Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5098 commits
Select commit Hold shift + click to select a range
b037445
MAGETWO-94432: [2.2] Can't hide product images via hide_from_product_…
OlgaVasyltsun Sep 18, 2018
88ddcaa
ENGCOM-3005: [Backport] Fixes from #15947 #18113
magento-engcom-team Sep 18, 2018
c1ac94d
ENGCOM-3006: Fix shipping discount failed to apply during place order…
magento-engcom-team Sep 18, 2018
8d1748f
ENGCOM-3008: Fix sitemap grid render incorrect base urls for multiple…
magento-engcom-team Sep 18, 2018
2aceac6
Merge branch '2.2-develop' into 2.2-develop-pr2
serhii-balko Sep 18, 2018
4e47281
Merge remote-tracking branch 'origin/2.2-develop-pr2' into 2.2-develo…
serhii-balko Sep 18, 2018
198a929
Changed intval($val) to (int) $val, since it is faster: - changed int…
TBlindaruk Sep 12, 2018
8ebd99a
typofix: ImportCollection -> ItemCollection
yaroslav-zenin Sep 13, 2018
f9c22ea
ENGCOM-3012: [Backport] typofix: ImportCollection -> ItemCollection #…
magento-engcom-team Sep 19, 2018
c2e57cf
MAGETWO-94890: Automate with MFTF Free Shipping is not available in A…
dimonovp Sep 19, 2018
9d8b003
MAGETWO-86686: Custom address attributes not stored when creating new…
svitja Sep 19, 2018
2bab161
MAGETWO-86686: Custom address attributes not stored when creating new…
svitja Sep 19, 2018
3a54946
Delete test product `simple3` before importing the CSV to avoid conta…
josephmcdermott Sep 19, 2018
2fb7183
Force reload of products during test to ensure they are not coming fr…
josephmcdermott Sep 19, 2018
2d0858b
MAGETWO-94890: Automate with MFTF Free Shipping is not available in A…
dimonovp Sep 19, 2018
3c6509f
MAGETWO-73447: Fatal Error Previewing Registry Update Email
DianaRusin Sep 19, 2018
54ed945
MAGETWO-93191: Magento 2.2.6 Publication
aakimov Sep 19, 2018
e51945a
Updated labels section in README.md
Sep 19, 2018
7cd57ab
ENGCOM-3017: [2.2] Update labels section in README.md #18137
magento-engcom-team Sep 19, 2018
fda664a
Updated testImportWithoutUrlKeys() to create new simple in CSV for th…
josephmcdermott Sep 19, 2018
abd95bd
Reverted previous changes which are no longer required
josephmcdermott Sep 19, 2018
0f26b52
Trying last test run with @magentoDbIsolation as now other (completel…
josephmcdermott Sep 19, 2018
9cf0d87
MAGETWO-81818: "Directory Data" and "Cart" sections are loaded twice …
svitja Sep 20, 2018
5cace23
MAGETWO-94890: Automate with MFTF Free Shipping is not available in A…
dimonovp Sep 20, 2018
1804146
Merge pull request #3185 from magento-plankton/2.2-develop-merged
Sep 20, 2018
1f08cd1
Refactored Implemented 17964: Backend Order creation Authorizenet: If…
passtet Sep 20, 2018
09ce6c9
Fixed issue with lib-line-height mixin failing when value of 'normal'…
Sep 20, 2018
e009427
MAGETWO-95059: Cannot create options/label for Customer address
StasKozar Sep 21, 2018
9337b44
MAGETWO-94432: [2.2] Can't hide product images via hide_from_product_…
OlgaVasyltsun Sep 21, 2018
0fb7ffe
Merge remote-tracking branch 'origin/MAGETWO-94890' into 2.2-develop-…
dimonovp Sep 21, 2018
99a8a0a
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-94432
OlgaVasyltsun Sep 21, 2018
6b61bec
MAGETWO-95101: URL Key column with accented characters not converted …
StasKozar Sep 21, 2018
4c1f467
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-95059
StasKozar Sep 21, 2018
1189e5f
MAGETWO-95059: Cannot create options/label for Customer address
StasKozar Sep 21, 2018
6044e51
Merge branch '2.2-develop' into replace-intval
Sep 21, 2018
0a4d625
Merge branch '2.2-develop' into 2.2-develop-pr2
serhii-balko Sep 21, 2018
7711460
ENGCOM-3020: Replace intval() function by using direct type casting t…
magento-engcom-team Sep 21, 2018
3476333
ENGCOM-3021: Allow usage of config-global.php when running Integratio…
magento-engcom-team Sep 21, 2018
ec1e3bb
MAGETWO-94842: Automate with MFTF Auto generated coupon code for Cart…
Sep 21, 2018
8e526f5
MAGETWO-95101: URL Key column with accented characters not converted …
StasKozar Sep 21, 2018
fd28eb0
ENGCOM-3025: Implemeted MAGETWO-81170: Missing $debugHintsPath when s…
magento-engcom-team Sep 21, 2018
ca7f8d3
Fixed unexpected T_IS_NOT_EQUAL
sreichel Sep 21, 2018
c9f02f1
Fixed line length
sreichel Sep 21, 2018
9241d80
Fixed spaces ...
sreichel Sep 21, 2018
a4a54b6
@SuppressWarnings(PHPMD.LongVariable)
sreichel Sep 22, 2018
664fe32
ENGCOM-3021: Allow usage of config-global.php when running Integratio…
Sep 22, 2018
7cd886f
ENGCOM-3017: [2.2] Update labels section in README.md #18137
Sep 22, 2018
8379a56
ENGCOM-3012: [Backport] typofix: ImportCollection -> ItemCollection #…
Sep 22, 2018
b29b712
ENGCOM-2977: Current password autocomplete for admin login #17783
Sep 22, 2018
006e785
ENGCOM-2963: [Backport] fix notice undefined shipment: revert locale …
Sep 22, 2018
bdbd087
ENGCOM-2958: [Backport] Use route ID when creating secret keys in bac…
Sep 22, 2018
3c7097d
ENGCOM-2944: [CatalogUrlRewrite] Covering the CategoryProcessUrlRewri…
Sep 22, 2018
1966805
ENGCOM-2943: Fixes saving product in single-store mode if website_id …
Sep 22, 2018
2ae2316
ENGCOM-2942: Fix module uninstall shell command and composer removal …
Sep 22, 2018
638370d
ENGCOM-2939: [remove] rich snippet declaration on grouped product #17919
Sep 22, 2018
7955f47
ENGCOM-2938: Menu does not work when you change from Mobile to Deskto…
Sep 22, 2018
64ba43f
ENGCOM-2937: Fix currency symbol setting back to default #17567 #17966
Sep 22, 2018
a848c0f
ENGCOM-2936: Integration test for swatches types in attribute configu…
Sep 22, 2018
1a1346a
ENGCOM-2930: Make sure all linked products (related, upsells, crossse…
Sep 22, 2018
84bf7f2
ENGCOM-2926: [2.2] return $this from setters in Analytics/ReportXml/D…
Sep 22, 2018
0905e15
ENGCOM-2912: #17890: show correct text swatch values per store view #…
Sep 22, 2018
4dce82a
ENGCOM-2842: Prevent rendering of "Ship here" button if it is not nee…
Sep 22, 2018
3317dbb
ENGCOM-3020: Replace intval() function by using direct type casting t…
Sep 22, 2018
0bc9753
magento-engcom/magento2ce#2198: Fixed test failures
Sep 22, 2018
ea1ace7
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Sep 22, 2018
48fe662
Merge branch '2.2-develop' into 2.2-develop-PR-port-18035
Sep 22, 2018
b4dcf35
ENGCOM-3013: [Backport] [2.2] Changed intval($val) to (int) $val, sin…
magento-engcom-team Sep 22, 2018
c3262d1
Merge branch '2.2-develop' into 2.2-develop-pr2
serhii-balko Sep 24, 2018
33c42ff
MAGETWO-94842: Automate with MFTF Auto generated coupon code for Cart…
Sep 24, 2018
4e62fe3
fix wysiwyg editor not decoding base64 filenames special chars
Sep 24, 2018
8fb6fe1
ENGCOM-3013: [Backport] [2.2] Changed intval($val) to (int) $val, sin…
Sep 24, 2018
7cf1156
ENGCOM-3008: Fix sitemap grid render incorrect base urls for multiple…
Sep 24, 2018
017d3c3
ENGCOM-3006: Fix shipping discount failed to apply during place order…
Sep 24, 2018
2dbcaef
ENGCOM-3005: [Backport] Fixes from #15947 #18113
Sep 24, 2018
40583b7
ENGCOM-3003: [Backport] Fix import grouped products #12853 #18097
Sep 24, 2018
7d39569
ENGCOM-3001: fix #17582 ./bin/magento config:show fails with a fatal …
Sep 24, 2018
3f80589
ENGCOM-3000: Update shipment collection to unserialize `packages` att…
Sep 24, 2018
190c23e
ENGCOM-2995: fix: reset search mini-form when we have no data / an em…
Sep 24, 2018
d0492db
ENGCOM-2723: Correctly convert config integration api resources #14065
Sep 24, 2018
1a940bd
MAGETWO-88254: [Magento Cloud] "Tier Pricing" of Products changes to …
zakdma Sep 24, 2018
be85a8e
Merge remote-tracking branch 'origin/MAGETWO-90812' into 2.2-develop-…
zakdma Sep 24, 2018
3f250d1
Merge remote-tracking branch 'origin/MAGETWO-90976' into 2.2-develop-…
zakdma Sep 24, 2018
1fe9d11
Merge remote-tracking branch 'origin/MAGETWO-73894' into 2.2-develop-…
zakdma Sep 24, 2018
053fee8
Merge remote-tracking branch 'origin/MAGETWO-86097' into 2.2-develop-…
zakdma Sep 24, 2018
d2003e5
Merge remote-tracking branch 'origin/MAGETWO-87971' into 2.2-develop-…
zakdma Sep 24, 2018
c7880f8
Module Catalog: fix issue with custom option price conversion for dif…
Sep 24, 2018
81e9c52
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr46
zakdma Sep 24, 2018
4e553d4
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73883
zakdma Sep 24, 2018
ba45518
Merge remote-tracking branch 'origin/MAGETWO-73883' into 2.2-develop-…
zakdma Sep 24, 2018
831313f
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-94842
Sep 24, 2018
d452494
Merge remote-tracking branch 'origin/MAGETWO-94842' into 2.2-develop-…
Sep 24, 2018
5603cb1
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-88254
zakdma Sep 24, 2018
8eebafc
Merge pull request #3182 from magento-tsg-csl3/2.2-develop-pr2
viktym Sep 24, 2018
f32ad21
MAGETWO-93673: Cannot change attribute set
Sep 24, 2018
b9c495d
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Sep 24, 2018
5e7bc50
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Sep 24, 2018
8f9e270
ENGCOM-3038: Module Catalog: fix issue with custom option price conve…
magento-engcom-team Sep 24, 2018
aaa5528
Merge branch '2.2-develop' into issue/9830
Sep 25, 2018
8a91f16
ENGCOM-2940: 9830 - Null order in Magento\Sales\Block\Order\PrintShip…
magento-engcom-team Sep 25, 2018
bbe951c
ENGCOM-2981: magento/magento2#18009: Cannot create a numeric value at…
Sep 25, 2018
d6bb4b1
ENGCOM-2940: 9830 - Null order in Magento\Sales\Block\Order\PrintShip…
Sep 25, 2018
b4ae632
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-88254
zakdma Sep 25, 2018
c2790da
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-mf…
zakdma Sep 25, 2018
4f06ea5
Merge remote-tracking branch 'mainline/2.2-develop' into sreichel-cle…
Sep 25, 2018
dfa71c5
ENGCOM-3023: Use cast types instead of xyzval() #17511
magento-engcom-team Sep 25, 2018
461f6de
ENGCOM-3023: Use cast types instead of xyzval() #17511
Sep 25, 2018
451202c
ENGCOM-2981: magento/magento2#18009: Cannot create a numeric value at…
Sep 25, 2018
06d19b9
Removed unused var
Sep 25, 2018
1118adc
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
Sep 25, 2018
1d08737
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr46
zakdma Sep 25, 2018
f5e9eec
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-mf…
zakdma Sep 25, 2018
f31f70d
Merge remote-tracking branch 'origin/MAGETWO-95101' into 2.2-develop-…
zakdma Sep 25, 2018
2165937
Merge remote-tracking branch 'origin/MAGETWO-81818' into 2.2-develop-…
zakdma Sep 25, 2018
fd5966d
Merge remote-tracking branch 'origin/MAGETWO-91283' into 2.2-develop-…
zakdma Sep 25, 2018
5d3c733
Merge remote-tracking branch 'origin/MAGETWO-94432' into 2.2-develop-…
zakdma Sep 25, 2018
4a4fe88
Merge remote-tracking branch 'origin/MAGETWO-73039' into 2.2-develop-…
zakdma Sep 25, 2018
cf850d6
Merge remote-tracking branch 'origin/MAGETWO-73447' into 2.2-develop-…
zakdma Sep 25, 2018
ff4ea94
ENGCOM-3038: Module Catalog: fix issue with custom option price conve…
Sep 25, 2018
6924402
ENGCOM-3025: Implemeted MAGETWO-81170: Missing $debugHintsPath when s…
Sep 25, 2018
6a014a5
Merge pull request #3213 from magento-tsg/2.2-develop-pr46
Sep 25, 2018
dfd1ff1
MAGETWO-88254: [Magento Cloud] "Tier Pricing" of Products changes to …
zakdma Sep 25, 2018
51364b9
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-88254
zakdma Sep 25, 2018
5127a2f
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-94842
zakdma Sep 25, 2018
8b2fd29
MAGETWO-94842: Automate with MFTF Auto generated coupon code for Cart…
zakdma Sep 25, 2018
670b84a
Merge remote-tracking branch 'origin/MAGETWO-94842' into 2.2-develop-…
zakdma Sep 25, 2018
2db1477
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-95059
StasKozar Sep 26, 2018
06ccaaf
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Sep 26, 2018
48725d3
Merge branch 'MAGETWO-93673' into 2.2-develop-pr3
Sep 26, 2018
c40034f
MAGETWO-88254: [Magento Cloud] "Tier Pricing" of Products changes to …
zakdma Sep 26, 2018
06d604e
Merge branch 'MAGETWO-94019' into 2.2-develop-pr3
yelahin-serhiy Sep 26, 2018
36d4152
ENGCOM-3044: Fixed issue with lib-line-height mixin failing when valu…
magento-engcom-team Sep 26, 2018
00fd5ba
Merge pull request #3214 from magento-tsg/2.2-develop-mftf-pr7
Sep 26, 2018
111681d
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Sep 26, 2018
c253334
MAGETWO-94462: Configurable product thumbnail images slow to generate…
yelahin-serhiy Sep 26, 2018
f721e2f
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr47
zakdma Sep 26, 2018
a7dfddb
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr3
serhii-balko Sep 26, 2018
e48d0c8
MAGETWO-88254: [Magento Cloud] "Tier Pricing" of Products changes to …
zakdma Sep 26, 2018
79a33cc
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-88254
zakdma Sep 26, 2018
94bbdd9
MAGETWO-88254: [Magento Cloud] "Tier Pricing" of Products changes to …
zakdma Sep 26, 2018
37f5661
Merge pull request #3218 from magento-tsg/2.2-develop-pr47
Sep 26, 2018
8809faf
Merge branch '2.2-develop' into 2.2-develop-pr3
serhii-balko Sep 26, 2018
484bbba
Change sort order for customer group options #18101
dmytro-ch Sep 18, 2018
dd9b294
Minor code style fixes
rogyar Sep 19, 2018
495cd17
ENGCOM-3052: [Backport] Change sort order for customer group options …
magento-engcom-team Sep 27, 2018
bf2efff
Fixed code style issue
Sep 27, 2018
7528fc0
ENGCOM-3054: fix wysiwyg editor not decoding base64 filenames special…
magento-engcom-team Sep 27, 2018
4557bfe
Merge pull request #3219 from magento-tsg-csl3/2.2-develop-pr3
viktym Sep 27, 2018
45f22ac
Fix for removing the dirs while creating a TAR archive
haroldclaus Sep 27, 2018
4bb191f
MAGETWO-91105: Table Rates not working for Armed Forces states in Eur…
svitja Sep 27, 2018
78d865a
ENGCOM-3047: Cast products 'getStoreId()' to int, closes #18079 #18086
magento-engcom-team Sep 27, 2018
2ac8203
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73526
zakdma Sep 27, 2018
82d03d9
ENGCOM-3054: fix wysiwyg editor not decoding base64 filenames special…
Sep 27, 2018
44d060d
ENGCOM-3052: [Backport] Change sort order for customer group options …
Sep 27, 2018
4b0eefa
ENGCOM-3047: Cast products "getStoreId()" to int, closes #18079 #18086
Sep 27, 2018
89e5c60
ENGCOM-2988: [Fix] Do not modify current list of countries with requi…
Sep 27, 2018
0e9d2e6
MAGETWO-94154: Files and folders symlinked in pub/media cannot be del…
yelahin-serhiy Sep 28, 2018
d70f1ff
MAGETWO-94384: Apply profile changes
vgoncharenko Sep 5, 2018
c8e9ac7
MAGETWO-86303: Updated url keys of product after import produce 404 e…
svitja Sep 28, 2018
4bd61f9
MAGETWO-91105: Table Rates not working for Armed Forces states in Eur…
svitja Sep 28, 2018
cbdeeb3
MAGETWO-89296: Menu in mobile view cannot be closed
OlgaVasyltsun Sep 28, 2018
6ff60c1
MAGETWO-91105: Table Rates not working for Armed Forces states in Eur…
svitja Sep 28, 2018
427ffed
MAGETWO-94295: United States 'state' field in admin orders is not a d…
Sep 28, 2018
77bc93f
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Sep 28, 2018
7dab529
MAGETWO-94384: Apply profile changes
vgoncharenko Sep 28, 2018
fac354a
MAGETWO-86303: Updated url keys of product after import produce 404 e…
svitja Sep 28, 2018
de04745
Merge branch 'MAGETWO-94181' into mpi-PR-2809
Sep 28, 2018
6b37384
MAGETWO-95075: Fix cache hit ratio on measurements
duhon Sep 28, 2018
f12bff2
Merge remote-tracking branches 'helix/MAGETWO-95075' and 'helix/MAGET…
duhon Sep 28, 2018
91a37a8
Merge pull request #3229 from magento-helix/pr_helix_2.2
duhon Sep 28, 2018
231f097
Sales: add missing unit tests for model classes
dmytro-ch Sep 16, 2018
82c4698
Added integration tests for gift message quote merge
rogyar Sep 13, 2018
c65b5a4
Fix excessively long variable names
dmytro-ch Sep 29, 2018
828e742
Minor code style fix
rogyar Sep 29, 2018
4905eaf
ENGCOM-3065: [Backport] Sales: add missing unit tests for model class…
magento-engcom-team Sep 29, 2018
0a624f3
ENGCOM-3066: [Backport] Added integration test for gift message quote…
magento-engcom-team Sep 29, 2018
e1d2673
Fix static tests
ihor-sviziev Oct 1, 2018
02f3ae8
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73526
svitja Oct 1, 2018
c369d8b
Merge branch '2.2-develop' of github.com:magento/magento2ce into mpi-…
Oct 1, 2018
a7dcd7b
Merge pull request #3234 from magento-mpi/mpi-PR-2809
viktym Oct 1, 2018
f7f3255
MAGETWO-91105: Table Rates not working for Armed Forces states in Eur…
svitja Oct 1, 2018
01af2b2
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-89296
OlgaVasyltsun Oct 2, 2018
be65bab
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91105
svitja Oct 2, 2018
df189a0
MAGETWO-73332: Update Catalog Rule Test
svitja Oct 2, 2018
c55480e
MAGETWO-93818: Magnifier function does not disappear after mouse-off …
rostyslav-hymon Oct 2, 2018
c2df0ad
MAGETWO-91105: Table Rates not working for Armed Forces states in Eur…
svitja Oct 2, 2018
e8dbe33
MAGETWO-93262: Cart is not empty after removing the product
Oct 2, 2018
d73e7c2
ENGCOM-3066: [Backport] Added integration test for gift message quote…
Oct 2, 2018
66a25dd
ENGCOM-3065: [Backport] Sales: add missing unit tests for model class…
Oct 2, 2018
b562288
ENGCOM-3044: Fixed issue with lib-line-height mixin failing when valu…
Oct 2, 2018
02d1e1b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Oct 2, 2018
49f6549
Fixed codestyle
slavvka Oct 2, 2018
b1670ce
ENGCOM-3079: add error message in else condition #17982
magento-engcom-team Oct 2, 2018
fd89b79
Merge remote-tracking branch 'origin/MAGETWO-94462' into 2.2-develop-pr4
yelahin-serhiy Oct 3, 2018
d77a325
Merge remote-tracking branch 'origin/MAGETWO-94154' into 2.2-develop-pr4
yelahin-serhiy Oct 3, 2018
2c9eebd
Merge branch 'MAGETWO-93818' into 2.2-develop-pr4
rostyslav-hymon Oct 3, 2018
e7a68d0
Merge branch 'MAGETWO-93262' into 2.2-develop-pr4
Oct 3, 2018
953dc16
Merge branch 'MAGETWO-94295' into 2.2-develop-pr4
Oct 3, 2018
e6dc188
Fix for parsing attribute options labels, when & used.
Oct 3, 2018
e91010a
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91105
svitja Oct 3, 2018
7cd4ec6
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73332
svitja Oct 3, 2018
f9d1f9a
ENGCOM-3081: Fix for parsing attribute options labels, when & used. #…
magento-engcom-team Oct 3, 2018
862441b
ENGCOM-3079: add error message in else condition #17982
Oct 3, 2018
b476af5
ENGCOM-2832: ConfigurableProduct show prices in select options #17695
Oct 3, 2018
8a5479b
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73332
ameysar Oct 3, 2018
41aeb20
Merge pull request #3243 from magento-tsg-csl3/2.2-develop-pr4
viktym Oct 3, 2018
8e7b04e
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Oct 3, 2018
8ae91cf
ENGCOM-3081: Fix for parsing attribute options labels, when & used. #…
Oct 3, 2018
3489e1b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Oct 3, 2018
501769f
ENGCOM-2916: Do not overwrite URL Key with blank value #17882
magento-engcom-team Oct 3, 2018
fa2d4bd
ENGCOM-3087: [Backport] Fix for removing the dirs while creating a TA…
magento-engcom-team Oct 4, 2018
74bed69
Fix throwing error by checkout error processor model
ihor-sviziev Oct 1, 2018
a552219
ENGCOM-3088: [Backport] Fix throwing error by checkout error processo…
magento-engcom-team Oct 4, 2018
8f26b2e
MAGETWO-73332: Update Catalog Rule Test
svitja Oct 4, 2018
ecfbb18
Merge remote-tracking branch 'origin/MAGETWO-73332' into MAGETWO-73332
svitja Oct 4, 2018
62e89c7
Merge remote-tracking branch 'origin/MAGETWO-73526' into 2.2-develop-…
ameysar Oct 4, 2018
c4a0862
Merge remote-tracking branch 'origin/MAGETWO-86686' into 2.2-develop-…
ameysar Oct 4, 2018
7afa9b0
Merge remote-tracking branch 'origin/MAGETWO-94179' into 2.2-develop-…
ameysar Oct 4, 2018
69b5b6f
Merge remote-tracking branch 'origin/MAGETWO-89986' into 2.2-develop-…
ameysar Oct 4, 2018
0d1551e
Merge remote-tracking branch 'origin/MAGETWO-94262' into 2.2-develop-…
ameysar Oct 4, 2018
0189014
Backport 2.2 - Fix wrong reference in google analytics module layout xml
sambolek Oct 4, 2018
c7079ec
ENGCOM-3091: Backport 2.2 - Fix wrong reference in google analytics m…
magento-engcom-team Oct 4, 2018
e803e6a
Refactor Mass Order Cancel code to use Interface
AnshuMishra17 Apr 11, 2018
21dfeae
ENGCOM-1266: Refactor Mass Order Cancel code to use Interface #14630
magento-engcom-team Apr 12, 2018
0ecf1fa
Remove duplicate
Oct 4, 2018
edea5c5
Fixed code style issue
Oct 4, 2018
d9a9b3d
ENGCOM-3093: Implemented 17964: Backend Order creation Authorizenet: …
magento-engcom-team Oct 4, 2018
2569a0b
Removed double call of orderManagement service
Oct 4, 2018
55fc039
ENGCOM-3094: [Backport 2.2-develop] Refactor Mass Order Cancel code t…
magento-engcom-team Oct 4, 2018
6ca6064
Fix Failed MassCancelTest
Oct 4, 2018
abab680
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-88254
ameysar Oct 4, 2018
81be9e7
ENGCOM-3091: Backport 2.2 - Fix wrong reference in google analytics m…
Oct 4, 2018
1f2d515
ENGCOM-3088: [Backport] Fix throwing error by checkout error processo…
Oct 4, 2018
d59eb89
ENGCOM-3087: [Backport] Fix for removing the dirs while creating a TA…
Oct 4, 2018
8ad436c
ENGCOM-3094: [Backport 2.2-develop] Refactor Mass Order Cancel code t…
Oct 4, 2018
f0a4ca9
ENGCOM-3093: Implemented 17964: Backend Order creation Authorizenet: …
Oct 4, 2018
a37b931
ENGCOM-2916: Do not overwrite URL Key with blank value #17882
Oct 4, 2018
98ee213
Merge pull request #3254 from magento-tsg/2.2-develop-pr48
Oct 4, 2018
c53d9a5
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Oct 4, 2018
c34ced3
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Oct 4, 2018
a99ade5
Merge remote-tracking branch 'origin/MAGETWO-73332' into 2.2-develop-…
ameysar Oct 5, 2018
e695543
Merge remote-tracking branch 'origin/MAGETWO-86303' into 2.2-develop-…
ameysar Oct 5, 2018
43cf828
Merge remote-tracking branch 'origin/MAGETWO-88254' into 2.2-develop-…
ameysar Oct 5, 2018
e746f7e
Merge remote-tracking branch 'origin/MAGETWO-95059' into 2.2-develop-…
ameysar Oct 5, 2018
dde109d
Merge remote-tracking branch 'origin/MAGETWO-89296' into 2.2-develop-…
ameysar Oct 5, 2018
6f0e5aa
Merge remote-tracking branch 'origin/MAGETWO-91105' into 2.2-develop-…
ameysar Oct 5, 2018
43c32d9
MAGETWO-88254: [Magento Cloud] "Tier Pricing" of Products changes to …
ameysar Oct 5, 2018
4c1e0a4
Merge remote-tracking branch 'origin/MAGETWO-88254' into 2.2-develop-…
ameysar Oct 5, 2018
11f66c4
Merge pull request #3259 from magento-tsg/2.2-develop-pr49
Oct 5, 2018
2c104db
type casted $qty to float in \Magento\Catalog\Model\Product::setQty()
jayankaghosh Sep 20, 2018
29cefcf
type casted $qty to float in \Magento\Catalog\Model\Product::getQty()
jayankaghosh Sep 20, 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.
28 changes: 14 additions & 14 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
# Contributing to Magento 2 code

Contributions to the Magento 2 codebase are done using the fork & pull model.
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes (hence the phrase “pull request”).
This contribution model has contributors maintaining their own copy of the forked codebase (which can easily be synced with the main copy). The forked repository is then used to submit a request to the base repository to “pull” a set of changes. For more information on pull requests please refer to [GitHub Help](https://help.github.com/articles/about-pull-requests/).

Contributions can take the form of new components/features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations or just good suggestions.
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes or optimizations.

The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor for two weeks, the issue is closed.
The Magento 2 development team will review all issues and contributions submitted by the community of developers in the first in, first out order. During the review we might require clarifications from the contributor. If there is no response from the contributor within two weeks, the pull request will be closed.


## Contribution requirements

1. Contributions must adhere to [Magento coding standards](http://devdocs.magento.com/guides/v2.0/coding-standards/bk-coding-standards.html).
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request to be merged quickly and without additional clarification requests.
3. Commits must be accompanied by meaningful commit messages.
4. PRs which include bug fixing, must be accompanied with step-by-step description of how to reproduce the bug.
1. Contributions must adhere to the [Magento coding standards](https://devdocs.magento.com/guides/v2.2/coding-standards/bk-coding-standards.html).
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.2-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
3. PRs which include new logic or new features must be submitted along with:
* Unit/integration test coverage (we will be releasing more information on writing test coverage in the near future).
* Proposed [documentation](http://devdocs.magento.com) update. Documentation contributions can be submitted [here](https://github.com/magento/devdocs).
4. For large features or changes, please [open an issue](https://github.com/magento/magento2/issues) and discuss first. This may prevent duplicate or unnecessary effort, and it may gain you some additional contributors.
5. All automated tests are passed successfully (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
* Unit/integration test coverage
* Proposed [documentation](http://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).

## Contribution process

If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). By doing that, you will be able to collaborate with the Magento 2 development team, fork the Magento 2 project and be able to easily send pull requests.
If you are a new GitHub user, we recommend that you create your own [free github account](https://github.com/signup/free). This will allow you to collaborate with the Magento 2 development team, fork the Magento 2 project and send pull requests.

1. Search current [listed issues](https://github.com/magento/magento2/issues) (open or closed) for similar proposals of intended contribution before starting work on a new contribution.
2. Review the [Contributor License Agreement](https://magento.com/legaldocuments/mca) if this is your first time contributing.
3. Create and test your work.
4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
4. Fork the Magento 2 repository according to the [Fork A Repository instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow the [Create A Pull Request instructions](http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#pull_request).
5. Once your contribution is received the Magento 2 development team will review the contribution and collaborate with you as needed.

## Code of Conduct

Expand Down
29 changes: 20 additions & 9 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
<!--- Provide a general summary of the issue in the Title above -->
<!--- Before adding new issues, please, check this article https://github.com/magento/magento2/wiki/Issue-reporting-guidelines-->
<!---
Thank you for contributing to Magento.
To help us process this issue we recommend that you add the following information:
- Summary of the issue,
- Information on your environment,
- Steps to reproduce,
- Expected and actual results,

Please also have a look at our guidelines article before adding a new issue https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### Preconditions
<!--- Provide a more detailed information of environment you use -->
<!--- Magento version, tag, HEAD, etc., PHP & MySQL version, etc.. -->
<!---
Please provide as detailed information about your environment as possible.
For example Magento version, tag, HEAD, PHP & MySQL version, etc..
-->
1.
2.

### Steps to reproduce
<!--- Provide a set of unambiguous steps to reproduce this bug include code, if relevant -->
<!---
It is important to provide a set of clear steps to reproduce this bug.
If relevant please include code samples
-->
1.
2.
3.

### Expected result
<!--- Tell us what should happen -->
1.
1. [Screenshots, logs or description]

### Actual result
<!--- Tell us what happens instead -->
1. [Screenshot, logs]

<!--- (This may be platform independent comment) -->
1. [Screenshots, logs or description]
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Bug report
about: Technical issue with the Magento 2 core components

---

<!---
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### Preconditions
<!---
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
-->
1.
2.

### Steps to reproduce
<!---
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
-->
1.
2.

### Expected result
<!--- Tell us what do you expect to happen. -->
1. [Screenshots, logs or description]
2.

### Actual result
<!--- Tell us what happened instead. Include error messages and issues. -->
1. [Screenshots, logs or description]
2.
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/developer-experience-issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: Developer experience issue
about: Issues related to customization, extensibility, modularity

---

<!---
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
-->

### Summary
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->

### Examples
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->

### Proposed solution
<!--- Suggest your potential solutions for this issue. -->
21 changes: 21 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: Feature request
about: Please consider reporting directly to https://github.com/magento/community-features

---

<!---
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
-->

### Description
<!--- Describe the feature you would like to add. -->

### Expected behavior
<!--- What is the expected behavior of this feature? How is it going to work? -->

### Benefits
<!--- How do you think this feature would improve Magento? -->

### Additional information
<!--- What other information can you provide about the desired feature? -->
25 changes: 21 additions & 4 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,32 @@
<!--- Provide a general summary of the Pull Request in the Title above -->
<!---
Thank you for contributing to Magento.
To help us process this pull request we recommend that you add the following information:
- Summary of the pull request,
- Issue(s) related to the changes made,
- Manual testing scenarios,
-->

<!--- Please provide a general summary of the Pull Request in the Title above -->

### Description
<!--- Provide a description of the changes proposed in the pull request -->
<!---
Please provide a description of the changes proposed in the pull request.
Letting us know what has changed and why it needed changing will help us validate this pull request.
-->

### Fixed Issues (if relevant)
<!--- Provide a list of fixed issues in the format magento/magento2#<issue_number>, if relevant -->
<!---
If relevant, please provide a list of fixed issues in the format magento/magento2#<issue_number>.
There could be 1 or more issues linked here and it will help us find some more information about the reasoning behind this change.
-->
1. magento/magento2#<issue_number>: Issue title
2. ...

### Manual testing scenarios
<!--- Provide a set of unambiguous steps to test the proposed code change -->
<!---
Please provide a set of unambiguous steps to test the proposed code change.
Giving us manual testing scenarios will help with the processing and validation process.
-->
1. ...
2. ...

Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,13 @@ language: php
php:
- 7.0
- 7.1
git:
depth: 5
env:
global:
- COMPOSER_BIN_DIR=~/bin
- INTEGRATION_SETS=3
- NODE_JS_VERSION=6
- NODE_JS_VERSION=8
- MAGENTO_HOST_NAME="magento2.travis"
matrix:
- TEST_SUITE=unit
Expand Down
Loading