Merge remote-tracking branch 'mainline/develop' into develop (330cb1ce) · Commits · KIII-12 / Magento

Commit 330cb1ce authored 9 years ago by

Yaroslav Onischenko

Browse files

Merge remote-tracking branch 'mainline/develop' into develop

parents 9e676992 0fbca058

Branches

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/Backend/Model/Auth/Session.php 2 additions, 15 deletions

app/code/Magento/Backend/Model/Auth/Session.php
app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php 36 additions, 0 deletions

...nto/Backend/Model/Config/SessionLifetime/BackendModel.php
app/code/Magento/Backend/Model/Session/AdminConfig.php 10 additions, 2 deletions

app/code/Magento/Backend/Model/Session/AdminConfig.php
app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php 0 additions, 60 deletions

...code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php
app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php 43 additions, 0 deletions

...st/Unit/Model/Config/SessionLifetime/BackendModelTest.php
app/code/Magento/Backend/etc/adminhtml/system.xml 2 additions, 1 deletion

app/code/Magento/Backend/etc/adminhtml/system.xml
app/code/Magento/Backend/i18n/en_US.csv 3 additions, 1 deletion

app/code/Magento/Backend/i18n/en_US.csv
app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php 1 addition, 0 deletions

...Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php
app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php 1 addition, 14 deletions

...code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php
app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php 5 additions, 0 deletions

...dle/Ui/DataProvider/Product/Form/Modifier/BundlePanel.php
app/code/Magento/Bundle/Ui/DataProvider/Product/Form/Modifier/Composite.php 10 additions, 1 deletion

...undle/Ui/DataProvider/Product/Form/Modifier/Composite.php
app/code/Magento/Bundle/view/adminhtml/templates/product/edit/bundle/option/selection.phtml 1 addition, 1 deletion

...html/templates/product/edit/bundle/option/selection.phtml
app/code/Magento/Bundle/view/adminhtml/web/js/components/bundle-option-qty.js 26 additions, 0 deletions

...dle/view/adminhtml/web/js/components/bundle-option-qty.js
app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php 28 additions, 19 deletions

app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php 15 additions, 0 deletions

...Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
app/code/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php 77 additions, 0 deletions

...de/Magento/Catalog/Block/Category/Plugin/PriceBoxTags.php
app/code/Magento/Catalog/Controller/Adminhtml/Category.php 51 additions, 0 deletions

app/code/Magento/Catalog/Controller/Adminhtml/Category.php
app/code/Magento/Catalog/Controller/Adminhtml/Category/Add.php 36 additions, 3 deletions

...ode/Magento/Catalog/Controller/Adminhtml/Category/Add.php
app/code/Magento/Catalog/Controller/Adminhtml/Category/Edit.php 4 additions, 43 deletions

...de/Magento/Catalog/Controller/Adminhtml/Category/Edit.php
app/code/Magento/Catalog/Controller/Category/View.php 5 additions, 3 deletions

app/code/Magento/Catalog/Controller/Category/View.php

with 356 additions and 163 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'mainline/develop' into develop