Skip to content

Commit b4f31ea

Browse files
author
Robert He
committed
Merge branch 'develop' into FearlessKiwis-MAGETWO-51577-downloadable_configurable_product_functional_tests
2 parents 322f062 + b5900bc commit b4f31ea

File tree

523 files changed

+10922
-5068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

523 files changed

+10922
-5068
lines changed

‎.htaccess

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44

55
# SetEnv MAGE_MODE developer
66

7-
############################################
8-
## overrides default umask value to allow using different
9-
## file permissions
10-
11-
# SetEnv MAGE_UMASK 022
12-
137
############################################
148
## uncomment these lines for CGI mode
159
## make sure to specify the correct cgi php binary file name
@@ -281,6 +275,10 @@
281275
order allow,deny
282276
deny from all
283277
</Files>
278+
<Files magento_umask>
279+
order allow,deny
280+
deny from all
281+
</Files>
284282

285283
################################
286284
## If running in cluster environment, uncomment this

‎.htaccess.sample

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,10 @@
274274
order allow,deny
275275
deny from all
276276
</Files>
277+
<Files magento_umask>
278+
order allow,deny
279+
deny from all
280+
</Files>
277281

278282
################################
279283
## If running in cluster environment, uncomment this

‎app/bootstrap.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
error_reporting(E_ALL);
1111
#ini_set('display_errors', 1);
1212

13-
/* Custom umask value may be provided in MAGE_UMASK environment variable */
14-
$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
15-
umask($mask);
16-
1713
/* PHP version validation */
1814
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 50522) {
1915
if (PHP_SAPI == 'cli') {
@@ -34,6 +30,11 @@
3430
require_once __DIR__ . '/autoload.php';
3531
require_once BP . '/app/functions.php';
3632

33+
/* Custom umask value may be provided in optional mage_umask file in root */
34+
$umaskFile = BP . '/magento_umask';
35+
$mask = file_exists($umaskFile) ? octdec(file_get_contents($umaskFile)) : 002;
36+
umask($mask);
37+
3738
if (!empty($_SERVER['MAGE_PROFILER'])
3839
&& isset($_SERVER['HTTP_ACCEPT'])
3940
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,14 @@ protected function _prepareColumns()
8080

8181
$this->addColumn(
8282
'orders_count',
83-
['header' => __('Orders'), 'sortable' => false, 'index' => 'orders_count', 'type' => 'number']
83+
[
84+
'header' => __('Orders'),
85+
'sortable' => false,
86+
'index' => 'orders_count',
87+
'type' => 'number',
88+
'header_css_class' => 'col-orders',
89+
'column_css_class' => 'col-orders'
90+
]
8491
);
8592

8693
$baseCurrencyCode = (string)$this->_storeManager->getStore(

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,14 @@ protected function _prepareColumns()
7878

7979
$this->addColumn(
8080
'orders_count',
81-
['header' => __('Orders'), 'sortable' => false, 'index' => 'orders_count', 'type' => 'number']
81+
[
82+
'header' => __('Orders'),
83+
'sortable' => false,
84+
'index' => 'orders_count',
85+
'type' => 'number',
86+
'header_css_class' => 'col-orders',
87+
'column_css_class' => 'col-orders'
88+
]
8289
);
8390

8491
$baseCurrencyCode = (string)$this->_storeManager->getStore(

‎app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
?>
1010
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
11-
<?php /* @escapeNotVerified */ echo __('Copyright&copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
11+
<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>

‎app/code/Magento/Backend/view/adminhtml/templates/page/js/calendar.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ require([
5050
showTime: false,
5151
showHour: false,
5252
showMinute: false,
53+
serverTimezoneSeconds: <?php echo (int) $block->getStoreTimestamp(); ?>,
5354
yearRange: '<?php /* @escapeNotVerified */ echo $block->getYearRange() ?>'
5455
}
5556
});

‎app/code/Magento/Backend/view/adminhtml/ui_component/design_config_form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
</field>
7575
<field name="theme">
7676
<argument name="data" xsi:type="array">
77-
<item name="options" xsi:type="object">Magento\Framework\View\Design\Theme\Label</item>
77+
<item name="options" xsi:type="object">Magento\Theme\Model\Design\Theme\Label</item>
7878
<item name="config" xsi:type="array">
7979
<item name="formElement" xsi:type="string">select</item>
8080
<item name="dataType" xsi:type="string">text</item>

‎app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
*/
66
-->
77

8-
<div class="admin_field-complex" if="element.addButton">
9-
<div class="admin_field-complex-title">
8+
<div class="admin__field-complex" if="element.addButton">
9+
<div class="admin__field-complex-title">
1010
<span class="label" translate="'User Agent Rules'"></span>
1111
</div>
1212

13-
<div class="admin_field-complex-elements">
13+
<div class="admin__field-complex-elements">
1414
<render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
1515
<button attr="{disabled: disabled}"
1616
class="action-secondary"
@@ -20,7 +20,7 @@
2020
</button>
2121
</div>
2222

23-
<div class="admin_field-complex-content"
23+
<div class="admin__field-complex-content"
2424
translate="'User agent exceptions override product and CMS pages rules.'"></div>
2525
</div>
2626

‎app/code/Magento/Braintree/view/adminhtml/web/js/vault.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77
define([
88
'jquery',
99
'uiComponent',
10-
'Magento_Ui/js/modal/alert',
11-
'Magento_Checkout/js/model/full-screen-loader'
12-
], function ($, Class, alert, fullScreenLoader) {
10+
'Magento_Ui/js/modal/alert'
11+
], function ($, Class, alert) {
1312
'use strict';
1413

1514
return Class.extend({
@@ -84,7 +83,7 @@ define([
8483
submitOrder: function () {
8584
this.$selector.validate().form();
8685
this.$selector.trigger('afterValidate.beforeSubmit');
87-
fullScreenLoader.stopLoader();
86+
$('body').trigger('processStop');
8887

8988
// validate parent form
9089
if (this.$selector.validate().errorList.length) {
@@ -106,7 +105,7 @@ define([
106105
getPaymentMethodNonce: function () {
107106
var self = this;
108107

109-
fullScreenLoader.startLoader();
108+
$('body').trigger('processStart');
110109

111110
$.get(self.nonceUrl, {
112111
'public_hash': self.publicHash
@@ -118,7 +117,7 @@ define([
118117

119118
self.error(failed.message);
120119
}).always(function () {
121-
fullScreenLoader.stopLoader();
120+
$('body').trigger('processStop');
122121
});
123122
},
124123

0 commit comments

Comments
 (0)