Merge "Avoid lock acquisition errors for multi-title refreshlinks jobs"

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

diff --git a/resources/Resources.php b/resources/Resources.php
index f725efe..09bd4dc 100644 (file)
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1379,6 +1379,7 @@ return [
                ]
        ],
        'mediawiki.util' => [
+               'class' => 'ResourceLoaderMediaWikiUtilModule',
                'scripts' => 'resources/src/mediawiki/mediawiki.util.js',
                'dependencies' => [
                        'jquery.accessKeyLabel',
@@ -1423,7 +1424,6 @@ return [
                'styles' => 'resources/src/mediawiki.action/mediawiki.action.edit.css',
                'dependencies' => [
                        'mediawiki.action.edit.styles',
-                       'jquery.accessKeyLabel',
                        'jquery.textSelection',
                        'jquery.byteLimit',
                        'mediawiki.widgets.visibleByteLimit',
@@ -1453,6 +1453,7 @@ return [
                        'mediawiki.diff.styles',
                        'mediawiki.util',
                        'mediawiki.jqueryMsg',
+                       'oojs-ui-core',
                ],
                'messages' => [
                        // Keep the uses message keys in sync with EditPage#setHeaders
@@ -1815,6 +1816,7 @@ return [
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.MenuSelectWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ViewSwitchWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ValuePickerWidget.less',
+                       'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesLimitPopupWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.DatePopupWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.FilterWrapperWidget.less',
                        'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less',
@@ -1835,6 +1837,8 @@ return [
                'messages' => [
                        'rcfilters-activefilters',
                        'rcfilters-advancedfilters',
+                       'rcfilters-group-results-by-page',
+                       'rcfilters-grouping-title',
                        'rcfilters-limit-title',
                        'rcfilters-limit-shownum',
                        'rcfilters-days-title',
@@ -1853,9 +1857,11 @@ return [
                        'rcfilters-savedqueries-new-name-placeholder',
                        'rcfilters-savedqueries-add-new-title',
                        'rcfilters-savedqueries-apply-label',
+                       'rcfilters-savedqueries-apply-and-setdefault-label',
                        'rcfilters-savedqueries-cancel-label',
                        'rcfilters-restore-default-filters',
                        'rcfilters-clear-all-filters',
+                       'rcfilters-show-new-changes',
                        'rcfilters-search-placeholder',
                        'rcfilters-invalid-filter',
                        'rcfilters-empty-filter',
@@ -1875,11 +1881,15 @@ return [
                        'rcfilters-tag-prefix-tags',
                        'rcfilters-exclude-button-off',
                        'rcfilters-exclude-button-on',
+                       'rcfilters-view-advanced-filters-label',
                        'rcfilters-view-tags',
                        'rcfilters-view-namespaces-tooltip',
                        'rcfilters-view-tags-tooltip',
                        'rcfilters-view-return-to-default-tooltip',
                        'rcfilters-liveupdates-button',
+                       'rcfilters-liveupdates-button-title-on',
+                       'rcfilters-liveupdates-button-title-off',
+                       'rcfilters-other-review-tools',
                        'blanknamespace',
                        'namespaces',
                        'invert',
@@ -1888,6 +1898,7 @@ return [
                ],
                'dependencies' => [
                        'oojs-ui',
+                       'jquery.makeCollapsible',
                        'mediawiki.language',
                        'mediawiki.user',
                        'mediawiki.rcfilters.filters.dm',
@@ -2206,11 +2217,27 @@ return [
        ],
        'mediawiki.special.watchlist' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.js',
+               'messages' => [
+                       'addedwatchtext',
+                       'addedwatchtext-talk',
+                       'removedwatchtext',
+                       'removedwatchtext-talk',
+                       'tooltip-ca-watch',
+                       'tooltip-ca-unwatch',
+                       'watchlist-unwatch',
+                       'watchlist-unwatch-undo',
+               ],
                'dependencies' => [
-                       'mediawiki.api',
+                       'mediawiki.api.watch',
+                       'mediawiki.jqueryMsg',
+                       'mediawiki.Title',
+                       'mediawiki.util',
                        'oojs-ui-core',
                        'user.options',
-               ]
+               ],
+       ],
+       'mediawiki.special.watchlist.styles' => [
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.css',
        ],
        'mediawiki.special.version' => [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',
@@ -2239,6 +2266,7 @@ return [
        ],
        // Used in the web installer. Test it after modifying this definition!
        'mediawiki.legacy.shared' => [
+               'targets' => [ 'desktop', 'mobile' ],
                'styles' => [
                        'resources/src/mediawiki.legacy/shared.css' => [ 'media' => 'screen' ]
                ],