From: jenkins-bot Date: Thu, 22 Feb 2018 19:19:29 +0000 (+0000) Subject: Merge "Title: Refactor JS/CSS page handling to be more sane" X-Git-Tag: 1.31.0-rc.0~537 X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=8624538de243da3779db5eb3362bedf78d2e2931;hp=-c Merge "Title: Refactor JS/CSS page handling to be more sane" --- 8624538de243da3779db5eb3362bedf78d2e2931 diff --combined RELEASE-NOTES-1.31 index f49a5822e1,c1bc8f7f39..131a3b959a --- a/RELEASE-NOTES-1.31 +++ b/RELEASE-NOTES-1.31 @@@ -26,8 -26,6 +26,8 @@@ production default mode. * CACHE_ACCEL now only supports APC(u) or WinCache. XCache support was removed as upstream is inactive and has no plans to move to PHP 7. +* The old CategorizedRecentChanges feature, including its related configuration + option $wgAllowCategorizedRecentChanges, has been removed. === New features in 1.31 === * Wikimedia\Rdbms\IDatabase->select() and similar methods now support @@@ -65,7 -63,6 +65,7 @@@ * Updated wikimedia/running-stat from 1.1.0 to 1.2.0. * Updated wikimedia/wrappedstring from 2.2.0 to 2.3.0. * Updated mediawiki/at-ease from 1.1.0 to 1.2.0. +* Updated wikimedia/php-session-serializer from 1.0.4 to 1.0.5. * … ==== New external libraries ==== @@@ -103,10 -100,8 +103,10 @@@ changes to languages because of Phabric * (T186359) New language support: Siberian Tatar [cебертатар] (sty). * (T186635) New language support: Guianan Creole (gcr). * (T186647) New language support: Kumyk [къумукъ] (kum). +* (T187750) New language support: Spanish formal address (es-formal). === Other changes in 1.31 === +* Browser support for Internet Explorer 10 was lowered from Grade A to Grade C. * Introducing multi-content-revision capability into the storage layer. For details, see . * The Revision class was deprecated in favor of RevisionStore, BlobStore, and @@@ -238,10 -233,13 +238,16 @@@ * CommentStore::getCommentLegacy * CommentStore::insert * CommentStore::insertWithTemplate + * The following methods in Title have been renamed, and the old ones are deprecated: + * Title::getSkinFromCssJsSubpage – use ::getSkinFromConfigSubpage + * Title::isCssOrJsPage – use ::isSiteConfigPage + * Title::isCssJsSubpage – use ::isUserConfigPage + * Title::isCssSubpage – use ::isUserCssConfigPage + * Title::isJsSubpage – use ::isUserJsConfigPage * The method ResourceLoaderModule::getPosition(), deprecated in 1.29, has been removed. +* The DeferredStringifier class is deprecated, use Message::listParam() instead. +* The type string for the parameter $lang of DateFormatter::getInstance is + deprecated. == Compatibility == MediaWiki 1.31 requires PHP 5.5.9 or later. Although HHVM 3.18.5 or later is supported, diff --combined includes/DefaultSettings.php index ae5cef5e1d,f31238acb2..35b821cfa0 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@@ -5813,6 -5813,7 +5813,7 @@@ $wgGrantPermissions['editpage']['change $wgGrantPermissions['editprotected'] = $wgGrantPermissions['editpage']; $wgGrantPermissions['editprotected']['editprotected'] = true; + // FIXME: Rename editmycssjs to editmyconfig $wgGrantPermissions['editmycssjs'] = $wgGrantPermissions['editpage']; $wgGrantPermissions['editmycssjs']['editmyusercss'] = true; $wgGrantPermissions['editmycssjs']['editmyuserjs'] = true; @@@ -6953,6 -6954,11 +6954,6 @@@ $wgShowUpdatedMarker = true */ $wgDisableAnonTalk = false; -/** - * Enable filtering of categories in Recentchanges - */ -$wgAllowCategorizedRecentChanges = false; - /** * Allow filtering by change tag in recentchanges, history, etc * Has no effect if no tags are defined in valid_tag. @@@ -7454,7 -7460,6 +7455,7 @@@ $wgJobClasses = 'clearUserWatchlist' => ClearUserWatchlistJob::class, 'cdnPurge' => CdnPurgeJob::class, 'enqueue' => EnqueueJob::class, // local queue for multi-DC setups + 'userGroupExpiry' => UserGroupExpiryJob::class, 'null' => NullJob::class, ]; diff --combined languages/i18n/en.json index bcf0ec5704,3dc01d9a29..d0ee41c27f --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@@ -684,7 -684,7 +684,7 @@@ "userjspreview": "Remember that you are only testing/previewing your user JavaScript.\nIt has not yet been saved!", "sitecsspreview": "Remember that you are only previewing this CSS.\nIt has not yet been saved!", "sitejspreview": "Remember that you are only previewing this JavaScript code.\nIt has not yet been saved!", - "userinvalidcssjstitle": "Warning: There is no skin \"$1\".\nCustom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/vector.css as opposed to {{ns:user}}:Foo/Vector.css.", + "userinvalidconfigtitle": "Warning: There is no skin \"$1\".\nCustom .css and .js pages use a lowercase title, e.g. {{ns:user}}:Foo/vector.css as opposed to {{ns:user}}:Foo/Vector.css.", "updated": "(Updated)", "note": "Note:", "previewnote": "Remember that this is only a preview.\nYour changes have not yet been saved!", @@@ -1073,7 -1073,7 +1073,7 @@@ "prefs-files": "Files", "prefs-custom-css": "Custom CSS", "prefs-custom-js": "Custom JavaScript", - "prefs-common-css-js": "Shared CSS/JavaScript for all skins:", + "prefs-common-config": "Shared CSS/JavaScript for all skins:", "prefs-reset-intro": "You can use this page to reset your preferences to the site defaults.\nThis cannot be undone.", "prefs-emailconfirm-label": "Email confirmation:", "youremail": "Email:", @@@ -1523,6 -1523,8 +1523,6 @@@ "unpatrolledletter": "!", "number_of_watching_users_RCview": "[$1]", "number_of_watching_users_pageview": "[$1 watching {{PLURAL:$1|user|users}}]", - "rc_categories": "Limit to categories (separate with \"|\"):", - "rc_categories_any": "Any of the chosen", "rc-change-size": "$1", "rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} after change", "newsectionsummary": "/* $1 */ new section", @@@ -2761,7 -2763,6 +2761,7 @@@ "thumbnail_dest_directory": "Unable to create destination directory", "thumbnail_image-type": "Image type not supported", "thumbnail_gd-library": "Incomplete GD library configuration: Missing function $1", + "thumbnail_image-size-zero": "Image file size seems to be zero.", "thumbnail_image-missing": "File seems to be missing: $1", "thumbnail_image-failure-limit": "There have been too many recent failed attempts ($1 or more) to render this thumbnail. Please try again later.", "import": "Import pages", diff --combined languages/i18n/qqq.json index f75d9bd79b,c92d7051eb..ec41d37cc1 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@@ -195,8 -195,7 +195,8 @@@ "Wladek92", "Gombang", "Trizek (WMF)", - "Acamicamacaraca" + "Acamicamacaraca", + "Avatar6" ] }, "sidebar": "{{notranslate}}", @@@ -881,7 -880,7 +881,7 @@@ "userjspreview": "Text displayed on preview of every user .js subpage", "sitecsspreview": "Text displayed on preview of .css pages in MediaWiki namespace.\n\nSee also:\n* {{msg-mw|Usercsspreview}}", "sitejspreview": "Text displayed on preview of .js pages in MediaWiki namespace", - "userinvalidcssjstitle": "Parameters:\n* $1 - skin name", + "userinvalidconfigtitle": "Parameters:\n* $1 - skin name", "updated": "{{Identical|Updated}}", "note": "{{Identical|Note}}", "previewnote": "Note displayed when clicking on Show preview", @@@ -1270,7 -1269,7 +1270,7 @@@ "prefs-files": "Title of a tab in [[Special:Preferences]].\n{{Identical|File}}", "prefs-custom-css": "visible on [[Special:Preferences]] -[Skins].\n{{Identical|Custom CSS}}", "prefs-custom-js": "visible on [[Special:Preferences]] -[Skins].\n{{Identical|Custom JavaScript}}", - "prefs-common-css-js": "Used as label in [[Special:Preferences#mw-prefsection-rendering|preferences]], tab \"Appearance\", section \"Skin\".\n\nSee also:\n* {{msg-mw|Globalcssjs-custom-css-js}}", + "prefs-common-config": "Used as label in [[Special:Preferences#mw-prefsection-rendering|preferences]], tab \"Appearance\", section \"Skin\".\n\nSee also:\n* {{msg-mw|Globalcssjs-custom-css-js}}", "prefs-reset-intro": "Used in [[Special:Preferences/reset]].", "prefs-emailconfirm-label": "Sub-heading in [[Special:Preferences]] > {{int:prefs-personal}} > {{int:email}}.", "youremail": "Label of the e-mail text box of the \"E-mail options\" section of [[Special:Preferences]].\nAlso used on create account form.\n\n{{Identical|E-mail}}", @@@ -1720,6 -1719,8 +1720,6 @@@ "unpatrolledletter": "{{optional}}\n\nUsed in {{msg-mw|Recentchanges-label-legend}}, meaning \"unpatrolled\".", "number_of_watching_users_RCview": "{{notranslate}}\nParameters:\n* $1 - number of users who are watching", "number_of_watching_users_pageview": "Used if $wgPageShowWatchingUsers is true.\n* $1 - number of watching user(s)", - "rc_categories": "A label of an input box. Appears on Special:RecentChanges if filtering recent changes by category is enabled (that is, $wgAllowCategorizedRecentChanges is set to true).", - "rc_categories_any": "Appears ''after'' the input box the label of which is {{msg-mw|rc_categories}}, which appears on [[Special:RecentChanges]], if $wgAllowCategorizedRecentChanges is true. \"Chosen\" refers to categories.", "rc-change-size": "{{optional}}\nDoes not work under $wgMiserMode ([[mwr:48986|r48986]]).\n\nParameters:\n* $1 - size of diff", "rc-change-size-new": "Tooltip when hovering a change list diff size. Parameters:\n* $1 - the resulting new size (in bytes)", "newsectionsummary": "Default summary when adding a new section to a page. Parameters:\n* $1 - section title", @@@ -2958,7 -2959,6 +2958,7 @@@ "thumbnail_dest_directory": "Used as thumbnail error message.\n\nSee also:\n* {{msg-mw|Thumbnail error}}\n* {{msg-mw|Thumbnail-temp-create}}\n* {{msg-mw|Thumbnail-dest-create}}\n* {{msg-mw|Thumbnail invalid params}}", "thumbnail_image-type": "This is the parameter 1 of the message {{msg-mw|thumbnail error}}", "thumbnail_gd-library": "This is the parameter 1 of the message {{msg-mw|thumbnail error}}.\n*$1 is a function name of the GD library", + "thumbnail_image-size-zero": "This is the parameter 1 of the message {{msg-mw|thumbnail error}}.\n*$1 is the path incl. filename of the image with zero size", "thumbnail_image-missing": "This is the parameter 1 of the message {{msg-mw|thumbnail error}}.\n*$1 is the path incl. filename of the missing image", "thumbnail_image-failure-limit": "Used as $1 in {{msg-mw|Thumbnail error}}.\n\nParameters:\n* $1 - the maximum allowed number of failed attempts", "import": "The title of the special page [[Special:Import]];", @@@ -3966,7 -3966,7 +3966,7 @@@ "signature-anon": "{{notranslate}}\nUsed as signature for anonymous user. Parameters:\n* $1 - username (IP address?)\n* $2 - nickname (IP address?)\nSee also:\n* {{msg-mw|Signature}} - signature for registered user", "timezone-utc": "{{optional}}", "timezone-local": "Label to indicate that a time is in the user's local timezone.\n{{Identical|Local}}", - "duplicate-defaultsort": "See definition of [[w:Sorting|sort key]] on Wikipedia. Parameters:\n* $1 - old default sort key\n* $2 - new default sort key", + "duplicate-defaultsort": "Warning: Default sort key \"$2\" overrides earlier default sort key \"$1\".", "duplicate-displaytitle": "Warning shown when a page has its display title set multiple times. Parameters:\n* $1 - old display title\n* $2 - new display title", "restricted-displaytitle": "Warning shown when a display title is ignored because it is not equivalent to its actual title. Parameters:\n* $1 - the ignored display title", "invalid-indicator-name": "Warning shown when the [https://www.mediawiki.org/wiki/Help:Page_status_indicators <indicator name=\"''unique-identifier''\">''content''</indicator>] parser tag is used incorrectly.",