jenkins-bot has submitted this change and it was merged.

Change subject: Update OOjs UI to v0.18.1
......................................................................


Update OOjs UI to v0.18.1

Release notes:
 
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.18.1

Change-Id: I5fe3129c9ccf3fa20494b5934bca7487d8d36879
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/.eslintrc.json
M oojs/oojs-ui/History.md
M oojs/oojs-ui/i18n/el.json
M oojs/oojs-ui/package.json
7 files changed, 72 insertions(+), 54 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 6065b01..094dd4f 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
                "mediawiki/at-ease": "1.1.0",
                "monolog/monolog": "1.18.2",
                "nmred/kafka-php": "0.1.5",
-               "oojs/oojs-ui": "0.18.0",
+               "oojs/oojs-ui": "0.18.1",
                "oyejorge/less.php": "1.7.0.10",
                "pear/console_getopt": "1.4.1",
                "pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 05b7f58..193b6fe 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
         "This file is @generated automatically"
     ],
-    "hash": "292faee4fba200fdaf2f34e66a03ff92",
-    "content-hash": "e83297b8a45f948622cd770f5464d102",
+    "hash": "11c4efda1918bd4f691dba69af2fff34",
+    "content-hash": "2831edfb7a355781ca75751e650087d1",
     "packages": [
         {
             "name": "composer/semver",
@@ -466,16 +466,16 @@
         },
         {
             "name": "oojs/oojs-ui",
-            "version": "v0.18.0",
+            "version": "v0.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/wikimedia/oojs-ui.git";,
-                "reference": "9bb664bf24be66b4d887b976fd6e71c460c15ffd"
+                "reference": "4f8a906bac3a2fb7e1df5bcf184c96c7f79c6624"
             },
             "dist": {
                 "type": "zip",
-                "url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/9bb664bf24be66b4d887b976fd6e71c460c15ffd";,
-                "reference": "9bb664bf24be66b4d887b976fd6e71c460c15ffd",
+                "url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/4f8a906bac3a2fb7e1df5bcf184c96c7f79c6624";,
+                "reference": "4f8a906bac3a2fb7e1df5bcf184c96c7f79c6624",
                 "shasum": ""
             },
             "require": {
@@ -541,7 +541,7 @@
             ],
             "description": "Provides library of common widgets, layouts, and 
windows.",
             "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-            "time": "2016-11-08 23:36:02"
+            "time": "2016-11-29 22:02:31"
         },
         {
             "name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index 4d5f9d5..33a342f 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1973,18 +1973,51 @@
         "homepage": "https://github.com/firebase/php-jwt";
     },
     {
-        "name": "oojs/oojs-ui",
-        "version": "v0.18.0",
-        "version_normalized": "0.18.0.0",
+        "name": "stil/gd-text",
+        "version": "v1.0.0",
+        "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/wikimedia/oojs-ui.git";,
-            "reference": "9bb664bf24be66b4d887b976fd6e71c460c15ffd"
+            "url": "https://github.com/stil/gd-text.git";,
+            "reference": "a3e561afd5a53a6a4b0c1d64ebaf51e768348a66"
         },
         "dist": {
             "type": "zip",
-            "url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/9bb664bf24be66b4d887b976fd6e71c460c15ffd";,
-            "reference": "9bb664bf24be66b4d887b976fd6e71c460c15ffd",
+            "url": 
"https://api.github.com/repos/stil/gd-text/zipball/a3e561afd5a53a6a4b0c1d64ebaf51e768348a66";,
+            "reference": "a3e561afd5a53a6a4b0c1d64ebaf51e768348a66",
+            "shasum": ""
+        },
+        "require": {
+            "ext-gd": "*",
+            "php": ">=5.3"
+        },
+        "time": "2015-01-02 12:21:25",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "GDText\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/";,
+        "license": [
+            "MIT"
+        ],
+        "description": "A class drawing multiline and aligned text on 
pictures. Uses GD extension."
+    },
+    {
+        "name": "oojs/oojs-ui",
+        "version": "v0.18.1",
+        "version_normalized": "0.18.1.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/wikimedia/oojs-ui.git";,
+            "reference": "4f8a906bac3a2fb7e1df5bcf184c96c7f79c6624"
+        },
+        "dist": {
+            "type": "zip",
+            "url": 
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/4f8a906bac3a2fb7e1df5bcf184c96c7f79c6624";,
+            "reference": "4f8a906bac3a2fb7e1df5bcf184c96c7f79c6624",
             "shasum": ""
         },
         "require": {
@@ -1996,7 +2029,7 @@
             "mediawiki/mediawiki-codesniffer": "0.6.0",
             "phpunit/phpunit": "4.8.21"
         },
-        "time": "2016-11-08 23:36:02",
+        "time": "2016-11-29 22:02:31",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -2052,38 +2085,5 @@
         ],
         "description": "Provides library of common widgets, layouts, and 
