Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3829 commits
Select commit Hold shift + click to select a range
051945d
MAGETWO-87340: magento/magento2#7848: M2.1.x : Require Customer To Be…
Feb 1, 2018
1ad527a
Switch updatecart qty input validators to dynamic instead of hardcoding
Feb 1, 2018
30b1de5
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Feb 2, 2018
b61c516
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-8356…
mslabko Feb 2, 2018
ac9d5c5
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 2, 2018
0333d62
MAGETWO-45775: Cache storage separation support
slopukhov Feb 2, 2018
4b3f941
MAGETWO-45775: Cache storage separation support
slopukhov Feb 2, 2018
d951a20
MAGETWO-45775: Cache storage separation support
slopukhov Feb 2, 2018
c143235
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr16
zakdma Feb 2, 2018
effe6b1
MAGETWO-45775: Cache storage separation support
slopukhov Feb 2, 2018
6b2d339
MAGETWO-45775: Cache storage separation support
slopukhov Feb 2, 2018
09ece03
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
RuslanKostiv1 Feb 2, 2018
d902872
MAGETWO-71393: Incorrect catalog rule price for bundle product with c…
RuslanKostiv1 Feb 2, 2018
61c086c
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
omiroshnichenko Feb 2, 2018
6d5cf58
Merge pull request #2029 from magento-performance/MAGETWO-83560
rganin Feb 2, 2018
3947a86
MAGETWO-87340: magento/magento2#7848: M2.1.x : Require Customer To Be…
ishakhsuvarov Feb 2, 2018
45a3706
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr16
zakdma Feb 2, 2018
f805605
Merge branch '2.2-develop' of https://github.com/magento-qwerty/magen…
Feb 2, 2018
e12b925
MAGETWO-84397: Overlapping reindex processes of catalogrule_rule
Feb 2, 2018
a763c42
Merge branch 'MAGETWO-84397' of https://github.com/magento-qwerty/mag…
Feb 2, 2018
c3b09d0
Merge pull request #2035 from magento-tsg/2.2-develop-pr16
Feb 2, 2018
7e46ab0
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 23, 2018
6554d2f
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 23, 2018
498cd6d
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 23, 2018
382736c
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 23, 2018
105b7ab
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 25, 2018
64abd5d
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 26, 2018
7a5b070
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 29, 2018
600bef4
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 29, 2018
344638c
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 30, 2018
c85d0b0
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 30, 2018
fcbfe1f
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 30, 2018
7a60088
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Jan 30, 2018
60fb61d
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Feb 2, 2018
2851b71
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Feb 2, 2018
afbb0d2
Merge remote-tracking branch 'origin/MAGETWO-75840' into PANDA-FIXES-2.2
RuslanKostiv1 Feb 2, 2018
90578c7
Merge remote-tracking branch 'origin/MAGETWO-85518' into PANDA-FIXES-2.2
RuslanKostiv1 Feb 2, 2018
471ef8b
Merge remote-tracking branch 'origin/MAGETWO-86780' into PANDA-FIXES-2.2
RuslanKostiv1 Feb 2, 2018
a574b0a
Merge remote-tracking branch 'origin/MAGETWO-71393' into PANDA-FIXES-2.2
RuslanKostiv1 Feb 2, 2018
2ad76a5
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
omiroshnichenko Feb 2, 2018
2598eae
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 2, 2018
dbcb0cd
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Feb 2, 2018
f45a75c
magento/magento2#7698: Admin Global Search was build in a hurry #1167
Feb 2, 2018
a9237bc
MAGETWO-87293: magento/magento2#7698: Admin Global Search was build i…
Feb 2, 2018
2c03ff9
Update code formatting in Swagger Block
Feb 4, 2018
60f2ea6
MAGETWO-86736: Product View Block initialization isn't optimal
slopukhov Feb 5, 2018
531a07e
MAGETWO-86918: Saving configurable product erases and reinserts recor…
victor-v-rad Feb 5, 2018
1d7c0ac
MAGETWO-86736: Product View Block initialization isn't optimal
slopukhov Feb 5, 2018
bb4e105
MAGETWO-86736: Product View Block initialization isn't optimal
slopukhov Feb 5, 2018
df0b57f
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 5, 2018
4b85971
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-84397
Feb 5, 2018
106c6ec
MAGETWO-87444: Update code formatting in Swagger Block #13485
orlangur Feb 5, 2018
1b6c425
MAGETWO-86736: Product View Block initialization isn't optimal
slopukhov Feb 5, 2018
3bef986
Fixing of Problem with updating stock item qty and stock status durin…
nuzil Feb 5, 2018
11b3161
MAGETWO-87447: Fixing of Problem with updating stock item qty and sto…
orlangur Feb 5, 2018
6293557
MAGETWO-86736: Product View Block initialization isn't optimal
slopukhov Feb 5, 2018
6563f2b
MAGETWO-86736: Product View Block initialization isn't optimal
slopukhov Feb 5, 2018
b3b217f
MAGETWO-73696: Sorting by price column in admin doesn't count disable…
duhon Feb 5, 2018
5e2a47f
Merge pull request #2042 from magento-performance/MAGETWO-45775
vzabaznov Feb 5, 2018
06d0a34
MAGETWO-87445: FATAL error on compiler generation on PAT 2.2 Trend
mslabko Feb 5, 2018
220ad97
issue #13497 - Method getUrl in Magento\Catalog\Model\Product\Attribu…
Feb 5, 2018
22d6534
MAGETWO-86736: Product View Block initialization isn't optimal
slopukhov Feb 5, 2018
940bf9f
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-69634
RuslanKostiv1 Feb 5, 2018
6429862
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 5, 2018
8051454
MAGETWO-73696: Sorting by price column in admin doesn't count disable…
duhon Feb 5, 2018
b9a5e0e
MAGETWO-72597: [2.2.x] - Impossible to perform mass update on product…
duhon Feb 5, 2018
9cfaf5a
merge magento/2.2-develop into magento-panda/PANDA-FIXES-2.2
Feb 5, 2018
03ea842
MAGETWO-86918: Saving configurable product erases and reinserts recor…
victor-v-rad Feb 5, 2018
9147391
MAGETWO-86918: Saving configurable product erases and reinserts recor…
victor-v-rad Feb 5, 2018
79463a5
Merge pull request #2044 from magento-panda/PANDA-FIXES-2.2
dvoskoboinikov Feb 5, 2018
0ff8f97
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-69634
RuslanKostiv1 Feb 5, 2018
8002a47
MAGETWO-87444: Update code formatting in Swagger Block #13485
Feb 5, 2018
67d7b43
MAGETWO-87341: magento/magento2#11527: Notification messages not disa…
Feb 5, 2018
6a3d2d4
MAGETWO-87293: magento/magento2#7698: Admin Global Search was build i…
Feb 5, 2018
62c8ca6
MAGETWO-87290: 12574: ConfigurationTest fails when installing via com…
Feb 5, 2018
e2c7bf1
MAGETWO-87289: Refunding / Credit Memo Total Value is not updated #1185
Feb 5, 2018
9d8f31f
MAGETWO-86736: Product View Block initialization isn't optimal
slopukhov Feb 6, 2018
1815365
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 6, 2018
01cd455
MAGETWO-84967: Set auto increment to 3 for Performance test plan
duhon Feb 6, 2018
33df100
MAGETWO-72597: [2.2.x] - Impossible to perform mass update on product…
duhon Feb 6, 2018
5797856
MAGETWO-87445: FATAL error on compiler generation on PAT 2.2 Trend
duhon Feb 6, 2018
6dbe135
Merge remote-tracking branches 'perf/MAGETWO-84967', 'perf/MAGETWO-73…
duhon Feb 6, 2018
4e031d7
MAGETWO-86918: Saving configurable product erases and reinserts recor…
victor-v-rad Feb 6, 2018
ca296c6
MAGETWO-87477: issue #13497 - Method getUrl in Magento\Catalog\Model\…
orlangur Feb 6, 2018
b576f72
MQE-669: Update functional test composer.json to use MTF 1.0.0-rc58.
jilu1 Jan 16, 2018
bd7f41a
MQE-663: Update magento 2.2-develop tests to be compatible with MFTF-2.0
jilu1 Feb 1, 2018
42e17c0
MQE-669: Update functional test composer.json.
jilu1 Feb 2, 2018
80696b8
MQE-663: added back in the previously skipped test AdminCreateCustome…
jilu1 Feb 2, 2018
1a05c33
Merge branch '2.2-develop' of https://github.com/magento-qwerty/magen…
Feb 6, 2018
e833c71
Merge branch 'MAGETWO-84397' of https://github.com/magento-qwerty/mag…
Feb 6, 2018
6790f9a
Merge pull request #2046 from magento-performance/MAGETWO-86736
vzabaznov Feb 6, 2018
3ee8175
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-69634
RuslanKostiv1 Feb 6, 2018
9d67128
Merge branch 'MAGETWO-84992' into 2.2.4-PR-20170111
Feb 6, 2018
e39e0d0
Merge branch 'MAGETWO-84397' into 2.2.4-PR-20170111
Feb 6, 2018
3feed10
Merge branch 'MAGETWO-85205' into 2.2.4-PR-20170111
Feb 6, 2018
9d99be9
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 6, 2018
1445a8a
MQE-663: Update magento2:2.2-develop tests to be compatible with MFTF…
okolesnyk Feb 6, 2018
44e038f
MQE-663: Update magento2:2.2-develop tests to be compatible with MFTF…
okolesnyk Feb 6, 2018
3012d33
MQE-663: Update magento2:2.2-develop tests to be compatible with MFTF…
okolesnyk Feb 6, 2018
03fbee5
MQE-663: Update magento2:2.2-develop tests to be compatible with MFTF…
okolesnyk Feb 6, 2018
0aa5522
Merge branch '2.2-develop' into 2.2.4-PR-20170111
Feb 6, 2018
1e7caef
MAGETWO-69634: Product with a special price must be showed with this …
RuslanKostiv1 Feb 6, 2018
5c2b4a1
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Feb 6, 2018
e3f5953
MAGETWO-87477: issue #13497 - Method getUrl in Magento\Catalog\Model\…
Feb 6, 2018
116c0d7
MAGETWO-87447: Fixing of Problem with updating stock item qty and sto…
Feb 6, 2018
62304f4
MAGETWO-87124: Update the Emogrifier dependency to ^2.0.0 #13132
Feb 6, 2018
f18377b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 6, 2018
9c35c45
Fix proposal for https://github.com/magento/magento2/issues/12081
mattijv Feb 7, 2018
1efdc4c
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
omiroshnichenko Feb 7, 2018
b584f2f
Merge branch '2.2-develop' of github.com:magento/magento2ce into PR-2…
okolesnyk Feb 7, 2018
5cbef15
MQE-663: Update magento2:2.2-develop tests to be compatible with MFTF…
okolesnyk Feb 7, 2018
b72e1b9
MQE-663: Update magento2:2.2-develop tests to be compatible with MFTF…
okolesnyk Feb 7, 2018
85f36cd
add failing test for json-encoded attribute backend
Feb 7, 2018
3d10764
fix issue when json encoded attribute backend serialize the value mul…
Feb 7, 2018
5d9ca56
Merge pull request #2047 from magento-pangolin/PR-2.2-develop
okolesnyk Feb 7, 2018
2482b58
Merge remote-tracking branch 'mainline/2.2-develop' into pr-2.2-develop
mslabko Feb 7, 2018
da442ce
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
omiroshnichenko Feb 7, 2018
dcc5e53
MAGETWO-87169: [FAT] Fix UpgradeSystemTest to correctly work with oth…
omiroshnichenko Feb 7, 2018
6bdc08a
Merge pull request #2050 from magento-performance/pr-2.2-develop
Feb 7, 2018
a70ab83
MAGETWO-86727: magento/magento2#: Customer Login/Logout Issue #13040
Feb 7, 2018
b23ae19
MAGETWO-87575: Fix for #12081: missing translations in the js-transla…
Feb 7, 2018
03bb798
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 7, 2018
bcff65e
MAGETWO-85960: magento/magento2#12817: Coupon code with canceled orde…
Feb 7, 2018
3c8be1c
MAGETWO-87588: Fix json encoded attribute backend type to not encode …
Feb 7, 2018
224c658
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
omiroshnichenko Feb 8, 2018
3640e7b
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-69634
RuslanKostiv1 Feb 8, 2018
6cc8bdb
magento/magento2#11252: fix adminhtml file attribute edit form
Feb 8, 2018
00ae3f7
Merge branch '2.2-develop' into 2.2.4-PR-20170111
Feb 8, 2018
c7acfe2
Merge pull request #2064 from magento-plankton/MAGETWO-87169
okolesnyk Feb 8, 2018
8d338b8
MAGETWO-69634: Product with a special price must be showed with this …
RuslanKostiv1 Feb 8, 2018
9969b7b
Merge branch '2.2-develop' into 2.2.4-PR-20170111
Feb 8, 2018
6012f39
MAGETWO-82288: Add MagentoStyle as Console Input/output helper object…
Feb 8, 2018
4e32e53
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 7, 2018
2a46a74
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 9, 2018
f3528e0
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 9, 2018
e749aa6
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 9, 2018
743a850
MQE-741: two steps with same step key, the later step will overwrite …
okolesnyk Feb 9, 2018
b48f07c
MAGETWO-87496: Switch updatecart qty input validators to dynamic inst…
rogyar Feb 9, 2018
d15bd5e
MAGETWO-87514: Product image builder - Override attributes when build…
rogyar Feb 9, 2018
b6d6715
Merge branches '2.2-develop' and 'MAGETWO-84397' of https://github.co…
Feb 9, 2018
2cb9e06
MAGETWO-84397: Overlapping reindex processes of catalogrule_rule
Feb 9, 2018
94e42f0
Merge branch 'MAGETWO-84397' into 2.2.4-PR-20170111
Feb 9, 2018
166d0b7
MAGETWO-84397: Overlapping reindex processes of catalogrule_rule
Feb 9, 2018
c37350e
Merge branch 'MAGETWO-84397' into 2.2.4-PR-20170111
Feb 9, 2018
20b2fd9
MAGETWO-85661: Can not revert "Swatches" attribute type
Feb 9, 2018
54254ad
Merge remote-tracking branch 'upstream/2.2-develop' into 2.2-develop
mustdobetter Feb 9, 2018
bf391fa
MAGETWO-87657: magento/magento2#11252: fix adminhtml file attribute e…
Feb 9, 2018
6b9eaba
MAGETWO-87657: magento/magento2#11252: fix adminhtml file attribute e…
Feb 9, 2018
63c8a2a
MAGETWO-87575: Fix for #12081: missing translations in the js-transla…
Feb 9, 2018
8171225
MAGETWO-87496: Switch updatecart qty input validators to dynamic inst…
Feb 9, 2018
e83eec7
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 9, 2018
56bc270
Fix adding values to variable collection
mszydlo Feb 10, 2018
5caafef
Merge branch '2.2-develop' of github.com:magento/magento2ce into MPI-PR
YevSent Feb 12, 2018
4da77c7
MAGETWO-82288: Add MagentoStyle as Console Input/output helper object...
nmalevanec Feb 12, 2018
863a025
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
Feb 12, 2018
e5cad3a
merge magento/2.2-develop into magento-qwerty/2.2.4-PR-20170111
Feb 12, 2018
2b9c44c
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 12, 2018
580f6e3
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 12, 2018
f52700f
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-71790
Feb 12, 2018
91dc6fe
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 12, 2018
47c55ae
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 12, 2018
e6561ac
magento/magento2#87588: Fix json encoded attribute backend type to no…
p-bystritsky Feb 12, 2018
0852f9d
Show IP-address without comma
barryvdh Feb 9, 2018
41c5b3d
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-84074-2
Feb 12, 2018
0a27f9c
magento/magento2#87588: Fix json encoded attribute backend type to no…
p-bystritsky Feb 12, 2018
0839bd4
Merge pull request #2072 from magento-mpi/MPI-PR
viktym Feb 12, 2018
4dc0872
magento/magento2#87588: Fix json encoded attribute backend type to no…
p-bystritsky Feb 12, 2018
6e82722
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 12, 2018
fe415b2
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 12, 2018
2d009ec
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 12, 2018
269acc6
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 12, 2018
806e9cf
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 12, 2018
1a9b833
Merge branch '2.2-develop' into 2.2.4-PR-20170111
Feb 12, 2018
7a6e7c6
Merge branch '2.2.4-PR-20170111' of https://github.com/magento-qwerty…
Feb 12, 2018
c359261
MAGETWO-69634: Product with a special price must be showed with this …
RuslanKostiv1 Feb 12, 2018
6e9aeff
MAGETWO-69634: Product with a special price must be showed with this …
RuslanKostiv1 Feb 12, 2018
0cb7019
Show redirect_to_base config in store scope
Feb 12, 2018
46130a0
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-69634
RuslanKostiv1 Feb 12, 2018
754a30e
MAGETWO-87588: Fix json encoded attribute backend type to not encode …
Feb 12, 2018
59efdd5
MAGETWO-85960: magento/magento2#12817: Coupon code with canceled orde…
Feb 12, 2018
4d9f2d9
MAGETWO-69634: Product with a special price must be showed with this …
RuslanKostiv1 Feb 12, 2018
2bbf7e9
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Feb 12, 2018
101e9eb
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 13, 2018
5af3a66
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
Feb 13, 2018
02fba0b
Merge branches '2.2-develop' and 'MAGETWO-71790' of https://github.co…
Feb 13, 2018
b9959cd
Merge branch '2.2-develop' into 2.2.4-PR-20170111
Feb 13, 2018
caa4d94
MAGETWO-69634: Product with a special price must be showed with this …
RuslanKostiv1 Feb 13, 2018
7137470
MAGETWO-87815: Update PAT scenarios for caching popular search terms …
slopukhov Feb 13, 2018
4313eaa
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-84074-2
Feb 13, 2018
37d8c92
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-69634
RuslanKostiv1 Feb 13, 2018
e56696e
Merge remote-tracking branch 'origin/MAGETWO-86918' into PANDA-FIXES-2.2
RuslanKostiv1 Feb 13, 2018
3c59fb4
Merge remote-tracking branch 'origin/MAGETWO-69634' into PANDA-FIXES-2.2
RuslanKostiv1 Feb 13, 2018
a28f839
Merge branch '2.2-develop' of github.com:magento/magento2ce into MQE-…
okolesnyk Feb 13, 2018
40c9d62
Merge pull request #2073 from magento-qwerty/2.2.4-PR-20170111
dvoskoboinikov Feb 13, 2018
0ad6fdd
Merge remote-tracking branch 'mainline/2.2-develop' into PANDA-FIXES-2.2
RuslanKostiv1 Feb 13, 2018
8b50e6c
MAGETWO-87838: Show maintenance IP-address without commas #13587
Feb 13, 2018
d019dce
MQE-792: fixed StorefrontCustomerCheckoutTest test.
jilu1 Feb 13, 2018
53c9efb
Merge pull request #2078 from magento-panda/PANDA-FIXES-2.2
dvoskoboinikov Feb 13, 2018
1046adf
Merge branch 'MQE-792' of github.com:magento-pangolin/magento2ce into…
okolesnyk Feb 13, 2018
2bc075d
merge magento/2.2-develop into magento-pangolin/MQE-741-2.2-develop
Feb 13, 2018
dcd0dbc
Merge pull request #2079 from magento-pangolin/MQE-741-2.2-develop
okolesnyk Feb 13, 2018
0d09347
MAGETWO-87859: Show redirect_to_base config in store scope #13614
dmanners Feb 14, 2018
525ce69
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 14, 2018
83f6fbf
MAGETWO-75769: Cache Popular Search Terms and Their Search Results Pages
slopukhov Feb 14, 2018
5019500
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 14, 2018
df53540
Refactoring: remove unuseful temporary variable
real34 Feb 14, 2018
9aa31e9
Merge branch 'MAGETWO-84074-2' into 2.2-bugfixes-140218
Feb 14, 2018
4dafb50
Merge branch 'MAGETWO-71790' into 2.2-bugfixes-140218
Feb 14, 2018
a8f0160
MAGETWO-87897: Refactoring: remove unuseful temporary variable #13663
rogyar Feb 14, 2018
b9e0483
MAGETWO-87908: Display a more meaningful error message in case of mis…
magento-engcom-team Feb 15, 2018
b1ac6c3
Merge pull request #2084 from magento-performance/MAGETWO-75769
igrybkov Feb 15, 2018
f6693f0
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 15, 2018
dadd4c5
MAGETWO-87815: Update PAT scenarios for caching popular search terms …
slopukhov Feb 15, 2018
caa488b
MAGETWO-87815: Update PAT scenarios for caching popular search terms …
slopukhov Feb 15, 2018
9b1ce69
MAGETWO-87921: Fix adding values to system variable collection #13596
magento-engcom-team Feb 15, 2018
04d2965
Update StorageInterface.php
davidangel Feb 15, 2018
c1db173
MAGETWO-87815: Update PAT scenarios for caching popular search terms …
slopukhov Feb 15, 2018
398ebd4
MAGETWO-87815: Update PAT scenarios for caching popular search terms …
slopukhov Feb 15, 2018
d451b58
MAGETWO-87815: Update PAT scenarios for caching popular search terms …
slopukhov Feb 15, 2018
b0c224e
#1143 magento/magento2#11963: Magento 2.2 language switching not work…
Feb 15, 2018
4ca46ae
#1143 magento/magento2#11963: Magento 2.2 language switching not work…
Feb 15, 2018
3d279cf
MAGETWO-87847: magento/magento2#11963: Magento 2.2 language switching…
magento-engcom-team Feb 15, 2018
3f26fbb
Merge branch '2.2-develop' into 2.2-bugfixes-140218
Feb 15, 2018
62b2832
MAGETWO-87921: Fix adding values to system variable collection #13596
Feb 15, 2018
1524190
MAGETWO-87908: Display a more meaningful error message in case of mis…
Feb 15, 2018
ecf3e2c
MAGETWO-87859: Show redirect_to_base config in store scope #13614
Feb 15, 2018
13fea73
MAGETWO-87847: magento/magento2#11963: Magento 2.2 language switching…
Feb 15, 2018
22701d6
MAGETWO-87514: Product image builder - Override attributes when build…
Feb 15, 2018
600d194
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 15, 2018
915f7c1
MAGETWO-87838: Show maintenance IP-address without commas #13587
Feb 15, 2018
2d93371
MAGETWO-82288: Add MagentoStyle as Console Input/output helper object…
Feb 15, 2018
2a70ee7
MAGETWO-87940: Update StorageInterface.php #13679
magento-engcom-team Feb 15, 2018
fe4614a
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 15, 2018
d3128f2
MAGETWO-87940: Update StorageInterface.php #13679
Feb 15, 2018
6ae181a
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Feb 15, 2018
74186cd
MAGETWO-87815: Update PAT scenarios for caching popular search terms …
slopukhov Feb 16, 2018
2dbcc8c
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 16, 2018
74563af
MQE-799: Bump MFTF version to 2.0.3 and test fixes
okolesnyk Feb 16, 2018
7814f7d
Merge pull request #2095 from magento-pangolin/MQE-799
okolesnyk Feb 16, 2018
a7c2290
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
slopukhov Feb 16, 2018
3cf5c24
Merge pull request #2096 from magento-performance/MAGETWO-87815
duhon Feb 16, 2018
f8ed85d
[Travis Test Fix] Add MagentoStyle as Console Input/output helper obj…
magento-engcom-team Feb 16, 2018
440aaf4
MAGETWO-87984: [Travis Test Fix] Add MagentoStyle as Console Input/ou…
magento-engcom-team Feb 16, 2018
8e4491b
MAGETWO-87984: [Travis Test Fix] Add MagentoStyle as Console Input/ou…
Feb 16, 2018
a1f36b5
MAGETWO-87897: Refactoring: remove unuseful temporary variable #13663
Feb 16, 2018
9d9a6c3
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 16, 2018
6e957af
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
Feb 19, 2018
d9fc848
Merge pull request #2097 from magento-chaika/MAGETWO-85661
igrybkov Feb 19, 2018
685e822
merge magento/2.2-develop into magento-qwerty/2.2-bugfixes-140218
Feb 19, 2018
7366763
Merge pull request #2106 from magento-qwerty/2.2-bugfixes-140218
dvoskoboinikov Feb 19, 2018
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.
8 changes: 8 additions & 0 deletions .github/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>

46 changes: 46 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/.metadata
/.project
/.settings
/.vscode
atlassian*
/nbproject
/robots.txt
Expand Down
170 changes: 130 additions & 40 deletions .htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
############################################
## adjust memory limit

php_value memory_limit 768M
php_value memory_limit 756M
php_value max_execution_time 18000

############################################
Expand All @@ -59,7 +59,7 @@
############################################
## adjust memory limit

php_value memory_limit 768M
php_value memory_limit 756M
php_value max_execution_time 18000

############################################
Expand Down Expand Up @@ -203,76 +203,166 @@
RedirectMatch 403 /\.git

<Files composer.json>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files composer.lock>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .gitignore>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .htaccess>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .htaccess.sample>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .php_cs.dist>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files .travis.yml>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files CHANGELOG.md>
order allow,deny
deny from all
</Files>
<Files CONTRIBUTING.md>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files COPYING.txt>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files Gruntfile.js>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files LICENSE.txt>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files LICENSE_AFL.txt>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files nginx.conf.sample>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files package.json>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files php.ini.sample>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files README.md>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files auth.json>
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>
<Files magento_umask>
order allow,deny
deny from all
<IfVersion < 2.4>
order allow,deny
deny from all
</IfVersion>
<IfVersion >= 2.4>
Require all denied
</IfVersion>
</Files>

# For 404s and 403s that aren't handled by the application, show plain 404 response
Expand Down
Loading