Merge remote-tracking branch 'mainline/2.1-develop' into 2.1.8-develop

Author: duhon

CONTRIBUTING.md

@@ -29,3 +29,8 @@ If you are a new GitHub user, we recommend that you create your own [free github
 3. Create and test your work.
 4. Fork the Magento 2 repository according to [Fork a repository instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#fork) and when you are ready to send us a pull request – follow [Create a pull request instructions](http://devdocs.magento.com/guides/v2.0/contributor-guide/contributing.html#pull_request).
 5. Once your contribution is received, Magento 2 development team will review the contribution and collaborate with you as needed to improve the quality of the contribution.
+
+## Code of Conduct
+
+Please note that this project is released with a Contributor Code of Conduct. We expect you to agree to its terms when participating in this project.
+The full text is available in the repository [Wiki](https://github.com/magento/magento2/wiki/Magento-Code-of-Conduct).

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -213,6 +213,7 @@ private function prepareMeta()
                 'dataScope' => 'qty',
                 'validation' => [
                     'validate-number' => true,
+                    'validate-integer' => true,
                     'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
                 ],
                 'imports' => [

app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

@@ -95,6 +95,7 @@
                         <item name="dataScope" xsi:type="string">quantity_and_stock_status.qty</item>
                         <item name="validation" xsi:type="array">
                             <item name="validate-number" xsi:type="boolean">true</item>
+                            <item name="validate-integer" xsi:type="boolean">true</item>
                             <item name="less-than-equals-to" xsi:type="number">99999999</item>
                         </item>
                         <item name="sortOrder" xsi:type="number">200</item>

app/code/Magento/Quote/Setup/UpgradeSchema.php

@@ -55,6 +55,38 @@ public function upgrade(SchemaSetupInterface $setup, ModuleContextInterface $con
                 $setup->getFkName('quote_item', 'product_id', 'catalog_product_entity', 'entity_id')
             );
         }
+        if (version_compare($context->getVersion(), '2.0.4', '<')) {
+            $setup->getConnection(self::$connectionName)->changeColumn(
+                $setup->getTable('quote_address', self::$connectionName),
+                'firstname',
+                'firstname',
+                [
+                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'length' => 255,
+                    'comment' => 'Firstname'
+                ]
+            );
+            $setup->getConnection(self::$connectionName)->changeColumn(
+                $setup->getTable('quote_address', self::$connectionName),
+                'middlename',
+                'middlename',
+                [
+                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'length' => 40,
+                    'comment' => 'Middlename'
+                ]
+            );
+            $setup->getConnection(self::$connectionName)->changeColumn(
+                $setup->getTable('quote_address', self::$connectionName),
+                'lastname',
+                'lastname',
+                [
+                    'type' => \Magento\Framework\DB\Ddl\Table::TYPE_TEXT,
+                    'length' => 255,
+                    'comment' => 'Lastname'
+                ]
+            );
+        }
         $setup->endSetup();
     }
 }

app/code/Magento/Quote/etc/module.xml

@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Magento_Quote" setup_version="2.0.3">
+    <module name="Magento_Quote" setup_version="2.0.4">
     </module>
 </config>

app/code/Magento/Ui/view/base/web/js/lib/validation/rules.js

@@ -572,15 +572,15 @@ define([
             },
             $.mage.__('Please enter a valid number in this field.')
         ],
-        'validate-integer': [
+        "validate-integer": [
             function(value) {
                 return (
-                    utils.isEmptyNoTrim(value)
-                    || (!isNaN(utils.parseNumber(value)) && /^\s*-?\d*\s*$/.test(value))
-                );
-            },
+                     utils.isEmptyNoTrim(value)
+                      || (!isNaN(utils.parseNumber(value)) && /^\s*-?\d*\s*$/.test(value))
+               );
+             },
             $.mage.__('Please enter a valid integer in this field.')
-        ],
+         ],
         "validate-number-range": [
             function(value, param) {
                 if (utils.isEmptyNoTrim(value)) {