Skip to content

Commit 0e3ecda

Browse files
fascinosumfascinosum
committed
MAGETWO-71868: Merge release branch into 2.0-develop
1 parent 31c82a5 commit 0e3ecda

File tree

7 files changed

+238
-189
lines changed

7 files changed

+238
-189
lines changed

‎app/code/Magento/Ui/view/base/web/js/grid/columns/thumbnail.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
define([
67
'./column',
78
'jquery',
89
'mage/template',
910
'text!Magento_Ui/templates/grid/cells/thumbnail/preview.html',
11+
'underscore',
1012
'Magento_Ui/js/modal/modal',
1113
'mage/translate'
12-
], function (Column, $, mageTemplate, thumbnailPreviewTemplate) {
14+
], function (Column, $, mageTemplate, thumbnailPreviewTemplate, _) {
1315
'use strict';
1416

1517
return Column.extend({
@@ -29,7 +31,7 @@ define([
2931
return row[this.index + '_link'];
3032
},
3133
getAlt: function (row) {
32-
return row[this.index + '_alt']
34+
return _.escape(row[this.index + '_alt']);
3335
},
3436
isPreviewAvailable: function() {
3537
return this.has_preview || false;

‎app/code/Magento/Widget/Controller/Adminhtml/Widget/LoadOptions.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010

1111
class LoadOptions extends \Magento\Backend\App\Action
1212
{
13+
/**
14+
* @inheritdoc
15+
*/
16+
const ADMIN_RESOURCE = 'Magento_Widget::widget_instance';
17+
1318
/**
1419
* @var \Magento\Widget\Helper\Conditions
1520
*/
@@ -46,7 +51,8 @@ public function execute()
4651
} catch (\Magento\Framework\Exception\LocalizedException $e) {
4752
$result = ['error' => true, 'message' => $e->getMessage()];
4853
$this->getResponse()->representJson(
49-
$this->_objectManager->get('Magento\Framework\Json\Helper\Data')->jsonEncode($result)
54+
$this->_objectManager->get(\Magento\Framework\Json\Helper\Data::class)
55+
->jsonEncode($result)
5056
);
5157
}
5258
}

‎composer.json

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2ce",
33
"description": "Magento 2 (Community Edition)",
44
"type": "project",
5-
"version": "2.0.15",
5+
"version": "2.0.16",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"
@@ -72,106 +72,106 @@
7272
"lusitanian/oauth": "~0.3 <=0.7.0"
7373
},
7474
"replace": {
75-
"magento/module-marketplace": "100.0.6",
76-
"magento/module-admin-notification": "100.0.6",
75+
"magento/module-marketplace": "100.0.7",
76+
"magento/module-admin-notification": "100.0.7",
7777
"magento/module-advanced-pricing-import-export": "100.0.7",
7878
"magento/module-authorization": "100.0.6",
79-
"magento/module-authorizenet": "100.0.8",
80-
"magento/module-backend": "100.0.10",
81-
"magento/module-backup": "100.0.7",
79+
"magento/module-authorizenet": "100.0.9",
80+
"magento/module-backend": "100.0.11",
81+
"magento/module-backup": "100.0.8",
8282
"magento/module-braintree": "100.0.10",
83-
"magento/module-bundle": "100.0.7",
83+
"magento/module-bundle": "100.0.8",
8484
"magento/module-bundle-import-export": "100.0.7",
8585
"magento/module-cache-invalidate": "100.0.7",
8686
"magento/module-captcha": "100.0.8",
87-
"magento/module-catalog": "100.0.13",
87+
"magento/module-catalog": "100.0.15",
8888
"magento/module-catalog-import-export": "100.0.10",
8989
"magento/module-catalog-inventory": "100.0.8",
90-
"magento/module-catalog-rule": "100.0.8",
90+
"magento/module-catalog-rule": "100.0.9",
9191
"magento/module-catalog-rule-configurable": "100.0.7",
92-
"magento/module-catalog-search": "100.0.7",
92+
"magento/module-catalog-search": "100.0.8",
9393
"magento/module-catalog-url-rewrite": "100.0.9",
94-
"magento/module-catalog-widget": "100.0.6",
95-
"magento/module-checkout": "100.0.12",
96-
"magento/module-checkout-agreements": "100.0.6",
97-
"magento/module-cms": "100.0.6",
94+
"magento/module-catalog-widget": "100.0.7",
95+
"magento/module-checkout": "100.0.14",
96+
"magento/module-checkout-agreements": "100.0.7",
97+
"magento/module-cms": "100.0.8",
9898
"magento/module-cms-url-rewrite": "100.0.6",
99-
"magento/module-config": "100.0.6",
99+
"magento/module-config": "100.0.7",
100100
"magento/module-configurable-import-export": "100.0.6",
101-
"magento/module-configurable-product": "100.0.9",
101+
"magento/module-configurable-product": "100.0.11",
102102
"magento/module-contact": "100.0.6",
103103
"magento/module-cookie": "100.0.6",
104104
"magento/module-cron": "100.0.6",
105-
"magento/module-currency-symbol": "100.0.6",
106-
"magento/module-customer": "100.0.11",
107-
"magento/module-customer-import-export": "100.0.7",
105+
"magento/module-currency-symbol": "100.0.7",
106+
"magento/module-customer": "100.0.13",
107+
"magento/module-customer-import-export": "100.0.8",
108108
"magento/module-deploy": "100.0.8",
109109
"magento/module-developer": "100.0.6",
110110
"magento/module-dhl": "100.0.7",
111111
"magento/module-directory": "100.0.7",
112-
"magento/module-downloadable": "100.0.7",
112+
"magento/module-downloadable": "100.0.9",
113113
"magento/module-downloadable-import-export": "100.0.6",
114114
"magento/module-eav": "100.0.10",
115-
"magento/module-email": "100.0.7",
116-
"magento/module-encryption-key": "100.0.6",
115+
"magento/module-email": "100.0.8",
116+
"magento/module-encryption-key": "100.0.7",
117117
"magento/module-fedex": "100.0.7",
118118
"magento/module-gift-message": "100.0.7",
119119
"magento/module-google-adwords": "100.0.6",
120120
"magento/module-google-analytics": "100.0.6",
121121
"magento/module-google-optimizer": "100.0.7",
122122
"magento/module-grouped-import-export": "100.0.6",
123-
"magento/module-grouped-product": "100.0.7",
124-
"magento/module-import-export": "100.0.7",
123+
"magento/module-grouped-product": "100.0.8",
124+
"magento/module-import-export": "100.0.8",
125125
"magento/module-indexer": "100.0.7",
126-
"magento/module-integration": "100.0.7",
126+
"magento/module-integration": "100.0.9",
127127
"magento/module-layered-navigation": "100.0.6",
128-
"magento/module-media-storage": "100.0.6",
128+
"magento/module-media-storage": "100.0.7",
129129
"magento/module-msrp": "100.0.6",
130130
"magento/module-multishipping": "100.0.7",
131131
"magento/module-new-relic-reporting": "100.0.6",
132-
"magento/module-newsletter": "100.0.9",
132+
"magento/module-newsletter": "100.0.10",
133133
"magento/module-offline-payments": "100.0.8",
134134
"magento/module-offline-shipping": "100.0.6",
135-
"magento/module-page-cache": "100.0.8",
136-
"magento/module-payment": "100.0.10",
137-
"magento/module-paypal": "100.0.8",
135+
"magento/module-page-cache": "100.0.9",
136+
"magento/module-payment": "100.0.12",
137+
"magento/module-paypal": "100.0.11",
138138
"magento/module-persistent": "100.0.6",
139139
"magento/module-product-alert": "100.0.7",
140-
"magento/module-product-video": "100.0.8",
140+
"magento/module-product-video": "100.0.10",
141141
"magento/module-quote": "100.0.10",
142-
"magento/module-reports": "100.0.7",
142+
"magento/module-reports": "100.0.8",
143143
"magento/module-require-js": "100.0.7",
144-
"magento/module-review": "100.0.6",
145-
"magento/module-rss": "100.0.6",
146-
"magento/module-rule": "100.0.7",
147-
"magento/module-sales": "100.0.13",
144+
"magento/module-review": "100.0.7",
145+
"magento/module-rss": "100.0.7",
146+
"magento/module-rule": "100.0.8",
147+
"magento/module-sales": "100.0.15",
148148
"magento/module-sales-inventory": "100.0.1",
149-
"magento/module-sales-rule": "100.0.8",
149+
"magento/module-sales-rule": "100.0.10",
150150
"magento/module-sales-sequence": "100.0.6",
151151
"magento/module-sample-data": "100.0.6",
152-
"magento/module-search": "100.0.7",
152+
"magento/module-search": "100.0.9",
153153
"magento/module-send-friend": "100.0.6",
154-
"magento/module-shipping": "100.0.8",
155-
"magento/module-sitemap": "100.0.6",
156-
"magento/module-store": "100.0.7",
154+
"magento/module-shipping": "100.0.9",
155+
"magento/module-sitemap": "100.0.7",
156+
"magento/module-store": "100.0.8",
157157
"magento/module-swagger": "100.0.6",
158-
"magento/module-swatches": "100.0.10",
159-
"magento/module-tax": "100.0.8",
160-
"magento/module-tax-import-export": "100.0.6",
161-
"magento/module-theme": "100.0.8",
158+
"magento/module-swatches": "100.0.11",
159+
"magento/module-tax": "100.0.9",
160+
"magento/module-tax-import-export": "100.0.7",
161+
"magento/module-theme": "100.0.9",
162162
"magento/module-translation": "100.0.6",
163-
"magento/module-ui": "100.0.8",
164-
"magento/module-ups": "100.0.7",
165-
"magento/module-url-rewrite": "100.0.6",
166-
"magento/module-user": "100.0.7",
167-
"magento/module-usps": "100.0.6",
168-
"magento/module-variable": "100.0.6",
163+
"magento/module-ui": "100.0.10",
164+
"magento/module-ups": "100.0.8",
165+
"magento/module-url-rewrite": "100.0.7",
166+
"magento/module-user": "100.0.8",
167+
"magento/module-usps": "100.0.7",
168+
"magento/module-variable": "100.0.7",
169169
"magento/module-version": "100.0.6",
170-
"magento/module-webapi": "100.0.7",
170+
"magento/module-webapi": "100.0.8",
171171
"magento/module-webapi-security": "100.0.2",
172172
"magento/module-weee": "100.0.6",
173-
"magento/module-widget": "100.0.7",
174-
"magento/module-wishlist": "100.0.8",
173+
"magento/module-widget": "100.0.9",
174+
"magento/module-wishlist": "100.0.10",
175175
"magento/theme-adminhtml-backend": "100.0.8",
176176
"magento/theme-frontend-blank": "100.0.7",
177177
"magento/theme-frontend-luma": "100.0.7",
@@ -182,7 +182,7 @@
182182
"magento/language-nl_nl": "100.0.6",
183183
"magento/language-pt_br": "100.0.6",
184184
"magento/language-zh_hans_cn": "100.0.6",
185-
"magento/framework": "100.0.15",
185+
"magento/framework": "100.0.18",
186186
"trentrichardson/jquery-timepicker-addon": "1.4.3",
187187
"colinmollenhour/cache-backend-redis": "1.8",
188188
"components/jquery": "1.11.0",

0 commit comments

Comments
 (0)