[MediaWiki-commits] [Gerrit] Add search support for proofread mode - change (mediawiki...Translate)
Santhosh has submitted this change and it was merged.
Change subject: Add search support for proofread mode
..
Add search support for proofread mode
Change-Id: I60606bc3676210f40df89abe93064af70fc33485
---
M resources/js/ext.translate.messagetable.js
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Santhosh: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index fac3c1a..1dfbe53 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -225,9 +225,13 @@
search: function ( query ) {
var resultCount = 0,
$result,
- matcher = new RegExp( '\\b' + escapeRegex(
query ), 'i' );
+ matcher = new RegExp( '\\b' + escapeRegex(
query ), 'i' ),
+ itemsClass = {
+ proofread: '.tux-message-proofread',
+ translate: '.tux-message'
+ };
- this.$container.find( '.tux-message' ).each( function
() {
+ this.$container.find( itemsClass[ this.mode ] ).each(
function () {
var $message = $( this ),
message = $message.data( 'message' );
--
To view, visit https://gerrit.wikimedia.org/r/51348
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60606bc3676210f40df89abe93064af70fc33485
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Siebrand siebr...@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 Dutch namespace names - change (mediawiki...Scribunto)
jenkins-bot has submitted this change and it was merged. Change subject: Add Dutch namespace names .. Add Dutch namespace names Also add a standard header. Change-Id: Ib2bc381e859ef527e03da9680a462755bcc35a4d --- M Scribunto.namespaces.php 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index 4c67f99..5104def 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -1,4 +1,10 @@ ?php +/** + * Internationalisation file for extension Scribunto. + * + * @file + * @ingroup Extensions + */ $namespaceNames = array(); @@ -22,6 +28,11 @@ 829 = 'שיחת_יחידה', ); +$namespaceNames['nl'] = array( + 828 = 'Module', + 829 = 'Overleg_module', +); + $namespaceNames['zh-hans'] = array( 828 = '模块', 829 = '模块讨论', -- To view, visit https://gerrit.wikimedia.org/r/51347 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2bc381e859ef527e03da9680a462755bcc35a4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Siebrand siebr...@wikimedia.org Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Liangent liang...@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] Whitespace cleanup for JSHint - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Whitespace cleanup for JSHint
..
Whitespace cleanup for JSHint
Change-Id: I5301f228dd482ec7755322b590d84b9cf2631358
---
M resources/js/ext.translate.messagetable.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index fac3c1a..952ab41 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -127,9 +127,9 @@
status = message.properties.status;
statusClass = 'tux-status-' + status;
- if ( message.tags.length
-$.inArray( 'optional', message.tags ) = 0
-status === 'untranslated'
+ if ( message.tags.length
+ $.inArray( 'optional', message.tags ) = 0
+ status === 'untranslated'
) {
status = 'optional';
statusClass = 'tux-status-optional';
@@ -366,7 +366,7 @@
switchMode: function ( mode ) {
var messageTable = this;
- messageTable.$actionBar.find( '.down').removeClass(
'down' );
+ messageTable.$actionBar.find( '.down' ).removeClass(
'down' );
if ( mode === 'translate' ) {
messageTable.$actionBar.find(
'.translate-mode-button' ).addClass( 'down' );
}
--
To view, visit https://gerrit.wikimedia.org/r/51349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5301f228dd482ec7755322b590d84b9cf2631358
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] Entity selector: Option to emulate search box behavior - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51350
Change subject: Entity selector: Option to emulate search box behavior
..
Entity selector: Option to emulate search box behavior
This change set adds a option named emulateSearch to the entity selector.
Setting
this option to true links the entity selector's suggestions to the actual
entity
pages. Another change set will enable entering random text in the input box.
Change-Id: If17dd8bd50af5fce096c07f3232eb5612c76167d
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
M repo/resources/wikibase.ui.entitysearch.js
2 files changed, 34 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/50/51350/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 802cbc3..6f5c4a7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -111,7 +111,8 @@
messages: {
'aliases-label': mwMsgOrString(
'wikibase-aliases-label', 'also known as:' ),
'more': mwMsgOrString(
'wikibase-entityselector-more', 'more' )
- }
+ },
+ emulateSearch: false
},
/**
@@ -186,6 +187,16 @@
// when pressing enter, check if the current
input matches any of the suggested item
// and select it
if ( event.keyCode === $.ui.keyCode.ENTER ) {
+
+ if ( self.options.emulateSearch
self.selectedEntity() ) {
+ // Prevent submitting search
form since we want to redirect directly to the
+ // entity.
+
event.stopImmediatePropagation();
+ event.preventDefault();
+ window.location.href =
self.selectedEntity().url;
+ return;
+ }
+
if ( self.validateInput() ) {
self.menu.select( $.Event(
'programmatic' ) );
}
@@ -210,10 +221,15 @@
// value but blur event will not trigger a redundant
selected event since the entity
// is set already.
this.menu.element.on( 'mousedown.' + this.widgetName,
function( event ) {
- if ( $( event.target ).closest( '.ui-menu-item'
).length ) {
+ if ( $( event.target ).closest(
'.ui-menu-item:not( .ui-suggester-custom )' ).length ) {
var item =
$( event.target ).closest(
'.ui-menu-item' ).data( 'item.autocomplete' );
self._setEntity( item );
+
+ if ( self.options.emulateSearch ) {
+ window.location.href = item.url;
+ }
+
}
} );
@@ -451,10 +467,15 @@
this.menu.element.show();
}
} else {
- this._hiddenInput( '' );
this._setEntity( null );
+ if ( this.options.emulateSearch ) {
+ this._hiddenInput(
this.element.val() );
+ }
}
return true;
+ }
+ if ( this.options.emulateSearch ) {
+ this._hiddenInput( this.element.val() );
}
return false;
},
@@ -483,6 +504,10 @@
)
),
$section = $( 'li/' ).data(
'item.autocomplete', item ).append( $link );
+
+ if ( this.options.emulateSearch ) {
+ $link.attr( 'href', item.url );
+ }
if ( item.description !== undefined ) {
$section.find(
[MediaWiki-commits] [Gerrit] Entity search: Allow random text input in entity selector - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51351
Change subject: Entity search: Allow random text input in entity selector
..
Entity search: Allow random text input in entity selector
With this change set, the text typed into the entity selector search box will
not get lost when triggering a full-text search (when entering text that does
not match an entity).
Change-Id: Ie27da6cf8f7f2294a228f6357dc85e2fdafa5c23
---
M repo/resources/wikibase.ui.entitysearch.js
1 file changed, 35 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/51/51351/1
diff --git a/repo/resources/wikibase.ui.entitysearch.js
b/repo/resources/wikibase.ui.entitysearch.js
index ca56e69..2858e0d 100644
--- a/repo/resources/wikibase.ui.entitysearch.js
+++ b/repo/resources/wikibase.ui.entitysearch.js
@@ -12,6 +12,8 @@
'use strict';
$( document ).ready( function() {
+ var $form = $( '#searchform ' ),
+ $input = $( '#searchInput' );
/**
* Removes the native search box suggestion list.
@@ -24,7 +26,7 @@
$.removeData( input, 'suggestionsContext' );
}
- $( '#searchInput' )
+ $input
.one( 'focus', function( event ) {
if ( $.data( this, 'suggestionsContext' ) ) {
removeSuggestionContext( this );
@@ -46,6 +48,38 @@
emulateSearch: true
} );
+ // TODO: Re-evaluate entity selector input (e.g. hitting Go
after having hit Search
+ // before. However, this will require triggering the entity
selector's API call and waiting
+ // for its response.
+
+ $( '#searchGoButton' ).on( 'click keydown', function( event ) {
+ if ( !$input.data( 'entityselector' ) ) {
+ return;
+ }
+
+ // If an entity is selected, redirect to that entity's
page.
+ if (
+ event.type === 'click'
+ || event.keyCode === $.ui.keyCode.ENTER ||
event.keyCode === $.ui.keyCode.SPACE
+ ) {
+ var entity = $input.data( 'entityselector'
).selectedEntity();
+ if ( entity entity.url ){
+ event.preventDefault(); // Prevent
default form sumit action.
+ window.location.href = entity.url;
+ }
+ }
+
+ } );
+
+ // Default form submit action: Imitate full-text search.
+ // Since we are using the entity selector, if an entity is
selected, the entity id is stored
+ // in a hidden input element (which has ripped the name
attribute from the original search
+ // box). Therefore, the entity id needs to be replaced by the
actual search box (entity
+ // selector) content.
+ $form.on( 'submit', function( event ) {
+ $( this ).find( 'input[name=search]' ).val(
$input.val() );
+ } );
+
} );
}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/51351
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie27da6cf8f7f2294a228f6357dc85e2fdafa5c23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow insert from helper language - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51352
Change subject: Allow insert from helper language
..
Allow insert from helper language
Change-Id: Ic950baf9b31e660d696ffa0f8ba287af3892db05
---
M resources/js/ext.translate.editor.helpers.js
1 file changed, 34 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/52/51352/1
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index 1f74da7..9b59c28 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -181,7 +181,10 @@
* @param {array} translations An inotherlanguages array as
returned by the translation helpers API.
*/
showAssistantLanguages: function ( translations ) {
- var translateEditor = this;
+ var translateEditor = this,
+ $translationTextarea;
+
+ $translationTextarea = this.$editor.find( 'textarea' );
$.each( translations, function ( index ) {
var $otherLanguage,
@@ -194,20 +197,37 @@
.addClass( 'row in-other-language' )
.append(
$( 'div' )
- .addClass( 'nine
columns' )
- .attr( {
- lang:
translation.language,
- dir:
translationDir
- } )
- .text(
translation.value ),
+ .addClass( 'row
in-other-language-top' )
+ .append(
+ $( 'div' )
+ .addClass(
'nine columns' )
+ .attr( {
+ lang:
translation.language,
+ dir:
translationDir
+ } )
+ .text(
translation.value ),
+ $( 'div' )
+ .addClass(
'three columns language text-right' )
+ .attr( {
+ lang:
translation.language,
+ dir:
translationDir
+ } )
+ .text(
$.uls.data.getAutonym( translation.language ) )
+ ),
$( 'div' )
- .addClass( 'three
columns language text-right' )
- .attr( {
- lang:
translation.language,
- dir:
translationDir
- } )
- .text(
$.uls.data.getAutonym( translation.language ) )
- );
+ .addClass( 'row
in-other-language-bottom' )
+ .append(
+ $( 'a' )
+ .addClass(
'nine columns use-this-translation' )
+ .text( mw.msg(
'tux-editor-use-this-translation' ) )
+ .on( 'click',
function () {
+
$translationTextarea
+
.val( translation.value )
+
.focus()
+
.trigger( 'input' );
+
[MediaWiki-commits] [Gerrit] Unbreak group selector in old interface - change (mediawiki...Translate)
Santhosh has uploaded a new change for review. https://gerrit.wikimedia.org/r/51353 Change subject: Unbreak group selector in old interface .. Unbreak group selector in old interface Change-Id: I24557a1bc46ff8f5c6f489ccfd7e19830ff9ed5f --- M resources/js/ext.translate.special.translate.js 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/53/51353/1 diff --git a/resources/js/ext.translate.special.translate.js b/resources/js/ext.translate.special.translate.js index e427405..088c622 100644 --- a/resources/js/ext.translate.special.translate.js +++ b/resources/js/ext.translate.special.translate.js @@ -295,7 +295,8 @@ } ); } - targetLanguage = $messageList.data( 'targetlangcode' ); + targetLanguage = $messageList.data( 'targetlangcode' ) // for tux=1 + || mw.config.get( 'wgUserLanguage' ); // for tux=0 ourWindowOnBeforeUnloadRegister(); prepareWorkflowSelector(); -- To view, visit https://gerrit.wikimedia.org/r/51353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I24557a1bc46ff8f5c6f489ccfd7e19830ff9ed5f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Convert translationreview logs to LogFormatter - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51354
Change subject: Convert translationreview logs to LogFormatter
..
Convert translationreview logs to LogFormatter
Change-Id: I09be2d49e5cf200ebecb55a70108a455beddcbe2
---
M Translate.i18n.php
M Translate.php
M TranslateHooks.php
M _autoload.php
M api/ApiGroupReview.php
M api/ApiTranslationReview.php
A utils/TranslateLogFormatter.php
7 files changed, 109 insertions(+), 71 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/54/51354/1
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 30a9c79..d4f0d8a 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -389,7 +389,7 @@
'log-name-translationreview' = 'Translation review log',
'log-description-translationreview' = 'Log of all reviews to
translations and message groups.',
'logentry-translationreview-message' = '$1 {{GENDER:$2|accepted}}
translation $3',
- 'logentry-groupreview-message' = '$1 {{GENDER:$2|changed}} the state
of $4 translations of message group $3 from $5 to $6',
+ 'logentry-translationreview-group' = '$1 {{GENDER:$2|changed}} the
state of $4 translations of $3 from $6 to $7',
// The actual states, when set, come after the hyphen.
// The dangling hyphen hints that it's unset.
@@ -861,11 +861,12 @@
'group-translate-proofr.js' = '{{doc-group|translate-proofr|js}}',
'log-name-translationreview' = '{{doc-logpage}}',
'logentry-translationreview-message' = '{{Logentry}}',
- 'logentry-groupreview-message' = '{{Logentry}}
+ 'logentry-translationreview-group' = '{{Logentry}}
Additional parameters:
-* $4 - Localised language name (with language code in parentheses)
-* $5 - Previous workflow state
-* $6 - New workflow state',
+* $4 - Localised language name
+* $5 - Label of the message group (unused)
+* $6 - Previous workflow state
+* $7 - New workflow state',
'translate-workflow-state-' = 'Unselectable select option in
[[Special:Translate]] if workflow state editing is on. The dangling hyphen in
the message key hints that this state is unset; the actual states have the same
key with something after the hyphen.',
'translate-workflowstatus' = 'In [[Special:Translate]] if workflow
states are in use, $1 is selector or the current state.
{{Identical|Status}}',
diff --git a/Translate.php b/Translate.php
index a65e56f..c6cd203 100644
--- a/Translate.php
+++ b/Translate.php
@@ -190,10 +190,10 @@
$wgGroupPermissions['translate-proofr']['translate-messagereview'] = true;
$wgAddGroups['translate-proofr'] = array( 'translate-proofr' );
-// Logs
+// Logs. More logs are defined in TranslateHooks::setupTranslate
$wgLogTypes[] = 'translationreview';
-$wgLogActionsHandlers['translationreview/message'] =
'TranslateHooks::formatTranslationreviewLogEntry';
-$wgLogActionsHandlers['translationreview/group'] =
'TranslateHooks::formatTranslationreviewLogEntry';
+$wgLogActionsHandlers['translationreview/message'] = 'TranslateLogFormatter';
+$wgLogActionsHandlers['translationreview/group'] = 'TranslateLogFormatter';
// New jobs
$wgJobClasses['MessageIndexRebuildJob'] = 'MessageIndexRebuildJob';
diff --git a/TranslateHooks.php b/TranslateHooks.php
index eeb5498..f221a3c 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -326,52 +326,6 @@
return true;
}
- /// Log action handler
- public static function formatTranslationreviewLogEntry( $type, $action,
Title $title, $forUI, $params ) {
- global $wgLang, $wgContLang;
-
- $language = $forUI === null ? $wgContLang : $wgLang;
-
- if ( $action === 'message' ) {
- $link = $forUI ?
- Linker::link( $title, null, array(), array(
'oldid' = $params[0] ) ) :
- $title-getPrefixedText();
- return wfMessage( 'logentry-translationreview-message'
)-params(
- '', // User link in the new system
- '#', // User name for gender in the new system
- Message::rawParam( $link )
- )-inLanguage( $language )-text();
- }
-
- if ( $action === 'group' ) {
- $languageCode = $params[0];
- $languageNames = Language::getTranslatedLanguageNames(
$language-getCode() );
- $languageName = $languageNames[$languageCode]
($languageCode);
- $groupLabel = $params[1];
- $oldState = $params[2];
- $newState = $params[3];
- $oldStateMessage = wfMessage(
translate-workflow-state-$oldState );
- $newStateMessage = wfMessage(
[MediaWiki-commits] [Gerrit] Allow insert from helper language - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Allow insert from helper language
..
Allow insert from helper language
Change-Id: Ic950baf9b31e660d696ffa0f8ba287af3892db05
---
M resources/js/ext.translate.editor.helpers.js
1 file changed, 34 insertions(+), 14 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index 1f74da7..9b59c28 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -181,7 +181,10 @@
* @param {array} translations An inotherlanguages array as
returned by the translation helpers API.
*/
showAssistantLanguages: function ( translations ) {
- var translateEditor = this;
+ var translateEditor = this,
+ $translationTextarea;
+
+ $translationTextarea = this.$editor.find( 'textarea' );
$.each( translations, function ( index ) {
var $otherLanguage,
@@ -194,20 +197,37 @@
.addClass( 'row in-other-language' )
.append(
$( 'div' )
- .addClass( 'nine
columns' )
- .attr( {
- lang:
translation.language,
- dir:
translationDir
- } )
- .text(
translation.value ),
+ .addClass( 'row
in-other-language-top' )
+ .append(
+ $( 'div' )
+ .addClass(
'nine columns' )
+ .attr( {
+ lang:
translation.language,
+ dir:
translationDir
+ } )
+ .text(
translation.value ),
+ $( 'div' )
+ .addClass(
'three columns language text-right' )
+ .attr( {
+ lang:
translation.language,
+ dir:
translationDir
+ } )
+ .text(
$.uls.data.getAutonym( translation.language ) )
+ ),
$( 'div' )
- .addClass( 'three
columns language text-right' )
- .attr( {
- lang:
translation.language,
- dir:
translationDir
- } )
- .text(
$.uls.data.getAutonym( translation.language ) )
- );
+ .addClass( 'row
in-other-language-bottom' )
+ .append(
+ $( 'a' )
+ .addClass(
'nine columns use-this-translation' )
+ .text( mw.msg(
'tux-editor-use-this-translation' ) )
+ .on( 'click',
function () {
+
$translationTextarea
+
.val( translation.value )
+
.focus()
+
.trigger( 'input' );
+ } )
+
[MediaWiki-commits] [Gerrit] Unbreak group selector in old interface - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged. Change subject: Unbreak group selector in old interface .. Unbreak group selector in old interface Change-Id: I24557a1bc46ff8f5c6f489ccfd7e19830ff9ed5f --- M resources/js/ext.translate.special.translate.js 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/js/ext.translate.special.translate.js b/resources/js/ext.translate.special.translate.js index e427405..088c622 100644 --- a/resources/js/ext.translate.special.translate.js +++ b/resources/js/ext.translate.special.translate.js @@ -295,7 +295,8 @@ } ); } - targetLanguage = $messageList.data( 'targetlangcode' ); + targetLanguage = $messageList.data( 'targetlangcode' ) // for tux=1 + || mw.config.get( 'wgUserLanguage' ); // for tux=0 ourWindowOnBeforeUnloadRegister(); prepareWorkflowSelector(); -- To view, visit https://gerrit.wikimedia.org/r/51353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I24557a1bc46ff8f5c6f489ccfd7e19830ff9ed5f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il 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] (bug 44095) enhanced claim diff visualizaion including refs - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (bug 44095) enhanced claim diff visualizaion including refs
..
(bug 44095) enhanced claim diff visualizaion including refs
- still todo: qualifiers, ranks.
squashed:
(bug 44095) visualize claim differences
This commit is a follow up to 5fc812442e19d55a7d1c2072ba8a839ce7d1f067.
It tackles some design issues and adds tests, while removing the
preliminary visualization code, which needs to be re-added.
Change-Id: I7f8645df860b1860b4016003f52e7959af685a25
---
M lib/WikibaseLib.hooks.php
M lib/WikibaseLib.i18n.php
M lib/WikibaseLib.php
M lib/includes/DiffView.php
A lib/includes/claim/ClaimDiffer.php
A lib/includes/claim/ClaimDifference.php
A lib/includes/claim/ClaimDifferenceVisualizer.php
D lib/includes/entity/EntityDiffView.php
A lib/includes/entity/EntityDiffVisualizer.php
A lib/tests/phpunit/claim/ClaimDifferTest.php
A lib/tests/phpunit/claim/ClaimDifferenceTest.php
A lib/tests/phpunit/claim/ClaimDifferenceVisualizerTest.php
M repo/includes/EntityContentDiffView.php
M repo/includes/actions/EditEntityAction.php
14 files changed, 768 insertions(+), 197 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index 7487c4d..b1c6cfd 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -33,6 +33,9 @@
'changes/EntityChange',
'claim/ClaimAggregate',
+ 'claim/ClaimDifference',
+ 'claim/ClaimDifferenceVisualizer',
+ 'claim/ClaimDiffer',
'claim/ClaimListAccess',
'claim/Claims',
'claim/Claim',
diff --git a/lib/WikibaseLib.i18n.php b/lib/WikibaseLib.i18n.php
index 4dc468b..6f3d31d 100644
--- a/lib/WikibaseLib.i18n.php
+++ b/lib/WikibaseLib.i18n.php
@@ -21,6 +21,9 @@
'wikibase-entity-item' = 'item',
'wikibase-entity-property' = 'property',
'wikibase-entity-query' = 'query',
+ 'wikibase-diffview-reference' = 'reference',
+ 'wikibase-diffview-rank' = 'rank',
+ 'wikibase-diffview-qualifier' = 'qualifier',
'wikibase-error-unexpected' = 'An unexpected error occurred.',
'wikibase-error-save-generic' = 'An error occurred while trying to
perform save and because of this, your changes could not be completed.',
'wikibase-error-remove-generic' = 'An error occurred while trying to
perform remove and because of this, your changes could not be completed.',
@@ -63,6 +66,9 @@
{{Identical|Property}}',
'wikibase-entity-query' = 'How we refer to entities of type query. See
also Wikidatas glossary on [[m:Wikidata/Glossary#entity|entity]].
{{Identical|Query}}',
+ 'wikibase-diffview-reference' = 'Label within the header of a
diff-operation on the entity diff view to describe that the diff-operation
affects a reference. Will be shown as e.g. claim / property q1 / referenece.',
+ 'wikibase-diffview-rank' = 'Label within the header of a
diff-operation on the entity diff view to describe that the diff-operation
affects the rank of the statement. Will be shown as e.g. claim / property q1 /
rank.',
+ 'wikibase-diffview-qualifier' = 'Label within the header of a
diff-operation on the entity diff view to describe that the diff-operation
affects a qualifier. Will be shown as e.g. claim / property q1 / qualifier.',
'wikibase-error-unexpected' = 'Error message that is used as a
fallback message if no other message can be assigned to the error that
occurred. This error message being displayed should never happen. However,
there may be unexpected errors not covered by the implemented error
handling.',
'wikibase-error-save-generic' = 'Generic error message for an error
happening during a save operation.',
'wikibase-error-remove-generic' = 'Generic error message for an error
happening during a remove operation',
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 0a9987f..f0e5545 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -129,6 +129,9 @@
// includes/claims
$wgAutoloadClasses['Wikibase\Claim'] = $dir .
'includes/claim/Claim.php';
$wgAutoloadClasses['Wikibase\ClaimAggregate'] = $dir .
'includes/claim/ClaimAggregate.php';
+$wgAutoloadClasses['Wikibase\ClaimDiffer'] = $dir .
'includes/claim/ClaimDiffer.php';
+$wgAutoloadClasses['Wikibase\ClaimDifference'] = $dir .
'includes/claim/ClaimDifference.php';
+$wgAutoloadClasses['Wikibase\ClaimDifferenceVisualizer'] = $dir .
'includes/claim/ClaimDifferenceVisualizer.php';
$wgAutoloadClasses['Wikibase\ClaimListAccess'] = $dir .
'includes/claim/ClaimListAccess.php';
$wgAutoloadClasses['Wikibase\Claims']
[MediaWiki-commits] [Gerrit] Simple diff visualization - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Simple diff visualization
..
Simple diff visualization
- todo: make sure all cases are covered, such as reference change
- further design improvements
- tests
- there's opportunity for DiffView and other places to share code
Change-Id: I4459f274b092a4c0aa707af8bafd175775b2c51e
---
M lib/WikibaseLib.php
A lib/includes/DiffOpValueFormatter.php
M lib/includes/claim/ClaimDifferenceVisualizer.php
M lib/includes/entity/EntityDiffVisualizer.php
M repo/includes/EntityContentDiffView.php
M repo/includes/actions/EditEntityAction.php
6 files changed, 414 insertions(+), 25 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index f0e5545..2955626 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -99,6 +99,7 @@
$wgAutoloadClasses['Wikibase\ChangeNotifier'] = $dir .
'includes/ChangeNotifier.php';
$wgAutoloadClasses['Wikibase\ChangeNotificationJob'] = $dir .
'includes/ChangeNotificationJob.php';
$wgAutoloadClasses['Wikibase\ChangesTable']= $dir .
'includes/ChangesTable.php';
+$wgAutoloadClasses['Wikibase\DiffOpValueFormatter']= $dir .
'includes/DiffOpValueFormatter.php';
$wgAutoloadClasses['Wikibase\DiffView']= $dir
. 'includes/DiffView.php';
$wgAutoloadClasses['Wikibase\Lib\GuidGenerator'] = $dir .
'includes/GuidGenerator.php';
$wgAutoloadClasses['Wikibase\Lib\V4GuidGenerator'] = $dir .
'includes/GuidGenerator.php';
diff --git a/lib/includes/DiffOpValueFormatter.php
b/lib/includes/DiffOpValueFormatter.php
new file mode 100644
index 000..f1411e9
--- /dev/null
+++ b/lib/includes/DiffOpValueFormatter.php
@@ -0,0 +1,150 @@
+?php
+
+namespace Wikibase;
+
+use Html;
+use Diff;
+
+/**
+ * Class for generating HTML for Claim Diffs.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 0.4
+ *
+ * @file
+ * @ingroup WikibaseLib
+ *
+ * @licence GNU GPL v2+
+ * @author Tobias Gritschacher tobias.gritschac...@wikimedia.de
+ * @author Katie Filbert aude.w...@gmail.com
+ */
+class DiffOpValueFormatter {
+
+ protected $name;
+
+ protected $oldValue;
+
+ protected $newValue;
+
+ public function __construct( $name, $oldValue, $newValue ) {
+ $this-name = $name;
+ $this-oldValue = $oldValue;
+ $this-newValue = $newValue;
+ }
+
+ /**
+* Generates HTML for the header of the diff operation
+*
+* @since 0.4
+*
+* @return string
+*/
+ protected function generateHeaderHtml() {
+ $html = Html::openElement( 'tr' );
+ $html .= Html::rawElement( 'td', array( 'colspan'='2', 'class'
= 'diff-lineno' ), $this-name );
+ $html .= Html::rawElement( 'td', array( 'colspan'='2', 'class'
= 'diff-lineno' ), $this-name );
+ $html .= Html::closeElement( 'tr' );
+
+ return $html;
+ }
+
+ /**
+* Generates HTML for an change diffOp
+*
+* @since 0.4
+*
+* @return string
+*/
+ protected function generateChangeOpHtml() {
+ $html = Html::openElement( 'tr' );
+ $html .= Html::rawElement( 'td', array( 'class' =
'diff-marker' ), '-' );
+ $html .= Html::rawElement( 'td', array( 'class' =
'diff-deletedline' ),
+ Html::rawElement( 'div', array(),
+ Html::rawElement( 'del', array( 'class' =
'diffchange diffchange-inline' ),
+ $this-oldValue ) ) );
+ $html .= Html::rawElement( 'td', array( 'class' =
'diff-marker' ), '+' );
+ $html .= Html::rawElement( 'td', array( 'class' =
'diff-addedline' ),
+ Html::rawElement( 'div', array(),
+ Html::rawElement( 'ins', array( 'class' =
'diffchange diffchange-inline' ),
+ $this-newValue ) ) );
+ $html .=
[MediaWiki-commits] [Gerrit] Further work on claim diff visualization - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Further work on claim diff visualization
..
Further work on claim diff visualization
Change-Id: Iefb28bb70af3380e820ae1e3955e89f95e901383
---
M lib/includes/DiffOpValueFormatter.php
M lib/includes/DiffView.php
M lib/includes/claim/ClaimDifferenceVisualizer.php
M lib/includes/entity/EntityDiffVisualizer.php
M lib/tests/phpunit/claim/ClaimDifferenceVisualizerTest.php
5 files changed, 241 insertions(+), 116 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/includes/DiffOpValueFormatter.php
b/lib/includes/DiffOpValueFormatter.php
index f1411e9..1b6cd62 100644
--- a/lib/includes/DiffOpValueFormatter.php
+++ b/lib/includes/DiffOpValueFormatter.php
@@ -6,7 +6,7 @@
use Diff;
/**
- * Class for generating HTML for Claim Diffs.
+ * Class for formatting diffs, @todo might be renamed or something
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,12 +34,36 @@
*/
class DiffOpValueFormatter {
+ /**
+* @since 0.4
+*
+* @var string
+*/
protected $name;
+ /**
+* @since 0.4
+*
+* @var string
+*/
protected $oldValue;
+ /**
+* @since 0.4
+*
+* @var string
+*/
protected $newValue;
+ /**
+* Constructor.
+*
+* @since 0.4
+*
+* @param string $name
+* @param string $oldValue
+* @param string $newValue
+*/
public function __construct( $name, $oldValue, $newValue ) {
$this-name = $name;
$this-oldValue = $oldValue;
@@ -54,9 +78,12 @@
* @return string
*/
protected function generateHeaderHtml() {
+ $oldHeader = is_string( $this-oldValue ) ? $this-name : '';
+ $newHeader = is_string( $this-newValue ) ? $this-name : '';
+
$html = Html::openElement( 'tr' );
- $html .= Html::rawElement( 'td', array( 'colspan'='2', 'class'
= 'diff-lineno' ), $this-name );
- $html .= Html::rawElement( 'td', array( 'colspan'='2', 'class'
= 'diff-lineno' ), $this-name );
+ $html .= Html::element( 'td', array( 'colspan'='2', 'class' =
'diff-lineno' ), $oldHeader );
+ $html .= Html::element( 'td', array( 'colspan'='2', 'class' =
'diff-lineno' ), $newHeader );
$html .= Html::closeElement( 'tr' );
return $html;
@@ -74,12 +101,12 @@
$html .= Html::rawElement( 'td', array( 'class' =
'diff-marker' ), '-' );
$html .= Html::rawElement( 'td', array( 'class' =
'diff-deletedline' ),
Html::rawElement( 'div', array(),
- Html::rawElement( 'del', array( 'class' =
'diffchange diffchange-inline' ),
+ Html::element( 'del', array( 'class' =
'diffchange diffchange-inline' ),
$this-oldValue ) ) );
$html .= Html::rawElement( 'td', array( 'class' =
'diff-marker' ), '+' );
$html .= Html::rawElement( 'td', array( 'class' =
'diff-addedline' ),
Html::rawElement( 'div', array(),
- Html::rawElement( 'ins', array( 'class' =
'diffchange diffchange-inline' ),
+ Html::element( 'ins', array( 'class' =
'diffchange diffchange-inline' ),
$this-newValue ) ) );
$html .= Html::closeElement( 'tr' );
$html .= Html::closeElement( 'tr' );
@@ -100,7 +127,7 @@
$html .= Html::rawElement( 'td', array( 'class' =
'diff-marker' ), '+' );
$html .= Html::rawElement( 'td', array( 'class' =
'diff-addedline' ),
Html::rawElement( 'div', array(),
- Html::rawElement( 'ins', array( 'class' =
'diffchange diffchange-inline' ),
+ Html::element( 'ins', array( 'class' =
'diffchange diffchange-inline' ),
$this-newValue )
)
);
@@ -121,7 +148,7 @@
$html .= Html::rawElement( 'td', array( 'class' =
'diff-marker' ), '-' );
$html .= Html::rawElement( 'td', array( 'class' =
'diff-deletedline' ),
Html::rawElement( 'div', array(),
- Html::rawElement( 'del', array( 'class' =
'diffchange diffchange-inline' ),
+ Html::element( 'del', array( 'class' =
'diffchange diffchange-inline' ),
[MediaWiki-commits] [Gerrit] (bug 45547) Add the page view for a side-by-side translation - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51355
Change subject: (bug 45547) Add the page view for a side-by-side translation
..
(bug 45547) Add the page view for a side-by-side translation
Change-Id: I6a79be5599b7a3dc679baa81cad016b379016903
---
M Translate.i18n.php
M resources/css/ext.translate.messagetable.css
M resources/js/ext.translate.messagetable.js
M utils/TuxMessageTable.php
4 files changed, 74 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/55/51355/1
diff --git a/Translate.i18n.php b/Translate.i18n.php
index 30a9c79..dba9eef 100644
--- a/Translate.i18n.php
+++ b/Translate.i18n.php
@@ -465,6 +465,7 @@
'tux-editor-clear-translated' = 'Hide translated',
'tux-editor-proofreading-mode' = 'Proofread',
'tux-editor-translate-mode' = 'List',
+ 'tux-editor-page-mode' = 'Page',
'tux-editor-outdated-warning' = 'This translation may need to be
updated.',
'tux-editor-outdated-warning-diff-link' = 'Show differences',
'tux-editor-doc-editor-placeholder' = 'Message documentation',
@@ -953,6 +954,8 @@
'tux-editor-translate-mode' = 'Label for the button that appears at
the footer of the translation editor.
Pressing the button goes to the translation mode.
{{Identical|List}}',
+ 'tux-editor-page-mode' = 'Label for the button that appears at the
footer of the translation editor.
+Pressing the button goes to the page mode.',
'tux-editor-doc-editor-placeholder' = 'A placeholder that appears in
the message documentation editor.
{{Identical|Message documentation}}',
'tux-editor-doc-editor-save' = 'A button that saves the documentation
string',
diff --git a/resources/css/ext.translate.messagetable.css
b/resources/css/ext.translate.messagetable.css
index f1b073d..11a825c 100644
--- a/resources/css/ext.translate.messagetable.css
+++ b/resources/css/ext.translate.messagetable.css
@@ -203,7 +203,7 @@
.tux-action-bar .toggle.button {
height: 35px;
- width: 50%;
+ width: 30%;
font-size: 15px;
vertical-align: middle;
border-radius: 0;
@@ -237,6 +237,25 @@
background-image: linear-gradient(transparent, transparent),
url(../images/view-list-hi.svg);
}
+.tux-action-bar .page-mode-button:before {
+ content: ;
+ height: 15px;
+ width: 25px;
+ display: inline-block;
+ vertical-align: bottom;
+ background: transparent url(../images/view-page.png) center center
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-page.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-page.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-page.svg);
+}
+
+.tux-action-bar .page-mode-button.down:before {
+ background: transparent url(../images/view-list-hi.png) center center
no-repeat;
+ background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/view-page-hi.svg);
+ background-image: -moz-linear-gradient(transparent, transparent),
url(../images/view-page-hi.svg);
+ background-image: linear-gradient(transparent, transparent),
url(../images/view-page-hi.svg);
+}
+
.tux-action-bar .tux-proofread-button:before {
content: ;
height: 15px;
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index c4c..59cf6fe 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -53,7 +53,7 @@
this.$container = $( container );
this.options = options;
this.options = $.extend( {}, $.fn.messagetable.defaults,
options );
- // mode can be proofread or translate
+ // mode can be proofread, page or translate
this.mode = this.options.mode;
this.$loader = $( '.tux-messagetable-loader' );
this.$actionBar = $( '.tux-action-bar' );
@@ -98,6 +98,10 @@
this.$actionBar.find( 'button.translate-mode-button'
).on( 'click', function () {
messageTable.switchMode( 'translate' );
} );
+
+ this.$actionBar.find( 'button.page-mode-button' ).on(
'click', function () {
+ messageTable.switchMode( 'page' );
+ } );
},
add: function ( message ) {
@@ -106,6 +110,9 @@
}
if ( this.mode === 'proofread' ) {
this.addProofread( message );
+ }
+ if ( this.mode === 'page' ) {
+
[MediaWiki-commits] [Gerrit] Bug 43847 - mysql 5.5 / ansi sql incompatibility - change (mediawiki...ArticleFeedback)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/51356 Change subject: Bug 43847 - mysql 5.5 / ansi sql incompatibility .. Bug 43847 - mysql 5.5 / ansi sql incompatibility Change-Id: If28bba4d44eda708b4ebc7e25feaf6da37b8cb12 --- M api/ApiArticleFeedback.php 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedback refs/changes/56/51356/1 diff --git a/api/ApiArticleFeedback.php b/api/ApiArticleFeedback.php index 9967df0..40c0d69 100644 --- a/api/ApiArticleFeedback.php +++ b/api/ApiArticleFeedback.php @@ -142,8 +142,8 @@ $dbw-update( 'article_feedback_pages', array( - aap_total = GREATEST( aap_total + $updateAddition, 0 ), - 'aap_count = aap_count + ' . $this-getCountChange( $lastRating, $thisRating ), + aap_total = GREATEST( CAST( aap_total AS SIGNED) + $updateAddition, 0 ), + 'aap_count = GREATEST( CAST( aap_count AS SIGNED) + ' . $this-getCountChange( $lastRating, $thisRating ) . ', 0 )', ), array( 'aap_page_id' = $pageId, @@ -184,8 +184,8 @@ $dbw-update( 'article_feedback_revisions', array( - afr_total = GREATEST( afr_total + $updateAddition, 0 ), - 'afr_count = afr_count + ' . $this-getCountChange( $lastRating, $thisRating ), + afr_total = GREATEST( CAST( afr_total AS SIGNED ) + $updateAddition, 0 ), + 'afr_count = GREATEST( CAST( afr_count AS SIGNED ) + ' . $this-getCountChange( $lastRating, $thisRating ) .', 0 )', ), array( 'afr_page_id' = $pageId, -- To view, visit https://gerrit.wikimedia.org/r/51356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If28bba4d44eda708b4ebc7e25feaf6da37b8cb12 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedback Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45556) Show blue pencil mark for untranslated messages - change (mediawiki...Translate)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51357
Change subject: (bug 45556) Show blue pencil mark for untranslated messages
..
(bug 45556) Show blue pencil mark for untranslated messages
Change-Id: I6f50aa19b8507c9fee769e7fb8001be89a098fd0
---
M resources/css/ext.translate.proofread.css
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/57/51357/1
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index 9f9ef51..726785f 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -52,8 +52,7 @@
height: 40px;
}
-.tux-proofread-status.translated,
-.tux-proofread-status.proofread {
+.tux-proofread-status.untranslated {
/* @embed */
background: url(../images/translate.png) left center no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/translate.svg);
--
To view, visit https://gerrit.wikimedia.org/r/51357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f50aa19b8507c9fee769e7fb8001be89a098fd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added be-tarask NS translations - change (mediawiki...Scribunto)
Wizardist has uploaded a new change for review. https://gerrit.wikimedia.org/r/51358 Change subject: Added be-tarask NS translations .. Added be-tarask NS translations Change-Id: I7479e33655b1993c39a4761ff2e5366c45e23f26 --- M Scribunto.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/58/51358/1 diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index 5104def..142c96f 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -13,6 +13,11 @@ 829 = 'Module_talk', ); +$namespaceNames['be-tarask'] = array( + 828 = 'Модуль', + 829 = 'Абмеркаваньне_модулю', +); + $namespaceNames['de'] = array( 828 = 'Modul', 829 = 'Modul_Diskussion', -- To view, visit https://gerrit.wikimedia.org/r/51358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7479e33655b1993c39a4761ff2e5366c45e23f26 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Wizardist p.selits...@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] Adding $this = $( this ) where appropriate - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: Adding $this = $( this ) where appropriate
..
Adding $this = $( this ) where appropriate
Change-Id: I796311b5f5422909ea70d448adbca45def9f1cac
---
M resources/js/ext.translate.special.translate.js
1 file changed, 18 insertions(+), 9 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.special.translate.js
b/resources/js/ext.translate.special.translate.js
index 088c622..1ff1b82 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -157,14 +157,17 @@
$.each( workflowstates, function ( id, workflowstate ) {
if ( workflowstate._canchange ) {
workflowstate.id = id;
+
$selector.append( $('li')
.data( 'state', workflowstate )
.text( workflowstate._name )
.on( 'click', function() {
+ var $this = $( this );
+
$selector.find(
'.selected' ).removeClass( 'selected' );
- $( this ).addClass(
'selected' )
+ $this.addClass(
'selected' )
.parent().addClass( 'hide' );
-
workflowSelectionHandler( $( this ).data( 'state' ) );
+
workflowSelectionHandler( $this.data( 'state' ) );
})
);
}
@@ -284,13 +287,17 @@
if ( $messageList.length ) {
uri = new mw.Uri( window.location.href );
filter = uri.query.filter;
+
if ( filter === undefined ) {
filter = '!translated';
}
+
mw.translate.changeFilter( filter );
$( '.tux-message-selector li' ).each( function () {
- if ( $( this ).data( 'filter' ) === filter ) {
- $( this ).addClass( 'selected' );
+ var $this = $( this );
+
+ if ( $this.data( 'filter' ) === filter ) {
+ $this.addClass( 'selected' );
}
} );
}
@@ -376,15 +383,17 @@
$translateContainer.find( '.tux-workflow-status-selector li' )
.on( 'click', function () {
- var state, stateText, $selector;
+ var state, stateText, $selector,
+ $this = $( this );
- state = $( this ).data( 'state' );
- stateText = $( this ).text();
+ state = $this.data( 'state' );
+ stateText = $this.text();
$selector = $translateContainer.find(
'.tux-workflow-status' );
- $( this ).parent().find( '.selected'
).removeClass( 'selected' );
- $( this ).addClass( 'selected' )
+ $this.parent().find( '.selected' ).removeClass(
'selected' );
+ $this.addClass( 'selected' )
.parent().addClass( 'hide' );
$selector.text( mw.msg(
'translate-workflow-set-doing' ) );
+
mw.translate.changeWorkflowStatus(
$selector.data( 'group' ),
$selector.data( 'language' ),
state,
--
To view, visit https://gerrit.wikimedia.org/r/51156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I796311b5f5422909ea70d448adbca45def9f1cac
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
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] (bug 45556) Show blue pencil mark for untranslated messages - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45556) Show blue pencil mark for untranslated messages
..
(bug 45556) Show blue pencil mark for untranslated messages
Change-Id: I6f50aa19b8507c9fee769e7fb8001be89a098fd0
---
M resources/css/ext.translate.proofread.css
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/ext.translate.proofread.css
b/resources/css/ext.translate.proofread.css
index 9f9ef51..726785f 100644
--- a/resources/css/ext.translate.proofread.css
+++ b/resources/css/ext.translate.proofread.css
@@ -52,8 +52,7 @@
height: 40px;
}
-.tux-proofread-status.translated,
-.tux-proofread-status.proofread {
+.tux-proofread-status.untranslated {
/* @embed */
background: url(../images/translate.png) left center no-repeat;
background-image: -webkit-linear-gradient(transparent, transparent),
url(../images/translate.svg);
--
To view, visit https://gerrit.wikimedia.org/r/51357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f50aa19b8507c9fee769e7fb8001be89a098fd0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@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] (bug 45494) Make translated the default filter for proofre... - change (mediawiki...Translate)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 45494) Make translated the default filter for
proofreading
..
(bug 45494) Make translated the default filter for proofreading
Change-Id: Ifef5276a3a99fcd0a69abf2b173f332da93adcee
---
M resources/js/ext.translate.messagetable.js
1 file changed, 10 insertions(+), 7 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index c4c..6547815 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -368,7 +368,8 @@
* @param {string} mode The message table mode - proofread or
translate
*/
switchMode: function ( mode ) {
- var messageTable = this;
+ var messageTable = this,
+ filter = messageTable.$loader.data( 'filter' );
messageTable.$actionBar.find( '.down' ).removeClass(
'down' );
if ( mode === 'translate' ) {
@@ -389,17 +390,19 @@
if ( messageTable.mode === 'proofread' ) {
$( '.tux-message-selector
.tux-tab-untranslated' ).addClass( 'hide' );
+ // Fix the filter if it is untranslated.
Untranslated does not make sense
+ // for proofread mode. Keep the filter if it is
not 'untranslated'
+ if ( filter.indexOf( '!translated' ) = 0 ) {
+ messageTable.messages = [];
+ mw.translate.changeFilter( 'translated'
);
+ $( '.tux-message-selector
.tux-tab-translated' ).addClass( 'selected' );
+ }
} else {
$( '.tux-message-selector
.tux-tab-untranslated' ).removeClass( 'hide' );
}
$.each( messageTable.messages, function ( index,
message ) {
- if ( messageTable.mode === 'translate' ) {
- messageTable.addTranslate( message );
- }
- if ( messageTable.mode === 'proofread' ) {
- messageTable.addProofread( message );
- }
+ messageTable.add( message );
} );
},
--
To view, visit https://gerrit.wikimedia.org/r/51344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifef5276a3a99fcd0a69abf2b173f332da93adcee
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@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] Added be-tarask NS translations - change (mediawiki...Scribunto)
jenkins-bot has submitted this change and it was merged. Change subject: Added be-tarask NS translations .. Added be-tarask NS translations Change-Id: I7479e33655b1993c39a4761ff2e5366c45e23f26 --- M Scribunto.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index 5104def..142c96f 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -13,6 +13,11 @@ 829 = 'Module_talk', ); +$namespaceNames['be-tarask'] = array( + 828 = 'Модуль', + 829 = 'Абмеркаваньне_модулю', +); + $namespaceNames['de'] = array( 828 = 'Modul', 829 = 'Modul_Diskussion', -- To view, visit https://gerrit.wikimedia.org/r/51358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7479e33655b1993c39a4761ff2e5366c45e23f26 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Wizardist p.selits...@gmail.com Gerrit-Reviewer: Anomie bjor...@wikimedia.org 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] adjusted comments for IcuCollation::$tailoringFirstLetters - change (mediawiki/core)
Matmarex has uploaded a new change for review. https://gerrit.wikimedia.org/r/51359 Change subject: adjusted comments for IcuCollation::$tailoringFirstLetters .. adjusted comments for IcuCollation::$tailoringFirstLetters More information about what actually sits in that array. Summary of modifications to the Mimer data so far: * removed data for traditional variants of de (German) and es (Spanish) * used code 'tl' instead of 'fil' for Tagalog/Filipino * added be-tarask (Belarusian Taraškievica) Change-Id: I97273c52599a5eda3f63366d697b077d6b17ba81 --- M includes/Collation.php 1 file changed, 15 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/59/51359/1 diff --git a/includes/Collation.php b/includes/Collation.php index b0f770f..7ff8a05 100644 --- a/includes/Collation.php +++ b/includes/Collation.php @@ -181,20 +181,30 @@ ); /** -* Additional characters (or character groups) to be considered first-letters +* Additional characters (or character groups) to be considered separate +* letters for given languages, compared to the data stored in the +* first-letters-root.ser file (which among others includes full basic latin, +* cyrillic and greek alphabets). * -* Generated based on the primary level of Unicode collation tailorings -* available at http://developer.mimer.com/charts/tailorings.htm . +* Separate letter is a letter that would have a separate heading/section +* for it in a dictionary or a phone book in this language. This data isn't +* used for sorting (the ICU library handles that), only for deciding which +* characters (or character groups) to use as headings. +* +* Initially generated based on the primary level of Unicode collation +* tailorings available at http://developer.mimer.com/charts/tailorings.htm , +* later modified. * * Empty arrays are intended; this signifies that the data for the language is * available and that there are, in fact, no additional letters to consider. */ static $tailoringFirstLetters = array( // Verified by native speakers - 'pl' = array( Ą, Ć, Ę, Ł, Ń, Ó, Ś, Ź, Ż ), - 'fi' = array( Å, Ä, Ö ), 'be' = array( Ё ), 'be-tarask' = array( Ё ), + 'fi' = array( Å, Ä, Ö ), + 'it' = array(), + 'pl' = array( Ą, Ć, Ę, Ł, Ń, Ó, Ś, Ź, Ż ), 'ru' = array(), // Not verified, but likely correct 'af' = array(), @@ -227,7 +237,6 @@ 'hsb' = array( Č, DŹ, Ě, CH, Ł, Ń, Ř, Š, Ć, Ž ), 'hu' = array( CS, DZ, DZS, GY, LY, NY, Ö, SZ, TY, Ü, ZS ), 'is' = array( Á, Ð, É, Í, Ó, Ú, Ý, Þ, Æ, Ö, Å ), - 'it' = array(), 'kk' = array( Ү, І ), 'kl' = array( Æ, Ø, Å ), 'ku' = array( Ç, Ê, Î, Ş, Û ), -- To view, visit https://gerrit.wikimedia.org/r/51359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I97273c52599a5eda3f63366d697b077d6b17ba81 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Matmarex matma@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) fix for selenium sitelinks tests - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review. https://gerrit.wikimedia.org/r/51360 Change subject: (testing) fix for selenium sitelinks tests .. (testing) fix for selenium sitelinks tests - we need a better way to get the suggestion list elements, since the serach-box may or may not be a ui-autocomplete element too. Change-Id: I4bf85a8319b4382145651c208d6caf913fa606d5 --- M selenium/lib/modules/sitelink_module.rb 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/60/51360/1 diff --git a/selenium/lib/modules/sitelink_module.rb b/selenium/lib/modules/sitelink_module.rb index 1405056..020e70a 100644 --- a/selenium/lib/modules/sitelink_module.rb +++ b/selenium/lib/modules/sitelink_module.rb @@ -22,9 +22,10 @@ text_field(:pageInputField, :xpath = //table[contains(@class, 'wb-sitelinks')]/tfoot/tr/td[contains(@class, 'wb-sitelinks-link')]/input) text_field(:pageInputFieldExistingSiteLink, :xpath = //table[contains(@class, 'wb-sitelinks')]/tbody/tr/td[contains(@class, 'wb-sitelinks-link')]/input) span(:saveSitelinkLinkDisabled, :class = wb-ui-toolbar-button-disabled) - unordered_list(:siteIdAutocompleteList, :class = ui-autocomplete, :index = 0) - unordered_list(:pageAutocompleteList, :class = ui-autocomplete, :index = 1) - unordered_list(:editSitelinkAutocompleteList, :class = ui-autocomplete, :index = 0) + unordered_list(:siteIdAutocompleteList, :class = wikibase-siteselector-list) + #todo: this is not a nice way to get the suggestion list, we should find a better way + unordered_list(:pageAutocompleteList, :xpath = //ul[@class='ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all ui-suggester-list']) + unordered_list(:editSitelinkAutocompleteList, :xpath = //ul[@class='ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all ui-suggester-list']) link(:saveSitelinkLink, :text = save) link(:cancelSitelinkLink, :text = cancel) link(:removeSitelinkLink, :text = remove) -- To view, visit https://gerrit.wikimedia.org/r/51360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4bf85a8319b4382145651c208d6caf913fa606d5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) fix for selenium sitelinks tests - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: (testing) fix for selenium sitelinks tests .. (testing) fix for selenium sitelinks tests - we need a better way to get the suggestion list elements, since the serach-box may or may not be a ui-autocomplete element too. Change-Id: I4bf85a8319b4382145651c208d6caf913fa606d5 --- M selenium/lib/modules/sitelink_module.rb 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/selenium/lib/modules/sitelink_module.rb b/selenium/lib/modules/sitelink_module.rb index 1405056..020e70a 100644 --- a/selenium/lib/modules/sitelink_module.rb +++ b/selenium/lib/modules/sitelink_module.rb @@ -22,9 +22,10 @@ text_field(:pageInputField, :xpath = //table[contains(@class, 'wb-sitelinks')]/tfoot/tr/td[contains(@class, 'wb-sitelinks-link')]/input) text_field(:pageInputFieldExistingSiteLink, :xpath = //table[contains(@class, 'wb-sitelinks')]/tbody/tr/td[contains(@class, 'wb-sitelinks-link')]/input) span(:saveSitelinkLinkDisabled, :class = wb-ui-toolbar-button-disabled) - unordered_list(:siteIdAutocompleteList, :class = ui-autocomplete, :index = 0) - unordered_list(:pageAutocompleteList, :class = ui-autocomplete, :index = 1) - unordered_list(:editSitelinkAutocompleteList, :class = ui-autocomplete, :index = 0) + unordered_list(:siteIdAutocompleteList, :class = wikibase-siteselector-list) + #todo: this is not a nice way to get the suggestion list, we should find a better way + unordered_list(:pageAutocompleteList, :xpath = //ul[@class='ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all ui-suggester-list']) + unordered_list(:editSitelinkAutocompleteList, :xpath = //ul[@class='ui-autocomplete ui-menu ui-widget ui-widget-content ui-corner-all ui-suggester-list']) link(:saveSitelinkLink, :text = save) link(:cancelSitelinkLink, :text = cancel) link(:removeSitelinkLink, :text = remove) -- To view, visit https://gerrit.wikimedia.org/r/51360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4bf85a8319b4382145651c208d6caf913fa606d5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher tobias.gritschac...@wikimedia.de Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.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] (Bug 45352, Bug 45353) Add ItemByTitle and ItemDisambiguatio... - change (mediawiki...Wikibase)
Anja Jentzsch has submitted this change and it was merged.
Change subject: (Bug 45352, Bug 45353) Add ItemByTitle and ItemDisambiguation
to the special pages list
..
(Bug 45352, Bug 45353) Add ItemByTitle and ItemDisambiguation to the special
pages list
Changes so ItemDisambiguation and ItemByTitle can be added to the list
of special pages. Also some minor changes to the messages used for those
pages.
There are also a name change in the list to ItemBySitelink, we are not
very good at following our own naming scheme. We should really try to
follow our glossary.
Change-Id: Id197c49dd52c482eb162f56522e5f0db0256b90a
---
M repo/Wikibase.i18n.php
M repo/Wikibase.php
M repo/includes/specials/SpecialItemByTitle.php
M repo/includes/specials/SpecialItemDisambiguation.php
M repo/includes/specials/SpecialItemResolver.php
5 files changed, 24 insertions(+), 18 deletions(-)
Approvals:
Anja Jentzsch: Verified; Looks good to me, approved
diff --git a/repo/Wikibase.i18n.php b/repo/Wikibase.i18n.php
index eb1b5cd..5721da3 100644
--- a/repo/Wikibase.i18n.php
+++ b/repo/Wikibase.i18n.php
@@ -112,7 +112,7 @@
'wikibase-itemlink-title' = '$1 | $2',
// Special pages
- 'special-itembytitle' = 'Item by title',
+ 'special-itembytitle' = 'Item by sitelink',
'wikibase-itembytitle-lookup-fieldset' = 'Search for items by site and
title',
'wikibase-itembytitle-lookup-site' = 'Site:',
'wikibase-itembytitle-lookup-page' = 'Page:',
@@ -121,8 +121,8 @@
'wikibase-itembytitle-invalid-site' = 'The previous query could not be
used for a search. Please provide a valid site identifier.',
'wikibase-itembytitle-description' = 'Site is an identifier code, such
as enwiki.',
'wikibase-itembytitle-create' = 'You can also
[{{fullurl:Special:CreateItem|site=$1page=$2}} create an item].',
- 'special-itemdisambiguation' = 'Disambiguation: Items with the same
label',
- 'wikibase-itemdisambiguation-lookup-fieldset' = 'Search for items by
label',
+ 'special-itemdisambiguation' = 'Item disambiguation',
+ 'wikibase-itemdisambiguation-lookup-fieldset' = 'Search for items by
language and label',
'wikibase-itemdisambiguation-lookup-language' = 'Language:',
'wikibase-itemdisambiguation-lookup-label' = 'Label:',
'wikibase-itemdisambiguation-submit' = 'Search',
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 8010ba5..56187af 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -227,29 +227,29 @@
// Special page registration
$wgSpecialPages['CreateItem'] =
'SpecialCreateItem';
+$wgSpecialPages['EntitiesWithoutLabel']=
'SpecialEntitiesWithoutLabel';
$wgSpecialPages['ItemByTitle']
= 'SpecialItemByTitle';
$wgSpecialPages['ItemDisambiguation'] =
'SpecialItemDisambiguation';
-$wgSpecialPages['SetLabel']=
'SpecialSetLabel';
-$wgSpecialPages['SetDescription'] =
'SpecialSetDescription';
-$wgSpecialPages['SetAliases'] =
'SpecialSetAliases';
-$wgSpecialPages['EntitiesWithoutLabel']=
'SpecialEntitiesWithoutLabel';
$wgSpecialPages['ItemsWithoutSitelinks'] =
'SpecialItemsWithoutSitelinks';
-$wgSpecialPages['NewProperty']
= 'SpecialNewProperty';
$wgSpecialPages['ListDatatypes'] =
'SpecialListDatatypes';
+$wgSpecialPages['NewProperty']
= 'SpecialNewProperty';
+$wgSpecialPages['SetAliases'] =
'SpecialSetAliases';
+$wgSpecialPages['SetDescription'] =
'SpecialSetDescription';
+$wgSpecialPages['SetLabel']=
'SpecialSetLabel';
// Special page groups
$wgSpecialPageGroups['CreateItem'] =
'wikibaserepo';
-$wgSpecialPageGroups['NewProperty']=
'wikibaserepo';
-$wgSpecialPageGroups['ItemByTitle']=
'wikibaserepo';
-$wgSpecialPageGroups['ItemDisambiguation'] =
'wikibaserepo';
-$wgSpecialPageGroups['SetLabel'] =
'wikibaserepo';
-$wgSpecialPageGroups['SetDescription'] =
'wikibaserepo';
-$wgSpecialPageGroups['SetAliases'] =
'wikibaserepo';
$wgSpecialPageGroups['EntitiesWithoutLabel'] = 'wikibaserepo';
$wgSpecialPageGroups['EntityData'] =
'wikibaserepo';
+$wgSpecialPageGroups['ItemByTitle']=
[MediaWiki-commits] [Gerrit] alternative definitions disabled until we find a use for tha... - change (mediawiki...WikiLexicalData)
Kipcool has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51361
Change subject: alternative definitions disabled until we find a use for that
field
..
alternative definitions disabled until we find a use for that field
Change-Id: I69734b59c62421861a49c5b296c7a49a2a95b3c4
---
M OmegaWiki/DefinedMeaningModel.php
M OmegaWiki/OmegaWikiEditors.php
M OmegaWiki/WikiDataGlobals.php
3 files changed, 6 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData
refs/changes/61/51361/1
diff --git a/OmegaWiki/DefinedMeaningModel.php
b/OmegaWiki/DefinedMeaningModel.php
index 8b622bd..baa9bd0 100644
--- a/OmegaWiki/DefinedMeaningModel.php
+++ b/OmegaWiki/DefinedMeaningModel.php
@@ -172,7 +172,8 @@
$record-definedMeaningCompleteDefiningExpression =
getDefiningExpressionRecord( $id );
$record-definition = getDefinedMeaningDefinitionRecord( $id,
$view );
$record-classAttributes = getClassAttributesRecordSet( $id,
$view );
- $record-alternativeDefinitions =
getAlternativeDefinitionsRecordSet( $id, $view );
+ // Kip: alternative definitions disabled until we find a use
for that field
+ // $record-alternativeDefinitions =
getAlternativeDefinitionsRecordSet( $id, $view );
// exclude the current syntrans from the list of Synonyms
$excludeSyntransId = null;
diff --git a/OmegaWiki/OmegaWikiEditors.php b/OmegaWiki/OmegaWikiEditors.php
index a5f1ae9..8a9282a 100644
--- a/OmegaWiki/OmegaWikiEditors.php
+++ b/OmegaWiki/OmegaWikiEditors.php
@@ -878,7 +878,6 @@
$o = OmegaWikiAttributes::getInstance();
$definitionEditor = getDefinitionEditor( $viewInformation );
- $alternativeDefinitionsEditor = getAlternativeDefinitionsEditor(
$viewInformation );
$synonymsAndTranslationsEditor = getSynonymsAndTranslationsEditor(
$viewInformation );
$reciprocalRelationsEditor =
getDefinedMeaningReciprocalRelationsEditor( $viewInformation );
$classMembershipEditor = getDefinedMeaningClassMembershipEditor(
$viewInformation );
@@ -886,7 +885,8 @@
$availableEditors = new AttributeEditorMap();
$availableEditors-addEditor( $definitionEditor );
- $availableEditors-addEditor( $alternativeDefinitionsEditor );
+ // Kip: alternative definitions disabled until we find a use for that
field
+ // $availableEditors-addEditor( getAlternativeDefinitionsEditor(
$viewInformation ) );
if ( $wgUser-isAllowed( 'editClassAttributes' ) ) {
$classAttributesEditor = getClassAttributesEditor(
$viewInformation );
diff --git a/OmegaWiki/WikiDataGlobals.php b/OmegaWiki/WikiDataGlobals.php
index 4b7bbc2..fa2dcbf 100644
--- a/OmegaWiki/WikiDataGlobals.php
+++ b/OmegaWiki/WikiDataGlobals.php
@@ -54,7 +54,8 @@
$wdDefinedMeaningAttributesOrder = array(
WLD_SYNT_ATTRIBUTES,
WLD_DEFINITION,
- WLD_ALTERNATIVE_DEFINITIONS,
+ // Kip: alternative definitions disabled until we find a use for that
field
+ // WLD_ALTERNATIVE_DEFINITIONS,
WLD_SYNONYMS_TRANSLATIONS,
WLD_DM_ATTRIBUTES,
WLD_CLASS_MEMBERSHIP,
--
To view, visit https://gerrit.wikimedia.org/r/51361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69734b59c62421861a49c5b296c7a49a2a95b3c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Kipcool kipmas...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] alternative definitions disabled until we find a use for tha... - change (mediawiki...WikiLexicalData)
Kipcool has submitted this change and it was merged.
Change subject: alternative definitions disabled until we find a use for that
field
..
alternative definitions disabled until we find a use for that field
Change-Id: I69734b59c62421861a49c5b296c7a49a2a95b3c4
---
M OmegaWiki/DefinedMeaningModel.php
M OmegaWiki/OmegaWikiEditors.php
M OmegaWiki/WikiDataGlobals.php
3 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Kipcool: Verified; Looks good to me, approved
diff --git a/OmegaWiki/DefinedMeaningModel.php
b/OmegaWiki/DefinedMeaningModel.php
index 8b622bd..baa9bd0 100644
--- a/OmegaWiki/DefinedMeaningModel.php
+++ b/OmegaWiki/DefinedMeaningModel.php
@@ -172,7 +172,8 @@
$record-definedMeaningCompleteDefiningExpression =
getDefiningExpressionRecord( $id );
$record-definition = getDefinedMeaningDefinitionRecord( $id,
$view );
$record-classAttributes = getClassAttributesRecordSet( $id,
$view );
- $record-alternativeDefinitions =
getAlternativeDefinitionsRecordSet( $id, $view );
+ // Kip: alternative definitions disabled until we find a use
for that field
+ // $record-alternativeDefinitions =
getAlternativeDefinitionsRecordSet( $id, $view );
// exclude the current syntrans from the list of Synonyms
$excludeSyntransId = null;
diff --git a/OmegaWiki/OmegaWikiEditors.php b/OmegaWiki/OmegaWikiEditors.php
index a5f1ae9..8a9282a 100644
--- a/OmegaWiki/OmegaWikiEditors.php
+++ b/OmegaWiki/OmegaWikiEditors.php
@@ -878,7 +878,6 @@
$o = OmegaWikiAttributes::getInstance();
$definitionEditor = getDefinitionEditor( $viewInformation );
- $alternativeDefinitionsEditor = getAlternativeDefinitionsEditor(
$viewInformation );
$synonymsAndTranslationsEditor = getSynonymsAndTranslationsEditor(
$viewInformation );
$reciprocalRelationsEditor =
getDefinedMeaningReciprocalRelationsEditor( $viewInformation );
$classMembershipEditor = getDefinedMeaningClassMembershipEditor(
$viewInformation );
@@ -886,7 +885,8 @@
$availableEditors = new AttributeEditorMap();
$availableEditors-addEditor( $definitionEditor );
- $availableEditors-addEditor( $alternativeDefinitionsEditor );
+ // Kip: alternative definitions disabled until we find a use for that
field
+ // $availableEditors-addEditor( getAlternativeDefinitionsEditor(
$viewInformation ) );
if ( $wgUser-isAllowed( 'editClassAttributes' ) ) {
$classAttributesEditor = getClassAttributesEditor(
$viewInformation );
diff --git a/OmegaWiki/WikiDataGlobals.php b/OmegaWiki/WikiDataGlobals.php
index 4b7bbc2..fa2dcbf 100644
--- a/OmegaWiki/WikiDataGlobals.php
+++ b/OmegaWiki/WikiDataGlobals.php
@@ -54,7 +54,8 @@
$wdDefinedMeaningAttributesOrder = array(
WLD_SYNT_ATTRIBUTES,
WLD_DEFINITION,
- WLD_ALTERNATIVE_DEFINITIONS,
+ // Kip: alternative definitions disabled until we find a use for that
field
+ // WLD_ALTERNATIVE_DEFINITIONS,
WLD_SYNONYMS_TRANSLATIONS,
WLD_DM_ATTRIBUTES,
WLD_CLASS_MEMBERSHIP,
--
To view, visit https://gerrit.wikimedia.org/r/51361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I69734b59c62421861a49c5b296c7a49a2a95b3c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Kipcool kipmas...@gmail.com
Gerrit-Reviewer: Kipcool kipmas...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updated sheck marks to use sprites - change (mediawiki...Translate)
Pginer has uploaded a new change for review. https://gerrit.wikimedia.org/r/51362 Change subject: Updated sheck marks to use sprites .. Updated sheck marks to use sprites Check marks for proofread have been modified to: * Use a single graphical asset so that once loaded, status changes such as hovering do not introduce an additional delay. * Emphasize the markers (bigger and more intense colors) so that they are easily recognizable. Change-Id: I0d8593c59ef6f8e65a94c47839d6ba91b7089bc7 --- M resources/css/ext.translate.proofread.css D resources/images/check-hi.png D resources/images/check-hi.svg A resources/images/check-sprite.png R resources/images/check-sprite.svg D resources/images/check.png D resources/images/check.svg D resources/images/uncheck-hi.png D resources/images/uncheck-hi.svg D resources/images/uncheck.png 10 files changed, 26,892 insertions(+), 351,275 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate refs/changes/62/51362/1 -- To view, visit https://gerrit.wikimedia.org/r/51362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d8593c59ef6f8e65a94c47839d6ba91b7089bc7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Pginer pgi...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed unused global in jobs-loop (only local one matters). - change (operations/puppet)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/51363 Change subject: Removed unused global in jobs-loop (only local one matters). .. Removed unused global in jobs-loop (only local one matters). Change-Id: Ie2b7db9b438b4c2c8615eaaaccffd10093f9cf99 --- M modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/51363/1 diff --git a/modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb b/modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb index 10657a1..d6598f7 100755 --- a/modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb +++ b/modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb @@ -58,10 +58,6 @@ # default total memory limit (in kb) for this process and its sub-processes maxvirtualmemory=40 -# Whether to process the default queue. Will be the case if no job type -# was specified on the command line. Else we only want to process given types -dodefault=y - while getopts t:v: flag do case $flag in -- To view, visit https://gerrit.wikimedia.org/r/51363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie2b7db9b438b4c2c8615eaaaccffd10093f9cf99 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Aaron Schulz asch...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Only run sha1_file once per file in FSFile - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Only run sha1_file once per file in FSFile
..
Only run sha1_file once per file in FSFile
This shouldn't harm as we don't use this and then alter the file.
But it can kick in useful with extension that need the sha1 of
files (like AbuseFilter).
Change-Id: Ied2ac0397266a5ffd27da02ef6448b64c12fad86
---
M includes/filebackend/FSFile.php
1 file changed, 22 insertions(+), 8 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/FSFile.php b/includes/filebackend/FSFile.php
index acbc4a9..a6b6200 100644
--- a/includes/filebackend/FSFile.php
+++ b/includes/filebackend/FSFile.php
@@ -28,6 +28,7 @@
*/
class FSFile {
protected $path; // path to file
+ private $sha1Base36 = null; // File Sha1Base36
/**
* Sets up the file object
@@ -193,20 +194,26 @@
* 160 log 2 / log 36 = 30.95, so the 160-bit hash fills 31 digits in
base 36
* fairly neatly.
*
+* @param $recache bool
* @return bool|string False on failure
*/
- public function getSha1Base36() {
+ public function getSha1Base36( $recache = false ) {
wfProfileIn( __METHOD__ );
+ if ( $this-sha1Base36 !== null !$recache ) {
+ return $this-sha1Base36;
+ }
+
wfSuppressWarnings();
- $hash = sha1_file( $this-path );
+ $this-sha1Base36 = sha1_file( $this-path );
wfRestoreWarnings();
- if ( $hash !== false ) {
- $hash = wfBaseConvert( $hash, 16, 36, 31 );
+
+ if ( $this-sha1Base36 !== false ) {
+ $this-sha1Base36 = wfBaseConvert( $this-sha1Base36,
16, 36, 31 );
}
wfProfileOut( __METHOD__ );
- return $hash;
+ return $this-sha1Base36;
}
/**
@@ -242,11 +249,18 @@
* fairly neatly.
*
* @param $path string
+* @param $recache bool
*
* @return bool|string False on failure
*/
- public static function getSha1Base36FromPath( $path ) {
- $fsFile = new self( $path );
- return $fsFile-getSha1Base36();
+ public static function getSha1Base36FromPath( $path, $recache = false )
{
+ static $sha1Base36 = array();
+
+ if ( !isset( $sha1Base36[$path] ) || $recache ) {
+ $fsFile = new self( $path );
+ $sha1Base36[$path] = $fsFile-getSha1Base36();
+ }
+
+ return $sha1Base36[$path];
}
}
--
To view, visit https://gerrit.wikimedia.org/r/51302
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied2ac0397266a5ffd27da02ef6448b64c12fad86
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Reedy re...@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] remove server name labels as it changes hashing behavior - change (operations/mediawiki-config)
Asher has uploaded a new change for review. https://gerrit.wikimedia.org/r/51364 Change subject: remove server name labels as it changes hashing behavior .. remove server name labels as it changes hashing behavior Change-Id: I4cd42dc195951c342d30ee5971bacacfce5c0bc1 --- M wmf-config/twemproxy-eqiad.yaml M wmf-config/twemproxy-pmtpa.yaml 2 files changed, 32 insertions(+), 32 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/64/51364/1 diff --git a/wmf-config/twemproxy-eqiad.yaml b/wmf-config/twemproxy-eqiad.yaml index e35c77c..0132a1b 100644 --- a/wmf-config/twemproxy-eqiad.yaml +++ b/wmf-config/twemproxy-eqiad.yaml @@ -9,19 +9,19 @@ server_retry_timeout: 3 server_failure_limit: 3 servers: - - 10.64.0.180:11211:1 mc1001.eqiad.wmnet - - 10.64.0.181:11211:1 mc1002.eqiad.wmnet - - 10.64.0.182:11211:1 mc1003.eqiad.wmnet - - 10.64.0.183:11211:1 mc1004.eqiad.wmnet - - 10.64.0.184:11211:1 mc1005.eqiad.wmnet - - 10.64.0.185:11211:1 mc1006.eqiad.wmnet - - 10.64.0.186:11211:1 mc1007.eqiad.wmnet - - 10.64.0.187:11211:1 mc1008.eqiad.wmnet - - 10.64.0.188:11211:1 mc1009.eqiad.wmnet - - 10.64.0.189:11211:1 mc1010.eqiad.wmnet - - 10.64.0.190:11211:1 mc1011.eqiad.wmnet - - 10.64.0.191:11211:1 mc1012.eqiad.wmnet - - 10.64.0.192:11211:1 mc1013.eqiad.wmnet - - 10.64.0.193:11211:1 mc1014.eqiad.wmnet - - 10.64.0.194:11211:1 mc1015.eqiad.wmnet - - 10.64.0.195:11211:1 mc1016.eqiad.wmnet + - 10.64.0.180:11211:1 + - 10.64.0.181:11211:1 + - 10.64.0.182:11211:1 + - 10.64.0.183:11211:1 + - 10.64.0.184:11211:1 + - 10.64.0.185:11211:1 + - 10.64.0.186:11211:1 + - 10.64.0.187:11211:1 + - 10.64.0.188:11211:1 + - 10.64.0.189:11211:1 + - 10.64.0.190:11211:1 + - 10.64.0.191:11211:1 + - 10.64.0.192:11211:1 + - 10.64.0.193:11211:1 + - 10.64.0.194:11211:1 + - 10.64.0.195:11211:1 diff --git a/wmf-config/twemproxy-pmtpa.yaml b/wmf-config/twemproxy-pmtpa.yaml index 0a29d3f..62c0ba0 100644 --- a/wmf-config/twemproxy-pmtpa.yaml +++ b/wmf-config/twemproxy-pmtpa.yaml @@ -9,19 +9,19 @@ server_retry_timeout: 3 server_failure_limit: 3 servers: - - 10.0.12.1:11211:1 mc1.pmtpa.wmnet - - 10.0.12.2:11211:1 mc2.pmtpa.wmnet - - 10.0.12.3:11211:1 mc3.pmtpa.wmnet - - 10.0.12.4:11211:1 mc4.pmtpa.wmnet - - 10.0.12.5:11211:1 mc5.pmtpa.wmnet - - 10.0.12.6:11211:1 mc6.pmtpa.wmnet - - 10.0.12.7:11211:1 mc7.pmtpa.wmnet - - 10.0.12.8:11211:1 mc8.pmtpa.wmnet - - 10.0.12.9:11211:1 mc9.pmtpa.wmnet - - 10.0.12.10:11211:1 mc10.pmtpa.wmnet - - 10.0.12.11:11211:1 mc11.pmtpa.wmnet - - 10.0.12.12:11211:1 mc12.pmtpa.wmnet - - 10.0.12.13:11211:1 mc13.pmtpa.wmnet - - 10.0.12.14:11211:1 mc14.pmtpa.wmnet - - 10.0.12.15:11211:1 mc15.pmtpa.wmnet - - 10.0.12.16:11211:1 mc16.pmtpa.wmnet + - 10.0.12.1:11211:1 + - 10.0.12.2:11211:1 + - 10.0.12.3:11211:1 + - 10.0.12.4:11211:1 + - 10.0.12.5:11211:1 + - 10.0.12.6:11211:1 + - 10.0.12.7:11211:1 + - 10.0.12.8:11211:1 + - 10.0.12.9:11211:1 + - 10.0.12.10:11211:1 + - 10.0.12.11:11211:1 + - 10.0.12.12:11211:1 + - 10.0.12.13:11211:1 + - 10.0.12.14:11211:1 + - 10.0.12.15:11211:1 + - 10.0.12.16:11211:1 -- To view, visit https://gerrit.wikimedia.org/r/51364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4cd42dc195951c342d30ee5971bacacfce5c0bc1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher afeld...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove server name labels as it changes hashing behavior - change (operations/mediawiki-config)
Asher has submitted this change and it was merged. Change subject: remove server name labels as it changes hashing behavior .. remove server name labels as it changes hashing behavior Change-Id: I4cd42dc195951c342d30ee5971bacacfce5c0bc1 --- M wmf-config/twemproxy-eqiad.yaml M wmf-config/twemproxy-pmtpa.yaml 2 files changed, 32 insertions(+), 32 deletions(-) Approvals: Asher: Verified; Looks good to me, approved diff --git a/wmf-config/twemproxy-eqiad.yaml b/wmf-config/twemproxy-eqiad.yaml index e35c77c..0132a1b 100644 --- a/wmf-config/twemproxy-eqiad.yaml +++ b/wmf-config/twemproxy-eqiad.yaml @@ -9,19 +9,19 @@ server_retry_timeout: 3 server_failure_limit: 3 servers: - - 10.64.0.180:11211:1 mc1001.eqiad.wmnet - - 10.64.0.181:11211:1 mc1002.eqiad.wmnet - - 10.64.0.182:11211:1 mc1003.eqiad.wmnet - - 10.64.0.183:11211:1 mc1004.eqiad.wmnet - - 10.64.0.184:11211:1 mc1005.eqiad.wmnet - - 10.64.0.185:11211:1 mc1006.eqiad.wmnet - - 10.64.0.186:11211:1 mc1007.eqiad.wmnet - - 10.64.0.187:11211:1 mc1008.eqiad.wmnet - - 10.64.0.188:11211:1 mc1009.eqiad.wmnet - - 10.64.0.189:11211:1 mc1010.eqiad.wmnet - - 10.64.0.190:11211:1 mc1011.eqiad.wmnet - - 10.64.0.191:11211:1 mc1012.eqiad.wmnet - - 10.64.0.192:11211:1 mc1013.eqiad.wmnet - - 10.64.0.193:11211:1 mc1014.eqiad.wmnet - - 10.64.0.194:11211:1 mc1015.eqiad.wmnet - - 10.64.0.195:11211:1 mc1016.eqiad.wmnet + - 10.64.0.180:11211:1 + - 10.64.0.181:11211:1 + - 10.64.0.182:11211:1 + - 10.64.0.183:11211:1 + - 10.64.0.184:11211:1 + - 10.64.0.185:11211:1 + - 10.64.0.186:11211:1 + - 10.64.0.187:11211:1 + - 10.64.0.188:11211:1 + - 10.64.0.189:11211:1 + - 10.64.0.190:11211:1 + - 10.64.0.191:11211:1 + - 10.64.0.192:11211:1 + - 10.64.0.193:11211:1 + - 10.64.0.194:11211:1 + - 10.64.0.195:11211:1 diff --git a/wmf-config/twemproxy-pmtpa.yaml b/wmf-config/twemproxy-pmtpa.yaml index 0a29d3f..62c0ba0 100644 --- a/wmf-config/twemproxy-pmtpa.yaml +++ b/wmf-config/twemproxy-pmtpa.yaml @@ -9,19 +9,19 @@ server_retry_timeout: 3 server_failure_limit: 3 servers: - - 10.0.12.1:11211:1 mc1.pmtpa.wmnet - - 10.0.12.2:11211:1 mc2.pmtpa.wmnet - - 10.0.12.3:11211:1 mc3.pmtpa.wmnet - - 10.0.12.4:11211:1 mc4.pmtpa.wmnet - - 10.0.12.5:11211:1 mc5.pmtpa.wmnet - - 10.0.12.6:11211:1 mc6.pmtpa.wmnet - - 10.0.12.7:11211:1 mc7.pmtpa.wmnet - - 10.0.12.8:11211:1 mc8.pmtpa.wmnet - - 10.0.12.9:11211:1 mc9.pmtpa.wmnet - - 10.0.12.10:11211:1 mc10.pmtpa.wmnet - - 10.0.12.11:11211:1 mc11.pmtpa.wmnet - - 10.0.12.12:11211:1 mc12.pmtpa.wmnet - - 10.0.12.13:11211:1 mc13.pmtpa.wmnet - - 10.0.12.14:11211:1 mc14.pmtpa.wmnet - - 10.0.12.15:11211:1 mc15.pmtpa.wmnet - - 10.0.12.16:11211:1 mc16.pmtpa.wmnet + - 10.0.12.1:11211:1 + - 10.0.12.2:11211:1 + - 10.0.12.3:11211:1 + - 10.0.12.4:11211:1 + - 10.0.12.5:11211:1 + - 10.0.12.6:11211:1 + - 10.0.12.7:11211:1 + - 10.0.12.8:11211:1 + - 10.0.12.9:11211:1 + - 10.0.12.10:11211:1 + - 10.0.12.11:11211:1 + - 10.0.12.12:11211:1 + - 10.0.12.13:11211:1 + - 10.0.12.14:11211:1 + - 10.0.12.15:11211:1 + - 10.0.12.16:11211:1 -- To view, visit https://gerrit.wikimedia.org/r/51364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4cd42dc195951c342d30ee5971bacacfce5c0bc1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Asher afeld...@wikimedia.org Gerrit-Reviewer: Asher afeld...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove d and chapter interwiki - change (mediawiki...WikimediaMaintenance)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/51365 Change subject: Remove d and chapter interwiki .. Remove d and chapter interwiki d = en.wikidata.org chapter = en.wikimedia.org Change-Id: I91fa5860d06f6d3f80709b7f2fbb3388256ecbfc --- M dumpInterwiki.php M rebuildInterwiki.php 2 files changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance refs/changes/65/51365/1 diff --git a/dumpInterwiki.php b/dumpInterwiki.php index da9ce38..9b0c629 100644 --- a/dumpInterwiki.php +++ b/dumpInterwiki.php @@ -89,10 +89,8 @@ 'wikibooks' = new WMFSite( 'wikibooks', 'b', 'wikibooks.org' ), 'wikinews' = new WMFSite( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' = new WMFSite( 'wikisource', 's', 'wikisource.org' ), - 'wikimedia' = new WMFSite( 'wikimedia', 'chapter', 'wikimedia.org' ), 'wikiversity' = new WMFSite( 'wikiversity', 'v', 'wikiversity.org' ), 'wikivoyage' = new WMFSite( 'wikivoyage', 'voy', 'wikivoyage.org' ), - 'wikidata' = new WMFSite( 'wikidata', 'd', 'wikidata.org' ), ); # Site overrides for wikis whose DB names end in 'wiki' but that really belong to another site diff --git a/rebuildInterwiki.php b/rebuildInterwiki.php index f526665..8566ae6 100644 --- a/rebuildInterwiki.php +++ b/rebuildInterwiki.php @@ -72,10 +72,8 @@ 'wikibooks' = new WMFSite( 'wikibooks', 'b', 'wikibooks.org' ), 'wikinews' = new WMFSite( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' = new WMFSite( 'wikisource', 's', 'wikisource.org' ), - 'wikimedia' = new WMFSite( 'wikimedia', 'chapter', 'wikimedia.org' ), 'wikiversity' = new WMFSite( 'wikiversity', 'v', 'wikiversity.org' ), 'wikivoyage' = new WMFSite( 'wikivoyage', 'voy', 'wikivoyage.org' ), - 'wikidata' = new WMFSite( 'wikidata', 'd', 'wikidata.org' ), ); # Special-case hostnames -- To view, visit https://gerrit.wikimedia.org/r/51365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91fa5860d06f6d3f80709b7f2fbb3388256ecbfc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove d and chapter interwiki - change (mediawiki...WikimediaMaintenance)
Reedy has submitted this change and it was merged. Change subject: Remove d and chapter interwiki .. Remove d and chapter interwiki d = en.wikidata.org chapter = en.wikimedia.org Change-Id: I91fa5860d06f6d3f80709b7f2fbb3388256ecbfc --- M dumpInterwiki.php M rebuildInterwiki.php 2 files changed, 0 insertions(+), 4 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/dumpInterwiki.php b/dumpInterwiki.php index da9ce38..9b0c629 100644 --- a/dumpInterwiki.php +++ b/dumpInterwiki.php @@ -89,10 +89,8 @@ 'wikibooks' = new WMFSite( 'wikibooks', 'b', 'wikibooks.org' ), 'wikinews' = new WMFSite( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' = new WMFSite( 'wikisource', 's', 'wikisource.org' ), - 'wikimedia' = new WMFSite( 'wikimedia', 'chapter', 'wikimedia.org' ), 'wikiversity' = new WMFSite( 'wikiversity', 'v', 'wikiversity.org' ), 'wikivoyage' = new WMFSite( 'wikivoyage', 'voy', 'wikivoyage.org' ), - 'wikidata' = new WMFSite( 'wikidata', 'd', 'wikidata.org' ), ); # Site overrides for wikis whose DB names end in 'wiki' but that really belong to another site diff --git a/rebuildInterwiki.php b/rebuildInterwiki.php index f526665..8566ae6 100644 --- a/rebuildInterwiki.php +++ b/rebuildInterwiki.php @@ -72,10 +72,8 @@ 'wikibooks' = new WMFSite( 'wikibooks', 'b', 'wikibooks.org' ), 'wikinews' = new WMFSite( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' = new WMFSite( 'wikisource', 's', 'wikisource.org' ), - 'wikimedia' = new WMFSite( 'wikimedia', 'chapter', 'wikimedia.org' ), 'wikiversity' = new WMFSite( 'wikiversity', 'v', 'wikiversity.org' ), 'wikivoyage' = new WMFSite( 'wikivoyage', 'voy', 'wikivoyage.org' ), - 'wikidata' = new WMFSite( 'wikidata', 'd', 'wikidata.org' ), ); # Special-case hostnames -- To view, visit https://gerrit.wikimedia.org/r/51365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91fa5860d06f6d3f80709b7f2fbb3388256ecbfc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] Update WikimediaMaintenance to master - change (mediawiki/core)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/51366 Change subject: Update WikimediaMaintenance to master .. Update WikimediaMaintenance to master Change-Id: I66285c1c8d17dfb86b0ddd35b15b8cb02aa4e9e5 --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/66/51366/1 diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index 7c791a5..abfa23a 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit 7c791a560d17c469faf8e38a2df5094546029dd6 +Subproject commit abfa23a33251c02baabf9c32bd4a186c0e56fea9 -- To view, visit https://gerrit.wikimedia.org/r/51366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66285c1c8d17dfb86b0ddd35b15b8cb02aa4e9e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf10 Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaMaintenance to master - change (mediawiki/core)
Reedy has submitted this change and it was merged. Change subject: Update WikimediaMaintenance to master .. Update WikimediaMaintenance to master Change-Id: I66285c1c8d17dfb86b0ddd35b15b8cb02aa4e9e5 --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index 7c791a5..abfa23a 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit 7c791a560d17c469faf8e38a2df5094546029dd6 +Subproject commit abfa23a33251c02baabf9c32bd4a186c0e56fea9 -- To view, visit https://gerrit.wikimedia.org/r/51366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I66285c1c8d17dfb86b0ddd35b15b8cb02aa4e9e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf10 Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] Bring back wikimedia/chapter even though it's a lie. Broke o... - change (mediawiki...WikimediaMaintenance)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/51367 Change subject: Bring back wikimedia/chapter even though it's a lie. Broke other wikimedia entries .. Bring back wikimedia/chapter even though it's a lie. Broke other wikimedia entries Change-Id: I9299f70dc22e45cefc24806dd76d269b200cf8ff --- M dumpInterwiki.php M rebuildInterwiki.php 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance refs/changes/67/51367/1 diff --git a/dumpInterwiki.php b/dumpInterwiki.php index 9b0c629..44666e5 100644 --- a/dumpInterwiki.php +++ b/dumpInterwiki.php @@ -89,6 +89,7 @@ 'wikibooks' = new WMFSite( 'wikibooks', 'b', 'wikibooks.org' ), 'wikinews' = new WMFSite( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' = new WMFSite( 'wikisource', 's', 'wikisource.org' ), + 'wikimedia' = new WMFSite( 'wikimedia', 'chapter', 'wikimedia.org' ), 'wikiversity' = new WMFSite( 'wikiversity', 'v', 'wikiversity.org' ), 'wikivoyage' = new WMFSite( 'wikivoyage', 'voy', 'wikivoyage.org' ), ); diff --git a/rebuildInterwiki.php b/rebuildInterwiki.php index 8566ae6..d9fbe0a 100644 --- a/rebuildInterwiki.php +++ b/rebuildInterwiki.php @@ -72,6 +72,7 @@ 'wikibooks' = new WMFSite( 'wikibooks', 'b', 'wikibooks.org' ), 'wikinews' = new WMFSite( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' = new WMFSite( 'wikisource', 's', 'wikisource.org' ), + 'wikimedia' = new WMFSite( 'wikimedia', 'chapter', 'wikimedia.org' ), 'wikiversity' = new WMFSite( 'wikiversity', 'v', 'wikiversity.org' ), 'wikivoyage' = new WMFSite( 'wikivoyage', 'voy', 'wikivoyage.org' ), ); -- To view, visit https://gerrit.wikimedia.org/r/51367 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9299f70dc22e45cefc24806dd76d269b200cf8ff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add -q flag to runtests.sh to suppress diff and update Usage... - change (mediawiki...Parsoid)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51368
Change subject: Add -q flag to runtests.sh to suppress diff and update Usage
note
..
Add -q flag to runtests.sh to suppress diff and update Usage note
No diff / quiet mode is useful to run commit tests on master followed by
running diffing on a patch set in a single commandline.
Change-Id: Iab1e276d58608ed686a27c38d137c743175e318a
---
M js/tests/runtests.sh
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/68/51368/1
diff --git a/js/tests/runtests.sh b/js/tests/runtests.sh
index 7fcee7b..d25ce14 100755
--- a/js/tests/runtests.sh
+++ b/js/tests/runtests.sh
@@ -1,10 +1,9 @@
#!/bin/sh
# Simple test runner with result archival in results git repository
# Usage:
-# ./runtests.sh -c# wikitext - HTML DOM tests and commit results
-# ./runtests.sh -r -c # round-trip tests; commit
-# ./runtests.sh # wikitext - HTML DOM; only show diff (no commit)
-# ./runtests.sh -r# round-trip tests; only show diff (no commit)
+# ./runtests.sh -c# run all tests and commit results
+# ./runtests.sh -c -q # run all tests and commit results, no diff
+# ./runtests.sh # run all tests, only show diff (no commit)
# Helper function to echo a message to stderr
warn() {
@@ -73,5 +72,7 @@
else
git commit -m `tail -11 all.txt` all.txt || exit 1
fi
-git diff HEAD~1 | less -R || exit 1
+if [ $2 != '-q'];then
+git diff HEAD~1 | less -R || exit 1
+fi
fi
--
To view, visit https://gerrit.wikimedia.org/r/51368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab1e276d58608ed686a27c38d137c743175e318a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bring back wikimedia/chapter even though it's a lie. Broke o... - change (mediawiki...WikimediaMaintenance)
Reedy has submitted this change and it was merged. Change subject: Bring back wikimedia/chapter even though it's a lie. Broke other wikimedia entries .. Bring back wikimedia/chapter even though it's a lie. Broke other wikimedia entries Change-Id: I9299f70dc22e45cefc24806dd76d269b200cf8ff --- M dumpInterwiki.php M rebuildInterwiki.php 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/dumpInterwiki.php b/dumpInterwiki.php index 9b0c629..44666e5 100644 --- a/dumpInterwiki.php +++ b/dumpInterwiki.php @@ -89,6 +89,7 @@ 'wikibooks' = new WMFSite( 'wikibooks', 'b', 'wikibooks.org' ), 'wikinews' = new WMFSite( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' = new WMFSite( 'wikisource', 's', 'wikisource.org' ), + 'wikimedia' = new WMFSite( 'wikimedia', 'chapter', 'wikimedia.org' ), 'wikiversity' = new WMFSite( 'wikiversity', 'v', 'wikiversity.org' ), 'wikivoyage' = new WMFSite( 'wikivoyage', 'voy', 'wikivoyage.org' ), ); diff --git a/rebuildInterwiki.php b/rebuildInterwiki.php index 8566ae6..d9fbe0a 100644 --- a/rebuildInterwiki.php +++ b/rebuildInterwiki.php @@ -72,6 +72,7 @@ 'wikibooks' = new WMFSite( 'wikibooks', 'b', 'wikibooks.org' ), 'wikinews' = new WMFSite( 'wikinews', 'n', 'wikinews.org' ), 'wikisource' = new WMFSite( 'wikisource', 's', 'wikisource.org' ), + 'wikimedia' = new WMFSite( 'wikimedia', 'chapter', 'wikimedia.org' ), 'wikiversity' = new WMFSite( 'wikiversity', 'v', 'wikiversity.org' ), 'wikivoyage' = new WMFSite( 'wikivoyage', 'voy', 'wikivoyage.org' ), ); -- To view, visit https://gerrit.wikimedia.org/r/51367 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9299f70dc22e45cefc24806dd76d269b200cf8ff Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] Update WikimediaMaintenance to master - change (mediawiki/core)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/51369 Change subject: Update WikimediaMaintenance to master .. Update WikimediaMaintenance to master Change-Id: I76711e3f3efbbc701f21553d79cd7cdd28a3248e --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/69/51369/1 diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index abfa23a..3ccd947 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit abfa23a33251c02baabf9c32bd4a186c0e56fea9 +Subproject commit 3ccd947d8258616ed7eb3fd07f58e68ef6ed095d -- To view, visit https://gerrit.wikimedia.org/r/51369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76711e3f3efbbc701f21553d79cd7cdd28a3248e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf10 Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaMaintenance to master - change (mediawiki/core)
Reedy has submitted this change and it was merged. Change subject: Update WikimediaMaintenance to master .. Update WikimediaMaintenance to master Change-Id: I76711e3f3efbbc701f21553d79cd7cdd28a3248e --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index abfa23a..3ccd947 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit abfa23a33251c02baabf9c32bd4a186c0e56fea9 +Subproject commit 3ccd947d8258616ed7eb3fd07f58e68ef6ed095d -- To view, visit https://gerrit.wikimedia.org/r/51369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I76711e3f3efbbc701f21553d79cd7cdd28a3248e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf10 Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] Removed unused global in jobs-loop (only local one matters). - change (operations/puppet)
ArielGlenn has submitted this change and it was merged. Change subject: Removed unused global in jobs-loop (only local one matters). .. Removed unused global in jobs-loop (only local one matters). Change-Id: Ie2b7db9b438b4c2c8615eaaaccffd10093f9cf99 --- M modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: ArielGlenn: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb b/modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb index 10657a1..d6598f7 100755 --- a/modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb +++ b/modules/mediawiki_new/templates/jobrunner/jobs-loop.sh.erb @@ -58,10 +58,6 @@ # default total memory limit (in kb) for this process and its sub-processes maxvirtualmemory=40 -# Whether to process the default queue. Will be the case if no job type -# was specified on the command line. Else we only want to process given types -dodefault=y - while getopts t:v: flag do case $flag in -- To view, visit https://gerrit.wikimedia.org/r/51363 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2b7db9b438b4c2c8615eaaaccffd10093f9cf99 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: ArielGlenn ar...@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 the d IW link for wikidata to extra - change (mediawiki...WikimediaMaintenance)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/51370 Change subject: Add the d IW link for wikidata to extra .. Add the d IW link for wikidata to extra Change-Id: I90e3ba55463b9d340bf2830c009d964fc1afd33d --- M dumpInterwiki.php M rebuildInterwiki.php 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaMaintenance refs/changes/70/51370/1 diff --git a/dumpInterwiki.php b/dumpInterwiki.php index 44666e5..d79cdbb 100644 --- a/dumpInterwiki.php +++ b/dumpInterwiki.php @@ -104,6 +104,7 @@ array( 'm', $this-urlprotocol . '//meta.wikimedia.org/wiki/$1', 1 ), array( 'meta', $this-urlprotocol . '//meta.wikimedia.org/wiki/$1', 1 ), array( 'sep11', $this-urlprotocol . '//sep11.wikipedia.org/wiki/$1', 1 ), + array( 'd', $this-urlprotocol . '//www.wikidata.org/wiki/$1', 1 ), ); # Language aliases, usually configured as redirects to the real wiki in apache diff --git a/rebuildInterwiki.php b/rebuildInterwiki.php index d9fbe0a..5f73876 100644 --- a/rebuildInterwiki.php +++ b/rebuildInterwiki.php @@ -93,6 +93,7 @@ array( 'm', $this-urlprotocol . '//meta.wikimedia.org/wiki/$1', 1 ), array( 'meta', $this-urlprotocol . '//meta.wikimedia.org/wiki/$1', 1 ), array( 'sep11', $this-urlprotocol . '//sep11.wikipedia.org/wiki/$1', 1 ), + array( 'd', $this-urlprotocol . '//www.wikidata.org/wiki/$1', 1 ), ); # Language aliases, usually configured as redirects to the real wiki in apache -- To view, visit https://gerrit.wikimedia.org/r/51370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I90e3ba55463b9d340bf2830c009d964fc1afd33d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add the d IW link for wikidata to extra - change (mediawiki...WikimediaMaintenance)
Reedy has submitted this change and it was merged. Change subject: Add the d IW link for wikidata to extra .. Add the d IW link for wikidata to extra Change-Id: I90e3ba55463b9d340bf2830c009d964fc1afd33d --- M dumpInterwiki.php M rebuildInterwiki.php 2 files changed, 2 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/dumpInterwiki.php b/dumpInterwiki.php index 44666e5..d79cdbb 100644 --- a/dumpInterwiki.php +++ b/dumpInterwiki.php @@ -104,6 +104,7 @@ array( 'm', $this-urlprotocol . '//meta.wikimedia.org/wiki/$1', 1 ), array( 'meta', $this-urlprotocol . '//meta.wikimedia.org/wiki/$1', 1 ), array( 'sep11', $this-urlprotocol . '//sep11.wikipedia.org/wiki/$1', 1 ), + array( 'd', $this-urlprotocol . '//www.wikidata.org/wiki/$1', 1 ), ); # Language aliases, usually configured as redirects to the real wiki in apache diff --git a/rebuildInterwiki.php b/rebuildInterwiki.php index d9fbe0a..5f73876 100644 --- a/rebuildInterwiki.php +++ b/rebuildInterwiki.php @@ -93,6 +93,7 @@ array( 'm', $this-urlprotocol . '//meta.wikimedia.org/wiki/$1', 1 ), array( 'meta', $this-urlprotocol . '//meta.wikimedia.org/wiki/$1', 1 ), array( 'sep11', $this-urlprotocol . '//sep11.wikipedia.org/wiki/$1', 1 ), + array( 'd', $this-urlprotocol . '//www.wikidata.org/wiki/$1', 1 ), ); # Language aliases, usually configured as redirects to the real wiki in apache -- To view, visit https://gerrit.wikimedia.org/r/51370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I90e3ba55463b9d340bf2830c009d964fc1afd33d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaMaintenance Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] Update WikimediaMaintenance to master - change (mediawiki/core)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/51371 Change subject: Update WikimediaMaintenance to master .. Update WikimediaMaintenance to master Change-Id: I3c6a1dc8e635d66b87fd28be2f7c88f406d0456f --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/71/51371/1 diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index 3ccd947..78dc331 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit 3ccd947d8258616ed7eb3fd07f58e68ef6ed095d +Subproject commit 78dc331cae4bc5b813b95c247a18059b0d64cd80 -- To view, visit https://gerrit.wikimedia.org/r/51371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c6a1dc8e635d66b87fd28be2f7c88f406d0456f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf10 Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improvement to diff view - change (mediawiki...MobileFrontend)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51372
Change subject: Improvement to diff view
..
Improvement to diff view
Avoid repeating lines by not targetting del or ins elements
Use css3 pseudo element to add + and - value
Change-Id: I849254201df5bd2062cd3fd921e6b2b97537d4f6
---
M includes/specials/SpecialMobileDiff.php
M stylesheets/less/specials/watchlist.less
M stylesheets/specials/watchlist.css
3 files changed, 18 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/72/51372/1
diff --git a/includes/specials/SpecialMobileDiff.php
b/includes/specials/SpecialMobileDiff.php
index 63a6a5f..9a8e495 100644
--- a/includes/specials/SpecialMobileDiff.php
+++ b/includes/specials/SpecialMobileDiff.php
@@ -106,17 +106,17 @@
$doc = new DOMDocument();
$doc-loadHtml( '?xml encoding=utf-8' . $diff );
$xpath = new DOMXpath( $doc );
- $els = $xpath-query( //td[@class='diff-deletedline'] |
//td[@class='diff-addedline'] | //del | //ins );
+ $els = $xpath-query( //td[@class='diff-deletedline'] |
//td[@class='diff-addedline'] );
$out .= Html::element( 'div', array( 'class' = 'heading' ),
$this-msg( 'mobile-frontend-diffview-explained'
)-plain() );
/** @var $el DOMElement */
foreach( $els as $el ) {
$name = $el-nodeName;
$class = $el-getAttribute( 'class' );
- if ( $name === 'del' || $class === 'diff-deletedline' )
{
- $out .= Html::element( 'del', array(), '- ' .
$el-nodeValue );
+ if ( $class === 'diff-deletedline' ) {
+ $out .= Html::element( 'del', array(),
$el-nodeValue );
} else {
- $out .= Html::element( 'ins', array(), '+ ' .
$el-nodeValue );
+ $out .= Html::element( 'ins', array(),
$el-nodeValue );
}
}
diff --git a/stylesheets/less/specials/watchlist.less
b/stylesheets/less/specials/watchlist.less
index 9ae3fed..b95042b 100644
--- a/stylesheets/less/specials/watchlist.less
+++ b/stylesheets/less/specials/watchlist.less
@@ -176,6 +176,14 @@
padding-left: 8px;
}
+ ins::before {
+ content: + ;
+ }
+
+ del::before {
+ content: - ;
+ }
+
#mw-mf-userinfo .mw-mf-roles,
.mw-mf-diff-date,
.mw-mf-bytesremoved,
diff --git a/stylesheets/specials/watchlist.css
b/stylesheets/specials/watchlist.css
index e3e9d30..78596b0 100644
--- a/stylesheets/specials/watchlist.css
+++ b/stylesheets/specials/watchlist.css
@@ -158,6 +158,12 @@
display: block;
padding-left: 8px;
}
+#mw-mf-diffview ins::before {
+ content: + ;
+}
+#mw-mf-diffview del::before {
+ content: - ;
+}
#mw-mf-diffview #mw-mf-userinfo .mw-mf-roles,
#mw-mf-diffview .mw-mf-diff-date,
#mw-mf-diffview .mw-mf-bytesremoved,
--
To view, visit https://gerrit.wikimedia.org/r/51372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I849254201df5bd2062cd3fd921e6b2b97537d4f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove x86-mingw32 platform - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/51375 Change subject: Remove x86-mingw32 platform .. Remove x86-mingw32 platform We do not run tests on Windows. Change-Id: I91d073711876193c147e597f13b1a052c0d90785 --- M Gemfile.lock 1 file changed, 0 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/75/51375/1 diff --git a/Gemfile.lock b/Gemfile.lock old mode 100755 new mode 100644 index c6f737e..a1f8775 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,7 @@ faker (1.1.2) i18n (~ 0.5) ffi (1.4.0) -ffi (1.4.0-x86-mingw32) gherkin (2.11.6) - json (= 1.7.6) -gherkin (2.11.6-x86-mingw32) json (= 1.7.6) i18n (0.6.3) json (1.7.7) @@ -52,7 +49,6 @@ PLATFORMS ruby - x86-mingw32 DEPENDENCIES chunky_png -- To view, visit https://gerrit.wikimedia.org/r/51375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91d073711876193c147e597f13b1a052c0d90785 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use https to access rubygems.org - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/51374 Change subject: Use https to access rubygems.org .. Use https to access rubygems.org Change-Id: I86de3ecf411c2865b50c39b254bcd36e9340f6fa --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/74/51374/1 diff --git a/Gemfile b/Gemfile index e108958..5400d13 100755 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' gem 'chunky_png' gem 'cucumber' -- To view, visit https://gerrit.wikimedia.org/r/51374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86de3ecf411c2865b50c39b254bcd36e9340f6fa Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Downgrade to page-object 0.8.5 - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/51376 Change subject: Downgrade to page-object 0.8.5 .. Downgrade to page-object 0.8.5 Fixing Could not find page-object-0.8.6 in any of the sources error. Change-Id: I2ea3d4beb4676fac1fe68f3ac7c45099bd3e43e4 --- M Gemfile.lock 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/76/51376/1 diff --git a/Gemfile.lock b/Gemfile.lock index a1f8775..5927137 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,11 +19,11 @@ ffi (1.4.0) gherkin (2.11.6) json (= 1.7.6) -i18n (0.6.3) +i18n (0.6.4) json (1.7.7) multi_json (1.6.1) net-http-persistent (2.8) -page-object (0.8.6) +page-object (0.8.5) page_navigation (= 0.6) selenium-webdriver (= 2.30.0) watir-webdriver (= 0.6.2) -- To view, visit https://gerrit.wikimedia.org/r/51376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ea3d4beb4676fac1fe68f3ac7c45099bd3e43e4 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update WikimediaMaintenance to master - change (mediawiki/core)
Reedy has submitted this change and it was merged. Change subject: Update WikimediaMaintenance to master .. Update WikimediaMaintenance to master Change-Id: I3c6a1dc8e635d66b87fd28be2f7c88f406d0456f --- M extensions/WikimediaMaintenance 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/extensions/WikimediaMaintenance b/extensions/WikimediaMaintenance index 3ccd947..78dc331 16 --- a/extensions/WikimediaMaintenance +++ b/extensions/WikimediaMaintenance -Subproject commit 3ccd947d8258616ed7eb3fd07f58e68ef6ed095d +Subproject commit 78dc331cae4bc5b813b95c247a18059b0d64cd80 -- To view, visit https://gerrit.wikimedia.org/r/51371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c6a1dc8e635d66b87fd28be2f7c88f406d0456f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf10 Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Reedy re...@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 -q flag to runtests.sh to suppress diff and update Usage... - change (mediawiki...Parsoid)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51377
Change subject: Add -q flag to runtests.sh to suppress diff and update Usage
note
..
Add -q flag to runtests.sh to suppress diff and update Usage note
No diff / quiet mode is useful to run commit tests on master followed by
running diffing on a patch set in a single commandline.
Change-Id: If0c52e441ed6fec9f4c4937b18bfebd4519000a8
---
M js/tests/runtests.sh
1 file changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Parsoid
refs/changes/77/51377/1
diff --git a/js/tests/runtests.sh b/js/tests/runtests.sh
index 7fcee7b..d25ce14 100755
--- a/js/tests/runtests.sh
+++ b/js/tests/runtests.sh
@@ -1,10 +1,9 @@
#!/bin/sh
# Simple test runner with result archival in results git repository
# Usage:
-# ./runtests.sh -c# wikitext - HTML DOM tests and commit results
-# ./runtests.sh -r -c # round-trip tests; commit
-# ./runtests.sh # wikitext - HTML DOM; only show diff (no commit)
-# ./runtests.sh -r# round-trip tests; only show diff (no commit)
+# ./runtests.sh -c# run all tests and commit results
+# ./runtests.sh -c -q # run all tests and commit results, no diff
+# ./runtests.sh # run all tests, only show diff (no commit)
# Helper function to echo a message to stderr
warn() {
@@ -73,5 +72,7 @@
else
git commit -m `tail -11 all.txt` all.txt || exit 1
fi
-git diff HEAD~1 | less -R || exit 1
+if [ $2 != '-q'];then
+git diff HEAD~1 | less -R || exit 1
+fi
fi
--
To view, visit https://gerrit.wikimedia.org/r/51377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0c52e441ed6fec9f4c4937b18bfebd4519000a8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jobs for mw/ext/Agora - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/51378 Change subject: jobs for mw/ext/Agora .. jobs for mw/ext/Agora Change-Id: I6d2e50cd4bf95772d3dff88c131413a0f4efda34 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/78/51378/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 2952302..dc06c36 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -109,6 +109,7 @@ ext-name: - AdminLinks + - Agora - APC - ApiSandbox - Ask -- To view, visit https://gerrit.wikimedia.org/r/51378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d2e50cd4bf95772d3dff88c131413a0f4efda34 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jobs for mw/ext/Agora - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: jobs for mw/ext/Agora .. jobs for mw/ext/Agora Change-Id: I6d2e50cd4bf95772d3dff88c131413a0f4efda34 --- M mediawiki-extensions.yaml 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 2952302..dc06c36 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -109,6 +109,7 @@ ext-name: - AdminLinks + - Agora - APC - ApiSandbox - Ask -- To view, visit https://gerrit.wikimedia.org/r/51378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6d2e50cd4bf95772d3dff88c131413a0f4efda34 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use https to access rubygems.org - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Use https to access rubygems.org .. Use https to access rubygems.org Change-Id: I86de3ecf411c2865b50c39b254bcd36e9340f6fa --- M Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/Gemfile b/Gemfile index e108958..5400d13 100755 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' gem 'chunky_png' gem 'cucumber' -- To view, visit https://gerrit.wikimedia.org/r/51374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86de3ecf411c2865b50c39b254bcd36e9340f6fa Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove x86-mingw32 platform - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Remove x86-mingw32 platform .. Remove x86-mingw32 platform We do not run tests on Windows. Change-Id: I91d073711876193c147e597f13b1a052c0d90785 --- M Gemfile.lock 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/Gemfile.lock b/Gemfile.lock old mode 100755 new mode 100644 index c6f737e..a1f8775 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,10 +17,7 @@ faker (1.1.2) i18n (~ 0.5) ffi (1.4.0) -ffi (1.4.0-x86-mingw32) gherkin (2.11.6) - json (= 1.7.6) -gherkin (2.11.6-x86-mingw32) json (= 1.7.6) i18n (0.6.3) json (1.7.7) @@ -52,7 +49,6 @@ PLATFORMS ruby - x86-mingw32 DEPENDENCIES chunky_png -- To view, visit https://gerrit.wikimedia.org/r/51375 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I91d073711876193c147e597f13b1a052c0d90785 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lock multiple CentralAuth accounts at once - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Lock multiple CentralAuth accounts at once
..
Lock multiple CentralAuth accounts at once
Lock multiple accounts by inputting multiple names, or searching for a
prefix.
[[mw:Admin_tools_development/CentralAuth_Locking]]
Change-Id: If9cd34d3e1f121f5ab8ad4fb708ccc268391788a
---
M CentralAuth.alias.php
M CentralAuth.i18n.php
M CentralAuth.php
M CentralAuthUser.php
A specials/SpecialMultiLock.php
5 files changed, 596 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/CentralAuth.alias.php b/CentralAuth.alias.php
index a0fadba..3e156e1 100644
--- a/CentralAuth.alias.php
+++ b/CentralAuth.alias.php
@@ -17,6 +17,7 @@
'GlobalGroupPermissions' = array( 'GlobalGroupPermissions' ),
'WikiSets' = array( 'WikiSets', 'EditWikiSets' ),
'GlobalUsers' = array( 'GlobalUsers' ),
+ 'MultiLock' = array( 'MultiLock' ),
);
/** Afrikaans (Afrikaans) */
@@ -774,4 +775,4 @@
/** Chinese (Hong Kong) (中文（香港）) */
$specialPageAliases['zh-hk'] = array(
'GlobalGroupMembership' = array( '全域用戶權限' ),
-);
\ No newline at end of file
+);
diff --git a/CentralAuth.i18n.php b/CentralAuth.i18n.php
index 051862e..2c3875a 100644
--- a/CentralAuth.i18n.php
+++ b/CentralAuth.i18n.php
@@ -209,6 +209,7 @@
** inappropriate personal information',
'centralauth-admin-logsnippet' = 'Previous global account
changes',
'centralauth-admin-suppressreason' = 'Globally suppressed by $1
for following reason: $2',
+ 'centralauth-admin-not-authorized' = 'You do not have permissions
to perform this action',
// List of global users
@@ -217,6 +218,20 @@
'centralauth-listusers-attached' = '[[User:$1|exists locally]]',
'centralauth-listusers-item' = '[[Special:CentralAuth/$1|$1]]
($2)',
'centralauth-listusers-nolocal' = 'unattached or doesn\'t exist
locally',
+
+ // MultiLock
+ 'multilock' = 'Lock Multiple
Global Users',
+ 'centralauth-admin-multi-username' = 'Enter one or more
usernames, separated by new-line',
+ 'centralauth-admin-multi-notfound' = 'Search returned no
usernames.',
+ 'centralauth-admin-multi-searchprefix' = 'Or, search for
accounts with a prefix',
+ 'centralauth-admin-multi-intro' = 'Update multiple
global users at once',
+ 'centralauth-admin-action-lock-nochange'= 'Don\'t change
locks',
+ 'centralauth-admin-action-lock-lock'= 'Lock selected
accounts',
+ 'centralauth-admin-action-lock-unlock' = 'Unlock selected
accounts',
+ 'centralauth-admin-action-hide-nochange'= 'Don\'t change
hidden levels',
+ 'centralauth-admin-action-hide-none'= 'Unhide selected
accounts',
+ 'centralauth-admin-action-hide-lists' = 'Hide selected
accounts from public lists',
+ 'centralauth-admin-action-hide-oversight' = 'Completely hide
selected accounts',
// Pretty timespan
'centralauth-seconds-ago' = '$1 {{PLURAL:$1|second|seconds}} ago',
@@ -380,6 +395,9 @@
// AbuseFilter integration for global_user_groups variable - see
CentralAuthHooks::abuseFilter*
'abusefilter-edit-builder-vars-global-user-groups' = 'Global groups
that the user is in',
+
+ // Associated actions - in the sentence You do not have permission to
X
+ 'action-centralauth-lock' = 'lock or unlock global
accounts',
);
/** Message documentation (Message documentation)
@@ -595,11 +613,24 @@
*{{msg-mw|Centralauth-admin-status-hidden-no}}
*{{msg-mw|Centralauth-admin-status-hidden-list}}
*{{msg-mw|Centralauth-admin-status-hidden-oversight}}',
+ 'centralauth-admin-not-authorized' = 'Error message when the user
doesn\'t have permission',
'centralauth-listusers-locked' = This message is used as user's info:
*{{msg-mw|centralauth-listusers-locked}}
*{{msg-mw|centralauth-listusers-attached}}
*{{msg-mw|centralauth-listusers-nolocal}}
-{{Identical|Locked}},
+{{identical|locked}},
+ 'centralauth-admin-action-lock-nochange' = 'Radio button, leave
settings unchanged',
+ 'centralauth-admin-action-lock-lock' = 'Radio button, lock accounts',
+ 'centralauth-admin-action-lock-unlock' = 'Radio button, unlock
accounts',
+ 'centralauth-admin-action-hide-nochange' = 'Radio button, leave
settings unchanged',
+ 'centralauth-admin-action-hide-none' = 'Radio button, unhide accounts',
+ 'centralauth-admin-action-hide-lists' = 'Radio button, hide accounts',
+ 'centralauth-admin-action-hide-oversight' = 'Radio button, suppress
accounts',
+ 'centralauth-admin-multi-username' = 'Instructions for text box where
admin will
[MediaWiki-commits] [Gerrit] Downgrade to page-object 0.8.5 - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Downgrade to page-object 0.8.5 .. Downgrade to page-object 0.8.5 Fixing Could not find page-object-0.8.6 in any of the sources error. Change-Id: I2ea3d4beb4676fac1fe68f3ac7c45099bd3e43e4 --- M Gemfile.lock 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/Gemfile.lock b/Gemfile.lock index a1f8775..5927137 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,11 +19,11 @@ ffi (1.4.0) gherkin (2.11.6) json (= 1.7.6) -i18n (0.6.3) +i18n (0.6.4) json (1.7.7) multi_json (1.6.1) net-http-persistent (2.8) -page-object (0.8.6) +page-object (0.8.5) page_navigation (= 0.6) selenium-webdriver (= 2.30.0) watir-webdriver (= 0.6.2) -- To view, visit https://gerrit.wikimedia.org/r/51376 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ea3d4beb4676fac1fe68f3ac7c45099bd3e43e4 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make user name more generic - change (mediawiki...MobileFrontend)
Cmcmahon has submitted this change and it was merged. Change subject: Make user name more generic .. Make user name more generic We are not using the user only for upload wizard tests any more. Change-Id: Ic50660e1ffcc3eea5c0f76a70a6c9f4cdde2198f --- M tests/acceptance/config/config.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cmcmahon: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/tests/acceptance/config/config.yml b/tests/acceptance/config/config.yml index 59b0794..b5f5546 100644 --- a/tests/acceptance/config/config.yml +++ b/tests/acceptance/config/config.yml @@ -1,4 +1,4 @@ -mediawiki_username: uploadwizardtest +mediawiki_username: Selenium_user android: name: android -- To view, visit https://gerrit.wikimedia.org/r/51316 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic50660e1ffcc3eea5c0f76a70a6c9f4cdde2198f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org Gerrit-Reviewer: Mgrover mgro...@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] triggers for mw/ext/Agora - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/51379 Change subject: triggers for mw/ext/Agora .. triggers for mw/ext/Agora Change-Id: I75695070ff16c9c3019b2f15291dc1cb04029b61 --- M layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/79/51379/1 diff --git a/layout.yaml b/layout.yaml index b52c49d..29d6d8a 100644 --- a/layout.yaml +++ b/layout.yaml @@ -474,6 +474,16 @@ - mwext-AdminLinks-jslint - mwext-AdminLinks-lint + - name: mediawiki/extensions/Agora +check: + - mwext-Agora-merge: +- mwext-Agora-jslint +- mwext-Agora-lint +gate-and-submit: + - mwext-Agora-merge: +- mwext-Agora-jslint +- mwext-Agora-lint + - name: mediawiki/extensions/APC check: - mwext-APC-merge: -- To view, visit https://gerrit.wikimedia.org/r/51379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I75695070ff16c9c3019b2f15291dc1cb04029b61 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] triggers for mw/ext/Agora - change (integration/zuul-config)
Hashar has submitted this change and it was merged. Change subject: triggers for mw/ext/Agora .. triggers for mw/ext/Agora Change-Id: I75695070ff16c9c3019b2f15291dc1cb04029b61 --- M layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/layout.yaml b/layout.yaml index b52c49d..29d6d8a 100644 --- a/layout.yaml +++ b/layout.yaml @@ -474,6 +474,16 @@ - mwext-AdminLinks-jslint - mwext-AdminLinks-lint + - name: mediawiki/extensions/Agora +check: + - mwext-Agora-merge: +- mwext-Agora-jslint +- mwext-Agora-lint +gate-and-submit: + - mwext-Agora-merge: +- mwext-Agora-jslint +- mwext-Agora-lint + - name: mediawiki/extensions/APC check: - mwext-APC-merge: -- To view, visit https://gerrit.wikimedia.org/r/51379 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I75695070ff16c9c3019b2f15291dc1cb04029b61 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] LinkHandler: Clone tokens before modifying them. - change (mediawiki...Parsoid)
GWicke has submitted this change and it was merged.
Change subject: LinkHandler: Clone tokens before modifying them.
..
LinkHandler: Clone tokens before modifying them.
* One more instance where cloning was required.
* Add missing check for non-empty stack.
* No change in parser test results.
* Fixes crashers in several pages found in RT testing.
Change-Id: I8f0e422ec4bbc04db6654c2accc92a49fa0b8c8a
---
M js/lib/ext.core.LinkHandler.js
1 file changed, 21 insertions(+), 10 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/js/lib/ext.core.LinkHandler.js b/js/lib/ext.core.LinkHandler.js
index e57680b..72bac31 100644
--- a/js/lib/ext.core.LinkHandler.js
+++ b/js/lib/ext.core.LinkHandler.js
@@ -507,25 +507,36 @@
// too. This would need to apply phase 3 token transforms, as the
caption
// as an attribute is already expanded to phase 2.
function closeUnclosedBlockTags(tokens) {
- var t;
- var openBlockTagStack = [];
- for (var i = 0, n = tokens.length; i n; i++) {
+ var i, j, n, t,
+ // Store the index of a token in the 'tokens' array
+ // rather than the token itself.
+ openBlockTagStack = [];
+
+ for (i = 0, n = tokens.length; i n; i++) {
t = tokens[i];
if (Util.isBlockToken(t)) {
if (t.constructor === TagTk) {
- openBlockTagStack.push(t);
- } else if (t.constructor === EndTagTk) {
- if (openBlockTagStack.last().name ===
t.name) {
+ openBlockTagStack.push(i);
+ } else if (t.constructor === EndTagTk
openBlockTagStack.length 0) {
+ if
(tokens[openBlockTagStack.last()].name === t.name) {
openBlockTagStack.pop();
}
}
}
}
- for (i = 0, n = openBlockTagStack.length; i n; i++) {
- t = openBlockTagStack.pop();
- t.dataAttribs.autoInsertedEnd = true;
- tokens.push(new EndTagTk(t.name));
+ n = openBlockTagStack.length;
+ if (n 0) {
+ if (Object.isFrozen(tokens)) {
+ tokens = tokens.slice();
+ }
+ for (i = 0; i n; i++) {
+ j = openBlockTagStack.pop();
+ t = tokens[j].clone();
+ t.dataAttribs.autoInsertedEnd = true;
+ tokens[j] = t;
+ tokens.push(new EndTagTk(t.name));
+ }
}
return tokens;
--
To view, visit https://gerrit.wikimedia.org/r/51335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f0e422ec4bbc04db6654c2accc92a49fa0b8c8a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@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] relocating the main commons search-index within pool4 to the... - change (operations/puppet)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51380
Change subject: relocating the main commons search-index within pool4 to the
relatively empty spelling index hosts
..
relocating the main commons search-index within pool4 to the relatively empty
spelling index hosts
Change-Id: I14eb0f4c8ae60fa52f707171027369f75787e144
---
M manifests/role/lucene.pp
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/51380/1
diff --git a/manifests/role/lucene.pp b/manifests/role/lucene.pp
index 1458f92..1d57c89 100644
--- a/manifests/role/lucene.pp
+++ b/manifests/role/lucene.pp
@@ -92,10 +92,12 @@
'itwiki.nspart2',
'nlwiki.nspart2', 'ruwiki.nspart2', 'svwiki.nspart2', ' plwiki.nspart2',
'ptwiki.nspart2', 'zhwiki.nspart2'],
},
pool4 = {
- search13 =
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl', '*?'],
- search14 =
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl', '*?'],
- search15 =
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
- search16 =
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
+ search13 = ['*?'],
+ search14 = ['*?'],
+ search15 =
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl',
+
'(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
+ search16 =
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl',
+
'(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
search17 =
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.|jawiki.|zhwiki.))*.hl'],
search18 =
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.|jawiki.|zhwiki.))*.hl'],
},
--
To view, visit https://gerrit.wikimedia.org/r/51380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I14eb0f4c8ae60fa52f707171027369f75787e144
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher afeld...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Agora)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/51381 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Change-Id: I57f51a913f41e6d57cd918b00fffed07dd9f66ee --- A JENKINS 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Agora refs/changes/81/51381/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS -- To view, visit https://gerrit.wikimedia.org/r/51381 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I57f51a913f41e6d57cd918b00fffed07dd9f66ee Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Agora Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix type of tokens passed to cb's to ensure they are arrays. - change (mediawiki...Parsoid)
GWicke has submitted this change and it was merged.
Change subject: Fix type of tokens passed to cb's to ensure they are arrays.
..
Fix type of tokens passed to cb's to ensure they are arrays.
* Local RT testing emitted warnings about non-array tokens being
received from parser functions code.
* Fixed up a few sites that were the source of warnings.
* No change in parser test results.
Change-Id: I74dcb68dc4fba2ee0582769b400afb9434cbc8c9
---
M js/lib/ext.core.ParserFunctions.js
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/js/lib/ext.core.ParserFunctions.js
b/js/lib/ext.core.ParserFunctions.js
index 0c27de4..55d3145 100644
--- a/js/lib/ext.core.ParserFunctions.js
+++ b/js/lib/ext.core.ParserFunctions.js
@@ -33,7 +33,7 @@
} else if (k.constructor === Array k.length 0) {
return k.concat( ['='], v );
} else {
- return trim ? Util.tokenTrim(v) : v;
+ return trim ? (v.constructor === String ? v.trim() :
Util.tokenTrim(v)) : v;
}
};
@@ -54,7 +54,7 @@
if ( kv.k ) {
cb( { tokens: [kv.k + '=' + kv.v] } );
} else {
- cb( { tokens: trim ? Util.tokenTrim([kv.v]) : [kv.v] }
);
+ cb( { tokens: [trim ? kv.v.trim() : kv.v] } );
}
} else {
var self = this,
@@ -217,7 +217,7 @@
cb ( {} );
}
} else if ( v ) {
- cb( { tokens: v } );
+ cb( { tokens: v.constructor === Array ? v : [v] } );
} else {
// nothing found at all.
cb( {} );
@@ -236,7 +236,9 @@
this.env.dp( 'switch found: ', target, dict, ' res=',
dict[target] );
dict[target].get({
type: 'tokens/x-mediawiki/expanded',
- cb: function( res ) { cb ( { tokens:
Util.tokenTrim(res) } ); },
+ cb: function( res ) {
+ cb ( { tokens: res.constructor === String ?
[res.trim()] : Util.tokenTrim(res) } );
+ },
asyncCB: cb
});
} else {
--
To view, visit https://gerrit.wikimedia.org/r/51275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74dcb68dc4fba2ee0582769b400afb9434cbc8c9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@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] Remove wgLegalTitleChars, same as default - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/51382 Change subject: Remove wgLegalTitleChars, same as default .. Remove wgLegalTitleChars, same as default Change-Id: I3aee1a3917f10438a769f564947475310d539390 --- M wmf-config/CommonSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/82/51382/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index d4705f1..656e166 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -329,7 +329,6 @@ $wgUseTeX = true; $wgTmpDirectory = '/tmp'; -$wgLegalTitleChars = + %!\$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF; $wgSQLMode = null; -- To view, visit https://gerrit.wikimedia.org/r/51382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3aee1a3917f10438a769f564947475310d539390 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use https to access rubygems.org - change (mediawiki...MobileFrontend)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/51383 Change subject: Use https to access rubygems.org .. Use https to access rubygems.org Change-Id: I9184b78ab014d1493ca2729c34f35d62f2402c47 --- M tests/acceptance/Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/83/51383/1 diff --git a/tests/acceptance/Gemfile b/tests/acceptance/Gemfile index e108958..5400d13 100755 --- a/tests/acceptance/Gemfile +++ b/tests/acceptance/Gemfile @@ -1,4 +1,4 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' gem 'chunky_png' gem 'cucumber' -- To view, visit https://gerrit.wikimedia.org/r/51383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9184b78ab014d1493ca2729c34f35d62f2402c47 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Downgrade page-object gem to 0.8.5 - change (mediawiki...MobileFrontend)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/51384 Change subject: Downgrade page-object gem to 0.8.5 .. Downgrade page-object gem to 0.8.5 Fixing Could not find page-object-0.8.6 in any of the sources error. Change-Id: I81e658e26432542d2f9ef6bfe783b7a4e2d9f4c7 --- M tests/acceptance/Gemfile.lock 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/84/51384/1 diff --git a/tests/acceptance/Gemfile.lock b/tests/acceptance/Gemfile.lock index a1f8775..233d22e 100644 --- a/tests/acceptance/Gemfile.lock +++ b/tests/acceptance/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: builder (3.2.0) childprocess (0.3.8) @@ -19,11 +19,11 @@ ffi (1.4.0) gherkin (2.11.6) json (= 1.7.6) -i18n (0.6.3) +i18n (0.6.4) json (1.7.7) multi_json (1.6.1) net-http-persistent (2.8) -page-object (0.8.6) +page-object (0.8.5) page_navigation (= 0.6) selenium-webdriver (= 2.30.0) watir-webdriver (= 0.6.2) -- To view, visit https://gerrit.wikimedia.org/r/51384 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81e658e26432542d2f9ef6bfe783b7a4e2d9f4c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix the config setup in parse.js - change (mediawiki...Parsoid)
GWicke has submitted this change and it was merged.
Change subject: Fix the config setup in parse.js
..
Fix the config setup in parse.js
There's an instance of using parsoidConfig before we define it. Now fixed.
Change-Id: I4ff9bdd85506a96642960fd9f29e392fd692469d
---
M js/tests/parse.js
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/js/tests/parse.js b/js/tests/parse.js
index 0e2e146..cfa9032 100644
--- a/js/tests/parse.js
+++ b/js/tests/parse.js
@@ -173,13 +173,16 @@
var prefix = argv.prefix || null;
- if (argv.apiURL) {
- parsoidConfig.setInterwiki( 'customwiki', argv.apiURL );
+ if ( argv.apiURL ) {
prefix = 'customwiki';
}
var parsoidConfig = new ParsoidConfig( null, { defaultWiki: prefix } );
+ if ( argv.apiURL ) {
+ parsoidConfig.setInterwiki( 'customwiki', argv.apiURL );
+ }
+
ParserEnv.getParserEnv( parsoidConfig, null, prefix, argv.pagename ||
null, function ( err, env ) {
if ( err !== null ) {
console.error( err.toString() );
--
To view, visit https://gerrit.wikimedia.org/r/50777
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ff9bdd85506a96642960fd9f29e392fd692469d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: Cscott wikime...@cscott.net
Gerrit-Reviewer: GWicke gwi...@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] Remove wgLegalTitleChars, same as default - change (operations/mediawiki-config)
Reedy has submitted this change and it was merged. Change subject: Remove wgLegalTitleChars, same as default .. Remove wgLegalTitleChars, same as default Change-Id: I3aee1a3917f10438a769f564947475310d539390 --- M wmf-config/CommonSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Reedy: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index d4705f1..656e166 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -329,7 +329,6 @@ $wgUseTeX = true; $wgTmpDirectory = '/tmp'; -$wgLegalTitleChars = + %!\$'()*,\\-.\\/0-9:;=?@A-Z^_`a-z~\\x80-\\xFF; $wgSQLMode = null; -- To view, visit https://gerrit.wikimedia.org/r/51382 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3aee1a3917f10438a769f564947475310d539390 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Reedy re...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] Downgrade page-object gem to 0.8.5 - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged. Change subject: Downgrade page-object gem to 0.8.5 .. Downgrade page-object gem to 0.8.5 Fixing Could not find page-object-0.8.6 in any of the sources error. Change-Id: I81e658e26432542d2f9ef6bfe783b7a4e2d9f4c7 --- M tests/acceptance/Gemfile.lock 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/tests/acceptance/Gemfile.lock b/tests/acceptance/Gemfile.lock index a1f8775..233d22e 100644 --- a/tests/acceptance/Gemfile.lock +++ b/tests/acceptance/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: builder (3.2.0) childprocess (0.3.8) @@ -19,11 +19,11 @@ ffi (1.4.0) gherkin (2.11.6) json (= 1.7.6) -i18n (0.6.3) +i18n (0.6.4) json (1.7.7) multi_json (1.6.1) net-http-persistent (2.8) -page-object (0.8.6) +page-object (0.8.5) page_navigation (= 0.6) selenium-webdriver (= 2.30.0) watir-webdriver (= 0.6.2) -- To view, visit https://gerrit.wikimedia.org/r/51384 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I81e658e26432542d2f9ef6bfe783b7a4e2d9f4c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@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] Use https to access rubygems.org - change (mediawiki...MobileFrontend)
Cmcmahon has submitted this change and it was merged. Change subject: Use https to access rubygems.org .. Use https to access rubygems.org Change-Id: I9184b78ab014d1493ca2729c34f35d62f2402c47 --- M tests/acceptance/Gemfile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cmcmahon: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/tests/acceptance/Gemfile b/tests/acceptance/Gemfile index e108958..5400d13 100755 --- a/tests/acceptance/Gemfile +++ b/tests/acceptance/Gemfile @@ -1,4 +1,4 @@ -source 'http://rubygems.org' +source 'https://rubygems.org' gem 'chunky_png' gem 'cucumber' -- To view, visit https://gerrit.wikimedia.org/r/51383 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9184b78ab014d1493ca2729c34f35d62f2402c47 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@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] Use https to access rubygems.org - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/51385 Change subject: Use https to access rubygems.org .. Use https to access rubygems.org Change-Id: I2963af5f154e21497cc54d6e695710c36a37a31d --- M Gemfile.lock 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/85/51385/1 diff --git a/Gemfile.lock b/Gemfile.lock index 5927137..233d22e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: builder (3.2.0) childprocess (0.3.8) -- To view, visit https://gerrit.wikimedia.org/r/51385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2963af5f154e21497cc54d6e695710c36a37a31d Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use https to access rubygems.org - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Use https to access rubygems.org .. Use https to access rubygems.org Change-Id: I2963af5f154e21497cc54d6e695710c36a37a31d --- M Gemfile.lock 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/Gemfile.lock b/Gemfile.lock index 5927137..233d22e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GEM - remote: http://rubygems.org/ + remote: https://rubygems.org/ specs: builder (3.2.0) childprocess (0.3.8) -- To view, visit https://gerrit.wikimedia.org/r/51385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2963af5f154e21497cc54d6e695710c36a37a31d Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin zfili...@wikimedia.org Gerrit-Reviewer: Cmcmahon cmcma...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix commit 5782d0838 - change (mediawiki...Maintenance)
Skizzerz has submitted this change and it was merged. Change subject: Fix commit 5782d0838 .. Fix commit 5782d0838 clearStats -- clearCacheStats Change-Id: If8278451bb9d7ede2fac6dbf0cfa8121e14d6dd9 --- M metadata.ini 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Skizzerz: Verified; Looks good to me, approved diff --git a/metadata.ini b/metadata.ini index e5fbebe..17f761e 100644 --- a/metadata.ini +++ b/metadata.ini @@ -102,7 +102,7 @@ output[] = db regex (.*)\.\.\. output[] = done string done -[clearStats] +[clearCacheStats] enabled = 0 [convertLinks] -- To view, visit https://gerrit.wikimedia.org/r/49206 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8278451bb9d7ede2fac6dbf0cfa8121e14d6dd9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Maintenance Gerrit-Branch: master Gerrit-Owner: Waldir wal...@email.com Gerrit-Reviewer: Skizzerz skizz...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Throw error when interwiki is given for various title p... - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51386
Change subject: API: Throw error when interwiki is given for various title param
..
API: Throw error when interwiki is given for various title param
See bug 44341 for action=parse, but the problem with interwiki
processing can also be happen in other modules.
This gives clearer error message on some modules
For example:
Bad title *title*
instead of:
Unknown error: immobile-target-namespace-iw
Change-Id: I86524533dfd778a169b3996818a1f531efeb
---
M includes/api/ApiBase.php
M includes/api/ApiComparePages.php
M includes/api/ApiEditPage.php
M includes/api/ApiExpandTemplates.php
M includes/api/ApiFileRevert.php
M includes/api/ApiMove.php
M includes/api/ApiParse.php
M includes/api/ApiQueryAllMessages.php
M includes/api/ApiRollback.php
M includes/api/ApiUndelete.php
M includes/api/ApiWatch.php
11 files changed, 12 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/86/51386/1
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index aff7a2e..d90ea26 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -756,7 +756,7 @@
$pageObj = null;
if ( isset( $params['title'] ) ) {
$titleObj = Title::newFromText( $params['title'] );
- if ( !$titleObj ) {
+ if ( !$titleObj || $titleObj-isExternal() ) {
$this-dieUsageMsg( array( 'invalidtitle',
$params['title'] ) );
}
if ( !$titleObj-canExist() ) {
diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index 6b894c1..79ffcb0 100644
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -85,7 +85,7 @@
return $revision;
} elseif( $titleText ) {
$title = Title::newFromText( $titleText );
- if( !$title ) {
+ if( !$title || $title-isExternal() ) {
$this-dieUsageMsg( array( 'invalidtitle',
$titleText ) );
}
return $title-getLatestRevID();
diff --git a/includes/api/ApiEditPage.php b/includes/api/ApiEditPage.php
index b642c6d..1b9df68 100644
--- a/includes/api/ApiEditPage.php
+++ b/includes/api/ApiEditPage.php
@@ -46,10 +46,6 @@
$pageObj = $this-getTitleOrPageId( $params );
$titleObj = $pageObj-getTitle();
- if ( $titleObj-isExternal() ) {
- $this-dieUsageMsg( array( 'invalidtitle',
$params['title'] ) );
- }
-
$apiResult = $this-getResult();
if ( $params['redirect'] ) {
diff --git a/includes/api/ApiExpandTemplates.php
b/includes/api/ApiExpandTemplates.php
index 826171b..f5898fb 100644
--- a/includes/api/ApiExpandTemplates.php
+++ b/includes/api/ApiExpandTemplates.php
@@ -42,7 +42,7 @@
// Create title for parser
$title_obj = Title::newFromText( $params['title'] );
- if ( !$title_obj ) {
+ if ( !$title_obj || $title_obj-isExternal() ) {
$this-dieUsageMsg( array( 'invalidtitle',
$params['title'] ) );
}
diff --git a/includes/api/ApiFileRevert.php b/includes/api/ApiFileRevert.php
index 9520dc7..b14a45a 100644
--- a/includes/api/ApiFileRevert.php
+++ b/includes/api/ApiFileRevert.php
@@ -85,7 +85,7 @@
protected function validateParameters() {
// Validate the input title
$title = Title::makeTitleSafe( NS_FILE,
$this-params['filename'] );
- if ( is_null( $title ) ) {
+ if ( is_null( $title ) || $title-isExternal() ) {
$this-dieUsageMsg( array( 'invalidtitle',
$this-params['filename'] ) );
}
$localRepo = RepoGroup::singleton()-getLocalRepo();
diff --git a/includes/api/ApiMove.php b/includes/api/ApiMove.php
index 3f54fee..6788c4f 100644
--- a/includes/api/ApiMove.php
+++ b/includes/api/ApiMove.php
@@ -38,12 +38,12 @@
if ( isset( $params['from'] ) ) {
$fromTitle = Title::newFromText( $params['from'] );
- if ( !$fromTitle ) {
+ if ( !$fromTitle || $fromTitle-isExternal() ) {
$this-dieUsageMsg( array( 'invalidtitle',
$params['from'] ) );
}
} elseif ( isset( $params['fromid'] ) ) {
$fromTitle = Title::newFromID( $params['fromid'] );
- if ( !$fromTitle ) {
+ if ( !$fromTitle || $fromTitle-isExternal() ) {
$this-dieUsageMsg( array(
[MediaWiki-commits] [Gerrit] Add test to check if all resource files are accessible - change (mediawiki...SemanticMediaWiki)
jenkins-bot has submitted this change and it was merged.
Change subject: Add test to check if all resource files are accessible
..
Add test to check if all resource files are accessible
This is to ensure that during testing any anomaly is caught before
deployement and an inaccessible file is being flagged.
@Note
Somehow testing accessiblity against http is a bit tougher to verify
Change-Id: Id74144945cbc1a3405f53c5cc8d5925671b02ef7
---
M SemanticMediaWiki.hooks.php
A tests/phpunit/resources/ResourcesTest.php
2 files changed, 103 insertions(+), 0 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SemanticMediaWiki.hooks.php b/SemanticMediaWiki.hooks.php
index 6d62288..309f0d4 100644
--- a/SemanticMediaWiki.hooks.php
+++ b/SemanticMediaWiki.hooks.php
@@ -287,6 +287,8 @@
'printers/ResultPrinters',
+ 'resources/Resources',
+
// Keep store tests near the end, since they are slower
due to database access.
'storage/Store',
diff --git a/tests/phpunit/resources/ResourcesTest.php
b/tests/phpunit/resources/ResourcesTest.php
new file mode 100644
index 000..5e606e0
--- /dev/null
+++ b/tests/phpunit/resources/ResourcesTest.php
@@ -0,0 +1,101 @@
+?php
+
+namespace SMW\Test;
+
+use ResourceLoader;
+use ResourceLoaderModule;
+use ResourceLoaderContext;
+
+/**
+ * Tests for resource definitions and files
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @since 1.9
+ *
+ * @ingroup SMW
+ * @ingroup Test
+ *
+ * @group SMW
+ * @group SMWExtension
+ *
+ * @licence GNU GPL v2+
+ * @author mwjames
+ */
+class ResourcesTest extends \MediaWikiTestCase {
+
+ /**
+* Helper method to load resources only valid for this extension
+*
+*/
+ private function load(){
+ global $smwgIP, $smwgScriptPath;
+ return include( $smwgIP . /resources/Resources.php );
+ }
+
+ /**
+* DataProvider
+*
+*/
+ public function moduleDataProvider() {
+ $resourceLoader = new ResourceLoader();
+ $context = ResourceLoaderContext::newDummyContext();
+ $modules = $this-load();
+
+ return array( array( $modules, $resourceLoader, $context ) );
+ }
+
+ /**
+* Test scripts accessibility
+*
+* @dataProvider moduleDataProvider
+*/
+ public function testModulesScriptsFilesAreAccessible( $modules,
$resourceLoader, $context ){
+
+ foreach ( $modules as $name = $values ){
+
+ // Get module details
+ $module = $resourceLoader-getModule( $name );
+
+ // Get scripts per module
+ $scripts = $module-getScript( $context );
+ $this-assertTrue( is_string( $scripts ) );
+ }
+ }
+
+ /**
+* Test styles accessibility
+*
+* @dataProvider moduleDataProvider
+*/
+
+ public function testModulesStylesFilesAreAccessible( $modules,
$resourceLoader, $context ){
+
+ foreach ( $modules as $name = $values ){
+
+ // Get module details
+ $module = $resourceLoader-getModule( $name );
+
+ // Get styles per module
+ $styles = $module-getStyles( $context );
+
+ foreach ( $styles as $style ){
+ $this-assertTrue( is_string( $style ) );
+ }
+ }
+ }
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/51273
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id74144945cbc1a3405f53c5cc8d5925671b02ef7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SemanticMediaWiki
Gerrit-Branch: master
Gerrit-Owner: Mwjames jamesin.hongkon...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Mwjames jamesin.hongkon...@gmail.com
Gerrit-Reviewer:
[MediaWiki-commits] [Gerrit] adding khorn and mwalker to having permissions for icinga - change (operations/puppet)
Lcarr has uploaded a new change for review. https://gerrit.wikimedia.org/r/51387 Change subject: adding khorn and mwalker to having permissions for icinga .. adding khorn and mwalker to having permissions for icinga Change-Id: If503bbfc5649086310c8e3f0a2f1930601045cb5 --- M files/icinga/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/87/51387/1 diff --git a/files/icinga/cgi.cfg b/files/icinga/cgi.cfg index 7d3f417..b440646 100644 --- a/files/icinga/cgi.cfg +++ b/files/icinga/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen +authorized_for_system_information=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen +authorized_for_configuration_information=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen +authorized_for_system_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen -authorized_for_all_host_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen +authorized_for_all_service_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn +authorized_for_all_host_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn -- To view, visit https://gerrit.wikimedia.org/r/51387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If503bbfc5649086310c8e3f0a2f1930601045cb5 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr lc...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding khorn and mwalker to having permissions for icinga - change (operations/puppet)
Lcarr has submitted this change and it was merged. Change subject: adding khorn and mwalker to having permissions for icinga .. adding khorn and mwalker to having permissions for icinga Change-Id: If503bbfc5649086310c8e3f0a2f1930601045cb5 --- M files/icinga/cgi.cfg 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Lcarr: Looks good to me, approved jenkins-bot: Verified diff --git a/files/icinga/cgi.cfg b/files/icinga/cgi.cfg index 7d3f417..6a98911 100644 --- a/files/icinga/cgi.cfg +++ b/files/icinga/cgi.cfg @@ -131,7 +131,7 @@ # not use authorization. You may use an asterisk (*) to # authorize any user who has authenticated to the web server. -authorized_for_system_information=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen +authorized_for_system_information=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn,pgheres # CONFIGURATION INFORMATION ACCESS @@ -142,7 +142,7 @@ # an asterisk (*) to authorize any user who has authenticated # to the web server. -authorized_for_configuration_information=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen +authorized_for_configuration_information=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn,pgheres @@ -155,7 +155,7 @@ # You may use an asterisk (*) to authorize any user who has # authenticated to the web server. -authorized_for_system_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen +authorized_for_system_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn,pgheres # GLOBAL HOST/SERVICE VIEW ACCESS @@ -181,8 +181,8 @@ # authorization). You may use an asterisk (*) to authorize any # user who has authenticated to the web server. -authorized_for_all_service_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen -authorized_for_all_host_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen +authorized_for_all_service_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn,pgheres +authorized_for_all_host_commands=tstarling,robh,mark,midom,laner,ariel,py,asher,dzahn,lcarr,jgreen,mwalker,khorn,pgheres -- To view, visit https://gerrit.wikimedia.org/r/51387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If503bbfc5649086310c8e3f0a2f1930601045cb5 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Lcarr lc...@wikimedia.org Gerrit-Reviewer: Lcarr lc...@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] implemented wb.Claim.equals - change (mediawiki...Wikibase)
Daniel Werner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51388
Change subject: implemented wb.Claim.equals
..
implemented wb.Claim.equals
Change-Id: If07ea5ff7bc2e6ccc1a112ed4bc398b42a10466b
---
M lib/resources/wikibase.datamodel/wikibase.Claim.js
M lib/resources/wikibase.datamodel/wikibase.Snak.js
2 files changed, 23 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/88/51388/1
diff --git a/lib/resources/wikibase.datamodel/wikibase.Claim.js
b/lib/resources/wikibase.datamodel/wikibase.Claim.js
index f0f5cdd..a28d618 100644
--- a/lib/resources/wikibase.datamodel/wikibase.Claim.js
+++ b/lib/resources/wikibase.datamodel/wikibase.Claim.js
@@ -4,7 +4,7 @@
* @licence GNU GPL v2+
* @author Daniel Werner
*/
-( function( wb, $, undefined ) {
+( function( wb, $ ) {
'use strict';
/**
@@ -92,6 +92,25 @@
throw new Error( 'Qualifiers have to be a wb.SnakList
object' );
}
this._qualifiers = qualifiers;
+ },
+
+ /**
+* Returns whether this Claim is equal to another Claim. Two Claims are
considered equal
+* if they are of the same type and have the same value. The value does
not include the guid,
+* so Claims with the same value but different guids are still
considered equal.
+*
+* @since 0.4
+*
+* @param {wb.Claim|*} claim If this is not a wb.Claim, false will be
returned.
+* @return boolean
+*/
+ equals: function( claim ) {
+ return this === claim
+ || ( // snaks have no IDs, so we don't have to worry
about comparing any
+ claim instanceof wb.Claim
+this._mainSnak.equals( claim.getMainSnak() )
+this._qualifiers.equals(
claim.getQualifiers() )
+ );
}
};
@@ -127,9 +146,7 @@
rank = wb.Statement.RANK[ json.rank.toUpperCase() ];
return new wb.Statement( mainSnak, qualifiers, references,
rank, guid );
}
- else {
- return new wb.Claim( mainSnak, qualifiers, guid );
- }
+ return new wb.Claim( mainSnak, qualifiers, guid );
};
}( wikibase, jQuery ) );
diff --git a/lib/resources/wikibase.datamodel/wikibase.Snak.js
b/lib/resources/wikibase.datamodel/wikibase.Snak.js
index 020abbe..9fe6586 100644
--- a/lib/resources/wikibase.datamodel/wikibase.Snak.js
+++ b/lib/resources/wikibase.datamodel/wikibase.Snak.js
@@ -124,8 +124,8 @@
};
/**
- * Creates a new Snak Object from a given Object with certain keys and values,
what a certain Snak
- * would return when calling toMap().
+ * Creates a new Snak Object from a given Object with certain keys and values,
what an actual Snak
+ * would return when calling its toMap().
*
* @since 0.4
*
--
To view, visit https://gerrit.wikimedia.org/r/51388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If07ea5ff7bc2e6ccc1a112ed4bc398b42a10466b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner daniel.wer...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changes wb.RepoApi.getEntities to promise a collection of wb... - change (mediawiki...Wikibase)
Daniel Werner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51390
Change subject: Changes wb.RepoApi.getEntities to promise a collection of
wb.Entity
..
Changes wb.RepoApi.getEntities to promise a collection of wb.Entity
Would promise a collection of raw data before.
* changed jQuery.wikibase.snakview to make use of the change (rather than
break).
* simple refactoring and adjustment of some API test
Change-Id: If80ca6c9048cd9d6880a9c790240fdb4e81cbcc0
---
M lib/resources/Resources.php
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
M lib/resources/wikibase.store/wikibase.RepoApi.js
M lib/tests/qunit/wikibase.store/wikibase.RepoApi.tests.js
4 files changed, 118 insertions(+), 130 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/90/51390/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 71d75fa..823a42a 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -133,6 +133,7 @@
'jquery.json',
'user.tokens',
'wikibase.datamodel',
+ 'wikibase.serialization.entities',
'wikibase.repoAccess',
'wikibase.RepoApiError',
'mediawiki.Title',
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
index 0e2eb04..878c348 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
@@ -202,7 +202,8 @@
.on( 'entityselectorselect', function( e, ui ) {
// entity chosen in entity selector but we still need
the data type of the entity, so
// we have to make a separate API call:
- var api = new wb.RepoApi();
+ var api = new wb.RepoApi(),
+ entityId = ui.item.id;
// Display spinner as long as the value view is
loading. There is no need to display the
// spinner when the selected item actually has not
changed since the variation will stay
@@ -213,24 +214,16 @@
);
}
- api.getEntities( ui.item.id, null ).done( function(
response ) {
- var entityId = ui.item.id,
- entity = response.entities[ entityId ],
- dataTypeId = entity.datatype,
- dataType = dt.getDataType( dataTypeId ),
- label;
-
- if( entity.labels entity.labels[ language ]
) {
- label = entity.labels[ language ].value;
- }
+ api.getEntities( entityId, null, [ language ] ).done(
function( entities ) {
+ var entity = entities[ entityId ];
// update local store with newest information
about selected property
// TODO: create more sophisticated local store
interface rather than accessing
// wb.entities directly
wb.entities[ entityId ] = {
id: entityId,
- label: label,
- datatype: dataType.getId(),
+ label: entity.getLabel(),
+ datatype: entity.getDataType().getId(),
url: ui.item.url
};
diff --git a/lib/resources/wikibase.store/wikibase.RepoApi.js
b/lib/resources/wikibase.store/wikibase.RepoApi.js
index 463ff5a..aa9c0d6 100644
--- a/lib/resources/wikibase.store/wikibase.RepoApi.js
+++ b/lib/resources/wikibase.store/wikibase.RepoApi.js
@@ -75,7 +75,7 @@
},
/**
-* Gets one or more entities.
+* Gets one or more Entities.
*
* @param {String[]|String} ids
* @param {String[]|String} [props] Key(s) of property/ies to retrieve
from the API
@@ -86,7 +86,12 @@
* default: null (unsorted)
* @param {String} [dir] Sort direction may be 'ascending' or
'descending'
* default: null (ascending)
-* @return {jQuery.Promise}
+* @return {jQuery.Promise} If successful, the first parameter of the
done callbacks will be
+
[MediaWiki-commits] [Gerrit] Make use of new data model constructors all over the UI now - change (mediawiki...Wikibase)
Daniel Werner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51391
Change subject: Make use of new data model constructors all over the UI now
..
Make use of new data model constructors all over the UI now
* replaced wb.entities with wb.fetchedEntities, holding wb.FetchedContent now
instead of wb.Entity
instances. Includes some tests.
* wb.entity is a wb.Entity object representing the site's entity now.
* for unserializing JSON in entityViewInit we now use the
wikibase.serialization module.
* wb.entityview is expecting a wb.Entity object instead of a loose data
structure now.
* removed/changed some todos
Change-Id: I40bcc945610fe6f32e89fc12ea3b0def3126317a
---
M lib/resources/jquery.valueview.views/wikibaseItem.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.js
M
lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Value.js
M lib/resources/wikibase.js
M lib/resources/wikibase.utilities/wikibase.utilities.ui.js
M lib/tests/qunit/wikibase.datamodel/Wikibase.snak.tests.js
M repo/includes/EntityView.php
M repo/resources/Resources.php
M repo/resources/wikibase.ui.entityViewInit.js
12 files changed, 114 insertions(+), 86 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/91/51391/1
diff --git a/lib/resources/jquery.valueview.views/wikibaseItem.js
b/lib/resources/jquery.valueview.views/wikibaseItem.js
index 5e4140b..3bd4f26 100644
--- a/lib/resources/jquery.valueview.views/wikibaseItem.js
+++ b/lib/resources/jquery.valueview.views/wikibaseItem.js
@@ -72,14 +72,20 @@
$( this ).data( 'entityselector'
).repositionMenu();
} )
.on( 'entityselectorselect', function( e, ui ) {
+ var itemData = {
+ id: ui.item.id,
+ label: {}
+ };
+ itemData.label[ language ] = ui.item.label;
+
// update local store with newest information
about selected item
// TODO: create more sophisticated local store
interface rather than accessing
- // wb.entities directly
- wb.entities[ ui.item.id ] = {
- id: ui.item.id,
- label: ui.item.label,
- url: ui.item.url
- };
+ // wb.fetchedEntities directly
+ wb.fetchedEntities[ ui.item.id ] = new
wb.store.FetchedContent( {
+ // TODO: *terrible* solution to use
regex, entityselector should provide title
+ title: new mw.Title( ui.item.url.match(
/[^\/]+$/ )[0] ),
+ content: new wb.Item( itemData )
+ } );
} )
.on(
// aftersetentity: When setting the entity
programmatically (editing an existing
@@ -101,20 +107,22 @@
_displayValue: function( value ) {
if( this.$input ) {
var entityId = value === null ? null :
value.getPrefixedId( WB_ENTITIES_PREFIXMAP ),
- entity = entityId ? wb.entities[
entityId ] : null,
+ fetchedEntity = entityId ?
wb.fetchedEntities[ entityId ] : null,
simpleEntity = null;
- if( entity ) {
+ if( fetchedEntity ) {
// entity selector requires very basic
data only, but ID has to be set which is
- // not the case in the wb.entities
entity store.
+ // not the case in the
wb.fetchedEntities entity store.
simpleEntity = {
- label: entity.label,
+ label:
fetchedEntity.getContent().getLabel(),
id: entityId
};
}
// in edit mode:
this.$input.data( 'entityselector'
).selectedEntity( simpleEntity );
+ //
[MediaWiki-commits] [Gerrit] Add missing return value - change (mediawiki...luasandbox)
Tim Starling has submitted this change and it was merged.
Change subject: Add missing return value
..
Add missing return value
Functions declared to return a value must actually do so. Otherwise the
return value is not necessarily anything valid, which is liable to
confuse things.
Change-Id: Ie38532105b20d403da6144a0c87a3f9cba620320
---
M luasandbox_lstrlib.c
M luasandbox_lstrlib.patch
2 files changed, 28 insertions(+), 13 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/luasandbox_lstrlib.c b/luasandbox_lstrlib.c
index 1a58665..515f973 100644
--- a/luasandbox_lstrlib.c
+++ b/luasandbox_lstrlib.c
@@ -369,6 +369,7 @@
}
static int do_nothing(lua_State * L) {
+ return 0;
}
#define MATCH_RETURN(r) { \
diff --git a/luasandbox_lstrlib.patch b/luasandbox_lstrlib.patch
index 6b9b397..92d7978 100644
--- a/luasandbox_lstrlib.patch
+++ b/luasandbox_lstrlib.patch
@@ -1,6 +1,19 @@
lstrlib.c 2012-07-09 12:00:43.465130991 +1000
-+++ luasandbox_lstrlib.c 2012-07-09 12:00:29.448916293 +1000
-@@ -176,6 +176,7 @@
+--- lstrlib.c 2013-02-27 17:27:45.973598391 -0800
luasandbox_lstrlib.c 2013-02-27 17:58:33.809497263 -0800
+@@ -19,6 +19,12 @@
+ #include lauxlib.h
+ #include lualib.h
+
++#ifdef LUAI_MAXCALLS
++#define LUASANDBOX_MAX_MATCH_DEPTH LUAI_MAXCALLS
++#else
++#define LUASANDBOX_MAX_MATCH_DEPTH 2
++#endif
++
+
+ /* macro to `unsign' a character */
+ #define uchar(c)((unsigned char)(c))
+@@ -176,6 +182,7 @@
const char *init;
ptrdiff_t len;
} capture[LUA_MAXCAPTURES];
@@ -8,11 +21,12 @@
} MatchState;
-@@ -361,24 +362,43 @@
+@@ -361,24 +368,44 @@
else return NULL;
}
+static int do_nothing(lua_State * L) {
++ return 0;
+}
+
+#define MATCH_RETURN(r) { \
@@ -29,7 +43,7 @@
+ lua_call(ms-L, 0, 0);
+ }
+
-+ if (++ms-depth LUAI_MAXCALLS) {
++ if (++ms-depth LUASANDBOX_MAX_MATCH_DEPTH) {
+luaL_error(ms-L, recursion depth limit exceeded);
+ }
init: /* using goto's to optimize tail recursion */
@@ -59,7 +73,7 @@
p+=4; goto init; /* else return match(ms, s, p+4); */
}
case 'f': { /* frontier? */
-@@ -390,13 +410,13 @@
+@@ -390,13 +417,13 @@
ep = classend(ms, p); /* points to what is next */
previous = (s == ms-src_init) ? '\0' : *(s-1);
if (matchbracketclass(uchar(previous), p, ep-1) ||
@@ -75,7 +89,7 @@
p+=2; goto init; /* else return match(ms, s, p+2) */
}
goto dflt; /* case default */
-@@ -404,12 +424,12 @@
+@@ -404,12 +431,12 @@
}
}
case '\0': { /* end of pattern */
@@ -92,7 +106,7 @@
}
default: dflt: { /* it is a pattern item */
const char *ep = classend(ms, p); /* points to what is next */
-@@ -418,20 +438,20 @@
+@@ -418,20 +445,20 @@
case '?': { /* optional */
const char *res;
if (m ((res=match(ms, s+1, ep+1)) != NULL))
@@ -118,7 +132,7 @@
s++; p=ep; goto init; /* else return match(ms, s+1, ep); */
}
}
-@@ -439,7 +459,7 @@
+@@ -439,7 +466,7 @@
}
}
@@ -127,7 +141,7 @@
static const char *lmemfind (const char *s1, size_t l1,
const char *s2, size_t l2) {
-@@ -516,6 +536,7 @@
+@@ -516,6 +543,7 @@
ms.L = L;
ms.src_init = s;
ms.src_end = s+l1;
@@ -135,7 +149,7 @@
do {
const char *res;
ms.level = 0;
-@@ -554,6 +575,7 @@
+@@ -554,6 +582,7 @@
ms.L = L;
ms.src_init = s;
ms.src_end = s+ls;
@@ -143,7 +157,7 @@
for (src = s + (size_t)lua_tointeger(L, lua_upvalueindex(3));
src = ms.src_end;
src++) {
-@@ -658,6 +680,7 @@
+@@ -658,6 +687,7 @@
ms.L = L;
ms.src_init = src;
ms.src_end = src+srcl;
@@ -151,7 +165,7 @@
while (n max_s) {
const char *e;
ms.level = 0;
-@@ -859,7 +882,7 @@
+@@ -859,7 +889,7 @@
/*
** Open string library
*/
--
To view, visit https://gerrit.wikimedia.org/r/51331
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie38532105b20d403da6144a0c87a3f9cba620320
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/php/luasandbox
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Demon ch...@wikimedia.org
Gerrit-Reviewer: Tim Starling tstarl...@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] Turned property dropdowns into combo boxes, added fixes for ... - change (mediawiki...SemanticForms)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51392
Change subject: Turned property dropdowns into combo boxes, added fixes for
property values
..
Turned property dropdowns into combo boxes, added fixes for property values
Change-Id: I967c45f66f7512e651ddba5413e9ca1326f46593
---
M specials/SF_CreateTemplate.php
1 file changed, 18 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/92/51392/1
diff --git a/specials/SF_CreateTemplate.php b/specials/SF_CreateTemplate.php
index ab7a918..ea2e65f 100644
--- a/specials/SF_CreateTemplate.php
+++ b/specials/SF_CreateTemplate.php
@@ -34,6 +34,11 @@
$options-limit = 500;
$used_properties = smwfGetStore()-getPropertiesSpecial(
$options );
foreach ( $used_properties as $property ) {
+ // Skip over properties that are errors. (This
+ // shouldn't happen, but it sometimes does.)
+ if ( !method_exists( $property[0], 'getKey' ) ) {
+ continue;
+ }
$propName = $property[0]-getKey();
if ( $propName{0} != '_' ) {
$all_properties[] = str_replace( '_', ' ',
$propName );
@@ -42,22 +47,30 @@
$unused_properties =
smwfGetStore()-getUnusedPropertiesSpecial( $options );
foreach ( $unused_properties as $property ) {
+ // Skip over properties that are errors. (This
+ // shouldn't happen, but it sometimes does.)
+ if ( !method_exists( $property, 'getKey' ) ) {
+ continue;
+ }
$all_properties[] = str_replace( '_' , ' ',
$property-getKey() );
}
- // Sort properties list alphabetically.
+ // Sort properties list alphabetically, and get unique values
+ // (for SQLStore3, getPropertiesSpecial() seems to get unused
+ // properties as well.
sort( $all_properties );
+ $all_properties = array_unique( $all_properties );
return $all_properties;
}
- public static function printPropertiesDropdown( $all_properties, $id,
$selected_property = null ) {
+ public static function printPropertiesComboBox( $all_properties, $id,
$selected_property = null ) {
$selectBody = option value=\\/option\n;
foreach ( $all_properties as $prop_name ) {
$optionAttrs = array( 'value' = $prop_name );
if ( $selected_property == $prop_name ) {
$optionAttrs['selected'] = 'selected'; }
$selectBody .= Html::element( 'option', $optionAttrs,
$prop_name ) . \n;
}
- return Html::rawElement( 'select', array( 'name' =
semantic_property_$id ), $selectBody ) . \n;
+ return Html::rawElement( 'select', array( 'name' =
semantic_property_$id, 'class' = 'sfComboBox' ), $selectBody ) . \n;
}
public static function printFieldEntryBox( $id, $all_properties,
$display = true ) {
@@ -72,7 +85,7 @@
array( 'size' = '15' )
) . \n;
- $dropdown_html = self::printPropertiesDropdown(
$all_properties, $id );
+ $dropdown_html = self::printPropertiesComboBox(
$all_properties, $id );
$text .= \t . wfMessage( 'sf_createtemplate_semanticproperty'
)-text() . ' ' . $dropdown_html . /p\n;
$text .= \tp . 'input type=checkbox name=is_list_' .
$id . ' / ' . wfMessage( 'sf_createtemplate_fieldislist' )-text() . \n;
$text .= ' #160;#160;input type=button value=' .
wfMessage( 'sf_createtemplate_deletefield' )-text() . ' class=deleteField
/' . \n;
@@ -229,7 +242,7 @@
$text .= \t . Html::element( 'legend', null, wfMessage(
'sf_createtemplate_aggregation' )-text() ) . \n;
$text .= \t . Html::element( 'p', null, wfMessage(
'sf_createtemplate_aggregationdesc' )-text() ) . \n;
$text .= \tp . wfMessage(
'sf_createtemplate_semanticproperty' )-escaped() . ' ' .
- self::printPropertiesDropdown( $all_properties,
aggregation ) . /p\n;
+ self::printPropertiesComboBox( $all_properties,
aggregation ) . /p\n;
$text .= \tp . wfMessage(
'sf_createtemplate_aggregationlabel' )-escaped() . ' ' .
Html::input( 'aggregation_label', null, 'text',
array( 'size' = '25' ) ) .
--
To view, visit https://gerrit.wikimedia.org/r/51392
To unsubscribe, visit
[MediaWiki-commits] [Gerrit] internally resharding the main indices of major projects wit... - change (operations/puppet)
Asher has submitted this change and it was merged.
Change subject: internally resharding the main indices of major projects within
pool4 to fairly unused spell nodes [pmtpa only - for testing]
..
internally resharding the main indices of major projects within pool4 to fairly
unused spell nodes [pmtpa only - for testing]
Change-Id: I14eb0f4c8ae60fa52f707171027369f75787e144
---
M manifests/role/lucene.pp
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
diff --git a/manifests/role/lucene.pp b/manifests/role/lucene.pp
index 1458f92..3f59e50 100644
--- a/manifests/role/lucene.pp
+++ b/manifests/role/lucene.pp
@@ -92,10 +92,14 @@
'itwiki.nspart2',
'nlwiki.nspart2', 'ruwiki.nspart2', 'svwiki.nspart2', ' plwiki.nspart2',
'ptwiki.nspart2', 'zhwiki.nspart2'],
},
pool4 = {
- search13 =
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl', '*?'],
- search14 =
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl', '*?'],
- search15 =
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
- search16 =
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
+ search13 = ['*?'],
+ search14 = ['*?'],
+ search15 =
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl',
+ 'wikidatawiki',
'metawiki', 'enwiktionary',
+
'(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
+ search16 =
['commonswiki.nspart1', 'commonswiki.nspart1.hl', 'commonswiki.nspart2',
'commonswiki.nspart2.hl',
+ 'wikidatawiki',
'metawiki', 'enwiktionary',
+
'(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.))*.spell'],
search17 =
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.|jawiki.|zhwiki.))*.hl'],
search18 =
['(?!(enwiki.|dewiki.|frwiki.|itwiki.|nlwiki.|ruwiki.|svwiki.|plwiki.|eswiki.|ptwiki.|jawiki.|zhwiki.))*.hl'],
},
--
To view, visit https://gerrit.wikimedia.org/r/51380
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14eb0f4c8ae60fa52f707171027369f75787e144
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher afeld...@wikimedia.org
Gerrit-Reviewer: Asher afeld...@wikimedia.org
Gerrit-Reviewer: Pyoungmeister p...@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] Turned property dropdowns into combo boxes, added fixes for ... - change (mediawiki...SemanticForms)
Yaron Koren has submitted this change and it was merged.
Change subject: Turned property dropdowns into combo boxes, added fixes for
property values
..
Turned property dropdowns into combo boxes, added fixes for property values
Change-Id: I967c45f66f7512e651ddba5413e9ca1326f46593
---
M specials/SF_CreateTemplate.php
1 file changed, 18 insertions(+), 5 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
diff --git a/specials/SF_CreateTemplate.php b/specials/SF_CreateTemplate.php
index ab7a918..ea2e65f 100644
--- a/specials/SF_CreateTemplate.php
+++ b/specials/SF_CreateTemplate.php
@@ -34,6 +34,11 @@
$options-limit = 500;
$used_properties = smwfGetStore()-getPropertiesSpecial(
$options );
foreach ( $used_properties as $property ) {
+ // Skip over properties that are errors. (This
+ // shouldn't happen, but it sometimes does.)
+ if ( !method_exists( $property[0], 'getKey' ) ) {
+ continue;
+ }
$propName = $property[0]-getKey();
if ( $propName{0} != '_' ) {
$all_properties[] = str_replace( '_', ' ',
$propName );
@@ -42,22 +47,30 @@
$unused_properties =
smwfGetStore()-getUnusedPropertiesSpecial( $options );
foreach ( $unused_properties as $property ) {
+ // Skip over properties that are errors. (This
+ // shouldn't happen, but it sometimes does.)
+ if ( !method_exists( $property, 'getKey' ) ) {
+ continue;
+ }
$all_properties[] = str_replace( '_' , ' ',
$property-getKey() );
}
- // Sort properties list alphabetically.
+ // Sort properties list alphabetically, and get unique values
+ // (for SQLStore3, getPropertiesSpecial() seems to get unused
+ // properties as well.
sort( $all_properties );
+ $all_properties = array_unique( $all_properties );
return $all_properties;
}
- public static function printPropertiesDropdown( $all_properties, $id,
$selected_property = null ) {
+ public static function printPropertiesComboBox( $all_properties, $id,
$selected_property = null ) {
$selectBody = option value=\\/option\n;
foreach ( $all_properties as $prop_name ) {
$optionAttrs = array( 'value' = $prop_name );
if ( $selected_property == $prop_name ) {
$optionAttrs['selected'] = 'selected'; }
$selectBody .= Html::element( 'option', $optionAttrs,
$prop_name ) . \n;
}
- return Html::rawElement( 'select', array( 'name' =
semantic_property_$id ), $selectBody ) . \n;
+ return Html::rawElement( 'select', array( 'name' =
semantic_property_$id, 'class' = 'sfComboBox' ), $selectBody ) . \n;
}
public static function printFieldEntryBox( $id, $all_properties,
$display = true ) {
@@ -72,7 +85,7 @@
array( 'size' = '15' )
) . \n;
- $dropdown_html = self::printPropertiesDropdown(
$all_properties, $id );
+ $dropdown_html = self::printPropertiesComboBox(
$all_properties, $id );
$text .= \t . wfMessage( 'sf_createtemplate_semanticproperty'
)-text() . ' ' . $dropdown_html . /p\n;
$text .= \tp . 'input type=checkbox name=is_list_' .
$id . ' / ' . wfMessage( 'sf_createtemplate_fieldislist' )-text() . \n;
$text .= ' #160;#160;input type=button value=' .
wfMessage( 'sf_createtemplate_deletefield' )-text() . ' class=deleteField
/' . \n;
@@ -229,7 +242,7 @@
$text .= \t . Html::element( 'legend', null, wfMessage(
'sf_createtemplate_aggregation' )-text() ) . \n;
$text .= \t . Html::element( 'p', null, wfMessage(
'sf_createtemplate_aggregationdesc' )-text() ) . \n;
$text .= \tp . wfMessage(
'sf_createtemplate_semanticproperty' )-escaped() . ' ' .
- self::printPropertiesDropdown( $all_properties,
aggregation ) . /p\n;
+ self::printPropertiesComboBox( $all_properties,
aggregation ) . /p\n;
$text .= \tp . wfMessage(
'sf_createtemplate_aggregationlabel' )-escaped() . ' ' .
Html::input( 'aggregation_label', null, 'text',
array( 'size' = '25' ) ) .
--
To view, visit https://gerrit.wikimedia.org/r/51392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] Add mw.title library - change (mediawiki...Scribunto)
jenkins-bot has submitted this change and it was merged.
Change subject: Add mw.title library
..
Add mw.title library
Note that fetching any title besides the one for the current page is
considered expensive. It also records the title fetched in the
ParserOutput so it will be listed in pagelinks, just like #ifexists.
This also moves the ToString test formatter into TestFramework.lua, so
TitleLibraryTests.lua can use it too.
Change-Id: I799f3289a37fe1349b6bca5758829acf82cb718f
---
M Scribunto.php
M common/Hooks.php
M engines/LuaCommon/LuaCommon.php
A engines/LuaCommon/TitleLibrary.php
A engines/LuaCommon/lualib/mw.title.lua
M tests/engines/LuaCommon/LuaEngineTestBase.php
M tests/engines/LuaCommon/TestFramework.lua
A tests/engines/LuaCommon/TitleLibraryTest.php
A tests/engines/LuaCommon/TitleLibraryTests.lua
M tests/engines/LuaCommon/UriLibraryTests.lua
10 files changed, 845 insertions(+), 27 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Scribunto.php b/Scribunto.php
index d31bca2..d07cc7d 100644
--- a/Scribunto.php
+++ b/Scribunto.php
@@ -108,6 +108,7 @@
$wgAutoloadClasses['Scribunto_LuaUstringLibrary'] =
$dir.'engines/LuaCommon/UstringLibrary.php';
$wgAutoloadClasses['Scribunto_LuaLanguageLibrary'] =
$dir.'engines/LuaCommon/LanguageLibrary.php';
$wgAutoloadClasses['Scribunto_LuaMessageLibrary'] =
$dir.'engines/LuaCommon/MessageLibrary.php';
+$wgAutoloadClasses['Scribunto_LuaTitleLibrary'] =
$dir.'engines/LuaCommon/TitleLibrary.php';
/* Configuration */
diff --git a/common/Hooks.php b/common/Hooks.php
index aae6f42..c5eb761 100644
--- a/common/Hooks.php
+++ b/common/Hooks.php
@@ -302,6 +302,7 @@
'engines/LuaCommon/UriLibraryTest.php',
'engines/LuaCommon/UstringLibraryTest.php',
'engines/LuaCommon/MessageLibraryTest.php',
+ 'engines/LuaCommon/TitleLibraryTest.php',
);
foreach ( $tests as $test ) {
$files[] = dirname( __FILE__ ) .'/../tests/' . $test;
diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index cee6896..631ddd1 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -11,6 +11,7 @@
'mw.ustring' = 'Scribunto_LuaUstringLibrary',
'mw.language' = 'Scribunto_LuaLanguageLibrary',
'mw.message' = 'Scribunto_LuaMessageLibrary',
+ 'mw.title' = 'Scribunto_LuaTitleLibrary',
);
/**
diff --git a/engines/LuaCommon/TitleLibrary.php
b/engines/LuaCommon/TitleLibrary.php
new file mode 100644
index 000..817c869
--- /dev/null
+++ b/engines/LuaCommon/TitleLibrary.php
@@ -0,0 +1,196 @@
+?php
+
+class Scribunto_LuaTitleLibrary extends Scribunto_LuaLibraryBase {
+ // Note these caches are naturally limited to
+ // $wgExpensiveParserFunctionLimit + 1 actual Title objects because any
+ // addition besides the one for the current page calls
+ // incrementExpensiveFunctionCount()
+ private $titleCache = array();
+ private $idCache = array();
+
+ function register( $pureLua = false ) {
+ $lib = array(
+ 'newTitle' = array( $this, 'newTitle' ),
+ 'makeTitle' = array( $this, 'makeTitle' ),
+ 'getUrl' = array( $this, 'getUrl' ),
+ );
+ $this-getEngine()-registerInterface( 'mw.title.lua', $lib,
array(
+ 'thisTitle' = $this-returnTitleToLua(
$this-getTitle() ),
+ ) );
+ }
+
+ private function checkNamespace( $name, $argIdx, $arg, $default = null
) {
+ global $wgContLang;
+
+ if ( $arg === null $default !== null ) {
+ $arg = $default;
+ } elseif ( is_numeric( $arg ) ) {
+ $arg = (int)$arg;
+ if ( !MWNamespace::exists( $arg ) ) {
+ throw new Scribunto_LuaError(
+ bad argument #$argIdx to '$name'
(unrecognized namespace number '$arg')
+ );
+ }
+ } elseif ( is_string( $arg ) ) {
+ $ns = $wgContLang-getNsIndex( $arg );
+ if ( $ns === false ) {
+ throw new Scribunto_LuaError(
+ bad argument #$argIdx to '$name'
(unrecognized namespace name '$arg')
+ );
+ }
+ $arg = $ns;
+ } else {
+ $this-checkType( $name, $argIdx, $arg, 'namespace
number or name' );
+ }
+ }
+
+ /**
+* Extract information from a Title object for
[MediaWiki-commits] [Gerrit] Add a define guard to NoLocalSettings.php - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add a define guard to NoLocalSettings.php
..
Add a define guard to NoLocalSettings.php
NoLocalSettings.php is only loaded from WebStart,
after defining MEDIAWIKI.
Change-Id: Id90ede9c3dc5b340fc27a61d2b41f1517482d21b
---
M includes/templates/NoLocalSettings.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/templates/NoLocalSettings.php
b/includes/templates/NoLocalSettings.php
index bf5c487..2483e58 100644
--- a/includes/templates/NoLocalSettings.php
+++ b/includes/templates/NoLocalSettings.php
@@ -21,6 +21,10 @@
* @ingroup Templates
*/
+if ( !defined( 'MEDIAWIKI' ) ) {
+die( NoLocalSettings.php is not a valid MediaWiki entry point\n );
+}
+
if ( !isset( $wgVersion ) ) {
$wgVersion = 'VERSION';
}
--
To view, visit https://gerrit.wikimedia.org/r/50819
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id90ede9c3dc5b340fc27a61d2b41f1517482d21b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Platonides platoni...@gmail.com
Gerrit-Reviewer: Demon ch...@wikimedia.org
Gerrit-Reviewer: Krinkle ttij...@wikimedia.org
Gerrit-Reviewer: MZMcBride w...@mzmcbride.com
Gerrit-Reviewer: Reedy re...@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] Fix compiler warnings and remove obsolete files - change (mediawiki...luasandbox)
Tim Starling has submitted this change and it was merged.
Change subject: Fix compiler warnings and remove obsolete files
..
Fix compiler warnings and remove obsolete files
The extension should now compile with
make CFLAGS=-Wall -Wextra -Werror -Wno-unused-parameter -Wno-sign-compare -g
-O2
Removed ustring.c, luasandbox_unicode.h, and m4/ac_check_icu.m4, as they
have been unused since Aug 2012.
Change-Id: I63998c026ac15c96bbfb72b0fa3a770aae1c0ba9
---
M README
M alloc.c
M data_conversion.c
M luasandbox.c
D luasandbox_unicode.h
D m4/ac_check_icu.m4
M timer.c
D ustring.c
8 files changed, 14 insertions(+), 1,173 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/README b/README
index 319a0bb..97e315e 100644
--- a/README
+++ b/README
@@ -7,16 +7,8 @@
It requires a few dependencies:
luajit - LUA just in time compiler. http://www.luajit.org/
- ICU - set of libraries providing Unicode and Globalization support
== Mac OS X ==
Using brew:
brew install luajit
- brew install icu4c
- # Formula being keg-only, you need to link it manually
- brew link icu4c
-
-That will makes pkg-config files available. Check them using:
- ls -l `brew --prefix`/lib/pkgconfig/icu*pc
-
diff --git a/alloc.c b/alloc.c
index 82c04f5..ac826ff 100644
--- a/alloc.c
+++ b/alloc.c
@@ -19,7 +19,9 @@
static inline int luasandbox_update_memory_accounting(php_luasandbox_alloc *
obj,
size_t osize, size_t nsize);
static void *luasandbox_php_alloc(void *ud, void *ptr, size_t osize, size_t
nsize);
+#ifdef LUASANDBOX_LJ_64
static void *luasandbox_passthru_alloc(void *ud, void *ptr, size_t osize,
size_t nsize);
+#endif
lua_State * luasandbox_alloc_new_state(php_luasandbox_alloc * alloc,
php_luasandbox_obj * sandbox)
{
@@ -110,6 +112,7 @@
}
/* }}} */
+#ifdef LUASANDBOX_LJ_64
/** {{{ luasandbox_passthru_alloc
*
* A Lua allocator function for use with LuaJIT on a 64-bit platform. Pass
@@ -126,4 +129,4 @@
return obj-alloc.old_alloc(obj-alloc.old_alloc_ud, ptr, osize, nsize);
}
/* }}} */
-
+#endif
diff --git a/data_conversion.c b/data_conversion.c
index 191e13c..b151473 100644
--- a/data_conversion.c
+++ b/data_conversion.c
@@ -11,7 +11,6 @@
#include php.h
#include php_luasandbox.h
-#include luasandbox_unicode.h
static void luasandbox_lua_to_array(HashTable *ht, lua_State *L, int index,
zval * sandbox_zval, HashTable * recursionGuard TSRMLS_DC);
diff --git a/luasandbox.c b/luasandbox.c
index 1554619..4754154 100644
--- a/luasandbox.c
+++ b/luasandbox.c
@@ -16,6 +16,11 @@
#include luasandbox_timer.h
#include ext/standard/php_smart_str.h
+// Compatability for PHP = 5.3.6
+#ifndef ZEND_FE_END
+#define ZEND_FE_END { NULL, NULL, NULL, 0, 0 }
+#endif
+
#define CHECK_VALID_STATE(state) \
if (!state) { \
php_error_docref(NULL TSRMLS_CC, E_WARNING, invalid LuaSandbox
state); \
@@ -140,7 +145,7 @@
/** {{{ function entries */
const zend_function_entry luasandbox_functions[] = {
- {NULL, NULL, NULL} /* Must be the last line in
luasandbox_functions[] */
+ ZEND_FE_END /* Must be the last line in luasandbox_functions[] */
};
const zend_function_entry luasandbox_methods[] = {
@@ -157,7 +162,7 @@
PHP_ME(LuaSandbox, callFunction, arginfo_luasandbox_callFunction, 0)
PHP_ME(LuaSandbox, wrapPhpFunction, arginfo_luasandbox_wrapPhpFunction,
0)
PHP_ME(LuaSandbox, registerLibrary, arginfo_luasandbox_registerLibrary,
0)
- {NULL, NULL, NULL}
+ ZEND_FE_END
};
const zend_function_entry luasandboxfunction_methods[] = {
@@ -165,11 +170,11 @@
ZEND_ACC_PRIVATE | ZEND_ACC_FINAL)
PHP_ME(LuaSandboxFunction, call, arginfo_luasandboxfunction_call, 0)
PHP_ME(LuaSandboxFunction, dump, arginfo_luasandboxfunction_dump, 0)
- {NULL, NULL, NULL}
+ ZEND_FE_END
};
const zend_function_entry luasandbox_empty_methods[] = {
- {NULL, NULL, NULL}
+ ZEND_FE_END
};
/* }}} */
@@ -520,8 +525,6 @@
int codeLength, chunkNameLength;
int status;
lua_State * L;
- size_t index;
- php_luasandboxfunction_obj * func_obj;
int have_mark;
php_luasandbox_obj * sandbox;
@@ -643,11 +646,9 @@
return;
}
- if (luasandbox_is_fatal(L, -1) !strcmp(errorMsg,
luasandbox_timeout_message)) {
- ce = luasandboxtimeouterror_ce;
- }
switch (status) {
case LUA_ERRRUN:
+ default:
if (luasandbox_is_fatal(L, -1)) {
if (!strcmp(errorMsg,
luasandbox_timeout_message)) {
ce = luasandboxtimeouterror_ce;
diff --git a/luasandbox_unicode.h b/luasandbox_unicode.h
deleted file mode 100644
index 58f0ffa..000
--- a/luasandbox_unicode.h
+++
[MediaWiki-commits] [Gerrit] Several minor fixes. - change (mediawiki/core)
Platonides has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51394
Change subject: Several minor fixes.
..
Several minor fixes.
- Add missing wfProfileOut( __METHOD__ ); in FSFile.php [13ae6bfb]
- Remove unused $IP globals in ApiUpload.php [fbf34d84]
- Remove empty statement in EditPage.php [375687]
Change-Id: I3b0506e3c8fc89b352a0d72f18e51a1223af0e9b
---
M includes/EditPage.php
M includes/api/ApiUpload.php
M includes/filebackend/FSFile.php
3 files changed, 2 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/94/51394/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 6aed2d3..d42edd7 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1167,7 +1167,7 @@
* since the post-edit state should only apply to the load right after
the save.
*/
protected function setPostEditCookie() {
- global $wgCookiePrefix, $wgCookieDomain;;
+ global $wgCookiePrefix, $wgCookieDomain;
$revisionId = $this-mArticle-getLatest();
$postEditKey = self::POST_EDIT_COOKIE_KEY_PREFIX . $revisionId;
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 6ec3a71..eabcf9b 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -184,8 +184,6 @@
* @return array
*/
private function getChunkResult( $warnings ) {
- global $IP;
-
$result = array();
$result['result'] = 'Continue';
@@ -564,8 +562,6 @@
* @return array
*/
protected function performUpload( $warnings ) {
- global $IP;
-
// Use comment as initial page text by default
if ( is_null( $this-mParams['text'] ) ) {
$this-mParams['text'] = $this-mParams['comment'];
diff --git a/includes/filebackend/FSFile.php b/includes/filebackend/FSFile.php
index a6b6200..17a88c6 100644
--- a/includes/filebackend/FSFile.php
+++ b/includes/filebackend/FSFile.php
@@ -201,6 +201,7 @@
wfProfileIn( __METHOD__ );
if ( $this-sha1Base36 !== null !$recache ) {
+ wfProfileOut( __METHOD__ );
return $this-sha1Base36;
}
--
To view, visit https://gerrit.wikimedia.org/r/51394
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b0506e3c8fc89b352a0d72f18e51a1223af0e9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Platonides platoni...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changelog for 1.3 - change (mediawiki...luasandbox)
Tim Starling has uploaded a new change for review. https://gerrit.wikimedia.org/r/51395 Change subject: Changelog for 1.3 .. Changelog for 1.3 Change-Id: I98892f0516d7ad0f5f43b99bc4fe3dca1f93dd79 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/luasandbox refs/changes/95/51395/1 diff --git a/debian/changelog b/debian/changelog index 7611755..081e3f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +php-luasandbox (1.3-1) precise-wikimedia; urgency=low + + * Fix missing return value causing data corruption + + -- Tim Starling tstarl...@wikimedia.org Thu, 28 Feb 2013 12:12:10 -0800 + php-luasandbox (1.2-1) precise-wikimedia; urgency=low * Fix profiler bugs -- To view, visit https://gerrit.wikimedia.org/r/51395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98892f0516d7ad0f5f43b99bc4fe3dca1f93dd79 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/php/luasandbox Gerrit-Branch: master Gerrit-Owner: Tim Starling tstarl...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Changelog for 1.3 - change (mediawiki...luasandbox)
Tim Starling has submitted this change and it was merged. Change subject: Changelog for 1.3 .. Changelog for 1.3 Change-Id: I98892f0516d7ad0f5f43b99bc4fe3dca1f93dd79 --- M debian/changelog 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Tim Starling: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 7611755..081e3f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +php-luasandbox (1.3-1) precise-wikimedia; urgency=low + + * Fix missing return value causing data corruption + + -- Tim Starling tstarl...@wikimedia.org Thu, 28 Feb 2013 12:12:10 -0800 + php-luasandbox (1.2-1) precise-wikimedia; urgency=low * Fix profiler bugs -- To view, visit https://gerrit.wikimedia.org/r/51395 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I98892f0516d7ad0f5f43b99bc4fe3dca1f93dd79 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/php/luasandbox Gerrit-Branch: master Gerrit-Owner: Tim Starling tstarl...@wikimedia.org Gerrit-Reviewer: Tim Starling tstarl...@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] Bump ob3 to ob4, with associated schema id change. - change (mediawiki...E3Experiments)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51396
Change subject: Bump ob3 to ob4, with associated schema id change.
..
Bump ob3 to ob4, with associated schema id change.
Change-Id: I12fffa17923ce40f901206086ea28c957d2e7af2
---
M Experiments.php
M experiments/openTask.js
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/E3Experiments
refs/changes/96/51396/1
diff --git a/Experiments.php b/Experiments.php
index f42c274..d0321f7 100644
--- a/Experiments.php
+++ b/Experiments.php
@@ -31,7 +31,7 @@
$wgResourceModules[ 'schema.GettingStarted' ] = array(
'class'= 'ResourceLoaderSchemaModule',
'schema' = 'GettingStarted',
- 'revision' = 5243394,
+ 'revision' = 5285747,
);
$wgResourceModules[ 'schema.AccountCreation' ] = array(
diff --git a/experiments/openTask.js b/experiments/openTask.js
index 6533afe..289daef 100644
--- a/experiments/openTask.js
+++ b/experiments/openTask.js
@@ -26,7 +26,7 @@
// Set some fields common to both clicks and fixing articles.
function setCommonDefaults( schema ) {
var defaults = {
- experimentId : 'ob3-split',
+ experimentId : 'ob4-split',
userId : cfg.wgUserId
};
@@ -188,7 +188,7 @@
if ( isNew ) {
// Split test. Even gets GuidedTour treatment
- bucketId = ( cfg.wgUserId % 2 === 0 ) ? 'ob3b' : 'ob3a';
+ bucketId = ( cfg.wgUserId % 2 === 0 ) ? 'ob4b' : 'ob4a';
}
setCommonDefaults( 'GettingStarted' );
--
To view, visit https://gerrit.wikimedia.org/r/51396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12fffa17923ce40f901206086ea28c957d2e7af2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/E3Experiments
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump ob3 to ob4, with associated schema id change. - change (mediawiki...E3Experiments)
jenkins-bot has submitted this change and it was merged.
Change subject: Bump ob3 to ob4, with associated schema id change.
..
Bump ob3 to ob4, with associated schema id change.
Change-Id: I12fffa17923ce40f901206086ea28c957d2e7af2
---
M Experiments.php
M experiments/openTask.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Experiments.php b/Experiments.php
index f42c274..d0321f7 100644
--- a/Experiments.php
+++ b/Experiments.php
@@ -31,7 +31,7 @@
$wgResourceModules[ 'schema.GettingStarted' ] = array(
'class'= 'ResourceLoaderSchemaModule',
'schema' = 'GettingStarted',
- 'revision' = 5243394,
+ 'revision' = 5285747,
);
$wgResourceModules[ 'schema.AccountCreation' ] = array(
diff --git a/experiments/openTask.js b/experiments/openTask.js
index 6533afe..289daef 100644
--- a/experiments/openTask.js
+++ b/experiments/openTask.js
@@ -26,7 +26,7 @@
// Set some fields common to both clicks and fixing articles.
function setCommonDefaults( schema ) {
var defaults = {
- experimentId : 'ob3-split',
+ experimentId : 'ob4-split',
userId : cfg.wgUserId
};
@@ -188,7 +188,7 @@
if ( isNew ) {
// Split test. Even gets GuidedTour treatment
- bucketId = ( cfg.wgUserId % 2 === 0 ) ? 'ob3b' : 'ob3a';
+ bucketId = ( cfg.wgUserId % 2 === 0 ) ? 'ob4b' : 'ob4a';
}
setCommonDefaults( 'GettingStarted' );
--
To view, visit https://gerrit.wikimedia.org/r/51396
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12fffa17923ce40f901206086ea28c957d2e7af2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/E3Experiments
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@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] Update EventLogging to master - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update EventLogging to master .. Update EventLogging to master Change-Id: I0a5275c09e3f3179b9854dc61a6e52eee98688c2 --- M extensions/EventLogging 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/EventLogging b/extensions/EventLogging index 47be6c2..b36b53a 16 --- a/extensions/EventLogging +++ b/extensions/EventLogging -Subproject commit 47be6c23bd7e1834aa7899c467fe99c6a8b5c12f +Subproject commit b36b53a520a389129122f5792e697f9af7e65f60 -- To view, visit https://gerrit.wikimedia.org/r/51343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0a5275c09e3f3179b9854dc61a6e52eee98688c2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf10 Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@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] Don't remove div.infobox which also doesn't work anyway - change (mediawiki...MobileFrontend)
MaxSem has uploaded a new change for review. https://gerrit.wikimedia.org/r/51398 Change subject: Don't remove div.infobox which also doesn't work anyway .. Don't remove div.infobox which also doesn't work anyway ...because it's table.infobox;) Change-Id: I133c4522aaa44a7ed2d3f561504a42ab53fc3666 --- M includes/MobileFormatter.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/98/51398/1 diff --git a/includes/MobileFormatter.php b/includes/MobileFormatter.php index 7b070fb..8cf3c57 100644 --- a/includes/MobileFormatter.php +++ b/includes/MobileFormatter.php @@ -26,7 +26,6 @@ protected $wmlContext; private $defaultItemsToRemove = array( - 'div.infobox', 'table.toc', 'div.stub', '#search', // remove search form element from Special:Search -- To view, visit https://gerrit.wikimedia.org/r/51398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I133c4522aaa44a7ed2d3f561504a42ab53fc3666 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: MaxSem maxsem.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update E3Experiments to master - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update E3Experiments to master .. Update E3Experiments to master Change-Id: I6653462366c8fb50b99a6167da8a724761a8de4d --- M extensions/E3Experiments 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/E3Experiments b/extensions/E3Experiments index 0912c58..d8acea6 16 --- a/extensions/E3Experiments +++ b/extensions/E3Experiments -Subproject commit 0912c58dab45359385a7e923587bae293b335a46 +Subproject commit d8acea6302a22fe723267d5e4ffb8dd50648d784 -- To view, visit https://gerrit.wikimedia.org/r/51346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6653462366c8fb50b99a6167da8a724761a8de4d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf10 Gerrit-Owner: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@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] Shift-Enter should add newline in preformatted - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Shift-Enter should add newline in preformatted
..
Shift-Enter should add newline in preformatted
Modified handleEnter to check for the condition that shift-enter
is being pressed inside of a preformatted block. If so, a break
node is inserted.
Bug: 45355
Change-Id: Iae7b3c88b7cd976e519c09821a064078228acc79
---
M modules/ve/ce/ve.ce.Surface.js
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ce/ve.ce.Surface.js b/modules/ve/ce/ve.ce.Surface.js
index ab9462a..bc12426 100644
--- a/modules/ve/ce/ve.ce.Surface.js
+++ b/modules/ve/ce/ve.ce.Surface.js
@@ -774,6 +774,9 @@
documentModel,
contentBranchModel.getOuterRange().to, emptyParagraph
);
}
+ } else if ( e.shiftKey contentBranchModel.hasSignificantWhitespace()
) {
+ // Insert newline
+ tx = ve.dm.Transaction.newFromInsertion( documentModel,
selection.from, '\n' );
} else {
// Split
node.traverseUpstream( function ( node ) {
--
To view, visit https://gerrit.wikimedia.org/r/50862
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae7b3c88b7cd976e519c09821a064078228acc79
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Christian christ...@wikia-inc.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Christian christ...@wikia-inc.com
Gerrit-Reviewer: Trevor Parscal tpars...@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] Apparently faster queries for DM and Syntrans - change (mediawiki...WikiLexicalData)
Kipcool has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51400
Change subject: Apparently faster queries for DM and Syntrans
..
Apparently faster queries for DM and Syntrans
Change-Id: I1619d6a35c32af230b58c376e2caa96312d73cea
---
M OmegaWiki/SpecialSuggest.php
1 file changed, 6 insertions(+), 6 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData
refs/changes/00/51400/1
diff --git a/OmegaWiki/SpecialSuggest.php b/OmegaWiki/SpecialSuggest.php
index 374d150..2904e80 100644
--- a/OmegaWiki/SpecialSuggest.php
+++ b/OmegaWiki/SpecialSuggest.php
@@ -77,18 +77,18 @@
break;
case WLD_DEFINED_MEANING:
$sql =
- SELECT
{$dc}_syntrans.defined_meaning_id AS defined_meaning_id,
{$dc}_expression.spelling AS spelling, {$dc}_expression.language_id AS
language_id .
-FROM {$dc}_expression, {$dc}_syntrans
.
-WHERE
{$dc}_expression.expression_id={$dc}_syntrans.expression_id .
+ SELECT STRAIGHT_JOIN
{$dc}_syntrans.defined_meaning_id AS defined_meaning_id,
{$dc}_expression.spelling AS spelling, {$dc}_expression.language_id AS
language_id .
+FROM {$dc}_expression JOIN
{$dc}_syntrans .
+ON
{$dc}_expression.expression_id={$dc}_syntrans.expression_id .
AND
{$dc}_syntrans.identical_meaning=1 .
AND
{$dc}_syntrans.remove_transaction_id is NULL ;
break;
case WLD_SYNONYMS_TRANSLATIONS:
$sql =
- SELECT {$dc}_syntrans.syntrans_sid AS
syntrans_sid, {$dc}_syntrans.defined_meaning_id AS defined_meaning_id, .
+ SELECT STRAIGHT_JOIN
{$dc}_syntrans.syntrans_sid AS syntrans_sid, {$dc}_syntrans.defined_meaning_id
AS defined_meaning_id, .
{$dc}_expression.spelling AS
spelling, {$dc}_expression.language_id AS language_id .
-FROM {$dc}_expression, {$dc}_syntrans
.
-WHERE
{$dc}_expression.expression_id={$dc}_syntrans.expression_id .
+FROM {$dc}_expression JOIN
{$dc}_syntrans .
+ON
{$dc}_expression.expression_id={$dc}_syntrans.expression_id .
AND
{$dc}_syntrans.identical_meaning=1 .
AND
{$dc}_syntrans.remove_transaction_id is NULL ;
break;
--
To view, visit https://gerrit.wikimedia.org/r/51400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1619d6a35c32af230b58c376e2caa96312d73cea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Kipcool kipmas...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Apparently faster queries for DM and Syntrans - change (mediawiki...WikiLexicalData)
Kipcool has submitted this change and it was merged.
Change subject: Apparently faster queries for DM and Syntrans
..
Apparently faster queries for DM and Syntrans
Change-Id: I1619d6a35c32af230b58c376e2caa96312d73cea
---
M OmegaWiki/SpecialSuggest.php
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
Kipcool: Verified; Looks good to me, approved
diff --git a/OmegaWiki/SpecialSuggest.php b/OmegaWiki/SpecialSuggest.php
index 374d150..2904e80 100644
--- a/OmegaWiki/SpecialSuggest.php
+++ b/OmegaWiki/SpecialSuggest.php
@@ -77,18 +77,18 @@
break;
case WLD_DEFINED_MEANING:
$sql =
- SELECT
{$dc}_syntrans.defined_meaning_id AS defined_meaning_id,
{$dc}_expression.spelling AS spelling, {$dc}_expression.language_id AS
language_id .
-FROM {$dc}_expression, {$dc}_syntrans
.
-WHERE
{$dc}_expression.expression_id={$dc}_syntrans.expression_id .
+ SELECT STRAIGHT_JOIN
{$dc}_syntrans.defined_meaning_id AS defined_meaning_id,
{$dc}_expression.spelling AS spelling, {$dc}_expression.language_id AS
language_id .
+FROM {$dc}_expression JOIN
{$dc}_syntrans .
+ON
{$dc}_expression.expression_id={$dc}_syntrans.expression_id .
AND
{$dc}_syntrans.identical_meaning=1 .
AND
{$dc}_syntrans.remove_transaction_id is NULL ;
break;
case WLD_SYNONYMS_TRANSLATIONS:
$sql =
- SELECT {$dc}_syntrans.syntrans_sid AS
syntrans_sid, {$dc}_syntrans.defined_meaning_id AS defined_meaning_id, .
+ SELECT STRAIGHT_JOIN
{$dc}_syntrans.syntrans_sid AS syntrans_sid, {$dc}_syntrans.defined_meaning_id
AS defined_meaning_id, .
{$dc}_expression.spelling AS
spelling, {$dc}_expression.language_id AS language_id .
-FROM {$dc}_expression, {$dc}_syntrans
.
-WHERE
{$dc}_expression.expression_id={$dc}_syntrans.expression_id .
+FROM {$dc}_expression JOIN
{$dc}_syntrans .
+ON
{$dc}_expression.expression_id={$dc}_syntrans.expression_id .
AND
{$dc}_syntrans.identical_meaning=1 .
AND
{$dc}_syntrans.remove_transaction_id is NULL ;
break;
--
To view, visit https://gerrit.wikimedia.org/r/51400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1619d6a35c32af230b58c376e2caa96312d73cea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Kipcool kipmas...@gmail.com
Gerrit-Reviewer: Kipcool kipmas...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] moving search-pool4 queries to pmtpa to test resharding - change (operations/mediawiki-config)
Asher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/51407
Change subject: moving search-pool4 queries to pmtpa to test resharding
..
moving search-pool4 queries to pmtpa to test resharding
Change-Id: I7cae22b55efe7f25bf5139dcf33ed437ba5d428a
---
M wmf-config/lucene.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/07/51407/1
diff --git a/wmf-config/lucene.php b/wmf-config/lucene.php
index 25748c9..922d0fb 100644
--- a/wmf-config/lucene.php
+++ b/wmf-config/lucene.php
@@ -35,6 +35,6 @@
#$wgLuceneHost = '10.2.1.13'; # pmtpa
} else {
# Pool 4 LVS
- $wgLuceneHost = '10.2.2.14'; # eqiad
- #$wgLuceneHost = '10.2.1.14'; # pmtpa
+ #$wgLuceneHost = '10.2.2.14'; # eqiad
+ $wgLuceneHost = '10.2.1.14'; # pmtpa
}
--
To view, visit https://gerrit.wikimedia.org/r/51407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cae22b55efe7f25bf5139dcf33ed437ba5d428a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Asher afeld...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
