Skip to content

Commit

Permalink
Merge pull request #926 from magento-engcom/develop-prs
Browse files Browse the repository at this point in the history
[EngCom] Public Pull Requests
  • Loading branch information
vrann authored Mar 15, 2017
2 parents 3c34e1d + a0e1515 commit b47cb1f
Show file tree
Hide file tree
Showing 467 changed files with 4 additions and 3 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/code/Magento/Braintree/view/base/web/images/paypal-small.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/code/Magento/Braintree/view/base/web/images/paypal.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/code/Magento/Captcha/view/adminhtml/web/reload.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/code/Magento/Checkout/view/frontend/web/cvv.png
Binary file modified app/code/Magento/Cms/view/adminhtml/web/images/widget_block.png
Binary file modified app/code/Magento/Dhl/view/adminhtml/web/logo.jpg
Binary file modified app/code/Magento/Email/view/frontend/web/logo_email.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/ae.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/di.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/dn.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/jcb.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/mc.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/md.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/mi.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/sm.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/so.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/un.png
Binary file modified app/code/Magento/Payment/view/base/web/images/cc/vi.png
Binary file modified app/code/Magento/Paypal/view/adminhtml/web/images/pp-allinone.png
Binary file modified app/code/Magento/Paypal/view/adminhtml/web/images/pp-alt.png
Binary file modified app/code/Magento/Paypal/view/adminhtml/web/images/pp-gateways.png
Binary file modified app/code/Magento/Paypal/view/adminhtml/web/images/pp-uk.png
Binary file modified app/code/Magento/Paypal/view/adminhtml/web/section.png
Binary file modified app/code/Magento/Theme/view/adminhtml/web/calendar.png
Binary file modified app/code/Magento/Theme/view/adminhtml/web/fam_book_open.png
Binary file modified app/code/Magento/Theme/view/frontend/web/calendar.png
Binary file modified app/code/Magento/Theme/view/frontend/web/fam_book_open.png
Binary file modified app/code/Magento/Widget/view/adminhtml/web/placeholder.gif
Binary file modified app/design/adminhtml/Magento/backend/web/images/ajax-loader.gif
Binary file modified app/design/adminhtml/Magento/backend/web/images/fam_leaf.png
Binary file modified app/design/adminhtml/Magento/backend/web/images/rating-bg.png
Binary file modified app/design/adminhtml/Magento/backend/web/images/subconfig-bg.png
Binary file modified app/design/adminhtml/Magento/backend/web/images/switcher.png
Binary file modified app/design/frontend/Magento/blank/media/preview.jpg
Binary file modified app/design/frontend/Magento/luma/media/preview.jpg
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
<constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
</variation>
<variation name="ApplyCatalogRuleForSimpleProductWithCustomOptions" summary="Apply Catalog Rule for Simple Product With Custom Options" ticketId="MAGETWO-23038">
<data name="tag" xsi:type="string">stable:no</data>
<data name="products/0" xsi:type="string">catalogProductSimple::with_default_custom_option</data>
<data name="products/1" xsi:type="string">catalogProductSimple::with_percent_and_fixed_custom_option</data>
<data name="products/2" xsi:type="string">catalogProductSimple::with_custom_options_and_price_56_78</data>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,9 +282,9 @@ protected function expectedValidate()
return [
'type' => 'image/jpeg',
'title' => 'test.jpg',
'quote_path' => 'custom_options/quote/t/e/e1d601731b4b1a84163cd0e9370a4fcb.jpg',
'order_path' => 'custom_options/order/t/e/e1d601731b4b1a84163cd0e9370a4fcb.jpg',
'size' => '3300',
'quote_path' => 'custom_options/quote/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
'order_path' => 'custom_options/order/t/e/a071b9ffc8fda6df1652c05a4c61bf8a.jpg',
'size' => '3046',
'width' => 136,
'height' => 131,
];
Expand Down
Binary file modified lib/internal/Magento/Framework/Api/Test/Unit/Api/_files/image.jpg
Binary file modified lib/web/extjs/resources/images/aero/basic-dialog/bg-left.gif
Binary file modified lib/web/extjs/resources/images/aero/basic-dialog/expand-over.gif
Binary file modified lib/web/extjs/resources/images/aero/basic-dialog/hd-sprite.gif
Binary file modified lib/web/extjs/resources/images/aero/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/aero/grid/sort_asc.gif
Binary file modified lib/web/extjs/resources/images/aero/layout/collapse.gif
Binary file modified lib/web/extjs/resources/images/aero/layout/expand.gif
Binary file modified lib/web/extjs/resources/images/aero/layout/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/aero/layout/ns-collapse.gif
Binary file modified lib/web/extjs/resources/images/aero/menu/item-over.gif
Binary file modified lib/web/extjs/resources/images/aero/menu/unchecked.gif
Binary file modified lib/web/extjs/resources/images/aero/qtip/bg.gif
Binary file modified lib/web/extjs/resources/images/aero/sizer/nw-handle-dark.gif
Binary file modified lib/web/extjs/resources/images/aero/sizer/se-handle-dark.gif
Binary file modified lib/web/extjs/resources/images/aero/tabs/tab-btm-left-bg.gif
Binary file modified lib/web/extjs/resources/images/aero/tabs/tab-sprite.gif
Binary file modified lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.gif
Binary file modified lib/web/extjs/resources/images/aero/tabs/tab-strip-bg.png
Binary file modified lib/web/extjs/resources/images/aero/tabs/tab-strip-btm-bg.gif
Binary file modified lib/web/extjs/resources/images/aero/toolbar/bg.gif
Binary file modified lib/web/extjs/resources/images/aero/toolbar/tb-btn-sprite.gif
Binary file modified lib/web/extjs/resources/images/default/box/tb-blue.gif
Binary file modified lib/web/extjs/resources/images/default/editor/tb-sprite.gif
Binary file modified lib/web/extjs/resources/images/default/form/clear-trigger.gif
Binary file modified lib/web/extjs/resources/images/default/form/date-trigger.gif
Binary file modified lib/web/extjs/resources/images/default/form/text-bg.gif
Binary file modified lib/web/extjs/resources/images/default/form/trigger.gif
Binary file modified lib/web/extjs/resources/images/default/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/default/grid/drop-no.gif
Binary file modified lib/web/extjs/resources/images/default/grid/grid-loading.gif
Binary file modified lib/web/extjs/resources/images/default/grid/grid3-hd-btn.gif
Binary file modified lib/web/extjs/resources/images/default/grid/grid3-hrow-over.gif
Binary file modified lib/web/extjs/resources/images/default/grid/grid3-hrow.gif
Binary file modified lib/web/extjs/resources/images/default/grid/hmenu-desc.gif
Binary file modified lib/web/extjs/resources/images/default/grid/hmenu-lock.gif
Binary file modified lib/web/extjs/resources/images/default/grid/hmenu-lock.png
Binary file modified lib/web/extjs/resources/images/default/grid/hmenu-unlock.png
Binary file modified lib/web/extjs/resources/images/default/grid/loading.gif
Binary file modified lib/web/extjs/resources/images/default/grid/nowait.gif
Binary file modified lib/web/extjs/resources/images/default/grid/row-over.gif
Binary file modified lib/web/extjs/resources/images/default/grid/row-sel.gif
Binary file modified lib/web/extjs/resources/images/default/grid/sort_asc.gif
Binary file modified lib/web/extjs/resources/images/default/grid/wait.gif
Binary file modified lib/web/extjs/resources/images/default/layout/collapse.gif
Binary file modified lib/web/extjs/resources/images/default/layout/expand.gif
Binary file modified lib/web/extjs/resources/images/default/layout/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/default/layout/ns-collapse.gif
Binary file modified lib/web/extjs/resources/images/default/layout/stick.gif
Binary file modified lib/web/extjs/resources/images/default/layout/stuck.gif
Binary file modified lib/web/extjs/resources/images/default/menu/checked.gif
Binary file modified lib/web/extjs/resources/images/default/menu/group-checked.gif
Binary file modified lib/web/extjs/resources/images/default/panel/corners-sprite.gif
Binary file modified lib/web/extjs/resources/images/default/panel/tool-sprites.gif
Binary file modified lib/web/extjs/resources/images/default/panel/top-bottom.gif
Binary file modified lib/web/extjs/resources/images/default/qtip/bg.gif
Binary file modified lib/web/extjs/resources/images/default/qtip/close.gif
Binary file modified lib/web/extjs/resources/images/default/qtip/tip-sprite.gif
Binary file modified lib/web/extjs/resources/images/default/shadow-lr.png
Binary file modified lib/web/extjs/resources/images/default/shadow.png
Binary file modified lib/web/extjs/resources/images/default/shared/calendar.gif
Binary file modified lib/web/extjs/resources/images/default/shared/glass-bg.gif
Binary file modified lib/web/extjs/resources/images/default/sizer/se-handle-dark.gif
Binary file modified lib/web/extjs/resources/images/default/toolbar/gray-bg.gif
Binary file modified lib/web/extjs/resources/images/default/toolbar/tb-bg.gif
Binary file modified lib/web/extjs/resources/images/default/tree/drop-between.gif
Binary file modified lib/web/extjs/resources/images/default/tree/drop-over.gif
Binary file modified lib/web/extjs/resources/images/default/tree/elbow-plus-nl.gif
Binary file modified lib/web/extjs/resources/images/default/tree/folder-open.gif
Binary file modified lib/web/extjs/resources/images/default/tree/leaf.gif
Binary file modified lib/web/extjs/resources/images/default/tree/loading.gif
Binary file modified lib/web/extjs/resources/images/default/window/top-bottom.gif
Binary file modified lib/web/extjs/resources/images/galdaka/basic-dialog/close.gif
Binary file modified lib/web/extjs/resources/images/galdaka/form/choose-trigger.gif
Binary file modified lib/web/extjs/resources/images/galdaka/grid/grid-hrow.gif
Binary file modified lib/web/extjs/resources/images/galdaka/grid/loading.gif
Binary file modified lib/web/extjs/resources/images/galdaka/layout/collapse.gif
Binary file modified lib/web/extjs/resources/images/galdaka/layout/expand.gif
Binary file modified lib/web/extjs/resources/images/galdaka/layout/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/galdaka/layout/ns-collapse.gif
Binary file modified lib/web/extjs/resources/images/galdaka/layout/panel-close.gif
Binary file modified lib/web/extjs/resources/images/galdaka/menu/group-checked.gif
Binary file modified lib/web/extjs/resources/images/galdaka/qtip/tip-sprite.gif
Binary file modified lib/web/extjs/resources/images/galdaka/toolbar/btn-over-bg.gif
Binary file modified lib/web/extjs/resources/images/gray/basic-dialog/dlg-bg.gif
Binary file modified lib/web/extjs/resources/images/gray/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/gray/grid/grid-hrow.gif
Binary file modified lib/web/extjs/resources/images/gray/layout/collapse.gif
Binary file modified lib/web/extjs/resources/images/gray/layout/expand.gif
Binary file modified lib/web/extjs/resources/images/gray/layout/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/gray/layout/ns-collapse.gif
Binary file modified lib/web/extjs/resources/images/gray/layout/panel-title-bg.gif
Binary file modified lib/web/extjs/resources/images/gray/layout/stick.gif
Binary file modified lib/web/extjs/resources/images/gray/menu/checked.gif
Binary file modified lib/web/extjs/resources/images/gray/menu/group-checked.gif
Binary file modified lib/web/extjs/resources/images/gray/qtip/bg.gif
Binary file modified lib/web/extjs/resources/images/gray/qtip/tip-sprite.gif
Binary file modified lib/web/extjs/resources/images/gray/sizer/nw-handle-dark.gif
Binary file modified lib/web/extjs/resources/images/gray/sizer/se-handle-dark.gif
Binary file modified lib/web/extjs/resources/images/gray/tabs/tab-btm-left-bg.gif
Binary file modified lib/web/extjs/resources/images/gray/toolbar/gray-bg.gif
Binary file modified lib/web/extjs/resources/images/gray/toolbar/tb-btn-sprite.gif
Binary file modified lib/web/extjs/resources/images/magento/basic-dialog/expand.gif
Binary file modified lib/web/extjs/resources/images/magento/layout/checkered-bg.gif
Binary file modified lib/web/extjs/resources/images/magento/loading_bg.gif
Binary file modified lib/web/extjs/resources/images/magento/tabs/tab-sprite.gif
Binary file modified lib/web/extjs/resources/images/magento/toolbar/btn-arrow.gif
Binary file modified lib/web/extjs/resources/images/magento/toolbar/header_bg.gif
Binary file modified lib/web/extjs/resources/images/vista/basic-dialog/bg-left.gif
Binary file modified lib/web/extjs/resources/images/vista/basic-dialog/bg-right.gif
Binary file modified lib/web/extjs/resources/images/vista/basic-dialog/dlg-bg.gif
Binary file modified lib/web/extjs/resources/images/vista/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/vista/layout/collapse.gif
Binary file modified lib/web/extjs/resources/images/vista/layout/expand.gif
Binary file modified lib/web/extjs/resources/images/vista/layout/gradient-bg.gif
Binary file modified lib/web/extjs/resources/images/vista/layout/ns-collapse.gif
Binary file modified lib/web/extjs/resources/images/vista/layout/panel-title-bg.gif
Binary file modified lib/web/extjs/resources/images/vista/layout/stick.gif
Binary file modified lib/web/extjs/resources/images/vista/qtip/bg.gif
Binary file modified lib/web/extjs/resources/images/vista/sizer/nw-handle-dark.gif
Binary file modified lib/web/extjs/resources/images/vista/sizer/se-handle-dark.gif
Binary file modified lib/web/extjs/resources/images/vista/tabs/tab-btm-left-bg.gif
Binary file modified lib/web/extjs/resources/images/vista/tabs/tab-btm-right-bg.gif
Binary file modified lib/web/extjs/resources/images/vista/toolbar/gray-bg.gif
Binary file modified lib/web/extjs/resources/images/vista/toolbar/tb-btn-sprite.gif
Loading

0 comments on commit b47cb1f

Please sign in to comment.