Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-48223 (0e42b4d1) · Commits · KIII-12 / Magento

Commit 0e42b4d1 authored 9 years ago by

Oleh Posyniak

Browse files

Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-48223

parents 7a864240 8fd3e8af

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/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/Category/View.php 5 additions, 3 deletions

app/code/Magento/Catalog/Controller/Category/View.php
app/code/Magento/Catalog/Model/Category.php 4 additions, 1 deletion

app/code/Magento/Catalog/Model/Category.php
app/code/Magento/Catalog/Model/Category/DataProvider.php 1 addition, 1 deletion

app/code/Magento/Catalog/Model/Category/DataProvider.php
app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php 1 addition, 1 deletion

...ode/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php
app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php 7 additions, 7 deletions

...oduct/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
app/code/Magento/Catalog/Model/Product/Attribute/Repository.php 13 additions, 2 deletions

...de/Magento/Catalog/Model/Product/Attribute/Repository.php
app/code/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php 26 additions, 0 deletions

...ode/Magento/Catalog/Model/ResourceModel/Eav/Attribute.php
app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/InventoryTest.php 10 additions, 0 deletions

...nhtml/Product/Edit/Action/Attribute/Tab/InventoryTest.php
app/code/Magento/Catalog/Test/Unit/Model/Product/Attribute/RepositoryTest.php 9 additions, 1 deletion

...alog/Test/Unit/Model/Product/Attribute/RepositoryTest.php

with 266 additions and 109 deletions

Please register or to comment

Admin message

Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-48223