Merge pull request #733 from magento-frontend/pr-develop
Bugs: MAGETWO-60185 Remove distinction in http/https for requirejs-config.js MAGETWO-60611 [Magento Cloud] - Static files not being generated correctly on prod(Race condition in merging files) MAGETWO-59322 Incorrect scope filter caching in UI grids MAGETWO-55393 [Github #5636] Many storeviews break the page
Showing
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/labels.phtml 22 additions, 20 deletions...dminhtml/templates/catalog/product/attribute/labels.phtml
- app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/options.phtml 3 additions, 3 deletions...minhtml/templates/catalog/product/attribute/options.phtml
- app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml 3 additions, 0 deletions...o/Catalog/view/adminhtml/ui_component/product_listing.xml
- app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml 5 additions, 4 deletions...dminhtml/templates/catalog/product/attribute/visual.phtml
- app/code/Magento/Ui/view/base/web/js/grid/data-storage.js 38 additions, 3 deletionsapp/code/Magento/Ui/view/base/web/js/grid/data-storage.js
- app/design/adminhtml/Magento/backend/web/css/source/forms/fields/_control-table.less 1 addition, 0 deletions...o/backend/web/css/source/forms/fields/_control-table.less
- app/design/adminhtml/Magento/backend/web/css/styles-old.less 5 additions, 0 deletionsapp/design/adminhtml/Magento/backend/web/css/styles-old.less
- dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Cache.php 6 additions, 3 deletions...sts/functional/lib/Magento/Mtf/Util/Command/Cli/Cache.php
- dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/StaticContent.php 30 additions, 0 deletions...tional/lib/Magento/Mtf/Util/Command/Cli/StaticContent.php
- dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php 91 additions, 0 deletions...ento/Backend/Test/Constraint/AssertHttpUsedOnFrontend.php
- dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php 101 additions, 0 deletions...ento/Backend/Test/Constraint/AssertHttpsUsedOnBackend.php
- dev/tests/functional/tests/app/Magento/Backend/Test/Repository/ConfigData.xml 19 additions, 1 deletion.../tests/app/Magento/Backend/Test/Repository/ConfigData.xml
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ConfigureSecureUrlsTest.php 157 additions, 0 deletions...Magento/Backend/Test/TestCase/ConfigureSecureUrlsTest.php
- dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ConfigureSecureUrlsTest.xml 17 additions, 0 deletions...Magento/Backend/Test/TestCase/ConfigureSecureUrlsTest.xml
- dev/tests/functional/tests/app/Magento/Backend/Test/etc/di.xml 10 additions, 0 deletions...ests/functional/tests/app/Magento/Backend/Test/etc/di.xml
- dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/grid/data-storage.test.js 76 additions, 0 deletions...sts/app/code/Magento/Ui/base/js/grid/data-storage.test.js
- lib/internal/Magento/Framework/Filesystem/Directory/Write.php 1 addition, 1 deletion...internal/Magento/Framework/Filesystem/Directory/Write.php
- lib/internal/Magento/Framework/Filesystem/Test/Unit/Directory/WriteTest.php 67 additions, 3 deletions...to/Framework/Filesystem/Test/Unit/Directory/WriteTest.php
- lib/internal/Magento/Framework/View/Asset/File/FallbackContext.php 2 additions, 14 deletions...nal/Magento/Framework/View/Asset/File/FallbackContext.php
- lib/internal/Magento/Framework/View/Asset/MergeStrategy/Direct.php 5 additions, 2 deletions...nal/Magento/Framework/View/Asset/MergeStrategy/Direct.php
Please register or sign in to comment