Merge "RCFilters: Update URL even when we skip fetching"

[lhc/web/wiklou.git] / resources / Resources.php

diff --git a/resources/Resources.php b/resources/Resources.php
index a0e1863..a5bfbc5 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -133,7 +133,7 @@ return [
 
        'jquery' => [
                'scripts' => [
-                       'resources/lib/jquery/jquery3.js',
+                       'resources/lib/jquery/jquery.js',
                        'resources/lib/jquery/jquery.migrate.js',
                ],
                'raw' => true,
@@ -1134,6 +1134,7 @@ return [
                'scripts' => 'resources/src/mediawiki/mediawiki.notification.js',
                'dependencies' => [
                        'mediawiki.util',
+                       'mediawiki.visibleTimeout',
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
@@ -1392,6 +1393,10 @@ return [
                'styles' => 'resources/src/mediawiki/mediawiki.editfont.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
+       'mediawiki.visibleTimeout' => [
+               'scripts' => 'resources/src/mediawiki/mediawiki.visibleTimeout.js',
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
 
        /* MediaWiki Action */
 
@@ -1854,6 +1859,7 @@ return [
                        'rcfilters-savedqueries-new-name-label',
                        'rcfilters-savedqueries-new-name-placeholder',
                        'rcfilters-savedqueries-add-new-title',
+                       'rcfilters-savedqueries-already-saved',
                        'rcfilters-savedqueries-apply-label',
                        'rcfilters-savedqueries-apply-and-setdefault-label',
                        'rcfilters-savedqueries-cancel-label',
@@ -1916,7 +1922,10 @@ return [
                ],
        ],
        'mediawiki.special' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.css',
+               'styles' => [
+                       'resources/src/mediawiki.special/mediawiki.special.css',
+                       'resources/src/mediawiki.special/mediawiki.special.userrights.css',
+               ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
        'mediawiki.special.apisandbox.styles' => [
@@ -1966,6 +1975,8 @@ return [
                        'api-help-param-integer-minmax',
                        'api-help-param-multi-separate',
                        'api-help-param-multi-max',
+                       'api-help-param-maxbytes',
+                       'api-help-param-maxchars',
                        'apisandbox-submit-invalid-fields-title',
                        'apisandbox-submit-invalid-fields-message',
                        'apisandbox-results',
@@ -2077,10 +2088,11 @@ return [
        'mediawiki.special.pagesWithProp' => [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
        ],
-       'mediawiki.special.preferences' => [
+       'mediawiki.special.preferences.ooui' => [
                'scripts' => [
                        'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
+                       'resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
                        'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
                ],
@@ -2094,9 +2106,12 @@ return [
                        'mediawiki.language',
                        'mediawiki.confirmCloseWindow',
                        'mediawiki.notification.convertmessagebox',
+                       'oojs-ui-widgets',
+                       'mediawiki.widgets.SelectWithInputWidget',
+                       'mediawiki.editfont.styles',
                ],
        ],
-       'mediawiki.special.preferences.styles' => [
+       'mediawiki.special.preferences.styles.ooui' => [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css',
        ],
        'mediawiki.special.recentchanges' => [
@@ -2220,7 +2235,6 @@ return [
                ],
        ],
        'mediawiki.special.userrights' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css',
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js',
                'dependencies' => [
                        'mediawiki.notification.convertmessagebox',
@@ -2735,6 +2749,7 @@ return [
                        'oojs-ui.styles.icons-moderation',
                ],
                'messages' => [
+                       'ooui-item-remove',
                        'ooui-outline-control-move-down',
                        'ooui-outline-control-move-up',
                        'ooui-outline-control-remove',