Merge remote-tracking branch 'origin/MAGETWO-39018' into BUGS (4117944b) · Commits · KIII-12 / Magento

Commit 4117944b authored 9 years ago by

Sergey Semenov

Browse files

Merge remote-tracking branch 'origin/MAGETWO-39018' into BUGS

parents 1314e873 75ccf015

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php 7 additions, 4 deletions

...to/Backend/Block/Widget/Grid/Column/Renderer/Checkbox.php
app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml 1 addition, 1 deletion

...alog/view/adminhtml/templates/catalog/category/tree.phtml
app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js 1 addition, 4 deletions

...view/adminhtml/web/catalog/product/composite/configure.js
app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php 64 additions, 18 deletions

...CatalogSearch/Model/Adapter/Mysql/Filter/Preprocessor.php
app/code/Magento/ConfigurableProduct/view/adminhtml/templates/product/configurable/affected-attribute-set-selector/js.phtml 9 additions, 0 deletions

...uct/configurable/affected-attribute-set-selector/js.phtml
app/code/Magento/GroupedProduct/view/adminhtml/layout/groupedproduct_popup_grid.xml 8 additions, 2 deletions

...oduct/view/adminhtml/layout/groupedproduct_popup_grid.xml
app/code/Magento/GroupedProduct/view/adminhtml/web/js/grouped-product.js 4 additions, 4 deletions

...o/GroupedProduct/view/adminhtml/web/js/grouped-product.js
app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php 4 additions, 4 deletions

...de/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
app/code/Magento/ImportExport/view/adminhtml/templates/export/form/after.phtml 2 additions, 2 deletions

...rtExport/view/adminhtml/templates/export/form/after.phtml
app/code/Magento/Integration/Block/Adminhtml/Integration/Tokens.php 1 addition, 1 deletion

...agento/Integration/Block/Adminhtml/Integration/Tokens.php
app/code/Magento/Integration/view/adminhtml/templates/integration/activate/permissions/tab/webapi.phtml 1 addition, 1 deletion

...mplates/integration/activate/permissions/tab/webapi.phtml
app/code/Magento/Payment/view/frontend/web/js/model/credit-card-validation/validator.js 22 additions, 1 deletion

...frontend/web/js/model/credit-card-validation/validator.js
app/code/Magento/Payment/view/frontend/web/template/payment/cc-form.html 1 addition, 1 deletion

...o/Payment/view/frontend/web/template/payment/cc-form.html
app/code/Magento/ProductVideo/view/adminhtml/web/js/video-modal.js 39 additions, 41 deletions

...Magento/ProductVideo/view/adminhtml/web/js/video-modal.js
app/code/Magento/ProductVideo/view/frontend/layout/catalog_product_view.xml 0 additions, 4 deletions

...roductVideo/view/frontend/layout/catalog_product_view.xml
app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js 15 additions, 14 deletions

.../Magento/Sales/view/adminhtml/web/order/create/scripts.js
app/code/Magento/Ui/view/base/web/js/grid/sticky/sticky.js 7 additions, 6 deletions

app/code/Magento/Ui/view/base/web/js/grid/sticky/sticky.js
app/code/Magento/Ui/view/base/web/js/lib/core/storage.js 64 additions, 0 deletions

app/code/Magento/Ui/view/base/web/js/lib/core/storage.js
app/code/Magento/Ui/view/base/web/js/modal/modal.js 1 addition, 1 deletion

app/code/Magento/Ui/view/base/web/js/modal/modal.js
app/code/Magento/Wishlist/CustomerData/Wishlist.php 70 additions, 29 deletions

app/code/Magento/Wishlist/CustomerData/Wishlist.php

with 321 additions and 138 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/MAGETWO-39018' into BUGS