[MediaWiki-commits] [Gerrit] Don't show debug CBN highlight in test mode - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/211403 Change subject: Don't show debug CBN highlight in test mode .. Don't show debug CBN highlight in test mode This is causing CE HTML tests to fail as we aren't expecting the inline CSS this generates. Change-Id: Ic1e4cc783b84dab4a1c3cffe27591abf5075dbf5 --- M src/ce/ve.ce.ContentBranchNode.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/03/211403/1 diff --git a/src/ce/ve.ce.ContentBranchNode.js b/src/ce/ve.ce.ContentBranchNode.js index 234ea15..45a93e8 100644 --- a/src/ce/ve.ce.ContentBranchNode.js +++ b/src/ce/ve.ce.ContentBranchNode.js @@ -403,7 +403,7 @@ this.setupInlineSlugs(); // Highlight the node in debug mode - if ( ve.debug ) { + if ( ve.debug !ve.test ) { this.$element.css( 'backgroundColor', '#eee' ); setTimeout( function () { node.$element.css( 'backgroundColor', '' ); -- To view, visit https://gerrit.wikimedia.org/r/211403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic1e4cc783b84dab4a1c3cffe27591abf5075dbf5 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bumped Vega Graphoid - handle data load crash - change (mediawiki...deploy)
Yurik has submitted this change and it was merged. Change subject: Bumped Vega Graphoid - handle data load crash .. Bumped Vega Graphoid - handle data load crash * Attemt to fix a service crashing bug that causes constant service reloading Change-Id: I7b1eca1a12c1affb1e1064aacc945c5e790d474a --- M node_modules/vega/bower.json M node_modules/vega/package.json M node_modules/vega/src/core/_start.js M node_modules/vega/src/parse/data.js M node_modules/vega/vega.js M node_modules/vega/vega.min.js M src 7 files changed, 20 insertions(+), 21 deletions(-) Approvals: Yurik: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/211431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7b1eca1a12c1affb1e1064aacc945c5e790d474a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/graphoid/deploy Gerrit-Branch: master Gerrit-Owner: Yurik yu...@wikimedia.org Gerrit-Reviewer: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Config.dev - domainMap 127.0.0.1-localhost:8080 - change (mediawiki...graphoid)
Yurik has submitted this change and it was merged. Change subject: Config.dev - domainMap 127.0.0.1-localhost:8080 .. Config.dev - domainMap 127.0.0.1-localhost:8080 Change-Id: I03522a93e7bac01c0c243e21fd833dc4a0039b02 --- M config.dev.yaml 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Yurik: Verified; Looks good to me, approved diff --git a/config.dev.yaml b/config.dev.yaml index 8ca44d3..ff8d33f 100644 --- a/config.dev.yaml +++ b/config.dev.yaml @@ -56,7 +56,9 @@ # Even though the subdomains will also be allowed, the substitution # will be done only on fully matched hostname. # For example, it allows graph.wmflabs.org to be replaced with localhost:12345 - domainMap: {} + domainMap: +127.0.0.1: localhost:8080 + # Which protocol should service use for protocol-relative URLs like //example.com/path defaultProtocol: http # Error if it takes longer than this to handle the request -- To view, visit https://gerrit.wikimedia.org/r/211429 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I03522a93e7bac01c0c243e21fd833dc4a0039b02 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/graphoid Gerrit-Branch: master Gerrit-Owner: Yurik yu...@wikimedia.org Gerrit-Reviewer: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Some more fixes for stats - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/211434 Change subject: Some more fixes for stats .. Some more fixes for stats Change-Id: Iddc720a3eb26907090744211f7d6455bc9616374 --- M SpecialRally.php 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/34/211434/1 diff --git a/SpecialRally.php b/SpecialRally.php index 984360d..eb47afc 100644 --- a/SpecialRally.php +++ b/SpecialRally.php @@ -52,7 +52,7 @@ $allGroups = MessageGroups::singleton()-getGroups(); foreach ( $allGroups as $groupId = $messageGroup ) { - if ( in_array( $groupId, $allowedGroups ) ) { + if ( in_array( $groupId, $allowedGroups ) ) { if( $messageGroup-isMeta() ) { // @todo Ugly work around for MediaWikiTopMessageGroup::getGroups() // not existing. @@ -125,7 +125,7 @@ $nonlatest[$row-rc_user_text]++; } - if ( $row-rc_namespace == 8 ) { + if ( in_array( $row-rc_namespace, array( 8 ) ) ) { if ( in_array( $group, array( 'core' ) ) ) { $products['MediaWiki core']++; } elseif ( !in_array( $group, array( 'wiki-twn-mainpage', 'wiki-betawiki' ) ) ) { @@ -135,17 +135,17 @@ } else { $products['translatewiki.net']++; } - } elseif ( $row-rc_namespace = 1198 ) { + } elseif ( in_array( $row-rc_namespace, array( 1198 ) ) ) { $products['translatewiki.net']++; - } elseif ( $row-rc_namespace = 1238 ) { + } elseif ( in_array( $row-rc_namespace, array( 1238 ) ) ) { $products['Pywikibot']++; - } elseif ( $row-rc_namespace = 1240 ) { + } elseif ( in_array( $row-rc_namespace, array( 1240 ) ) ) { $products['Intuition']++; - } elseif ( $row-rc_namespace = 1244 ) { + } elseif ( in_array( $row-rc_namespace, array( 1244 ) ) ) { $products['Kiwix']++; - } elseif ( $row-rc_namespace = 1248 ) { + } elseif ( in_array( $row-rc_namespace, array( 1248 ) ) ) { $products['Huggle']++; - } elseif ( $row-rc_namespace = 1252 ) { + } elseif ( in_array( $row-rc_namespace, array( 1252 ) ) ) { $products['VicuñaUploader']++; } elseif ( $group === 'out-wikiblame' ) { $products['WikiBlame']++; @@ -155,13 +155,13 @@ $messageData = TranslateUtils::figureMessage( $row-rc_title ); // Language totals - if( isset( $languages[$messageData[1]] ) ) { + if( isset( $languages[$messageData[1]] ) ) { $languages[$messageData[1]]++; } else { $languages[$messageData[1]] = 1; } // Per user per language totals - if( isset( $userLangs[$row-rc_user_text][$messageData[1]] ) ) { + if( isset( $userLangs[$row-rc_user_text][$messageData[1]] ) ) {
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...MaintenanceShell)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.21 Change-Id: I47ac713cd4d161793aa0957f9515b75b8e0a0adc --- M MaintenanceShell.php M includes/SpecialMaintenanceShell.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/MaintenanceShell.php b/MaintenanceShell.php index 443cde7..02b5666 100644 --- a/MaintenanceShell.php +++ b/MaintenanceShell.php @@ -35,7 +35,6 @@ // Register special pages $wgSpecialPages['MaintenanceShell'] = 'SpecialMaintenanceShell'; -$wgSpecialPageGroups['MaintenanceShell'] = 'wiki'; // Register user rights $wgAvailableRights[] = 'maintenanceshell'; diff --git a/includes/SpecialMaintenanceShell.php b/includes/SpecialMaintenanceShell.php index c22dd06..5c43c45 100644 --- a/includes/SpecialMaintenanceShell.php +++ b/includes/SpecialMaintenanceShell.php @@ -174,4 +174,8 @@ // If the script doesn't explictly exit, we'll exit anyway exit; } + + protected function getGroupName() { + return 'wiki'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47ac713cd4d161793aa0957f9515b75b8e0a0adc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MaintenanceShell Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Krinkle krinklem...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...GlobalUsage)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Ibdb69f721725b6e10475cdd14fb116e943500b2f --- M GlobalUsage.php M SpecialGlobalUsage.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/GlobalUsage.php b/GlobalUsage.php index 979ec9b..a327365 100644 --- a/GlobalUsage.php +++ b/GlobalUsage.php @@ -63,7 +63,6 @@ $wgSpecialPages['MostGloballyLinkedFiles'] = 'MostGloballyLinkedFilesPage'; $wgSpecialPages['GloballyWantedFiles'] = 'SpecialGloballyWantedFiles'; $wgSpecialPages['GlobalUsage'] = 'SpecialGlobalUsage'; -$wgSpecialPageGroups['GlobalUsage'] = 'media'; $wgAPIPropModules['globalusage'] = 'ApiQueryGlobalUsage'; diff --git a/SpecialGlobalUsage.php b/SpecialGlobalUsage.php index 627a9be..7d3fb5c 100644 --- a/SpecialGlobalUsage.php +++ b/SpecialGlobalUsage.php @@ -227,4 +227,8 @@ return $this-msg( 'viewprevnext' )-rawParams( $plink, $nlink, $nums )-escaped(); } + + protected function getGroupName() { + return 'media'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibdb69f721725b6e10475cdd14fb116e943500b2f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalUsage Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...WikimediaIncubator)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I127b77e2f6185b43ed138925354071b66a60fcc0 --- M SpecialViewUserLang.php M WikimediaIncubator.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialViewUserLang.php b/SpecialViewUserLang.php index e2f28ea..1532f32 100644 --- a/SpecialViewUserLang.php +++ b/SpecialViewUserLang.php @@ -104,4 +104,8 @@ Xml::closeElement( 'ul' ) ); } + + protected function getGroupName() { + return 'users'; + } } diff --git a/WikimediaIncubator.php b/WikimediaIncubator.php index e15de3d..d7f189b 100644 --- a/WikimediaIncubator.php +++ b/WikimediaIncubator.php @@ -83,7 +83,6 @@ /* Special:ViewUserLang */ $wgAutoloadClasses['SpecialViewUserLang'] = $dir . 'SpecialViewUserLang.php'; $wgSpecialPages['ViewUserLang'] = 'SpecialViewUserLang'; -$wgSpecialPageGroups['ViewUserLang'] = 'users'; $wgAvailableRights[] = 'viewuserlang'; $wgHooks['ContributionsToolLinks'][] = 'WikimediaIncubator::efLoadViewUserLangLink'; $wgGroupPermissions['*']['viewuserlang'] = false; -- To view, visit https://gerrit.wikimedia.org/r/211376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I127b77e2f6185b43ed138925354071b66a60fcc0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaIncubator Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...CentralNotice)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I355ace367c7a744677b404c30e077cb3408ebca2 --- M CentralNotice.hooks.php M special/SpecialCentralNotice.php 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/CentralNotice.hooks.php b/CentralNotice.hooks.php index 60fb03a..240da9e 100644 --- a/CentralNotice.hooks.php +++ b/CentralNotice.hooks.php @@ -36,7 +36,7 @@ */ function efCentralNoticeSetup() { global $wgHooks, $wgNoticeInfrastructure, $wgAutoloadClasses, $wgSpecialPages, - $wgCentralNoticeLoader, $wgSpecialPageGroups, $wgScript, + $wgCentralNoticeLoader, $wgScript, $wgNoticeUseTranslateExtension, $wgAPIModules, $wgAPIListModules, $wgAvailableRights, $wgGroupPermissions, $wgCentralDBname, $wgDBname; @@ -154,7 +154,6 @@ } $wgSpecialPages[ 'CentralNotice' ] = 'CentralNotice'; - $wgSpecialPageGroups[ 'CentralNotice' ] = 'wiki'; // Wiki data and tools $wgSpecialPages[ 'NoticeTemplate' ] = 'SpecialNoticeTemplate'; $wgSpecialPages[ 'GlobalAllocation' ] = 'SpecialGlobalAllocation'; $wgSpecialPages[ 'BannerAllocation' ] = 'SpecialBannerAllocation'; diff --git a/special/SpecialCentralNotice.php b/special/SpecialCentralNotice.php index c25584d..94a9022 100644 --- a/special/SpecialCentralNotice.php +++ b/special/SpecialCentralNotice.php @@ -1484,4 +1484,8 @@ } return $this-getContext()-getLanguage()-listToText( array_values( $list ) ); } + + protected function getGroupName() { + return 'wiki'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I355ace367c7a744677b404c30e077cb3408ebca2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralNotice Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Awight awi...@wikimedia.org Gerrit-Reviewer: Ejegg eeggles...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Ssmith ssm...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...WikibaseQuery)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I58c05a517f23fa72cbc40af76e27471bcec24a52 --- M src/Setup/ExtensionSetup.php M src/Specials/SimpleQuery.php 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/src/Setup/ExtensionSetup.php b/src/Setup/ExtensionSetup.php index 53601a8..a922166 100644 --- a/src/Setup/ExtensionSetup.php +++ b/src/Setup/ExtensionSetup.php @@ -77,9 +77,6 @@ private function registerSpecialPages() { // Special page registration $this-globalVars['wgSpecialPages']['SimpleQuery'] = 'Wikibase\Query\Specials\SimpleQuery'; - - // Special page groups - $this-globalVars['wgSpecialPageGroups']['SimpleQuery'] = 'wikibaserepo'; } private function registerPermissions() { diff --git a/src/Specials/SimpleQuery.php b/src/Specials/SimpleQuery.php index 610191a..b4cc19c 100644 --- a/src/Specials/SimpleQuery.php +++ b/src/Specials/SimpleQuery.php @@ -87,4 +87,7 @@ return $entityIds; } + protected function getGroupName() { + return 'wikibaserepo'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211368 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I58c05a517f23fa72cbc40af76e27471bcec24a52 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikibaseQuery Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...ArticleFeedbackv5)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Ifa6ed6182b3ea94a97ca7aef3d3a09b392949a74 --- M ArticleFeedbackv5.php M SpecialArticleFeedbackv5.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php index 0d2bb25..cfe7add 100644 --- a/ArticleFeedbackv5.php +++ b/ArticleFeedbackv5.php @@ -456,7 +456,6 @@ // Special Page $wgSpecialPages['ArticleFeedbackv5'] = 'SpecialArticleFeedbackv5'; $wgSpecialPages['ArticleFeedbackv5Watchlist'] = 'SpecialArticleFeedbackv5Watchlist'; -$wgSpecialPageGroups['ArticleFeedbackv5'] = 'other'; $wgArticleFeedbackv5Permissions = array( 'aft-reader', diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php index 9a7fb84..66a3532 100644 --- a/SpecialArticleFeedbackv5.php +++ b/SpecialArticleFeedbackv5.php @@ -875,4 +875,8 @@ $user = $this-getUser(); return $user-isAllowed( $permission ) !$user-isBlocked(); } + + protected function getGroupName() { + return 'other'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifa6ed6182b3ea94a97ca7aef3d3a09b392949a74 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Id79f960c274b582f4be0ece4ab862975f4c0d094 --- M ProofreadPage.php M SpecialPagesWithoutScans.php M SpecialProofreadPages.php 3 files changed, 8 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/ProofreadPage.php b/ProofreadPage.php index cd9510c..a53de7d 100644 --- a/ProofreadPage.php +++ b/ProofreadPage.php @@ -114,12 +114,10 @@ # special page $wgAutoloadClasses['ProofreadPages'] = $dir . 'SpecialProofreadPages.php'; $wgSpecialPages['IndexPages'] = 'ProofreadPages'; -$wgSpecialPageGroups['IndexPages'] = 'pages'; # special page $wgAutoloadClasses['PagesWithoutScans'] = $dir . 'SpecialPagesWithoutScans.php'; $wgSpecialPages['PagesWithoutScans'] = 'PagesWithoutScans'; -$wgSpecialPageGroups['PagesWithoutScans'] = 'maintenance'; # api prop $wgAutoloadClasses['ApiQueryProofread'] = $dir . 'ApiQueryProofread.php'; diff --git a/SpecialPagesWithoutScans.php b/SpecialPagesWithoutScans.php index 308ced5..a1a42b9 100644 --- a/SpecialPagesWithoutScans.php +++ b/SpecialPagesWithoutScans.php @@ -146,4 +146,8 @@ ? ({$hlink}) {$dm}{$plink} {$dm}[{$size}] : s({$hlink}) {$dm}{$plink} {$dm}[{$size}]/s; } + + protected function getGroupName() { + return 'maintenance'; + } } diff --git a/SpecialProofreadPages.php b/SpecialProofreadPages.php index 892b9f4..e5bb538 100644 --- a/SpecialProofreadPages.php +++ b/SpecialProofreadPages.php @@ -223,4 +223,8 @@ return $output; } + + protected function getGroupName() { + return 'pages'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211377 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id79f960c274b582f4be0ece4ab862975f4c0d094 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I9030d59f568927020300e33a91822cfdd51c4943 --- M SpecialTimedMediaHandler.php M TimedMediaHandler.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialTimedMediaHandler.php b/SpecialTimedMediaHandler.php index caab754..0808b18 100644 --- a/SpecialTimedMediaHandler.php +++ b/SpecialTimedMediaHandler.php @@ -228,4 +228,8 @@ } return $states; } + + protected function getGroupName() { + return 'media'; + } } diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php index ec45d18..f405176 100644 --- a/TimedMediaHandler.php +++ b/TimedMediaHandler.php @@ -259,7 +259,6 @@ # add Special pages $wgSpecialPages['OrphanedTimedText'] = 'SpecialOrphanedTimedText'; $wgSpecialPages['TimedMediaHandler'] = 'SpecialTimedMediaHandler'; -$wgSpecialPageGroups['TimedMediaHandler'] = 'media'; // Extension Credits $wgExtensionCredits['media'][] = array( -- To view, visit https://gerrit.wikimedia.org/r/211378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9030d59f568927020300e33a91822cfdd51c4943 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TimedMediaHandler Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I5608061481b6802f82a8cf772571d56c2ecc2ed3 --- M LiquidThreads.php M pages/SpecialNewMessages.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/LiquidThreads.php b/LiquidThreads.php index 4416e49..d61abd6 100644 --- a/LiquidThreads.php +++ b/LiquidThreads.php @@ -188,7 +188,6 @@ $wgSpecialPages['NewMessages'] = 'SpecialNewMessages'; $wgSpecialPages['SplitThread'] = 'SpecialSplitThread'; $wgSpecialPages['MergeThread'] = 'SpecialMergeThread'; -$wgSpecialPageGroups['NewMessages'] = 'wiki'; // Embedding $wgHooks['OutputPageParserOutput'][] = 'LqtParserFunctions::onAddParserOutput'; diff --git a/pages/SpecialNewMessages.php b/pages/SpecialNewMessages.php index 7db397c..c438752 100644 --- a/pages/SpecialNewMessages.php +++ b/pages/SpecialNewMessages.php @@ -38,4 +38,8 @@ $view-show(); } + + protected function getGroupName() { + return 'wiki'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5608061481b6802f82a8cf772571d56c2ecc2ed3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LiquidThreads Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com 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
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Collection)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I3907d93a7dba030cd3adf9efafba703711088396 --- M Collection.body.php M Collection.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Collection.body.php b/Collection.body.php index 37fecf9..a896648 100644 --- a/Collection.body.php +++ b/Collection.body.php @@ -1294,4 +1294,8 @@ ); return false; } + + protected function getGroupName() { + return 'pagetools'; + } } diff --git a/Collection.php b/Collection.php index 8422830..cad1ed5 100644 --- a/Collection.php +++ b/Collection.php @@ -194,7 +194,6 @@ $wgExtensionMessagesFiles['CollectionAlias'] = $dir . 'Collection.alias.php'; $wgSpecialPages['Book'] = 'SpecialCollection'; -$wgSpecialPageGroups['Book'] = 'pagetools'; $wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] = 'CollectionHooks::buildNavUrls'; $wgHooks['SkinBuildSidebar'][] = 'CollectionHooks::buildSidebar'; -- To view, visit https://gerrit.wikimedia.org/r/211383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3907d93a7dba030cd3adf9efafba703711088396 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Collection Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Cscott canan...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Drafts)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I6db427749f8373a4bf442c7bc7aab7ab4ee5abcc --- M Drafts.php M SpecialDrafts.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Drafts.php b/Drafts.php index 5b598bf..4f416a7 100644 --- a/Drafts.php +++ b/Drafts.php @@ -74,7 +74,6 @@ // Register the Drafts special page $wgSpecialPages['Drafts'] = 'SpecialDrafts'; -$wgSpecialPageGroups['Drafts'] = 'pagetools'; $wgAutoloadClasses['SpecialDrafts'] = $dir . 'SpecialDrafts.php'; // Values for options diff --git a/SpecialDrafts.php b/SpecialDrafts.php index a52d9d3..b2ec0f7 100644 --- a/SpecialDrafts.php +++ b/SpecialDrafts.php @@ -68,4 +68,8 @@ $out-addHTML( Drafts::display() ); } } + + protected function getGroupName() { + return 'pagetools'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6db427749f8373a4bf442c7bc7aab7ab4ee5abcc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Drafts Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...wikihiero)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I77ffdcd8f55008e68a5cdf7adbf472672ec834c8 --- M SpecialHieroglyphs.php M wikihiero.php 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialHieroglyphs.php b/SpecialHieroglyphs.php index 4d14e56..4bfcd32 100644 --- a/SpecialHieroglyphs.php +++ b/SpecialHieroglyphs.php @@ -224,4 +224,8 @@ . $this-hiero-render( $example ) . /td/tr\n; } - } + + protected function getGroupName() { + return 'wiki'; + } +} diff --git a/wikihiero.php b/wikihiero.php index 396661e..d11df84 100644 --- a/wikihiero.php +++ b/wikihiero.php @@ -50,7 +50,6 @@ $wgParserTestFiles[] = $dir/tests.txt; $wgSpecialPages['Hieroglyphs'] = 'SpecialHieroglyphs'; -$wgSpecialPageGroups['Hieroglyphs'] = 'wiki'; $moduleTemplate = array( 'localBasePath' = __DIR__ . '/modules', -- To view, visit https://gerrit.wikimedia.org/r/211373 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77ffdcd8f55008e68a5cdf7adbf472672ec834c8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/wikihiero Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust the styling of input boxes in the selector - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/211396 Change subject: Adjust the styling of input boxes in the selector .. Adjust the styling of input boxes in the selector Change-Id: Ifca062e2e4634d2e2c401df4d9be4a5f66e0363d --- M modules/source/styles/ext.cx.source.selector.less 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/96/211396/1 diff --git a/modules/source/styles/ext.cx.source.selector.less b/modules/source/styles/ext.cx.source.selector.less index 869529e..9bce083 100644 --- a/modules/source/styles/ext.cx.source.selector.less +++ b/modules/source/styles/ext.cx.source.selector.less @@ -92,14 +92,13 @@ font-size: medium; -webkit-appearance: none; border: none; - padding: 2px; + padding: 2px 2px 2px 30px; [type=search] { .background-image-svg('../../tools/images/search.svg', '../../tools/images/search.png'); - background-position: 5px center; + background-position: left 5px center; background-repeat: no-repeat; background-size: 20px; - padding-left: 30px; } } } -- To view, visit https://gerrit.wikimedia.org/r/211396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifca062e2e4634d2e2c401df4d9be4a5f66e0363d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Whitespace cleanup in ext.cx.source.selector.less - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/211395 Change subject: Whitespace cleanup in ext.cx.source.selector.less .. Whitespace cleanup in ext.cx.source.selector.less Change-Id: I638404329942bd506de8c17b650e498520ab0c70 --- M modules/source/styles/ext.cx.source.selector.less 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/95/211395/1 diff --git a/modules/source/styles/ext.cx.source.selector.less b/modules/source/styles/ext.cx.source.selector.less index 0436312..869529e 100644 --- a/modules/source/styles/ext.cx.source.selector.less +++ b/modules/source/styles/ext.cx.source.selector.less @@ -3,6 +3,7 @@ .cx-sourceselector-dialog { .mw-ui-item; + color: #333; position: absolute; min-width: 650px; @@ -18,8 +19,10 @@ .cx-sourceselector-dialog__heading { @vertical-margin: 10px; @horizontal-margin: 15px; + .mw-ui-item; .mw-ui-one-whole; + padding: @vertical-margin @horizontal-margin; font-size: 1.6em; line-height: 1.5em; @@ -31,6 +34,7 @@ .cx-sourceselector-dialog__source-inputs { .mw-ui-item; .mw-ui-one-whole; + height: 50px; padding: 10px; border-bottom: 1px solid #eee; @@ -39,6 +43,7 @@ .cx-sourceselector-dialog__language-label { .mw-ui-item; .mw-ui-one-eighth; + padding: 5px; font-size: large; } @@ -111,6 +116,7 @@ padding: 10px 15px 15px 15px; text-align: right; background-color: #FBFBFB; + button { margin-left: 10px; } @@ -119,6 +125,7 @@ .cx-sourceselector-dialog__license { .mw-ui-item; .mw-ui-one-whole; + padding: 10px; background-color: #FBFBFB; font-size: 12px; -- To view, visit https://gerrit.wikimedia.org/r/211395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I638404329942bd506de8c17b650e498520ab0c70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim and remove $dir - change (mediawiki...intersection)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/211398 Change subject: Remove i18n shim and remove $dir .. Remove i18n shim and remove $dir Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df --- D DynamicPageList.i18n.php M DynamicPageList.php A i18n/awa.json 3 files changed, 10 insertions(+), 38 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/intersection refs/changes/98/211398/1 diff --git a/DynamicPageList.i18n.php b/DynamicPageList.i18n.php deleted file mode 100644 index f044899..000 --- a/DynamicPageList.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -?php -/** - * This is a backwards-compatibility shim, generated by: - * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShim09f33f1e7d2b716f' ) ) { - function wfJsonI18nShim09f33f1e7d2b716f( $cache, $code, $cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . /i18n/$csCode.json; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShim09f33f1e7d2b716f'; -} diff --git a/DynamicPageList.php b/DynamicPageList.php index 9750ee4..69428f1 100644 --- a/DynamicPageList.php +++ b/DynamicPageList.php @@ -48,15 +48,13 @@ ); // Internationalization file -$dir = __DIR__ . '/'; $wgMessagesDirs['DynamicPageList'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['DynamicPageList'] = $dir . 'DynamicPageList.i18n.php'; // Parser tests // Warning, these only work when run with parserTests.php. There will be // failures if run via phpunit! (you may want to comment the below line // out if you're regularly running phpunit tests) -$wgParserTestFiles[] = $dir . 'DynamicPageList.tests.txt'; +$wgParserTestFiles[] = __DIR__ . '/DynamicPageList.tests.txt'; # Configuration variables. Warning: These use DLP instead of DPL # for historical reasons (pretend Dynamic list of pages) diff --git a/i18n/awa.json b/i18n/awa.json new file mode 100644 index 000..fd5b4b1 --- /dev/null +++ b/i18n/awa.json @@ -0,0 +1,9 @@ +{ + @metadata: { + authors: [ + 1AnuraagPandey + ] + }, + intersection-desc: एक श्रेणी या श्रेणीसमूहमें उपलब्ध नवीनतम लेख दर्शायें।, + intersection_toomanycats: Error: बहुत ज्यादा श्रेणी! +} -- To view, visit https://gerrit.wikimedia.org/r/211398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6c908d9da31498b2dda1acbb09bbc06737c77df Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/intersection Gerrit-Branch: master Gerrit-Owner: Paladox thomasmulhall...@yahoo.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moodbar: message clarified. - change (mediawiki...MoodBar)
Purodha has uploaded a new change for review. https://gerrit.wikimedia.org/r/211404 Change subject: Moodbar: message clarified. .. Moodbar: message clarified. Change-Id: I7397e76ed90a6487860c440062d3f6d4cc90dc06 See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Apihelp-moodbarsetuseremail-param-email/ksh --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MoodBar refs/changes/04/211404/1 diff --git a/i18n/en.json b/i18n/en.json index 831227d..143fe7b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -192,7 +192,7 @@ apihelp-moodbar-param-bucket: The testing bucket, if any., apihelp-moodbarsetuseremail-description: Sets the profile email for a user or resends the verification email to a user., apihelp-moodbarsetuseremail-param-mbaction: The action to take., - apihelp-moodbarsetuseremail-param-email: The email which a user sets or resends verification to., + apihelp-moodbarsetuseremail-param-email: The email address which a user sets or resends verification to., apihelp-query+moodbarcomments-description: List all feedback comments submitted through the MoodBar extension., apihelp-query+moodbarcomments-param-limit: How many comments to return., apihelp-query+moodbarcomments-param-type: Only return comments of the given type(s). If not set or empty, return all comments., -- To view, visit https://gerrit.wikimedia.org/r/211404 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7397e76ed90a6487860c440062d3f6d4cc90dc06 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MoodBar Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [PULL THROUGH] Use new allowedTypes property in model registry - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/211406 Change subject: [PULL THROUGH] Use new allowedTypes property in model registry .. [PULL THROUGH] Use new allowedTypes property in model registry For reference nodes, allow 'dc:references'. For transclusion nodes, allow any other types. Depends on I1ca64562e in core. Bug: T98999 Change-Id: I7eb2b61eb9336792535e9fd6d5a8dd2d57065f04 --- M modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js D modules/ve-mw/dm/ve.dm.MW.js 3 files changed, 6 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/06/211406/1 diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js index e7de412..aa60520 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js @@ -44,6 +44,8 @@ ve.dm.MWReferenceNode.static.matchRdfaTypes = [ 'mw:Extension/ref' ]; +ve.dm.MWReferenceNode.static.allowedRdfaTypes = [ 'dc:references' ]; + ve.dm.MWReferenceNode.static.isContent = true; ve.dm.MWReferenceNode.static.blacklistedAnnotationTypes = [ 'link' ]; diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js index f4e18bd..f48bfcd 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js @@ -46,18 +46,11 @@ ve.dm.MWTransclusionNode.static.matchTagNames = null; -ve.dm.MWTransclusionNode.static.matchRdfaTypes = [ - 'mw:Transclusion', - // We're interested in all nodes that have mw:Transclusion, even if they also have other mw: - // types. So we match all mw: types, then use a matchFunction to assert that mw:Transclusion - // is in there. - /^mw:/ -]; +ve.dm.MWTransclusionNode.static.matchRdfaTypes = [ 'mw:Transclusion' ]; -ve.dm.MWTransclusionNode.static.matchFunction = function ( domElement ) { - var types = ( domElement.getAttribute( 'typeof' ) || '' ).split( ' ' ); - return types.indexOf( 'mw:Transclusion' ) !== -1; -}; +// Transclusion nodes can contain other types, e.g. mw:PageProp/Category. +// Allow all other types (null) so they match to this node. +ve.dm.MWTransclusionNode.static.allowedRdfaTypes = null; ve.dm.MWTransclusionNode.static.enableAboutGrouping = true; diff --git a/modules/ve-mw/dm/ve.dm.MW.js b/modules/ve-mw/dm/ve.dm.MW.js deleted file mode 100644 index ced1d9d..000 --- a/modules/ve-mw/dm/ve.dm.MW.js +++ /dev/null @@ -1,8 +0,0 @@ -/*! - * VisualEditor DataModel MediaWiki configuration. - * - * @copyright 2011-2015 VisualEditor Team and others; see AUTHORS.txt - * @license The MIT License (MIT); see LICENSE.txt - */ - -ve.dm.modelRegistry.registerExtensionSpecificType( /^mw:/ ); -- To view, visit https://gerrit.wikimedia.org/r/211406 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7eb2b61eb9336792535e9fd6d5a8dd2d57065f04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] UploadWizard doesn't need addModuleStyles - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged. Change subject: UploadWizard doesn't need addModuleStyles .. UploadWizard doesn't need addModuleStyles None of these styles seem to be required for the simple form displayed in no JS mode. Bug: T97410 Change-Id: I3bee430ac7ef19530c08391124259f83fd413bba --- M UploadWizardHooks.php M includes/specials/SpecialUploadWizard.php 2 files changed, 0 insertions(+), 2 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php index 12a872c..b4c2e97 100644 --- a/UploadWizardHooks.php +++ b/UploadWizardHooks.php @@ -14,7 +14,6 @@ ), 'ext.uploadWizard' = array( - 'position' = 'top', 'dependencies' = array( 'jquery.arrowSteps', 'jquery.checkboxShiftClick', diff --git a/includes/specials/SpecialUploadWizard.php b/includes/specials/SpecialUploadWizard.php index 69b4da1..a0a122c 100644 --- a/includes/specials/SpecialUploadWizard.php +++ b/includes/specials/SpecialUploadWizard.php @@ -115,7 +115,6 @@ $this-addJsVars( $subPage ); // dependencies (css, js) - $out-addModuleStyles( 'ext.uploadWizard' ); $out-addModules( 'ext.uploadWizard.page' ); // where the uploadwizard will go -- To view, visit https://gerrit.wikimedia.org/r/209688 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3bee430ac7ef19530c08391124259f83fd413bba Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...WikiLexicalData)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/211414 Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.21 Change-Id: Ida8b15d55badead625f8b54fae1429a93512f10d --- M OmegaWiki/SpecialAddCollection.php M OmegaWiki/SpecialConceptMapping.php M OmegaWiki/SpecialImportLangNames.php M OmegaWiki/SpecialNeedsTranslation.php M includes/setup/OWSpecials.php M includes/specials/SpecialDatasearch.php M includes/specials/SpecialOWAddFromExternalAPI.php M includes/specials/SpecialOWDownloads.php M includes/specials/SpecialOWStatistics.php 9 files changed, 29 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData refs/changes/14/211414/1 diff --git a/OmegaWiki/SpecialAddCollection.php b/OmegaWiki/SpecialAddCollection.php index a820583..029d204 100644 --- a/OmegaWiki/SpecialAddCollection.php +++ b/OmegaWiki/SpecialAddCollection.php @@ -62,5 +62,9 @@ '', array( 'create' = wfMessage( 'ow_create' )-text() ) ) ); } + + protected function getGroupName() { + return 'other'; + } } diff --git a/OmegaWiki/SpecialConceptMapping.php b/OmegaWiki/SpecialConceptMapping.php index 4408e87..e70203b 100644 --- a/OmegaWiki/SpecialConceptMapping.php +++ b/OmegaWiki/SpecialConceptMapping.php @@ -189,5 +189,8 @@ } } + protected function getGroupName() { + return 'other'; + } } diff --git a/OmegaWiki/SpecialImportLangNames.php b/OmegaWiki/SpecialImportLangNames.php index d0d7bdb..569d2d2 100644 --- a/OmegaWiki/SpecialImportLangNames.php +++ b/OmegaWiki/SpecialImportLangNames.php @@ -111,4 +111,8 @@ $wikipage = new WikiPage( $titleObj ); $wikipage-doEdit( $content, 'updated via Special:ImportLangNames' ); } + + protected function getGroupName() { + return 'other'; + } } diff --git a/OmegaWiki/SpecialNeedsTranslation.php b/OmegaWiki/SpecialNeedsTranslation.php index 09dea95..4c5dd76 100644 --- a/OmegaWiki/SpecialNeedsTranslation.php +++ b/OmegaWiki/SpecialNeedsTranslation.php @@ -194,6 +194,10 @@ $wgOut-addHTML( Showing $nbshown out of $queryResultCount ) ; $wgOut-addHTML( $editor-view( new IdStack( expression ), $recordSet ) ); } + + protected function getGroupName() { + return 'maintenance'; + } } diff --git a/includes/setup/OWSpecials.php b/includes/setup/OWSpecials.php index 6b12fdc..0f5c73f 100644 --- a/includes/setup/OWSpecials.php +++ b/includes/setup/OWSpecials.php @@ -131,29 +131,6 @@ // $wgSpecialPages['Transaction'] = 'SpecialTransaction'; -# Tell MediaWiki about which group the new special page belongs to -# maintenance = Maintenance reports -# wiki = Data and tools -# others = Other Special pages -/** - * == UnlistedSpecialPage == - * SpecialCopy - * SpecialSelect - * SpecialSuggest - * SpecialPopupEditor - */ - -$wgSpecialPageGroups[ 'AddCollection' ] = 'other'; -$wgSpecialPageGroups[ 'ConceptMapping' ] = 'other'; -$wgSpecialPageGroups[ 'ow_data_search' ] = 'wiki'; -$wgSpecialPageGroups[ 'ImportLangNames' ] = 'other'; -$wgSpecialPageGroups[ 'NeedsTranslation' ] = 'maintenance'; - -$wgSpecialPageGroups[ 'ow_statistics' ] = 'wiki'; -$wgSpecialPageGroups[ 'ow_downloads' ] = 'wiki'; - -// special page with conditional groups - // ow_addFromExtAPI global $wgWldProcessExternalAPIClasses, $wgWldExtenalResourceLanguages, $wgWldScriptPath; @@ -172,8 +149,6 @@ } if ( $wgWldProcessExternalAPIClasses ) { - $wgSpecialPageGroups[ 'ow_addFromExtAPI' ] = 'maintenance'; - $wgResourceModules['ext.OwAddFromExtAPI.js'] = $resourcePathArray + array( 'scripts' = 'omegawiki-addExtAPI.js' ); diff --git a/includes/specials/SpecialDatasearch.php b/includes/specials/SpecialDatasearch.php index 5bfdb79..585696b 100644 --- a/includes/specials/SpecialDatasearch.php +++ b/includes/specials/SpecialDatasearch.php @@ -518,4 +518,8 @@ return $linksHtml; } + + protected function getGroupName() { + return 'wiki'; + } } diff --git a/includes/specials/SpecialOWAddFromExternalAPI.php b/includes/specials/SpecialOWAddFromExternalAPI.php index f739063..cdc60fa 100644 --- a/includes/specials/SpecialOWAddFromExternalAPI.php +++ b/includes/specials/SpecialOWAddFromExternalAPI.php @@ -143,6 +143,9 @@ require_once( 'ExternalWordnik.php' ); } + protected function getGroupName() { + return 'maintenance'; + } } /** @brief This class handles External Resources. diff --git
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...MaintenanceShell)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/211423 Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.21 Change-Id: I47ac713cd4d161793aa0957f9515b75b8e0a0adc --- M MaintenanceShell.php M includes/SpecialMaintenanceShell.php 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MaintenanceShell refs/changes/23/211423/1 diff --git a/MaintenanceShell.php b/MaintenanceShell.php index 443cde7..02b5666 100644 --- a/MaintenanceShell.php +++ b/MaintenanceShell.php @@ -35,7 +35,6 @@ // Register special pages $wgSpecialPages['MaintenanceShell'] = 'SpecialMaintenanceShell'; -$wgSpecialPageGroups['MaintenanceShell'] = 'wiki'; // Register user rights $wgAvailableRights[] = 'maintenanceshell'; diff --git a/includes/SpecialMaintenanceShell.php b/includes/SpecialMaintenanceShell.php index c22dd06..5c43c45 100644 --- a/includes/SpecialMaintenanceShell.php +++ b/includes/SpecialMaintenanceShell.php @@ -174,4 +174,8 @@ // If the script doesn't explictly exit, we'll exit anyway exit; } + + protected function getGroupName() { + return 'wiki'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47ac713cd4d161793aa0957f9515b75b8e0a0adc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MaintenanceShell Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] nova monitoring instaces and salt keys: add new options - change (operations/puppet)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/211432 Change subject: nova monitoring instaces and salt keys: add new options .. nova monitoring instaces and salt keys: add new options show all instances, show instances not responsive to test.ping, show instances without salt keys Change-Id: I1651c9340b34b3967413a22f55a3862bc95920be --- M modules/openstack/files/monitor_labs_salt_keys.py 1 file changed, 222 insertions(+), 54 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/32/211432/1 diff --git a/modules/openstack/files/monitor_labs_salt_keys.py b/modules/openstack/files/monitor_labs_salt_keys.py index d5aa043..7bc8c29 100644 --- a/modules/openstack/files/monitor_labs_salt_keys.py +++ b/modules/openstack/files/monitor_labs_salt_keys.py @@ -8,10 +8,6 @@ import salt.key from novaclient.v1_1 import client -# fixme sanity checking: -# we want to make sure we don't get bogus results -# for instance exists check (if it's broken what happens?) - class Whiner(object): ''' @@ -41,6 +37,29 @@ the nova openstack compute api ''' +@staticmethod +def instance_display(server): +''' +given a nova server object (returned by listing +servers), display a few useful fields from it +''' + +print 'Instance:', getattr(server, 'OS-EXT-SRV-ATTR:instance_name'), +print 'Status:', server.status, +print 'hostname:', server.name, +if 'public' in server.addresses and server.addresses['public']: +print 'IP:', server.addresses['public'][0]['addr'], +else: +print 'IP: seems to have none', +print 'Hypervisor:', +print getattr(server, 'OS-EXT-SRV-ATTR:hypervisor_hostname'), +if server.tenant_id == 'deployment-prep': +print 'Salt-master: deployment-salt' +else: +print +if hasattr(server, 'fault'): +print 'Fault:', server.fault + def __init__(self, authfile, limit=300): ''' authfile: full path to a file of auth creds, see @@ -60,22 +79,22 @@ (status is ACTIVE or ERROR or SHUTOFF) for all tenants ''' -ec2ids = set() +instances = {} opts = {'all_tenants': True, 'limit': self.limit} while True: servers = self.client.servers.list(detailed=True, search_opts=opts) if not servers: break -new_ec2ids = [getattr(instance, 'OS-EXT-SRV-ATTR:instance_name') - for instance in servers] -ec2ids = ec2ids | set(new_ec2ids) +for instance in servers: +instances[getattr(instance, + 'OS-EXT-SRV-ATTR:instance_name')] = instance opts['marker'] = servers[-1].id time.sleep(1) -if not ec2ids: +if not instances: Whiner.whine(no good nova instances found, something's wrong, fatal=True) -return ec2ids +return instances def get_bad_instances(self): ''' @@ -84,19 +103,22 @@ (status is DELETED only, not ERROR or BUILD) for all tenants ''' -ec2ids = set() +instances = {} opts = {'all_tenants': True, 'deleted': True, 'limit': self.limit} while True: servers = self.client.servers.list(detailed=True, search_opts=opts) if not servers: break -new_ec2ids = [getattr(instance, 'OS-EXT-SRV-ATTR:instance_name') - for instance in servers if - instance.status == 'DELETED'] -ec2ids = ec2ids | set(new_ec2ids) +for instance in servers: +if instance.status == 'DELETED': +instances[getattr( +instance, 'OS-EXT-SRV-ATTR:instance_name')] = instance opts['marker'] = servers[-1].id time.sleep(1) -return ec2ids +if not instances: +Whiner.whine(no deleted nova instances found, very fishy..., + fatal=True) +return instances class NovaAuth(object): @@ -183,6 +205,7 @@ self.accepted_keys = [] for dirname in dirnames: self.accepted_keys += accepted[dirname] +return self.accepted_keys def get_unresponsive_hosts(self): ''' @@ -210,18 +233,140 @@ self.key_manager.delete_key(host_name) -def canonicalize(salt_hostname, region): +class Runner(object): ''' -convert the hostname we get back from a salt -command to the standard ec2 form -'region' should be eqiad/pmtpa/ etc depending -on the dc this script runs in +handle action requests for display of nova instances +or manipulation of
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...CiteThisPage)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I34c23170b839ac876bcdf5b384d4a14a9c5f7f02 (cherry picked from commit 9198c04a0230ed03e5be9c8bcb38845c45396d15) --- M SpecialCiteThisPage.php M extension.json 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialCiteThisPage.php b/SpecialCiteThisPage.php index 6273815..6882f24 100644 --- a/SpecialCiteThisPage.php +++ b/SpecialCiteThisPage.php @@ -60,6 +60,10 @@ Xml::closeElement( 'form' ) ); } + + protected function getGroupName() { + return 'pagetools'; + } } class CiteThisPageOutput { diff --git a/extension.json b/extension.json index 3095321..bf81d4c 100644 --- a/extension.json +++ b/extension.json @@ -33,9 +33,6 @@ localBasePath: modules, remoteExtPath: CiteThisPage/modules }, - SpecialPageGroups: { - CiteThisPage: pagetools - }, SpecialPages: { CiteThisPage: SpecialCiteThisPage }, -- To view, visit https://gerrit.wikimedia.org/r/211440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I34c23170b839ac876bcdf5b384d4a14a9c5f7f02 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CiteThisPage Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Oversight)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/211445 Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I93933b5de35118987420819fb124784943b74e12 (cherry picked from commit a230ee76441a786cb71ef5bdfde2af7a1d37e776) --- M HideRevision.php M HideRevision_body.php M extension.json 3 files changed, 8 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Oversight refs/changes/45/211445/1 diff --git a/HideRevision.php b/HideRevision.php index 67201b6..78933cf 100644 --- a/HideRevision.php +++ b/HideRevision.php @@ -59,8 +59,6 @@ $wgSpecialPages['HideRevision'] = 'HideRevisionForm'; $wgSpecialPages['Oversight'] = 'SpecialOversight'; -$wgSpecialPageGroups['HideRevision'] = 'pagetools'; -$wgSpecialPageGroups['Oversight'] = 'pagetools'; $wgHooks['ArticleViewHeader'][] = 'HideRevisionHooks::onArticleViewHeader'; $wgHooks['DiffViewHeader'][] = 'HideRevisionHooks::onDiffViewHeader'; diff --git a/HideRevision_body.php b/HideRevision_body.php index 89e55eb..0f93439 100644 --- a/HideRevision_body.php +++ b/HideRevision_body.php @@ -400,6 +400,10 @@ __METHOD__, array( 'IGNORE' ) ); } + + protected function getGroupName() { + return 'pagetools'; + } } class SpecialOversight extends SpecialPage { @@ -682,6 +686,10 @@ /div\n ); } } + + protected function getGroupName() { + return 'pagetools'; + } } /** diff --git a/extension.json b/extension.json index 0a7c7a4..3accc55 100644 --- a/extension.json +++ b/extension.json @@ -30,10 +30,6 @@ i18n ] }, - SpecialPageGroups: { - HideRevision: pagetools, - Oversight: pagetools - }, GroupPermissions: { *: { hiderevision: false, -- To view, visit https://gerrit.wikimedia.org/r/211445 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I93933b5de35118987420819fb124784943b74e12 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Oversight Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Renameuser)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I5ab75599ad8c770da43b3dae82907c01951414a9 (cherry picked from commit b6551bf3c0be253b9909121cb951650dfb07ae91) --- M extension.json M specials/SpecialRenameuser.php 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 346a794..b01a6de 100644 --- a/extension.json +++ b/extension.json @@ -33,9 +33,6 @@ JobClasses: { renameUser: RenameUserJob }, - SpecialPageGroups: { - Renameuser: users - }, GroupPermissions: { bureaucrat: { renameuser: true diff --git a/specials/SpecialRenameuser.php b/specials/SpecialRenameuser.php index 70946e3..c8b2a53 100644 --- a/specials/SpecialRenameuser.php +++ b/specials/SpecialRenameuser.php @@ -369,4 +369,8 @@ $out-addHTML( Xml::element( 'h2', null, $logPage-getName()-text() ) . \n ); LogEventsList::showLogExtract( $out, $type, $username-getPrefixedText() ); } + + protected function getGroupName() { + return 'users'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211441 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5ab75599ad8c770da43b3dae82907c01951414a9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Renameuser Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unneeded $wgSpecialPageGroups - change (mediawiki...RandomRootPage)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/211447 Change subject: Remove unneeded $wgSpecialPageGroups .. Remove unneeded $wgSpecialPageGroups Already inherit SpecialPage::getGroupName from SpecialRandompage Change-Id: I8d9255bc78e0d51ee2c7e773b031e5e73e94270d (cherry picked from commit 274971cf0a5349a80683dbdd26f286580dfadcdc) --- M Randomrootpage.php M extension.json 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RandomRootPage refs/changes/47/211447/1 diff --git a/Randomrootpage.php b/Randomrootpage.php index 3c812d1..389e504 100644 --- a/Randomrootpage.php +++ b/Randomrootpage.php @@ -22,7 +22,6 @@ ); $wgSpecialPages['Randomrootpage'] = 'SpecialRandomrootpage'; -$wgSpecialPageGroups['Randomrootpage'] = 'redirects'; $wgMessagesDirs['Randomrootpage'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['Randomrootpage'] = __DIR__ . '/Randomrootpage.i18n.php'; diff --git a/extension.json b/extension.json index 543cb59..1289b02 100644 --- a/extension.json +++ b/extension.json @@ -11,9 +11,6 @@ SpecialPages: { Randomrootpage: SpecialRandomrootpage }, - SpecialPageGroups: { - Randomrootpage: redirects - }, MessagesDirs: { Randomrootpage: [ i18n -- To view, visit https://gerrit.wikimedia.org/r/211447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d9255bc78e0d51ee2c7e773b031e5e73e94270d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RandomRootPage Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...CodeReview)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Ic879fc98ba2ebd960d9d061f51ff9372ec19d06c (cherry picked from commit 91eb69f2a68ab53bbfcfafaaf3d0b7d9e056a11b) --- M CodeReview.php M extension.json M ui/SpecialCode.php M ui/SpecialRepoAdmin.php 4 files changed, 8 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/CodeReview.php b/CodeReview.php index 142f59d..3b1aa15 100644 --- a/CodeReview.php +++ b/CodeReview.php @@ -112,9 +112,7 @@ / SPECIAL PAGE SETUP / $wgSpecialPages['Code'] = 'SpecialCode'; -$wgSpecialPageGroups['Code'] = 'developer'; $wgSpecialPages['RepoAdmin'] = 'SpecialRepoAdmin'; -$wgSpecialPageGroups['RepoAdmin'] = 'developer'; / API SETUP / diff --git a/extension.json b/extension.json index 06d3ab2..b585cb5 100644 --- a/extension.json +++ b/extension.json @@ -119,10 +119,6 @@ localBasePath: modules, remoteExtPath: CodeReview/modules }, - SpecialPageGroups: { - Code: developer, - RepoAdmin: developer - }, GroupPermissions: { *: { codereview-use: true diff --git a/ui/SpecialCode.php b/ui/SpecialCode.php index d6a7aa3..a917226 100644 --- a/ui/SpecialCode.php +++ b/ui/SpecialCode.php @@ -139,4 +139,8 @@ } return $view; } + + protected function getGroupName() { + return 'developer'; + } } diff --git a/ui/SpecialRepoAdmin.php b/ui/SpecialRepoAdmin.php index b00de90..03e15d9 100644 --- a/ui/SpecialRepoAdmin.php +++ b/ui/SpecialRepoAdmin.php @@ -29,6 +29,10 @@ } $view-execute(); } + + protected function getGroupName() { + return 'developer'; + } } /** -- To view, visit https://gerrit.wikimedia.org/r/211443 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic879fc98ba2ebd960d9d061f51ff9372ec19d06c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeReview Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Oversight)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I93933b5de35118987420819fb124784943b74e12 (cherry picked from commit a230ee76441a786cb71ef5bdfde2af7a1d37e776) --- M HideRevision.php M HideRevision_body.php M extension.json 3 files changed, 8 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/HideRevision.php b/HideRevision.php index 67201b6..78933cf 100644 --- a/HideRevision.php +++ b/HideRevision.php @@ -59,8 +59,6 @@ $wgSpecialPages['HideRevision'] = 'HideRevisionForm'; $wgSpecialPages['Oversight'] = 'SpecialOversight'; -$wgSpecialPageGroups['HideRevision'] = 'pagetools'; -$wgSpecialPageGroups['Oversight'] = 'pagetools'; $wgHooks['ArticleViewHeader'][] = 'HideRevisionHooks::onArticleViewHeader'; $wgHooks['DiffViewHeader'][] = 'HideRevisionHooks::onDiffViewHeader'; diff --git a/HideRevision_body.php b/HideRevision_body.php index 89e55eb..0f93439 100644 --- a/HideRevision_body.php +++ b/HideRevision_body.php @@ -400,6 +400,10 @@ __METHOD__, array( 'IGNORE' ) ); } + + protected function getGroupName() { + return 'pagetools'; + } } class SpecialOversight extends SpecialPage { @@ -682,6 +686,10 @@ /div\n ); } } + + protected function getGroupName() { + return 'pagetools'; + } } /** diff --git a/extension.json b/extension.json index 0a7c7a4..3accc55 100644 --- a/extension.json +++ b/extension.json @@ -30,10 +30,6 @@ i18n ] }, - SpecialPageGroups: { - HideRevision: pagetools, - Oversight: pagetools - }, GroupPermissions: { *: { hiderevision: false, -- To view, visit https://gerrit.wikimedia.org/r/211445 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93933b5de35118987420819fb124784943b74e12 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Oversight Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Gadgets)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I3fe4906a422fdf7f6d8ba51b39b7f45c01c3d772 (cherry picked from commit 6c25618f55e67f359008afa9ee76a5b09c4f369a) --- M SpecialGadgets.php M extension.json 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialGadgets.php b/SpecialGadgets.php index 8a9fd0e..3cbce48 100644 --- a/SpecialGadgets.php +++ b/SpecialGadgets.php @@ -202,4 +202,8 @@ . Html::closeElement( 'form' ) ); } + + protected function getGroupName() { + return 'wiki'; + } } diff --git a/extension.json b/extension.json index 0c55840..f8377ec 100644 --- a/extension.json +++ b/extension.json @@ -11,9 +11,6 @@ SpecialPages: { Gadgets: SpecialGadgets }, - SpecialPageGroups: { - Gadgets: wiki - }, APIListModules: { gadgetcategories: ApiQueryGadgetCategories, gadgets: ApiQueryGadgets -- To view, visit https://gerrit.wikimedia.org/r/211439 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3fe4906a422fdf7f6d8ba51b39b7f45c01c3d772 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gadgets Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...ShortUrl)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Id253c72479b8818ed584b2fbab69004f536f69fe (cherry picked from commit ed0c39aeef545df952ab4adfff223598fea2883c) --- M ShortUrl.php M SpecialShortUrl.php M extension.json 3 files changed, 4 insertions(+), 4 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/ShortUrl.php b/ShortUrl.php index e158755..d1c2211 100644 --- a/ShortUrl.php +++ b/ShortUrl.php @@ -47,7 +47,6 @@ $wgAutoloadClasses['ShortUrlHooks'] = __DIR__ . '/ShortUrl.hooks.php'; $wgAutoloadClasses['SpecialShortUrl'] = __DIR__ . '/SpecialShortUrl.php'; $wgSpecialPages['ShortUrl'] = 'SpecialShortUrl'; -$wgSpecialPageGroups['ShortUrl'] = 'pagetools'; $wgHooks['SkinTemplateToolboxEnd'][] = 'ShortUrlHooks::addToolboxLink'; $wgHooks['LoadExtensionSchemaUpdates'][] = 'ShortUrlHooks::setupSchema'; diff --git a/SpecialShortUrl.php b/SpecialShortUrl.php index 4050266..6f1bb5b 100644 --- a/SpecialShortUrl.php +++ b/SpecialShortUrl.php @@ -43,4 +43,8 @@ $out-showErrorPage( 'shorturl-not-found-title', 'shorturl-not-found-message', array( $parEsc ) ); } } + + protected function getGroupName() { + return 'pagetools'; + } } diff --git a/extension.json b/extension.json index 325c609..fc014ab 100644 --- a/extension.json +++ b/extension.json @@ -8,9 +8,6 @@ SpecialPages: { ShortUrl: SpecialShortUrl }, - SpecialPageGroups: { - ShortUrl: pagetools - }, MessagesDirs: { ShortUrl: [ i18n -- To view, visit https://gerrit.wikimedia.org/r/211444 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id253c72479b8818ed584b2fbab69004f536f69fe Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ShortUrl Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Interwiki)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I512120e9cf7245dbe2225c6bc5cc20549745ef04 (cherry picked from commit 53cd67a7222c300f98ff78d8e5a6743e73852593) --- M Interwiki_body.php M extension.json 2 files changed, 4 insertions(+), 3 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Interwiki_body.php b/Interwiki_body.php index 0070cfb..5d6d530 100644 --- a/Interwiki_body.php +++ b/Interwiki_body.php @@ -482,6 +482,10 @@ $args = func_get_args(); $this-getOutput()-wrapWikiMsg( p class='error'$1/p, $args ); } + + protected function getGroupName() { + return 'wiki'; + } } /** diff --git a/extension.json b/extension.json index 964c4fb..49bd511 100644 --- a/extension.json +++ b/extension.json @@ -45,9 +45,6 @@ localBasePath: , remoteExtPath: Interwiki }, - SpecialPageGroups: { - Interwiki: wiki - }, SpecialPages: { Interwiki: SpecialInterwiki }, -- To view, visit https://gerrit.wikimedia.org/r/211446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I512120e9cf7245dbe2225c6bc5cc20549745ef04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Interwiki Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unneeded $wgSpecialPageGroups - change (mediawiki...Disambiguator)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unneeded $wgSpecialPageGroups .. Remove unneeded $wgSpecialPageGroups Override of SpecialPage::getGroupName already exists Change-Id: I026231ca8d4410a8e4eaf862b9658b919a732bda (cherry picked from commit a1adc5b061c537c0bc6a2ae7fcc3ea9d4afd9109) --- M Disambiguator.php M extension.json 2 files changed, 0 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Disambiguator.php b/Disambiguator.php index a74e252..71d7914 100644 --- a/Disambiguator.php +++ b/Disambiguator.php @@ -62,9 +62,7 @@ // Register special pages $wgSpecialPages['DisambiguationPages'] = 'SpecialDisambiguationPages'; -$wgSpecialPageGroups['DisambiguationPages'] = 'pages'; $wgSpecialPages['DisambiguationPageLinks'] = 'SpecialDisambiguationPageLinks'; -$wgSpecialPageGroups['DisambiguationPageLinks'] = 'pages'; $wgResourceModules['ext.disambiguator.visualEditor'] = array( 'localBasePath' = __DIR__, diff --git a/extension.json b/extension.json index a681fda..fa7cb8c 100644 --- a/extension.json +++ b/extension.json @@ -60,10 +60,6 @@ config: { DisambiguatorIndicateLinks: true }, - SpecialPageGroups: { - DisambiguationPages: pages, - DisambiguationPageLinks: pages - }, SpecialPages: { DisambiguationPages: SpecialDisambiguationPages, DisambiguationPageLinks: SpecialDisambiguationPageLinks -- To view, visit https://gerrit.wikimedia.org/r/211438 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I026231ca8d4410a8e4eaf862b9658b919a732bda Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Disambiguator Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unneeded $wgSpecialPageGroups - change (mediawiki...RandomRootPage)
jenkins-bot has submitted this change and it was merged. Change subject: Remove unneeded $wgSpecialPageGroups .. Remove unneeded $wgSpecialPageGroups Already inherit SpecialPage::getGroupName from SpecialRandompage Change-Id: I8d9255bc78e0d51ee2c7e773b031e5e73e94270d (cherry picked from commit 274971cf0a5349a80683dbdd26f286580dfadcdc) --- M Randomrootpage.php M extension.json 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Randomrootpage.php b/Randomrootpage.php index 3c812d1..389e504 100644 --- a/Randomrootpage.php +++ b/Randomrootpage.php @@ -22,7 +22,6 @@ ); $wgSpecialPages['Randomrootpage'] = 'SpecialRandomrootpage'; -$wgSpecialPageGroups['Randomrootpage'] = 'redirects'; $wgMessagesDirs['Randomrootpage'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['Randomrootpage'] = __DIR__ . '/Randomrootpage.i18n.php'; diff --git a/extension.json b/extension.json index 543cb59..1289b02 100644 --- a/extension.json +++ b/extension.json @@ -11,9 +11,6 @@ SpecialPages: { Randomrootpage: SpecialRandomrootpage }, - SpecialPageGroups: { - Randomrootpage: redirects - }, MessagesDirs: { Randomrootpage: [ i18n -- To view, visit https://gerrit.wikimedia.org/r/211447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d9255bc78e0d51ee2c7e773b031e5e73e94270d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RandomRootPage Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 26f185f..c6ad199 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 26f185f..c6ad199 .. Syncronize VisualEditor: 26f185f..c6ad199 Change-Id: I3c9ad283bc4e4e4af7204e803c0ba3cf80caaaeb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 26f185f..c6ad199 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 26f185fab88c5055af0e1484e6909aabff2597eb +Subproject commit c6ad199561239226397b94752e22d74cb7906c5e -- To view, visit https://gerrit.wikimedia.org/r/211495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c9ad283bc4e4e4af7204e803c0ba3cf80caaaeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Declare global in Action - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Declare global in Action .. Declare global in Action Follows up e928d5bdd0fbc63. Change-Id: I06e8490865554a0efa7678be6787deb8a22c5b82 --- M includes/actions/Action.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/actions/Action.php b/includes/actions/Action.php index fa75e08..79e859a 100644 --- a/includes/actions/Action.php +++ b/includes/actions/Action.php @@ -385,6 +385,7 @@ * @since 1.25 */ public function addHelpLink( $to, $overrideBaseUrl = false ) { + global $wgContLang; $msg = wfMessage( $wgContLang-lc( $this-getActionName() ) . '-helppage' ); if ( !$msg-isDisabled() ) { -- To view, visit https://gerrit.wikimedia.org/r/211452 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I06e8490865554a0efa7678be6787deb8a22c5b82 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 26f185f..c6ad199 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/211495 Change subject: Syncronize VisualEditor: 26f185f..c6ad199 .. Syncronize VisualEditor: 26f185f..c6ad199 Change-Id: I3c9ad283bc4e4e4af7204e803c0ba3cf80caaaeb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/95/211495/1 diff --git a/VisualEditor b/VisualEditor index 26f185f..c6ad199 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 26f185fab88c5055af0e1484e6909aabff2597eb +Subproject commit c6ad199561239226397b94752e22d74cb7906c5e -- To view, visit https://gerrit.wikimedia.org/r/211495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c9ad283bc4e4e4af7204e803c0ba3cf80caaaeb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove i18n shim - change (mediawiki...CharInsert)
jenkins-bot has submitted this change and it was merged. Change subject: Remove i18n shim .. Remove i18n shim Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab (cherry picked from commit 8cc075ea1e43f39249141c93137b3792901cc88a) --- D CharInsert.i18n.php M extension.json 2 files changed, 0 insertions(+), 38 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/CharInsert.i18n.php b/CharInsert.i18n.php deleted file mode 100644 index 8fd8dc0..000 --- a/CharInsert.i18n.php +++ /dev/null @@ -1,35 +0,0 @@ -?php -/** - * This is a backwards-compatibility shim, generated by: - * https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php - * - * Beginning with MediaWiki 1.23, translation strings are stored in json files, - * and the EXTENSION.i18n.php file only exists to provide compatibility with - * older releases of MediaWiki. For more information about this migration, see: - * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format - * - * This shim maintains compatibility back to MediaWiki 1.17. - */ -$messages = array(); -if ( !function_exists( 'wfJsonI18nShime4fc00e265fc0f96' ) ) { - function wfJsonI18nShime4fc00e265fc0f96( $cache, $code, $cachedData ) { - $codeSequence = array_merge( array( $code ), $cachedData['fallbackSequence'] ); - foreach ( $codeSequence as $csCode ) { - $fileName = dirname( __FILE__ ) . /i18n/$csCode.json; - if ( is_readable( $fileName ) ) { - $data = FormatJson::decode( file_get_contents( $fileName ), true ); - foreach ( array_keys( $data ) as $key ) { - if ( $key === '' || $key[0] === '@' ) { - unset( $data[$key] ); - } - } - $cachedData['messages'] = array_merge( $data, $cachedData['messages'] ); - } - - $cachedData['deps'][] = new FileDependency( $fileName ); - } - return true; - } - - $GLOBALS['wgHooks']['LocalisationCacheRecache'][] = 'wfJsonI18nShime4fc00e265fc0f96'; -} diff --git a/extension.json b/extension.json index 6ef8475..8933dc0 100644 --- a/extension.json +++ b/extension.json @@ -4,9 +4,6 @@ url: https://www.mediawiki.org/wiki/Extension:CharInsert;, descriptionmsg: charinsert-desc, type: parserhook, - ExtensionMessagesFiles: { - CharInsert: CharInsert.i18n.php - }, Hooks: { ParserFirstCallInit: [ CharInsert::onParserFirstCallInit -- To view, visit https://gerrit.wikimedia.org/r/209793 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6045be3255dcfdd30632da44ed3e8f7752635ab Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CharInsert Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox thomasmulhall...@yahoo.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Paladox thomasmulhall...@yahoo.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move global functions into static class in separate file in ... - change (mediawiki...intersection)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/211399 Change subject: Move global functions into static class in separate file in preperation for extension.json .. Move global functions into static class in separate file in preperation for extension.json Change-Id: I77b03140a4f143c4d514fe58fca9a8b578db1352 --- A DynamicPageList.hooks.php M DynamicPageList.php A i18n/awa.json 3 files changed, 614 insertions(+), 605 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/intersection refs/changes/99/211399/1 diff --git a/DynamicPageList.hooks.php b/DynamicPageList.hooks.php new file mode 100644 index 000..f2fd5f5 --- /dev/null +++ b/DynamicPageList.hooks.php @@ -0,0 +1,602 @@ +?php + +class DynamicPageListHooks { + + public static function onwfDynamicPageList( $parser ) { + $parser-setHook( 'DynamicPageList', 'onrenderDynamicPageList' ); + return true; + } + + public static function onrenderDynamicPageList( $input, $args, $mwParser ) { + global $wgContLang; + global $wgDisableCounters; // to determine if to allow sorting by #hits. + global $wgDLPmaxCategories, $wgDLPMaxResultCount, $wgDLPMaxCacheTime; + global $wgDLPAllowUnlimitedResults, $wgDLPAllowUnlimitedCategories; + + if ( $wgDLPMaxCacheTime !== false ) { + $mwParser-getOutput()-updateCacheExpiry( $wgDLPMaxCacheTime ); + } + + $countSet = false; + + $startList = 'ul'; + $endList = '/ul'; + $startItem = 'li'; + $endItem = '/li'; + $inlineMode = false; + + $useGallery = false; + $galleryFileSize = false; + $galleryFileName = true; + $galleryImageHeight = 0; + $galleryImageWidth = 0; + $galleryNumbRows = 0; + $galleryCaption = ''; + $gallery = null; + + $orderMethod = 'categoryadd'; + $order = 'descending'; + $redirects = 'exclude'; + $stable = $quality = 'include'; + $flaggedRevs = false; + + $namespaceFiltering = false; + $namespaceIndex = 0; + + $offset = 0; + + $googleHack = false; + + $suppressErrors = false; + $showNamespace = true; + $addFirstCategoryDate = false; + $dateFormat = ''; + $stripYear = false; + + $linkOptions = array(); + $categories = array(); + $excludeCategories = array(); + + $parameters = explode( \n, $input ); + + $parser = new Parser; + $poptions = new ParserOptions; + + foreach ( $parameters as $parameter ) { + $paramField = explode( '=', $parameter, 2 ); + if( count( $paramField ) 2 ) { + continue; + } + $type = trim( $paramField[0] ); + $arg = trim( $paramField[1] ); + switch ( $type ) { + case 'category': + $title = Title::makeTitleSafe( + NS_CATEGORY, + $parser-transformMsg( $arg, $poptions ) + ); + if( is_null( $title ) ) { + continue; + } + $categories[] = $title; + break; + case 'notcategory': + $title = Title::makeTitleSafe( + NS_CATEGORY, + $parser-transformMsg( $arg, $poptions ) + ); + if( is_null( $title ) ) { + continue; + } + $excludeCategories[] = $title; + break; + case 'namespace': + $ns = $wgContLang-getNsIndex( $arg ); + if ( $ns != null ) { + $namespaceIndex = $ns; + $namespaceFiltering = true; + } else { + // Note, since
[MediaWiki-commits] [Gerrit] Add MultiBoilerplate jenkings test - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/211402 Change subject: Add MultiBoilerplate jenkings test .. Add MultiBoilerplate jenkings test Change-Id: Idaa05f9aa23bd52d05c02dbd30887a7fc0607b3e --- M jjb/mediawiki-extensions.yaml M zuul/layout.yaml 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/02/211402/1 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 62d291a..ae7ed62 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -398,6 +398,7 @@ - MoodBar - MsLinks - MsUpload +- MultiBoilerplate - MultimediaPlayer - MultimediaViewer - Narayam diff --git a/zuul/layout.yaml b/zuul/layout.yaml index d7f8489..7e2ce66 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -1630,6 +1630,8 @@ # job later on. - name: apps-android-wikipedia-gradlew-lint voting: false +failure-pattern: 'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/artifact/wikipedia/build/outputs/lint-results-alphaDebug.html' +success-pattern: 'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/artifact/wikipedia/build/outputs/lint-results-alphaDebug.html' - name: ^beta-recompile-math-texvc.* branch: ^master$ -- To view, visit https://gerrit.wikimedia.org/r/211402 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idaa05f9aa23bd52d05c02dbd30887a7fc0607b3e Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox thomasmulhall...@yahoo.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert mediawiki.action.edit.collapsibleFooter and mediawik... - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/211409 Change subject: Convert mediawiki.action.edit.collapsibleFooter and mediawiki.special.changeslist.legend to using mw.cookie .. Convert mediawiki.action.edit.collapsibleFooter and mediawiki.special.changeslist.legend to using mw.cookie Remove redundant parameters, use sane defaults. This changes the cookie name due to mw.cookie adding the standard cookie prefix. This will cause existing values to be lost. Bug: T67384 Change-Id: I00ba66b271cef4635ab4c31226c854583b8ba79e --- M resources/Resources.php M resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js M resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js 3 files changed, 60 insertions(+), 51 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/09/211409/1 diff --git a/resources/Resources.php b/resources/Resources.php index 5f51702..44cf27d 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1098,7 +1098,7 @@ 'styles' = 'resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.css', 'dependencies' = array( 'jquery.makeCollapsible', - 'jquery.cookie', + 'mediawiki.cookie', 'mediawiki.icon', ), ), @@ -1399,7 +1399,7 @@ 'scripts' = 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js', 'dependencies' = array( 'jquery.makeCollapsible', - 'jquery.cookie', + 'mediawiki.cookie', ), ), 'mediawiki.special.changeslist.enhanced' = array( diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js index 7ae51ab..de8c975 100644 --- a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js +++ b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js @@ -1,27 +1,15 @@ -jQuery( document ).ready( function ( $ ) { - var collapsibleLists, i, handleOne; - - // Collapsible lists of categories and templates - collapsibleLists = [ - { - $list: $( '.templatesUsed ul' ), - $toggler: $( '.mw-templatesUsedExplanation' ), - cookieName: 'templates-used-list' - }, - { - $list: $( '.hiddencats ul' ), - $toggler: $( '.mw-hiddenCategoriesExplanation' ), - cookieName: 'hidden-categories-list' - }, - { - $list: $( '.preview-limit-report-wrapper' ), - $toggler: $( '.mw-limitReportExplanation' ), - cookieName: 'preview-limit-report' - } - ]; - - handleOne = function ( $list, $toggler, cookieName ) { - var isCollapsed = $.cookie( cookieName ) !== 'expanded'; +( function ( mw, $ ) { + /** +* Make a footer area collapsible. +* +* @param {jQuery} $list Footer area +* @param {jQuery} $toggler Expand/collapse button +* @param {string} cookieName Name of the cookie used to remember state +* @private +*/ + function makeFooterCollapsible( $list, $toggler, cookieName ) { + // Collapsed by default + var isCollapsed = mw.cookie.get( cookieName ) !== 'expanded'; // Style the toggler with an arrow icon and add a tabIndex and a role for accessibility $toggler.addClass( 'mw-editfooter-toggler' ).prop( 'tabIndex', 0 ).attr( 'role', 'button' ); @@ -38,17 +26,39 @@ $list.on( 'beforeExpand.mw-collapsible', function () { $toggler.removeClass( 'mw-icon-arrow-collapsed' ).addClass( 'mw-icon-arrow-expanded' ); - $.cookie( cookieName, 'expanded' ); + mw.cookie.set( cookieName, 'expanded' ); } ); $list.on( 'beforeCollapse.mw-collapsible', function () { $toggler.removeClass( 'mw-icon-arrow-expanded' ).addClass( 'mw-icon-arrow-collapsed' ); - $.cookie( cookieName, 'collapsed' ); + mw.cookie.set( cookieName, 'collapsed' ); } ); - }; - - for ( i = 0; i collapsibleLists.length; i++ ) { - // Pass to a function for iteration-local variables - handleOne( collapsibleLists[i].$list, collapsibleLists[i].$toggler, collapsibleLists[i].cookieName ); } -} ); + + $( function () { + var
[MediaWiki-commits] [Gerrit] Update and fix per product statistics - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/211433 Change subject: Update and fix per product statistics .. Update and fix per product statistics Change-Id: Id3ff92971c920a3fe3e7ef4a81fa4ee53a7b9e33 --- M SpecialRally.php 1 file changed, 39 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/33/211433/1 diff --git a/SpecialRally.php b/SpecialRally.php index a7c3bb9..984360d 100644 --- a/SpecialRally.php +++ b/SpecialRally.php @@ -33,18 +33,19 @@ $this-outputHeader(); $allowedGroups = array( - 'core', - 'ext-0-wikimedia', - 'out-wikimedia-mobile-0-all', - 'wiki-betawiki', - 'out-kiwix', - 'out-huggle', - 'tsint-0-all', - 'out-jquery-uls', - 'wiki-twn-mainpage', - 'out-pywikipedia-0-all', - 'out-vicuna', - 'out-wikiblame', + 'core', // core + 'ext-0-wikimedia', // Wikimedia extensions + 'out-wikimedia-mobile-0-all', // Wikimedia mobile apps + 'wiki-betawiki', // translatewiki.net UI + 'page-0-all', // translatewiki.net translatable pages + 'out-kiwix', // Kiwix + 'out-huggle', // Huggle + 'tsint-0-all', // Intuition + 'out-jquery-uls', // jQuery ULS + 'wiki-twn-mainpage', // translatewiki.net main page + 'out-pywikipedia-0-all', // Pywikibot + 'out-vicuna', // Vicona uploader + 'out-wikiblame', // WikiBlame ); $allowedGroups = MessageGroups::expandWildcards( '*' ); @@ -72,10 +73,10 @@ $allowed = $currentUser-isAllowed( 'translate-manage' ); if ( $allowed !$par ) { $products = array( - 'MediaWiki core' = 0, - 'MediaWiki extensions used by Wikimedia' = 0, - 'Wikimedia Mobile apps' = 0, - 'translatewiki.net' = 0, + 'MediaWiki core' = 0, // 8 + 'MediaWiki extensions used by Wikimedia' = 0, // 8 + 'Wikimedia Mobile apps' = 0, // + 'translatewiki.net' = 0, // 1198, 8, 'jQuery.ULS' = 0, 'Kiwix' = 0, 'Huggle' = 0, @@ -125,18 +126,31 @@ } if ( $row-rc_namespace == 8 ) { - if( in_array( $group, array( 'core' ) ) ) { - $products['MediaWiki']++; + if ( in_array( $group, array( 'core' ) ) ) { + $products['MediaWiki core']++; + } elseif ( !in_array( $group, array( 'wiki-twn-mainpage', 'wiki-betawiki' ) ) ) { + $products['MediaWiki extensions used by Wikimedia']++; + } elseif ( $group === 'out-jquery-uls' ) { + $products['jQuery.ULS']++; } else { - $products['MediaWiki extensions']++; + $products['translatewiki.net']++; } - } elseif ( in_array( $row-rc_namespace, array( 1212, 1220, 1224, 1244 ) ) ) { - $products['Offline']++; - } elseif ( in_array( $row-rc_namespace, array( 1206 ) ) - !in_array( $group, array( 'out-jquery-uls' ) ) ) { -
[MediaWiki-commits] [Gerrit] Declare global in Action - change (mediawiki/core)
Nemo bis has uploaded a new change for review. https://gerrit.wikimedia.org/r/211451 Change subject: Declare global in Action .. Declare global in Action Change-Id: I06e8490865554a0efa7678be6787deb8a22c5b82 --- M includes/actions/Action.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/51/211451/1 diff --git a/includes/actions/Action.php b/includes/actions/Action.php index fa75e08..79e859a 100644 --- a/includes/actions/Action.php +++ b/includes/actions/Action.php @@ -385,6 +385,7 @@ * @since 1.25 */ public function addHelpLink( $to, $overrideBaseUrl = false ) { + global $wgContLang; $msg = wfMessage( $wgContLang-lc( $this-getActionName() ) . '-helppage' ); if ( !$msg-isDisabled() ) { -- To view, visit https://gerrit.wikimedia.org/r/211451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06e8490865554a0efa7678be6787deb8a22c5b82 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the new isMainPage() and isFilePage() methods added to t... - change (apps...wikipedia)
Kittensofdoom has uploaded a new change for review. https://gerrit.wikimedia.org/r/211496 Change subject: Use the new isMainPage() and isFilePage() methods added to the Page class. .. Use the new isMainPage() and isFilePage() methods added to the Page class. Bug: T90843 Change-Id: I0e1d9561e4a1b9b7d50ae37cbc8848abe9a12472 --- M wikipedia/src/main/java/org/wikipedia/page/Page.java M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java M wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java M wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java M wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java 5 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/96/211496/1 diff --git a/wikipedia/src/main/java/org/wikipedia/page/Page.java b/wikipedia/src/main/java/org/wikipedia/page/Page.java old mode 100644 new mode 100755 index c86130b..26f0085 --- a/wikipedia/src/main/java/org/wikipedia/page/Page.java +++ b/wikipedia/src/main/java/org/wikipedia/page/Page.java @@ -57,7 +57,7 @@ } public boolean couldHaveReadMoreSection() { -return (!getTitle().isFilePage() !getTitle().isSpecial() getTitle().getNamespace() == null); +return (!isFilePage() !getTitle().isSpecial() getTitle().getNamespace() == null); } @Override diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java index 9ab455d..3c01eaf 100755 --- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java @@ -200,7 +200,7 @@ leadSectionPayload.put(string_expand_refs, getString(R.string.expand_refs)); leadSectionPayload.put(isBeta, app.getReleaseType() != WikipediaApp.RELEASE_PROD); leadSectionPayload.put(siteLanguage, title.getSite().getLanguage()); -leadSectionPayload.put(isMainPage, page.getPageProperties().isMainPage()); +leadSectionPayload.put(isMainPage, page.isMainPage()); leadSectionPayload.put(apiLevel, Build.VERSION.SDK_INT); bridge.sendMessage(displayLeadSection, leadSectionPayload); @@ -214,7 +214,7 @@ !app.getUserInfoStorage().isLoggedIn(); miscPayload.put(noedit, (isAnonEditingDisabled || title.isFilePage() - || page.getPageProperties().isMainPage())); + || page.isMainPage())); miscPayload.put(protect, !page.getPageProperties().canEdit()); bridge.sendMessage(setPageProtected, miscPayload); } catch (JSONException e) { diff --git a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java old mode 100644 new mode 100755 index 39916fe..8ce3fe2 --- a/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java +++ b/wikipedia/src/main/java/org/wikipedia/page/ToCHandler.java @@ -214,7 +214,7 @@ } }); -if (!page.getPageProperties().isMainPage() !firstPage) { +if (!page.isMainPage() !firstPage) { final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(parentActivity); final boolean knowsToC = prefs.getBoolean(PrefKeys.getKnowTocDrawer(), false); if (!knowsToC) { diff --git a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java old mode 100644 new mode 100755 index 9ad4500..000b5e1 --- a/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java +++ b/wikipedia/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java @@ -425,7 +425,7 @@ if (!parentFragment.isAdded()) { return; } -boolean isMainPage = parentFragment.getPage().getPageProperties().isMainPage(); +boolean isMainPage = parentFragment.getPage().isMainPage(); int titleContainerHeight; int titleBottomPadding = 0; diff --git a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java old mode 100644 new mode 100755 index cabb127..3c5c0ed --- a/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java +++ b/wikipedia/src/main/java/org/wikipedia/page/snippet/ShareHandler.java @@ -75,7 +75,7 @@ curPageFragment.getLeadImageBitmap(), curPageFragment.getLeadImageFocusY(), title.getDisplayText(), -
[MediaWiki-commits] [Gerrit] Simplify the placeholder for the target title box - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/211397 Change subject: Simplify the placeholder for the target title box .. Simplify the placeholder for the target title box The part in parentheses is not very helpful. It makes the message unnecessarily long, and it's easy to figure out that that is the default. Change-Id: I9f6a69103cef2ae961d150f4ab1e21c434ef0185 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/97/211397/1 diff --git a/i18n/en.json b/i18n/en.json index 07d7810..2aefd8b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -82,7 +82,7 @@ cx-sourceselector-dialog-source-language-label: From:, cx-sourceselector-dialog-target-language-label: To:, cx-sourceselector-dialog-source-title-placeholder: Search for source page, - cx-sourceselector-dialog-target-title-placeholder: Translation title (if different from source), + cx-sourceselector-dialog-target-title-placeholder: Translation title, cx-sourceselector-dialog-error-page-and-title-exist: This title is already used in [$1 $2] for [$3 a different page], cx-sourceselector-dialog-error-page-exists: The page [$1 already exists] in $2, cx-sourceselector-dialog-error-title-in-use: The title for the new page is [$1 already in use], -- To view, visit https://gerrit.wikimedia.org/r/211397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9f6a69103cef2ae961d150f4ab1e21c434ef0185 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] transparency - Raise HSTS max-age to 1 year - change (operations/puppet)
Chmarkine has uploaded a new change for review. https://gerrit.wikimedia.org/r/211394 Change subject: transparency - Raise HSTS max-age to 1 year .. transparency - Raise HSTS max-age to 1 year I14f5cf35 enabled HSTS with max-age=7 days. Bug: T40516 Change-Id: Ie61e3df798c13babdc3543f2bf4accd6c8275dc7 --- M templates/apache/sites/transparency.wikimedia.org.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/94/211394/1 diff --git a/templates/apache/sites/transparency.wikimedia.org.erb b/templates/apache/sites/transparency.wikimedia.org.erb index 44abf7c..55ee919 100644 --- a/templates/apache/sites/transparency.wikimedia.org.erb +++ b/templates/apache/sites/transparency.wikimedia.org.erb @@ -19,5 +19,5 @@ RewriteCond %{HTTP:X-Forwarded-Proto} !https RewriteRule ^/(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [R=301,E=ProtoRedirect] Header always merge Vary X-Forwarded-Proto env=ProtoRedirect -Header always set Strict-Transport-Security max-age=604800 +Header always set Strict-Transport-Security max-age=31536000 /VirtualHost -- To view, visit https://gerrit.wikimedia.org/r/211394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie61e3df798c13babdc3543f2bf4accd6c8275dc7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chmarkine chmark...@hotmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Whitespace cleanup in ext.cx.source.selector.less - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged. Change subject: Whitespace cleanup in ext.cx.source.selector.less .. Whitespace cleanup in ext.cx.source.selector.less Change-Id: I638404329942bd506de8c17b650e498520ab0c70 --- M modules/source/styles/ext.cx.source.selector.less 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/source/styles/ext.cx.source.selector.less b/modules/source/styles/ext.cx.source.selector.less index 0436312..869529e 100644 --- a/modules/source/styles/ext.cx.source.selector.less +++ b/modules/source/styles/ext.cx.source.selector.less @@ -3,6 +3,7 @@ .cx-sourceselector-dialog { .mw-ui-item; + color: #333; position: absolute; min-width: 650px; @@ -18,8 +19,10 @@ .cx-sourceselector-dialog__heading { @vertical-margin: 10px; @horizontal-margin: 15px; + .mw-ui-item; .mw-ui-one-whole; + padding: @vertical-margin @horizontal-margin; font-size: 1.6em; line-height: 1.5em; @@ -31,6 +34,7 @@ .cx-sourceselector-dialog__source-inputs { .mw-ui-item; .mw-ui-one-whole; + height: 50px; padding: 10px; border-bottom: 1px solid #eee; @@ -39,6 +43,7 @@ .cx-sourceselector-dialog__language-label { .mw-ui-item; .mw-ui-one-eighth; + padding: 5px; font-size: large; } @@ -111,6 +116,7 @@ padding: 10px 15px 15px 15px; text-align: right; background-color: #FBFBFB; + button { margin-left: 10px; } @@ -119,6 +125,7 @@ .cx-sourceselector-dialog__license { .mw-ui-item; .mw-ui-one-whole; + padding: 10px; background-color: #FBFBFB; font-size: 12px; -- To view, visit https://gerrit.wikimedia.org/r/211395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I638404329942bd506de8c17b650e498520ab0c70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Pginer pgi...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add user rights to $wgAvailableRights - change (mediawiki...BibManager)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/211417 Change subject: Add user rights to $wgAvailableRights .. Add user rights to $wgAvailableRights Found by tests: https://integration.wikimedia.org/ci/job/mwext-testextension-zend/1717/console Change-Id: Iabcc9429d1b6a1cd7dadb17be44e38e8216209bb --- M BibManager.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BibManager refs/changes/17/211417/1 diff --git a/BibManager.php b/BibManager.php index 6f04e10..1dd8a69 100644 --- a/BibManager.php +++ b/BibManager.php @@ -136,3 +136,7 @@ $wgGroupPermissions['sysop']['bibmanageredit'] = true; $wgGroupPermissions['sysop']['bibmanagerdelete'] = true; $wgGroupPermissions['sysop']['bibmanagercreate'] = true; + +$wgAvailableRights[] = 'bibmanageredit'; +$wgAvailableRights[] = 'bibmanagerdelete'; +$wgAvailableRights[] = 'bibmanagercreate'; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iabcc9429d1b6a1cd7dadb17be44e38e8216209bb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BibManager Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fd67843..5a2b1b6 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: fd67843..5a2b1b6 .. Syncronize VisualEditor: fd67843..5a2b1b6 Change-Id: Ied3c800904f96340de0182d41c2867d432cc8774 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index fd67843..5a2b1b6 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fd6784375a032f56f9a50c0f78e8153ef3d75b84 +Subproject commit 5a2b1b6aed7230d9e86e78b868c658afe80c2bb3 -- To view, visit https://gerrit.wikimedia.org/r/211416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied3c800904f96340de0182d41c2867d432cc8774 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: fd67843..5a2b1b6 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/211416 Change subject: Syncronize VisualEditor: fd67843..5a2b1b6 .. Syncronize VisualEditor: fd67843..5a2b1b6 Change-Id: Ied3c800904f96340de0182d41c2867d432cc8774 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/16/211416/1 diff --git a/VisualEditor b/VisualEditor index fd67843..5a2b1b6 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit fd6784375a032f56f9a50c0f78e8153ef3d75b84 +Subproject commit 5a2b1b6aed7230d9e86e78b868c658afe80c2bb3 -- To view, visit https://gerrit.wikimedia.org/r/211416 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied3c800904f96340de0182d41c2867d432cc8774 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...GlobalContributions)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/211420 Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.23 Change-Id: I18de171b5a9750ed3e04b76660e07d2780d5a4b3 --- M GlobalContributions.php M SpecialGlobalContributions.php 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalContributions refs/changes/20/211420/1 diff --git a/GlobalContributions.php b/GlobalContributions.php index 7a44453..91c2a10 100644 --- a/GlobalContributions.php +++ b/GlobalContributions.php @@ -36,7 +36,6 @@ $wgAutoloadClasses['SpecialGlobalContributions'] = __DIR__ . '/SpecialGlobalContributions.php'; $wgSpecialPages['GlobalContributions'] = 'SpecialGlobalContributions'; -$wgSpecialPageGroups['GlobalContributions'] = 'users'; $wgMessagesDirs['GlobalContributions'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['GlobalContributions'] = __DIR__ . '/GlobalContributions.i18n.php'; $wgExtensionMessagesFiles['GlobalContributionsAlias'] = __DIR__ . '/GlobalContributions.alias.php'; diff --git a/SpecialGlobalContributions.php b/SpecialGlobalContributions.php index 13203a1..9ac7b27 100644 --- a/SpecialGlobalContributions.php +++ b/SpecialGlobalContributions.php @@ -55,5 +55,7 @@ return true; } - + protected function getGroupName() { + return 'users'; + } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I18de171b5a9750ed3e04b76660e07d2780d5a4b3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalContributions Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Unregister core image types - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/211422 Change subject: Unregister core image types .. Unregister core image types Once MW images are registered, we should remove core image support so we don't accidentally match to them (e.g. an MW inline image with an unsupported extra RDFa type). Change-Id: I1c8567346c371fe338f95b232c9ac53e009c5a46 --- M modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js M modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js M modules/ve-mw/init/ve.init.mw.Target.js 3 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/22/211422/1 diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js index 0b5e5b5..e16bbbc 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js @@ -252,4 +252,5 @@ /* Registration */ +ve.dm.modelRegistry.unregister( ve.dm.BlockImageNode ); ve.dm.modelRegistry.register( ve.dm.MWBlockImageNode ); diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js index d6e3650..0ff92eb 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js @@ -199,4 +199,5 @@ /* Registration */ +ve.dm.modelRegistry.unregister( ve.dm.InlineImageNode ); ve.dm.modelRegistry.register( ve.dm.MWInlineImageNode ); diff --git a/modules/ve-mw/init/ve.init.mw.Target.js b/modules/ve-mw/init/ve.init.mw.Target.js index 109f685..b52abbb 100644 --- a/modules/ve-mw/init/ve.init.mw.Target.js +++ b/modules/ve-mw/init/ve.init.mw.Target.js @@ -240,7 +240,7 @@ // Annotations 'link', 'textStyle/span', 'textStyle/font', 'textStyle/underline', 'meta/language', // Nodes - 'inlineImage', 'blockImage', 'div', 'alienInline', 'alienBlock', 'comment' + 'div', 'alienInline', 'alienBlock', 'comment' ], removeOriginalDomElements: true }, -- To view, visit https://gerrit.wikimedia.org/r/211422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1c8567346c371fe338f95b232c9ac53e009c5a46 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...FlaggedRevs)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Id7b6e613b31faa511362d0a7a75df88c15dcaafa --- M FlaggedRevs.setup.php M frontend/FlaggedRevsUI.setup.php M frontend/specialpages/reports/ConfiguredPages_body.php M frontend/specialpages/reports/PendingChanges_body.php M frontend/specialpages/reports/ProblemChanges_body.php M frontend/specialpages/reports/QualityOversight_body.php M frontend/specialpages/reports/ReviewedPages_body.php M frontend/specialpages/reports/StablePages_body.php M frontend/specialpages/reports/UnreviewedPages_body.php M frontend/specialpages/reports/ValidationStatistics_body.php 10 files changed, 35 insertions(+), 12 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/FlaggedRevs.setup.php b/FlaggedRevs.setup.php index fe918fe..9504d06 100755 --- a/FlaggedRevs.setup.php +++ b/FlaggedRevs.setup.php @@ -365,10 +365,10 @@ * @return void */ public static function setSpecialPages() { - global $wgSpecialPages, $wgSpecialPageGroups, $wgSpecialPageCacheUpdates; + global $wgSpecialPages, $wgSpecialPageCacheUpdates; FlaggedRevsUISetup::defineSpecialPages( - $wgSpecialPages, $wgSpecialPageGroups, $wgSpecialPageCacheUpdates ); + $wgSpecialPages, $wgSpecialPageCacheUpdates ); } /** diff --git a/frontend/FlaggedRevsUI.setup.php b/frontend/FlaggedRevsUI.setup.php index 5b3b042..3fe5f2d 100644 --- a/frontend/FlaggedRevsUI.setup.php +++ b/frontend/FlaggedRevsUI.setup.php @@ -92,11 +92,10 @@ /** * Register FlaggedRevs special pages as needed. * @param $pages Array $wgSpecialPages (list of special pages) -* @param $groups Array $wgSpecialPageGroups (assoc array of special page groups) * @param $updates Array $wgSpecialPageCacheUpdates (assoc array of special page updaters) * @return void */ - public static function defineSpecialPages( array $pages, array $groups, array $updates ) { + public static function defineSpecialPages( array $pages, array $updates ) { global $wgFlaggedRevsProtection, $wgFlaggedRevsNamespaces, $wgUseTagFilter; // Show special pages only if FlaggedRevs is enabled on some namespaces @@ -104,31 +103,23 @@ $pages['RevisionReview'] = 'RevisionReview'; // unlisted $pages['ReviewedVersions'] = 'ReviewedVersions'; // unlisted $pages['PendingChanges'] = 'PendingChanges'; - $groups['PendingChanges'] = 'quality'; // Show tag filtered pending edit page if there are tags if ( $wgUseTagFilter ) { $pages['ProblemChanges'] = 'ProblemChanges'; - $groups['ProblemChanges'] = 'quality'; } if ( !$wgFlaggedRevsProtection ) { $pages['ReviewedPages'] = 'ReviewedPages'; - $groups['ReviewedPages'] = 'quality'; $pages['UnreviewedPages'] = 'UnreviewedPages'; - $groups['UnreviewedPages'] = 'quality'; $updates['UnreviewedPages'] = 'UnreviewedPages::updateQueryCache'; } $pages['QualityOversight'] = 'QualityOversight'; - $groups['QualityOversight'] = 'quality'; $pages['ValidationStatistics'] = 'ValidationStatistics'; - $groups['ValidationStatistics'] = 'quality'; $updates['ValidationStatistics'] = 'FlaggedRevsStats::updateCache'; // Protect levels define allowed stability settings if ( $wgFlaggedRevsProtection ) { $pages['StablePages'] = 'StablePages'; - $groups['StablePages'] = 'quality'; } else { $pages['ConfiguredPages'] = 'ConfiguredPages'; - $groups['ConfiguredPages'] = 'quality'; $pages['Stabilization'] = 'Stabilization'; // unlisted } } diff --git a/frontend/specialpages/reports/ConfiguredPages_body.php b/frontend/specialpages/reports/ConfiguredPages_body.php index a705a35..0898d84 100644 --- a/frontend/specialpages/reports/ConfiguredPages_body.php +++ b/frontend/specialpages/reports/ConfiguredPages_body.php @@ -105,6 +105,10 @@
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead GlobalGroupMembership inherit SpecialPage::getGroupName from SpecialUserrights Change-Id: Ic250e6a6fe20aa06db98370c6d6de2006c037431 --- M CentralAuth.php M includes/CentralAuthHooks.php M includes/specials/SpecialCentralAuth.php M includes/specials/SpecialGlobalGroupPermissions.php M includes/specials/SpecialGlobalRenameQueue.php M includes/specials/SpecialGlobalRenameRequest.php M includes/specials/SpecialGlobalUsers.php M includes/specials/SpecialMergeAccount.php M includes/specials/SpecialMultiLock.php M includes/specials/SpecialWikiSets.php 10 files changed, 32 insertions(+), 10 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/CentralAuth.php b/CentralAuth.php index 2876ad0..da05b50 100644 --- a/CentralAuth.php +++ b/CentralAuth.php @@ -434,13 +434,6 @@ $wgSpecialPages['GlobalRenameProgress'] = 'SpecialGlobalRenameProgress'; $wgSpecialPages['GlobalUserMerge'] = 'SpecialGlobalUserMerge'; $wgSpecialPages['UsersWhoWillBeRenamed'] = 'SpecialUsersWhoWillBeRenamed'; -$wgSpecialPageGroups['CentralAuth'] = 'users'; -$wgSpecialPageGroups['MergeAccount'] = 'login'; -$wgSpecialPageGroups['GlobalGroupMembership'] = 'users'; -$wgSpecialPageGroups['GlobalGroupPermissions'] = 'users'; -$wgSpecialPageGroups['WikiSets'] = 'wiki'; -$wgSpecialPageGroups['GlobalUsers'] = 'users'; -$wgSpecialPageGroups['MultiLock'] = 'users'; $wgAPIModules['deleteglobalaccount'] = 'ApiDeleteGlobalAccount'; $wgAPIModules['setglobalaccountstatus'] = 'ApiSetGlobalAccountStatus'; diff --git a/includes/CentralAuthHooks.php b/includes/CentralAuthHooks.php index b2eb7fb..c13ae50 100644 --- a/includes/CentralAuthHooks.php +++ b/includes/CentralAuthHooks.php @@ -9,7 +9,7 @@ */ public static function onRunExtensionFunctions() { global $wgAutoloadClasses, $wgExtensionCredits, $wgHooks; - global $wgSpecialPages, $wgSpecialPageGroups, $wgResourceModules; + global $wgSpecialPages, $wgResourceModules; global $wgCentralAuthEnableGlobalRenameRequest; global $wgCentralAuthCheckSULMigration; $caBase = __DIR__ . '/..'; @@ -57,7 +57,6 @@ 'descriptionmsg' = 'globalrenamerequest-desc', ); $wgSpecialPages['GlobalRenameRequest'] = 'SpecialGlobalRenameRequest'; - $wgSpecialPageGroups['GlobalRenameRequest'] = 'login'; $wgResourceModules['ext.centralauth.globalrenamerequest'] = array( 'position' = 'top', 'scripts' = array( @@ -81,7 +80,6 @@ 'descriptionmsg' = 'globalrenamequeue-desc', ); $wgSpecialPages['GlobalRenameQueue'] = 'SpecialGlobalRenameQueue'; - $wgSpecialPageGroups['GlobalRenameQueue'] = 'users'; $wgResourceModules['ext.centralauth.globalrenamequeue'] = array( 'scripts'= 'ext.centralauth.globalrenamequeue.js', 'localBasePath' = {$caBase}/modules, diff --git a/includes/specials/SpecialCentralAuth.php b/includes/specials/SpecialCentralAuth.php index 55d5f49..d96d620 100644 --- a/includes/specials/SpecialCentralAuth.php +++ b/includes/specials/SpecialCentralAuth.php @@ -847,4 +847,8 @@ } return $mergeMethodDescriptions; } + + protected function getGroupName() { + return 'users'; + } } diff --git a/includes/specials/SpecialGlobalGroupPermissions.php b/includes/specials/SpecialGlobalGroupPermissions.php index 30191a5..df0df38 100644 --- a/includes/specials/SpecialGlobalGroupPermissions.php +++ b/includes/specials/SpecialGlobalGroupPermissions.php @@ -532,4 +532,8 @@ $cu-quickInvalidateCache(); } } + + protected function getGroupName() { + return 'users'; + } } diff --git a/includes/specials/SpecialGlobalRenameQueue.php b/includes/specials/SpecialGlobalRenameQueue.php index a65141e..ecfbc7b 100644 --- a/includes/specials/SpecialGlobalRenameQueue.php +++ b/includes/specials/SpecialGlobalRenameQueue.php @@ -545,6 +545,10 @@ ); return UserMailer::send( $to, $from, $subject, $body ); } + + protected function getGroupName() { + return 'users'; + } } diff --git a/includes/specials/SpecialGlobalRenameRequest.php b/includes/specials/SpecialGlobalRenameRequest.php index
[MediaWiki-commits] [Gerrit] Declare global in Action - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Declare global in Action .. Declare global in Action Follows up e928d5bdd0fbc63. Change-Id: I06e8490865554a0efa7678be6787deb8a22c5b82 --- M includes/actions/Action.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/actions/Action.php b/includes/actions/Action.php index fa75e08..79e859a 100644 --- a/includes/actions/Action.php +++ b/includes/actions/Action.php @@ -385,6 +385,7 @@ * @since 1.25 */ public function addHelpLink( $to, $overrideBaseUrl = false ) { + global $wgContLang; $msg = wfMessage( $wgContLang-lc( $this-getActionName() ) . '-helppage' ); if ( !$msg-isDisabled() ) { -- To view, visit https://gerrit.wikimedia.org/r/211451 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I06e8490865554a0efa7678be6787deb8a22c5b82 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis federicol...@tiscali.it Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo - change (mediawiki...Josa)
jenkins-bot has submitted this change and it was merged. Change subject: Fix typo .. Fix typo * Change Eu/Euro to Euro/Ro Change-Id: Ie06b13b46325a88af19210d50733e79827b3bc90 --- M Josa.class.php M Josa.i18n.magic.php M tests/parserTests.txt 3 files changed, 8 insertions(+), 8 deletions(-) Approvals: devunt: Looks good to me, approved jenkins-bot: Verified diff --git a/Josa.class.php b/Josa.class.php index fa85966..91adf1a 100644 --- a/Josa.class.php +++ b/Josa.class.php @@ -13,7 +13,7 @@ 'E/Ga' = array( '이', '가', '이(가)' ), # 곶감이 / 사과가 'Gwa/Wa' = array( '과', '와', '과(와)' ), # 곶감과 / 사과와 'A/Ya' = array( '아', '야', '아(야)' ), # 태준아 / 철수야 - 'Eu/Euro' = array( '으로', '로', '(으)로' ), # 집으로 / 학교로 + 'Euro/Ro' = array( '으로', '로', '(으)로' ), # 집으로 / 학교로 'E/' = array( '이', '', '(이)' ), # 태준이가 / 철수가 ); @@ -49,8 +49,8 @@ $idx = 2; # Not hangul } elseif ( ( $chr - 0xAC00 ) % 28 == 0 ) { $idx = 1; # No trailing consonant - } elseif ( ( $type === 'Eu/Euro' ) ( ( $chr - 0xAC00 ) % 28 == 8 ) ) { - $idx = 1; # $type is Eu/Euro and trailing consonant is rieul(ㄹ). This is exception on Korean postposition rules. + } elseif ( ( $type === 'Euro/Ro' ) ( ( $chr - 0xAC00 ) % 28 == 8 ) ) { + $idx = 1; # $type is Euro/Ro and trailing consonant is rieul(ㄹ). This is exception on Korean postposition rules. } else { $idx = 0; # Trailing consonant exists } diff --git a/Josa.i18n.magic.php b/Josa.i18n.magic.php index e56d0ef..9b7421e 100644 --- a/Josa.i18n.magic.php +++ b/Josa.i18n.magic.php @@ -7,7 +7,7 @@ 'E/Ga' = array( 0, 'EGa' ), 'Gwa/Wa' = array( 0, 'GwaWa' ), 'A/Ya' = array( 0, 'AYa' ), - 'Eu/Euro' = array( 0, 'Euro' ), + 'Euro/Ro' = array( 0, 'Euro' ), 'E/' = array( 0, 'E' ), ); @@ -17,6 +17,6 @@ 'E/Ga' = array( 0, '이가' ), 'Gwa/Wa' = array( 0, '과와' ), 'A/Ya' = array( 0, '아야' ), - 'Eu/Euro' = array( 0, '으로' ), + 'Euro/Ro' = array( 0, '으로' ), 'E/' = array( 0, '이' ), ); diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 34d80f9..b89de83 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -4,7 +4,7 @@ E/Ga Gwa/Wa A/Ya -Eu/Euro +Euro/Ro E/ !! endfunctionhooks @@ -119,7 +119,7 @@ !! end !! test -Josa {{#Eu/Euro:}} - Euro: Hangul +Josa {{#Euro/Ro:}} - Euro: Hangul !! options language=ko !! input @@ -130,7 +130,7 @@ !! end !! test -Josa {{#Eu/Euro:}} - Ro: Hangul +Josa {{#Euro/Ro:}} - Ro: Hangul !! options language=ko !! input -- To view, visit https://gerrit.wikimedia.org/r/211020 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie06b13b46325a88af19210d50733e79827b3bc90 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Josa Gerrit-Branch: master Gerrit-Owner: devunt dev...@gmail.com Gerrit-Reviewer: devunt dev...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add required arguments to ParserAfterParse hook call - change (mediawiki...Math)
Physikerwelt has uploaded a new change for review. https://gerrit.wikimedia.org/r/211401 Change subject: Add required arguments to ParserAfterParse hook call .. Add required arguments to ParserAfterParse hook call Bug: T99212 Change-Id: Ia8993e55a4abd6580504e422eb84ebd4ed09544c --- M MathTexvc.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math refs/changes/01/211401/1 diff --git a/MathTexvc.php b/MathTexvc.php index b1e9662..9e6f906 100644 --- a/MathTexvc.php +++ b/MathTexvc.php @@ -406,7 +406,7 @@ // Workaround for bugfix for Bug 56769 if ( !isset( $wgHooks['ParserAfterParse']['FlushMathBackend'] ) ) { // saves the PNG-file - Hooks::run( 'ParserAfterParse' ); + Hooks::run( 'ParserAfterParse', array( new Parser(), '', new StripState( '' ) ) ); } $backend = $this-getBackend(); return $backend-getFileContents( array( 'src' = $this-getHashPath() . / . $this-getHash() . '.png' ) ); -- To view, visit https://gerrit.wikimedia.org/r/211401 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8993e55a4abd6580504e422eb84ebd4ed09544c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Physikerwelt w...@physikerwelt.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Allow models to specific which extra RDFa ... - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/211405 Change subject: [BREAKING CHANGE] Allow models to specific which extra RDFa types they support .. [BREAKING CHANGE] Allow models to specific which extra RDFa types they support Currently the rule is 'any' for regular types, and 'none' for types which have extension specific types. Change this be a defined value 'allowedRdfaTypes' which defaults to [] (i.e. none). This can be overriden by users which allow other types (e.g. mw:Transclusion allows any type, mw:Image allows mw:Error, mw:Reference allows dc:reference). Bug: T98999 Change-Id: I1ca64562e9e65d5881dba43a4f2012d51f936784 --- M src/dm/ve.dm.Model.js M src/dm/ve.dm.ModelRegistry.js M tests/dm/ve.dm.ModelRegistry.test.js 3 files changed, 148 insertions(+), 161 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/05/211405/1 diff --git a/src/dm/ve.dm.Model.js b/src/dm/ve.dm.Model.js index 3d0a338..3bc7ae3 100644 --- a/src/dm/ve.dm.Model.js +++ b/src/dm/ve.dm.Model.js @@ -44,6 +44,7 @@ /** * Array of RDFa types that this model should be a match candidate for. + * Any other types the element might have must be sepcified in allowedRdfaTypes. * Empty array means none, null means any. * For more information about element matching, see ve.dm.ModelRegistry. * @static @@ -51,6 +52,17 @@ * @inheritable */ ve.dm.Model.static.matchRdfaTypes = null; + +/** + * Extra RDFa types that the element is allowed to have (but don't by + * themselves trigger a match). + * Empty array means none, null means any. + * For more information about element matching, see ve.dm.ModelRegistry. + * @static + * @property {Array} + * @inheritable + */ +ve.dm.Model.static.allowedRdfaTypes = []; /** * Optional function to determine whether this model should match a given element. @@ -218,6 +230,16 @@ return this.matchRdfaTypes; }; +/** + * Extra RDFa types that the element is allowed to have. + * + * @static + * @returns {Array} Array of strings or regular expressions + */ +ve.dm.Model.static.getAllowedRdfaTypes = function () { + return this.allowedRdfaTypes; +}; + /* Methods */ /** diff --git a/src/dm/ve.dm.ModelRegistry.js b/src/dm/ve.dm.ModelRegistry.js index b5a08d5..b9c7596 100644 --- a/src/dm/ve.dm.ModelRegistry.js +++ b/src/dm/ve.dm.ModelRegistry.js @@ -224,38 +224,6 @@ }; /** -* Register an extension-specific RDFa type or set of types. Unrecognized extension-specific types -* skip non-type matches and are alienated. -* -* If a DOM node has RDFa types that are extension-specific, any matches that do not involve one of -* those extension-specific types will be ignored. This means that if 'bar' is an -* extension-specific type, and there are no models specifying 'bar' in their .matchRdfaTypes, then -* `foo typeof=bar baz` will not match anything, not even a model with .matchTagNames=['foo'] -* or one with .matchRdfaTypes=['baz'] . -* -* @param {string|RegExp} type Type, or regex matching types, to designate as extension-specifics -*/ - ve.dm.ModelRegistry.prototype.registerExtensionSpecificType = function ( type ) { - this.extSpecificTypes.push( type ); - }; - - /** -* Checks whether a given type matches one of the registered extension-specific types. -* @param {string} type Type to check -* @returns {boolean} Whether type is extension-specific -*/ - ve.dm.ModelRegistry.prototype.isExtensionSpecificType = function ( type ) { - var i, len, t; - for ( i = 0, len = this.extSpecificTypes.length; i len; i++ ) { - t = this.extSpecificTypes[i]; - if ( t === type || ( t instanceof RegExp type.match( t ) ) ) { - return true; - } - } - return false; - }; - - /** * Determine which model best matches the given node * * Model matching works as follows: @@ -283,8 +251,7 @@ * @returns {string|null} Model type, or null if none found */ ve.dm.ModelRegistry.prototype.matchElement = function ( node, forceAboutGrouping, excludeTypes ) { - var i, name, model, matches, winner, types, elementExtSpecificTypes, matchTypes, - hasExtSpecificTypes, + var i, name, model, matches, winner, types, tag = node.nodeName.toLowerCase(), reg = this; @@ -317,31 +284,38 @@ return matches; } - function matchesAllTypes( types, name ) { - var i, j, haveMatch, matchTypes =
[MediaWiki-commits] [Gerrit] Removed extra return in triggerOpportunisticLinksUpdate - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Removed extra return in triggerOpportunisticLinksUpdate .. Removed extra return in triggerOpportunisticLinksUpdate Change-Id: Ifbce1ce6e940e4e7afbd1267283a4d0568713f6b --- M includes/page/WikiPage.php 1 file changed, 0 insertions(+), 3 deletions(-) Approvals: Umherirrender: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index 7b33b02..72ce19a 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -3418,10 +3418,7 @@ new JobSpecification( 'refreshLinks', $params, array( 'removeDuplicates' = true ), $this-mTitle ) ) ); - return; } - - return; } /** -- To view, visit https://gerrit.wikimedia.org/r/211309 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifbce1ce6e940e4e7afbd1267283a4d0568713f6b Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...OAuth)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/211418 Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Id5265e6a21b777423981a0e6456c5ef67877df27 --- M frontend/MWOAuthUI.setup.php M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php M frontend/specialpages/SpecialMWOAuthListConsumers.php M frontend/specialpages/SpecialMWOAuthManageConsumers.php M frontend/specialpages/SpecialMWOAuthManageMyGrants.php 5 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OAuth refs/changes/18/211418/1 diff --git a/frontend/MWOAuthUI.setup.php b/frontend/MWOAuthUI.setup.php index d5f89b6..d3aa768 100644 --- a/frontend/MWOAuthUI.setup.php +++ b/frontend/MWOAuthUI.setup.php @@ -12,13 +12,11 @@ * @return void */ public static function unconditionalSetup() { - global $wgSpecialPages, $wgSpecialPageGroups, $wgHooks, $wgResourceModules; + global $wgSpecialPages, $wgHooks, $wgResourceModules; $wgSpecialPages['OAuth'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuth'; $wgSpecialPages['OAuthManageMyGrants'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuthManageMyGrants'; - $wgSpecialPageGroups['OAuthManageMyGrants'] = 'users'; $wgSpecialPages['OAuthListConsumers'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuthListConsumers'; - $wgSpecialPageGroups['OAuthListConsumers'] = 'users'; $wgHooks['GetPreferences'][] = 'MediaWiki\Extensions\OAuth\MWOAuthUIHooks::onGetPreferences'; $wgHooks['MessagesPreLoad'][] = 'MediaWiki\Extensions\OAuth\MWOAuthUIHooks::onMessagesPreLoad'; @@ -48,14 +46,12 @@ * @return void */ public static function conditionalSetup() { - global $wgSpecialPages, $wgSpecialPageGroups; + global $wgSpecialPages; global $wgLogTypes, $wgLogNames, $wgLogHeaders, $wgLogActionsHandlers; if ( MWOAuthUtils::isCentralWiki() ) { $wgSpecialPages['OAuthConsumerRegistration'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuthConsumerRegistration'; - $wgSpecialPageGroups['OAuthConsumerRegistration'] = 'users'; $wgSpecialPages['OAuthManageConsumers'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuthManageConsumers'; - $wgSpecialPageGroups['OAuthManageConsumers'] = 'users'; $wgLogTypes[] = 'mwoauthconsumer'; $wgLogNames['mwoauthconsumer'] = 'mwoauthconsumer-consumer-logpage'; diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php index e5636f9..2ccf3af 100644 --- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php +++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php @@ -463,6 +463,10 @@ return $r; } + + protected function getGroupName() { + return 'users'; + } } /** diff --git a/frontend/specialpages/SpecialMWOAuthListConsumers.php b/frontend/specialpages/SpecialMWOAuthListConsumers.php index b9ea117..e4b5c77 100644 --- a/frontend/specialpages/SpecialMWOAuthListConsumers.php +++ b/frontend/specialpages/SpecialMWOAuthListConsumers.php @@ -292,6 +292,10 @@ return $r; } + + protected function getGroupName() { + return 'users'; + } } /** diff --git a/frontend/specialpages/SpecialMWOAuthManageConsumers.php b/frontend/specialpages/SpecialMWOAuthManageConsumers.php index c45105c..8959e61 100755 --- a/frontend/specialpages/SpecialMWOAuthManageConsumers.php +++ b/frontend/specialpages/SpecialMWOAuthManageConsumers.php @@ -506,6 +506,10 @@ return $r; } + + protected function getGroupName() { + return 'users'; + } } /** diff --git a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php index efad8dc..e138547 100644 --- a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php +++ b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php @@ -319,6 +319,10 @@ } return self::$irrevocableGrants; } + + protected function getGroupName() { + return 'users'; + } } /** -- To view, visit https://gerrit.wikimedia.org/r/211418 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5265e6a21b777423981a0e6456c5ef67877df27 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch:
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5a2b1b6..26f185f - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/211428 Change subject: Syncronize VisualEditor: 5a2b1b6..26f185f .. Syncronize VisualEditor: 5a2b1b6..26f185f Change-Id: Ib13ccfd26c34edb87b18af55855925fd7ed0f9b2 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/28/211428/1 diff --git a/VisualEditor b/VisualEditor index 5a2b1b6..26f185f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 5a2b1b6aed7230d9e86e78b868c658afe80c2bb3 +Subproject commit 26f185fab88c5055af0e1484e6909aabff2597eb -- To view, visit https://gerrit.wikimedia.org/r/211428 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib13ccfd26c34edb87b18af55855925fd7ed0f9b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 5a2b1b6..26f185f - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 5a2b1b6..26f185f .. Syncronize VisualEditor: 5a2b1b6..26f185f Change-Id: Ib13ccfd26c34edb87b18af55855925fd7ed0f9b2 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 5a2b1b6..26f185f 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 5a2b1b6aed7230d9e86e78b868c658afe80c2bb3 +Subproject commit 26f185fab88c5055af0e1484e6909aabff2597eb -- To view, visit https://gerrit.wikimedia.org/r/211428 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib13ccfd26c34edb87b18af55855925fd7ed0f9b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a couple of patterns to .gitignore for emacs - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Add a couple of patterns to .gitignore for emacs .. Add a couple of patterns to .gitignore for emacs Change-Id: I591ae58aee028444a12932ee0fd3ec01587ddfa5 --- M .gitignore 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index 29103a4..6530eb6 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ sublime-* .project .settings +\#*# +.#* # Install and build artifacts /docs @@ -12,5 +14,6 @@ composer.lock vendor + # OS .DS_Store -- To view, visit https://gerrit.wikimedia.org/r/210827 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I591ae58aee028444a12932ee0fd3ec01587ddfa5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: MarkAHershberger m...@nichework.com Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: MarkAHershberger m...@nichework.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update for upcoming translation rally - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/211430 Change subject: Update for upcoming translation rally .. Update for upcoming translation rally Change-Id: I875acf870fd8f0ba8987975a6a9dbcb7916a8344 --- M SpecialRally.php 1 file changed, 39 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/30/211430/1 diff --git a/SpecialRally.php b/SpecialRally.php index cbffe18..a7c3bb9 100644 --- a/SpecialRally.php +++ b/SpecialRally.php @@ -33,15 +33,18 @@ $this-outputHeader(); $allowedGroups = array( - 'core', // 8 - 'ext-0-all', // 8 - 'out-jquery-uls', // 1206 - 'out-kiwix', // 1244 - 'out-okawix-0-all', // 1220 - 'out-pywikipedia-0-all', // 1238 - 'out-wikiblame', // 1206 - 'out-wikimedia-mobile-0-all', // 1206 - 'tsint-0-all' // 1240 + 'core', + 'ext-0-wikimedia', + 'out-wikimedia-mobile-0-all', + 'wiki-betawiki', + 'out-kiwix', + 'out-huggle', + 'tsint-0-all', + 'out-jquery-uls', + 'wiki-twn-mainpage', + 'out-pywikipedia-0-all', + 'out-vicuna', + 'out-wikiblame', ); $allowedGroups = MessageGroups::expandWildcards( '*' ); @@ -50,6 +53,11 @@ foreach ( $allGroups as $groupId = $messageGroup ) { if ( in_array( $groupId, $allowedGroups ) ) { if( $messageGroup-isMeta() ) { + // @todo Ugly work around for MediaWikiTopMessageGroup::getGroups() + // not existing. + if( $messageGroup-getId() === 'core-0-mostused' ) + continue; + $groups = $messageGroup-getGroups(); foreach ( $groups as $gid = $groupDetails ) { $allowedGroups[] = $gid; @@ -64,11 +72,17 @@ $allowed = $currentUser-isAllowed( 'translate-manage' ); if ( $allowed !$par ) { $products = array( - 'MediaWiki' = 0, - 'MediaWiki extensions' = 0, - 'Mobile' = 0, - 'Offline' = 0, - 'Other' = 0 + 'MediaWiki core' = 0, + 'MediaWiki extensions used by Wikimedia' = 0, + 'Wikimedia Mobile apps' = 0, + 'translatewiki.net' = 0, + 'jQuery.ULS' = 0, + 'Kiwix' = 0, + 'Huggle' = 0, + 'Intuition' = 0, + 'Pywikibot' = 0, + 'VicuñaUploader' = 0, + 'WikiBlame' = 0, ); $languages = array(); $userLangs = array(); @@ -81,11 +95,11 @@ 'page_latest' ); $conds = array( - rc_timestamp = 2014080610, - rc_timestamp = 20140810235959, + rc_timestamp = 2015051700, + rc_timestamp = 20150525235959, 'rc_new' = 1, 'rc_bot' = 0, - 'rc_namespace IN (8, 1206, 1212, 1220, 1224, 1238, 1240, 1244)', + 'rc_namespace IN ( 8, 1198, 1206, 1238, 1240, 1244, 1248, 1252 )', 'rc_cur_id = page_id' ); @@ -195,11 +209,11 @@
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...BibManager)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.22 Change-Id: I9d97b5b85707bb920ff786c00abac5ac409fe70e --- M BibManager.php M includes/specials/SpecialBibManagerCreate.php M includes/specials/SpecialBibManagerDelete.php M includes/specials/SpecialBibManagerEdit.php M includes/specials/SpecialBibManagerExport.php M includes/specials/SpecialBibManagerImport.php M includes/specials/SpecialBibManagerList.php M includes/specials/SpecialBibManagerListAuthors.php 8 files changed, 27 insertions(+), 10 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/BibManager.php b/BibManager.php index 1dd8a69..b351dc7 100644 --- a/BibManager.php +++ b/BibManager.php @@ -72,15 +72,6 @@ $wgSpecialPages['BibManagerCreate'] = 'SpecialBibManagerCreate'; $wgSpecialPages['BibManagerEdit']= 'SpecialBibManagerEdit'; -//Add SpecialPages to group -$wgSpecialPageGroups['BibManagerList']= 'bibmanager'; -$wgSpecialPageGroups['BibManagerListAuthors'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerImport'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerExport'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerDelete'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerCreate'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerEdit']= 'bibmanager'; - //Add Hookhandler $wgHooks['ParserFirstCallInit'][] = 'BibManagerHooks::onParserFirstCallInit'; $wgHooks['BeforePageDisplay'][] = 'BibManagerHooks::onBeforePageDisplay'; @@ -139,4 +130,4 @@ $wgAvailableRights[] = 'bibmanageredit'; $wgAvailableRights[] = 'bibmanagerdelete'; -$wgAvailableRights[] = 'bibmanagercreate'; \ No newline at end of file +$wgAvailableRights[] = 'bibmanagercreate'; diff --git a/includes/specials/SpecialBibManagerCreate.php b/includes/specials/SpecialBibManagerCreate.php index 1f11922..f6e5742 100644 --- a/includes/specials/SpecialBibManagerCreate.php +++ b/includes/specials/SpecialBibManagerCreate.php @@ -92,4 +92,8 @@ ); return true; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerDelete.php b/includes/specials/SpecialBibManagerDelete.php index b6e6107..5d269d3 100644 --- a/includes/specials/SpecialBibManagerDelete.php +++ b/includes/specials/SpecialBibManagerDelete.php @@ -101,4 +101,8 @@ } return $result; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerEdit.php b/includes/specials/SpecialBibManagerEdit.php index eef6cd8..85f69d8 100644 --- a/includes/specials/SpecialBibManagerEdit.php +++ b/includes/specials/SpecialBibManagerEdit.php @@ -145,4 +145,8 @@ return true; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerExport.php b/includes/specials/SpecialBibManagerExport.php index f6434d6..b0ce846 100644 --- a/includes/specials/SpecialBibManagerExport.php +++ b/includes/specials/SpecialBibManagerExport.php @@ -55,4 +55,7 @@ echo $out; } + protected function getGroupName() { + return 'bibmanager'; + } } \ No newline at end of file diff --git a/includes/specials/SpecialBibManagerImport.php b/includes/specials/SpecialBibManagerImport.php index ebdf1e3..34eea37 100644 --- a/includes/specials/SpecialBibManagerImport.php +++ b/includes/specials/SpecialBibManagerImport.php @@ -100,4 +100,8 @@ return true; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerList.php b/includes/specials/SpecialBibManagerList.php index 03c98fa..bc6125b 100644 --- a/includes/specials/SpecialBibManagerList.php +++ b/includes/specials/SpecialBibManagerList.php @@ -92,4 +92,8 @@ public function submitForm ( $formData ) { return false; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerListAuthors.php b/includes/specials/SpecialBibManagerListAuthors.php index b5a317e..de037bc 100644 --- a/includes/specials/SpecialBibManagerListAuthors.php +++ b/includes/specials/SpecialBibManagerListAuthors.php @@ -42,4 +42,7 @@ return false; } + protected function getGroupName() { + return 'bibmanager'; + } } \ No newline at end of file -- To view, visit
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...WikiLexicalData)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.21 Change-Id: Ida8b15d55badead625f8b54fae1429a93512f10d --- M OmegaWiki/SpecialAddCollection.php M OmegaWiki/SpecialConceptMapping.php M OmegaWiki/SpecialImportLangNames.php M OmegaWiki/SpecialNeedsTranslation.php M includes/setup/OWSpecials.php M includes/specials/SpecialDatasearch.php M includes/specials/SpecialOWAddFromExternalAPI.php M includes/specials/SpecialOWDownloads.php M includes/specials/SpecialOWStatistics.php 9 files changed, 29 insertions(+), 27 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/OmegaWiki/SpecialAddCollection.php b/OmegaWiki/SpecialAddCollection.php index a820583..029d204 100644 --- a/OmegaWiki/SpecialAddCollection.php +++ b/OmegaWiki/SpecialAddCollection.php @@ -62,5 +62,9 @@ '', array( 'create' = wfMessage( 'ow_create' )-text() ) ) ); } + + protected function getGroupName() { + return 'other'; + } } diff --git a/OmegaWiki/SpecialConceptMapping.php b/OmegaWiki/SpecialConceptMapping.php index 4408e87..e70203b 100644 --- a/OmegaWiki/SpecialConceptMapping.php +++ b/OmegaWiki/SpecialConceptMapping.php @@ -189,5 +189,8 @@ } } + protected function getGroupName() { + return 'other'; + } } diff --git a/OmegaWiki/SpecialImportLangNames.php b/OmegaWiki/SpecialImportLangNames.php index d0d7bdb..569d2d2 100644 --- a/OmegaWiki/SpecialImportLangNames.php +++ b/OmegaWiki/SpecialImportLangNames.php @@ -111,4 +111,8 @@ $wikipage = new WikiPage( $titleObj ); $wikipage-doEdit( $content, 'updated via Special:ImportLangNames' ); } + + protected function getGroupName() { + return 'other'; + } } diff --git a/OmegaWiki/SpecialNeedsTranslation.php b/OmegaWiki/SpecialNeedsTranslation.php index 09dea95..4c5dd76 100644 --- a/OmegaWiki/SpecialNeedsTranslation.php +++ b/OmegaWiki/SpecialNeedsTranslation.php @@ -194,6 +194,10 @@ $wgOut-addHTML( Showing $nbshown out of $queryResultCount ) ; $wgOut-addHTML( $editor-view( new IdStack( expression ), $recordSet ) ); } + + protected function getGroupName() { + return 'maintenance'; + } } diff --git a/includes/setup/OWSpecials.php b/includes/setup/OWSpecials.php index 6b12fdc..d9951fc 100644 --- a/includes/setup/OWSpecials.php +++ b/includes/setup/OWSpecials.php @@ -131,31 +131,6 @@ // $wgSpecialPages['Transaction'] = 'SpecialTransaction'; -# Tell MediaWiki about which group the new special page belongs to -# maintenance = Maintenance reports -# wiki = Data and tools -# others = Other Special pages -/** - * == UnlistedSpecialPage == - * SpecialCopy - * SpecialSelect - * SpecialSuggest - * SpecialPopupEditor - */ - -$wgSpecialPageGroups[ 'AddCollection' ] = 'other'; -$wgSpecialPageGroups[ 'ConceptMapping' ] = 'other'; -$wgSpecialPageGroups[ 'ow_data_search' ] = 'wiki'; -$wgSpecialPageGroups[ 'ImportLangNames' ] = 'other'; -$wgSpecialPageGroups[ 'NeedsTranslation' ] = 'maintenance'; - -$wgSpecialPageGroups[ 'ow_statistics' ] = 'wiki'; -$wgSpecialPageGroups[ 'ow_downloads' ] = 'wiki'; - -// special page with conditional groups - -// ow_addFromExtAPI - global $wgWldProcessExternalAPIClasses, $wgWldExtenalResourceLanguages, $wgWldScriptPath; $wgWldProcessExternalAPIClasses = array(); $wgWldExtenalResourceLanguages = array(); @@ -172,8 +147,6 @@ } if ( $wgWldProcessExternalAPIClasses ) { - $wgSpecialPageGroups[ 'ow_addFromExtAPI' ] = 'maintenance'; - $wgResourceModules['ext.OwAddFromExtAPI.js'] = $resourcePathArray + array( 'scripts' = 'omegawiki-addExtAPI.js' ); diff --git a/includes/specials/SpecialDatasearch.php b/includes/specials/SpecialDatasearch.php index 5bfdb79..585696b 100644 --- a/includes/specials/SpecialDatasearch.php +++ b/includes/specials/SpecialDatasearch.php @@ -518,4 +518,8 @@ return $linksHtml; } + + protected function getGroupName() { + return 'wiki'; + } } diff --git a/includes/specials/SpecialOWAddFromExternalAPI.php b/includes/specials/SpecialOWAddFromExternalAPI.php index f739063..cdc60fa 100644 --- a/includes/specials/SpecialOWAddFromExternalAPI.php +++ b/includes/specials/SpecialOWAddFromExternalAPI.php @@ -143,6 +143,9 @@ require_once( 'ExternalWordnik.php' ); } + protected function getGroupName() { + return 'maintenance'; + } } /** @brief This class handles External Resources. diff --git
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...PageTriage)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I120fed5f56acf9d6407e92479952dbe69dcb343a --- M PageTriage.php M SpecialNewPagesFeed.php 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/PageTriage.php b/PageTriage.php index 7fc8c40..540cc3f 100644 --- a/PageTriage.php +++ b/PageTriage.php @@ -113,7 +113,6 @@ $wgAutoloadClasses['SpecialNewPagesFeed'] = $dir . 'SpecialNewPagesFeed.php'; $wgSpecialPages['NewPagesFeed'] = 'SpecialNewPagesFeed'; -$wgSpecialPageGroups['NewPagesFeed'] = 'changes'; $wgAutoloadClasses['ArticleMetadata'] = $dir . 'includes/ArticleMetadata.php'; $wgAutoloadClasses['PageTriage'] = $dir . 'includes/PageTriage.php'; $wgAutoloadClasses['PageTriageUtil'] = $dir . 'includes/PageTriageUtil.php'; diff --git a/SpecialNewPagesFeed.php b/SpecialNewPagesFeed.php index a762883..985014d 100644 --- a/SpecialNewPagesFeed.php +++ b/SpecialNewPagesFeed.php @@ -217,4 +217,7 @@ } } + protected function getGroupName() { + return 'changes'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I120fed5f56acf9d6407e92479952dbe69dcb343a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageTriage Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...UserMerge)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I39cee2a30aba07eea780243a232872d2d4ad27e4 --- M SpecialUserMerge.php M UserMerge.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialUserMerge.php b/SpecialUserMerge.php index 6ec194f..638bcab 100644 --- a/SpecialUserMerge.php +++ b/SpecialUserMerge.php @@ -159,6 +159,10 @@ return Status::newGood(); } + + protected function getGroupName() { + return 'users'; + } } /** diff --git a/UserMerge.php b/UserMerge.php index 1da477b..cdf9282 100644 --- a/UserMerge.php +++ b/UserMerge.php @@ -70,7 +70,6 @@ $wgExtensionMessagesFiles['UserMerge'] = $dir . 'UserMerge.i18n.php'; $wgExtensionMessagesFiles['UserMergeAlias'] = $dir . 'UserMerge.alias.php'; $wgSpecialPages['UserMerge'] = 'UserMerge'; -$wgSpecialPageGroups['UserMerge'] = 'users'; $wgUserMergeProtectedGroups = array( sysop ); -- To view, visit https://gerrit.wikimedia.org/r/211367 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39cee2a30aba07eea780243a232872d2d4ad27e4 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UserMerge Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localize NS_TOPIC to 'Tema' for Catalan - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Localize NS_TOPIC to 'Tema' for Catalan .. Localize NS_TOPIC to 'Tema' for Catalan Bug: T99217 Change-Id: I859621a2b44b5066f85bcf10b44f521ccab435df --- M Flow.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/Flow.namespaces.php b/Flow.namespaces.php index 816cc9c..a46409a 100644 --- a/Flow.namespaces.php +++ b/Flow.namespaces.php @@ -14,6 +14,11 @@ NS_TOPIC = 'Asuntu', ); +/** Catalan */ +$namespaceNames['ca'] = array( + NS_TOPIC = 'Tema', +); + /** German */ $namespaceNames['de'] = array( NS_TOPIC = 'Thema', -- To view, visit https://gerrit.wikimedia.org/r/211311 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I859621a2b44b5066f85bcf10b44f521ccab435df Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Id57edc492c249bada21bcd1bccc5d18c602c7b3e --- M Flow.php M includes/Specials/SpecialEnableFlow.php M includes/Specials/SpecialFlow.php 3 files changed, 8 insertions(+), 2 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/Flow.php b/Flow.php index 6c9847e..88917f4 100644 --- a/Flow.php +++ b/Flow.php @@ -96,8 +96,6 @@ $wgExtensionMessagesFiles['FlowAlias'] = $dir . 'Flow.alias.php'; $wgSpecialPages['Flow'] = 'Flow\Specials\SpecialFlow'; $wgSpecialPages['EnableFlow'] = 'Flow\Specials\SpecialEnableFlow'; -$wgSpecialPageGroups['Flow'] = 'redirects'; -$wgSpecialPageGroups['EnableFlow'] = 'wiki'; // Housekeeping hooks $wgHooks['LoadExtensionSchemaUpdates'][] = 'FlowHooks::getSchemaUpdates'; diff --git a/includes/Specials/SpecialEnableFlow.php b/includes/Specials/SpecialEnableFlow.php index 7eaa358..37304cf 100644 --- a/includes/Specials/SpecialEnableFlow.php +++ b/includes/Specials/SpecialEnableFlow.php @@ -154,4 +154,8 @@ $confirmationMessage = $this-msg( 'flow-special-enableflow-confirmation', $this-page )-parse(); $this-getOutput()-addHTML( $confirmationMessage ); } + + protected function getGroupName() { + return 'wiki'; + } } diff --git a/includes/Specials/SpecialFlow.php b/includes/Specials/SpecialFlow.php index af70785..866ae1f 100644 --- a/includes/Specials/SpecialFlow.php +++ b/includes/Specials/SpecialFlow.php @@ -193,4 +193,8 @@ return Status::newFatal( 'flow-special-invalid-uuid' ); } } + + protected function getGroupName() { + return 'redirects'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211386 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id57edc492c249bada21bcd1bccc5d18c602c7b3e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I1d040a8c3aa349f8fdbbf469a7789ccf3adc9d4f --- M UploadWizard.php M includes/specials/SpecialCampaigns.php M includes/specials/SpecialUploadWizard.php 3 files changed, 6 insertions(+), 2 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/UploadWizard.php b/UploadWizard.php index fde51a2..3b98ef1 100644 --- a/UploadWizard.php +++ b/UploadWizard.php @@ -84,8 +84,6 @@ # Let the special page be a special center of unique specialness $wgSpecialPages['UploadWizard'] = 'SpecialUploadWizard'; $wgSpecialPages['Campaigns'] = 'SpecialCampaigns'; -$wgSpecialPageGroups['UploadWizard'] = 'media'; -$wgSpecialPageGroups['Campaigns'] = 'media'; $wgHooks['ResourceLoaderRegisterModules'][] = 'UploadWizardHooks::resourceLoaderRegisterModules'; $wgHooks['LoadExtensionSchemaUpdates'][] = 'UploadWizardHooks::onSchemaUpdate'; diff --git a/includes/specials/SpecialCampaigns.php b/includes/specials/SpecialCampaigns.php index 81b4eaf..0a433b8 100644 --- a/includes/specials/SpecialCampaigns.php +++ b/includes/specials/SpecialCampaigns.php @@ -80,4 +80,7 @@ ); } + protected function getGroupName() { + return 'media'; + } } \ No newline at end of file diff --git a/includes/specials/SpecialUploadWizard.php b/includes/specials/SpecialUploadWizard.php index 69b4da1..7d54511 100644 --- a/includes/specials/SpecialUploadWizard.php +++ b/includes/specials/SpecialUploadWizard.php @@ -475,6 +475,9 @@ . '/div'; } + protected function getGroupName() { + return 'media'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d040a8c3aa349f8fdbbf469a7789ccf3adc9d4f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UploadWizard Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Timestamp from Year/Month selector on forms should be wiki time - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Timestamp from Year/Month selector on forms should be wiki time .. Timestamp from Year/Month selector on forms should be wiki time When searching for a year/month with the year/month selector on Special:Contributions or action=history the given time should be treated as wiki time and therefore needs adjust to UTC before search in the Database. This has no effect on wikis with UTC like enwiki, but for example on dewiki with an offset from 1hour/2hour. Change-Id: Iccd41d19a360827b9c80b66582ca0daa7ed7576c --- M includes/pager/ReverseChronologicalPager.php 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/pager/ReverseChronologicalPager.php b/includes/pager/ReverseChronologicalPager.php index 4f8c438..ee6e26c 100644 --- a/includes/pager/ReverseChronologicalPager.php +++ b/includes/pager/ReverseChronologicalPager.php @@ -113,6 +113,10 @@ $ymd = 20320101; } - $this-mOffset = $this-mDb-timestamp( ${ymd}00 ); + // Treat the given time in the wiki timezone and get a UTC timestamp for the database lookup + $timestamp = MWTimestamp::getInstance( ${ymd}00 ); + $timestamp-setTimeZone( $this-getConfig()-get( 'Localtimezone' ) ); + + $this-mOffset = $this-mDb-timestamp( $timestamp-getTimestamp() ); } } -- To view, visit https://gerrit.wikimedia.org/r/205017 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iccd41d19a360827b9c80b66582ca0daa7ed7576c Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Echo)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I92eee336132de57b9759ba67fed1f060bd6a881e --- M Echo.php M special/SpecialNotifications.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/Echo.php b/Echo.php index e1c461c..276e090 100644 --- a/Echo.php +++ b/Echo.php @@ -64,7 +64,6 @@ // Special page $wgSpecialPages['Notifications'] = 'SpecialNotifications'; -$wgSpecialPageGroups['Notifications'] = 'users'; // Housekeeping hooks $wgHooks['LoadExtensionSchemaUpdates'][] = 'EchoHooks::getSchemaUpdates'; diff --git a/special/SpecialNotifications.php b/special/SpecialNotifications.php index c8a0d08..d34d0b7 100644 --- a/special/SpecialNotifications.php +++ b/special/SpecialNotifications.php @@ -177,4 +177,8 @@ ); return $lang-pipeList( $subtitleLinks ); } + + protected function getGroupName() { + return 'users'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211285 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92eee336132de57b9759ba67fed1f060bd6a881e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Maharashtrian Konkani language - change (translatewiki)
Mjbmr has uploaded a new change for review. https://gerrit.wikimedia.org/r/211412 Change subject: Add Maharashtrian Konkani language .. Add Maharashtrian Konkani language Change-Id: I2f4375bccd673bc294cef275fa7c00742c2b6189 --- M FallbackSettings.php M LanguageSettings.php 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/12/211412/1 diff --git a/FallbackSettings.php b/FallbackSettings.php index c0de0e5..4afdf3c 100644 --- a/FallbackSettings.php +++ b/FallbackSettings.php @@ -50,6 +50,7 @@ $wgTranslateLanguageFallbacks['kgp'] = array( 'pt', 'pt-br' ); $wgTranslateLanguageFallbacks['ki'] = 'sw'; $wgTranslateLanguageFallbacks['kjh'] = 'ru'; +$wgTranslateLanguageFallbacks['knn'] = 'hi'; $wgTranslateLanguageFallbacks['krl'] = 'fi'; $wgTranslateLanguageFallbacks['ks-arab'] = 'ur'; # Robin $wgTranslateLanguageFallbacks['ks-deva'] = 'hi'; # Robin diff --git a/LanguageSettings.php b/LanguageSettings.php index b285d5a..3500b63 100644 --- a/LanguageSettings.php +++ b/LanguageSettings.php @@ -86,6 +86,7 @@ $wgExtraLanguageNames['dty'] = 'डोटेली'; # Dotyali / Siebrand 2014-11-16 $wgExtraLanguageNames['awa'] = 'अवधी'; # Awadhi / Siebrand 2014-12-28 $wgExtraLanguageNames['gor'] = 'Hulontalo'; # Gorontalo / Siebrand 2014-12-28 +$wgExtraLanguageNames['knn'] = 'महाराष्ट्रीय कोंकणी'; # Maharashtrian Konkani $wgExtraLanguageNames['nl-be'] = 'nl-be'; # Nikerabbit 2008-xx-xx - For FreeCol $wgExtraLanguageNames['es-mx'] = 'español de México'; # Mexico; for iNaturalist -- To view, visit https://gerrit.wikimedia.org/r/211412 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2f4375bccd673bc294cef275fa7c00742c2b6189 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Mjbmr mjb...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...LastUserLogin)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/211427 Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.21 Change-Id: Iaa865a9a7b93763051aebc9a6f215ab8b6553344 --- M LastUserLogin.body.php M LastUserLogin.php 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LastUserLogin refs/changes/27/211427/1 diff --git a/LastUserLogin.body.php b/LastUserLogin.body.php index 77110d2..2716bcd 100644 --- a/LastUserLogin.body.php +++ b/LastUserLogin.body.php @@ -122,4 +122,8 @@ $out .= '/table'; $wgOut-addHTML( $out ); } + + protected function getGroupName() { + return 'users'; + } } diff --git a/LastUserLogin.php b/LastUserLogin.php index 78cb073..8f5567d 100644 --- a/LastUserLogin.php +++ b/LastUserLogin.php @@ -37,7 +37,6 @@ // Set up the new special page $wgSpecialPages['LastUserLogin'] = 'LastUserLogin'; -$wgSpecialPageGroups['LastUserLogin'] = 'users'; // Register the method that updates the database when a user logs in $wgExtensionFunctions[] = 'LastUserLogin::updateUserTouched'; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211427 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa865a9a7b93763051aebc9a6f215ab8b6553344 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LastUserLogin Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update for upcoming translation rally - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Update for upcoming translation rally .. Update for upcoming translation rally Change-Id: I875acf870fd8f0ba8987975a6a9dbcb7916a8344 --- M SpecialRally.php 1 file changed, 39 insertions(+), 22 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialRally.php b/SpecialRally.php index cbffe18..a7c3bb9 100644 --- a/SpecialRally.php +++ b/SpecialRally.php @@ -33,15 +33,18 @@ $this-outputHeader(); $allowedGroups = array( - 'core', // 8 - 'ext-0-all', // 8 - 'out-jquery-uls', // 1206 - 'out-kiwix', // 1244 - 'out-okawix-0-all', // 1220 - 'out-pywikipedia-0-all', // 1238 - 'out-wikiblame', // 1206 - 'out-wikimedia-mobile-0-all', // 1206 - 'tsint-0-all' // 1240 + 'core', + 'ext-0-wikimedia', + 'out-wikimedia-mobile-0-all', + 'wiki-betawiki', + 'out-kiwix', + 'out-huggle', + 'tsint-0-all', + 'out-jquery-uls', + 'wiki-twn-mainpage', + 'out-pywikipedia-0-all', + 'out-vicuna', + 'out-wikiblame', ); $allowedGroups = MessageGroups::expandWildcards( '*' ); @@ -50,6 +53,11 @@ foreach ( $allGroups as $groupId = $messageGroup ) { if ( in_array( $groupId, $allowedGroups ) ) { if( $messageGroup-isMeta() ) { + // @todo Ugly work around for MediaWikiTopMessageGroup::getGroups() + // not existing. + if( $messageGroup-getId() === 'core-0-mostused' ) + continue; + $groups = $messageGroup-getGroups(); foreach ( $groups as $gid = $groupDetails ) { $allowedGroups[] = $gid; @@ -64,11 +72,17 @@ $allowed = $currentUser-isAllowed( 'translate-manage' ); if ( $allowed !$par ) { $products = array( - 'MediaWiki' = 0, - 'MediaWiki extensions' = 0, - 'Mobile' = 0, - 'Offline' = 0, - 'Other' = 0 + 'MediaWiki core' = 0, + 'MediaWiki extensions used by Wikimedia' = 0, + 'Wikimedia Mobile apps' = 0, + 'translatewiki.net' = 0, + 'jQuery.ULS' = 0, + 'Kiwix' = 0, + 'Huggle' = 0, + 'Intuition' = 0, + 'Pywikibot' = 0, + 'VicuñaUploader' = 0, + 'WikiBlame' = 0, ); $languages = array(); $userLangs = array(); @@ -81,11 +95,11 @@ 'page_latest' ); $conds = array( - rc_timestamp = 2014080610, - rc_timestamp = 20140810235959, + rc_timestamp = 2015051700, + rc_timestamp = 20150525235959, 'rc_new' = 1, 'rc_bot' = 0, - 'rc_namespace IN (8, 1206, 1212, 1220, 1224, 1238, 1240, 1244)', + 'rc_namespace IN ( 8, 1198, 1206, 1238, 1240, 1244, 1248, 1252 )', 'rc_cur_id = page_id' ); @@ -195,11 +209,11 @@ $tables = array(
[MediaWiki-commits] [Gerrit] Update start time for rally - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Update start time for rally .. Update start time for rally Change-Id: I1b6bac878b018a276106f691bdf6a0c270c2cd59 --- M SpecialRally.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialRally.php b/SpecialRally.php index eb47afc..75f6156 100644 --- a/SpecialRally.php +++ b/SpecialRally.php @@ -96,7 +96,7 @@ 'page_latest' ); $conds = array( - rc_timestamp = 2015051700, + rc_timestamp = 2015051620, rc_timestamp = 20150525235959, 'rc_new' = 1, 'rc_bot' = 0, @@ -223,7 +223,7 @@ $tables = array( 'recentchanges', 'page' ); $fields = array( 'rc_title', 'rc_namespace', 'rc_this_oldid', 'page_latest' ); $conds = array( - rc_timestamp = 2015051700, + rc_timestamp = 2015051620, rc_timestamp = 20150525235959, 'rc_new' = 1, 'rc_bot' = 0, -- To view, visit https://gerrit.wikimedia.org/r/211436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b6bac878b018a276106f691bdf6a0c270c2cd59 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl 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
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...HostStats)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.22 Change-Id: I1b840b466b226d933c916d9e473998e733ea91e6 --- M HostStats.php M SpecialHostStats.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/HostStats.php b/HostStats.php index f8515d8..503de78 100644 --- a/HostStats.php +++ b/HostStats.php @@ -46,7 +46,6 @@ // Register special page into MediaWiki. $wgSpecialPages['HostStats'] = 'SpecialHostStats'; -$wgSpecialPageGroups['HostStats'] = 'wiki'; // Create new right. $wgAvailableRights[] = 'hoststats'; diff --git a/SpecialHostStats.php b/SpecialHostStats.php index 46d42c4..6520eb3 100644 --- a/SpecialHostStats.php +++ b/SpecialHostStats.php @@ -34,4 +34,8 @@ $output = wfShellExec( $query ); return $output; } + + protected function getGroupName() { + return 'wiki'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1b840b466b226d933c916d9e473998e733ea91e6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HostStats Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Hydriz ad...@alphacorp.tk Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I7540d2d607caba45ce311b0dafa2a6642412c57f --- M Math.php M SpecialMathShowImage.php M SpecialMathStatus.php 3 files changed, 7 insertions(+), 2 deletions(-) Approvals: Polybuildr: Looks good to me, but someone else must approve Physikerwelt: Looks good to me, approved jenkins-bot: Verified diff --git a/Math.php b/Math.php index 3f45333..746f0b1 100644 --- a/Math.php +++ b/Math.php @@ -238,8 +238,6 @@ $wgParserTestFiles[] = $dir . 'mathParserTests.txt'; -$wgSpecialPageGroups[ 'MathShowImage' ] = 'other'; -$wgSpecialPageGroups[ 'MathStatus' ] = 'other'; $wgSpecialPages['MathShowImage'] = 'SpecialMathShowImage'; $wgSpecialPages['MathStatus'] = 'SpecialMathStatus'; diff --git a/SpecialMathShowImage.php b/SpecialMathShowImage.php index 3b57c40..154e40d 100644 --- a/SpecialMathShowImage.php +++ b/SpecialMathShowImage.php @@ -129,4 +129,7 @@ return $result; } + protected function getGroupName() { + return 'other'; + } } diff --git a/SpecialMathStatus.php b/SpecialMathStatus.php index 488500e..74bc8da 100644 --- a/SpecialMathStatus.php +++ b/SpecialMathStatus.php @@ -138,4 +138,8 @@ private function assertEquals( $expected, $real, $message = '' ) { $this-assertTrue( $expected == $real, $message ); } + + protected function getGroupName() { + return 'other'; + } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7540d2d607caba45ce311b0dafa2a6642412c57f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Math Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de Gerrit-Reviewer: Polybuildr v.a.ghai...@gmail.com Gerrit-Reviewer: TheDJ hartman.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] config: Add all languages in target - change (mediawiki...cxserver)
jenkins-bot has submitted this change and it was merged. Change subject: config: Add all languages in target .. config: Add all languages in target \0/ Change-Id: I9a26731e34fa42da5b79e9d4a0af17099a18e6ae --- M config.defaults.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Santhosh: Looks good to me, approved jenkins-bot: Verified diff --git a/config.defaults.js b/config.defaults.js index f1c0b14..c281be0 100644 --- a/config.defaults.js +++ b/config.defaults.js @@ -24,7 +24,7 @@ // Service registry registry: { source: [ 'aa', 'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang', 'an', 'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'bat-smg', 'ba', 'bcl', 'be-x-old', 'be', 'bg', 'bh', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho', 'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy', 'da', 'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'fa', 'ff', 'fiu-vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr', 'fur', 'fy', 'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'got', 'gu', 'gv', 'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy', 'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja', 'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km', 'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad', 'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'ltg', 'lt', 'lv', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml', 'mn', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah', 'nap', 'na', 'nds-nl', 'nds', 'ne', 'new', 'ng', 'nl', 'nn', 'nov', 'no', 'nrm', 'nso', 'nv', 'ny', 'oc', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa', 'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu', 'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sa', 'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sl', 'sm', 'sn', 'so', 'sq', 'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl', 'ta', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'tr', 'ts', 'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep', 've', 'vi', 'vls', 'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea', 'zh-classical', 'zh-min-nan', 'zh-yue', 'zh', 'zu' ], - target: [ 'af', 'ak', 'an', 'ar', 'ast', 'az', 'ba', 'bg', 'bm', 'bs', 'ca', 'ceb', 'cr', 'cs', 'cv', 'cy', 'ee', 'el', 'eo', 'es', 'eu', 'ff', 'fr', 'gl', 'gu', 'hi', 'hr', 'id', 'it', 'ja', 'kg', 'ki', 'kk', 'km', 'kn', 'koi', 'kv', 'ky', 'kz', 'lg', 'lez', 'min', 'mk', 'ms', 'mt', 'nl', 'no', 'nn', 'ny', 'oc', 'om', 'pa', 'pl', 'pt', 'rn', 'ru', 'sah', 'sg', 'sh', 'simple', 'sl', 'ss', 'st', 'ti', 'tn', 'tr', 'ts', 'tt', 'tyv', 'tum', 'tw', 'udm', 'uk', 'ur', 'uz', 've', 'vi', 'war', 'xh', 'zh', 'zu' ], + target: [ 'aa', 'ab', 'ace', 'af', 'ak', 'als', 'am', 'ang', 'an', 'arc', 'ar', 'arz', 'ast', 'as', 'av', 'ay', 'az', 'bar', 'bat-smg', 'ba', 'bcl', 'be-x-old', 'be', 'bg', 'bh', 'bi', 'bjn', 'bm', 'bn', 'bo', 'bpy', 'br', 'bs', 'bug', 'bxr', 'ca', 'cbk-zam', 'cdo', 'ceb', 'ce', 'cho', 'chr', 'ch', 'chy', 'ckb', 'co', 'crh', 'cr', 'csb', 'cs', 'cu', 'cv', 'cy', 'da', 'de', 'diq', 'dsb', 'dv', 'dz', 'ee', 'el', 'eml', 'en', 'eo', 'es', 'et', 'eu', 'ext', 'fa', 'ff', 'fiu-vro', 'fi', 'fj', 'fo', 'frp', 'frr', 'fr', 'fur', 'fy', 'gag', 'gan', 'ga', 'gd', 'glk', 'gl', 'gn', 'got', 'gu', 'gv', 'hak', 'ha', 'haw', 'he', 'hif', 'hi', 'ho', 'hr', 'hsb', 'ht', 'hu', 'hy', 'hz', 'ia', 'id', 'ie', 'ig', 'ii', 'ik', 'ilo', 'io', 'is', 'it', 'iu', 'ja', 'jbo', 'jv', 'kaa', 'kab', 'ka', 'kbd', 'kg', 'ki', 'kj', 'kk', 'kl', 'km', 'kn', 'koi', 'ko', 'krc', 'kr', 'ksh', 'ks', 'ku', 'kv', 'kw', 'ky', 'lad', 'la', 'lbe', 'lb', 'lez', 'lg', 'lij', 'li', 'lmo', 'ln', 'lo', 'ltg', 'lt', 'lv', 'mai', 'map-bms', 'mdf', 'mg', 'mhr', 'mh', 'min', 'mi', 'mk', 'ml', 'mn', 'mo', 'mrj', 'mr', 'ms', 'mt', 'mus', 'mwl', 'myv', 'my', 'mzn', 'nah', 'nap', 'na', 'nds-nl', 'nds', 'ne', 'new', 'ng', 'nl', 'nn', 'nov', 'no', 'nrm', 'nso', 'nv', 'ny', 'oc', 'om', 'or', 'os', 'pag', 'pam', 'pap', 'pa', 'pcd', 'pdc', 'pfl', 'pih', 'pi', 'pl', 'pms', 'pnb', 'pnt', 'ps', 'pt', 'qu', 'rm', 'rmy', 'rn', 'roa-rup', 'roa-tara', 'ro', 'rue', 'ru', 'rw', 'sah', 'sa', 'scn', 'sco', 'sc', 'sd', 'se', 'sg', 'sh', 'simple', 'si', 'sk', 'sl', 'sm', 'sn', 'so', 'sq', 'srn', 'sr', 'ss', 'stq', 'st', 'su', 'sv', 'sw', 'szl', 'ta', 'tet', 'te', 'tg', 'th', 'ti', 'tk', 'tl', 'tn', 'to', 'tpi', 'tr', 'ts', 'tt', 'tum', 'tw', 'tyv', 'ty', 'udm', 'ug', 'uk', 'ur', 'uz', 'vec', 'vep', 've', 'vi', 'vls', 'vo', 'war', 'wa', 'wo', 'wuu', 'xal', 'xh', 'xmf', 'yi', 'yo', 'za', 'zea',
[MediaWiki-commits] [Gerrit] Convert mediawiki.toc and mediawiki.user to using mw.cookie - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Convert mediawiki.toc and mediawiki.user to using mw.cookie .. Convert mediawiki.toc and mediawiki.user to using mw.cookie * Remove redundant 'path' parameter (handled by mw.cookie) * Remove redundant 'expires' parameter (handled by mw.cookie) * Return value for absent cookie is now reliably 'null'. This changes the cookie name due to mw.cookie adding the standard cookie prefix. This will cause existing values to be lost. Make use of this oppertunity to rename some cookie names. * mw_hidetoc - {wikiprefix} hidetoc * mediaWiki.user.sessionId - {wikiprefix} mwuser-session * mediaWiki.user.bucket - {wikiprefix} mwuser-bucket Bug: T67384 Change-Id: I835063f40f742a56f8d137cbaabc77e51c60a2a9 --- M resources/Resources.php M resources/src/mediawiki/mediawiki.cookie.js M resources/src/mediawiki/mediawiki.toc.js M resources/src/mediawiki/mediawiki.user.js M tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js 5 files changed, 16 insertions(+), 23 deletions(-) Approvals: Krinkle: Looks good to me, but someone else must approve Legoktm: Looks good to me, but someone else must approve Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/Resources.php b/resources/Resources.php index ae5b3f9..30ab739 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -209,7 +209,6 @@ 'styles' = 'resources/src/jquery/jquery.confirmable.css', 'dependencies' = 'mediawiki.jqueryMsg', ), - // Use mediawiki.cookie in new code, rather than jquery.cookie. 'jquery.cookie' = array( 'scripts' = 'resources/lib/jquery/jquery.cookie.js', 'targets' = array( 'desktop', 'mobile' ), @@ -1030,7 +1029,7 @@ ), 'mediawiki.toc' = array( 'scripts' = 'resources/src/mediawiki/mediawiki.toc.js', - 'dependencies' = 'jquery.cookie', + 'dependencies' = 'mediawiki.cookie', 'messages' = array( 'showtoc', 'hidetoc' ), 'targets' = array( 'desktop', 'mobile' ), ), @@ -1042,7 +1041,7 @@ 'mediawiki.user' = array( 'scripts' = 'resources/src/mediawiki/mediawiki.user.js', 'dependencies' = array( - 'jquery.cookie', + 'mediawiki.cookie', 'mediawiki.api', 'user.options', 'user.tokens', diff --git a/resources/src/mediawiki/mediawiki.cookie.js b/resources/src/mediawiki/mediawiki.cookie.js index 8f091e4..0c0095c 100644 --- a/resources/src/mediawiki/mediawiki.cookie.js +++ b/resources/src/mediawiki/mediawiki.cookie.js @@ -16,7 +16,7 @@ mw.cookie = { /** -* Sets or deletes a cookie. +* Set or deletes a cookie. * * While this is natural in JavaScript, contrary to `WebResponse#setcookie` in PHP, the * default values for the `options` properties only apply if that property isn't set @@ -101,13 +101,13 @@ }, /** -* Gets the value of a cookie. +* Get the value of a cookie. * * @param {string} key * @param {string} [prefix=wgCookiePrefix] The prefix of the key. If `prefix` is * `undefined` or `null`, then `wgCookiePrefix` is used * @param {Mixed} [defaultValue=null] -* @return {string} If the cookie exists, then the value of the +* @return {string|null|Mixed} If the cookie exists, then the value of the * cookie, otherwise `defaultValue` */ get: function ( key, prefix, defaultValue ) { diff --git a/resources/src/mediawiki/mediawiki.toc.js b/resources/src/mediawiki/mediawiki.toc.js index 45338ea..78627fc 100644 --- a/resources/src/mediawiki/mediawiki.toc.js +++ b/resources/src/mediawiki/mediawiki.toc.js @@ -15,25 +15,19 @@ $tocList.slideDown( 'fast' ); $tocToggleLink.text( mw.msg( 'hidetoc' ) ); $toc.removeClass( 'tochidden' ); - $.cookie( 'mw_hidetoc', null, { - expires: 30, - path: '/' - } ); + mw.cookie.set( 'hidetoc', null ); } else { $tocList.slideUp( 'fast' ); $tocToggleLink.text( mw.msg( 'showtoc' ) ); $toc.addClass( 'tochidden' ); - $.cookie( 'mw_hidetoc', '1', { -
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2015-05-16T10:00:01+0000 - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged. Change subject: New Wikidata Build - 2015-05-16T10:00:01+ .. New Wikidata Build - 2015-05-16T10:00:01+ Change-Id: I8e76c27e19ebfa2af69b4d91c66f8f56a71d76be --- M composer.lock M extensions/Wikibase/client/i18n/as.json M extensions/Wikibase/client/i18n/ro.json M extensions/Wikibase/repo/Wikibase.i18n.alias.php M extensions/Wikibase/repo/i18n/be-tarask.json M extensions/Wikibase/repo/i18n/fr.json A extensions/Wikibase/repo/i18n/glk.json M extensions/Wikibase/repo/i18n/ru.json M vendor/composer/installed.json 9 files changed, 23 insertions(+), 13 deletions(-) Approvals: JanZerebecki: Looks good to me, approved jenkins-bot: Verified diff --git a/composer.lock b/composer.lock index ef7f7af..254b6ed 100644 --- a/composer.lock +++ b/composer.lock @@ -1213,12 +1213,12 @@ source: { type: git, url: https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;, -reference: 8697e9d68ecc10e5e97dba15845031d16c8b2e61 +reference: a38aad2a87c800c11a6e53b71bc26536bcc742dc }, dist: { type: zip, -url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/8697e9d68ecc10e5e97dba15845031d16c8b2e61;, -reference: 8697e9d68ecc10e5e97dba15845031d16c8b2e61, +url: https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/a38aad2a87c800c11a6e53b71bc26536bcc742dc;, +reference: a38aad2a87c800c11a6e53b71bc26536bcc742dc, shasum: }, require: { @@ -1286,7 +1286,7 @@ wikibaserepo, wikidata ], -time: 2015-05-14 20:11:42 +time: 2015-05-15 19:47:56 }, { name: wikibase/wikimedia-badges, diff --git a/extensions/Wikibase/client/i18n/as.json b/extensions/Wikibase/client/i18n/as.json index 0b98285..cf435f6 100644 --- a/extensions/Wikibase/client/i18n/as.json +++ b/extensions/Wikibase/client/i18n/as.json @@ -10,7 +10,7 @@ wikibase-comment-update: {{WBREPONAME}} বস্তু সলনি হ'ল, wikibase-dataitem: {{WBREPONAME}} আইটেম, wikibase-editlinks: আন্তঃৱিকি লিংক সম্পাদনা কৰক, - wikibase-editlinkstitle: আন্তৰ্ৱিকি লিংক সম্পাদনা কৰক, + wikibase-editlinkstitle: আন্তঃৱিকি লিংক সম্পাদনা কৰক, wikibase-linkitem-title: পৃষ্ঠাৰ লগত সংযোগ, wikibase-linkitem-linkpage: পৃষ্ঠাৰ লগত সংযোগ কৰক, wikibase-linkitem-selectlink: অনুগ্ৰহ কৰি এই পৃষ্ঠাৰ লগত সংযোগ কৰিবলৈ এটা ছাইট আৰু নিৰ্দিষ্ট পৃষ্ঠা বাছনি কৰক।, diff --git a/extensions/Wikibase/client/i18n/ro.json b/extensions/Wikibase/client/i18n/ro.json index 7c3119c..f8c16a9 100644 --- a/extensions/Wikibase/client/i18n/ro.json +++ b/extensions/Wikibase/client/i18n/ro.json @@ -8,7 +8,6 @@ ] }, wikibase-client-desc: Client pentru extensia Wikibase, - specialpages-group-wikibaseclient: Client {{WBREPONAME}}, tooltip-t-wikibase: Legătură către elementul asociat din depozitul de date, wikibase-after-page-move: Puteți, de asemenea, [$1 să actualizați] elementul {{WBREPONAME}} asociat pentru a menține legăturile linguale pe pagina redenumită., wikibase-after-page-move-queued: [$1 Elementul {{WBREPONAME}}] asociat acestei pagini va fi în curând actualizat în mod automat., @@ -41,6 +40,7 @@ wikibase-rc-show-wikidata-pref: Arată modificările de la {{WBREPONAME}} în lista cu schimbări recente, wikibase-rc-wikibase-edit-letter: D, wikibase-rc-wikibase-edit-title: Modificare la {{WBREPONAME}}, + wikibase-replicationnote: Rețineți că pot trece câteva minute până când modificările sunt vizibile pe toate wikiurile., wikibase-watchlist-show-changes-pref: Arată modificările de la {{WBREPONAME}} în lista dumneavoastră de pagini urmărite, wikibase-error-serialize-error: Imposibil de serializat datele., wikibase-error-invalid-entity-id: ID-ul introdus nu este recunoscut de sistem. Utilizați un ID de entitate valid., diff --git a/extensions/Wikibase/repo/Wikibase.i18n.alias.php b/extensions/Wikibase/repo/Wikibase.i18n.alias.php index 8bdcc2b..61df05f 100644 --- a/extensions/Wikibase/repo/Wikibase.i18n.alias.php +++ b/extensions/Wikibase/repo/Wikibase.i18n.alias.php @@ -270,7 +270,7 @@ 'MyLanguageFallbackChain' = array( 'Meng_Ersatzsproochketten' ), ); -/** لوری مینجایی (لوری مینجایی) */ +/** Northern Luri (لوری مینجایی) */ $specialPageAliases['lrc'] = array( 'ListDatatypes' = array( 'میزونکاری_جور_داده_یا' ), 'SetLabel' = array( 'میزونکاری_ریتراز' ), diff --git a/extensions/Wikibase/repo/i18n/be-tarask.json b/extensions/Wikibase/repo/i18n/be-tarask.json index 916e439..14afa96 100644 ---
[MediaWiki-commits] [Gerrit] Bumped Vega Graphoid - handle data load crash - change (mediawiki...deploy)
Yurik has uploaded a new change for review. https://gerrit.wikimedia.org/r/211431 Change subject: Bumped Vega Graphoid - handle data load crash .. Bumped Vega Graphoid - handle data load crash * Attemt to fix a service crashing bug that causes constant service reloading Change-Id: I7b1eca1a12c1affb1e1064aacc945c5e790d474a --- M node_modules/vega/bower.json M node_modules/vega/package.json M node_modules/vega/src/core/_start.js M node_modules/vega/src/parse/data.js M node_modules/vega/vega.js M node_modules/vega/vega.min.js M src 7 files changed, 20 insertions(+), 21 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/graphoid/deploy refs/changes/31/211431/1 -- To view, visit https://gerrit.wikimedia.org/r/211431 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b1eca1a12c1affb1e1064aacc945c5e790d474a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/graphoid/deploy Gerrit-Branch: master Gerrit-Owner: Yurik yu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Some more fixes for stats - change (translatewiki)
jenkins-bot has submitted this change and it was merged. Change subject: Some more fixes for stats .. Some more fixes for stats Change-Id: Iddc720a3eb26907090744211f7d6455bc9616374 --- M SpecialRally.php 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialRally.php b/SpecialRally.php index 984360d..eb47afc 100644 --- a/SpecialRally.php +++ b/SpecialRally.php @@ -52,7 +52,7 @@ $allGroups = MessageGroups::singleton()-getGroups(); foreach ( $allGroups as $groupId = $messageGroup ) { - if ( in_array( $groupId, $allowedGroups ) ) { + if ( in_array( $groupId, $allowedGroups ) ) { if( $messageGroup-isMeta() ) { // @todo Ugly work around for MediaWikiTopMessageGroup::getGroups() // not existing. @@ -125,7 +125,7 @@ $nonlatest[$row-rc_user_text]++; } - if ( $row-rc_namespace == 8 ) { + if ( in_array( $row-rc_namespace, array( 8 ) ) ) { if ( in_array( $group, array( 'core' ) ) ) { $products['MediaWiki core']++; } elseif ( !in_array( $group, array( 'wiki-twn-mainpage', 'wiki-betawiki' ) ) ) { @@ -135,17 +135,17 @@ } else { $products['translatewiki.net']++; } - } elseif ( $row-rc_namespace = 1198 ) { + } elseif ( in_array( $row-rc_namespace, array( 1198 ) ) ) { $products['translatewiki.net']++; - } elseif ( $row-rc_namespace = 1238 ) { + } elseif ( in_array( $row-rc_namespace, array( 1238 ) ) ) { $products['Pywikibot']++; - } elseif ( $row-rc_namespace = 1240 ) { + } elseif ( in_array( $row-rc_namespace, array( 1240 ) ) ) { $products['Intuition']++; - } elseif ( $row-rc_namespace = 1244 ) { + } elseif ( in_array( $row-rc_namespace, array( 1244 ) ) ) { $products['Kiwix']++; - } elseif ( $row-rc_namespace = 1248 ) { + } elseif ( in_array( $row-rc_namespace, array( 1248 ) ) ) { $products['Huggle']++; - } elseif ( $row-rc_namespace = 1252 ) { + } elseif ( in_array( $row-rc_namespace, array( 1252 ) ) ) { $products['VicuñaUploader']++; } elseif ( $group === 'out-wikiblame' ) { $products['WikiBlame']++; @@ -155,13 +155,13 @@ $messageData = TranslateUtils::figureMessage( $row-rc_title ); // Language totals - if( isset( $languages[$messageData[1]] ) ) { + if( isset( $languages[$messageData[1]] ) ) { $languages[$messageData[1]]++; } else { $languages[$messageData[1]] = 1; } // Per user per language totals - if( isset( $userLangs[$row-rc_user_text][$messageData[1]] ) ) { + if( isset( $userLangs[$row-rc_user_text][$messageData[1]] ) ) {
[MediaWiki-commits] [Gerrit] Add user rights to $wgAvailableRights - change (mediawiki...BibManager)
jenkins-bot has submitted this change and it was merged. Change subject: Add user rights to $wgAvailableRights .. Add user rights to $wgAvailableRights Found by tests: https://integration.wikimedia.org/ci/job/mwext-testextension-zend/1717/console Change-Id: Iabcc9429d1b6a1cd7dadb17be44e38e8216209bb --- M BibManager.php 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/BibManager.php b/BibManager.php index 6f04e10..1dd8a69 100644 --- a/BibManager.php +++ b/BibManager.php @@ -136,3 +136,7 @@ $wgGroupPermissions['sysop']['bibmanageredit'] = true; $wgGroupPermissions['sysop']['bibmanagerdelete'] = true; $wgGroupPermissions['sysop']['bibmanagercreate'] = true; + +$wgAvailableRights[] = 'bibmanageredit'; +$wgAvailableRights[] = 'bibmanagerdelete'; +$wgAvailableRights[] = 'bibmanagercreate'; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211417 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iabcc9429d1b6a1cd7dadb17be44e38e8216209bb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BibManager Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update start time for rally - change (translatewiki)
Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/211436 Change subject: Update start time for rally .. Update start time for rally Change-Id: I1b6bac878b018a276106f691bdf6a0c270c2cd59 --- M SpecialRally.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/36/211436/1 diff --git a/SpecialRally.php b/SpecialRally.php index eb47afc..75f6156 100644 --- a/SpecialRally.php +++ b/SpecialRally.php @@ -96,7 +96,7 @@ 'page_latest' ); $conds = array( - rc_timestamp = 2015051700, + rc_timestamp = 2015051620, rc_timestamp = 20150525235959, 'rc_new' = 1, 'rc_bot' = 0, @@ -223,7 +223,7 @@ $tables = array( 'recentchanges', 'page' ); $fields = array( 'rc_title', 'rc_namespace', 'rc_this_oldid', 'page_latest' ); $conds = array( - rc_timestamp = 2015051700, + rc_timestamp = 2015051620, rc_timestamp = 20150525235959, 'rc_new' = 1, 'rc_bot' = 0, -- To view, visit https://gerrit.wikimedia.org/r/211436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b6bac878b018a276106f691bdf6a0c270c2cd59 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@kitano.nl ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...GlobalContributions)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.23 Change-Id: I18de171b5a9750ed3e04b76660e07d2780d5a4b3 --- M GlobalContributions.php M SpecialGlobalContributions.php 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/GlobalContributions.php b/GlobalContributions.php index 7a44453..91c2a10 100644 --- a/GlobalContributions.php +++ b/GlobalContributions.php @@ -36,7 +36,6 @@ $wgAutoloadClasses['SpecialGlobalContributions'] = __DIR__ . '/SpecialGlobalContributions.php'; $wgSpecialPages['GlobalContributions'] = 'SpecialGlobalContributions'; -$wgSpecialPageGroups['GlobalContributions'] = 'users'; $wgMessagesDirs['GlobalContributions'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['GlobalContributions'] = __DIR__ . '/GlobalContributions.i18n.php'; $wgExtensionMessagesFiles['GlobalContributionsAlias'] = __DIR__ . '/GlobalContributions.alias.php'; diff --git a/SpecialGlobalContributions.php b/SpecialGlobalContributions.php index 13203a1..9ac7b27 100644 --- a/SpecialGlobalContributions.php +++ b/SpecialGlobalContributions.php @@ -55,5 +55,7 @@ return true; } - + protected function getGroupName() { + return 'users'; + } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18de171b5a9750ed3e04b76660e07d2780d5a4b3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalContributions Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...LastUserLogin)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.21 Change-Id: Iaa865a9a7b93763051aebc9a6f215ab8b6553344 --- M LastUserLogin.body.php M LastUserLogin.php 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/LastUserLogin.body.php b/LastUserLogin.body.php index 77110d2..2716bcd 100644 --- a/LastUserLogin.body.php +++ b/LastUserLogin.body.php @@ -122,4 +122,8 @@ $out .= '/table'; $wgOut-addHTML( $out ); } + + protected function getGroupName() { + return 'users'; + } } diff --git a/LastUserLogin.php b/LastUserLogin.php index 78cb073..8f5567d 100644 --- a/LastUserLogin.php +++ b/LastUserLogin.php @@ -37,7 +37,6 @@ // Set up the new special page $wgSpecialPages['LastUserLogin'] = 'LastUserLogin'; -$wgSpecialPageGroups['LastUserLogin'] = 'users'; // Register the method that updates the database when a user logs in $wgExtensionFunctions[] = 'LastUserLogin::updateUserTouched'; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211427 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa865a9a7b93763051aebc9a6f215ab8b6553344 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LastUserLogin Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...CategoryTree)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Id783a062acb023b80704c2e24aaf8736f7cd75e7 --- M CategoryTree.php M CategoryTreePage.php 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/CategoryTree.php b/CategoryTree.php index 73e192f..0717285 100644 --- a/CategoryTree.php +++ b/CategoryTree.php @@ -122,7 +122,6 @@ $wgAutoloadClasses['CategoryTreeCategoryPage'] = __DIR__ . '/CategoryPageSubclass.php'; $wgAutoloadClasses['CategoryTreeCategoryViewer'] = __DIR__ . '/CategoryPageSubclass.php'; $wgSpecialPages['CategoryTree'] = 'CategoryTreePage'; -$wgSpecialPageGroups['CategoryTree'] = 'pages'; # $wgHooks['SkinTemplateTabs'][] = 'efCategoryTreeInstallTabs'; $wgHooks['ArticleFromTitle'][] = 'efCategoryTreeArticleFromTitle'; diff --git a/CategoryTreePage.php b/CategoryTreePage.php index 49c2688..b6ad168 100644 --- a/CategoryTreePage.php +++ b/CategoryTreePage.php @@ -142,4 +142,9 @@ $output = $this-getOutput(); $output-addHTML( Xml::tags( 'form', array( 'name' = 'categorytree', 'method' = 'get', 'action' = $wgScript, 'id' = 'mw-categorytree-form' ), $fieldset ) ); } + + protected function getGroupName() { + return 'pages'; + } + } -- To view, visit https://gerrit.wikimedia.org/r/211385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id783a062acb023b80704c2e24aaf8736f7cd75e7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CategoryTree Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...OAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: Id5265e6a21b777423981a0e6456c5ef67877df27 --- M frontend/MWOAuthUI.setup.php M frontend/specialpages/SpecialMWOAuthConsumerRegistration.php M frontend/specialpages/SpecialMWOAuthListConsumers.php M frontend/specialpages/SpecialMWOAuthManageConsumers.php M frontend/specialpages/SpecialMWOAuthManageMyGrants.php 5 files changed, 18 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/frontend/MWOAuthUI.setup.php b/frontend/MWOAuthUI.setup.php index d5f89b6..d3aa768 100644 --- a/frontend/MWOAuthUI.setup.php +++ b/frontend/MWOAuthUI.setup.php @@ -12,13 +12,11 @@ * @return void */ public static function unconditionalSetup() { - global $wgSpecialPages, $wgSpecialPageGroups, $wgHooks, $wgResourceModules; + global $wgSpecialPages, $wgHooks, $wgResourceModules; $wgSpecialPages['OAuth'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuth'; $wgSpecialPages['OAuthManageMyGrants'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuthManageMyGrants'; - $wgSpecialPageGroups['OAuthManageMyGrants'] = 'users'; $wgSpecialPages['OAuthListConsumers'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuthListConsumers'; - $wgSpecialPageGroups['OAuthListConsumers'] = 'users'; $wgHooks['GetPreferences'][] = 'MediaWiki\Extensions\OAuth\MWOAuthUIHooks::onGetPreferences'; $wgHooks['MessagesPreLoad'][] = 'MediaWiki\Extensions\OAuth\MWOAuthUIHooks::onMessagesPreLoad'; @@ -48,14 +46,12 @@ * @return void */ public static function conditionalSetup() { - global $wgSpecialPages, $wgSpecialPageGroups; + global $wgSpecialPages; global $wgLogTypes, $wgLogNames, $wgLogHeaders, $wgLogActionsHandlers; if ( MWOAuthUtils::isCentralWiki() ) { $wgSpecialPages['OAuthConsumerRegistration'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuthConsumerRegistration'; - $wgSpecialPageGroups['OAuthConsumerRegistration'] = 'users'; $wgSpecialPages['OAuthManageConsumers'] = 'MediaWiki\Extensions\OAuth\SpecialMWOAuthManageConsumers'; - $wgSpecialPageGroups['OAuthManageConsumers'] = 'users'; $wgLogTypes[] = 'mwoauthconsumer'; $wgLogNames['mwoauthconsumer'] = 'mwoauthconsumer-consumer-logpage'; diff --git a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php index e5636f9..2ccf3af 100644 --- a/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php +++ b/frontend/specialpages/SpecialMWOAuthConsumerRegistration.php @@ -463,6 +463,10 @@ return $r; } + + protected function getGroupName() { + return 'users'; + } } /** diff --git a/frontend/specialpages/SpecialMWOAuthListConsumers.php b/frontend/specialpages/SpecialMWOAuthListConsumers.php index b9ea117..e4b5c77 100644 --- a/frontend/specialpages/SpecialMWOAuthListConsumers.php +++ b/frontend/specialpages/SpecialMWOAuthListConsumers.php @@ -292,6 +292,10 @@ return $r; } + + protected function getGroupName() { + return 'users'; + } } /** diff --git a/frontend/specialpages/SpecialMWOAuthManageConsumers.php b/frontend/specialpages/SpecialMWOAuthManageConsumers.php index c45105c..8959e61 100755 --- a/frontend/specialpages/SpecialMWOAuthManageConsumers.php +++ b/frontend/specialpages/SpecialMWOAuthManageConsumers.php @@ -506,6 +506,10 @@ return $r; } + + protected function getGroupName() { + return 'users'; + } } /** diff --git a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php index efad8dc..e138547 100644 --- a/frontend/specialpages/SpecialMWOAuthManageMyGrants.php +++ b/frontend/specialpages/SpecialMWOAuthManageMyGrants.php @@ -319,6 +319,10 @@ } return self::$irrevocableGrants; } + + protected function getGroupName() { + return 'users'; + } } /** -- To view, visit https://gerrit.wikimedia.org/r/211418 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5265e6a21b777423981a0e6456c5ef67877df27 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OAuth Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de
[MediaWiki-commits] [Gerrit] Add segmentation for Ethiopic languages - change (mediawiki...cxserver)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/211400 Change subject: Add segmentation for Ethiopic languages .. Add segmentation for Ethiopic languages Bug: T98345 Change-Id: I3a47e630dcbaff8f5b9c60b1a4d48b3db7d5606d --- A segmentation/languages/SegmenterAm.js M segmentation/languages/index.js M tests/segmentation/SegmentationTests.json A tests/segmentation/data/result-23.html A tests/segmentation/data/test-23.html 5 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver refs/changes/00/211400/1 diff --git a/segmentation/languages/SegmenterAm.js b/segmentation/languages/SegmenterAm.js new file mode 100644 index 000..e3bdf38 --- /dev/null +++ b/segmentation/languages/SegmenterAm.js @@ -0,0 +1,43 @@ +var findAll = require( '../../lineardoc' ).Utils.findAll; + +/** + * Test a possible Amharic sentence boundary match + * + * @param {string} text The plaintext to segment + * @param {Object} match The possible boundary match (returned by regex.exec) + * @return {number|null} The boundary offset, or null if not a sentence boundary + */ + +function findBoundary( text, match ) { + var tail = text.slice( match.index + 1, text.length ); + + // Trailing non-final punctuation: not a sentence boundary + if ( tail.match( /^[,;:]/ ) ) { + return null; + } + + // Next word character is number or lower-case: not a sentence boundary + if ( tail.match( /^\W*[0-9a-z]/ ) ) { + return null; + } + + // Include any closing punctuation and trailing space + return match.index + 1 + tail.match( /^['”’]*\s*/ )[ 0 ].length; +} + +/** + * Find English sentence boundaries + * + * @param {string} text The plaintext to segment + * @returns {number[]} Sentence boundary offsets + */ +function getBoundaries( text ) { + // Regex to find possible English sentence boundaries. + // Must not use a shared regex instance (re.lastIndex is used). + // In the Ethiopic script ። is used as a full stop. + return findAll( text, /[።!?]/g, findBoundary ); +} + +module.exports = { + getBoundaries: getBoundaries +}; diff --git a/segmentation/languages/index.js b/segmentation/languages/index.js index 766d654..f5e623b 100644 --- a/segmentation/languages/index.js +++ b/segmentation/languages/index.js @@ -1,12 +1,14 @@ 'use strict'; module.exports.Segmenters = { + am: require( __dirname + '/SegmenterAm.js' ), en: require( __dirname + '/SegmenterEn.js' ), hi: require( __dirname + '/SegmenterHi.js' ), hy: require( __dirname + '/SegmenterHy.js' ), ja: require( __dirname + '/SegmenterJa.js' ), pa: require( __dirname + '/SegmenterHi.js' ), sa: require( __dirname + '/SegmenterHi.js' ), + ti: require( __dirname + '/SegmenterAm.js' ), zh: require( __dirname + '/SegmenterZh.js' ), default: require( __dirname + '/SegmenterDefault.js' ) }; diff --git a/tests/segmentation/SegmentationTests.json b/tests/segmentation/SegmentationTests.json index 2f6eb3c..9ca712a 100644 --- a/tests/segmentation/SegmentationTests.json +++ b/tests/segmentation/SegmentationTests.json @@ -1,4 +1,11 @@ { + am: [ + { + desc: Amharic segmentation - basic test, + source: test-23.html, + result: result-23.html + } + ], en: [ { desc: Simple paragraph test, diff --git a/tests/segmentation/data/result-23.html b/tests/segmentation/data/result-23.html new file mode 100644 index 000..19bdb26 --- /dev/null +++ b/tests/segmentation/data/result-23.html @@ -0,0 +1 @@ +p id=0span class=cx-segment data-segmentid=1ቴዎድሮስ a class=cx-link data-linkid=2 href=/wiki/%E1%8C%A5%E1%88%AD_%E1%8D%AE title=ጥር ፮ጥር ፮/a ቀን a class=cx-link data-linkid=3 href=/w/index.php?title=1811#38;action=edit#38;redlink=1 title=1811 (ገጹ ገና አልተጻፈም)፲፰፻፲፩/a ዓ.ም. ሻርጌ በተባለ ቦታ a class=cx-link data-linkid=4 href=/wiki/%E1%89%8B%E1%88%AB title=ቋራቋራ/a ውስጥ፣ ከa class=cx-link data-linkid=5 href=/wiki/%E1%8C%8E%E1%8A%95%E1%8B%B0%E1%88%AD title=ጎንደርጎንደር ከተማ/a በስተ ምዕራብ ተወለዱ። /spanspan class=cx-segment data-segmentid=6የተወለዱትም አገሪቷ በባላባቶች ተከፋፍላ በምትመራበት-a class=cx-link data-linkid=7 href=/wiki/%E1%8B%98%E1%88%98%E1%8A%90_%E1%88%98%E1%88%B3%E1%8D%8D%E1%8A%95%E1%89%B5 title=ዘመነ መሳፍንትዘመነ መሳፍንት/a በሚባለው ወቅት ነበር። /spanspan class=cx-segment data-segmentid=8አባታቸው a class=cx-link data-linkid=9 href=/w/index.php?title=%E1%8B%B0%E1%8C%83%E1%8B%9D%E1%88%9B%E1%89%BD#38;action=edit#38;redlink=1 title=ደጃዝማች (ገጹ ገና አልተጻፈም)ደጃዝማች/a a class=cx-link data-linkid=10 href=/w/index.php?title=%E1%8A%83%E1%8B%AD%E1%88%89_%E1%8B%88%E1%88%8D%E1%8B%B0_%E1%8C%8A%E1%8B%AE%E1%88%AD%E1%8C%8A%E1%88%B5#38;action=edit#38;redlink=1 title=ኃይሉ ወልደ ጊዮርጊስ (ገጹ ገና
[MediaWiki-commits] [Gerrit] Don't fatal in RdfDumpGenerator if entity loading failed - change (mediawiki...Wikibase)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/211410 Change subject: Don't fatal in RdfDumpGenerator if entity loading failed .. Don't fatal in RdfDumpGenerator if entity loading failed The parent class will catch the exception and handle it. See also the implementation in JsonDumpGenerator. Fails for testwikidatawiki with: Fatal error: Call to a member function getEntity() on a non-object in /srv/mediawiki/php-1.26wmf6/extensions/Wikidata/extensions/Wikibase/repo/includes/Dumpers/RdfDumpGenerator.php on line 102 Change-Id: I6d6fcb4b3330a3e5a019f29c185e5585afb0fe74 --- M repo/includes/Dumpers/RdfDumpGenerator.php 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/10/211410/1 diff --git a/repo/includes/Dumpers/RdfDumpGenerator.php b/repo/includes/Dumpers/RdfDumpGenerator.php index c44c9e7..5305eb6 100644 --- a/repo/includes/Dumpers/RdfDumpGenerator.php +++ b/repo/includes/Dumpers/RdfDumpGenerator.php @@ -98,6 +98,10 @@ try { $entityRevision = $this-entityRevisionLookup-getEntityRevision( $entityId ); + if ( !$entityRevision ) { + throw new StorageException( 'Entity not found: ' . $entityId-getSerialization() ); + } + $this-rdfBuilder-addEntityRevisionInfo( $entityRevision-getEntity()-getId(), $entityRevision-getRevisionId(), @@ -108,9 +112,6 @@ $entityRevision-getEntity() ); - if ( !$entityRevision ) { - throw new StorageException( 'Entity not found: ' . $entityId-getSerialization() ); - } } catch ( MWContentSerializationException $ex ) { throw new StorageException( 'Deserialization error for ' . $entityId-getSerialization() ); } catch ( UnresolvedRedirectException $e ) { -- To view, visit https://gerrit.wikimedia.org/r/211410 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d6fcb4b3330a3e5a019f29c185e5585afb0fe74 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...BibManager)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/211415 Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.22 Change-Id: I9d97b5b85707bb920ff786c00abac5ac409fe70e --- M BibManager.php M includes/specials/SpecialBibManagerCreate.php M includes/specials/SpecialBibManagerDelete.php M includes/specials/SpecialBibManagerEdit.php M includes/specials/SpecialBibManagerExport.php M includes/specials/SpecialBibManagerImport.php M includes/specials/SpecialBibManagerList.php M includes/specials/SpecialBibManagerListAuthors.php 8 files changed, 26 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BibManager refs/changes/15/211415/1 diff --git a/BibManager.php b/BibManager.php index 6f04e10..6a06fad 100644 --- a/BibManager.php +++ b/BibManager.php @@ -72,15 +72,6 @@ $wgSpecialPages['BibManagerCreate'] = 'SpecialBibManagerCreate'; $wgSpecialPages['BibManagerEdit']= 'SpecialBibManagerEdit'; -//Add SpecialPages to group -$wgSpecialPageGroups['BibManagerList']= 'bibmanager'; -$wgSpecialPageGroups['BibManagerListAuthors'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerImport'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerExport'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerDelete'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerCreate'] = 'bibmanager'; -$wgSpecialPageGroups['BibManagerEdit']= 'bibmanager'; - //Add Hookhandler $wgHooks['ParserFirstCallInit'][] = 'BibManagerHooks::onParserFirstCallInit'; $wgHooks['BeforePageDisplay'][] = 'BibManagerHooks::onBeforePageDisplay'; diff --git a/includes/specials/SpecialBibManagerCreate.php b/includes/specials/SpecialBibManagerCreate.php index 1f11922..f6e5742 100644 --- a/includes/specials/SpecialBibManagerCreate.php +++ b/includes/specials/SpecialBibManagerCreate.php @@ -92,4 +92,8 @@ ); return true; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerDelete.php b/includes/specials/SpecialBibManagerDelete.php index b6e6107..5d269d3 100644 --- a/includes/specials/SpecialBibManagerDelete.php +++ b/includes/specials/SpecialBibManagerDelete.php @@ -101,4 +101,8 @@ } return $result; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerEdit.php b/includes/specials/SpecialBibManagerEdit.php index eef6cd8..85f69d8 100644 --- a/includes/specials/SpecialBibManagerEdit.php +++ b/includes/specials/SpecialBibManagerEdit.php @@ -145,4 +145,8 @@ return true; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerExport.php b/includes/specials/SpecialBibManagerExport.php index f6434d6..b0ce846 100644 --- a/includes/specials/SpecialBibManagerExport.php +++ b/includes/specials/SpecialBibManagerExport.php @@ -55,4 +55,7 @@ echo $out; } + protected function getGroupName() { + return 'bibmanager'; + } } \ No newline at end of file diff --git a/includes/specials/SpecialBibManagerImport.php b/includes/specials/SpecialBibManagerImport.php index ebdf1e3..34eea37 100644 --- a/includes/specials/SpecialBibManagerImport.php +++ b/includes/specials/SpecialBibManagerImport.php @@ -100,4 +100,8 @@ return true; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerList.php b/includes/specials/SpecialBibManagerList.php index 03c98fa..bc6125b 100644 --- a/includes/specials/SpecialBibManagerList.php +++ b/includes/specials/SpecialBibManagerList.php @@ -92,4 +92,8 @@ public function submitForm ( $formData ) { return false; } + + protected function getGroupName() { + return 'bibmanager'; + } } diff --git a/includes/specials/SpecialBibManagerListAuthors.php b/includes/specials/SpecialBibManagerListAuthors.php index b5a317e..de037bc 100644 --- a/includes/specials/SpecialBibManagerListAuthors.php +++ b/includes/specials/SpecialBibManagerListAuthors.php @@ -42,4 +42,7 @@ return false; } + protected function getGroupName() { + return 'bibmanager'; + } } \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/211415 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Representation of red-linked images in VE - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Representation of red-linked images in VE .. Representation of red-linked images in VE The red-linked images in VE are now identifited as red links and image errors. They can be changed and thereby be modified just as any other image on the editor. Bug: T52788 Change-Id: I9cbb992c34d71b7073157fe276fee04e901845b1 --- M modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js M modules/ve-mw/dm/models/ve.dm.MWImageModel.js M modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js 3 files changed, 44 insertions(+), 17 deletions(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js index 03fe2ea..b510646 100644 --- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js +++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js @@ -17,13 +17,14 @@ * @param {Object} [config] Configuration options */ ve.ce.MWBlockImageNode = function VeCeMWBlockImageNode( model, config ) { - var type, align; + var type, align, isError; // Parent constructor ve.ce.BranchNode.call( this, model, config ); type = this.model.getAttribute( 'type' ); align = this.model.getAttribute( 'align' ); + isError = this.model.getAttribute( 'isError' ); // Properties this.captionVisible = false; @@ -36,13 +37,19 @@ // figcaption this.caption.view.$element // Build DOM: - this.$a = $( 'a' ) - .addClass( 'image' ) - .attr( 'href', this.getResolvedAttribute( 'href' ) ); - this.$image = $( 'img' ) - .attr( 'src', this.getResolvedAttribute( 'src' ) ) - .appendTo( this.$a ); + .attr( 'src', this.getResolvedAttribute( 'src' ) ); + + if ( isError ) { + this.$a = $( 'a' ) + .addClass( 'new' ) + .text( this.model.getFilename() ); + } else { + this.$a = $( 'a' ) + .addClass( 'image' ) + .attr( 'href', this.getResolvedAttribute( 'href' ) ) + .append( this.$image ); + } this.$element .append( this.$a ) diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js index 69c8ffb..f9c7905 100644 --- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js +++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js @@ -448,6 +448,8 @@ // Remove old classes delete editAttributes.originalClasses; delete editAttributes.unrecognizedClasses; + // Newly created images must have valid URLs, so remove the error attribute + delete editAttributes.isError; contentToInsert = [ { diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js index c2d926f..0b5e5b5 100644 --- a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js +++ b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js @@ -63,8 +63,18 @@ ve.dm.MWBlockImageNode.static.blacklistedAnnotationTypes = [ 'link' ]; -ve.dm.MWBlockImageNode.static.getMatchRdfaTypes = function () { - return Object.keys( this.rdfaToType ); +ve.dm.MWBlockImageNode.static.matchRdfaTypes = [ + // We're interested in all nodes that have mw:Image, even if they also have other mw: + // types. So we match all mw: types, then use a matchFunction to assert that mw:Image + // is in there. + /^mw:/ +]; + +ve.dm.MWBlockImageNode.static.matchFunction = function ( domElement ) { + var nodetypes = ( domElement.getAttribute( 'typeof' ) || '' ).split( ' ' ), + matchTypes = Object.keys( this.rdfaToType ), + storeType = OO.simpleArrayIntersection( nodetypes, matchTypes ); + return storeType.length !== 0; }; ve.dm.MWBlockImageNode.static.classAttributes = { @@ -85,26 +95,34 @@ } ); } - var dataElement, newDimensions, + var dataElement, newDimensions, attributes, figure = domElements[0], imgWrapper = findChildren( figure, [ 'a', 'span' ] )[0] || null, img = imgWrapper findChildren( imgWrapper, [ 'img' ] )[0] || null, caption = findChildren( figure, [ 'figcaption' ] )[0] || null, classAttr = figure.getAttribute( 'class' ), - typeofAttr = figure.getAttribute( 'typeof' ), - attributes = { - type: this.rdfaToType[typeofAttr], - href: imgWrapper imgWrapper.getAttribute( 'href' ) || '', - src: img img.getAttribute( 'src' ), - resource: img img.getAttribute( 'resource' ) - }, +
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...HostStats)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/211421 Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Min version on mw.org is 1.22 Change-Id: I1b840b466b226d933c916d9e473998e733ea91e6 --- M HostStats.php M SpecialHostStats.php 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HostStats refs/changes/21/211421/1 diff --git a/HostStats.php b/HostStats.php index f8515d8..503de78 100644 --- a/HostStats.php +++ b/HostStats.php @@ -46,7 +46,6 @@ // Register special page into MediaWiki. $wgSpecialPages['HostStats'] = 'SpecialHostStats'; -$wgSpecialPageGroups['HostStats'] = 'wiki'; // Create new right. $wgAvailableRights[] = 'hoststats'; diff --git a/SpecialHostStats.php b/SpecialHostStats.php index 46d42c4..6520eb3 100644 --- a/SpecialHostStats.php +++ b/SpecialHostStats.php @@ -34,4 +34,8 @@ $output = wfShellExec( $query ); return $output; } + + protected function getGroupName() { + return 'wiki'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211421 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1b840b466b226d933c916d9e473998e733ea91e6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HostStats Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] deployment server init should configure repo every time - change (operations/puppet)
ArielGlenn has uploaded a new change for review. https://gerrit.wikimedia.org/r/211435 Change subject: deployment server init should configure repo every time .. deployment server init should configure repo every time formerly it woul refuse to configure a git repo with .git dir in it with this change it will configure an existing repo properly Change-Id: I49f624367d6457f30c7e8ab0efa0b783501e5a66 --- M modules/deployment/files/modules/deploy.py 1 file changed, 14 insertions(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/35/211435/1 diff --git a/modules/deployment/files/modules/deploy.py b/modules/deployment/files/modules/deploy.py index 932c821..59237b2 100644 --- a/modules/deployment/files/modules/deploy.py +++ b/modules/deployment/files/modules/deploy.py @@ -235,22 +235,22 @@ continue # git clone does ignore umask and does explicit mkdir with 755 __salt__['file.set_mode'](config['location'], 2775) -# Set the repo name in the repo's config -cmd = 'git config deploy.repo-name %s' % repo -status = __salt__['cmd.retcode'](cmd, cwd=config['location'], +# Set the repo name in the repo's config +cmd = 'git config deploy.repo-name %s' % repo +status = __salt__['cmd.retcode'](cmd, cwd=config['location'], runas=deploy_user, umask=002) -if status != 0: -ret_status = 1 -continue -# Ensure checkout-submodules is also configured for trigger -if config['checkout_submodules']: -cmd = 'git config deploy.checkout-submodules true' -else: -cmd = 'git config deploy.checkout-submodules false' -status = __salt__['cmd.retcode'](cmd, cwd=config['location'], +if status != 0: +ret_status = 1 +continue +# Ensure checkout-submodules is also configured for trigger +if config['checkout_submodules']: +cmd = 'git config deploy.checkout-submodules true' +else: +cmd = 'git config deploy.checkout-submodules false' +status = __salt__['cmd.retcode'](cmd, cwd=config['location'], runas=deploy_user, umask=002) -if status != 0: -ret_status = 1 +if status != 0: +ret_status = 1 return ret_status -- To view, visit https://gerrit.wikimedia.org/r/211435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49f624367d6457f30c7e8ab0efa0b783501e5a66 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: ArielGlenn ar...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...CheckUser)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead For backport of Idccbe41b649de93548c5b0fca03145da716bcc65 Change-Id: I9b8e6aad922d45b9bb3a0665fcd3ddce6f82f04e (cherry picked from commit 32bb10553b035d731789ff0a0f4bc122e6632e90) --- M CheckUser.php M extension.json M specials/SpecialCheckUser.php M specials/SpecialCheckUserLog.php 4 files changed, 8 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/CheckUser.php b/CheckUser.php index 5fbc47b..0b7c09e 100644 --- a/CheckUser.php +++ b/CheckUser.php @@ -99,9 +99,7 @@ // Set up the new special page $wgSpecialPages['CheckUser'] = 'CheckUser'; -$wgSpecialPageGroups['CheckUser'] = 'users'; $wgSpecialPages['CheckUserLog'] = 'SpecialCheckUserLog'; -$wgSpecialPageGroups['CheckUserLog'] = 'changes'; $wgAutoloadClasses['CheckUser'] = $dir . 'specials/SpecialCheckUser.php'; $wgAutoloadClasses['CheckUserHooks'] = $dir . 'CheckUser.hooks.php'; diff --git a/extension.json b/extension.json index 9e62d31..67b8c67 100644 --- a/extension.json +++ b/extension.json @@ -79,10 +79,6 @@ localBasePath: , remoteExtPath: CheckUser }, - SpecialPageGroups: { - CheckUser: users, - CheckUserLog: changes - }, GroupPermissions: { checkuser: { checkuser: true, diff --git a/specials/SpecialCheckUser.php b/specials/SpecialCheckUser.php index eaa3eb5..5f8af03 100644 --- a/specials/SpecialCheckUser.php +++ b/specials/SpecialCheckUser.php @@ -1438,5 +1438,9 @@ ), __METHOD__ ); return true; } + + protected function getGroupName() { + return 'users'; + } } diff --git a/specials/SpecialCheckUserLog.php b/specials/SpecialCheckUserLog.php index 7470de0..190f612 100644 --- a/specials/SpecialCheckUserLog.php +++ b/specials/SpecialCheckUserLog.php @@ -122,4 +122,8 @@ $pager-getNavigationBar() ); } + + protected function getGroupName() { + return 'changes'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211442 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b8e6aad922d45b9bb3a0665fcd3ddce6f82f04e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/CheckUser Gerrit-Branch: REL1_25 Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Replace deprecated $wgSpecialPageGroups - change (mediawiki...ApiFeatureUsage)
jenkins-bot has submitted this change and it was merged. Change subject: Replace deprecated $wgSpecialPageGroups .. Replace deprecated $wgSpecialPageGroups $wgSpecialPageGroups is deprecated since 1.21 override SpecialPage::getGroupName instead Change-Id: I0340cd8687d097867f7278428f3f2e0129c1ba10 --- M ApiFeatureUsage.php M SpecialApiFeatureUsage.php 2 files changed, 3 insertions(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/ApiFeatureUsage.php b/ApiFeatureUsage.php index feac398..fb77678 100644 --- a/ApiFeatureUsage.php +++ b/ApiFeatureUsage.php @@ -40,7 +40,6 @@ $wgMessagesDirs['ApiFeatureUsage'] = __DIR__ . '/i18n'; $wgExtensionMessagesFiles['ApiFeatureUsageAlias'] = __DIR__ . '/ApiFeatureUsage.alias.php'; $wgSpecialPages['ApiFeatureUsage'] = 'SpecialApiFeatureUsage'; -$wgSpecialPageGroups['ApiFeatureUsage'] = 'wiki'; $wgAPIMetaModules['featureusage'] = 'ApiQueryFeatureUsage'; $wgConfigRegistry['ApiFeatureUsage'] = 'GlobalVarConfig::newInstance'; diff --git a/SpecialApiFeatureUsage.php b/SpecialApiFeatureUsage.php index 2970bd5..c6aa923 100644 --- a/SpecialApiFeatureUsage.php +++ b/SpecialApiFeatureUsage.php @@ -125,4 +125,7 @@ return $this-engine-execute( $agent, $start, $end ); } + protected function getGroupName() { + return 'wiki'; + } } -- To view, visit https://gerrit.wikimedia.org/r/211366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0340cd8687d097867f7278428f3f2e0129c1ba10 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ApiFeatureUsage Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits