Skip to content

Update README.md #1542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 10,000 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10000 commits
Select commit Hold shift + click to select a range
5f8b060
MAGETWO-50947: Incorrect IP addresses shown in account activity page
dsikkema-magento May 2, 2016
ff74cb8
MAGETWO-52441: Customer account lockout works incorrectly if this acc…
May 2, 2016
14445fa
MAGETWO-50848: [Github] The `setup:di:compile` command should not pro…
dsikkema-magento May 3, 2016
981d1f4
Merge remote-tracking branch 'mainline/develop' into for-pr
May 3, 2016
1017b2c
MAGETWO-52441: Customer account lockout works incorrectly if this acc…
May 3, 2016
abda8a5
Merge remote-tracking branch 'origin/MAGETWO-50846-Unit-Test-Fix' int…
monkeysee May 3, 2016
9701889
Merge remote-tracking branch 'origin/MAGETWO-50934-failed-upgrade' in…
monkeysee May 3, 2016
e581092
Merge remote-tracking branch 'origin/MAGETWO-51580-misleading-error-m…
monkeysee May 3, 2016
2d4aa69
Merge remote-tracking branch 'origin/MAGETWO-51881-catalog-events-car…
monkeysee May 3, 2016
e751c69
Merge remote-tracking branch 'origin/MAGETWO-52371-marketplace-creden…
monkeysee May 3, 2016
900ec17
MAGETWO-52329: [PR] Prepare and process PR
May 4, 2016
f071704
Merge remote-tracking branch 'mainline/develop' into PR
May 4, 2016
9aad31b
Merge remote-tracking branch 'origin/MAGETWO-51925' into PR
May 4, 2016
fc735a3
MAGETWO-52329: [PR] Prepare and process PR
May 4, 2016
bd8c100
MAGETWO-52329: [PR] Prepare and process PR
May 4, 2016
5631d25
MAGETWO-51049: Incorrect behavior of DragAndDrop for Dynamic Rows
slopok May 4, 2016
fd3cb6e
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
valdislav May 4, 2016
4d72132
MAGETWO-51993: Product Price isn't displayed in "My Wish List" custom…
May 4, 2016
2d8f277
Merge remote-tracking branch 'mainline/develop' into MAGETWO-51993
May 4, 2016
c2bd1e4
MAGETWO-51993: Product Price isn't displayed in "My Wish List" custom…
May 4, 2016
39651fb
MAGETWO-52170: Impossible to create Downloadable Product
valdislav May 4, 2016
3853d0d
MAGETWO-52170: Impossible to create Downloadable Product - deprecated…
valdislav May 4, 2016
c1b7c35
MAGETWO-52079: [GITHUB] Order Repository GetList Method always return…
Mulderua May 4, 2016
492af16
Merge remote-tracking branch 'mainline/develop' into bugs
May 4, 2016
6c60062
MAGETWO-51791: [Github] Sales Order extension_attributes #3967
May 4, 2016
b1dd1c6
MAGETWO-52079: [GITHUB] Order Repository GetList Method always return…
Mulderua May 4, 2016
191f4c4
MAGETWO-52379: Product price is not updated if edit product options f…
slopok May 4, 2016
8c18808
MAGETWO-52170: Impossible to create Downloadable Product - review fixes
valdislav May 4, 2016
a5e6889
Merge remote-tracking branch 'origin/MAGETWO-52079' into MAGETWO-52374
mlogvin May 4, 2016
4e6fc89
Merge remote-tracking branch 'origin/MAGETWO-52170' into MAGETWO-52374
mlogvin May 4, 2016
834a756
MAGETWO-51791: [Github] Sales Order extension_attributes #3967
May 4, 2016
b1e53d7
MAGETWO-50767: Cache is not invalidated if reset theme to parent scop…
May 4, 2016
7edc294
MAGETWO-51791: [Github] Sales Order extension_attributes #3967
May 4, 2016
f3e1524
MAGETWO-52079: [GITHUB] Order Repository GetList Method always return…
Mulderua May 4, 2016
0883d63
MAGETWO-52079: [GITHUB] Order Repository GetList Method always return…
Mulderua May 4, 2016
564cfd6
MAGETWO-50767: Cache is not invalidated if reset theme to parent scop…
May 4, 2016
6edb7ee
MAGETWO-50767: Cache is not invalidated if reset theme to parent scop…
May 4, 2016
c29ec9d
Merge remote-tracking branch 'origin/MAGETWO-52079' into MAGETWO-52374
mlogvin May 4, 2016
0e74546
Merge branch 'develop' of https://github.corp.magento.com/magento2/ma…
May 4, 2016
412c11b
MAGETWO-52359: Order cannot be placed via online payments in Admin
dkvashninbay May 4, 2016
a67c815
MAGETWO-52170: Impossible to create Downloadable Product - fix unit
valdislav May 4, 2016
0c0e8a6
Merge remote-tracking branch 'origin/MAGETWO-52170' into MAGETWO-52374
mlogvin May 4, 2016
7c45459
Merge remote-tracking branch 'mainline/develop' into PR_Branch
monkeysee May 4, 2016
13ab162
Fix SortOrderBuilder::create() return type hint
Vinai May 4, 2016
aaa9e6a
MAGETWO-52493: Bug Fixes Contribution
May 4, 2016
744106a
MAGETWO-52493: Bug Fixes Contribution
May 4, 2016
cd09ee1
MAGETWO-52493: Bug Fixes Contribution
May 4, 2016
5e7c3b4
Merge remote-tracking branch 'mainline/develop' into MAGETWO-49585-ty…
May 4, 2016
b55821e
MAGETWO-51993: Product Price isn't displayed in "My Wish List" custom…
May 4, 2016
870bdfb
Merge pull request #583 from magento-folks/bugs
May 4, 2016
d69f408
Merge commit 'refs/pull/3632/head' of https://github.com/magento/mage…
May 4, 2016
b66a362
Merge commit 'refs/pull/3725/head' of https://github.com/magento/mage…
May 4, 2016
004193d
MAGETWO-52165: [PS-API-FT] Fix functional test Magento\User\Test\Test…
May 4, 2016
8d448eb
MAGETWO-52493: Bug Fixes Contribution
May 4, 2016
eba4cce
MAGETWO-52493: Bug Fixes Contribution
May 4, 2016
ee2263b
Merge remote-tracking branch 'mainline/develop' into pull-request
May 4, 2016
0484c7a
Merge branch 'develop' into MAGETWO-52374
mlogvin May 5, 2016
8fd51ba
MAGETWO-52329: [PR] Prepare and process PR
May 5, 2016
1adf4c9
Merge remote-tracking branch 'mainline/develop' into PR
May 5, 2016
02dbbce
Merge remote-tracking branch 'origin/MAGETWO-51628' into PR
May 5, 2016
a30424c
Merge branch 'develop' of https://github.corp.magento.com/magento2/ma…
May 5, 2016
859af1a
MAGETWO-52452: Shopping cart shipping estimation fails randomly
ishakhsuvarov May 5, 2016
135f967
Merge pull request #574 from magento-firedrakes/MAGETWO-52374
May 5, 2016
f3cf5d5
MAGETWO-51975: Product attribute with date type has incorrect value
xmav May 5, 2016
72093aa
Merge branch 'develop' of https://github.corp.magento.com/magento2/ma…
May 5, 2016
e4b3994
Merge remote-tracking branch 'mainline/develop' into MAGETWO-51449
May 5, 2016
6a28398
Merge remote-tracking branch 'mainline/develop' into MAGETWO-52306
May 5, 2016
1157ccd
Merge remote-tracking branch 'mainline/develop' into MAGETWO-52067
May 5, 2016
38a16b5
Merge remote-tracking branch 'mainline/develop' into MAGETWO-51993
May 5, 2016
440d55f
Merge remote-tracking branch 'mainline/develop' into MAGETWO-51660
May 5, 2016
0a1f26f
Merge remote-tracking branch 'mainline/develop' into MAGETWO-50785
May 5, 2016
9107e87
Merge remote-tracking branch 'mainline/develop' into MAGETWO-50767
May 5, 2016
2aa6e5a
Merge remote-tracking branch 'mainline/develop' into MAGETWO-49820-Cu…
May 5, 2016
bfd791b
Merge remote-tracking branch 'mainline/develop' into MAGETWO-49308
May 5, 2016
f559bf5
Merge remote-tracking branch 'mainline/develop' into MAGETWO-51917
May 5, 2016
068f051
Merge remote-tracking branch 'origin/MAGETWO-51449' into BUGS
May 5, 2016
c2b8e53
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
ishakhsuvarov May 5, 2016
5738510
Merge remote-tracking branch 'origin/MAGETWO-52306' into BUGS
May 5, 2016
163f0fc
Merge remote-tracking branch 'origin/MAGETWO-52067' into BUGS
May 5, 2016
f2619d5
Merge remote-tracking branch 'origin/MAGETWO-51993' into BUGS
May 5, 2016
852b957
Merge remote-tracking branch 'origin/MAGETWO-51660' into BUGS
May 5, 2016
782cd5c
Merge remote-tracking branch 'origin/MAGETWO-50785' into BUGS
May 5, 2016
b85e8ea
Merge remote-tracking branch 'origin/MAGETWO-50767' into BUGS
May 5, 2016
d05b3bf
Merge remote-tracking branch 'origin/MAGETWO-49820-Customer-validatio…
May 5, 2016
6da2200
Merge remote-tracking branch 'origin/MAGETWO-49308' into BUGS
May 5, 2016
c5374ca
MAGETWO-52493: Bug Fixes Contribution
May 5, 2016
d4fafab
Merge remote-tracking branch 'mainline/develop' into PR
May 5, 2016
61068d1
MAGETWO-52067: Downloadable product price doesn't include link price …
May 5, 2016
a3e24ab
Merge remote-tracking branch 'origin/MAGETWO-52067' into BUGS
May 5, 2016
b0d221c
MAGETWO-49585: [GitHub] Add type declaration to setter methods of gen…
May 5, 2016
0e6de79
Merge remote-tracking branch 'mainline/develop' into MAGETWO-49585-ty…
May 5, 2016
dfa9c35
Merge branch 'MAGETWO-49585-type-declaration' into pull-request
May 5, 2016
d081054
Merge remote-tracking branch 'origin/MAGETWO-52471' into pull-request
May 5, 2016
806be5b
Merge remote-tracking branch 'origin/MAGETWO-52472' into pull-request
May 5, 2016
1433f2c
Merge Pull Reqeust #3274 from Vinai/magento2.git develop
May 5, 2016
d6c82c0
Merge remote-tracking branch 'mainline/develop' into PR_Branch
monkeysee May 5, 2016
ee4f294
Merge Pull Request #4227 from Imaginaerum/magento2.git patch-1
May 5, 2016
1430015
MAGETWO-51792: [Github] <!--@subject Your {{var store.getFrontendName…
May 5, 2016
ce9983d
MAGETWO-52493: Bug Fixes Contribution
May 5, 2016
dcef2ff
Merge commit 'refs/pull/3567/head' of https://github.com/magento/mage…
May 5, 2016
30b1dda
Merge commit 'refs/pull/3851/head' of https://github.com/magento/mage…
May 5, 2016
d8b18dd
Merge commit 'refs/pull/3892/head' of https://github.com/magento/mage…
May 5, 2016
fa0b979
MAGETWO-52170: Impossible to create Downloadable Product - fix link w…
valdislav May 6, 2016
6a9d303
Merge remote-tracking branch 'tango-ce/MAGETWO-52275' into MAGETWO-52578
magicbunneh May 6, 2016
8d2d644
Merge remote-tracking branch 'tango-ce/MAGETWO-52284-2.1' into MAGETW…
magicbunneh May 6, 2016
5894db0
Merge remote-tracking branch 'tango-ce/MAGETWO-50600' into MAGETWO-52578
magicbunneh May 6, 2016
feab3b9
Merge remote-tracking branch 'tango-ce/MAGETWO-51472' into MAGETWO-52578
magicbunneh May 6, 2016
107c91e
Merge remote-tracking branch 'tango-ce/MAGETWO-52172' into MAGETWO-52578
magicbunneh May 6, 2016
9b5a861
Merge remote-tracking branch 'tango-ce/MAGETWO-52219' into MAGETWO-52578
magicbunneh May 6, 2016
e282811
MAGETWO-52578: [PR] Bug Fixes
magicbunneh May 6, 2016
4d71bb4
Merge pull request #580 from magento-vanilla/PR
May 6, 2016
7da1847
Merge remote-tracking branch 'mainline/develop' into BUGS
May 6, 2016
0c5880a
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
valdislav May 6, 2016
bacf970
MAGETWO-52418: Drag and drop on Customizable opions poblem
May 6, 2016
c68d6f3
MAGETWO-52418: Drag and drop on Customizable opions poblem
May 6, 2016
c14466a
Merge remote-tracking branch 'mainline/develop' into bugs
May 6, 2016
e7e006e
Merge remote-tracking branch 'mainline/develop' into develop
May 6, 2016
c25eb1c
MAGETWO-50126: Code Refactoring: Fix the Less test errors
zanilee May 6, 2016
efc35bb
Merge pull request #594 from magento-south/BUGS
dkvashninbay May 6, 2016
04366d2
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
valdislav May 6, 2016
f42c8c7
MAGETWO-52560: Impossible to use Stored Cards via Braintree on Admin …
dkvashninbay May 6, 2016
e3bb6a4
MAGETWO-52493: Bug Fixes Contribution
May 6, 2016
0dfd558
Merge pull request #595 from magento-firedrakes/MAGETWO-52170
May 6, 2016
ab37a8e
Merge remote-tracking branch 'mainline/develop' into PR_Branch
monkeysee May 6, 2016
bc77c1f
Merge remote-tracking branch 'mainline/develop' into pull-request
May 6, 2016
335c09c
MAGETWO-52318: Deploy mode assertion inconsistent
dsikkema-magento May 6, 2016
072ce1a
MAGETWO-52572: [Github] Change return value from boolean to ActionInt…
May 6, 2016
ca032ca
MAGETWO-52441: Customer account lockout works incorrectly if this acc…
dsikkema-magento May 6, 2016
8f26cee
MAGETWO-50273: [Github][PR] Process Public PR Added grunt tasks autol…
May 6, 2016
ffea3cd
Merge pull request #591 from magento-ogre/PR_Branch
sdwright May 6, 2016
85c31bf
Merge remote-tracking branch 'mainline/develop' into pull-request
May 6, 2016
4bcf8d8
Merge remote-tracking branch 'origin/MAGETWO-50947-ip-table' into dev…
dsikkema-magento May 6, 2016
f8a3757
Merge remote-tracking branch 'origin/MAGETWO-51073-product-starts-wit…
dsikkema-magento May 6, 2016
50eb392
Merge remote-tracking branch 'origin/MAGETWO-52318-deploy-mode-assert…
dsikkema-magento May 6, 2016
284aec3
Merge remote-tracking branch 'origin/MAGETWO-50848-compile-folders-as…
dsikkema-magento May 6, 2016
52ea72b
Merge remote-tracking branch 'origin/MAGETWO-52441-password' into dev…
dsikkema-magento May 6, 2016
03bc835
Merge remote-tracking branch 'origin/MAGETWO-52143-redis-2.1' into de…
dsikkema-magento May 6, 2016
69e3e6e
Merge remote-tracking branch 'origin/MAGETWO-52332-FT-pagecache' into…
dsikkema-magento May 6, 2016
53fe59d
MAGETWO-52143: Make Redis session adapter changes backwards compatibl…
dsikkema-magento May 6, 2016
07aa35f
Merge remote-tracking branch 'origin/MAGETWO-52143-redis-2.1' into de…
dsikkema-magento May 6, 2016
f10c7c8
Merge pull request #592 from magento-api/pull-request
monkeysee May 6, 2016
b8f609d
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
3c76c91
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
70aaafb
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
109cff6
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
5b8b78d
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
27f1d54
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
9d6d9e8
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
5463df6
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
c951140
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
3afb568
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
40fa62a
Merge branch 'develop' of github.corp.magento.com:magento-extensibili…
bwaters May 9, 2016
7bab557
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
cd09595
MAGETWO-52616: Bug Fixes Contribution
May 9, 2016
4995351
Merge remote-tracking branch 'mainline/develop' into develop
May 10, 2016
e6420d4
Merge branch 'maindevelop' into bugs
irenelagno May 10, 2016
53ff5d2
MAGETWO-52157: Can not edit product
May 10, 2016
cb356d7
Merge remote-tracking branch 'origin/MAGETWO-52418' into PR
May 10, 2016
76e1e76
Merge remote-tracking branch 'origin/MAGETWO-52379' into PR
May 10, 2016
a828b2e
Merge remote-tracking branch 'origin/MAGETWO-51049' into PR
May 10, 2016
57cecbc
Merge remote-tracking branch 'origin/MAGETWO-51048' into PR
May 10, 2016
34946a4
Merge remote-tracking branch 'origin/MAGETWO-52157' into PR
May 10, 2016
b16cc2d
Merge branch 'develop' of https://github.corp.magento.com/magento2/ma…
rganin May 10, 2016
6885095
MAGETWO-52598: [Github] Usage of Magento\Framework\Stdlib\DateTime is…
May 10, 2016
3956bb2
Merge branch 'Troll-PR' of github.corp.magento.com:magento-troll/mage…
rganin May 10, 2016
baffde0
MAGETWO-51015: Swatch attribute that is not required has no empty option
May 10, 2016
4565624
MAGETWO-51072: Changing Swatch attribute's property doesn't affect st…
May 10, 2016
a610b45
MAGETWO-50296: Discount Coupon Code Description is not presented on S…
irenelagno May 10, 2016
82dfd56
Merge remote-tracking branch 'origin/MAGETWO-52225' into PR
May 10, 2016
4a68a99
Merge remote-tracking branch 'origin/develop' into MAGETWO-46056-new
May 10, 2016
738376a
Merge remote-tracking branch 'mainline/develop' into pr-573
mslabko May 10, 2016
ff7d5ff
MAGETWO-49561: [GitHub] Empty Shipping Method Name breaks shopping ca…
May 10, 2016
27a0b87
MAGETWO-46922: [GitHub] SynchronizePersistentInfoObserver is subscrib…
irenelagno May 10, 2016
e3a3616
MAGETWO-48730: Customer can't hide applied Gift Options
May 10, 2016
e3b578e
MAGETWO-52482: Fatal error appears if user less symbols in quick sear…
igrybkov May 10, 2016
0807920
MAGETWO-52098: Exception if add configurable product with out of stoc…
mslabko May 10, 2016
0611722
MAGETWO-52482: Fatal error appears if user less symbols in quick sear…
igrybkov May 10, 2016
19c4594
Merge remote-tracking branch 'origin/MAGETWO-51258' into bugs
May 10, 2016
49e88e8
Merge remote-tracking branch 'origin/MAGETWO-52039' into bugs
May 10, 2016
ca16849
Merge remote-tracking branch 'origin/MAGETWO-51994' into bugs
May 10, 2016
2e71fed
Merge remote-tracking branch 'origin/MAGETWO-52391' into bugs
May 10, 2016
41fc7d5
Merge remote-tracking branch 'origin/MAGETWO-52419' into bugs
May 10, 2016
52be797
Merge pull request #573 from magento-goinc/pr-573
May 10, 2016
d4e5296
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
bwaters May 10, 2016
51d0453
Merge pull request #599 from magento-extensibility/develop
May 10, 2016
dd12ccf
Merge remote-tracking branch 'mainline/develop' into pull-request
May 10, 2016
5f5bd4f
Merge pull request #603 from magento-api/pull-request
monkeysee May 10, 2016
bd16996
MAGETWO-52482: Fatal error appears if user less symbols in quick sear…
igrybkov May 11, 2016
7982419
Merge remote-tracking branch 'origin/develop' into bugs
zanilee May 11, 2016
962a250
MAGETWO-50126: Code Refactoring: Fix the Less test errors
zanilee May 11, 2016
ce5a0e5
Merge remote-tracking branch 'origin/MAGETWO-52482' into PR-4
aohorodnyk May 11, 2016
1156e51
Merge remote-tracking branch 'mainline/develop' into PR
May 11, 2016
94d0ec7
Merge remote-tracking branch 'origin/MAGETWO-50571' into PR-4
aohorodnyk May 11, 2016
a747da2
Merge remote-tracking branch 'origin/MAGETWO-51210' into PR-4
aohorodnyk May 11, 2016
7b9e6ba
Merge remote-tracking branch 'origin/MAGETWO-51975' into PR-4
aohorodnyk May 11, 2016
69da18d
Merge remote-tracking branch 'origin/MAGETWO-52180' into PR-4
aohorodnyk May 11, 2016
317ffc2
Merge remote-tracking branch 'origin/MAGETWO-52186' into PR-4
aohorodnyk May 11, 2016
07d60c2
Merge remote-tracking branch 'origin/MAGETWO-51611' into PR-4
aohorodnyk May 11, 2016
72c66ca
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
slopukhov May 11, 2016
018345d
Merge remote-tracking branch 'remotes/origin/MAGETWO-52015' into PR-4
aohorodnyk May 11, 2016
a93883c
Merge remote-tracking branch 'origin/MAGETWO-52030' into PR-4
aohorodnyk May 11, 2016
a5d33d6
MAGETWO-52042: Saving swatch option cause errors
May 11, 2016
2689af4
MAGETWO-51072: Changing Swatch attribute's property doesn't affect st…
May 11, 2016
b40eaad
Merge remote-tracking branch 'mainline/develop' into develop
May 11, 2016
41bc7aa
MAGETWO-50126: Code Refactoring: Fix the Less test errors
May 11, 2016
3e66e85
MAGETWO-52009: Can't add new user agent rule in theme page. (JS error).
May 11, 2016
7a247b7
Merge pull request #576 from magento-troll/Troll-PR
kandy May 11, 2016
c0a781c
MAGETWO-48759: Incorrect message to user if session timeout before ac…
May 11, 2016
cdf7c44
Merge remote-tracking branch 'mainline/develop' into PR
May 11, 2016
372f1d5
MAGETWO-52009: Can't add new user agent rule in theme page. (JS error).
May 11, 2016
5ac0521
Merge remote-tracking branch 'origin/develop' into bugs
zanilee May 11, 2016
0611634
Merge pull request #597 from magento-vanilla/PR
May 11, 2016
a0fc088
Merge remote-tracking branch 'mainline/develop' into develop
May 11, 2016
392644b
Merge pull request #585 from magento-nord/develop
May 11, 2016
aaa2142
Merge remote-tracking branch 'main-ce/develop' into MAGETWO-52578
magicbunneh May 11, 2016
ffe26b0
Merge pull request #598 from magento-tango/MAGETWO-52578
May 11, 2016
99eb32f
Merge remote-tracking branch 'origin/develop' into bugs
zanilee May 12, 2016
c7e6e6e
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
YevSent May 12, 2016
003bd86
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
YevSent May 12, 2016
4de236b
Merge branch 'MAGETWO-52337' into MPI-PR
YevSent May 12, 2016
08cda66
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
YevSent May 12, 2016
67f25b8
Merge branch 'MAGETWO-52359' into MPI-PR
YevSent May 12, 2016
56db8b8
MAGETWO-52560: Impossible to use Stored Cards via Braintree on Admin …
YevSent May 12, 2016
7049ea4
Merge branch 'maindevelop' into bugs
irenelagno May 12, 2016
01ec09a
Revert "MAGETWO-52015: Bundle Product price range not include custom …
aohorodnyk May 12, 2016
77dc986
MAGETWO-52724: Server side validation absent for checkout agreements
irenelagno May 12, 2016
32e7ab6
Merge pull request #605 from magento-webdev/bugs
VladimirZaets May 12, 2016
211c549
Merge remote-tracking branch 'mainline/develop' into PR-4
aohorodnyk May 12, 2016
52e6fd6
MAGETWO-52590: [GITHUB] Calendar. Time format 24h #3856 #4243
guz-anton May 12, 2016
fd9e67a
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce…
YevSent May 12, 2016
b8b52ad
MAGETWO-48048: Bundle product price on category view isn't included c…
YevSent May 12, 2016
e0fcf63
MAGETWO-51629: Incorrect current time in date pickers
iivashchenko May 12, 2016
cbbdc39
Merge branch 'maindevelop' into bugs
irenelagno May 12, 2016
2e41989
MAGETWO-52699: New "Bundle option" dynamic row is filled with deleted…
May 12, 2016
964f540
Merge pull request #606 from magento-mpi/MPI-PR
May 12, 2016
380be50
Merge remote-tracking branch 'mainline/develop' into bugs
May 12, 2016
2680b71
Merge remote-tracking branch 'mainline/develop' into PR-4
igrybkov May 12, 2016
fc32492
Merge pull request #607 from magento-dragons/PR-4
May 12, 2016
5c82f8c
Merge remote-tracking branch 'mainline/develop' into bugs
May 12, 2016
584af4d
Merge pull request #608 from magento-folks/bugs
May 13, 2016
b5b73f9
Merge remote-tracking branch 'origin/MAGETWO-52009' into PR
May 13, 2016
d7efe16
Merge remote-tracking branch 'origin/MAGETWO-51629' into PR
May 13, 2016
4d0be07
Merge remote-tracking branch 'origin/MAGETWO-52590' into PR
May 13, 2016
5130a5e
MAGETWO-32380: Customer is logged out after clicking two links in min…
irenelagno May 13, 2016
6b21f6f
Merge remote-tracking branch 'origin/MAGETWO-52699' into PR
May 13, 2016
5471bca
Merge pull request #612 from magento-vanilla/PR
May 13, 2016
479fa5a
MAGETWO-52747: Fatal error on reordering on Storefront
May 13, 2016
727cd9d
Merge remote-tracking branch 'mainline/develop' into bugs
May 13, 2016
2f91db8
Merge pull request #615 from magento-folks/bugs
slavvka May 13, 2016
2778dc4
Merge branch 'readme-translations' of https://github.com/piotrekkamin…
May 13, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
atlassian*
/nbproject
/sitemap
/sitemap.xml
/.idea
/.gitattributes
/app/config_sandbox
Expand Down Expand Up @@ -46,4 +47,5 @@ atlassian*

/var/*
!/var/.htaccess
/vendor
/vendor/*
!/vendor/.htaccess
118 changes: 112 additions & 6 deletions .htaccess
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
############################################
## uncomment the line below to enable developer mode
## overrides deployment configuration mode value
## use command bin/magento deploy:mode:set to switch modes

# SetEnv MAGE_MODE developer

############################################
## overrides default umask value to allow using different
## file permissions

# SetEnv MAGE_UMASK 022

############################################
## uncomment these lines for CGI mode
## make sure to specify the correct cgi php binary file name
Expand Down Expand Up @@ -57,6 +64,32 @@

</IfModule>

<IfModule mod_php7.c>

############################################
## adjust memory limit

php_value memory_limit 768M
php_value max_execution_time 18000

############################################
## disable automatic session start
## before autoload was initialized

php_flag session.auto_start off

############################################
## enable resulting html compression

#php_flag zlib.output_compression on

###########################################
## disable user agent verification to not break multiple image upload

php_flag suhosin.session.cryptua off

</IfModule>

<IfModule mod_security.c>
###########################################
## disable POST processing to not break multiple image upload
Expand Down Expand Up @@ -102,6 +135,13 @@

</IfModule>

############################################
## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
## Please, set it on virtual host configuration level

## SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
############################################

<IfModule mod_rewrite.c>

############################################
Expand Down Expand Up @@ -170,13 +210,79 @@
</IfModule>

###########################################
## Deny access to release notes to prevent disclosure of the installed Magento version
## Deny access to root files to hide sensitive application information
RedirectMatch 404 /\.git

<Files RELEASE_NOTES.txt>
Order allow,deny
Deny from all
<Files composer.json>
order allow,deny
deny from all
</Files>
############################################
<Files composer.lock>
order allow,deny
deny from all
</Files>
<Files .gitignore>
order allow,deny
deny from all
</Files>
<Files .htaccess>
order allow,deny
deny from all
</Files>
<Files .htaccess.sample>
order allow,deny
deny from all
</Files>
<Files .php_cs>
order allow,deny
deny from all
</Files>
<Files .travis.yml>
order allow,deny
deny from all
</Files>
<Files CHANGELOG.md>
order allow,deny
deny from all
</Files>
<Files CONTRIBUTING.md>
order allow,deny
deny from all
</Files>
<Files COPYING.txt>
order allow,deny
deny from all
</Files>
<Files Gruntfile.js>
order allow,deny
deny from all
</Files>
<Files LICENSE.txt>
order allow,deny
deny from all
</Files>
<Files LICENSE_AFL.txt>
order allow,deny
deny from all
</Files>
<Files nginx.conf.sample>
order allow,deny
deny from all
</Files>
<Files package.json>
order allow,deny
deny from all
</Files>
<Files php.ini.sample>
order allow,deny
deny from all
</Files>
<Files README.md>
order allow,deny
deny from all
</Files>

################################
## If running in cluster environment, uncomment this
## http://developer.yahoo.com/performance/rules.html#etags

Expand Down
Loading