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

[Backport] 21842: don't cache absolute file paths in validator factory #1

Open
wants to merge 1,166 commits into
base: 2.2-develop
Choose a base branch
from
Open
Changes from 30 commits
Commits
Show all changes
1166 commits
Select commit Hold shift + click to select a range
65e6bec
Merge remote-tracking branch 'magento/2.2-develop' into MAGETWO-97464
viktym Apr 15, 2019
d188036
merge magento/2.2-develop into magento-engcom/MAGETWO-97585-2.2
magento-cicd2 Apr 15, 2019
4192ac1
Merge pull request #4048 from magento-tsg/2.2-develop-pr90
xmav Apr 15, 2019
cc46f59
merge magento/2.2-develop into magento-engcom/MAGETWO-97585-2.2
magento-cicd2 Apr 15, 2019
bcc4526
Previous scrolling to invalid form element is not being canceled on h…
yvechirko Apr 2, 2019
c459949
Merge branch 'MAGETWO-99006' into MAGETWO-98990
serhii-balko Apr 16, 2019
082b3e9
Merge branch '2.2-develop' into MAGETWO-98990
serhii-balko Apr 16, 2019
10de6de
Use correct base path to check if setup folder exists
Jan 10, 2019
40b5d2e
magento/magento2#20182: Static test fix.
p-bystritsky Apr 12, 2019
40b3fee
MAGETWO-97464: Braintree payment method not supported in multi-shipping
viktym Apr 16, 2019
ae3dd2a
ENGCOM-4768: [Backport 2.2] Use correct base path to check if setup f…
magento-engcom-team Apr 16, 2019
71549c4
merge magento/2.2-develop into magento-mpi/MAGETWO-97464
magento-cicd2 Apr 16, 2019
cf60a15
MAGETWO-97400: Name of categories in the Category tree on Product Edi…
dyushkin Apr 16, 2019
c866e77
MAGETWO-97464: Braintree payment method not supported in multi-shipping
viktym Apr 16, 2019
34a910c
Merge remote-tracking branch 'origin/MAGETWO-97464' into MAGETWO-97464
viktym Apr 16, 2019
57af527
Same product quantity not increment when added with guest user. #2137…
Jitheesh Feb 28, 2019
e9fb114
Merge pull request #4055 from magento-mpi/MAGETWO-97464
viktym Apr 16, 2019
5a5b1b0
Merge branch 2.2-develop into ENGCOM-4339-magento-magento2-21203
magento-engcom-team Apr 17, 2019
e712e07
ENGCOM-4734: [Backport] Fix gallery event observer #22250
sivaschenko Apr 17, 2019
ee249de
ENGCOM-4724: magento2-22238: removed backward incompatible change fro…
sivaschenko Apr 17, 2019
8b90f2b
ENGCOM-4682: WYSIWYG Image-Popup is not working correctly with multip…
sivaschenko Apr 17, 2019
8e4be79
ENGCOM-4672: [2.2] Add support for validation message callback #20107
sivaschenko Apr 17, 2019
5cb3a0f
ENGCOM-4657: [Backport] Secure errors directory #21946
sivaschenko Apr 17, 2019
b55bb34
ENGCOM-4633: [backport] issue - 21507 Change photo only if user swipe…
sivaschenko Apr 17, 2019
c01e038
ENGCOM-4339: [Backport] icon text showing feature #21203
sivaschenko Apr 17, 2019
7a556ae
MC-15443: Out of memory exception thrown when indexer:reindex is run
zakdma Apr 17, 2019
77de966
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 17, 2019
8161a69
Merge remote-tracking branch 'origin/2.2-develop' into MC-15456
ameysar Apr 17, 2019
0956f7a
Merge remote-tracking branch 'origin/2.2-develop' into MC-15443
zakdma Apr 17, 2019
eb7743e
ENGCOM-4625: Full Tax Summary display wrong numbers -Backport #21961
magento-engcom-team Apr 17, 2019
be7c2fc
Merge remote-tracking branch 'origin/MC-15456' into 2.2-develop-pr92
ameysar Apr 17, 2019
ba17fa0
MAGETWO-98694: [Magento Cloud] Translated Arabic URL's are returning …
odubovyk Apr 17, 2019
731d8a0
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-98694
odubovyk Apr 17, 2019
23d884e
ENGCOM-4777: Bug fix for #21753 (2.2-develop) #22072
magento-engcom-team Apr 17, 2019
ba29d6f
MC-15443: Out of memory exception thrown when indexer:reindex is run
zakdma Apr 18, 2019
60a223e
Merge branch 2.2-develop into ENGCOM-4754-magento-magento2-22295
magento-engcom-team Apr 18, 2019
d5d7dcc
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-73157
ameysar Apr 18, 2019
bbe2f7d
Merge remote-tracking branch 'origin/MAGETWO-73157' into 2.2-develop-…
ameysar Apr 18, 2019
bffe14c
ENGCOM-4687: [Backport] ISSUE-5021 fixed guest checkout with custom s…
sivaschenko Apr 18, 2019
3ebbff1
ENGCOM-4625: Full Tax Summary display wrong numbers -Backport #21961
sivaschenko Apr 18, 2019
1c9ea80
ENGCOM-3988: [Backport][2.2] Reworked gallery.phtml to move generatio…
sivaschenko Apr 18, 2019
2910efd
Checkout Totals Sort Order fields can't be empty and should be a number.
barbanet Apr 18, 2019
9b74d97
Merge branch 2.2-develop into ENGCOM-4768-magento-magento2-22369
magento-engcom-team Apr 18, 2019
79e90ba
filter config values on testSuiteStart
bcerban Apr 18, 2019
2165bb3
ENGCOM-4754: [Backport] Turn on edit mode for product repository when…
sidolov Apr 18, 2019
0e81013
MAGETWO-93521: Custom customer attributes don't show in admin unless …
dhorytskyi Apr 18, 2019
5368d41
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 18, 2019
72980c1
MAGETWO-99251: Duplicate orders with same quote ID when form is submi…
viktym Apr 18, 2019
58ff359
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-9758…
slavvka Apr 18, 2019
342ea67
Merge remote-tracking branch 'origin/MAGETWO-97585-2.2' into MAGETWO-…
slavvka Apr 18, 2019
35ad602
MC-15874: Catch unserializer exception
Apr 18, 2019
ab6ec5b
Merge pull request #4050 from magento-engcom/MAGETWO-97585-2.2
slavvka Apr 18, 2019
e1f91d1
Fix importFromArray by setting _isCollectionLoaded to true after import
slackerzz Mar 21, 2019
d11cc25
ENGCOM-4787: Backport - Fix importFromArray by setting _isCollectionL…
magento-engcom-team Apr 19, 2019
23b736f
MAGETWO-98583: Google chart API used by Magento dashboard scheduled t…
viktorpetryk Apr 19, 2019
a4c3b4e
ENGCOM-4777: Bug fix for #21753 (2.2-develop) #22072
sidolov Apr 19, 2019
8565d5f
ENGCOM-4768: [Backport 2.2] Use correct base path to check if setup f…
sidolov Apr 19, 2019
d8affad
Merge remote-tracking branch 'chaika/MAGETWO-98694' into PR-2.2-04
dhorytskyi Apr 19, 2019
a92fdde
Merge remote-tracking branch 'mpi/MAGETWO-98991' into PR-2.2-04
dhorytskyi Apr 19, 2019
1e1703e
Merge remote-tracking branch 'mpi/MAGETWO-98670-22' into PR-2.2-04
dhorytskyi Apr 19, 2019
b13a3d7
Merge remote-tracking branch 'tango/MAGETWO-87222' into PR-2.2-04
dhorytskyi Apr 19, 2019
b77bdcf
Merge remote-tracking branch 'tango/MAGETWO-93521' into PR-2.2-04
dhorytskyi Apr 19, 2019
c1fbaf9
Merge remote-tracking branch 'mpi/MAGETWO-97400' into PR-2.2-04
dhorytskyi Apr 19, 2019
1c5f7da
MAGETWO-97400: Name of categories in the Category tree on Product Edi…
dyushkin Apr 19, 2019
a4f313a
MAGETWO-98670: Braintree Displaying Incorrect Ship-To Name
dyushkin Apr 19, 2019
690a2e3
MAGETWO-97400: Name of categories in the Category tree on Product Edi…
dyushkin Apr 19, 2019
28f35bc
MAGETWO-99247: Customizable Option Price input is not saved on Store …
Apr 19, 2019
40b8c25
Merge pull request #4076 from magento-tango/PR-2.2-04
dhorytskyi Apr 19, 2019
cfbd77e
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 19, 2019
5fb9b4b
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
Apr 19, 2019
e4c5c82
MAGETWO-99247: Customizable Option Price input is not saved on Store …
Apr 19, 2019
c52ee4a
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 20, 2019
4b60fad
Cherry Pick issue 18641
schmengler Oct 16, 2018
20efb05
Fixed - Category API update Issue required name on update
Apr 16, 2019
b3a799d
Fixed - search icon click not working issue in admin ui grid sticky h…
Apr 15, 2019
faa1d79
ENGCOM-4792: [Backport] [Fixed] Category Update without 'name' cannot…
magento-engcom-team Apr 21, 2019
0b976b2
ENGCOM-4793: [Backport] Fiexed 22152 - Click on search icon it does n…
magento-engcom-team Apr 21, 2019
e95fd4a
Translated exception message
yogeshsuhagiya Apr 22, 2019
eb152f0
Translate comment in DHL config settings
yogeshsuhagiya Apr 22, 2019
e4760d2
ENGCOM-4796: [Backport] Translated exception message #22448
magento-engcom-team Apr 22, 2019
2b15fb4
Merge remote-tracking branch 'origin/2.2-develop' into MC-15443
DianaRusin Apr 22, 2019
68df312
Merge branch 2.2-develop into ENGCOM-4702-magento-magento2-22214
magento-engcom-team Apr 22, 2019
ad52521
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr92
zakdma Apr 22, 2019
34b2dcc
Layered Navigation: “Equalize product count” not working as expected
Nazar65 Apr 22, 2019
943427b
Merge remote-tracking branch 'origin/MAGETWO-98990' into 2.2-develop-…
serhii-balko Apr 22, 2019
ae5f1b2
Merge remote-tracking branch 'origin/MAGETWO-97096' into 2.2-develop-…
serhii-balko Apr 22, 2019
840e6f3
Merge remote-tracking branch 'origin/MAGETWO-97008' into 2.2-develop-…
serhii-balko Apr 22, 2019
05417ce
Merge remote-tracking branch 'upstream/2.2-develop' into MC-15874-2
Apr 22, 2019
c365d6c
Fix static test.
nmalevanec Apr 22, 2019
6595b4c
ENGCOM-4702: [Backport] [Widget] Fixing the multidimensional array as…
magento-engcom-team Apr 22, 2019
5a1438f
ENGCOM-4787: Backport - Fix importFromArray by setting _isCollectionL…
sidolov Apr 22, 2019
fa145cb
ENGCOM-4741: [Backport] Fixed "Please specify the admin custom URL" e…
sidolov Apr 22, 2019
14e5d75
Merge pull request #4090 from magento-arcticfoxes/MC-15874-2
joanhe Apr 22, 2019
499cdc1
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 22, 2019
a1daa45
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 22, 2019
30f4010
ENGCOM-4803: [Backport]Layered Navigation: “Equalize product count” n…
magento-engcom-team Apr 23, 2019
fa725fa
Merge remote-tracking branch 'origin/MC-15443' into 2.2-develop-pr92
zakdma Apr 23, 2019
e44aae2
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr92
zakdma Apr 23, 2019
85d5d57
Merge branch 2.2-develop into ENGCOM-4702-magento-magento2-22214
magento-engcom-team Apr 23, 2019
c89d20f
Merge branch 2.2-develop into ENGCOM-4793-magento-magento2-22441
magento-engcom-team Apr 23, 2019
4ea408d
Merge branch 2.2-develop into ENGCOM-4796-magento-magento2-22448
magento-engcom-team Apr 23, 2019
5f633ab
Merge branch 2.2-develop into ENGCOM-4792-magento-magento2-22440
magento-engcom-team Apr 23, 2019
29633e9
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-98583
viktorpetryk Apr 23, 2019
c056560
ENGCOM-4795: [Backport] Translate comment tag in DHL config settings …
magento-engcom-team Apr 23, 2019
92ac18d
MAGETWO-98583: Google chart API used by Magento dashboard scheduled t…
viktorpetryk Apr 23, 2019
8a65256
ENGCOM-4796: [Backport] Translated exception message #22448
sivaschenko Apr 23, 2019
64e1a68
ENGCOM-4795: [Backport] Translate comment tag in DHL config settings …
sivaschenko Apr 23, 2019
ed97e2c
ENGCOM-4793: [Backport] Fiexed 22152 - Click on search icon it does n…
sivaschenko Apr 23, 2019
7e01c80
ENGCOM-4792: [Backport] [Fixed] Category Update without "name" cannot…
sivaschenko Apr 23, 2019
d67f127
ENGCOM-4702: [Backport] [Widget] Fixing the multidimensional array as…
sivaschenko Apr 23, 2019
e913688
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 23, 2019
1242bb8
Remove all marketing get params on Varnish to minimize the cache obje…
lfluvisotto Apr 8, 2019
3d4a8db
Remove all marketing get params on Varnish to minimize the cache obje…
lfluvisotto Apr 16, 2019
9d26084
Fix static and unit tests.
nmalevanec Apr 23, 2019
2e8f086
ENGCOM-4791: Backport Magento 2.2 Set cache id prefix on installation…
magento-engcom-team Apr 23, 2019
0aa6af2
Fixed - Admin Order Create Full tax summary calculation missing
Apr 9, 2019
65b8526
Merge remote-tracking branch 'mainline/2.2-develop' into 2.2-develop-…
serhii-balko Apr 23, 2019
6f105d7
ENGCOM-4805: [Backport] [Fixed] Full Tax Summary missing calculation …
magento-engcom-team Apr 23, 2019
66baef7
ENGCOM-4803: [Backport]Layered Navigation: “Equalize product count” n…
sidolov Apr 23, 2019
2fba45e
ENGCOM-4791: Backport Magento 2.2 Set cache id prefix on installation…
sidolov Apr 23, 2019
1c76b28
Merge pull request #4095 from magento-tsg-csl3/2.2-develop-pr27
viktym Apr 23, 2019
8a655b6
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 23, 2019
5358ec9
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 23, 2019
8136b52
MAGETWO-99247: Customizable Option Price input is not saved on Store …
Apr 23, 2019
27032e1
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
Apr 23, 2019
9aff2a9
Fixed Changing sample for downloadable product failure
ravi-chandra3197 Apr 24, 2019
5ad4ab6
Backport - Qty box visibility issue in wishlist when product is out o…
Apr 24, 2019
7b645c7
ENGCOM-4814: filter config values on testSuiteStart #22415
magento-engcom-team Apr 24, 2019
f6642c8
Merge remote-tracking branch 'origin/2.2-develop' into 2.2-develop-pr92
zakdma Apr 24, 2019
f99afb1
ENGCOM-4816: [Backport] Fixed Changing sample for downloadable produc…
magento-engcom-team Apr 24, 2019
ff8c1ee
ENGCOM-4817: [Backport] Qty box visibility issue in wishlist when pro…
magento-engcom-team Apr 24, 2019
1fcd1ed
Merge pull request #4105 from magento-tsg/2.2-develop-pr92
xmav Apr 24, 2019
20ed11b
ENGCOM-4805: [Backport] [Fixed] Full Tax Summary missing calculation …
sidolov Apr 24, 2019
bcb7e42
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
Apr 24, 2019
2587afc
MC-15952: [2.2] S2 build failed when upgrading from 2.0 to 2.2
fascinosum Apr 24, 2019
c94674c
Merge pull request #4108 from magento-tango/MAGETWO-99247
dhorytskyi Apr 24, 2019
36fe0df
merge magento/2.2-develop into magento-trigger/MC-15952
magento-cicd2 Apr 24, 2019
c5a9640
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 24, 2019
41ebeeb
ENGCOM-4820: [Backport] Previous scrolling to invalid form element is…
magento-engcom-team Apr 24, 2019
6948b7b
ENGCOM-4821: [Backport] Remove all marketing get params on Varnish to…
magento-engcom-team Apr 24, 2019
1f5bf31
ENGCOM-4823: [Backport] Same product quantity not increment when adde…
magento-engcom-team Apr 24, 2019
dda7186
ENGCOM-4824: [Backport] #21786 Fix the issue with asynchronous email …
magento-engcom-team Apr 24, 2019
b902254
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-98583
SeruyV Apr 25, 2019
fd6fcae
Merge remote-tracking branch 'origin/MAGETWO-98583' into MAGETWO-98583
SeruyV Apr 25, 2019
0740379
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-98583
SeruyV Apr 25, 2019
03db558
api-functional test fix
Nazar65 Apr 25, 2019
d1cd0e5
ENGCOM-4816: [Backport] Fixed Changing sample for downloadable produc…
magento-engcom-team Apr 25, 2019
359f6d7
Merge branch 2.2-develop into ENGCOM-4816-magento-magento2-22471
magento-engcom-team Apr 25, 2019
226d0d9
ENGCOM-4824: [Backport] #21786 Fix the issue with asynchronous email …
sivaschenko Apr 25, 2019
3d5774d
ENGCOM-4817: [Backport] Qty box visibility issue in wishlist when pro…
sivaschenko Apr 25, 2019
a8b662b
ENGCOM-4816: [Backport] Fixed Changing sample for downloadable produc…
sivaschenko Apr 25, 2019
238f457
Merge pull request #4111 from magento-trigger/MC-15952
irenelagno Apr 25, 2019
81576b6
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 25, 2019
c1aa3b2
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 25, 2019
f7540e9
ENGCOM-4823: [Backport] Same product quantity not increment when adde…
sidolov Apr 25, 2019
188affb
ENGCOM-4821: [Backport] Remove all marketing get params on Varnish to…
sidolov Apr 25, 2019
0220d6d
ENGCOM-4814: filter config values on testSuiteStart #22415
sidolov Apr 25, 2019
1e29a6c
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 25, 2019
c5dca37
MAGETWO-99416: Empty email in quote prevent order creation even if pa…
viktym Apr 25, 2019
932506e
MQE-1430: bug fix in dev/tests/functional/utils/command.php etc
jilu1 Feb 6, 2019
f48e1b0
MQE-1430: bug fix in dev/tests/functional/utils/command.php etc
jilu1 Feb 8, 2019
5c13d33
MQE-1430: bug fix in dev/tests/functional/utils/command.php etc
jilu1 Feb 11, 2019
bd0613a
Fixed Dependency on Backup Settings Configuration
keyurk-emipro Apr 24, 2019
7bb6471
ENGCOM-4829: [Backport] Fixed Dependency on Backup Settings Configura…
magento-engcom-team Apr 26, 2019
3835ad5
ENGCOM-4829: [Backport] Fixed Dependency on Backup Settings Configura…
sivaschenko Apr 26, 2019
2e0aa0f
ENGCOM-4820: [Backport] Previous scrolling to invalid form element is…
sivaschenko Apr 26, 2019
4992141
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 26, 2019
7c2ad7b
MAGETWO-99324: Reverting: [Magento Cloud] If a product has a custom a…
Rrego6 Apr 26, 2019
0d936c8
Fixed #22223 Missing/Wrong data display on downloadable report table …
Apr 11, 2019
35ca37e
Code style fix
rogyar Apr 13, 2019
a78bb8e
magento/magento2#22291: Static test fix.
p-bystritsky Apr 16, 2019
bdc5b61
ENGCOM-4834: [Backport] Fixed #22223 Missing/Wrong data display on do…
magento-engcom-team Apr 27, 2019
2995636
PUT /V1/products/:sku/media/:entryId does not change the file - backport
Apr 29, 2019
d707c6b
#22299: Cms block cache key does not contain the store id
tzyganu Apr 12, 2019
c17b232
magento/magento2#22302 Static test fix
Nazar65 Apr 26, 2019
f593573
Use final price rather than base price to calculate price increases /…
danielpfarmer Apr 23, 2019
ff047cb
ENGCOM-4837: [Backport] PUT /V1/products/:sku/media/:entryId does not…
magento-engcom-team Apr 29, 2019
14bd17f
ENGCOM-4841: [Backport] #22299: Cms block cache key does not contain …
magento-engcom-team Apr 29, 2019
422b329
ENGCOM-4842: [Backport] Fix configurable dropdown showing tax incorre…
magento-engcom-team Apr 29, 2019
7eb6717
MAGETWO-99324: Reverting: [Magento Cloud] If a product has a custom a…
Rrego6 Apr 29, 2019
5bfc5bb
ENGCOM-4845: [BACKPORT] #222249 configurable product images wrong sor…
magento-engcom-team Apr 29, 2019
715eca8
MAGETWO-99324: Reverting: [Magento Cloud] If a product has a custom a…
Rrego6 Apr 29, 2019
4f08d53
MQE-1536: Magento\Install\Test\TestCase\InstallTest is failing on php…
jilu1 Apr 29, 2019
b81ae13
Merge remote-tracking branch 'upstream/2.2-develop' into MQE-1536
jilu1 Apr 29, 2019
9b9d451
fixed - issue 21596
Apr 18, 2019
6645cb2
Fix static test.
nmalevanec Apr 19, 2019
1e230b1
Merge pull request #4132 from magento-trigger/MAGETWO-99324-trigger
irenelagno Apr 29, 2019
10d073d
Merge branch 'MAGETWO-99416' of https://github.com/magento-mpi/magent…
Apr 29, 2019
ff29269
Merge branch 'MAGETWO-99251' of https://github.com/magento-mpi/magent…
Apr 29, 2019
3e61725
Merge remote-tracking branch 'upstream/2.2-develop' into MQE-1536
jilu1 Apr 29, 2019
f54c202
Shortening currency list in Configuration->General
melaxon Apr 8, 2019
409eed3
ENGCOM-4856: [Backport] [Fixed] Checkout Section: Shipping step is ge…
magento-engcom-team Apr 30, 2019
21b2d01
ENGCOM-4857: [Backport] Shortening currency list in Configuration->Ge…
magento-engcom-team Apr 30, 2019
c62ab93
Backport-Adding product from wishlist not adding to cart showing warn…
Apr 30, 2019
4402714
Fix order of parameters
dmytro-ch Apr 30, 2019
e35a39b
ENGCOM-4859: [Bakport] Adding product from wishlist not adding to car…
magento-engcom-team Apr 30, 2019
74e912a
MAGETWO-98948: [2.2.x] UPS CGI url gateway to migrate from http to https
zakdma Apr 30, 2019
7376de6
ENGCOM-4841: [Backport] #22299: Cms block cache key does not contain …
sidolov Apr 30, 2019
dcb50c5
ENGCOM-4837: [Backport] PUT /V1/products/:sku/media/:entryId does not…
sidolov Apr 30, 2019
d2b56d2
ENGCOM-4834: [Backport] Fixed #22223 Missing/Wrong data display on do…
sidolov Apr 30, 2019
bfbe295
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team Apr 30, 2019
ab9e4c7
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
Apr 30, 2019
f3595c0
MAGETWO-99415: Update symfony/http-foundation
danmooney2 Apr 30, 2019
1d41abd
Revert "MAGETWO-99415: Update symfony/http-foundation"
danmooney2 Apr 30, 2019
222ecc7
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
May 1, 2019
e11c932
Merge pull request #4140 from magento-obsessive-owls/MAGETWO-99415-re…
cspruiell May 1, 2019
c0f531d
Merge branch '2.2-develop' of https://github.com/magento/magento2ce i…
May 1, 2019
d2df041
ENGCOM-4767: Magento Catalog - fix custom option type text price conv…
magento-engcom-team May 1, 2019
17b7341
ENGCOM-4799: Checkout Totals Sort Order fields can't be empty and sho…
magento-engcom-team May 1, 2019
753cce9
Merge remote-tracking branch 'upstream/2.2-develop' into MQE-1536
jilu1 May 1, 2019
1cc6e75
Merge pull request #4142 from magento-mpi/PR-2019-4-29
viktym May 2, 2019
53f7e6c
merge magento/2.2-develop into magento-pangolin/MQE-1536
magento-cicd2 May 2, 2019
008f8ef
Fixes issue with non existing file, when adding image to gallery with…
dudzio12 Mar 28, 2019
e97f14c
magento/magento2#22020 static-test-fix
Nazar65 Apr 30, 2019
223b710
Resolved Alignment Issue While Editing Order Data containing Downloda…
ansari-ziyaurrahman Apr 12, 2019
20c7d9a
Merge remote-tracking branch 'origin/2.2-develop' into MAGETWO-98948
DianaRusin May 2, 2019
c888348
Merge branch 2.2-develop into ENGCOM-4857-magento-magento2-22551
magento-engcom-team May 2, 2019
6dcbeae
Merge branch 2.2-develop into ENGCOM-4856-magento-magento2-22543
magento-engcom-team May 2, 2019
0e7c329
ENGCOM-5016: [Backport] Non existing file, when adding image to galle…
magento-engcom-team May 2, 2019
be46175
ENGCOM-5017: [Backport] Alignment Issue While Editing Order Data cont…
magento-engcom-team May 2, 2019
fcc9c16
Merge branch 2.2-develop into ENGCOM-4859-magento-magento2-22536
magento-engcom-team May 2, 2019
a541b3c
Merge branch 2.2-develop into ENGCOM-4799-magento-magento2-22413
magento-engcom-team May 2, 2019
9cf16b3
ENGCOM-4859: [Bakport] Adding product from wishlist not adding to car…
sidolov May 2, 2019
b7db604
ENGCOM-4857: [Backport] Shortening currency list in Configuration->Ge…
sidolov May 2, 2019
f9338a3
ENGCOM-4856: [Backport] [Fixed] Checkout Section: Shipping step is ge…
sidolov May 2, 2019
271da23
ENGCOM-4845: [BACKPORT] #222249 configurable product images wrong sor…
sidolov May 2, 2019
a7dd4ae
Merge remote-tracking branch 'origin/MAGETWO-98583' into 2.2-develop-…
zakdma May 2, 2019
a0ad646
Merge remote-tracking branch 'origin/MAGETWO-98948' into 2.2-develop-…
zakdma May 2, 2019
94ea76d
Revert "PR #4142"
May 2, 2019
a08dd4e
Merge pull request #4156 from magento-tango/PR-2019-4-29-revert
dhorytskyi May 2, 2019
9935b8f
Merge remote-tracking branch 'mainline/2.2-develop' into 2.2-develop-prs
May 2, 2019
e2c4216
merge magento/2.2-develop into magento-tsg/2.2-develop-pr94
magento-cicd2 May 3, 2019
744c318
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 3, 2019
d1a6187
merge magento/2.2-develop into magento-tsg/2.2-develop-pr94
magento-cicd2 May 3, 2019
b146f54
Merge pull request #4159 from magento-tsg/2.2-develop-pr94
zakdma May 3, 2019
afb2e78
ENGCOM-5017: [Backport] Alignment Issue While Editing Order Data cont…
sidolov May 3, 2019
ad15ec1
ENGCOM-5016: [Backport] Non existing file, when adding image to galle…
sidolov May 3, 2019
200c236
ENGCOM-4799: Checkout Totals Sort Order fields can't be empty and sho…
sidolov May 3, 2019
dbb1747
Merge remote-tracking branch 'upstream/2.2-develop' into MQE-1536
jilu1 May 3, 2019
3372a60
Merge pull request #4148 from magento-pangolin/MQE-1536
KevinBKozan May 3, 2019
d4cb573
[EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 3, 2019
69cadfd
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 6, 2019
bb80daa
ENGCOM-4842: [Backport] Fix configurable dropdown showing tax incorre…
sidolov May 6, 2019
d1b24f1
ENGCOM-4767: Magento Catalog - fix custom option type text price conv…
sidolov May 6, 2019
f8c9b03
:arrows_clockwise: [EngCom] Public Pull Requests - 2.2-develop
magento-engcom-team May 6, 2019
6a23ed5
21842 - do not cache absolute file paths
david-fuehr Mar 19, 2019
e79bf2c
clean up Validator Factory
david-fuehr Mar 20, 2019
d36d8b6
untouch static method call to prevent codacy fail
david-fuehr Mar 20, 2019
945c642
changes due to backword compatiblity constraints
david-fuehr Apr 1, 2019
6fcf88a
magento/magento2#21856: Static test fix.
p-bystritsky Apr 18, 2019
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
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@ public function __construct(
*
* @return string
*/
public function getValuesHtml(): string
public function getValuesHtml()
{
$option = $this->getOption();
$optionType = $option->getType();
Original file line number Diff line number Diff line change
@@ -48,6 +48,10 @@ define([
params :
[params];

if (typeof message === 'function') {
message = message.call(rule);
}

message = params.reduce(function (msg, param, idx) {
return msg.replace(new RegExp('\\{' + idx + '\\}', 'g'), param);
}, message);
26 changes: 19 additions & 7 deletions lib/web/css/source/lib/_icons.less
Original file line number Diff line number Diff line change
@@ -25,9 +25,12 @@
@_icon-font-text-hide: @icon-font__text-hide,
@_icon-font-display: @icon-font__display
) when (@_icon-font-position = before) {
._lib-icon-text-hide(@_icon-font-text-hide);
.lib-css(display, @_icon-font-display);
text-decoration: none;
text-decoration: none;

& when not (@_icon-font-content = false) {
._lib-icon-text-hide(@_icon-font-text-hide);
}

&:before {
._lib-icon-font(
@@ -68,10 +71,13 @@
@_icon-font-text-hide: @icon-font__text-hide,
@_icon-font-display: @icon-font__display
) when (@_icon-font-position = after) {
._lib-icon-text-hide(@_icon-font-text-hide);
.lib-css(display, @_icon-font-display);
text-decoration: none;


& when not (@_icon-font-content = false) {
._lib-icon-text-hide(@_icon-font-text-hide);
}

&:after {
._lib-icon-font(
@_icon-font-content,
@@ -151,8 +157,11 @@
@_icon-image-text-hide: @icon__text-hide
) when (@_icon-image-position = before) {
display: inline-block;
._lib-icon-text-hide(@_icon-image-text-hide);


& when not (@_icon-image = false) {
._lib-icon-text-hide(@_icon-image-text-hide);
}

&:before {
._lib-icon-image(
@_icon-image,
@@ -179,7 +188,10 @@
@_icon-image-text-hide: @icon__text-hide
) when (@_icon-image-position = after) {
display: inline-block;
._lib-icon-text-hide(@_icon-image-text-hide);

& when not (@_icon-image = false) {
._lib-icon-text-hide(@_icon-font-text-hide);
}

&:after {
._lib-icon-image(
12 changes: 10 additions & 2 deletions lib/web/fotorama/fotorama.js
Original file line number Diff line number Diff line change
@@ -1455,16 +1455,24 @@ fotoramaVersion = '4.6.4';
}
} else {
stopEvent(e);
(options.onMove || noop).call(el, e, {touch: touchFLAG});
if (movedEnough(xDiff,yDiff)) {
(options.onMove || noop).call(el, e, {touch: touchFLAG});
}
}

if (!moved && Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2)) > tolerance) {
if (!moved && movedEnough(xDiff, yDiff) && Math.sqrt(Math.pow(xDiff, 2) + Math.pow(yDiff, 2)) > tolerance)
{
moved = true;
}

tail.checked = tail.checked || xWin || yWin;
}


function movedEnough(xDiff, yDiff) {
return xDiff > yDiff && xDiff > 1.5;
}

function onEnd(e) {
(options.onTouchEnd || noop)();

5 changes: 1 addition & 4 deletions lib/web/fotorama/fotorama.min.js

Large diffs are not rendered by default.

18 changes: 14 additions & 4 deletions lib/web/mage/adminhtml/wysiwyg/tiny_mce/setup.js
Original file line number Diff line number Diff line change
@@ -238,10 +238,18 @@ define([
* @param {Object} o
*/
openFileBrowser: function (o) {
var typeTitle,
storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0,
frameDialog = jQuery(o.win.frameElement).parents('[role="dialog"]'),
wUrl = this.config['files_browser_window_url'] +
var targetElementID = tinyMCE.activeEditor.getElement().getAttribute('id'),
originId = this.id,
typeTitle,
storeId,
frameDialog,
wUrl;

this.initialize(targetElementID, this.config);

storeId = this.config['store_id'] !== null ? this.config['store_id'] : 0;
frameDialog = jQuery(o.win.frameElement).parents('[role="dialog"]');
wUrl = this.config['files_browser_window_url'] +
'target_element_id/' + this.id + '/' +
'store/' + storeId + '/';

@@ -255,6 +263,8 @@ define([
typeTitle = this.translate('Insert File...');
}

this.initialize(originId, this.config);

frameDialog.hide();
jQuery('#mceModalBlocker').hide();

2 changes: 1 addition & 1 deletion lib/web/mage/gallery/gallery.js
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ define([
this.setupBreakpoints();
this.initFullscreenSettings();

this.settings.$element.on('mousedown', '.fotorama__stage__frame', function () {
this.settings.$element.on('click', '.fotorama__stage__frame', function () {
if (
!$(this).parents('.fotorama__shadows--left, .fotorama__shadows--right').length &&
!$(this).hasClass('fotorama-video-container')
7 changes: 6 additions & 1 deletion nginx.conf.sample
Original file line number Diff line number Diff line change
@@ -164,6 +164,11 @@ location /media/downloadable/ {
location /media/import/ {
deny all;
}
location /errors/ {
location ~* \.xml$ {
deny all;
}
}

# PHP entry point for main application
location ~ ^/(index|get|static|errors/report|errors/404|errors/503|health_check)\.php$ {
@@ -203,6 +208,6 @@ gzip_types
gzip_vary on;

# Banned locations (only reached if the earlier PHP entry point regexes don't match)
location ~* (\.php$|\.htaccess$|\.git) {
location ~* (\.php$|\.phtml$|\.htaccess$|\.git) {
deny all;
}
3 changes: 3 additions & 0 deletions pub/errors/.htaccess
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
Options None
<FilesMatch "\.(xml|phtml)$">
Deny from all
</FilesMatch>
<IfModule mod_rewrite.c>
RewriteEngine Off
</IfModule>