[MediaWiki-commits] [Gerrit] Add '-page' parameter to cfd.py to specify CFD working page - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add '-page' parameter to cfd.py to specify CFD working page .. Add '-page' parameter to cfd.py to specify CFD working page This is a forward port of a change from pywikibot-compat that I wrote a few years back. Bug: T135354 Change-Id: I632f70b7ccab2f9d0159bcab2ef3f519fa7a85df --- M scripts/cfd.py 1 file changed, 18 insertions(+), 9 deletions(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/cfd.py b/scripts/cfd.py index b301919..96fa0a3 100755 --- a/scripts/cfd.py +++ b/scripts/cfd.py @@ -23,15 +23,14 @@ # import re +import sys import pywikibot -from pywikibot import config2 as config - from scripts.category import CategoryMoveRobot as CategoryMoveBot -# The location of the CFD working page. -cfdPage = u'Wikipedia:Categories for discussion/Working' + +DEFAULT_CFD_PAGE = 'Wikipedia:Categories for discussion/Working' # A list of templates that are used on category pages as part of the CFD # process that contain information such as the link to the per-day discussion page. @@ -81,13 +80,23 @@ @param args: command line arguments @type args: list of unicode """ -pywikibot.handle_args(args) +cfd_page = DEFAULT_CFD_PAGE +local_args = pywikibot.handle_args(args) -if config.family != 'wikipedia' or config.mylang != 'en': -pywikibot.warning('CFD does work only on the English Wikipedia.') -return +for arg in local_args: +if arg.startswith('-page'): +if len(arg) == len('-page'): +cfd_page = pywikibot.input('Enter the CFD working page to use:') +else: +cfd_page = arg[len('-page:'):] -page = pywikibot.Page(pywikibot.Site(), cfdPage) +page = pywikibot.Page(pywikibot.Site(), cfd_page) +try: +page.get() +except pywikibot.NoPage: +pywikibot.error( +'CFD working page "{0}" does not exist!'.format(cfd_page)) +sys.exit(1) # Variable declarations day = 'None' -- To view, visit https://gerrit.wikimedia.org/r/290004 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I632f70b7ccab2f9d0159bcab2ef3f519fa7a85df Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Cyde Gerrit-Reviewer: Cyde Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:UserLogin: Consolidate create account buttons - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/290050 Change subject: Special:UserLogin: Consolidate create account buttons .. Special:UserLogin: Consolidate create account buttons When logged in and not logged in. Both now shares the same styles and DOM structure. The differences: * When logged in, you don't get a "Don't have an account?" message * When logged in, the button's label is "Create another account" instead of "Join {wikiname}" Bug: T135925 Change-Id: I90c7a1288af927a03da3ccf9499f625935742125 --- M includes/specialpage/LoginSignupSpecialPage.php 1 file changed, 18 insertions(+), 30 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/290050/1 diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php index 0e4252c..732d28a 100644 --- a/includes/specialpage/LoginSignupSpecialPage.php +++ b/includes/specialpage/LoginSignupSpecialPage.php @@ -652,37 +652,25 @@ if ( $wgLoginLanguageSelector && $this->mLanguage ) { $linkq .= '&uselang=' . $this->mLanguage; } - $createOrLoginHref = $linkTitle->getLocalURL( $linkq ); - if ( $this->getUser()->isLoggedIn() ) { - $createOrLoginHtml = Html::rawElement( 'div', - [ 'class' => 'mw-ui-vform-field' ], - Html::element( 'a', - [ - 'id' => 'mw-createaccount-join', - 'href' => $createOrLoginHref, - // put right after all auth inputs in the tab order - 'tabindex' => 100, - ], - $this->msg( 'userlogin-createanother' )->escaped() - ) - ); - } else { - $createOrLoginHtml = Html::rawElement( 'div', - [ 'id' => 'mw-createaccount-cta', - 'class' => 'mw-ui-vform-field' ], - $this->msg( 'userlogin-noaccount' )->escaped() - . Html::element( 'a', - [ - 'id' => 'mw-createaccount-join', - 'href' => $createOrLoginHref, - 'class' => 'mw-ui-button', - 'tabindex' => 100, - ], - $this->msg( 'userlogin-joinproject' )->escaped() - ) - ); - } + $createOrLoginHtml = Html::rawElement( 'div', + [ 'id' => 'mw-createaccount-cta', + 'class' => 'mw-ui-vform-field' ], + ( $this->getUser()->isLoggedIn() ? '' : $this->msg( 'userlogin-noaccount' )->escaped() ) + . Html::element( 'a', + [ + 'id' => 'mw-createaccount-join', + 'href' => $linkTitle->getLocalURL( $linkq ), + 'class' => 'mw-ui-button', + 'tabindex' => 100, + ], + $this->msg( + ( $this->getUser()->isLoggedIn() ? + 'userlogin-createanother' : + 'userlogin-joinproject' + ) )->escaped() + ) + ); $form
[MediaWiki-commits] [Gerrit] Fix autoload.php sort order - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/290049 Change subject: Fix autoload.php sort order .. Fix autoload.php sort order By running maintenance/generateLocalAutoload.php. Change-Id: I54324c9c3da201a8ccf3be8bd6a2e9c026936253 --- M autoload.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/49/290049/1 diff --git a/autoload.php b/autoload.php index fe37fe9..c68b703 100644 --- a/autoload.php +++ b/autoload.php @@ -794,8 +794,6 @@ 'MediaWikiSite' => __DIR__ . '/includes/site/MediaWikiSite.php', 'MediaWikiTitleCodec' => __DIR__ . '/includes/title/MediaWikiTitleCodec.php', 'MediaWikiVersionFetcher' => __DIR__ . '/includes/MediaWikiVersionFetcher.php', - 'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . '/includes/interwiki/ClassicInterwikiLookup.php', - 'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . '/includes/interwiki/InterwikiLookup.php', 'MediaWiki\\Auth\\AbstractAuthenticationProvider' => __DIR__ . '/includes/auth/AbstractAuthenticationProvider.php', 'MediaWiki\\Auth\\AbstractPasswordPrimaryAuthenticationProvider' => __DIR__ . '/includes/auth/AbstractPasswordPrimaryAuthenticationProvider.php', 'MediaWiki\\Auth\\AbstractPreAuthenticationProvider' => __DIR__ . '/includes/auth/AbstractPreAuthenticationProvider.php', @@ -832,6 +830,8 @@ 'MediaWiki\\Auth\\UserDataAuthenticationRequest' => __DIR__ . '/includes/auth/UserDataAuthenticationRequest.php', 'MediaWiki\\Auth\\UsernameAuthenticationRequest' => __DIR__ . '/includes/auth/UsernameAuthenticationRequest.php', 'MediaWiki\\Diff\\WordAccumulator' => __DIR__ . '/includes/diff/WordAccumulator.php', + 'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . '/includes/interwiki/ClassicInterwikiLookup.php', + 'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . '/includes/interwiki/InterwikiLookup.php', 'MediaWiki\\Languages\\Data\\Names' => __DIR__ . '/languages/data/Names.php', 'MediaWiki\\Languages\\Data\\ZhConversion' => __DIR__ . '/languages/data/ZhConversion.php', 'MediaWiki\\Linker\\LinkTarget' => __DIR__ . '/includes/linker/LinkTarget.php', @@ -853,8 +853,8 @@ 'MediaWiki\\Services\\CannotReplaceActiveServiceException' => __DIR__ . '/includes/Services/CannotReplaceActiveServiceException.php', 'MediaWiki\\Services\\ContainerDisabledException' => __DIR__ . '/includes/Services/ContainerDisabledException.php', 'MediaWiki\\Services\\DestructibleService' => __DIR__ . '/includes/Services/DestructibleService.php', - 'MediaWiki\\Services\\SalvageableService' => __DIR__ . '/includes/Services/SalvageableService.php', 'MediaWiki\\Services\\NoSuchServiceException' => __DIR__ . '/includes/Services/NoSuchServiceException.php', + 'MediaWiki\\Services\\SalvageableService' => __DIR__ . '/includes/Services/SalvageableService.php', 'MediaWiki\\Services\\ServiceAlreadyDefinedException' => __DIR__ . '/includes/Services/ServiceAlreadyDefinedException.php', 'MediaWiki\\Services\\ServiceContainer' => __DIR__ . '/includes/Services/ServiceContainer.php', 'MediaWiki\\Services\\ServiceDisabledException' => __DIR__ . '/includes/Services/ServiceDisabledException.php', -- To view, visit https://gerrit.wikimedia.org/r/290049 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I54324c9c3da201a8ccf3be8bd6a2e9c026936253 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] AuthManagerSpecialPage: Preserve returnto and returntoquery ... - change (mediawiki/core)
Florianschmidtwelzow has uploaded a new change for review. https://gerrit.wikimedia.org/r/290048 Change subject: AuthManagerSpecialPage: Preserve returnto and returntoquery params .. AuthManagerSpecialPage: Preserve returnto and returntoquery params They're are needed for a redirect to the target page after a successful login. Bug: T135924 Change-Id: I6ded7f9bb255cbb332a5810e7ed3cb3ecfdb2c04 --- M includes/specialpage/AuthManagerSpecialPage.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/48/290048/1 diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php index 7866c12..56f286a 100644 --- a/includes/specialpage/AuthManagerSpecialPage.php +++ b/includes/specialpage/AuthManagerSpecialPage.php @@ -495,6 +495,7 @@ * @return array */ protected function getPreservedParams( $withToken = false ) { + $request = $this->getRequest(); $params = []; if ( $this->authAction !== $this->getDefaultAction( $this->subPage ) ) { $params['authAction'] = $this->getContinueAction( $this->authAction ); @@ -502,6 +503,12 @@ if ( $withToken ) { $params[$this->getTokenName()] = $this->getToken()->toString(); } + if ( $request->getVal( 'returnto' ) ) { + $params['returnto'] = $request->getVal( 'returnto' ); + } + if ( $request->getVal( 'returntoquery' ) ) { + $params['returntoquery'] = $request->getVal( 'returntoquery' ); + } return $params; } -- To view, visit https://gerrit.wikimedia.org/r/290048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ded7f9bb255cbb332a5810e7ed3cb3ecfdb2c04 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove 'load_composer_autoloader' from extension.json - change (mediawiki...AntiSpoof)
jenkins-bot has submitted this change and it was merged. Change subject: Remove 'load_composer_autoloader' from extension.json .. Remove 'load_composer_autoloader' from extension.json This extension does not have any composer dependencies, so there's no need to load the composer autoloader. Also, that feature was introduced in 1.27, but the extension is marked to only require 1.25 or higher. Bug: T135870 Change-Id: I004c33a4f241a31ad6b0e81a482a5ce566ac9025 --- M extension.json 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Paladox: Looks good to me, but someone else must approve Florianschmidtwelzow: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 7be1d59..a1c3325 100644 --- a/extension.json +++ b/extension.json @@ -56,6 +56,5 @@ "\uFF0F" ] }, - "load_composer_autoloader": true, "manifest_version": 1 } -- To view, visit https://gerrit.wikimedia.org/r/289984 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I004c33a4f241a31ad6b0e81a482a5ce566ac9025 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AntiSpoof Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Gergő Tisza Gerrit-Reviewer: Hashar Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow wikilinks in template names - change (mediawiki...MultiBoilerplate)
FreedomFighterSparrow has submitted this change and it was merged. Change subject: Allow wikilinks in template names .. Allow wikilinks in template names Bug: T43787 Change-Id: Iea2f4660a0c69027aae47833c98851e2c78b7be7 --- M CHANGELOG.md M MultiBoilerplate.hooks.php R README.md M SpecialBoilerplates.php M extension.json 5 files changed, 52 insertions(+), 30 deletions(-) Approvals: FreedomFighterSparrow: Looks good to me, approved jenkins-bot: Verified diff --git a/CHANGELOG.md b/CHANGELOG.md index 36e0760..c3c3b9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. This project adheres (or attempts to adhere) to [Semantic Versioning](http://semver.org/). +## [2.1.1] - 2015-12-22 +- Support using wikilinks inside MediaWiki:Multiboilerplates (patch by Jhf2442) +- Slight code beautification + ## [2.1.0] - 2015-05-24 ### Breaking changes @@ -25,19 +29,19 @@ of the extension, or it will have no effect. ### Added -* Handle `` tag in a boilerplate. -* Add support for optgroups (headers) in the dropdown list, by using level 2 headers (==) +- Handle `` tag in a boilerplate. +- Add support for optgroups (headers) in the dropdown list, by using level 2 headers (==) in `MediaWiki:MultiBoilerplate`, thanks to an old patch by an unknown author; see [T43788](https://phabricator.wikimedia.org/T43788) on Phabricator for more details. -* README, RELEASE-NOTES, HISTORY & LICENSE files. +- README, RELEASE-NOTES, HISTORY & LICENSE files. ### Changed -* Updated to work with MediaWiki >= 1.24 -* Refactored to (hopefully) modern MediaWiki extension standards, e.g.: -* File structure -* JSON files for l10n -* Reduce use of globals +- Updated to work with MediaWiki >= 1.24 +- Refactored to (hopefully) modern MediaWiki extension standards, e.g.: +- File structure +- JSON files for l10n +- Reduce use of globals ## 1.8.0 (2009-07-31) diff --git a/MultiBoilerplate.hooks.php b/MultiBoilerplate.hooks.php index d49ae43..10d99e5 100644 --- a/MultiBoilerplate.hooks.php +++ b/MultiBoilerplate.hooks.php @@ -60,13 +60,12 @@ $options .= Xml::option( $name, $template, $selected ); } } else { - $things = wfMessage( 'Multiboilerplate' )->inContentLanguage()->text(); + $rows = wfMessage( 'Multiboilerplate' )->inContentLanguage()->text(); $options = ''; $headingFound = 0; - $things = explode( "\n", str_replace( - "\r", "\n", str_replace( "\r\n", "\n", $things ) - ) ); // Ensure line-endings are \n - foreach ( $things as $row ) { + $rows = preg_split( '/\r\n|\r|\n/', $rows ); + + foreach ( $rows as $row ) { if ( preg_match( '/==\s*(.*)\s*==/', $row, $optGroupText ) ) { if ( $headingFound ) { $options .= ''; @@ -74,11 +73,18 @@ $headingFound = true; $options.=''; } elseif ( substr( ltrim( $row ), 0, 1 ) === '*' ) { - $row = ltrim( $row, '* ' ); // Remove astersk & spacing from start of line. + $row = ltrim( $row, '* ' ); // Remove asterisk & spacing from start of line. $rowParts = explode( '|', $row ); if ( !isset( $rowParts[ 1 ] ) ) { return true; // Invalid syntax, abort } + + $rowParts[1] = trim( $rowParts[1] ); // Clean whitespace that might break wikilinks + + // allow wikilinks in template names + $rowParts[1] = preg_replace( '/^\[\[/','',$rowParts[1] ); + $rowParts[1] = preg_replace( '/\]\]$/','',$rowParts[1] ); + $selected = false; if ( $request->getVal( 'boilerplate' ) === $rowParts[ 1 ] ) { $selected = true; @@ -87,6 +93,7 @@ } } + if ( $headingFound ) { $options .= ''; } diff --git a/README b/README.md similarity index 73% rename from README rename to README.md index 8929455..63dbe43 100644 --- a/README +++ b/README.md @@ -1,4 +1,5 @@ -# M
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 65f4ba7..25b339b - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/290047 Change subject: Syncronize VisualEditor: 65f4ba7..25b339b .. Syncronize VisualEditor: 65f4ba7..25b339b Change-Id: Iaa4c685a180e52149d55c6d36347fb79f7e1dee3 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/47/290047/1 diff --git a/VisualEditor b/VisualEditor index 65f4ba7..25b339b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 65f4ba7b21cb96f1bfa8dcbec9e9eccf8efef629 +Subproject commit 25b339b430b25ba390be826c8349af94217ca5f9 -- To view, visit https://gerrit.wikimedia.org/r/290047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa4c685a180e52149d55c6d36347fb79f7e1dee3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove explicit height from "Translate instead" campaign - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/290008 Change subject: Remove explicit height from "Translate instead" campaign .. Remove explicit height from "Translate instead" campaign With explicit height it will be too narrow vertically if the campaign text is too long. Bug: T135919 Change-Id: I008c391f559dcd047379411be8ae7e5c4334aee6 --- M modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/08/290008/1 diff --git a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less index ed1ff5b..f654edf 100644 --- a/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less +++ b/modules/campaigns/styles/ext.cx.campaigns.contributionsmenu.less @@ -57,7 +57,6 @@ padding: 5px 5px 5px 40px; color: #555; background-color: #ecf5ff; - height: 2em; line-height: 2em; font-size: small; } -- To view, visit https://gerrit.wikimedia.org/r/290008 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I008c391f559dcd047379411be8ae7e5c4334aee6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Count "invisible" nodes with no DOM rendering - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/290007 Change subject: [WIP] Count "invisible" nodes with no DOM rendering .. [WIP] Count "invisible" nodes with no DOM rendering For demonstration, set comment nodes to invisible. Change-Id: Ie37f0b3bf26342776f4a202bd81c7d57c185c6e8 --- M src/ce/nodes/ve.ce.CommentNode.js M src/ce/ve.ce.js M src/dm/nodes/ve.dm.CommentNode.js 3 files changed, 31 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/07/290007/1 diff --git a/src/ce/nodes/ve.ce.CommentNode.js b/src/ce/nodes/ve.ce.CommentNode.js index 74d7a87..1d977f6 100644 --- a/src/ce/nodes/ve.ce.CommentNode.js +++ b/src/ce/nodes/ve.ce.CommentNode.js @@ -20,16 +20,18 @@ ve.ce.CommentNode.super.call( this, model, config ); // Mixin constructors - ve.ce.FocusableNode.call( this, this.$element, config ); +// ve.ce.FocusableNode.call( this, this.$element, config ); // DOM changes this.$element.addClass( 've-ce-commentNode' ); + + this.$element = $( [] ); }; /* Inheritance */ OO.inheritClass( ve.ce.CommentNode, ve.ce.LeafNode ); -OO.mixinClass( ve.ce.CommentNode, ve.ce.FocusableNode ); +//OO.mixinClass( ve.ce.CommentNode, ve.ce.FocusableNode ); /* Static Properties */ @@ -39,6 +41,8 @@ ve.ce.CommentNode.static.iconWhenInvisible = 'notice'; +ve.ce.CommentNode.static.invisible = true; + /* Static Methods */ /** diff --git a/src/ce/ve.ce.js b/src/ce/ve.ce.js index 44ed5ea..b6e0c22 100644 --- a/src/ce/ve.ce.js +++ b/src/ce/ve.ce.js @@ -315,6 +315,25 @@ offset = view.getOffset(); + function countInvisibleNodes( parent, nodeOffset, textOffset ) { + var nextSibling, + invisibleOffsets = 0, + modelOffset = 0; + + while ( ( nextSibling = parent.children[ nodeOffset ] ) ) { + if ( nextSibling.constructor.static.invisible ) { + invisibleOffsets += nextSibling.getOuterLength(); + } else { + modelOffset += nextSibling.getOuterLength(); + if ( modelOffset > textOffset ) { + break; + } + } + nodeOffset++; + } + return invisibleOffsets; + } + if ( $.contains( node, startNode ) ) { // node is an ancestor of startNode if ( !view.getModel().isContent() ) { @@ -324,6 +343,7 @@ if ( view.getModel().canContainContent() ) { offset += lengthSum; } + offset += countInvisibleNodes( view, 0, lengthSum ); // else: we're inside an alienated node: throw away all the text node lengths, // because the alien's content has no DM width } else if ( view.parent ) { @@ -336,6 +356,7 @@ // needs to be counted. offset += lengthSum; } + offset += countInvisibleNodes( view.parent, view.parent.children.indexOf( view ) + 1, lengthSum ); } else { throw new Error( 'Node is not in document' ); } diff --git a/src/dm/nodes/ve.dm.CommentNode.js b/src/dm/nodes/ve.dm.CommentNode.js index a98d1e2..2f55d4f 100644 --- a/src/dm/nodes/ve.dm.CommentNode.js +++ b/src/dm/nodes/ve.dm.CommentNode.js @@ -18,14 +18,14 @@ ve.dm.CommentNode.super.call( this, element ); // Mixin constructors - ve.dm.FocusableNode.call( this ); + //ve.dm.FocusableNode.call( this ); }; /* Inheritance */ OO.inheritClass( ve.dm.CommentNode, ve.dm.LeafNode ); -OO.mixinClass( ve.dm.CommentNode, ve.dm.FocusableNode ); +//OO.mixinClass( ve.dm.CommentNode, ve.dm.FocusableNode ); /* Static Properties */ @@ -33,6 +33,8 @@ ve.dm.CommentNode.static.preserveHtmlAttributes = false; +ve.dm.CommentNode.static.isDeletable = false; + ve.dm.CommentNode.static.toDataElement = function ( domElements, converter ) { var text; if ( domElements[ 0 ].nodeType === Node.COMMENT_NODE ) { -- To view, visit https://gerrit.wikimedia.org/r/290007 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie37f0b3bf26342776f4a202bd81c7d57c185c6e8 Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add composer.json file - change (mediawiki...CommonsMetadata)
Rudloff has uploaded a new change for review. https://gerrit.wikimedia.org/r/290006 Change subject: Add composer.json file .. Add composer.json file Change-Id: I10e85141d9285dd229c54f4c054715a3e80c95db --- A composer.json 1 file changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommonsMetadata refs/changes/06/290006/1 diff --git a/composer.json b/composer.json new file mode 100644 index 000..e6bea50 --- /dev/null +++ b/composer.json @@ -0,0 +1,9 @@ +{ + "name": "mediawiki/commons-metadata", + "description": "Attempts at extracting metadata from commons pages", + "type": "mediawiki-extension", + "license": "GPL-2.0+", + "require": { + "composer/installers": "~1.0" + } +} -- To view, visit https://gerrit.wikimedia.org/r/290006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I10e85141d9285dd229c54f4c054715a3e80c95db Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommonsMetadata Gerrit-Branch: master Gerrit-Owner: Rudloff ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix a case of invalid element nesting - change (wikimedia/portals)
TheDJ has uploaded a new change for review. https://gerrit.wikimedia.org/r/290005 Change subject: Fix a case of invalid element nesting .. Fix a case of invalid element nesting Bug: T130431 Change-Id: I926ed3a523601fea6ac2ca9b7b9d460ae313ad7d --- M dev/wikipedia.org/assets/postcss/_wm-portal.css M dev/wikipedia.org/templates/top-n-articles.li.multi.handlebars 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/portals refs/changes/05/290005/1 diff --git a/dev/wikipedia.org/assets/postcss/_wm-portal.css b/dev/wikipedia.org/assets/postcss/_wm-portal.css index b2d5f1c..b677428 100644 --- a/dev/wikipedia.org/assets/postcss/_wm-portal.css +++ b/dev/wikipedia.org/assets/postcss/_wm-portal.css @@ -239,10 +239,10 @@ content: none; } /* Add parentheses around nested lists */ -.hlist li + ul:before { +.hlist li > ul:before { content: "\00a0("; } -.hlist li + ul:after { +.hlist li > ul:after { content: ") "; } @@ -455,4 +455,4 @@ padding: 1px 2px; font-size: 11px; vertical-align: top; -} \ No newline at end of file +} diff --git a/dev/wikipedia.org/templates/top-n-articles.li.multi.handlebars b/dev/wikipedia.org/templates/top-n-articles.li.multi.handlebars index a532a46..8dee6f1 100644 --- a/dev/wikipedia.org/templates/top-n-articles.li.multi.handlebars +++ b/dev/wikipedia.org/templates/top-n-articles.li.multi.handlebars @@ -1,2 +1,2 @@ -{{{name}}}{{#each sublinks}}{{> top-n-articles.li.simple}}{{/each}} +{{{name}}}{{#each sublinks}}{{> top-n-articles.li.simple}}{{/each}} -- To view, visit https://gerrit.wikimedia.org/r/290005 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I926ed3a523601fea6ac2ca9b7b9d460ae313ad7d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/portals Gerrit-Branch: master Gerrit-Owner: TheDJ ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix watch path for css - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Fix watch path for css .. Fix watch path for css Change-Id: I451c161c80b9185454b94557950f5b9bc1de117d --- M Gruntfile.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index ab4b8f9..eae3e96 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -88,7 +88,7 @@ } }, stylelint: { - src: [ + all: [ '**/*.css', '!coverage/**', '!dist/**', -- To view, visit https://gerrit.wikimedia.org/r/289857 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I451c161c80b9185454b94557950f5b9bc1de117d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Esanders Gerrit-Reviewer: Jforrester 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: 8986624..65f4ba7 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 8986624..65f4ba7 .. Syncronize VisualEditor: 8986624..65f4ba7 Change-Id: I7bfda7c03df08e1bc1d5b371d3f9221f019283a5 --- 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 8986624..65f4ba7 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 89866241ef8a27f66534fae566b466122291c686 +Subproject commit 65f4ba7b21cb96f1bfa8dcbec9e9eccf8efef629 -- To view, visit https://gerrit.wikimedia.org/r/290003 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7bfda7c03df08e1bc1d5b371d3f9221f019283a5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing samp tags and closing kbd tag - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing samp tags and closing kbd tag .. Add missing samp tags and closing kbd tag In: * apihelp-clientlogin-example-login2 * api-help-authmanager-general-usage Also fix a typo in api-help-authmanager-general-usage. Change-Id: I2a9f6c46c992fda9a21068dd789043d5ef626311 --- M includes/api/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Anomie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index a802cc7..4e9309e 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -48,7 +48,7 @@ "apihelp-clientlogin-description": "Log in to the wiki using the interactive flow.", "apihelp-clientlogin-example-login": "Start the process of logging in to the wiki as user Example with password ExamplePassword.", - "apihelp-clientlogin-example-login2": "Continue logging in after a UI response for two-factor auth, supplying an OATHToken of 987654.", + "apihelp-clientlogin-example-login2": "Continue logging in after a UI response for two-factor auth, supplying an OATHToken of 987654.", "apihelp-compare-description": "Get the difference between 2 pages.\n\nA revision number, a page title, or a page ID for both \"from\" and \"to\" must be passed.", "apihelp-compare-param-fromtitle": "First title to compare.", @@ -1505,7 +1505,7 @@ "api-help-right-apihighlimits": "Use higher limits in API queries (slow queries: $1; fast queries: $2). The limits for slow queries also apply to multivalue parameters.", "api-help-open-in-apisandbox": "[open in sandbox]", - "api-help-authmanager-general-usage": "The general procedure to use this module is:\n# Fetch the fields available from [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] with amirequestsfor=$4, and a $5 token from [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].\n# Present the fields to the user, and obtain their submission.\n# Post to this module, supplying $1returnurl and any relevant fields.\n# Check the status in the response.\n#* If you received PASS or FAIL, you're done. The operation either succeeded or it didn't.\n#* If you received UI, present the new fields to the user and obtain their submission. Then post to this module with $1continue and the relevant fields set, and repeat step 4.\n#* If you received REDIRECT, direct the user to the redirecttarget and wait for the return to $1returnurl. Then post to this module with $1continue and any fields passed to the return URL, and repeat step 4.\n#* If you received RESTART, that means the authentication worked but we don't have an linked user account. You might treat this as UI or as FAIL.", + "api-help-authmanager-general-usage": "The general procedure to use this module is:\n# Fetch the fields available from [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] with amirequestsfor=$4, and a $5 token from [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].\n# Present the fields to the user, and obtain their submission.\n# Post to this module, supplying $1returnurl and any relevant fields.\n# Check the status in the response.\n#* If you received PASS or FAIL, you're done. The operation either succeeded or it didn't.\n#* If you received UI, present the new fields to the user and obtain their submission. Then post to this module with $1continue and the relevant fields set, and repeat step 4.\n#* If you received REDIRECT, direct the user to the redirecttarget and wait for the return to $1returnurl. Then post to this module with $1continue and any fields passed to the return URL, and repeat step 4.\n#* If you received RESTART, that means the authentication worked but we don't have a linked user account. You might treat this as UI or as FAIL.", "api-help-authmanagerhelper-requests": "Only use these authentication requests, by the id returned from [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] with amirequestsfor=$1 or from a previous response from this module.", "api-help-authmanagerhelper-request": "Use this authentication request, by the id returned from [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] with amirequestsfor=$1.", "api-help-authmanagerhelper-messageformat": "Format to use for returning messages.", -- To view, visit https://gerrit.wikimedia.org/r/289991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2a9f6c46c992fda9a21068dd789043d5ef626311 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Amire80 Gerrit-Reviewer: Anomie Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___
[MediaWiki-commits] [Gerrit] Add a trusty build - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add a trusty build .. Add a trusty build Use nb.wikipedia as it is an alias for no.wikipedia, and there isnt a full test run of an alias. Change-Id: Ic248ecb7fa28a0168bf5c90750cc107924ab8c75 --- M .travis.yml 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.travis.yml b/.travis.yml index 5db2095..fa8fef8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -133,6 +133,10 @@ - python: '2.7_with_system_site_packages' # equivalent to virtualenv: system_site_packages: true env: LANGUAGE=he FAMILY=wikivoyage SITE_ONLY=1 - python: '2.7' + env: LANGUAGE=nb FAMILY=wikipedia DIST=trusty + dist: trusty + sudo: required +- python: '2.7' env: LANGUAGE=en FAMILY=wpbeta SITE_ONLY=1 OAUTH_DOMAIN="en.wikipedia.beta.wmflabs.org" - python: '3.3' env: LANGUAGE=zh FAMILY=wpbeta SITE_ONLY=1 OAUTH_DOMAIN="zh.wikipedia.beta.wmflabs.org" -- To view, visit https://gerrit.wikimedia.org/r/289818 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic248ecb7fa28a0168bf5c90750cc107924ab8c75 Gerrit-PatchSet: 4 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use flake8-mock and fix mock.assert_called_once - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Use flake8-mock and fix mock.assert_called_once .. Use flake8-mock and fix mock.assert_called_once diff_tests was created using mock in 3c8c5eae, with a call to assert_called_once, which doesnt do anything. assert_called_once_with is the correct function name, but it is best avoided by using call_count. Also enable flake8-mock, which flags this as M001. Bug: T134341 Change-Id: I9f6e0c5c2b0f41b5b6d4cef33dcc3829b8dc1e05 --- M dev-requirements.txt M tests/diff_tests.py M tox.ini 3 files changed, 4 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/dev-requirements.txt b/dev-requirements.txt index baed441..44499a0 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -17,6 +17,7 @@ pyflakes>=0.9 flake8 flake8-docstrings>=0.2.6 +flake8-mock codecov coverage mock ; python_version < '3' diff --git a/tests/diff_tests.py b/tests/diff_tests.py index 402ad74..b94911f 100644 --- a/tests/diff_tests.py +++ b/tests/diff_tests.py @@ -94,7 +94,7 @@ @patch('{0}.__import__'.format('__builtin__' if PY2 else 'builtins'), - side_effect=ImportError) + side_effect=ImportError, autospec=True) class TestNoBeautifulSoup(TestCase): """Test functions when BeautifulSoup is not installes.""" @@ -104,7 +104,7 @@ def test_html_comparator(self, mocked_import): """Test html_comparator when bs4 not installed.""" self.assertRaises(ImportError, html_comparator, '') -mocked_import.assert_called_once() +self.assertEqual(mocked_import.call_count, 1) self.assertIn('bs4', mocked_import.call_args[0]) diff --git a/tox.ini b/tox.ini index 040e501..ea79390 100644 --- a/tox.ini +++ b/tox.ini @@ -38,6 +38,7 @@ flake8-import-order flake8-tuple>=0.2.8 flake8-print>=2.0.1 + flake8-mock [testenv:flake8-py3] commands = -- To view, visit https://gerrit.wikimedia.org/r/289894 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9f6e0c5c2b0f41b5b6d4cef33dcc3829b8dc1e05 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Whitlist user Urbanecm - change (integration/config)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/290001 Change subject: Whitlist user Urbanecm .. Whitlist user Urbanecm He is doing alot of site-requests work. https://gerrit.wikimedia.org/r/#/q/owner:martin%2540urbanec.cz,n,z It would make it easisar for him or she that they doint need one of the whitelisted users to keep rechecking to make sure nothing breaks. Change-Id: Id8c942a53e14e246b1b12c9e2a54231f6bd4e7b5 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/01/290001/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index b3b3075..505a004 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -132,6 +132,7 @@ | marielle\.volz@gmail\.com | markus@semantic-mediawiki\.org | maroloccio@gmail\.com +| martin@urbanec\.cz | matanya@foss\.co\.il | matanya\.moses@gmail\.com | matma\.rex@gmail\.com @@ -374,6 +375,7 @@ - ^mail@wikinaut\.de$ - ^markus@semantic-mediawiki\.org$ - ^maroloccio@gmail\.com$ + - ^martin@urbanec\.cz$ # Urbanecm - ^matanya\.moses@gmail\.com$ - ^matanya@foss\.co\.il$ - ^matma\.rex@gmail\.com$ -- To view, visit https://gerrit.wikimedia.org/r/290001 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8c942a53e14e246b1b12c9e2a54231f6bd4e7b5 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adjust groups permissions on fa.wikipedia - change (operations/mediawiki-config)
Urbanecm has uploaded a new change for review. https://gerrit.wikimedia.org/r/29 Change subject: Adjust groups permissions on fa.wikipedia .. Adjust groups permissions on fa.wikipedia Only bureaucrats should be able to grant the "eliminator" right and add 'deletedhistory' right to "eliminator" user group on fa.wikipedia. Bug: T135736 Bug: T135725 Change-Id: I4fdf7e06997f1ace14c0bb78c3de4d3b2fdfabaf --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/00/29/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index cd60468..df3dee8 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -7845,8 +7845,9 @@ 'mergehistory' => true, 'protect' => true, 'suppressredirect' => true, - 'deletedtext' => true - ], // T87558, T135370 + 'deletedtext' => true, +'deletedhistory' => true + ], // T87558, T135370, T135725 ], '+fawikibooks' => [ 'autopatrolled' => [ 'autopatrol' => true ], // T111024 @@ -9158,9 +9159,8 @@ 'uploader', 'templateeditor', // T74146 'abusefilter', // T74502 - 'confirmed', // T87348 - 'eliminator' // T87558 - ], // T71411 + 'confirmed' // T87348 + ], // T71411, T135736 ], '+fawikibooks' => [ 'sysop' => [ -- To view, visit https://gerrit.wikimedia.org/r/29 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4fdf7e06997f1ace14c0bb78c3de4d3b2fdfabaf Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm Gerrit-Reviewer: Huji ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up debug bar buttons - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/28 Change subject: Clean up debug bar buttons .. Clean up debug bar buttons Replace 'Dump model' group with 'Show model' toggle. Show separate 'Update on changes' toggle above model dump. Rename various internal variables to make more sense. Change-Id: Ib5b4a73d4e755f3755d4a98cd45355df6953dc6c --- M src/ui/styles/ve.ui.DebugBar.css M src/ui/ve.ui.DebugBar.js 2 files changed, 56 insertions(+), 51 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/99/28/1 diff --git a/src/ui/styles/ve.ui.DebugBar.css b/src/ui/styles/ve.ui.DebugBar.css index 0895049..148060a 100644 --- a/src/ui/styles/ve.ui.DebugBar.css +++ b/src/ui/styles/ve.ui.DebugBar.css @@ -45,7 +45,7 @@ border-top-left-radius: 0.25em; } -.ve-ui-debugBar-dump > .oo-ui-buttonWidget { +.ve-ui-debugBar-dump > .oo-ui-toggleWidget { margin-bottom: 0.25em; } diff --git a/src/ui/ve.ui.DebugBar.js b/src/ui/ve.ui.DebugBar.js index 5c611d4..5b1cce7 100644 --- a/src/ui/ve.ui.DebugBar.js +++ b/src/ui/ve.ui.DebugBar.js @@ -15,7 +15,7 @@ * @param {Object} [config] Configuration options */ ve.ui.DebugBar = function VeUiDebugBar( surface, config ) { - var dumpModelButtonGroup, hideDumpButton, closeButton; + var closeButton; // Parent constructor OO.ui.Element.call( this, config ); @@ -23,29 +23,33 @@ this.surface = surface; this.$commands = $( '' ).addClass( 've-ui-debugBar-commands' ); - this.$dumpLinmodData = $( '' ).addClass( 've-ui-debugBar-dump-linmod-data' ); - this.$dumpLinmodMetadata = $( '' ).addClass( 've-ui-debugBar-dump-linmod-metadata' ); - this.$dumpView = $( '' ).addClass( 've-ui-debugBar-dump-view' ); - this.$dumpModel = $( '' ).addClass( 've-ui-debugBar-dump-model' ); - - hideDumpButton = new OO.ui.ButtonWidget( { - icon: 'collapse', - label: 'Hide' - } ); + this.$linmodData = $( '' ).addClass( 've-ui-debugBar-dump-linmod-data' ); + this.$linmodMetadata = $( '' ).addClass( 've-ui-debugBar-dump-linmod-metadata' ); + this.$viewTree = $( '' ).addClass( 've-ui-debugBar-view-tree' ); + this.$modelTree = $( '' ).addClass( 've-ui-debugBar-model-tree' ); closeButton = new OO.ui.ButtonWidget( { icon: 'close', label: 'Close' } ); + // Widgets + this.selectionLabel = new OO.ui.LabelWidget( { classes: [ 've-ui-debugBar-selectionLabel' ] } ); + + this.logRangeButton = new OO.ui.ButtonWidget( { label: 'Log', disabled: true } ); + this.showModelToggle = new OO.ui.ToggleButtonWidget( { label: 'Show model' } ); + this.updateModelToggle = new OO.ui.ToggleButtonWidget( { label: 'Update on changes' } ); + this.inputDebuggingToggle = new OO.ui.ToggleButtonWidget( { label: 'Input debugging' } ); + this.filibusterToggle = new OO.ui.ToggleButtonWidget( { label: 'Filibuster' } ); + this.$dump = $( '' ).append( - hideDumpButton.$element, + this.updateModelToggle.$element, $( '' ).append( $( 'Linear model dataLinear model metadataView treeModel tree' ), $( '' ).append( $( '' ).append( - this.$dumpLinmodData, this.$dumpLinmodMetadata, this.$dumpView, this.$dumpModel + this.$linmodData, this.$linmodMetadata, this.$viewTree, this.$modelTree ) ) ) @@ -53,30 +57,14 @@ this.$filibuster = $( '' ); - // Widgets - this.selectionLabel = new OO.ui.LabelWidget( { classes: [ 've-ui-debugBar-selectionLabel' ] } ); - - this.logRangeButton = new OO.ui.ButtonWidget( { label: 'Log', disabled: true } ); - this.dumpModelButton = new OO.ui.ButtonWidget( { label: 'Dump model' } ); - this.dumpModelChangeToggle = new OO.ui.ToggleButtonWidget( { icon: 'check' } ); - this.inputDebuggingToggle = new OO.ui.ToggleButtonWidget( { label: 'Input debugging' } ); - this.filibusterToggle = new OO.ui.ToggleButtonWidget( { label: 'Filibuster' } ); - - dumpModelButtonGroup = new OO.ui.ButtonGroupWidget( { items: [ - this.dumpModelButton, - this.dumpModelChangeToggle - ] } ); - // Events this.logRangeButton.on( 'click', this.onLogRangeButtonClick.bind( this ) ); - this.dumpModelButton.on( 'click', this.onDumpModelButtonClick.bind( this ) ); - this.dumpModelChangeToggle.on( 'click', this.onDumpModelChangeToggleClick.bind( this ) ); - th
[MediaWiki-commits] [Gerrit] Fix debugbar styling - change (mediawiki...Flow)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/289998 Change subject: Fix debugbar styling .. Fix debugbar styling Change-Id: Ia8e034c4c3a6bfce522271ab16fe255b52dc65ed --- M modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less M modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less 2 files changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/98/289998/1 diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less index 6eef6fd..209ae4c 100644 --- a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less +++ b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less @@ -35,6 +35,13 @@ // in solid white on top of that. background: transparent; } + + .ve-ui-debugBar { + font-size: @uiFontSize; + &-selectionLabel { + min-width: 10em; + } + } } .flow-editor { diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less index 2bd1c78..02ddbf8 100644 --- a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less +++ b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-vector.less @@ -43,6 +43,13 @@ .oo-ui-toolGroup { border: none; } + + .ve-ui-debugBar { + font-size: @uiFontSize; + &-selectionLabel { + min-width: 10em; + } + } } .flow-editor { -- To view, visit https://gerrit.wikimedia.org/r/289998 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia8e034c4c3a6bfce522271ab16fe255b52dc65ed Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use VisualEditorSupportCheck - change (mediawiki...Flow)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/289997 Change subject: Use VisualEditorSupportCheck .. Use VisualEditorSupportCheck To avoid making the support check process async, load the VESupportCheck module with ext.flow.ui. In Hooks.php register a dummy module if VE isn't installed. Bug: T135901 Change-Id: I4752fb3079972bc2cf8aa4defe5dda1ceb305706 --- M .jshintrc M Hooks.php M Resources.php M modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js M modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js 5 files changed, 16 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/97/289997/1 diff --git a/.jshintrc b/.jshintrc index 85b889e..90d9c51 100644 --- a/.jshintrc +++ b/.jshintrc @@ -15,7 +15,8 @@ "Handlebars": true, "initStorer": true, "OO": true, - "moment": true + "moment": true, + "VisualEditorSupportCheck": true }, "browser": true, // document, navigator, etc. "curly":true, // requres curly braces around loops and conditionals diff --git a/Hooks.php b/Hooks.php index 2bb4d5f..619942c 100644 --- a/Hooks.php +++ b/Hooks.php @@ -40,6 +40,12 @@ ) ); } + // Register a dummy supportCheck module in case VE isn't loaded, as we attempt + // to load this module unconditionally on load. + if ( !$resourceLoader->isModuleRegistered( 'ext.visualEditor.supportCheck' ) ) { + $resourceLoader->register( 'ext.visualEditor.supportCheck', array() ); + } + if ( class_exists( 'GuidedTourHooks' ) ) { $resourceLoader->register( 'ext.guidedTour.tour.flowOptIn', array( 'localBasePath' => __DIR__ . '/modules', diff --git a/Resources.php b/Resources.php index 1330051..2f91c8c 100644 --- a/Resources.php +++ b/Resources.php @@ -440,6 +440,8 @@ 'es5-shim', 'ext.flow.dm', 'oojs-ui.styles.icons-editing-advanced', + // This module may not exist, so a dummy version is conditionally added in Hooks.php + 'ext.visualEditor.supportCheck', ) ) + $mobile, 'ext.flow' => $flowResourceTemplate + array( diff --git a/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js b/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js index 9bd7eee..6f88ea5 100644 --- a/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js +++ b/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js @@ -197,23 +197,10 @@ var isMobileTarget = ( mw.config.get( 'skin' ) === 'minerva' ); return !!( - mw.loader.getState( 'ext.visualEditor.core' ) && - !isMobileTarget && - - // ES5 support, from es5-skip.js - ( function () { - // This test is based on 'use strict', - // which is inherited from the top-level function. - return !this && !!Function.prototype.bind; - }() ) && - - // Since VE commit e2fab2f1ebf2a28f18b8ead08c478c4fc95cd64e, SVG is required - document.createElementNS && - document.createElementNS( 'http://www.w3.org/2000/svg', 'svg' ).createSVGRect && - - // ve needs to be turned on as a valid editor - mw.config.get( 'wgFlowEditorList' ).indexOf( 'visualeditor' ) !== -1 + mw.loader.getState( 'ext.visualEditor.core' ) && + mw.config.get( 'wgFlowEditorList' ).indexOf( 'visualeditor' ) !== -1 && + window.VisualEditorSupportCheck && VisualEditorSupportCheck() ); }; diff --git a/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js b/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js index 70ba0e4..2cc0eca 100644 --- a/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js +++ b/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js @@ -43,22 +43,10 @@ var isMobileTarget = ( mw.config.get( 'skin' ) === 'minerva' ); return !!( - mw.loader.getState( 'ext.visualEditor.core' ) && - !isMobileTarget && - - // ES5 support, from es5-skip.js - ( function () { - 'use strict'; -
[MediaWiki-commits] [Gerrit] Add VE module check to #isSupported - change (mediawiki...Flow)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/289996 Change subject: Add VE module check to #isSupported .. Add VE module check to #isSupported Because if VE isn't installed, VE isn't supported. Bug: T131055 Change-Id: I0198194bff9cca0ba6e5e9343bc32eae67593c0b --- M modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js M modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/96/289996/1 diff --git a/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js b/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js index 6fc3dc8..9bd7eee 100644 --- a/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js +++ b/modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js @@ -197,6 +197,8 @@ var isMobileTarget = ( mw.config.get( 'skin' ) === 'minerva' ); return !!( + mw.loader.getState( 'ext.visualEditor.core' ) && + !isMobileTarget && // ES5 support, from es5-skip.js diff --git a/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js b/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js index c49bff3..70ba0e4 100644 --- a/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js +++ b/modules/flow/ui/widgets/editor/editors/mw.flow.ui.VisualEditorWidget.js @@ -43,6 +43,8 @@ var isMobileTarget = ( mw.config.get( 'skin' ) === 'minerva' ); return !!( + mw.loader.getState( 'ext.visualEditor.core' ) && + !isMobileTarget && // ES5 support, from es5-skip.js -- To view, visit https://gerrit.wikimedia.org/r/289996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0198194bff9cca0ba6e5e9343bc32eae67593c0b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/289995 Change subject: Test .. Test This reverts commit 87e62b845b9c8d618d0fded4a0a20cbd1869c89c. Change-Id: Ie9543cac4a627b7f1156d68fb6a812bc0e5cfffc --- M includes/diff/DifferenceEngine.php 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/95/289995/1 diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 832a54c..1352aab 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -828,9 +828,8 @@ * @return bool|string */ public function generateTextDiffBody( $otext, $ntext ) { - $self = $this; - $diff = function() use ( $self, $otext, $ntext ) { - return $self->textDiff( $otext, $ntext ); + $diff = function() use ( $otext, $ntext ) { + return $this->textDiff( $otext, $ntext ); }; $error = function( $status ) { -- To view, visit https://gerrit.wikimedia.org/r/289995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie9543cac4a627b7f1156d68fb6a812bc0e5cfffc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Test - change (mediawiki/core)
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/289994 Change subject: Test .. Test This reverts commit 01b4001e707ea9535810af364fec2b0cba0f5735. Change-Id: I25b47d08f69843cf8ca4638d8ac0049fd0db31ce --- M includes/diff/DifferenceEngine.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/94/289994/1 diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index d1f24ad..832a54c 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -856,7 +856,7 @@ * @param string $ntext New text, must be already segmented * @return bool|string */ - public function textDiff( $otext, $ntext ) { + protected function textDiff( $otext, $ntext ) { global $wgExternalDiffEngine, $wgContLang; $otext = str_replace( "\r\n", "\n", $otext ); -- To view, visit https://gerrit.wikimedia.org/r/289994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25b47d08f69843cf8ca4638d8ac0049fd0db31ce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: REL1_25 Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not count 0-load servers in getMaxLag() - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/289993 Change subject: Do not count 0-load servers in getMaxLag() .. Do not count 0-load servers in getMaxLag() JobRunner::run() and API endpoints use this to bail out if lag is too high. A dedicated "vslow" host with no normal load should not trigger this logic, for example. Bug: T135809 Change-Id: If6879aa1a4379857779a4eacf2a8b7400c0b434f --- M includes/db/loadbalancer/LoadBalancer.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/93/289993/1 diff --git a/includes/db/loadbalancer/LoadBalancer.php b/includes/db/loadbalancer/LoadBalancer.php index 5578099..1f2f494 100644 --- a/includes/db/loadbalancer/LoadBalancer.php +++ b/includes/db/loadbalancer/LoadBalancer.php @@ -1334,7 +1334,7 @@ $lagTimes = $this->getLagTimes( $wiki ); foreach ( $lagTimes as $i => $lag ) { - if ( $lag > $maxLag ) { + if ( $this->mLoads[$i] > 0 && $lag > $maxLag ) { $maxLag = $lag; $host = $this->mServers[$i]['host']; $maxIndex = $i; -- To view, visit https://gerrit.wikimedia.org/r/289993 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6879aa1a4379857779a4eacf2a8b7400c0b434f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Make LinksDeletionUpdate use query batching - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/289992 Change subject: [WIP] Make LinksDeletionUpdate use query batching .. [WIP] Make LinksDeletionUpdate use query batching Bug: T95501 Change-Id: Ib0c911b030ae17cb7b0729be223b89d64c8c4b3f --- M includes/deferred/LinksDeletionUpdate.php 1 file changed, 94 insertions(+), 22 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/92/289992/1 diff --git a/includes/deferred/LinksDeletionUpdate.php b/includes/deferred/LinksDeletionUpdate.php index 65a8c0e..d294fd2 100644 --- a/includes/deferred/LinksDeletionUpdate.php +++ b/includes/deferred/LinksDeletionUpdate.php @@ -42,48 +42,95 @@ } elseif ( $pageId ) { $this->pageId = $pageId; } else { - throw new MWException( "Page ID not known, perhaps the page doesn't exist?" ); + throw new InvalidArgumentException( "Page ID not known. Page doesn't exist?" ); } } public function doUpdate() { - # Page may already be deleted, so don't just getId() + $config = RequestContext::getMain()->getConfig(); + $batchSize = $config->get( 'UpdateRowsPerQuery' ); + + // Page may already be deleted, so don't just getId() $id = $this->pageId; // Make sure all links update threads see the changes of each other. // This handles the case when updates have to batched into several COMMITs. $scopedLock = LinksUpdate::acquirePageLock( $this->mDb, $id ); - # Delete restrictions for it + // Delete restrictions for it $this->mDb->delete( 'page_restrictions', [ 'pr_page' => $id ], __METHOD__ ); - # Fix category table counts + // Fix category table counts $cats = $this->mDb->selectFieldValues( 'categorylinks', 'cl_to', [ 'cl_from' => $id ], __METHOD__ ); - $this->page->updateCategoryCounts( [], $cats ); + $catBatches = array_chunk( $cats, $batchSize ); + foreach ( $catBatches as $catBatch ) { + $this->page->updateCategoryCounts( [], $catBatch ); + if ( count( $catBatches ) > 1 ) { + $this->mDb->commit( __METHOD__, 'flush' ); + wfGetLBFactory()->waitForReplication( [ 'wiki' => $this->mDb->getWikiID() ] ); + } + } - # If using cascading deletes, we can skip some explicit deletes + // If using cascading deletes, we can skip some explicit deletes if ( !$this->mDb->cascadingDeletes() ) { - # Delete outgoing links - $this->mDb->delete( 'pagelinks', [ 'pl_from' => $id ], __METHOD__ ); - $this->mDb->delete( 'imagelinks', [ 'il_from' => $id ], __METHOD__ ); - $this->mDb->delete( 'categorylinks', [ 'cl_from' => $id ], __METHOD__ ); - $this->mDb->delete( 'templatelinks', [ 'tl_from' => $id ], __METHOD__ ); - $this->mDb->delete( 'externallinks', [ 'el_from' => $id ], __METHOD__ ); - $this->mDb->delete( 'langlinks', [ 'll_from' => $id ], __METHOD__ ); - $this->mDb->delete( 'iwlinks', [ 'iwl_from' => $id ], __METHOD__ ); + // Delete outgoing links + $this->batchDeleteByPK( + 'pagelinks', + [ 'pl_from' => $id ], + [ 'pl_from', 'pl_namespace', 'pl_title' ], + $batchSize + ); + $this->batchDeleteByPK( + 'imagelinks', + [ 'il_from' => $id ], + [ 'il_from', 'il_to' ], + $batchSize + ); + $this->batchDeleteByPK( + 'categorylinks', + [ 'cl_from' => $id ], + [ 'cl_from', 'cl_to' ], + $batchSize + ); + $this->batchDeleteByPK( + 'templatelinks', + [ 'tl_from' => $id ], + [ 'tl_from', 'tl_namespace', 'tl_title' ], + $batchSize + ); + $this->batchDeleteByPK( + '
[MediaWiki-commits] [Gerrit] Add missing closing kbd tag and samp tags - change (mediawiki/core)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/289991 Change subject: Add missing closing kbd tag and samp tags .. Add missing closing kbd tag and samp tags In api-help-authmanager-general-usage. Change-Id: I2a9f6c46c992fda9a21068dd789043d5ef626311 --- M includes/api/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/91/289991/1 diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json index a802cc7..2262a8b 100644 --- a/includes/api/i18n/en.json +++ b/includes/api/i18n/en.json @@ -1505,7 +1505,7 @@ "api-help-right-apihighlimits": "Use higher limits in API queries (slow queries: $1; fast queries: $2). The limits for slow queries also apply to multivalue parameters.", "api-help-open-in-apisandbox": "[open in sandbox]", - "api-help-authmanager-general-usage": "The general procedure to use this module is:\n# Fetch the fields available from [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] with amirequestsfor=$4, and a $5 token from [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].\n# Present the fields to the user, and obtain their submission.\n# Post to this module, supplying $1returnurl and any relevant fields.\n# Check the status in the response.\n#* If you received PASS or FAIL, you're done. The operation either succeeded or it didn't.\n#* If you received UI, present the new fields to the user and obtain their submission. Then post to this module with $1continue and the relevant fields set, and repeat step 4.\n#* If you received REDIRECT, direct the user to the redirecttarget and wait for the return to $1returnurl. Then post to this module with $1continue and any fields passed to the return URL, and repeat step 4.\n#* If you received RESTART, that means the authentication worked but we don't have an linked user account. You might treat this as UI or as FAIL.", + "api-help-authmanager-general-usage": "The general procedure to use this module is:\n# Fetch the fields available from [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] with amirequestsfor=$4, and a $5 token from [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].\n# Present the fields to the user, and obtain their submission.\n# Post to this module, supplying $1returnurl and any relevant fields.\n# Check the status in the response.\n#* If you received PASS or FAIL, you're done. The operation either succeeded or it didn't.\n#* If you received UI, present the new fields to the user and obtain their submission. Then post to this module with $1continue and the relevant fields set, and repeat step 4.\n#* If you received REDIRECT, direct the user to the redirecttarget and wait for the return to $1returnurl. Then post to this module with $1continue and any fields passed to the return URL, and repeat step 4.\n#* If you received RESTART, that means the authentication worked but we don't have an linked user account. You might treat this as UI or as FAIL.", "api-help-authmanagerhelper-requests": "Only use these authentication requests, by the id returned from [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] with amirequestsfor=$1 or from a previous response from this module.", "api-help-authmanagerhelper-request": "Use this authentication request, by the id returned from [[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]] with amirequestsfor=$1.", "api-help-authmanagerhelper-messageformat": "Format to use for returning messages.", -- To view, visit https://gerrit.wikimedia.org/r/289991 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a9f6c46c992fda9a21068dd789043d5ef626311 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Amire80 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 2016-05-21T10:00:01+0000 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/289990 Change subject: New Wikidata Build - 2016-05-21T10:00:01+ .. New Wikidata Build - 2016-05-21T10:00:01+ Change-Id: I0ee6618d0160d658fe70c0c3b7f59e80d0d55782 --- M composer.lock M extensions/Wikibase/Gemfile A extensions/Wikibase/Gemfile.lock M extensions/Wikibase/client/i18n/gor.json M extensions/Wikibase/client/i18n/ps.json M extensions/Wikibase/client/i18n/xmf.json M extensions/Wikibase/repo/i18n/bn.json M extensions/Wikibase/repo/i18n/fr.json M vendor/composer/installed.json 9 files changed, 149 insertions(+), 26 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata refs/changes/90/289990/1 diff --git a/composer.lock b/composer.lock index 5ed86ab..c1f82cb 100644 --- a/composer.lock +++ b/composer.lock @@ -1564,12 +1564,12 @@ "source": { "type": "git", "url": "https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";, -"reference": "c2db8ce4e2f2c1b867040433ce9911b4b6c70d91" +"reference": "f97fed11c7a3920a5c7ce214e5a7d04ada7a3d5d" }, "dist": { "type": "zip", -"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/c2db8ce4e2f2c1b867040433ce9911b4b6c70d91";, -"reference": "c2db8ce4e2f2c1b867040433ce9911b4b6c70d91", +"url": "https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/f97fed11c7a3920a5c7ce214e5a7d04ada7a3d5d";, +"reference": "f97fed11c7a3920a5c7ce214e5a7d04ada7a3d5d", "shasum": "" }, "require": { @@ -1641,7 +1641,7 @@ "wikibaserepo", "wikidata" ], -"time": "2016-05-20 00:09:37" +"time": "2016-05-20 20:32:59" }, { "name": "wikibase/wikimedia-badges", diff --git a/extensions/Wikibase/Gemfile b/extensions/Wikibase/Gemfile index 7ee7f08..27b5a13 100644 --- a/extensions/Wikibase/Gemfile +++ b/extensions/Wikibase/Gemfile @@ -5,7 +5,7 @@ gem 'activesupport' gem 'mediawiki_api-wikidata', '~> 0.2.0' -gem 'mediawiki_selenium', '~> 1.6.2' +gem 'mediawiki_selenium', '~> 1.6.5' gem 'parallel_tests' gem 'require_all' gem 'rubocop', require: false diff --git a/extensions/Wikibase/Gemfile.lock b/extensions/Wikibase/Gemfile.lock new file mode 100644 index 000..94ec75f --- /dev/null +++ b/extensions/Wikibase/Gemfile.lock @@ -0,0 +1,122 @@ +GEM + remote: https://rubygems.org/ + specs: +activesupport (4.2.6) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) +ast (2.2.0) +builder (3.2.2) +childprocess (0.5.9) + ffi (~> 1.0, >= 1.0.11) +cucumber (1.3.20) + builder (>= 2.1.2) + diff-lcs (>= 1.1.3) + gherkin (~> 2.12) + multi_json (>= 1.7.5, < 2.0) + multi_test (>= 0.1.2) +data_magic (0.22) + faker (>= 1.1.2) + yml_reader (>= 0.6) +diff-lcs (1.2.5) +domain_name (0.5.20160310) + unf (>= 0.0.5, < 1.0.0) +faker (1.6.3) + i18n (~> 0.5) +faraday (0.9.2) + multipart-post (>= 1.2, < 3) +faraday-cookie_jar (0.0.6) + faraday (>= 0.7.4) + http-cookie (~> 1.0.0) +ffi (1.9.10) +gherkin (2.12.2) + multi_json (~> 1.3) +headless (2.2.3) +http-cookie (1.0.2) + domain_name (~> 0.5) +i18n (0.7.0) +json (1.8.3) +mediawiki_api (0.5.0) + faraday (~> 0.9, >= 0.9.0) + faraday-cookie_jar (~> 0.0, >= 0.0.6) +mediawiki_api-wikidata (0.2.0) + mediawiki_api (~> 0.5.0) +mediawiki_selenium (1.6.5) + cucumber (~> 1.3, >= 1.3.20) + headless (~> 2.0, >= 2.1.0) + json (~> 1.8, >= 1.8.1) + mediawiki_api (~> 0.5, >= 0.5.0) + page-object (~> 1.0) + rest-client (~> 1.6, >= 1.6.7) + rspec-core (~> 2.14, >= 2.14.4) + rspec-expectations (~> 2.14, >= 2.14.4) + syntax (~> 1.2, >= 1.2.0) + thor (~> 0.19, >= 0.19.1) +mime-types (2.99.1) +minitest (5.8.4) +multi_json (1.12.0) +multi_test (0.1.2) +multipart-post (2.0.0) +netrc (0.11.0) +page-object (1.1.1) + page_navigation (>= 0.9) + selenium-webdriver (>= 2.44.0) + watir-webdriver (>= 0.6.11) +page_navigation (0.9) + data_magic (>= 0.14) +parallel (1.8.0) +parallel_tests (2.5.0) + parallel +parser (2.3.1.0) + ast (~> 2.2) +powerpack (0.1.1) +rainbow (2.1.0) +require_all (1.3.3) +rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) +rspec-core (2.99.2) +rspec-expectations (2.99.2) + diff-lcs (>= 1.1.3, < 2.0) +rubocop (0.40.0) + parser (>=
[MediaWiki-commits] [Gerrit] In group pages, replace subtitle with link to main page - change (mediawiki...CentralAuth)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/289989 Change subject: In group pages, replace subtitle with link to main page .. In group pages, replace subtitle with link to main page These subtitles aren't very helpful because the user would already know whether the user has read-only permissions or write permissions by looking at the interface. Since we don't currently have a link to the main page, replace these with a link to Special:GlobalGroupPermissions main page, which, IMO, is better. Change-Id: I956ef5f1935f2a3a7fab7ba8023f7a191142f48f --- M i18n/en.json M i18n/qqq.json M includes/specials/SpecialGlobalGroupPermissions.php 3 files changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/89/289989/1 diff --git a/i18n/en.json b/i18n/en.json index 41c887b..2dcaa1f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -280,8 +280,6 @@ "centralauth-newgroup-intro": "You can use this form to assign permissions to a new group.\nNote that a group does not exist unless it has permissions assigned to it.", "centralauth-globalgroupperms-newgroupname": "New group name:", "centralauth-globalgroupperms-creategroup-submit": "Assign permissions", - "centralauth-editgroup-subtitle": "Editing $1", - "centralauth-editgroup-subtitle-readonly": "View $1", "centralauth-editgroup-fieldset": "Permissions for $1", "centralauth-editgroup-name": "Name of group:", "centralauth-editgroup-display": "Localised name of group:", diff --git a/i18n/qqq.json b/i18n/qqq.json index 5c7a7d4..e029a1b 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -296,8 +296,6 @@ "centralauth-newgroup-intro": "Used as intro text.\n\nPreceded by the fieldset label {{msg-mw|Centralauth-newgroup-legend}}.\n\nFollowed by the following messages:\n* {{msg-mw|Centralauth-globalgroupperms-newgroupname}}\n* {{msg-mw|Centralauth-globalgroupperms-creategroup-submit}}", "centralauth-globalgroupperms-newgroupname": "I think this needs to be translated as \"Name of the new group\", not as \"New name of the group\". – [[User:McDutchie|McDutchie]] 16:40, 20 July 2008 (UTC)", "centralauth-globalgroupperms-creategroup-submit": "Used as label for the Submit button.\n\nPreceded by {{msg-mw|Centralauth-globalgroupperms-newgroupname}} and inputbox.", - "centralauth-editgroup-subtitle": "Subtitle for Special:GlobalGroupPernissions for users who may edit these permission.\n\nParameters:\n* $1 - Name of the group\n{{Identical|Editing}}", - "centralauth-editgroup-subtitle-readonly": "Subtitle for Special:GlobalGroupPermissions for users without edit right.\nParameters:\n* $1 - Name of the group", "centralauth-editgroup-fieldset": "Used as fieldset label. Parameters:\n* $1 - group name", "centralauth-editgroup-name": "Used as label for \"Global group name\" input box.", "centralauth-editgroup-display": "This is a label for a localised group name.", diff --git a/includes/specials/SpecialGlobalGroupPermissions.php b/includes/specials/SpecialGlobalGroupPermissions.php index 1c95abc..b002e7f 100644 --- a/includes/specials/SpecialGlobalGroupPermissions.php +++ b/includes/specials/SpecialGlobalGroupPermissions.php @@ -212,8 +212,7 @@ function buildGroupView( $group ) { $editable = $this->userCanEdit( $this->getUser() ); - $subtitleMessage = $editable ? 'centralauth-editgroup-subtitle' : 'centralauth-editgroup-subtitle-readonly'; - $this->getOutput()->setSubtitle( $this->msg( $subtitleMessage, $group ) ); + $this->getOutput()->addBacklinkSubtitle( $this->getPageTitle() ); $fieldsetClass = $editable ? 'mw-centralauth-editgroup' : 'mw-centralauth-editgroup-readonly'; $html = Xml::fieldset( $this->msg( 'centralauth-editgroup-fieldset', $group )->text(), false, array( 'class' => $fieldsetClass ) ); -- To view, visit https://gerrit.wikimedia.org/r/289989 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I956ef5f1935f2a3a7fab7ba8023f7a191142f48f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CentralAuth Gerrit-Branch: master Gerrit-Owner: Glaisher ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:GlobalGroupPermissions: Show table with global group... - change (mediawiki...CentralAuth)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/289988 Change subject: Special:GlobalGroupPermissions: Show table with global groups information instead of a list .. Special:GlobalGroupPermissions: Show table with global groups information instead of a list Currently this page has just a list of the defined global groups with links to the group pages. As the group specific pages are not very user friendly for only viewing information, this patch replaces the list with a table. This table allows to easily view which user rights are assigned to the group and the wikiset to which the group belongs to. It also indicates whether the group is disabled on the wiki. Additionally, it now links to the group description wikipage and list of members in addition to the management page for each group. Bug: T135452 Change-Id: Ic003b91b7237c86ebca7befbe23a6516fee07fb6 --- M i18n/en.json M i18n/qqq.json M includes/specials/SpecialGlobalGroupPermissions.php M modules/ext.centralauth.globalgrouppermissions.css 4 files changed, 156 insertions(+), 34 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth refs/changes/88/289988/1 diff --git a/i18n/en.json b/i18n/en.json index 5053888..41c887b 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -267,10 +267,15 @@ "centralauth-centralautologin-logged-in-nouser": "You are centrally logged in. Reload the page to apply your user settings.", "globalgroupmembership": "Membership in global groups", "globalgrouppermissions": "Global group management", - "centralauth-globalgroupperms-grouplist": "The following global groups have been configured.\nYou may view or edit the permissions assigned to a group, if you have permission to.\nA group may be deleted by removing all rights from it.", - "centralauth-globalgroupperms-grouplistitem": "$1 ([[Special:GlobalGroupPermissions/$2|view/edit]])", "centralauth-globalgroupperms-nogroups": "No global groups are defined.", - "centralauth-existinggroup-legend": "Existing groups", + "centralauth-globalgroupperms-group": "Group", + "centralauth-globalgroupperms-rights": "Rights", + "centralauth-globalgroupperms-management": "management", + "centralauth-globalgroupperms-group-listmembers": "list of members", + "centralauth-globalgroupperms-group-wikiset": "Set of wikis where this group is active: $1", + "centralauth-globalgroupperms-wikiset-none": "This group is active on all wikis.", + "centralauth-globalgroupperms-group-disabled": "(not enabled on this wiki)", + "centralauth-globalgroupperms-groups-intro": "This is a list of all global user groups configured on this wiki farm, with their associated user access rights and wikisets. Users with the permissions may delete a group by removing all rights from it.", "centralauth-newgroup-legend": "Create a new group", "centralauth-newgroup-intro": "You can use this form to assign permissions to a new group.\nNote that a group does not exist unless it has permissions assigned to it.", "centralauth-globalgroupperms-newgroupname": "New group name:", diff --git a/i18n/qqq.json b/i18n/qqq.json index e0069ba..5c7a7d4 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -283,10 +283,15 @@ "centralauth-centralautologin-logged-in-nouser": "See also:\n* {{msg-mw|Centralauth-centralautologin-logged-in}}", "globalgroupmembership": "{{doc-special|GlobalGroupMembership}}", "globalgrouppermissions": "{{doc-special|GlobalGroupPermissions}}\nSee example: [[w:Special:GlobalGroupPermissions]] and [[w:Special:SpecialPages]]", - "centralauth-globalgroupperms-grouplist": "Preceded by fieldset label {{msg-mw|Centralauth-existinggroup-legend}}.\n\nFollowed by list items {{msg-mw|Centralauth-globalgroupperms-grouplistitem}}.", - "centralauth-globalgroupperms-grouplistitem": "\"view/edit\" is link text which enables to view or edit the group.\n\nParameters:\n* $1 - group name (localized) - e.g. {{msg-mw|group-editor}}, {{msg-mw|group-sysop}}\n* $2 - group name", - "centralauth-globalgroupperms-nogroups": "Preceded by the fieldset label {{msg-mw|Centralauth-existinggroup-legend}}.\n\nSee also:\n* {{msg-mw|Centralauth-globalgroupperms-grouplist}}", - "centralauth-existinggroup-legend": "Used as fieldset label.\n\nFollowed by any one of the following messages:\n* {{msg-mw|Centralauth-globalgroupperms-grouplist}}\n* {{msg-mw|Centralauth-globalgroupperms-nogroups}}", + "centralauth-globalgroupperms-nogroups": "Message shown on Special:GlobalGroupPermissions when there is no existing global groups.", + "centralauth-globalgroupperms-group": "Message used on column header at the table on Special:GlobalGroupPermissions. See also {{msg-mw|centralauth-globalgroupperms-rights}}", + "centrala
[MediaWiki-commits] [Gerrit] High priority + trivial: Fix Cencosud bank code - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: High priority + trivial: Fix Cencosud bank code .. High priority + trivial: Fix Cencosud bank code We had the same code for two cards, and as a result we're telling people with a Tarjeta Shopping and a Cencosud card that their donation failed when it actually went through. Change-Id: I76fbb2998bba61b3060f07ba1fe22d9e7a66c2d4 --- M astropay_gateway/config/payment_submethods.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Awight: Looks good to me, approved jenkins-bot: Verified diff --git a/astropay_gateway/config/payment_submethods.yaml b/astropay_gateway/config/payment_submethods.yaml index cfe0cde..7589be8 100644 --- a/astropay_gateway/config/payment_submethods.yaml +++ b/astropay_gateway/config/payment_submethods.yaml @@ -112,7 +112,7 @@ AR: true logo: card-nativa.png cencosud: -bank_code: TS +bank_code: CS label: Cencosud group: cc countries: -- To view, visit https://gerrit.wikimedia.org/r/289987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76fbb2998bba61b3060f07ba1fe22d9e7a66c2d4 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Ejegg Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: Awight Gerrit-Reviewer: Cdentinger Gerrit-Reviewer: Ssmith Gerrit-Reviewer: XenoRyet Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits