Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4439 commits
Select commit Hold shift + click to select a range
cbc704d
Revert "welcome-message-or-keyword"
mzeis Feb 27, 2018
7cd5958
ENGCOM-586: magento/magento2#7765: Filter block on category is still …
magento-engcom-team Feb 27, 2018
cfcfd48
ENGCOM-587: Issue-13768 Fixed error messages on admin user account pa…
magento-engcom-team Feb 28, 2018
b6d008d
ENGCOM-589: Inconsistent Redirect in Admin Notification Controller #1…
magento-engcom-team Feb 28, 2018
1c7e3a1
Issues 13769. Fix wrong info about sent email in order sender.
pawcioma Feb 27, 2018
4d50066
#13231: [GitHub] Default State or Province is not pre-selected in the…
serhii-balko Feb 28, 2018
adab3e5
Pass unused hashing algorithm parameter in the Encryptor::getHash method
Feb 28, 2018
42fec58
Merge branch 'MAGETWO-87030' into 2.2-bugfixes-280218
Feb 28, 2018
9e06419
Merge branch 'MAGETWO-81431' into 2.2-bugfixes-280218
Feb 28, 2018
81b24e6
Merge branch 'MAGETWO-73002' into 2.2-bugfixes-280218
Feb 28, 2018
3b17a22
MAGETWO-86448: Default Welcome message is broken on storefront with e…
magento-engcom-team Feb 28, 2018
a06793e
MAGETWO-88435: Fix issue 13827 #13844
Feb 28, 2018
419270d
MAGETWO-88340: Allow changing head and body element through xml layou…
Feb 28, 2018
6b47e2b
MAGETWO-88174: Add integration tests for product urls rewrite generat…
Feb 28, 2018
df3e5eb
MAGETWO-86448: Default Welcome message is broken on storefront with e…
Feb 28, 2018
1a21d24
ENGCOM-589: Inconsistent Redirect in Admin Notification Controller #1…
Feb 28, 2018
6916fda
ENGCOM-587: Issue-13768 Fixed error messages on admin user account pa…
Feb 28, 2018
253cbe3
MAGETWO-88174: Add integration tests for product urls rewrite generat…
Feb 28, 2018
7e17a4f
MAGETWO-88174: Add integration tests for product urls rewrite generat…
Feb 28, 2018
ec47891
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Feb 28, 2018
d77d6e9
Fix typo in securityCheckers array
Mar 1, 2018
ff25a78
ENGCOM-624: Issues 13769. Fix wrong info about sent email in order se…
magento-engcom-team Mar 1, 2018
c6070e1
ENGCOM-627: Fix typo in securityCheckers array #13897
magento-engcom-team Mar 1, 2018
db2b246
Merge remote-tracking branch 'origin/MAGETWO-83343' into 2.2.4-PR-part-1
VladimirZaets Mar 1, 2018
4772526
Merge remote-tracking branch 'origin/MAGETWO-84921' into 2.2.4-PR-part-1
VladimirZaets Mar 1, 2018
024fb2b
Merge remote-tracking branch 'origin/MAGETWO-73479' into 2.2.4-PR-part-1
VladimirZaets Mar 1, 2018
010a646
Merge remote-tracking branch 'origin/MAGETWO-71936' into 2.2.4-PR-part-1
VladimirZaets Mar 1, 2018
8268922
magento/magento2#12889: Wrong shipping fee in backend with multiple s…
p-bystritsky Mar 1, 2018
c2c8a75
Merge branch 'MAGETWO-83782' into 2.2-bugfixes-280218
Mar 1, 2018
a2411cd
Merge branch '2.2-develop' into 2.2-bugfixes-280218
Mar 1, 2018
6d01460
Merge branch '2.2-develop' into MAGETWO-84507
Mar 1, 2018
04e573a
#13231: [GitHub] Default State or Province is not pre-selected in the…
serhii-balko Mar 1, 2018
2ae77be
ENGCOM-632: Fix JS address converter function from mutating its argum…
magento-engcom-team Mar 1, 2018
c7e9c5c
ENGCOM-620: magento/magento2#12889: Wrong shipping fee in backend wit…
magento-engcom-team Mar 1, 2018
7ebdb91
ENGCOM-627: Fix typo in securityCheckers array #13897
Mar 1, 2018
a85068b
ENGCOM-586: magento/magento2#7765: Filter block on category is still …
Mar 1, 2018
975137b
Send order email for Braintree Paypal orders
Mar 1, 2018
a00c926
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 1, 2018
c8a7265
MQE-526: Do not depend on xml merging by filename-order
imeron2433 Mar 1, 2018
036be07
ENGCOM-657: magento/magento2#7515: Error when submit customer/account…
magento-engcom-team Mar 1, 2018
b2337c7
Merge branch '2.2' of github.com:magento/magento2ce into MAGETWO-85051
omiroshnichenko Mar 1, 2018
2dac850
Ensure valid data type is passed to backgroundColor
Mar 1, 2018
aec7af9
magento/magento2/#13898
Mar 1, 2018
14ad270
ENGCOM-643: Send order email for Braintree Paypal orders #13898
magento-engcom-team Mar 1, 2018
3a4329c
MAGETWO-85051: Merge release branch into 2.2-develop
omiroshnichenko Mar 1, 2018
f83c8c0
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 1, 2018
e63db8b
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
omiroshnichenko Mar 1, 2018
70a9991
MAGETWO-88278: Load CMS Page using repository in save action #13814
Mar 1, 2018
84982fe
MAGETWO-88251: Save CMS Block using repository #13796
Mar 1, 2018
3f3287f
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 1, 2018
3c413b0
magento/magento2/#13914
Mar 2, 2018
097cc45
ENGCOM-658: Pass Expected Data Type in backgroundColor Call #13914
magento-engcom-team Mar 2, 2018
fac3300
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 2, 2018
acb5488
MAGETWO-82069: Modify Report processor to return 500 #11513
Mar 2, 2018
981d589
ENGCOM-584: #13231: Default State or Province is not pre-selected in …
magento-engcom-team Mar 2, 2018
cb25aa4
Merge branch '2.2-develop' into MAGETWO-84507
Mar 2, 2018
9c3e47c
MAGETWO-85051: Merge release branch into 2.2-develop
omiroshnichenko Mar 2, 2018
9632b1c
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
omiroshnichenko Mar 2, 2018
346bb06
MAGETWO-87487: phpunit.xml files should be ignored by Magento/Test/In…
igrybkov Mar 2, 2018
b396cd0
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 2, 2018
fc521f7
ENGCOM-685: Changes static content deploy log levels verbosity #13709
magento-engcom-team Mar 2, 2018
70a0048
ENGCOM-658: Pass Expected Data Type in backgroundColor Call #13914
Mar 2, 2018
03369da
ENGCOM-689: Add missing implementation for applySortOrder() #13641
magento-engcom-team Mar 2, 2018
cb52f80
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 2, 2018
f3c0676
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 2, 2018
c6d128f
#13899 Solve Zipcode pattern for Canada
tadeobarranco Mar 2, 2018
7c5ddee
#13899 Improve unit test
tadeobarranco Mar 2, 2018
fa8b884
#13899 Improve unit test
tadeobarranco Mar 2, 2018
8fae90b
Fixing failures in the test file
tadeobarranco Mar 2, 2018
9a43f02
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 3, 2018
4343d86
ENGCOM-696: #13899 Solve Canada Zip Code pattern #13930
magento-engcom-team Mar 3, 2018
fd4ea3d
ENGCOM-689: Add missing implementation for applySortOrder() #13641
Mar 3, 2018
4cc0cc8
ENGCOM-632: Fix JS address converter function from mutating its argum…
Mar 3, 2018
b3bff32
ENGCOM-620: magento/magento2#12889: Wrong shipping fee in backend wit…
Mar 3, 2018
b17b9c9
Merge pull request #2157 from magento-engcom/2.2-develop-prs
Mar 3, 2018
ebf8674
Merge branch '2.2-develop' into MAGETWO-84507
Mar 3, 2018
555f703
Merge remote-tracking branch 'origin/MAGETWO-87963' into MPI-PR24
viktym Mar 3, 2018
327a9e1
Merge remote-tracking branch 'origin/MAGETWO-86306' into MPI-PR24
viktym Mar 3, 2018
59f37bf
Merge remote-tracking branch 'origin/MAGETWO-86940' into MPI-PR24
viktym Mar 3, 2018
7de5029
Merge remote-tracking branch 'origin/MAGETWO-80908' into MPI-PR24
viktym Mar 3, 2018
210860c
ENGCOM-697: Less clean up #13750
magento-engcom-team Mar 3, 2018
5b6df42
magento/magento2#12405: Impossible to create a new storeview
hostep Mar 4, 2018
7128407
MAGETWO-86940: Dedicated debug logging files for Payment and Shipping…
YevSent Mar 5, 2018
7893797
Merge remote-tracking branch 'origin/MAGETWO-86940' into MPI-PR24
viktym Mar 5, 2018
db80127
Merge branch '2.2-develop' into 2.2-bugfixes-280218
Mar 5, 2018
3d5f8dd
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 5, 2018
dfecd7f
Fix cache issue for currencies with no symbol
evgk Mar 5, 2018
ac3badd
Refactored the parameters passed in the 'ajax:addToCart' trigger when…
koenner01 Mar 5, 2018
c8dc954
ENGCOM-685: Changes static content deploy log levels verbosity #13709
Mar 5, 2018
5632952
ENGCOM-657: magento/magento2#7515: Error when submit customer/account…
Mar 5, 2018
360c7a9
ENGCOM-736: Use event object in 'ajax:addToCart' trigger when adding …
magento-engcom-team Mar 5, 2018
da4c835
ENGCOM-737: Solved this issue : Drop down values are not showing in c…
magento-engcom-team Mar 5, 2018
87e41af
Merge pull request #2145 from magento-qwerty/2.2-bugfixes-280218
dvoskoboinikov Mar 5, 2018
b049c5c
Merge branch '2.2-develop' into MAGETWO-84507
Mar 5, 2018
ff5b766
Merge remote-tracking branch 'origin/MAGETWO-87487' into PANDA-FIXES-2.2
RuslanKostiv1 Mar 5, 2018
dcd8bcb
Merge pull request #2151 from magento-thunder/MAGETWO-84507
Mar 5, 2018
b2129a9
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 5, 2018
198dbac
MAGETWO-85296: magento/magento2#7720: Product Repository saves attrib…
magento-engcom-team Mar 5, 2018
0f39eae
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 5, 2018
b8309a2
MAGETWO-81742: PHP Livecodetest testCodeStyle() method does not use w…
magento-engcom-team Mar 6, 2018
29dea48
ENGCOM-697: Less clean up #13750
Mar 6, 2018
4db746f
Setup Lists - Make allowedCurrencies property private
ihor-sviziev Mar 6, 2018
0933eeb
ENGCOM-750: Setup Lists - Make allowedCurrencies property private #13966
magento-engcom-team Mar 6, 2018
49aa1f9
MAGETWO-84921: Swagger does not render correctly for many POST/PUT op…
VladimirZaets Mar 6, 2018
02687b7
Merge remote-tracking branch 'mainline/2.2-develop' into 2.2.4-PR-part-1
VladimirZaets Mar 6, 2018
1f5c40f
MAGETWO-86332: Issues #10559 - Extend swatch using mixins (M2.2) #12929
magento-engcom-team Mar 6, 2018
25cc9ab
merge magento/2.2-develop into magento-plankton/MAGETWO-85051
Mar 6, 2018
90e5936
Merge remote-tracking branch 'mainline/2.2-develop' into PANDA-FIXES-2.2
RuslanKostiv1 Mar 6, 2018
13f9ad5
ENGCOM-750: Setup Lists - Make allowedCurrencies property private #13966
Mar 6, 2018
9d27268
ENGCOM-737: Solved this issue : Drop down values are not showing in c…
Mar 6, 2018
ce9fba4
ENGCOM-696: #13899 Solve Canada Zip Code pattern #13930
Mar 6, 2018
8441fbc
MAGETWO-86332: Issues #10559 - Extend swatch using mixins (M2.2) #12929
Mar 6, 2018
cc0f0e2
ENGCOM-765: magento/magento2#12405: Impossible to create a new storev…
magento-engcom-team Mar 6, 2018
0b1672f
MAGETWO-73479: Cart Rules are not excluding Bundle Products
VladimirZaets Mar 6, 2018
34c9b15
Merge branch '2.2-develop' into 2.2-develop-pangolin
imeron2433 Mar 6, 2018
7dedf8c
MAGETWO-84921: Swagger does not render correctly for many POST/PUT op…
VladimirZaets Mar 6, 2018
5d00300
MAGETWO-73479: Cart Rules are not excluding Bundle Products
VladimirZaets Mar 6, 2018
05253ef
MQE-827: Complete a Regression Test (from master)
imeron2433 Mar 6, 2018
a952969
Merge pull request #2153 from magento-plankton/MAGETWO-85051
Mar 6, 2018
4a75064
Merge remote-tracking branch 'magento2/2.2-develop' into MPI-PR24
viktym Mar 6, 2018
c5945e0
MAGETWO-80908: Upgrade outdated libraries w/composer (minor versions)…
viktym Mar 6, 2018
4e32965
Merge remote-tracking branch 'mainline/2.2-develop' into 2.2.4-PR-part-1
VladimirZaets Mar 6, 2018
dced646
MAGETWO-80908: Upgrade outdated libraries w/composer (minor versions)…
viktym Mar 6, 2018
4f52266
Merge remote-tracking branch 'mainline/2.2-develop' into PANDA-FIXES-2.2
RuslanKostiv1 Mar 6, 2018
3c31353
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 6, 2018
156b0f3
Backport of PR-10748 for Magento 2.2: Always use https for Vimeo vide…
hostep Sep 4, 2017
f2c44e6
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 7, 2018
b4cd9d1
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 7, 2018
8b583da
merge magento/2.2-develop into magento-mpi/MPI-PR24
Mar 7, 2018
36bfa58
Merge pull request #2161 from magento-mpi/MPI-PR24
viktym Mar 7, 2018
5316ce4
Merge remote-tracking branch 'mainline/2.2-develop' into PANDA-FIXES-2.2
le0n4eg Mar 7, 2018
a4cfa03
Merge remote-tracking branch 'mainline/2.2-develop' into 2.2.4-PR-part-1
VladimirZaets Mar 7, 2018
10c9417
MAGETWO-86332: Issues #10559 - Extend swatch using mixins (M2.2) #12929
Mar 7, 2018
9eb3c6f
Act better on existing input focus instead of removing it
krzksz Mar 7, 2018
393dc53
MAGETWO-85050: Prepare codebase for 2.2.4
omiroshnichenko Mar 7, 2018
e8742ff
ENGCOM-793: Invoice grid shows wrong subtotal for partial items invoi…
magento-engcom-team Mar 7, 2018
7ae6d9a
Merge branch '2.2-develop' of github.com:magento/magento2ce into 2.2-…
okolesnyk Mar 7, 2018
3e083e8
Merge pull request #2164 from magento-panda/PANDA-FIXES-2.2
igrybkov Mar 7, 2018
a7b0806
magento/magento2#13691
Mar 7, 2018
750dbf2
ENGCOM-797: Fix for Issue-13556 - Sorting in Product Listing via Quan…
magento-engcom-team Mar 7, 2018
ea9d6fa
MAGETWO-85296: magento/magento2#7720: Product Repository saves attrib…
Mar 7, 2018
5cd9c46
ENGCOM-736: Use event object in 'ajax:addToCart' trigger when adding …
Mar 7, 2018
6b061b7
ENGCOM-643: Send order email for Braintree Paypal orders #13898
Mar 7, 2018
40aaa21
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 7, 2018
4ac6aa5
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
omiroshnichenko Mar 7, 2018
505572b
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 7, 2018
fab4b82
ENGCOM-797: Fix for Issue-13556 - Sorting in Product Listing via Quan…
Mar 7, 2018
13ad7ee
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 7, 2018
05ac0d1
Merge pull request #2176 from magento-plankton/MAGETWO-85050
Mar 7, 2018
4614011
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-74154
mslabko Mar 8, 2018
ad8d942
merge magento/2.2-develop into magento-pangolin/2.2-develop-pangolin
Mar 8, 2018
e5b1b8e
Added alias to block 'product.info.description'
chedaroo Mar 8, 2018
8be7e1c
Use `^1.4` for `composer/composer`
sandermangel Mar 8, 2018
df79fc7
ENGCOM-809: Use \`^1.4\` for \`composer/composer\` #14013
magento-engcom-team Mar 8, 2018
a758fca
ENGCOM-765: magento/magento2#12405: Impossible to create a new storev…
Mar 8, 2018
4b45b5e
ENGCOM-624: Issues 13769. Fix wrong info about sent email in order se…
Mar 8, 2018
e9172d2
ENGCOM-810: Added alias to block 'product.info.description' #14011
magento-engcom-team Mar 8, 2018
143ca44
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 8, 2018
4ef208b
MAGETWO-86745: Performance: remove count() form the condition section…
magento-engcom-team Mar 9, 2018
2a99cb6
Merge remote-tracking branch 'mainline/2.2-develop' into 2.2.4-PR-part-1
VladimirZaets Mar 9, 2018
8266e03
magento/magento2#13024
Mar 9, 2018
69101ea
merge magento/2.2-develop into magento-pangolin/2.2-develop-pangolin
Mar 9, 2018
63107ab
ENGCOM-699: resolved default country selection issue while creating n…
magento-engcom-team Mar 9, 2018
4f6296c
magento/magento2#7372: Product images gets removed from "Images And V…
nmalevanec Mar 9, 2018
b07c437
MAGETWO-86745: Performance: remove count() form the condition section…
Mar 9, 2018
3d32d3e
ENGCOM-793: Invoice grid shows wrong subtotal for partial items invoi…
Mar 9, 2018
0aa93d0
[FIX] Remove not used variable in template
coderimus Mar 9, 2018
e026f35
ENGCOM-823: [FIX] Remove not used variable in template #14026
magento-engcom-team Mar 9, 2018
e0cd24e
ENGCOM-826: Fix cache issue for currencies with no symbol #13894
magento-engcom-team Mar 9, 2018
0de80d7
[FIX] small refacroting and removing not using variable from templates
coderimus Mar 9, 2018
4236a44
Fix $useCache for container child blocks
Mar 9, 2018
4108d74
[FIX] Remove not used and empty template
coderimus Mar 9, 2018
0f2f611
ENGCOM-828: [FIX] Remove not used and empty template #14030
magento-engcom-team Mar 9, 2018
32511de
ENGCOM-828: [FIX] Remove not used and empty template #14030
Mar 9, 2018
f47553c
ENGCOM-823: [FIX] Remove not used variable in template #14026
Mar 9, 2018
5562107
ENGCOM-810: Added alias to block 'product.info.description' #14011
Mar 9, 2018
711fd27
ENGCOM-809: Use `^1.4` for `composer/composer` #14013
Mar 9, 2018
9c538a1
Merge pull request #2174 from magento-pangolin/2.2-develop-pangolin
okolesnyk Mar 9, 2018
9ece610
Merge branch '2.2-develop' into ENGCOM-660-magento-engcom-magento2ce-…
nmalevanec Mar 9, 2018
36e7a41
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 9, 2018
f11f435
ENGCOM-837: [FIX] small refactoring and removing not using variable f…
magento-engcom-team Mar 9, 2018
ea8e221
ENGCOM-804: Backport of PR-10748 for Magento 2.2: Always use https fo…
magento-engcom-team Mar 9, 2018
f473572
rewrite issue-13385
shyamranpara Mar 9, 2018
3f053dd
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 9, 2018
fdaed50
ENGCOM-837: [FIX] small refactoring and removing not using variable f…
Mar 10, 2018
ccad75e
ENGCOM-804: Backport of PR-10748 for Magento 2.2: Always use https fo…
Mar 10, 2018
4597893
MAGETWO-81742: PHP Livecodetest testCodeStyle() method does not use w…
Mar 10, 2018
e621f57
Improve array output format by using 4 instead of 2 spaces and removi…
avstudnitz Mar 10, 2018
b59c096
Make scope parameters of methods to save/delete config optional
avstudnitz Mar 10, 2018
3ee6911
ENGCOM-839: SQL query is printed into browser in case of exception #1…
magento-engcom-team Mar 10, 2018
c9fb3d4
Unit test update for quoting base path in di compile command
simpleadm Mar 10, 2018
ca394fb
ENGCOM-842: [Backport 2.2] Add quoting for base path in DI compile co…
magento-engcom-team Mar 11, 2018
600749c
ENGCOM-843: Make scope parameters of methods to save/delete config op…
magento-engcom-team Mar 11, 2018
e314678
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 11, 2018
078f955
ENGCOM-845: [Backport 2.2] Solve problem saving empty swatches in adm…
magento-engcom-team Mar 11, 2018
e0c5af3
Merge remote-tracking branch 'mainline/2.2-develop' into 2.2.4-PR-part-1
VladimirZaets Mar 12, 2018
a7d4180
MAGETWO-89045: FATAL error on compiler generation on PHP 7.0.11
viktym Mar 12, 2018
45eb281
Merge remote-tracking branch 'mpi/MAGETWO-89045' into 2.2.4-PR-part-1
VladimirZaets Mar 12, 2018
c64c725
merge magento/2.2-develop into magento-performance/MAGETWO-74154
Mar 12, 2018
8a0c495
Typo is SSL port number
jasperzeinstra Mar 12, 2018
d36f27c
ENGCOM-869: Typo in SSL port number #14062
magento-engcom-team Mar 12, 2018
caabf08
MAGETWO-74154: Performance improvement on Catalog Fulltext indexer
mslabko Mar 12, 2018
f0d0053
ENGCOM-845: [Backport 2.2] Solve problem saving empty swatches in adm…
Mar 12, 2018
f374302
ENGCOM-842: [Backport 2.2] Add quoting for base path in DI compile co…
Mar 12, 2018
226ebee
ENGCOM-839: SQL query is printed into browser in case of exception #1…
Mar 12, 2018
2194a10
ENGCOM-660: 7372: Product images gets removed from "Images And Videos…
Mar 12, 2018
512fab8
ENGCOM-699: resolved default country selection issue while creating n…
Mar 13, 2018
f7ebf9d
Merge pull request #2185 from magento-tango/2.2.4-PR-part-1
VladimirZaets Mar 13, 2018
a98319f
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 13, 2018
da164a0
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 13, 2018
989e020
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-74154
mslabko Mar 13, 2018
54ebd25
Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGE…
Mar 13, 2018
e75c0ed
Fix product attribute ordering when more than 10 attributes.
RandeKnight Mar 13, 2018
8bb8788
ENGCOM-887: Fix $useCache for container child blocks #14029
magento-engcom-team Mar 13, 2018
bec5913
ENGCOM-889: Act better on existing input focus instead of removing it…
magento-engcom-team Mar 13, 2018
7685834
ENGCOM-843: Make scope parameters of methods to save/delete config op…
Mar 13, 2018
847f182
ENGCOM-699: resolved default country selection issue while creating n…
Mar 13, 2018
fb0baa5
MAGETWO-87570: "Hide from Product Page" option does not work for chil…
Mar 14, 2018
28a1b6a
Merge branch 'MAGETWO-77754' of github.com:magento-tango/magento2ce i…
Mar 14, 2018
f9689d5
Merge branch 'MAGETWO-87570' of github.com:magento-tango/magento2ce i…
Mar 14, 2018
9efa5e1
Merge pull request #2195 from magento-performance/MAGETWO-74154
duhon Mar 14, 2018
4412d53
ENGCOM-844: Improve array output format for etc.php and config.php #1…
magento-engcom-team Mar 14, 2018
2d94c94
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 14, 2018
41af6bb
Merge branch '2.2-develop' of github.com:magento/magento2ce into 2.2-…
Mar 14, 2018
0357fa6
magento/magento2#14083
Mar 14, 2018
3efc980
ENGCOM-888: Fix product attribute ordering when more than 10 attribut…
magento-engcom-team Mar 14, 2018
178fa2b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 14, 2018
2235f3e
magento/magento2#13820: IE11 minicart not updating on configurable pr…
Frodigo Mar 14, 2018
c6acadf
ENGCOM-912: magento/magento2#13820: IE11 minicart not updating on con…
magento-engcom-team Mar 14, 2018
9198f74
Merge branch '2.2-develop' of github.com:magento/magento2ce into 2.2-…
Mar 15, 2018
696f9dc
Add a CodeTriage badge to magento/magento2
ishakhsuvarov Mar 15, 2018
7faa348
ENGCOM-925: [2.2] Add a CodeTriage badge to magento/magento2 #1453
magento-engcom-team Mar 15, 2018
8cfffc1
Open link "Report an Issue" in a new tab
Mar 8, 2018
61334d9
ENGCOM-930: [Backport] Open link 'Report an Issue' in a new tab #14121
magento-engcom-team Mar 15, 2018
d5c2f8a
ENGCOM-618: #5463 - Use specified hashing algo in \Magento\Framework\…
magento-engcom-team Mar 15, 2018
75028b8
MAGETWO-86332: Issues #10559 - Extend swatch using mixins (M2.2) #12929
Mar 16, 2018
7a47ff7
ENGCOM-930: [Backport] Open link "Report an Issue" in a new tab #14121
Mar 16, 2018
58470a8
ENGCOM-925: [2.2] Add a CodeTriage badge to magento/magento2 #1453
Mar 16, 2018
5dd9faa
ENGCOM-912: magento/magento2#13820: IE11 minicart not updating on con…
Mar 16, 2018
905e531
ENGCOM-889: Act better on existing input focus instead of removing it…
Mar 16, 2018
a044f4f
ENGCOM-888: Fix product attribute ordering when more than 10 attribut…
Mar 16, 2018
55413d3
ENGCOM-887: Fix $useCache for container child blocks #14029
Mar 16, 2018
6a10a29
ENGCOM-869: Typo in SSL port number #14062
Mar 16, 2018
3f27b2f
ENGCOM-844: Improve array output format for etc.php and config.php #1…
Mar 16, 2018
943f09a
ENGCOM-826: Fix cache issue for currencies with no symbol #13894
Mar 16, 2018
0f80891
ENGCOM-618: #5463 - Use specified hashing algo in \Magento\Framework\…
Mar 16, 2018
d78f8d2
ENGCOM-584: #13231: Default State or Province is not pre-selected in …
Mar 16, 2018
cb0954a
Merge pull request #2219 from magento-tango/2.2-PR-part-3
igrybkov Mar 16, 2018
b1df309
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 16, 2018
975b90b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Mar 16, 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