Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Update 2.2 develop #3

Merged
merged 1,244 commits into from
Dec 8, 2018
Merged
Changes from 155 commits
Commits
Show all changes
1244 commits
Select commit Hold shift + click to select a range
7415cdd
Covering the CheckUserLoginBackendObserver by Unit Test
eduard13 Nov 15, 2018
ea434c7
Merge branch 'MAGETWO-73061' into 2.2-develop-pr10
Nov 15, 2018
0cae940
Merge remote-tracking branch 'origin/MAGETWO-88810' into 2.2-develop-…
StasKozar Nov 15, 2018
2c6d6af
Merge branch 'MAGETWO-94235' into mpi-fix-94235
Nov 15, 2018
6124b77
MAGETWO-96373: CHANGELOG.md for 2.2.7 Release
xmav Nov 15, 2018
011f0fd
Merge branch 'MAGETWO-96288' of https://github.com/magento-tango/mage…
droed89 Nov 15, 2018
f56c993
Merge branch 'MAGETWO-96027' of https://github.com/magento-tango/mage…
droed89 Nov 15, 2018
cd5ad1c
Merge pull request #3453 from magento-plankton/2.2.7-develop
Nov 15, 2018
aa4abec
#18956 Fixes for set root_category_id
Oct 30, 2018
acefdb3
CodeReviewChange
Nov 2, 2018
5866a39
#18956 Fix for phpunit-test case
Nov 4, 2018
fee2712
#18956 Add TestCase for no root_category_id set
Nov 7, 2018
7be21e2
ENGCOM-3408: #18956 Fixes for set root_category_id #18958
slavvka Nov 8, 2018
ebe4af7
Allow to read HTTP/2 response header.
vovayatsyuk Nov 10, 2018
64718ce
Add missing unit test for WishlistSettings plugin
dmytro-ch Oct 28, 2018
645f4f3
ENGCOM-3478: [Backport] Add missing unit test for WishlistSettings pl…
magento-engcom-team Nov 16, 2018
46c088c
ENGCOM-3479: [Backport] Allow to read HTTP/2 response header. #19239
magento-engcom-team Nov 16, 2018
f417c40
ENGCOM-3467: [Backport] Covering the CheckUserLoginBackendObserver by…
magento-engcom-team Nov 16, 2018
c503b97
ENGCOM-3468: [Backport] Covering the \Magento\Weee observers by Unit …
magento-engcom-team Nov 16, 2018
bc904a2
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73140
viktorpetryk Nov 16, 2018
c9d1923
Merge remote-tracking branch 'origin/MAGETWO-73140' into 2.2-develop-…
viktorpetryk Nov 16, 2018
6ab0dee
MAGETWO-73922: Import doesn't allow to set default value per store vi…
viktorpetryk Nov 16, 2018
cb868c4
Merge remote-tracking branch 'origin/MAGETWO-87985' into 2.2-develop-…
StasKozar Nov 16, 2018
5eb8a99
Merge remote-tracking branch 'origin/MAGETWO-96074' into 2.2-develop-…
zakdma Nov 16, 2018
32e14db
MAGETWO-95168: Magento 2.2.7 Publication
magento-team Nov 16, 2018
104c56c
MAGETWO-90381: Bundle product price doubled when switching currency
StasKozar Nov 16, 2018
f1b25b9
ENGCOM-3480: [Forwardport] #18956 Fixes for set root_category_id #19237
magento-engcom-team Nov 16, 2018
e544c95
Merge remote-tracking branch 'origin/MAGETWO-86120' into 2.2-develop-…
zakdma Nov 16, 2018
da0b4f1
Merge pull request #3452 from magento-mpi/mpi-fix-94235
viktym Nov 16, 2018
3b6c90b
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
dhorytskyi Nov 16, 2018
4b8bafd
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr58
zakdma Nov 16, 2018
06bb53d
merge magento/2.2-develop into magento-tsg-csl3/2.2-develop-pr10
magento-cicd2 Nov 16, 2018
7775f7d
Merge pull request #3455 from magento-tango/PR_15_11_2018
dhorytskyi Nov 16, 2018
0b16224
ENGCOM-3412: [2.2 backport] fix cipherMethod detection for openssl 1.…
slavvka Nov 16, 2018
064d879
ENGCOM-2911: Fixed child items showing on My Account order view #17889
slavvka Nov 16, 2018
d14510f
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
slavvka Nov 16, 2018
aa379ea
issue #19205 fixed
mahesh-rajawat Nov 18, 2018
1a321d2
removed unused variable
mahesh-rajawat Nov 18, 2018
6a7ae23
ENGCOM-3488: Issue #19205 Fixed: Bundle Product Option with input typ…
magento-engcom-team Nov 18, 2018
923b8bd
MAGETWO-90381: Bundle product price doubled when switching currency
StasKozar Nov 19, 2018
4c761a5
Merge branch '2.2-develop' into 2.2-develop-pr10
serhii-balko Nov 19, 2018
e8802d9
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-90381
StasKozar Nov 19, 2018
4df596b
Fix Notice and Exception while adding image to product programmatically
progreg Nov 19, 2018
d3dcc9d
Merge pull request #3458 from magento-tsg-csl3/2.2-develop-pr10
viktym Nov 19, 2018
cb8b166
ENGCOM-3494: 18615 updates structure for last_trans_id to be varchar …
magento-engcom-team Nov 19, 2018
6b201b2
MAGETWO-85683: Apostrophe displays as code in the text field box
SeruyV Nov 19, 2018
fedacf9
Remove void return declaration
progreg Nov 19, 2018
8e0b88e
MAGETWO-90056: Tooltip Position on Mobile out of view range
zakdma Nov 19, 2018
f0cec99
MAGETWO-90381: Bundle product price doubled when switching currency
StasKozar Nov 20, 2018
7b94f8c
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-90381
StasKozar Nov 20, 2018
b469496
MAGETWO-90381: Bundle product price doubled when switching currency
StasKozar Nov 20, 2018
4ef6d0b
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr58
zakdma Nov 20, 2018
e38a00d
MAGETWO-90381: Bundle product price doubled when switching currency
StasKozar Nov 20, 2018
ed4a8da
MAGETWO-83474: Frontend base url https results in admin too many redi…
zakdma Nov 20, 2018
b1e26d5
Merge pull request #3469 from magento-tsg/2.2-develop-pr58
xmav Nov 20, 2018
975e5da
MAGETWO-95898: Cannot update qty in mini shopping cart if enable deci…
viktym Nov 20, 2018
5e385b4
ENGCOM-3308: Fix the issue with missing asterisk for admin required f…
magento-engcom-team Nov 20, 2018
3861279
MAGETWO-91932: Zip code is not validated during checkout when "My bil…
yelahin-serhiy Nov 21, 2018
1219f0a
MAGETWO-96289: Cannot proceed to braintree paypal from iPhone
serhii-balko Nov 21, 2018
b79e67a
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-83474
zakdma Nov 21, 2018
3856db2
ENGCOM-3488: Issue #19205 Fixed: Bundle Product Option with input typ…
VladimirZaets Nov 21, 2018
dce1b71
ENGCOM-3480: [Forwardport] #18956 Fixes for set root_category_id #19237
VladimirZaets Nov 21, 2018
ccb2122
ENGCOM-3478: [Backport] Add missing unit test for WishlistSettings pl…
VladimirZaets Nov 21, 2018
d3041b6
ENGCOM-3468: [Backport] Covering the \Magento\Weee observers by Unit …
VladimirZaets Nov 21, 2018
0b9017c
ENGCOM-3467: [Backport] Covering the CheckUserLoginBackendObserver by…
VladimirZaets Nov 21, 2018
4afa4d1
ENGCOM-3271: fixed Quote Item Prices are NULL in cart related events.…
VladimirZaets Nov 21, 2018
16f1eef
ENGCOM-2111: #14020-Cart-Sales-Rule-with-negated-condition-over-speci…
VladimirZaets Nov 21, 2018
6365cad
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-90056
zakdma Nov 21, 2018
504aeb6
MAGETWO-73922: Import doesn't allow to set default value per store vi…
viktorpetryk Nov 21, 2018
8c83a6e
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73922
viktorpetryk Nov 21, 2018
aa1b000
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91932
yelahin-serhiy Nov 21, 2018
9945dc7
#14020-Cart-Sales-Rule-with-negated-condition-over-special-price-does
VladimirZaets Nov 21, 2018
584242c
Merge pull request #5 from magento/2.2-develop
speedy008 Nov 21, 2018
ee0bae8
Fixed pagination alignment issue-ƒ19286
speedy008 Nov 21, 2018
fdcdbe3
ENGCOM-3507: Fix issue 19286 - Wrong pager style #19296
magento-engcom-team Nov 21, 2018
8556130
MAGETWO-86048: Special characters in CSV return error: General system…
zakdma Nov 21, 2018
ec68989
ENGCOM-3308: MFTF tests fix.
p-bystritsky Nov 21, 2018
e2c86b9
Merge branch '2.2-develop' into ENGCOM-3357-magento-magento2-14485
p-bystritsky Nov 21, 2018
39cce0c
ENGCOM-3505: Using Media Image custom attribute type could not displa…
magento-engcom-team Nov 21, 2018
32a7c4b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
VladimirZaets Nov 21, 2018
47bf3b5
MAGETWO-86048: Special characters in CSV return error: General system…
zakdma Nov 21, 2018
99377a9
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-86048
zakdma Nov 21, 2018
4327eb4
MAGETWO-86048: Special characters in CSV return error: General system…
zakdma Nov 21, 2018
d7cbe06
MAGETWO-62841: On Payment screen using Credit Card checkout, up and d…
SeruyV Nov 22, 2018
6051858
ENGCOM-3527: [2.2 develop] [backport #19018] [issue #17833] child the…
magento-engcom-team Nov 22, 2018
310ed2b
ENGCOM-3528: [Backport] fixed - can't import external http to https r…
magento-engcom-team Nov 22, 2018
f15ddaf
performance improvements
apasare Oct 23, 2018
762722d
ENGCOM-3338: local themes should be added to git repo #18960
Nov 22, 2018
0bc3a68
ENGCOM-3276: [Backport] Fix issue with unexpected changing of subscri…
Nov 22, 2018
cb7b67e
missing use statement in layout generator
adeptofvoltron Nov 2, 2018
0cc9a11
import class to the use statement
adeptofvoltron Nov 2, 2018
20922a0
19082-Fatal-error-Uncaught-Error-Cannot-call-abstract-method-Magento-…
Nov 10, 2018
27c265d
Fix the issue: Content overlaps the close button #19263
dmytro-ch Nov 18, 2018
3bae848
ENGCOM-3531: [Backport] 19082-Fatal-error-Uncaught-Error-Cannot-call-…
magento-engcom-team Nov 22, 2018
651606e
ENGCOM-3490: Magento 2.2 Fix Product::addImageToMediaGallery throws E…
magento-engcom-team Nov 22, 2018
0cc1ce2
ENGCOM-3532: [Backport] small performance improvement on product list…
magento-engcom-team Nov 22, 2018
4b70893
Merge branch '2.2-develop' into 2.2-develop-PR-port-19264
gelanivishal Nov 22, 2018
b7c70c3
ENGCOM-3534: [Backport] Fix the issue: Content overlaps the close but…
magento-engcom-team Nov 22, 2018
5218dd9
ENGCOM-3490: Magento 2.2 Fix Product::addImageToMediaGallery throws E…
Nov 22, 2018
33b0a51
MAGETWO-93424: Permanent Redirect for old URL missing via API or no d…
yelahin-serhiy Nov 22, 2018
3f6c67f
ENGCOM-3530: [Backport] missing use statement in layout generator #19338
magento-engcom-team Nov 22, 2018
13de5a7
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 22, 2018
5d05219
ENGCOM-3534: [Backport] Fix the issue: Content overlaps the close but…
Nov 22, 2018
c8f2893
ENGCOM-3532: [Backport] small performance improvement on product list…
Nov 22, 2018
30554a9
ENGCOM-3531: [Backport] 19082-Fatal-error-Uncaught-Error-Cannot-call-…
Nov 22, 2018
cf5ad8d
ENGCOM-3530: [Backport] missing use statement in layout generator #19338
Nov 22, 2018
a53f7fc
ENGCOM-3505: Using Media Image custom attribute type could not displa…
Nov 22, 2018
d332f71
Changed get product way in blocks with related products
Oct 19, 2018
fe93034
MAGETWO-93424: Permanent Redirect for old URL missing via API or no d…
yelahin-serhiy Nov 23, 2018
7d47837
MAGETWO-91019: Visual Merchandiser incorrectly displays/sorts configu…
svitja Nov 23, 2018
a2764b0
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91019
svitja Nov 23, 2018
132a754
fixed-18887-notifications-counter
abrarpathan19 Nov 3, 2018
91fc40c
Update _notifications.less
VladimirZaets Nov 19, 2018
7559e3e
#13157 - Last Ordered Items block - bad js code
omiroshnichenko Nov 2, 2018
58550b9
#13157 - Last Ordered Items block - bad js code
omiroshnichenko Nov 6, 2018
f1bb98e
#13157 - Last Ordered Items block - bad js code
omiroshnichenko Nov 13, 2018
f4250a0
Fix the issue with repetitive "tbody" tag for order items table
dmytro-ch Nov 21, 2018
0d91b77
ENGCOM-3541: [Backport] Magento backend Notifications counter round i…
magento-engcom-team Nov 23, 2018
0ff0dab
ENGCOM-3542: [Backport] Changed get product way in blocks with relate…
magento-engcom-team Nov 23, 2018
c74477c
ENGCOM-3544: [Backport] Fix the issue with repetitive 'tbody' tag for…
magento-engcom-team Nov 23, 2018
fd14d87
ENGCOM-3540: [Backport] #13157 - Last Ordered Items block - bad js co…
magento-engcom-team Nov 23, 2018
043b52f
ENGCOM-3357: MTF tests fix.
p-bystritsky Nov 22, 2018
fc510d3
MAGETWO-93424: Permanent Redirect for old URL missing via API or no d…
yelahin-serhiy Nov 23, 2018
57d6b3b
Code style fixes
VladimirZaets Nov 23, 2018
97b98cc
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
VladimirZaets Nov 23, 2018
053291a
fix: remove old code in tabs, always set tabindex to 0 when tabs are …
Nov 22, 2018
152c240
ENGCOM-3548: [Backport] fix: remove old code in tabs, always set tabi…
magento-engcom-team Nov 23, 2018
90e9806
ENGCOM-3542: [Backport] Changed get product way in blocks with relate…
VladimirZaets Nov 23, 2018
0b97337
ENGCOM-3540: [Backport] #13157 - Last Ordered Items block - bad js co…
VladimirZaets Nov 23, 2018
d1c7535
ENGCOM-3507: Fix issue 19286 - Wrong pager style #19296
VladimirZaets Nov 23, 2018
645b78a
ENGCOM-3494: 18615 updates structure for last_trans_id to be varchar …
VladimirZaets Nov 23, 2018
01a7917
ENGCOM-3357: Fix for Issue #4136, MAGETWO-53440 #14485
VladimirZaets Nov 23, 2018
d41a57c
ENGCOM-3308: Fix the issue with missing asterisk for admin required f…
VladimirZaets Nov 23, 2018
3185123
Fixing a test for Magento Newsletter.
tiagosampaio Nov 23, 2018
306cc65
Removed obsolete _redirect method call
sivaschenko Nov 24, 2018
e1650f2
Merge branch '2.2-develop-prs' of github.com:magento-engcom/magento2c…
sivaschenko Nov 24, 2018
8b900d4
Code generate: support variadic parameter
Sep 5, 2017
f674bad
Fix integration test errors
Mar 30, 2018
541ce18
MAGETWO-89899: Proxy generator does not understand PHP 7.1 syntax
Apr 11, 2018
d33db64
MAGETWO-89899: Proxy generator does not understand PHP 7.1 syntax
Apr 12, 2018
c0c0a37
MAGETWO-89899: Proxy/Interceptor generator does not understand PHP 7.…
Apr 12, 2018
3e7f0eb
MAGETWO-89899: Proxy/Interceptor generator does not understand PHP 7.…
Apr 12, 2018
d7efcca
MAGETWO-89899: Proxy/Interceptor generator does not understand PHP 7.…
Apr 12, 2018
ce701af
back-port-pull-19024
Nov 24, 2018
d249036
MAGETWO-95415: Can't generate Plugin if object method returns self
Sep 28, 2018
c59e602
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 24, 2018
1763fe2
ENGCOM-3553: back-port-pull-19024 #19374
magento-engcom-team Nov 24, 2018
87ab26f
magento/magento2##15505: Interceptor class methods do not support nul…
Nov 24, 2018
41c8da0
Merge branch '2.2-develop' into Code-Generation-Improvement-For-PHP-7.1
swnsma Nov 24, 2018
5ccde33
ENGCOM-3550: Fixing a test for Magento Newsletter. #19365
magento-engcom-team Nov 25, 2018
c230c7e
Merge branch '2.2-develop' into Fixed-18918
suryakant-krish Nov 26, 2018
95a3136
MAGETWO-94112: Configurable "As low As" Product Price Not Updating Co…
rostyslav-hymon Nov 26, 2018
f0758f3
magento/magento2##15505: Interceptor class methods do not support nul…
Nov 26, 2018
a33f89d
Merge branch 'Code-Generation-Improvement-For-PHP-7.1' of github.com:…
Nov 26, 2018
3eb849b
ENGCOM-3550: Fixing a test for Magento Newsletter. #19365
sivaschenko Nov 26, 2018
a427b30
ENGCOM-3544: [Backport] Fix the issue with repetitive "tbody" tag for…
sivaschenko Nov 26, 2018
38d14a0
ENGCOM-3527: [2.2 develop] [backport #19018] [issue #17833] child the…
sivaschenko Nov 26, 2018
ace297a
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 26, 2018
79b62b8
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91019
svitja Nov 26, 2018
aee81e8
MAGETWO-91019: Visual Merchandiser incorrectly displays/sorts configu…
svitja Nov 26, 2018
9289039
ENGCOM-3568: [Backport-2.2] Code generation improvement for php 7.1 #…
magento-engcom-team Nov 26, 2018
6ed1b42
MAGETWO-90727: Ordered Products Report Error for restricted scope admin
svitja Nov 26, 2018
b847675
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-90056
SeruyV Nov 27, 2018
6677cf9
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-91019
DianaRusin Nov 27, 2018
513f39d
MAGETWO-86549: Unusual behavior with the persistent shopping cart aft…
SeruyV Nov 27, 2018
da57658
Merge branch 'MAGETWO-96289' into 2.2-develop-pr11
serhii-balko Nov 27, 2018
bc1cd5a
Merge branch 'MAGETWO-93424' into 2.2-develop-pr11
yelahin-serhiy Nov 27, 2018
e194edc
Merge branch 'MAGETWO-91932' into 2.2-develop-pr11
yelahin-serhiy Nov 27, 2018
2185923
Merge branch 'MAGETWO-94112' into 2.2-develop-pr11
rostyslav-hymon Nov 27, 2018
3a8bc52
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-86048
DianaRusin Nov 27, 2018
19c9aba
ENGCOM-3553: back-port-pull-19024 #19374
sivaschenko Nov 27, 2018
bc6358e
ENGCOM-3548: [Backport] fix: remove old code in tabs, always set tabi…
sivaschenko Nov 27, 2018
ae7563c
ENGCOM-3541: [Backport] Magento backend Notifications counter round i…
sivaschenko Nov 27, 2018
3c1b5d1
ENGCOM-3528: [Backport] fixed - can't import external http to https r…
sivaschenko Nov 27, 2018
89b5f5e
Properties sorted alphabetically
sivaschenko Nov 27, 2018
f38e340
Merge pull request #3484 from magento-tsg-csl3/2.2-develop-pr11
viktym Nov 27, 2018
ef236db
MAGETWO-86549: Unusual behavior with the persistent shopping cart aft…
SeruyV Nov 27, 2018
ccf61f1
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-90727
svitja Nov 27, 2018
7f7783c
MAGETWO-90727: Ordered Products Report Error for restricted scope admin
svitja Nov 27, 2018
d99739a
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 27, 2018
5036b0b
MAGETWO-74044: Import Products sets default behaviour as append, need…
viktorpetryk Nov 27, 2018
d7eafc2
MAGETWO-91070: Missing Swatch Images Break Catalog Pages
dhorytskyi Nov 27, 2018
5357558
Fix for incorrectly escapeHtml'd JSON in commit b8f78cc6
Nov 27, 2018
653d533
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 27, 2018
7d459d5
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-86549
viktorpetryk Nov 28, 2018
b8fc202
Fixing the customer subscribing from different stores
eduard13 Nov 28, 2018
2b1f98a
ENGCOM-3579: [Backport] Fixing the customer subscribing from differen…
magento-engcom-team Nov 28, 2018
21cf0d5
Adding integration tests for wrong captcha
eduard13 Nov 28, 2018
8c7398e
ENGCOM-3580: [Backport] Adding integration tests for wrong captcha #1…
magento-engcom-team Nov 28, 2018
05d5e20
Add annotations as requested for PR
Nov 28, 2018
64ab6b2
MAGETWO-74208: Header issue when resizing in Internet Explorer
DianaRusin Nov 28, 2018
542120b
Fixed issue with Base Currency for website is CND when PayPal Payflow…
Nov 28, 2018
e6779d4
ENGCOM-3582: Fix for incorrectly escapeHtml'd JSON in commit b8f78cc6…
magento-engcom-team Nov 28, 2018
eed8485
patch-19344 : Fixed Sample Link Issue in Downloadable product #19344
ansari-ziyaurrahman Nov 28, 2018
0bfccfc
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
droed89 Nov 28, 2018
dd4a109
ENGCOM-3583: Fixed issue with Base Currency for website is CND when P…
magento-engcom-team Nov 28, 2018
29cdda9
Merge branch 'MAGETWO-95898' into fix-95898
Nov 28, 2018
899e950
Merge pull request #3488 from magento-tango/MAGETWO-91070
dhorytskyi Nov 28, 2018
472ad5d
ENGCOM-3582: Fix for incorrectly escapeHtml'd JSON in commit b8f78cc6…
sidolov Nov 29, 2018
b3548a6
ENGCOM-3580: [Backport] Adding integration tests for wrong captcha #1…
sidolov Nov 29, 2018
84fa6a2
ENGCOM-3579: [Backport] Fixing the customer subscribing from differen…
sidolov Nov 29, 2018
7d65bf5
ENGCOM-3568: [Backport-2.2] Code generation improvement for php 7.1 #…
sidolov Nov 29, 2018
972dadb
ENGCOM-3373: [Backport] #17813 - Huge "product_data_storage" in local…
sidolov Nov 29, 2018
99dbb54
Merge pull request #1 from magento/2.2-develop
ansari-ziyaurrahman Nov 29, 2018
29eea73
patch-19344 : Fixed Sample Link Issue in Downloadable product #19344
ansari-ziyaurrahman Nov 28, 2018
3b6307b
MAGETWO-91711: Unable to delete downloadable product links if sample …
YuliyaLabudova Oct 2, 2018
e519bc6
Merge branch 'patch-2.2.6-19344' of https://github.com/ansari-krish/m…
ansari-ziyaurrahman Nov 29, 2018
1d602a3
Merge remote-tracking branch 'origin/MAGETWO-73922' into 2.2-develop-…
svitja Nov 29, 2018
bc229be
Merge remote-tracking branch 'origin/MAGETWO-74044' into 2.2-develop-…
StasKozar Nov 29, 2018
29965a1
chore: remove unused code in admin view of catalog
Nov 22, 2018
65c9a58
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 29, 2018
dfa5897
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-62841
OlgaVasyltsun Nov 29, 2018
8a8a596
ENGCOM-3587: [Backport] chore: remove unused code in admin view of ca…
magento-engcom-team Nov 29, 2018
b343de7
Merge remote-tracking branch 'origin/MAGETWO-62841' into 2.2-develop-…
OlgaVasyltsun Nov 29, 2018
8b09e3a
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-90727
SeruyV Nov 29, 2018
871ddbb
ENGCOM-3584: Sample Link Issue in Downloadable product in magento-2.2…
magento-engcom-team Nov 29, 2018
a4839ad
Merge remote-tracking branch 'origin/MAGETWO-90727' into 2.2-develop-…
SeruyV Nov 29, 2018
63a0d40
Merge remote-tracking branch 'origin/2.2-develop-pr60' into 2.2-devel…
SeruyV Nov 29, 2018
9d6d843
Merge branch '2.2-develop' of github.com:magento/magento2ce into fix-…
Nov 29, 2018
2c1ccdd
Merge remote-tracking branch 'origin/MAGETWO-90381' into 2.2-develop-…
zakdma Nov 29, 2018
67b6ea5
Merge remote-tracking branch 'origin/MAGETWO-86048' into 2.2-develop-…
zakdma Nov 29, 2018
8a68cd4
Merge remote-tracking branch 'origin/MAGETWO-90056' into 2.2-develop-…
zakdma Nov 29, 2018
43759cf
Merge remote-tracking branch 'origin/MAGETWO-91019' into 2.2-develop-…
zakdma Nov 29, 2018
b3073b6
Merge remote-tracking branch 'origin/MAGETWO-83474' into 2.2-develop-…
zakdma Nov 29, 2018
52c7bde
Merge remote-tracking branch 'origin/MAGETWO-85683' into 2.2-develop-…
zakdma Nov 29, 2018
d821363
ENGCOM-3587: [Backport] chore: remove unused code in admin view of ca…
sivaschenko Nov 29, 2018
ad04a2f
ENGCOM-3584: Sample Link Issue in Downloadable product in magento-2.2…
sivaschenko Nov 29, 2018
d6b5325
ENGCOM-3583: Fixed issue with Base Currency for website is CND when P…
sivaschenko Nov 29, 2018
c36df15
ENGCOM-3479: [Backport] Allow to read HTTP/2 response header. #19239
sivaschenko Nov 29, 2018
011e31f
ENGCOM-3324: Fixed 18918 Asterisk sign display twice #18922
sivaschenko Nov 29, 2018
4f3d55e
ENGCOM-3324: Fixed 18918 Asterisk sign display twice #18922
magento-engcom-team Nov 29, 2018
5f0c95f
Merge branch 'ENGCOM-3324-magento-magento2-18922' of github.com:magen…
sivaschenko Nov 29, 2018
c274c00
MAGETWO-90381: Bundle product price doubled when switching currency
OlgaVasyltsun Nov 30, 2018
398d1f1
Merge remote-tracking branch 'origin/MAGETWO-90381' into 2.2-develop-…
OlgaVasyltsun Nov 30, 2018
3dd49b7
Merge pull request #3492 from magento-tsg/2.2-develop-pr59
xmav Nov 30, 2018
65475d9
magento/magento2#18922: Fixed code styles
sivaschenko Nov 30, 2018
87fa4c2
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 30, 2018
2af88f1
Merge branch '2.2-develop' of github.com:magento/magento2ce into fix-…
Nov 30, 2018
c1e2f86
magento/magento2#18922: Fixed code styles
sivaschenko Nov 30, 2018
302437a
Merge pull request #3496 from magento-mpi/fix-95898
viktym Nov 30, 2018
ad398bf
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 30, 2018
a72f59b
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Nov 30, 2018
164619a
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-74208
OlgaVasyltsun Dec 3, 2018
2430b3d
Merge remote-tracking branch 'origin/MAGETWO-74208' into 2.2-develop-…
OlgaVasyltsun Dec 3, 2018
7b28e74
MAGETWO-95168: Magento 2.2.7 Publication
xmav Dec 3, 2018
ba0daa5
MAGETWO-95168: Magento 2.2.7 Publication
xmav Dec 3, 2018
8e455b9
MAGETWO-95168: Magento 2.2.7 Publication
xmav Dec 4, 2018
8c6000f
Merge pull request #3502 from magento-plankton/2.2-develop-merge-2.2.7
xmav Dec 5, 2018
edd3a2f
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr60
zakdma Dec 5, 2018
b4269c2
Merge pull request #3509 from magento-tsg/2.2-develop-pr60
Dec 5, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 147 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/code/Magento/AdminNotification/composer.json
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
"lib-libxml": "*"
},
"type": "magento2-module",
"version": "100.2.4",
"version": "100.2.5",
"license": [
"OSL-3.0",
"AFL-3.0"
2 changes: 1 addition & 1 deletion app/code/Magento/AdvancedPricingImportExport/composer.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.4",
"version": "100.2.5",
"license": [
"OSL-3.0",
"AFL-3.0"
2 changes: 1 addition & 1 deletion app/code/Magento/Analytics/composer.json
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.3",
"version": "100.2.4",
"license": [
"OSL-3.0",
"AFL-3.0"
2 changes: 1 addition & 1 deletion app/code/Magento/Authorization/composer.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.2",
"version": "100.2.3",
"license": [
"OSL-3.0",
"AFL-3.0"
2 changes: 1 addition & 1 deletion app/code/Magento/Authorizenet/composer.json
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.2",
"version": "100.2.3",
"license": [
"proprietary"
],
38 changes: 35 additions & 3 deletions app/code/Magento/Backend/Block/System/Store/Delete/Form.php
Original file line number Diff line number Diff line change
@@ -5,13 +5,39 @@
*/
namespace Magento\Backend\Block\System\Store\Delete;

use Magento\Backup\Helper\Data as BackupHelper;
use Magento\Framework\App\ObjectManager;

/**
* Adminhtml cms block edit form
*
* @author Magento Core Team <core@magentocommerce.com>
*/
class Form extends \Magento\Backend\Block\Widget\Form\Generic
{
/**
* @var BackupHelper
*/
private $backup;

/**
* @param \Magento\Backend\Block\Template\Context $context
* @param \Magento\Framework\Registry $registry
* @param \Magento\Framework\Data\FormFactory $formFactory
* @param array $data
* @param BackupHelper|null $backup
*/
public function __construct(
\Magento\Backend\Block\Template\Context $context,
\Magento\Framework\Registry $registry,
\Magento\Framework\Data\FormFactory $formFactory,
array $data = [],
BackupHelper $backup = null
) {
parent::__construct($context, $registry, $formFactory, $data);
$this->backup = $backup ?? ObjectManager::getInstance()->get(BackupHelper::class);
}

/**
* Init form
*
@@ -25,7 +51,7 @@ protected function _construct()
}

/**
* {@inheritdoc}
* @inheritDoc
*/
protected function _prepareForm()
{
@@ -45,15 +71,21 @@ protected function _prepareForm()

$fieldset->addField('item_id', 'hidden', ['name' => 'item_id', 'value' => $dataObject->getId()]);

$backupOptions = ['0' => __('No')];
$backupSelected = '0';
if ($this->backup->isEnabled()) {
$backupOptions['1'] = __('Yes');
$backupSelected = '1';
}
$fieldset->addField(
'create_backup',
'select',
[
'label' => __('Create DB Backup'),
'title' => __('Create DB Backup'),
'name' => 'create_backup',
'options' => ['1' => __('Yes'), '0' => __('No')],
'value' => '1'
'options' => $backupOptions,
'value' => $backupSelected
]
);

Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@
* Store controller
*
* @author Magento Core Team <core@magentocommerce.com>
* @SuppressWarnings(PHPMD.AllPurposeAction)
*/
abstract class Store extends Action
{
@@ -86,6 +87,8 @@ protected function createPage()
* Backup database
*
* @return bool
*
* @deprecated Backup module is to be removed.
*/
protected function _backupDatabase()
{
Original file line number Diff line number Diff line change
@@ -11,5 +11,6 @@
<element name="test" type="input" selector=".test"/>
<element name="success" type="text" selector="#messages div.message-success"/>
<element name="successMessageByIndex" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
<element name="error" type="text" selector="#messages div.message-error"/>
</section>
</sections>
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/composer.json
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
"magento/module-theme": "100.2.*"
},
"type": "magento2-module",
"version": "100.2.6",
"version": "100.2.7",
"license": [
"OSL-3.0",
"AFL-3.0"
26 changes: 25 additions & 1 deletion app/code/Magento/Backup/Controller/Adminhtml/Index.php
Original file line number Diff line number Diff line change
@@ -5,12 +5,16 @@
*/
namespace Magento\Backup\Controller\Adminhtml;

use Magento\Backup\Helper\Data as Helper;
use Magento\Framework\App\ObjectManager;

/**
* Backup admin controller
*
* @author Magento Core Team <core@magentocommerce.com>
* @api
* @since 100.0.2
* @SuppressWarnings(PHPMD.AllPurposeAction)
*/
abstract class Index extends \Magento\Backend\App\Action
{
@@ -48,27 +52,47 @@ abstract class Index extends \Magento\Backend\App\Action
*/
protected $maintenanceMode;

/**
* @var Helper
*/
private $helper;

/**
* @param \Magento\Backend\App\Action\Context $context
* @param \Magento\Framework\Registry $coreRegistry
* @param \Magento\Framework\Backup\Factory $backupFactory
* @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
* @param \Magento\Backup\Model\BackupFactory $backupModelFactory
* @param \Magento\Framework\App\MaintenanceMode $maintenanceMode
* @param Helper|null $helper
*/
public function __construct(
\Magento\Backend\App\Action\Context $context,
\Magento\Framework\Registry $coreRegistry,
\Magento\Framework\Backup\Factory $backupFactory,
\Magento\Framework\App\Response\Http\FileFactory $fileFactory,
\Magento\Backup\Model\BackupFactory $backupModelFactory,
\Magento\Framework\App\MaintenanceMode $maintenanceMode
\Magento\Framework\App\MaintenanceMode $maintenanceMode,
Helper $helper = null
) {
$this->_coreRegistry = $coreRegistry;
$this->_backupFactory = $backupFactory;
$this->_fileFactory = $fileFactory;
$this->_backupModelFactory = $backupModelFactory;
$this->maintenanceMode = $maintenanceMode;
$this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
parent::__construct($context);
}

/**
* @inheritDoc
*/
public function dispatch(\Magento\Framework\App\RequestInterface $request)
{
if (!$this->helper->isEnabled()) {
return $this->_redirect('*/*/disabled');
}

return parent::dispatch($request);
}
}
47 changes: 47 additions & 0 deletions app/code/Magento/Backup/Controller/Adminhtml/Index/Disabled.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);

namespace Magento\Backup\Controller\Adminhtml\Index;

use Magento\Backend\App\Action;
use Magento\Backend\App\Action\Context;
use Magento\Framework\View\Result\PageFactory;

/**
* Inform that backup is disabled.
*/
class Disabled extends Action
{
/**
* @see _isAllowed()
*/
const ADMIN_RESOURCE = 'Magento_Backend::backup';

/**
* @var PageFactory
*/
private $pageFactory;

/**
* @param Context $context
* @param PageFactory $pageFactory
*/
public function __construct(Context $context, PageFactory $pageFactory)
{
parent::__construct($context);
$this->pageFactory = $pageFactory;
}

/**
* @inheritDoc
*/
public function execute()
{
return $this->pageFactory->create();
}
}
7 changes: 7 additions & 0 deletions app/code/Magento/Backup/Cron/SystemBackup.php
Original file line number Diff line number Diff line change
@@ -8,6 +8,9 @@
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Store\Model\ScopeInterface;

/**
* Performs scheduled backup.
*/
class SystemBackup
{
const XML_PATH_BACKUP_ENABLED = 'system/backup/enabled';
@@ -101,6 +104,10 @@ public function __construct(
*/
public function execute()
{
if (!$this->_backupData->isEnabled()) {
return $this;
}

if (!$this->_scopeConfig->isSetFlag(self::XML_PATH_BACKUP_ENABLED, ScopeInterface::SCOPE_STORE)) {
return $this;
}
13 changes: 13 additions & 0 deletions app/code/Magento/Backup/Helper/Data.php
Original file line number Diff line number Diff line change
@@ -3,6 +3,9 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);

namespace Magento\Backup\Helper;

use Magento\Framework\App\Filesystem\DirectoryList;
@@ -285,4 +288,14 @@ public function extractDataFromFilename($filename)

return $result;
}

/**
* Is backup functionality enabled.
*
* @return bool
*/
public function isEnabled(): bool
{
return $this->scopeConfig->isSetFlag('system/backup/functionality_enabled');
}
}
Loading