windows.",
         "homepage": "https://www.mediawiki.org/wiki/OOjs_UI";
-    },
-    {
-        "name": "stil/gd-text",
-        "version": "v1.0.0",
-        "version_normalized": "1.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/stil/gd-text.git";,
-            "reference": "a3e561afd5a53a6a4b0c1d64ebaf51e768348a66"
-        },
-        "dist": {
-            "type": "zip",
-            "url": 
"https://api.github.com/repos/stil/gd-text/zipball/a3e561afd5a53a6a4b0c1d64ebaf51e768348a66";,
-            "reference": "a3e561afd5a53a6a4b0c1d64ebaf51e768348a66",
-            "shasum": ""
-        },
-        "require": {
-            "ext-gd": "*",
-            "php": ">=5.3"
-        },
-        "time": "2015-01-02 12:21:25",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "GDText\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/";,
-        "license": [
-            "MIT"
-        ],
-        "description": "A class drawing multiline and aligned text on 
pictures. Uses GD extension."
     }
 ]
diff --git a/oojs/oojs-ui/.eslintrc.json b/oojs/oojs-ui/.eslintrc.json
index bb22a9a..aaf8b7f 100644
--- a/oojs/oojs-ui/.eslintrc.json
+++ b/oojs/oojs-ui/.eslintrc.json
@@ -13,8 +13,7 @@
     },
 
     "rules": {
-        "dot-notation": 0,
-               "valid-jsdoc": 0,
-               "wrap-iife": 0
+        "dot-notation": [ "error", { "allowKeywords": true } ],
+        "valid-jsdoc": 0
     }
 }
diff --git a/oojs/oojs-ui/History.md b/oojs/oojs-ui/History.md
index 07695a5..bed1b26 100644
--- a/oojs/oojs-ui/History.md
+++ b/oojs/oojs-ui/History.md
@@ -1,4 +1,22 @@
 # OOjs UI Release History
+## v0.18.1 / 2016-11-29
+### Features
+* PopupElement: Allow $autoCloseIgnore to be overridden (Roan Kattouw)
+* WindowManager: Allow $returnFocusTo to be null (Ed Sanders)
+
+### Styles
+* MediaWiki theme: Reduce, align `margin` and `padding` of form elements 
(Volker E)
+* MediaWiki theme: Replace color function with palette color (Volker E)
+* MediaWiki theme: Standard placeholder colours for CapsuleMultiselectWidget 
too (Bartosz Dziewoński)
+* MediaWiki theme: Tweak destructive red for background-independent contrast 
(Volker E)
+
+### Code
+* Field & Fieldset: Make help popup code consistent (Ed Sanders)
+* PopupWidget: Consistently use OO.ui.contains() for auto-closing (Roan 
Kattouw)
+* build: Bump eslint-config-wikimedia to v0.3.0 and make pass (James D. 
Forrester)
+* eslint: Re-enable wrap-iife and partially enable dot-notation (Ed Sanders)
+
+
 ## v0.18.0 / 2016-11-08
 ### Breaking changes
 * [BREAKING CHANGE] ComboBoxWidget: Remove this deprecated alias for 
ComboBoxInputWidget (James D. Forrester)
diff --git a/oojs/oojs-ui/i18n/el.json b/oojs/oojs-ui/i18n/el.json
index 8538417..98835d5 100644
--- a/oojs/oojs-ui/i18n/el.json
+++ b/oojs/oojs-ui/i18n/el.json
@@ -24,6 +24,7 @@
        "ooui-dialog-process-dismiss": "Απόρριψη",
        "ooui-dialog-process-retry": "Δοκιμάστε ξανά",
        "ooui-dialog-process-continue": "Συνέχεια",
+       "ooui-selectfile-button-select": "Επιλέξτε ένα αρχείο",
        "ooui-selectfile-not-supported": "Επιλογή αρχείου δεν υποστηρίζεται",
        "ooui-selectfile-placeholder": "Κανένα αρχείο δεν είναι επιλεγμένο",
        "ooui-selectfile-dragdrop-placeholder": "Σύρετε το αρχείο εδώ"
diff --git a/oojs/oojs-ui/package.json b/oojs/oojs-ui/package.json
index 232e4e3..45e9815 100644
--- a/oojs/oojs-ui/package.json
+++ b/oojs/oojs-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
     "oojs-plugin",
@@ -26,7 +26,7 @@
     "oojs": "1.1.10"
   },
   "devDependencies": {
-    "eslint-config-wikimedia": "0.2.0",
+    "eslint-config-wikimedia": "0.3.0",
     "grunt": "1.0.1",
     "grunt-banana-checker": "0.5.0",
     "grunt-contrib-clean": "1.0.0",

-- 
To view, visit https://gerrit.wikimedia.org/r/324359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5fe3129c9ccf3fa20494b5934bca7487d8d36879
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to