MAGETWO-56063: After upgrading from 2.0.7 to 2.1, editing a category gives a 500 error
Merge remote-tracking branch 'mainline/develop' into MAGETWO-56063-upgrade-from-2.0.7-to-2.1.0
Showing
- .htaccess 24 additions, 0 deletions.htaccess
- .user.ini 4 additions, 0 deletions.user.ini
- Gruntfile.js.sample 7 additions, 2 deletionsGruntfile.js.sample
- app/code/Magento/AdminNotification/Ui/Component/DataProvider/DataProvider.php 36 additions, 0 deletions...inNotification/Ui/Component/DataProvider/DataProvider.php
- app/code/Magento/AdminNotification/composer.json 1 addition, 0 deletionsapp/code/Magento/AdminNotification/composer.json
- app/code/Magento/AdminNotification/view/adminhtml/layout/default.xml 1 addition, 5 deletions...gento/AdminNotification/view/adminhtml/layout/default.xml
- app/code/Magento/AdminNotification/view/adminhtml/ui_component/notification_area.xml 52 additions, 0 deletions...ication/view/adminhtml/ui_component/notification_area.xml
- app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/columns/message.js 46 additions, 0 deletions...otification/view/adminhtml/web/js/grid/columns/message.js
- app/code/Magento/AdminNotification/view/adminhtml/web/js/grid/listing.js 63 additions, 0 deletions...o/AdminNotification/view/adminhtml/web/js/grid/listing.js
- app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/cells/message.html 8 additions, 0 deletions...ation/view/adminhtml/web/template/grid/cells/message.html
- app/code/Magento/AdminNotification/view/adminhtml/web/template/grid/listing.html 32 additions, 0 deletions...otification/view/adminhtml/web/template/grid/listing.html
- app/code/Magento/Backend/Block/Store/Switcher.php 1 addition, 7 deletionsapp/code/Magento/Backend/Block/Store/Switcher.php
- app/code/Magento/Backend/Model/View/Result/Redirect.php 2 additions, 1 deletionapp/code/Magento/Backend/Model/View/Result/Redirect.php
- app/code/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php 53 additions, 0 deletions...de/Magento/Backend/Test/Unit/Block/Store/SwitcherTest.php
- app/code/Magento/Backend/view/adminhtml/templates/system/shipping/applicable_country.phtml 5 additions, 2 deletions...inhtml/templates/system/shipping/applicable_country.phtml
- app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml 6 additions, 0 deletions...ackend/view/adminhtml/ui_component/design_config_form.xml
- app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/cells/action-delete.html 1 addition, 1 deletion...inhtml/web/template/dynamic-rows/cells/action-delete.html
- app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html 4 additions, 4 deletions...ackend/view/adminhtml/web/template/dynamic-rows/grid.html
- app/code/Magento/Braintree/Gateway/Command/CaptureStrategyCommand.php 17 additions, 8 deletions...ento/Braintree/Gateway/Command/CaptureStrategyCommand.php
- app/code/Magento/Braintree/Gateway/Config/Config.php 10 additions, 0 deletionsapp/code/Magento/Braintree/Gateway/Config/Config.php
Please register or sign in to comment