Merge remote-tracking branch 'mainline/develop' into MAGETWO-43824 (3e602ff4) · Commits · KIII-12 / Magento

Commit 3e602ff4 authored 9 years ago by

Sviatoslav Mankivskyi

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

Conflicts:
	app/code/Magento/Ui/view/base/web/js/form/adapter.js
	app/code/Magento/Ui/view/base/web/js/form/form.js

parents 17a7af4c 03ec736b

Branches master

Hide whitespace changes

Inline Side-by-side

Showing

app/code/Magento/CatalogRule/Api/Data/ConditionInterface.php 125 additions, 0 deletions

app/code/Magento/CatalogRule/Api/Data/ConditionInterface.php
app/code/Magento/CatalogRule/Api/Data/RuleInterface.php 9 additions, 26 deletions

app/code/Magento/CatalogRule/Api/Data/RuleInterface.php
app/code/Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php 34 additions, 0 deletions

...Magento/CatalogRule/Block/Adminhtml/Edit/DeleteButton.php
app/code/Magento/CatalogRule/Block/Adminhtml/Edit/GenericButton.php 74 additions, 0 deletions

...agento/CatalogRule/Block/Adminhtml/Edit/GenericButton.php
app/code/Magento/CatalogRule/Block/Adminhtml/Edit/ResetButton.php 30 additions, 0 deletions

.../Magento/CatalogRule/Block/Adminhtml/Edit/ResetButton.php
app/code/Magento/CatalogRule/Block/Adminhtml/Edit/SaveAndApplyButton.php 30 additions, 0 deletions

...o/CatalogRule/Block/Adminhtml/Edit/SaveAndApplyButton.php
app/code/Magento/CatalogRule/Block/Adminhtml/Edit/SaveAndContinueButton.php 30 additions, 0 deletions

...atalogRule/Block/Adminhtml/Edit/SaveAndContinueButton.php
app/code/Magento/CatalogRule/Block/Adminhtml/Edit/SaveButton.php 29 additions, 0 deletions

...e/Magento/CatalogRule/Block/Adminhtml/Edit/SaveButton.php
app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php 0 additions, 95 deletions

...agento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php
app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Form.php 0 additions, 47 deletions

...o/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Form.php
app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php 0 additions, 126 deletions

...ogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php 41 additions, 2 deletions

...ule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php 0 additions, 235 deletions

...talogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tabs.php 0 additions, 26 deletions

...o/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tabs.php
app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php 1 addition, 1 deletion

...CatalogRule/Controller/Adminhtml/Promo/Catalog/Delete.php
app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php 5 additions, 7 deletions

...o/CatalogRule/Controller/Adminhtml/Promo/Catalog/Edit.php
app/code/Magento/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php 5 additions, 9 deletions

...o/CatalogRule/Controller/Adminhtml/Promo/Catalog/Save.php
app/code/Magento/CatalogRule/Controller/RegistryConstants.php 19 additions, 0 deletions

...code/Magento/CatalogRule/Controller/RegistryConstants.php
app/code/Magento/CatalogRule/Model/Data/Condition.php 144 additions, 0 deletions

app/code/Magento/CatalogRule/Model/Data/Condition.php
app/code/Magento/CatalogRule/Model/Data/Condition/Converter.php 73 additions, 0 deletions

...de/Magento/CatalogRule/Model/Data/Condition/Converter.php

with 649 additions and 574 deletions

Please register or to comment

Admin message

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