Merge remote-tracking branch 'mainline/develop' into MAGETWO-62964
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/composer.json 1 addition, 1 deletiondev/tests/functional/composer.json
- dev/tests/functional/etc/repository_replacer_payments.xml 17 additions, 0 deletionsdev/tests/functional/etc/repository_replacer_payments.xml
- 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/functional/tests/app/Magento/Braintree/Test/Constraint/AssertTransactionIsPresentInSettlementReport.php 13 additions, 6 deletions...nstraint/AssertTransactionIsPresentInSettlementReport.php
- dev/tests/functional/tests/app/Magento/Braintree/Test/Fixture/BraintreeSandboxCustomer.xml 19 additions, 0 deletions...gento/Braintree/Test/Fixture/BraintreeSandboxCustomer.xml
- dev/tests/functional/tests/app/Magento/Braintree/Test/Repository/BraintreeSandboxCustomer.xml 17 additions, 0 deletions...to/Braintree/Test/Repository/BraintreeSandboxCustomer.xml
Please register or sign in to comment