jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354607 )
Change subject: Add \b to regexes in BlockLevelPass to avoid confusing tr &
track
..
Add \b to regexes in BlockLevelPass to avoid confusing tr & track
With TimedMediaHandler in video.js mode, videos can be inline,
without a wrapper div.
Previously, in this mode two paragraphs where one contained a
video would end up merged into one paragraph, due to BlockLevelPass
matching "" against "
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354547 )
Change subject: Set empty PYTHONPATH in tox.ini
..
Set empty PYTHONPATH in tox.ini
Our jenkins instance is not actually running any pybal tests. The reason
is that we're using `trial pybal` in tox.ini and funnily enough trial
requires PYTHONPATH to be set (even if it is set to an empty string) or
else it won't manage to find any tests and just pretend everything is
fine, claiming the tests have passed.
Change-Id: I6541a8384bd8284bcc76adec04c6e2d2febecda1
Ref:
http://stackoverflow.com/questions/42425901/twisted-trial-pythonpath-and-sys-path
---
M tox.ini
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tox.ini b/tox.ini
index 095c4e4..3de1bc3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,9 @@
envlist = py27, flake8
[testenv]
+setenv =
+ PYTHONPATH=
+
commands = trial pybal
deps =
twisted
--
To view, visit https://gerrit.wikimedia.org/r/354547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6541a8384bd8284bcc76adec04c6e2d2febecda1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Ema
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354617 )
Change subject: Set empty PYTHONPATH in tox.ini
..
Set empty PYTHONPATH in tox.ini
Our jenkins instance is not actually running any pybal tests. The reason
is that we're using `trial pybal` in tox.ini and funnily enough trial
requires PYTHONPATH to be set (even if it is set to an empty string) or
else it won't manage to find any tests and just pretend everything is
fine, claiming the tests have passed.
Change-Id: I6541a8384bd8284bcc76adec04c6e2d2febecda1
Ref:
http://stackoverflow.com/questions/42425901/twisted-trial-pythonpath-and-sys-path
(cherry picked from commit 76e90a1e2f44c3b1885dc4e7383204ce8feb5046)
---
M tox.ini
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal
refs/changes/17/354617/1
diff --git a/tox.ini b/tox.ini
index 095c4e4..3de1bc3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,9 @@
envlist = py27, flake8
[testenv]
+setenv =
+ PYTHONPATH=
+
commands = trial pybal
deps =
twisted
--
To view, visit https://gerrit.wikimedia.org/r/354617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6541a8384bd8284bcc76adec04c6e2d2febecda1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: 2.0-dev
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Ema
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354618 )
Change subject: Assign column-agnostic UID to individual list entries
..
Assign column-agnostic UID to individual list entries
Unlike the other ID assignment mechanism, this is based on the item's
position in the JSON's native representation. This allows list items
to be edited regardless of how they appear in the rendered HTML.
Bug: T165672
Change-Id: I37da1639e2e70d1b51ba090444d2a5e73be94613
---
M includes/content/CollaborationListContent.php
M modules/ext.CollaborationKit.list.edit.js
M modules/ext.CollaborationKit.list.ui.js
3 files changed, 198 insertions(+), 135 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/18/354618/1
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index 47c68ff..246afa9 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -300,10 +300,19 @@
return $text;
}
+ $columns = $this->columns;
+
+ // Assign a UID to each list entry.
+ $uidCounter = 0;
+ foreach ( $columns as $colId => $column ) {
+ foreach ( $column->items as $rowId => $row ) {
+ $columns[$colId]->items[$rowId]->uid =
$uidCounter;
+ $uidCounter++;
+ }
+ }
+
if ( $this->displaymode === 'members' && count( $this->columns
) === 1 ) {
- $columns = $this->sortUsersIntoColumns(
$this->columns[0] );
- } else {
- $columns = $this->columns;
+ $columns = $this->sortUsersIntoColumns( $columns[0] );
}
$columns = $this->filterColumns( $columns, $options['columns']
);
@@ -335,103 +344,103 @@
if ( count( $column->items ) === 0 ) {
$text .= "\n";
$text .=
"{{mediawiki:collaborationkit-list-emptycolumn}}\n";
- $text .= "\n";
- continue;
- }
+ } else {
+ $curItem = 0;
- $curItem = 0;
+ $sortedItems = $column->items;
+ $this->sortList( $sortedItems,
$options['defaultSort'] );
- $sortedItems = $column->items;
- $this->sortList( $sortedItems, $options['defaultSort']
);
-
- $itemCounter = 0;
- foreach ( $sortedItems as $item ) {
- if ( $offset !== 0 ) {
- $offset--;
- continue;
- }
- $curItem++;
- if ( $maxItems !== false && $maxItems <
$curItem ) {
- break;
- }
-
- $itemTags = isset( $item->tags ) ? $item->tags
: [];
- if ( !$this->matchesTag( $options['tags'],
$itemTags ) ) {
- continue;
- }
-
- $titleForItem = null;
- if ( !isset( $item->link ) ) {
- $titleForItem = Title::newFromText(
$item->title );
- } elseif ( $item->link !== false ) {
- $titleForItem = Title::newFromText(
$item->link );
- }
- $text .= Html::openElement( 'div', [
- 'style' => "min-height:{$iconWidth}px",
- 'class' => 'mw-ck-list-item',
- 'data-collabkit-item-title' =>
$item->title,
- 'data-collabkit-item-id' => $colId .
'-' . $itemCounter
- ] );
- $itemCounter++;
- if ( $options['mode'] !== 'no-img' ) {
- if ( isset( $item->image ) ) {
- $text .= static::generateImage(
- $item->image,
- $this->displaymode,
- $titleForItem,
- $iconWidth
-
Jonas Kress (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354621 )
Change subject: Update jQuery to 3.2.1
..
Update jQuery to 3.2.1
Change-Id: I7b6e5253b81b7ba3e0a290562c99fe7315691b41
---
M package.json
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/21/354621/1
diff --git a/package.json b/package.json
index 8a9c4e6..ce88d32 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,9 @@
}
},
"dependencies": {
-"bootstrap": "^3.3.6",
-"bootstrap-table": "^1.10.1",
-"codemirror": "~5.20.2",
+"bootstrap": "^3.3.7",
+"bootstrap-table": "^1.11.2",
+"codemirror": "^5.25.2",
"d3": "^3.5.17",
"dimple-js": "^2.1.4",
"downloadjs": "^1.4.4",
@@ -25,17 +25,17 @@
"es6-shim": "^0.35.1",
"font-awesome": "^4.6.3",
"jqcloud-npm": "^3.0.3",
-"jquery": "^1.12.0",
+"jquery": "^3.2.1",
"jquery.i18n": "git+https://github.com/wikimedia/jquery.i18n.git;,
"jquery.uls": "git+https://github.com/wikimedia/jquery.uls.git;,
"js-cookie": "^2.1.2",
-"leaflet": "~1.0.0",
+"leaflet": "^1.0.3",
"leaflet-fullscreen": "^1.0.1",
"leaflet-zoombox": "^0.2.0",
-"moment": "^2.13.0",
+"moment": "^2.18.1",
"select2": "^4.0.3",
"underscore": "^1.8.3",
-"vis": "^4.16.1"
+"vis": "^4.19.1"
},
"devDependencies": {
"grunt": "0.4.5",
--
To view, visit https://gerrit.wikimedia.org/r/354621
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b6e5253b81b7ba3e0a290562c99fe7315691b41
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
WMDE-Fisch has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354649 )
Change subject: Improve support for screenreaders
..
Improve support for screenreaders
This patch improves screenreader support by applying some basic
rules and improving the OOjs UI usage. Things done here:
- make use of 'aria-label' attribute to label interactive buttons
- use connect method on help button to allow keyboard interaction
- give hint on help button that it opens a dialog
- communicate state of autoexpand button
- add attributes to make screenreaders understand the accordion
mechanism if the slider widget
See:
https://www.w3.org/TR/wai-aria-practices/#button
https://www.w3.org/TR/wai-aria-practices/#accordion
Bug: T165489
Change-Id: I7a174e5971a751ec54d4d5115d5441f0a577c103
---
M modules/ext.RevisionSlider.HelpButtonView.js
M modules/ext.RevisionSlider.SliderArrowView.js
M modules/ext.RevisionSlider.init.js
3 files changed, 32 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/49/354649/1
diff --git a/modules/ext.RevisionSlider.HelpButtonView.js
b/modules/ext.RevisionSlider.HelpButtonView.js
index 9fa0018..ec2bb99 100644
--- a/modules/ext.RevisionSlider.HelpButtonView.js
+++ b/modules/ext.RevisionSlider.HelpButtonView.js
@@ -24,16 +24,17 @@
width: 200,
classes: [ 'mw-revslider-tooltip',
'mw-revslider-help-tooltip' ]
} );
+ helpButton.connect( mw.libs.revisionSlider.HelpDialog, {
+ click: 'show'
+ } );
helpButton.$element
- .click( function () {
-
mw.libs.revisionSlider.HelpDialog.show();
- } )
.mouseover( function () {
helpPopup.toggle( true );
} )
.mouseout( function () {
helpPopup.toggle( false );
- } );
+ } )
+ .children().attr( 'aria-haspopup', 'true' );
$( 'body' ).append( helpPopup.$element );
diff --git a/modules/ext.RevisionSlider.SliderArrowView.js
b/modules/ext.RevisionSlider.SliderArrowView.js
index 8454d95..3032132 100644
--- a/modules/ext.RevisionSlider.SliderArrowView.js
+++ b/modules/ext.RevisionSlider.SliderArrowView.js
@@ -47,6 +47,7 @@
backwardArrowButton.$element
.attr( 'data-dir', -1 )
+ .children().attr( 'arial-label', mw.msg(
'revisionslider-arrow-tooltip-older' ) )
.mouseover( { button: backwardArrowButton,
popup: backwardArrowPopup }, this.showPopup )
.mouseout( { popup: backwardArrowPopup },
this.hidePopup )
.focusin( { button: backwardArrowButton },
this.arrowFocusHandler );
@@ -88,6 +89,7 @@
forwardArrowButton.$element
.attr( 'data-dir', 1 )
+ .children().attr( 'arial-label', mw.msg(
'revisionslider-arrow-tooltip-newer' ) )
.mouseover( { button: forwardArrowButton,
popup: forwardArrowPopup }, this.showPopup )
.mouseout( { popup: forwardArrowPopup },
this.hidePopup )
.focusin( { button: forwardArrowButton },
this.arrowFocusHandler );
diff --git a/modules/ext.RevisionSlider.init.js
b/modules/ext.RevisionSlider.init.js
index f964ef4..12cf1f5 100644
--- a/modules/ext.RevisionSlider.init.js
+++ b/modules/ext.RevisionSlider.init.js
@@ -8,6 +8,12 @@
var startTime = mw.now(),
api = new mw.libs.revisionSlider.Api(
mw.util.wikiScript( 'api' ) );
+ toggleButton.$element.attr( 'role', 'heading' );
+ toggleButton.$element.children().attr( {
+ 'aria-expanded': autoExpand,
+ 'aria-controls': 'mw-revslider-slider-wrapper'
+ } );
+
mw.track( 'counter.MediaWiki.RevisionSlider.event.init'
);
mw.libs.revisionSlider.userOffset =
mw.user.options.get( 'timecorrection' ) ? mw.user.options.get( 'timecorrection'
).split( '|' )[ 1 ] : mw.config.get( 'extRevisionSliderTimeOffset' );
@@ -29,6 +35,7 @@
revs.reverse();
$container = $(
'.mw-revslider-slider-wrapper' );
+
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354648 )
Change subject: Merging from cffe5b3ea5f726b5e88dbbeb9aa6ccdd306e5285:
..
Merging from cffe5b3ea5f726b5e88dbbeb9aa6ccdd306e5285:
Localisation updates from https://translatewiki.net.
Change-Id: Id1d9326f9107adbd900ab315f3c6abecb7c344f5
---
A css/embed.style.min.22cb00c77652586f7efa.css
D css/embed.style.min.255dd0aebdfd7b82334d.css
D css/style.min.2239745b99548f23d9b8.css
A css/style.min.fe9092e8eb3b77834582.css
M embed.html
M fonts/fontawesome-webfont.eot
M fonts/fontawesome-webfont.ttf
M fonts/fontawesome-webfont.woff
M fonts/fontawesome-webfont.woff2
D frame.html
M i18n/af.json
M i18n/ast.json
M i18n/az.json
M i18n/br.json
M i18n/da.json
M i18n/diq.json
M i18n/dty.json
M i18n/eu.json
M i18n/fr.json
M i18n/gd.json
M i18n/gu.json
M i18n/hant.json
M i18n/hi.json
M i18n/hy.json
M i18n/ia.json
M i18n/id.json
M i18n/ie.json
M i18n/io.json
M i18n/jv.json
M i18n/lb.json
M i18n/mg.json
M i18n/nl.json
M i18n/oc.json
M i18n/ps.json
M i18n/shn.json
M i18n/tarask.json
M i18n/te.json
M i18n/udm.json
M i18n/yi.json
M index.html
A js/embed.vendor.min.8262b8273dc9e77b4c73.js
D js/embed.vendor.min.a48cec24aa556691c844.js
A js/embed.wdqs.min.84434972d24d5966b235.js
D js/embed.wdqs.min.b344ab9c8402ab817acf.js
A js/shim.min.d1421fd3535f8c49c96c.js
D js/shim.min.e82702b2ab0ddd14f026.js
D js/vendor.min.3769a959a566f76468d3.js
A js/vendor.min.5088fa2672bbff9ee391.js
D js/wdqs.min.2fe2cb53c63db98bf269.js
A js/wdqs.min.f8aee51a695ba146023e.js
50 files changed, 183 insertions(+), 223 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui-deploy
refs/changes/48/354648/1
--
To view, visit https://gerrit.wikimedia.org/r/354648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1d9326f9107adbd900ab315f3c6abecb7c344f5
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354645 )
Change subject: Avoid exceptions in ApiTranslateSandbox signup
..
Avoid exceptions in ApiTranslateSandbox signup
The error message shown to the user is now just "invalid password"
instead of "MWException gibberish biggerish password-name-match gibberish"
Bug: T164912
Change-Id: I975193181e3b0331dfc9b57900c6cb246b79ffa9
---
M api/ApiTranslateSandbox.php
M i18n/api/en.json
M i18n/api/qqq.json
3 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/api/ApiTranslateSandbox.php b/api/ApiTranslateSandbox.php
index 6e25c56..4a990f4 100644
--- a/api/ApiTranslateSandbox.php
+++ b/api/ApiTranslateSandbox.php
@@ -72,9 +72,8 @@
}
$password = $params['password'];
- $status = $user->checkPasswordValidity( $password );
- if ( !$status->isGood() ) {
- $this->dieStatus( $status );
+ if ( !$user->isValidPassword( $password ) ) {
+ $this->dieWithError(
'apierror-translate-sandbox-invalidpassword', 'invalidpassword' );
}
$email = $params['email'];
diff --git a/i18n/api/en.json b/i18n/api/en.json
index e65d6cc..0cc93c4 100644
--- a/i18n/api/en.json
+++ b/i18n/api/en.json
@@ -101,6 +101,7 @@
"apierror-translate-owntranslation": "Cannot review own translations",
"apierror-translate-sandboxdisabled": "Sandbox feature is not in use",
"apierror-translate-sandbox-invalidparam": "$1",
+ "apierror-translate-sandbox-invalidppassword": "Invalid password",
"apierror-translate-unknownmessage": "Unknown message",
"apiwarn-translate-alreadyreviewedbyyou": "Already marked as reviewed
by you"
}
diff --git a/i18n/api/qqq.json b/i18n/api/qqq.json
index 5e2af63..aa26be4 100644
--- a/i18n/api/qqq.json
+++ b/i18n/api/qqq.json
@@ -106,6 +106,7 @@
"apierror-translate-owntranslation": "{{doc-apierror}}",
"apierror-translate-sandboxdisabled": "{{doc-apierror}}",
"apierror-translate-sandbox-invalidparam":
"{{doc-apierror}}\n\nParameters:\n* $1 - Exception message, probably in
English",
+ "apierror-translate-sandbox-invalidppassword": "{{doc-apierror}}",
"apierror-translate-unknownmessage": "{{doc-apierror}}",
"apiwarn-translate-alreadyreviewedbyyou": "{{doc-apierror}}"
}
--
To view, visit https://gerrit.wikimedia.org/r/354645
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I975193181e3b0331dfc9b57900c6cb246b79ffa9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Nemo bis
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/319970 )
Change subject: Serve meta. Russian translation for the privacy policy
..
Serve meta. Russian translation for the privacy policy
Bug: T150070
Change-Id: I65675fb64bac02a2cf65200857ce081388c7e905
---
A i18n/wikimediaoverridesnotranslate/ru.json
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
XXN: Looks good to me, but someone else must approve
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/i18n/wikimediaoverridesnotranslate/ru.json
b/i18n/wikimediaoverridesnotranslate/ru.json
new file mode 100644
index 000..2c52820
--- /dev/null
+++ b/i18n/wikimediaoverridesnotranslate/ru.json
@@ -0,0 +1,4 @@
+{
+ "@metadata": [],
+ "wikimedia-privacypage": "m:Privacy_policy/ru"
+}
--
To view, visit https://gerrit.wikimedia.org/r/319970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65675fb64bac02a2cf65200857ce081388c7e905
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: Dereckson
Gerrit-Reviewer: Dereckson
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: XXN
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353828 )
Change subject: Use DB_REPLICA in isSourcePage()
..
Use DB_REPLICA in isSourcePage()
Change-Id: I67beabc0830f34a3ae8d7f1859bf3134aa176c70
---
M tag/TranslatablePage.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/tag/TranslatablePage.php b/tag/TranslatablePage.php
index eccff77..db0d2a0 100644
--- a/tag/TranslatablePage.php
+++ b/tag/TranslatablePage.php
@@ -848,7 +848,7 @@
$cache->makeKey( 'pagetranslation', 'sourcepages' ),
$cache::TTL_MINUTE * 5,
function ( $oldValue, &$ttl, array &$setOpts ) {
- $dbr = TranslateUtils::getSafeReadDB();
+ $dbr = wfGetDB( DB_REPLICA );
$setOpts += Database::getCacheSetOptions( $dbr
);
return TranslatablePage::getTranslatablePages();
--
To view, visit https://gerrit.wikimedia.org/r/353828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67beabc0830f34a3ae8d7f1859bf3134aa176c70
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353829 )
Change subject: Use TranslateUtils::getSafeReadDB() in loadAggregateGroups
..
Use TranslateUtils::getSafeReadDB() in loadAggregateGroups
Bug: T92357
Change-Id: I2ff18e9c153e8756c96d962932778e76a1cc04b9
---
M MessageGroups.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/MessageGroups.php b/MessageGroups.php
index 9ca4fc9..aebc8c1 100644
--- a/MessageGroups.php
+++ b/MessageGroups.php
@@ -778,7 +778,7 @@
* @return array
*/
protected static function loadAggregateGroups() {
- $dbw = wfGetDB( DB_MASTER );
+ $dbw = TranslateUtils::getSafeReadDB();
$tables = [ 'translate_metadata' ];
$fields = [ 'tmd_group', 'tmd_value' ];
$conds = [ 'tmd_key' => 'subgroups' ];
--
To view, visit https://gerrit.wikimedia.org/r/353829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2ff18e9c153e8756c96d962932778e76a1cc04b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/298511 )
Change subject: Rewrite of translatable page moving code
..
Rewrite of translatable page moving code
Get rid of some ugly old code by using MovePage. Instead of splitting
moves into many many jobs, use one job that does it all. This allows
to simplify many things.
Old job class to be removed later.
Change-Id: Idbbdd09dcc214fecabc28607cc3207324fcb7fee
---
M Autoload.php
M TranslateHooks.php
M i18n/pagetranslation/en.json
M tag/PageTranslationHooks.php
M tag/SpecialPageTranslationMovePage.php
A tag/TranslatablePageMoveJob.php
6 files changed, 185 insertions(+), 92 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/Autoload.php b/Autoload.php
index 11b6106..7c1f72a 100644
--- a/Autoload.php
+++ b/Autoload.php
@@ -132,6 +132,7 @@
* @ingroup PageTranslation
* @{
*/
+$al['TranslatablePageMoveJob'] = "$dir/tag/TranslatablePageMoveJob.php";
$al['TranslateDeleteJob'] = "$dir/tag/TranslateDeleteJob.php";
$al['TranslateMoveJob'] = "$dir/tag/TranslateMoveJob.php";
$al['SpecialPageMigration'] = "$dir/tag/SpecialPageMigration.php";
diff --git a/TranslateHooks.php b/TranslateHooks.php
index 9b49eeb..0bf9c7f 100644
--- a/TranslateHooks.php
+++ b/TranslateHooks.php
@@ -110,6 +110,7 @@
global $wgJobClasses;
$wgJobClasses['TranslateRenderJob'] =
'TranslateRenderJob';
$wgJobClasses['RenderJob'] = 'TranslateRenderJob';
+ $wgJobClasses['TranslatablePageMoveJob'] =
'TranslatablePageMoveJob';
$wgJobClasses['TranslateMoveJob'] = 'TranslateMoveJob';
$wgJobClasses['MoveJob'] = 'TranslateMoveJob';
$wgJobClasses['TranslateDeleteJob'] =
'TranslateDeleteJob';
diff --git a/i18n/pagetranslation/en.json b/i18n/pagetranslation/en.json
index 09881f8..f1b2023 100644
--- a/i18n/pagetranslation/en.json
+++ b/i18n/pagetranslation/en.json
@@ -147,7 +147,7 @@
"pt-movepage-action-other": "Change target",
"pt-movepage-intro": "This special page allows you to move pages which
are marked for translation.\nThe move action will not be instant, because many
pages will need to be moved.\nWhile the pages are being moved, it is not
possible to interact with the pages in question.\nFailures will be logged in
the [[Special:Log/pagetranslation|page translation log]] and they need to be
repaired by hand.",
"pt-movepage-logreason": "Part of translatable page \"$1\"",
- "pt-movepage-started": "The base page is now moved.\nPlease check the
[[Special:Log/pagetranslation|page translation log]] for errors and completion
message.",
+ "pt-movepage-started": "Please check the
[[Special:Log/pagetranslation|page translation log]] in a while for errors and
completion message.",
"pt-locked-page": "This page is locked because the translatable page is
currently being moved.",
"pt-deletepage-lang-title": "Deleting translation page \"$1\"",
"pt-deletepage-full-title": "Deleting translatable page \"$1\"",
diff --git a/tag/PageTranslationHooks.php b/tag/PageTranslationHooks.php
index 55ad8e9..8770876 100644
--- a/tag/PageTranslationHooks.php
+++ b/tag/PageTranslationHooks.php
@@ -826,8 +826,7 @@
$cache = wfGetCache( CACHE_ANYTHING );
$key = wfMemcKey( 'pt-lock', sha1( $title->getPrefixedText() )
);
- // At least memcached mangles true to "1"
- if ( $cache->get( $key ) !== false ) {
+ if ( $cache->get( $key ) === 'locked' ) {
$result = [ 'pt-locked-page' ];
return false;
diff --git a/tag/SpecialPageTranslationMovePage.php
b/tag/SpecialPageTranslationMovePage.php
index a84afbe..df422f0 100644
--- a/tag/SpecialPageTranslationMovePage.php
+++ b/tag/SpecialPageTranslationMovePage.php
@@ -402,114 +402,42 @@
}
protected function performAction() {
- $jobs = [];
- $user = $this->getUser();
$target = $this->newTitle;
$base = $this->oldTitle->getPrefixedText();
- $oldLatest = $this->oldTitle->getLatestRevID();
- $params = [
- 'base-source' => $this->oldTitle->getPrefixedText(),
- 'base-target' => $this->newTitle->getPrefixedText(),
- ];
+ $moves = [];
+ $moves[$base] = $target->getPrefixedText();
- $translationPages = $this->getTranslationPages();
- foreach ( $translationPages as $old ) {
- $to = $this->newPageTitle( $base, $old, $target );
- $jobs[$old->getPrefixedText()] =
TranslateMoveJob::newJob( $old, $to, $params, $user );
+
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354592 )
Change subject: Fix Closure detection in MediaWikiTestCase
..
Fix Closure detection in MediaWikiTestCase
Sometimes the closure are hidden in arrays, catch this.
The $maxDepth check is just for sanity, I don't think it's
actually needed.
Follows-Up: c2c7452577e
Bug: T111641
Change-Id: Id5e036ce4949b8106873fd938f54c2774d3d6a4a
---
M tests/phpunit/MediaWikiTestCase.php
1 file changed, 23 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/MediaWikiTestCase.php
b/tests/phpunit/MediaWikiTestCase.php
index 1114f2a..df3d568 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1,6 +1,5 @@
mwGlobals[$globalKey] = clone
$GLOBALS[$globalKey];
- } elseif ( $GLOBALS[$globalKey] instanceof
Closure ) {
+ } elseif ( $this->containsClosure(
$GLOBALS[$globalKey] ) ) {
// Serializing Closure only gives a
warning on HHVM while
// it throws an Exception on Zend.
// Workaround for
https://github.com/facebook/hhvm/issues/6206
@@ -755,6 +754,28 @@
}
/**
+* @param mixed $var
+* @param int $maxDepth
+*
+* @return bool
+*/
+ private function containsClosure( $var, $maxDepth = 15 ) {
+ if ( $var instanceof Closure ) {
+ return true;
+ }
+ if ( !is_array( $var ) || $maxDepth === 0 ) {
+ return false;
+ }
+
+ foreach ( $var as $value ) {
+ if ( $this->containsClosure( $value, $maxDepth - 1 ) ) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
* Merges the given values into a MW global array variable.
* Useful for setting some entries in a configuration array, instead of
* setting the entire array.
--
To view, visit https://gerrit.wikimedia.org/r/354592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5e036ce4949b8106873fd938f54c2774d3d6a4a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Hoo man
Gerrit-Reviewer: Addshore
Gerrit-Reviewer: Aude
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Jean-Frédéric has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354661 )
Change subject: Use cl_sortkey_prefix in populate_image SQL query
..
Use cl_sortkey_prefix in populate_image SQL query
It turns out that `cl_sortkey` returns the concatenation
of the SortKey and of the page name.
To only get what we mean by SortKey,
we need to use `cl_sortkey_prefix`.
Change-Id: I1091ae63d65defb45676fe56b61cae8330607aa9
---
M erfgoedbot/populate_image_table.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/tools/heritage
refs/changes/61/354661/1
diff --git a/erfgoedbot/populate_image_table.py
b/erfgoedbot/populate_image_table.py
index 68cdb3d..9396f4a 100644
--- a/erfgoedbot/populate_image_table.py
+++ b/erfgoedbot/populate_image_table.py
@@ -147,7 +147,7 @@
"""Return all monument photos in a given tracker category on Commons."""
result = []
-query = (u"SELECT cl_sortkey, page_title "
+query = (u"SELECT cl_sortkey_prefix, page_title "
u"FROM page "
u"JOIN categorylinks ON page_id=cl_from "
u"WHERE page_namespace=6 AND page_is_redirect=0 AND cl_to=%s")
--
To view, visit https://gerrit.wikimedia.org/r/354661
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1091ae63d65defb45676fe56b61cae8330607aa9
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Andrew Bogott has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354668 )
Change subject: Tidy up tools node motd
..
Tidy up tools node motd
Change-Id: I795ceb01adf3d0e6b0d839b88530ca7b75f840b2
---
M modules/toollabs/files/40-tools-infrastructure-banner.sh
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/354668/1
diff --git a/modules/toollabs/files/40-tools-infrastructure-banner.sh
b/modules/toollabs/files/40-tools-infrastructure-banner.sh
index 82c0d78..11e9f59 100644
--- a/modules/toollabs/files/40-tools-infrastructure-banner.sh
+++ b/modules/toollabs/files/40-tools-infrastructure-banner.sh
@@ -10,9 +10,6 @@
[33;1m/ [31m![33m \[0m
[33;1m/_\[0m "No user-serviceable parts inside."
- *** This is supposed to be a [31mstable [0mserver ***
- *** Laugh or cry as appropriate ***
-
EOF
--
To view, visit https://gerrit.wikimedia.org/r/354668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I795ceb01adf3d0e6b0d839b88530ca7b75f840b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354665 )
Change subject: Trivial docfix in DiscussionParser
..
Trivial docfix in DiscussionParser
Change-Id: I105b297333017dbce71cc42528a0e76f8be5da4b
---
M includes/DiscussionParser.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index cba02b4..3759af0 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -277,7 +277,7 @@
* Set of arrays containing valid mentions and possible intended but
failed mentions.
* - [validMentions]: An array of valid users to mention with ID => ID.
* - [unknownUsers]: An array of DBKey strings representing unknown
users.
-* - [validMentions]: An array of DBKey strings representing anonymous
IP users.
+* - [anonymousUsers]: An array of DBKey strings representing anonymous
IP users.
*/
private static function getUserMentions( Title $title, $revisionUserId,
array $userLinks ) {
global $wgEchoMaxMentionsCount;
--
To view, visit https://gerrit.wikimedia.org/r/354665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I105b297333017dbce71cc42528a0e76f8be5da4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354638 )
Change subject: Fix callout positioning logic
..
Fix callout positioning logic
Follow-up to 1d395d49660e340df6ecd120b91bbb55947c4419. We were
measuring the wrong $window, which happened to work right most
of the time but wasn't correct.
Change-Id: I50f91623b304f43be58ebac844d507757f56db45
---
M resources/js/ext.uls.interface.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/38/354638/1
diff --git a/resources/js/ext.uls.interface.js
b/resources/js/ext.uls.interface.js
index 0dfe1ec..7fe90f5 100644
--- a/resources/js/ext.uls.interface.js
+++ b/resources/js/ext.uls.interface.js
@@ -351,7 +351,7 @@
caretRadius = parseInt(
$caretBefore.css( 'border-top-width' ), 10 );
- if (
ulsTriggerOffset.left > ( this.$window.width() - caretRadius ) / 2 ) {
+ if (
ulsTriggerOffset.left > $( window ).width() / 2 ) {
this.left =
ulsTriggerOffset.left - this.$window.width() - caretRadius;
$caretWrapper.addClass( 'caret-right' );
caretPosition =
$caretBefore.position();
--
To view, visit https://gerrit.wikimedia.org/r/354638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50f91623b304f43be58ebac844d507757f56db45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Anomie has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354654 )
Change subject: ApiSandbox: Fix HTTP error handling
..
ApiSandbox: Fix HTTP error handling
Since bf69459, ApiSandbox seems to stall out when an API request
results in an HTTP error (e.g. due to a PHP fatal error). Before that
revision, it displayed the 'apisandbox-results-error' message in this
situation.
Apparently the jQuery 3 changes to Deferred behavior caused it to be
impossible to have a then() filter return `this` (or anything else) in
order to avoid replacing the existing promise that's being resolved or
rejected.
Bug: T165857
Change-Id: I3f646cdfe7fe8987437980790788821f51e728d1
---
M resources/src/mediawiki.special/mediawiki.special.apisandbox.js
1 file changed, 17 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/354654/1
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index f53850a..6b7f6e7 100644
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -1100,25 +1100,18 @@
}
} )
.then( null, function ( code, data,
result, jqXHR ) {
+ var deferred = $.Deferred();
+
if ( code !== 'http' ) {
// Not really an error,
work around mw.Api thinking it is.
- return $.Deferred()
- .resolve(
result, jqXHR )
- .promise();
+ deferred.resolve(
result, jqXHR )
+ } else {
+ // Just forward it.
+ deferred.reject.apply(
deferred, arguments );
}
- return this;
+ return deferred.promise();
} )
- .fail( function ( code, data ) {
- var details = 'HTTP error: ' +
data.exception;
- $result.empty()
- .append(
- new
OO.ui.LabelWidget( {
- label:
mw.message( 'apisandbox-results-error', details ).text(),
-
classes: [ 'error' ]
- } ).$element
- );
- } )
- .done( function ( data, jqXHR ) {
+ .then( function ( data, jqXHR ) {
var m, loadTime, button, clear,
ct =
jqXHR.getResponseHeader( 'Content-Type' );
@@ -1195,6 +1188,15 @@
.on( 'click',
button.setDisabled, [ true ], button )
.$element.appendTo( $result );
}
+ }, function ( code, data ) {
+ var details = 'HTTP error: ' +
data.exception;
+ $result.empty()
+ .append(
+ new
OO.ui.LabelWidget( {
+ label:
mw.message( 'apisandbox-results-error', details ).text(),
+
classes: [ 'error' ]
+ } ).$element
+ );
} );
} );
},
--
To view, visit https://gerrit.wikimedia.org/r/354654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id:
Ladsgroup has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354652 )
Change subject: Adds textstat library
..
Adds textstat library
Change-Id: I3112d80a23afebcd98ab5c5d5e40a81b2f5aea37
---
A textstat-0.3.1-py3-none-any.whl
1 file changed, 0 insertions(+), 0 deletions(-)
Approvals:
Ladsgroup: Verified; Looks good to me, approved
diff --git a/textstat-0.3.1-py3-none-any.whl b/textstat-0.3.1-py3-none-any.whl
new file mode 100644
index 000..7c32567
--- /dev/null
+++ b/textstat-0.3.1-py3-none-any.whl
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/354652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3112d80a23afebcd98ab5c5d5e40a81b2f5aea37
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Halfak
Gerrit-Reviewer: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354656 )
Change subject: Update GUI
..
Update GUI
Change-Id: I91b555be1cb546ef43529bc5f41c309de4926d38
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/gui b/gui
index 3e2879f..cffe5b3 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 3e2879f1c9b996faff110e8fd15466b23d79d94d
+Subproject commit cffe5b3ea5f726b5e88dbbeb9aa6ccdd306e5285
--
To view, visit https://gerrit.wikimedia.org/r/354656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I91b555be1cb546ef43529bc5f41c309de4926d38
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354666 )
Change subject: [WIP] Add a byte counter to the edit page's summary field
..
[WIP] Add a byte counter to the edit page's summary field
Bug: T165856
Change-Id: I84213e6c134f55597340e77876f69063a37ed0a5
---
M resources/Resources.php
M resources/src/mediawiki.action/mediawiki.action.edit.js
2 files changed, 24 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/66/354666/1
diff --git a/resources/Resources.php b/resources/Resources.php
index 4c9934d..f906cc0 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1416,6 +1416,7 @@
'jquery.textSelection',
'jquery.byteLimit',
'mediawiki.api',
+ 'oojs-ui-core'
],
],
'mediawiki.action.edit.styles' => [
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.js
b/resources/src/mediawiki.action/mediawiki.action.edit.js
index f6a9c54..40e7341 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.js
@@ -19,10 +19,32 @@
$( function () {
var editBox, scrollTop, $editForm;
+ this.editSummaryInput = $( 'input#wpSummary, #wpSummary >
input' );
+
+ // FIXME: Fetch from config
+ this.editSummaryByteLimit = 255;
+
// Make sure edit summary does not exceed byte limit
// TODO: Replace with this when $wgOOUIEditPage is removed:
// OO.ui.infuse( 'wpSummary' ).$input.byteLimit( 255 );
- $( 'input#wpSummary, #wpSummary > input' ).byteLimit( 255 );
+ this.editSummaryInput.byteLimit( this.editSummaryByteLimit );
+
+ // Add a byte counter
+ this.editSummaryCountLabel = new OO.ui.LabelWidget( {
+ classes: [ 've-ui-mwSaveDialog-editSummary-count' ],
+ label: String( this.editSummaryByteLimit ),
+ title: mw.msg( 'mediawiki-editsummary-bytes-remaining' )
+ } );
+
+ this.editSummaryInput.on( 'change', function () {
+ // TODO: This looks a bit weird, there is no unit in
the UI, just numbers
+ // Users likely assume characters but then it seems to
count down quicker
+ // than expected. Facing users with the word "byte" is
bad? (bug 40035)
+ this.editSummaryCountLabel.setLabel(
+ String( this.editSummaryByteLimit -
$.byteLength( this.editSummaryInput.getValue() ) )
+ );
+ } );
+ $( '#wpSummaryLabel' ).append( this.editSummaryCountLabel );
// Restore the edit box scroll state following a preview
operation,
// and set up a form submission handler to remember this state.
--
To view, visit https://gerrit.wikimedia.org/r/354666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84213e6c134f55597340e77876f69063a37ed0a5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354639 )
Change subject: analytics - add shiny-server to reprepro
..
analytics - add shiny-server to reprepro
Bug: T164603
Change-Id: I17860440c5136d86059731ed004a4c99572566d8
---
M modules/aptrepo/files/distributions-wikimedia
M modules/aptrepo/files/updates
2 files changed, 20 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/354639/1
diff --git a/modules/aptrepo/files/distributions-wikimedia
b/modules/aptrepo/files/distributions-wikimedia
index 94ee27d..4e7804c 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -6,7 +6,7 @@
Architectures: source amd64 i386
Components: main universe non-free thirdparty thirdparty/cloudera
UDebComponents: main
-Update: hwraid cloudera-trusty elastic hp-mcp-trusty confluent
+Update: hwraid cloudera-trusty elastic hp-mcp-trusty confluent cran-ubuntu
Description: Wikimedia specific packages for Ubuntu Trusty Tahr
SignWith: 09DBD9F93F6CD44A
DebOverride: deb-override
@@ -22,7 +22,7 @@
Architectures: source amd64 i386
Components: main backports thirdparty experimental thirdparty/cloudera
UDebComponents: main backports thirdparty experimental
-Update: hwraid cassandra cloudera-jessie grafana tor hp-mcp-jessie confluent
elastic elasticsearch-curator docker jenkins
+Update: hwraid cassandra cloudera-jessie grafana tor hp-mcp-jessie confluent
elastic elasticsearch-curator docker jenkins cran-debian
Description: Wikimedia packages for Debian Jessie
SignWith: 09DBD9F93F6CD44A
DebOverride: deb-override
diff --git a/modules/aptrepo/files/updates b/modules/aptrepo/files/updates
index a6cdf94..38484d4 100644
--- a/modules/aptrepo/files/updates
+++ b/modules/aptrepo/files/updates
@@ -120,3 +120,21 @@
Architectures: amd64
VerifyRelease: F76221572C52609D
ListShellHook: grep-dctrl -X -P docker-engine -a -F Version --gt 1.12.0 -a -F
Version --lt 1.13.0 || [ $? -eq 1 ]
+
+Name: cran-debian
+Method: https://cran.cnr.berkeley.edu/bin/linux/debian/jessie-cran34/
+Components: main>thirdparty
+UDebComponents:
+Suite: trusty-wikimedia
+Architectures: amd64
+VerifyRelease: AD5F960A256A04AF
+ListShellHook: grep-dctrl -X -P shiny-server || [ $? -eq 1 ]
+
+Name: cran-ubuntu
+Method: https://cran.cnr.berkeley.edu/bin/linux/ubuntu/trusty/
+Components: main>thirdparty
+UDebComponents:
+Suite: trusty-wikimedia
+Architectures: amd64
+VerifyRelease: 51716619E084DAB9
+ListShellHook: grep-dctrl -X -P shiny-server || [ $? -eq 1 ]
--
To view, visit https://gerrit.wikimedia.org/r/354639
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17860440c5136d86059731ed004a4c99572566d8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Dereckson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354644 )
Change subject: Add release notes for T151633
..
Add release notes for T151633
This is a follow-up for f87b3b68860e.
Thanks to @Sfic to have submitted this solution.
Bug: T151633
Change-Id: Ia87d925f81be68a69b9b5f9893b7fc71afe950db
---
M RELEASE-NOTES-1.30
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/44/354644/1
diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index b24a08d..fbe23ab 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -40,7 +40,8 @@
* …
=== Bug fixes in 1.30 ===
-* …
+* (T151633) Ordered list items use now Devanagari digits in Nepalese
+ (thanks to Sfic)
=== Action API changes in 1.30 ===
* (T37247) action=parse output will be wrapped in a div with
--
To view, visit https://gerrit.wikimedia.org/r/354644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia87d925f81be68a69b9b5f9893b7fc71afe950db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Dereckson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/349282 )
Change subject: Enforce MW coding convention with phpcs
..
Enforce MW coding convention with phpcs
Bug: T163487
Change-Id: Ibd2aeddd1e71122f006173c562b446685d7e9127
---
M Newsletter.hooks.php
M composer.json
M includes/NewsletterEditPage.php
M includes/NewsletterStore.php
M includes/content/NewsletterContent.php
M includes/content/NewsletterDataUpdate.php
M includes/logging/NewsletterLogger.php
M includes/specials/SpecialNewsletter.php
M includes/specials/SpecialNewsletterCreate.php
M maintenance/deleteInactiveNewsletters.php
A phpcs.xml
11 files changed, 76 insertions(+), 37 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index 54a64b1..48cb1c0 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -109,9 +109,12 @@
$updater->addExtensionTable( 'nl_issues', __DIR__ .
'/sql/nl_issues.sql' );
$updater->addExtensionTable( 'nl_subscriptions', __DIR__ .
'/sql/nl_subscriptions.sql' );
$updater->addExtensionTable( 'nl_publishers', __DIR__ .
'/sql/nl_publishers.sql' );
- $updater->addExtensionField( 'nl_newsletters', 'nl_active',
__DIR__ . '/sql/nl_newsletters-add-active.sql' );
- $updater->dropExtensionIndex( 'nl_newsletters',
'nl_main_page_id', __DIR__ . '/sql/nl_main_page_id-drop-index.sql' );
- $updater->addExtensionIndex( 'nl_newsletters',
'nl_main_page_active', __DIR__ . '/sql/nl_newsletters-add-unique.sql' );
+ $updater->addExtensionField( 'nl_newsletters', 'nl_active',
+ __DIR__ . '/sql/nl_newsletters-add-active.sql' );
+ $updater->dropExtensionIndex( 'nl_newsletters',
'nl_main_page_id',
+ __DIR__ . '/sql/nl_main_page_id-drop-index.sql' );
+ $updater->addExtensionIndex( 'nl_newsletters',
'nl_main_page_active',
+ __DIR__ . '/sql/nl_newsletters-add-unique.sql' );
return true;
}
@@ -210,7 +213,8 @@
* @return bool
* @throws PermissionsError
*/
- public static function onArticleDelete( &$wikiPage, &$user, &$reason,
&$error, Status &$status, $suppress ) {
+ public static function onArticleDelete( &$wikiPage, &$user, &$reason,
&$error, Status &$status,
+ $suppress ) {
if ( !$wikiPage->getTitle()->inNamespace( NS_NEWSLETTER ) ) {
return true;
}
@@ -315,7 +319,8 @@
* @throws ThrottledError
*/
public static function onEditFilterMergedContent( IContextSource
$context, Content $content,
- Status $status,
$summary, User $user, $minoredit ) {
+ Status $status,
$summary, User $user,
+ $minoredit ) {
global $wgUser;
if ( !$context->getTitle()->inNamespace( NS_NEWSLETTER ) ) {
return;
@@ -332,11 +337,11 @@
$newsletter = Newsletter::newFromName(
$context->getTitle()->getText() );
// Validate API Edit parameters
- $formData = array(
+ $formData = [
'Name' => $context->getTitle()->getText(),
'Description' => $content->getDescription(),
'MainPage' => $content->getMainPage(),
- );
+ ];
$validator = new NewsletterValidator( $formData );
$validation = $validator->validate( !$newsletter );
if ( !$validation->isGood() ) {
diff --git a/composer.json b/composer.json
index 320081d..786fd5b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,15 +1,19 @@
{
"type": "mediawiki-extension",
+ "license": "GPL-2.0",
"require": {
"wikimedia/assert": ">=0.1 <0.3"
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor"
- ]
+ "parallel-lint . --exclude vendor",
+ "phpcs -p -s"
+ ],
+ "fix": "phpcbf"
}
}
diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php
index 7a87c8d..8fee487 100644
--- a/includes/NewsletterEditPage.php
+++
WikidataBuilder has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354650 )
Change subject: New Wikidata Build - 2017-05-20T10:00:02+
..
New Wikidata Build - 2017-05-20T10:00:02+
Change-Id: Ie907129efa29ad1f1d8a91042fa0bf4a98878631
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M Wikidata.localisation.php
M build/tasks/updatecomposer.js
M composer.json
M composer.lock
M extensions/Constraints/docs/user.js
M
extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php
A extensions/ExternalValidation/.coveralls.yml
A extensions/ExternalValidation/.gitignore
A extensions/ExternalValidation/.gitreview
A extensions/ExternalValidation/.jscsrc
A extensions/ExternalValidation/.jshintignore
A extensions/ExternalValidation/.jshintrc
A extensions/ExternalValidation/.stylelintrc
A extensions/ExternalValidation/.travis.yml
A extensions/ExternalValidation/COPYING
A extensions/ExternalValidation/Gruntfile.js
A extensions/ExternalValidation/README.md
A extensions/ExternalValidation/WikibaseQualityExternalValidation.alias.php
A extensions/ExternalValidation/WikibaseQualityExternalValidation.php
A extensions/ExternalValidation/WikibaseQualityExternalValidationHooks.php
A extensions/ExternalValidation/api/RunCrossCheck.php
A extensions/ExternalValidation/build/travis/after_script.sh
A extensions/ExternalValidation/build/travis/before_script.sh
A extensions/ExternalValidation/build/travis/script.sh
A extensions/ExternalValidation/composer.json
A extensions/ExternalValidation/i18n/ady-cyrl.json
A extensions/ExternalValidation/i18n/af.json
A extensions/ExternalValidation/i18n/arq.json
A extensions/ExternalValidation/i18n/ast.json
A extensions/ExternalValidation/i18n/ba.json
A extensions/ExternalValidation/i18n/bcl.json
A extensions/ExternalValidation/i18n/bg.json
A extensions/ExternalValidation/i18n/bn.json
A extensions/ExternalValidation/i18n/br.json
A extensions/ExternalValidation/i18n/ca.json
A extensions/ExternalValidation/i18n/ce.json
A extensions/ExternalValidation/i18n/ckb.json
A extensions/ExternalValidation/i18n/cs.json
A extensions/ExternalValidation/i18n/cu.json
A extensions/ExternalValidation/i18n/de.json
A extensions/ExternalValidation/i18n/el.json
A extensions/ExternalValidation/i18n/en-gb.json
A extensions/ExternalValidation/i18n/en.json
A extensions/ExternalValidation/i18n/es.json
A extensions/ExternalValidation/i18n/eu.json
A extensions/ExternalValidation/i18n/fa.json
A extensions/ExternalValidation/i18n/fr.json
A extensions/ExternalValidation/i18n/fy.json
A extensions/ExternalValidation/i18n/gl.json
A extensions/ExternalValidation/i18n/gu.json
A extensions/ExternalValidation/i18n/he.json
A extensions/ExternalValidation/i18n/ht.json
A extensions/ExternalValidation/i18n/hu.json
A extensions/ExternalValidation/i18n/id.json
A extensions/ExternalValidation/i18n/it.json
A extensions/ExternalValidation/i18n/ja.json
A extensions/ExternalValidation/i18n/ka.json
A extensions/ExternalValidation/i18n/kn.json
A extensions/ExternalValidation/i18n/ko.json
A extensions/ExternalValidation/i18n/ksh.json
A extensions/ExternalValidation/i18n/ku-latn.json
A extensions/ExternalValidation/i18n/lb.json
A extensions/ExternalValidation/i18n/lv.json
A extensions/ExternalValidation/i18n/mg.json
A extensions/ExternalValidation/i18n/mk.json
A extensions/ExternalValidation/i18n/mr.json
A extensions/ExternalValidation/i18n/nb.json
A extensions/ExternalValidation/i18n/ne.json
A extensions/ExternalValidation/i18n/nl.json
A extensions/ExternalValidation/i18n/oc.json
A extensions/ExternalValidation/i18n/olo.json
A extensions/ExternalValidation/i18n/or.json
A extensions/ExternalValidation/i18n/pam.json
A extensions/ExternalValidation/i18n/pl.json
A extensions/ExternalValidation/i18n/ps.json
A extensions/ExternalValidation/i18n/pt-br.json
A extensions/ExternalValidation/i18n/pt.json
A extensions/ExternalValidation/i18n/qqq.json
A extensions/ExternalValidation/i18n/ro.json
A extensions/ExternalValidation/i18n/ru.json
A extensions/ExternalValidation/i18n/sd.json
A extensions/ExternalValidation/i18n/si.json
A extensions/ExternalValidation/i18n/sv.json
A extensions/ExternalValidation/i18n/ta.json
A extensions/ExternalValidation/i18n/te.json
A extensions/ExternalValidation/i18n/tr.json
A extensions/ExternalValidation/i18n/uk.json
A extensions/ExternalValidation/i18n/vi.json
A extensions/ExternalValidation/i18n/yi.json
A extensions/ExternalValidation/i18n/zh-hans.json
A extensions/ExternalValidation/i18n/zh-hant.json
A
extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparer.php
A
extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparerFactory.php
A
extensions/ExternalValidation/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php
A
extensions/ExternalValidation/includes/CrossCheck/Comparer/EntityIdValueComparer.php
A
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354644 )
Change subject: Add release notes for T151633
..
Add release notes for T151633
This is a follow-up for f87b3b68860e.
Thanks to @Sfic to have submitted this solution.
Bug: T151633
Change-Id: Ia87d925f81be68a69b9b5f9893b7fc71afe950db
---
M RELEASE-NOTES-1.30
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.30 b/RELEASE-NOTES-1.30
index b24a08d..fbe23ab 100644
--- a/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@ -40,7 +40,8 @@
* …
=== Bug fixes in 1.30 ===
-* …
+* (T151633) Ordered list items use now Devanagari digits in Nepalese
+ (thanks to Sfic)
=== Action API changes in 1.30 ===
* (T37247) action=parse output will be wrapped in a div with
--
To view, visit https://gerrit.wikimedia.org/r/354644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia87d925f81be68a69b9b5f9893b7fc71afe950db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Dereckson
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Hello Catrope, Divec, jenkins-bot, Jforrester,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/354659
to review the following change.
Change subject: rebaser: Make serializations shorter (2nd attempt)
..
rebaser: Make serializations shorter (2nd attempt)
Shorten serialization of transactions and stores by using arrays and shorthand
syntax.
Change-Id: I3898ac033ecc28a70447ccf9779d02fb00803661
---
M rebaser/logToTestCase.js
M src/dm/ve.dm.Change.js
M src/dm/ve.dm.IndexValueStore.js
M src/dm/ve.dm.Selection.js
M src/dm/ve.dm.Transaction.js
M src/dm/ve.dm.TransactionProcessor.js
M tests/dm/ve.dm.Change.test.js
7 files changed, 134 insertions(+), 74 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/59/354659/1
diff --git a/rebaser/logToTestCase.js b/rebaser/logToTestCase.js
index 24d4b4b..82b27ae 100644
--- a/rebaser/logToTestCase.js
+++ b/rebaser/logToTestCase.js
@@ -85,9 +85,3 @@
testCase = toTestCase( parsed );
process.stdout.write( JSON.stringify( testCase ) );
} );
-
-// acceptChange
-// submitChange
-// applyChange
-// newClient
-// disconnect
diff --git a/src/dm/ve.dm.Change.js b/src/dm/ve.dm.Change.js
index 34c4c5e..63b1e8f 100644
--- a/src/dm/ve.dm.Change.js
+++ b/src/dm/ve.dm.Change.js
@@ -714,7 +714,7 @@
* already, i.e. the Change object was created by #deserialize without
deserializing store values).
*
* @param {boolean} [preserveStoreValues] If true, keep store values verbatim
instead of serializing
- * @return {ve.dm.Change} Deserialized change
+ * @return {Object} Serialized change
*/
ve.dm.Change.prototype.serialize = function ( preserveStoreValues ) {
var author, serializeStoreValues, serializeStore,
diff --git a/src/dm/ve.dm.IndexValueStore.js b/src/dm/ve.dm.IndexValueStore.js
index 08bf153..d4933fb 100644
--- a/src/dm/ve.dm.IndexValueStore.js
+++ b/src/dm/ve.dm.IndexValueStore.js
@@ -44,18 +44,19 @@
/**
* Deserialize a store from a JSONable object
*
+ * The serialization format is experimental and subject to change
+ *
* @param {Function} deserializeValue Deserializer for arbitrary store values
- * @param {Object} data Store serialized as a JSONable object
+ * @param {Array} data Store serialized as a JSONable object
* @return {ve.dm.IndexValueStore} Deserialized store
*/
ve.dm.IndexValueStore.static.deserialize = function ( deserializeValue, data )
{
- var hash,
+ var i,
store = new ve.dm.IndexValueStore();
- store.hashes = data.hashes.slice();
- store.hashStore = {};
- for ( hash in data.hashStore ) {
- store.hashStore[ hash ] = deserializeValue( data.hashStore[
hash ] );
+ for ( i = 0; i < data.length; i++ ) {
+ store.hashes.push( data[ i ][ 0 ] );
+ store.hashStore[ data[ i ][ 0 ] ] = deserializeValue( data[ i
][ 1 ] );
}
return store;
};
@@ -64,6 +65,8 @@
/**
* Serialize the store into a JSONable object
+ *
+ * The serialization format is experimental and subject to change
*
* @param {Function} serializeValue Serializer for arbitrary store values
* @return {Object} Serialized store
@@ -75,10 +78,9 @@
for ( hash in this.hashStore ) {
serialized[ hash ] = serializeValue( this.hashStore[ hash ] );
}
- return {
- hashes: this.hashes.slice(),
- hashStore: serialized
- };
+ return this.hashes.map( function ( hash ) {
+ return [ hash, serialized[ hash ] ];
+ } );
};
/**
diff --git a/src/dm/ve.dm.Selection.js b/src/dm/ve.dm.Selection.js
index c069e31..2de415f 100644
--- a/src/dm/ve.dm.Selection.js
+++ b/src/dm/ve.dm.Selection.js
@@ -37,7 +37,7 @@
constructor = ve.dm.selectionFactory.lookup( hash.type );
if ( !constructor ) {
- throw new Error( 'Unknown selection type ' + hash.name );
+ throw new Error( 'Unknown selection type ' + hash.type );
}
return constructor.static.newFromHash( doc, hash );
diff --git a/src/dm/ve.dm.Transaction.js b/src/dm/ve.dm.Transaction.js
index 604db67..6f95498 100644
--- a/src/dm/ve.dm.Transaction.js
+++ b/src/dm/ve.dm.Transaction.js
@@ -69,13 +69,61 @@
/**
* Deserialize a transaction from a JSONable object
*
+ * The serialization format is experimental and subject to change
+ *
* @param {Object} data Transaction serialized as a JSONable object
* @return {ve.dm.Transaction} Deserialized transaction
*/
ve.dm.Transaction.static.deserialize = function ( data ) {
+ function deserializeOp( op ) {
+ var insert = [], remove = [];
+ if ( typeof op === 'number' ) {
+ return {
+ type: 'retain',
+ length: op
+ };
+
Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354667 )
Change subject: Clone MobileFrontend when RevisionSlider is tested
..
Clone MobileFrontend when RevisionSlider is tested
Needed for change I05677e555353361610b93df70d6d2fc81f718b89.
Change-Id: Icea45cc9852678264bc9b3cf63c5c72e20336a5b
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/67/354667/1
diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index f639374..dbe0d6a 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -203,6 +203,7 @@
'QuickSurveys': ['EventLogging'],
'QuizGame': ['SocialProfile'],
'RelatedArticles': ['BetaFeatures', 'Cards', 'MobileFrontend'],
+'RevisionSlider': ['MobileFrontend'],
'Score': ['VisualEditor'],
'SemanticImageInput': ['SemanticMediaWiki'],
'SemanticSifter': ['SemanticMediaWiki'],
--
To view, visit https://gerrit.wikimedia.org/r/354667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icea45cc9852678264bc9b3cf63c5c72e20336a5b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354640 )
Change subject: build: Replace jshint and jscs with eslint, updata other devDeps
..
build: Replace jshint and jscs with eslint, updata other devDeps
grunt 0.4.5 → 1.0.1
grunt-banana-checker 0.4.0 → 0.6.0
grunt-jsonlint 1.0.7 → 1.1.0
Change-Id: Ibb3e72bfe102461b00d29ac5a08b5f28b10c22a8
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
M resources/src/FileAnnotation.js
M resources/src/fileannotations.js
8 files changed, 24 insertions(+), 46 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileAnnotations
refs/changes/40/354640/1
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..b5c2768
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,11 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "jquery": true,
+ "browser": true
+ },
+ "globals": {
+ "mediaWiki": false,
+ "OO": false
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 04baa68..000
--- a/.jscsrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "preset": "wikimedia",
- "excludeFiles": [ "node_modules/**", "vendor/**" ]
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 82eaa05..000
--- a/.jshintignore
+++ /dev/null
@@ -1,2 +0,0 @@
-node_modules/**
-vendor/**
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 0b8ae77..000
--- a/.jshintrc
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "es3": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mw": false,
- "mediaWiki": false,
- "JSON": false,
- "OO": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 02aa997..232c808 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,22 +1,16 @@
-/*jshint node:true */
+/* eslint-env node, es6 */
+
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'*.js',
'resources/**/*.js'
]
- },
- jscs: {
- src: '<%= jshint.all %>'
},
banana: {
all: 'i18n/'
@@ -30,6 +24,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index d6d0f28..efe48f5 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
"test": "grunt test"
},
"devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.3",
-"grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.5.0",
-"grunt-jsonlint": "1.0.7"
+"eslint-config-wikimedia": "0.4.0",
+"grunt": "1.0.1",
+"grunt-eslint": "19.0.0",
+"grunt-banana-checker": "0.6.0",
+"grunt-jsonlint": "1.1.0"
}
}
diff --git a/resources/src/FileAnnotation.js b/resources/src/FileAnnotation.js
index 1d823c2..f113381 100644
--- a/resources/src/FileAnnotation.js
+++ b/resources/src/FileAnnotation.js
@@ -243,6 +243,8 @@
/**
* Deletes the annotation and saves.
+*
+* @return {jQuery.Promise}
*/
FileAnnotation.prototype.deleteAnnotation = function () {
var annotation = this;
diff --git a/resources/src/fileannotations.js b/resources/src/fileannotations.js
index ffe8a42..32ce1c9 100644
--- a/resources/src/fileannotations.js
+++ b/resources/src/fileannotations.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-unused-vars */
( function ( $, mw ) {
var pageAnnotator,
pageTitle = mw.Title.newFromText( mw.config.get( 'wgPageName' )
),
--
To view, visit https://gerrit.wikimedia.org/r/354640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb3e72bfe102461b00d29ac5a08b5f28b10c22a8
Gerrit-PatchSet: 1
Gerrit-Project:
Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354641 )
Change subject: Run DiffViewHeader in mobile mode, too
..
Run DiffViewHeader in mobile mode, too
This change makes it possible for extension to add things to the diff
header in mobile using the (mediawiki core) hook DiffViewHeader, which
is called before the header is generated.
This also ensures, that the relevant title for Special:MobileDiff is
the Title object of the page, where the diff is created from. This is
especially useful for JavaScript code, which needs to now the Title for
which a page is generated.
Bug: T165835
Change-Id: I68cf50f5dd339f34802d70df1f32d2c3390944a3
---
M includes/specials/SpecialMobileDiff.php
1 file changed, 44 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/41/354641/1
diff --git a/includes/specials/SpecialMobileDiff.php
b/includes/specials/SpecialMobileDiff.php
index 0752828..6221587 100644
--- a/includes/specials/SpecialMobileDiff.php
+++ b/includes/specials/SpecialMobileDiff.php
@@ -113,6 +113,7 @@
$this->rev = $rev;
$this->prevRev = $prev;
$this->targetTitle = $this->rev->getTitle();
+ $this->getSkin()->setRelevantTitle( $this->targetTitle );
$output->setPageTitle( $this->msg(
'mobile-frontend-diffview-title',
@@ -132,6 +133,7 @@
$output->addHtml( '' );
+ $this->setupDifferenceEngine();
$this->showHeader();
$this->showDiff();
$output->addHtml( '' );
@@ -141,6 +143,39 @@
$output->addHtml( '' );
return true;
+ }
+
+ /**
+* Returns the ID of the previous Revision, if it is set, otherwise 0.
+*
+* @return int|null
+*/
+ protected function getPrevId() {
+ return $this->prevRev ? $this->prevRev->getId() : 0;
+ }
+
+ /**
+* Setups the DifferenceEngine.
+*/
+ protected function setupDifferenceEngine() {
+ $contentHandler = $this->rev->getContentHandler();
+ $de = $contentHandler->createDifferenceEngine(
$this->getContext(), $this->getPrevId(),
+ $this->revId );
+ // HACK:
+ if ( get_class( $de ) == 'DifferenceEngine' ) {
+ $de = new $this->diffClass(
+ $this->getContext(),
+ $this->getPrevId(),
+ $this->revId,
+ 0,
+ false,
+ (bool)$this->getRequest()->getVal( 'unhide' )
+ );
+ } else {
+ $de->showDiffPage();
+ return;
+ }
+ $this->mDiffEngine = $de;
}
/**
@@ -183,6 +218,11 @@
$comment = $this->msg(
'mobile-frontend-changeslist-nocomment' )->escaped();
}
+ if ( $this->mDiffEngine instanceof InlineDifferenceEngine ) {
+ // TODO: The hook gets originally called in the
DifferenceEngine::showDiffPage() method
+ Hooks::run( 'DiffViewHeader', [ $this->mDiffEngine,
$this->prevRev, $this->rev ] );
+ }
+
$ts = new MWTimestamp( $this->rev->getTimestamp() );
$this->getOutput()->addHtml(
Html::openElement( 'div', [ 'id' => 'mw-mf-diff-info',
'class' => 'page-summary' ] )
@@ -220,25 +260,9 @@
function showDiff() {
$output = $this->getOutput();
- $prevId = $this->prevRev ? $this->prevRev->getId() : 0;
+ $prevId = $this->getPrevId();
$unhide = (bool)$this->getRequest()->getVal( 'unhide' );
- $contentHandler = $this->rev->getContentHandler();
- $de = $contentHandler->createDifferenceEngine(
$this->getContext(), $prevId, $this->revId );
- // HACK:
- if ( get_class( $de ) == 'DifferenceEngine' ) {
- $de = new $this->diffClass(
- $this->getContext(),
- $prevId,
- $this->revId,
- 0,
- false,
- $unhide
- );
- } else {
- $de->showDiffPage();
- return;
- }
- $this->mDiffEngine = $de;
+ $de = $this->mDiffEngine;
$diff = $de->getDiffBody();
if ( !$prevId ) {
$audience =
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354558 )
Change subject: dm.MWTransclusionNode: remove TableCellableNode mixin
..
dm.MWTransclusionNode: remove TableCellableNode mixin
Change-Id: Ic08c7ba03ad2bee35a96a750377450475d0efeed
---
M modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
1 file changed, 0 insertions(+), 2 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
index 05efec3..cde269c 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js
@@ -41,8 +41,6 @@
OO.mixinClass( ve.dm.MWTransclusionNode, ve.dm.FocusableNode );
-OO.mixinClass( ve.dm.MWTransclusionNode, ve.dm.TableCellableNode );
-
/* Static members */
ve.dm.MWTransclusionNode.static.name = 'mwTransclusion';
--
To view, visit https://gerrit.wikimedia.org/r/354558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic08c7ba03ad2bee35a96a750377450475d0efeed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354611 )
Change subject: Add messages for Code of Conduct footer links
..
Add messages for Code of Conduct footer links
Add new messages that can be used via SkinTemplateOutputPageBeforeExec
to add a link to the Code of Conduct for Wikimedia Technical Spaces to
appropriate wikis.
Change-Id: I26d0618fc6d3e7ad96c24ae46b189e51f8cc3f00
---
M extension.json
A i18n/codeofcontact/en.json
A i18n/codeofcontact/qqq.json
3 files changed, 18 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/extension.json b/extension.json
index df77512..07a172d 100644
--- a/extension.json
+++ b/extension.json
@@ -38,6 +38,9 @@
"WikimediaCCLicenseTexts": [
"i18n/cclicensetexts"
],
+ "WikimediaCodeOfConduct": [
+ "i18n/codeofcontact"
+ ],
"WikitechMessages": [
"i18n/wikitech"
]
diff --git a/i18n/codeofcontact/en.json b/i18n/codeofcontact/en.json
new file mode 100644
index 000..f824278
--- /dev/null
+++ b/i18n/codeofcontact/en.json
@@ -0,0 +1,7 @@
+{
+ "@metadata": {
+ "authors": []
+ },
+ "wm-codeofconduct-url":
"https://www.mediawiki.org/wiki/Special:MyLanguage/Code_of_Conduct;,
+ "wm-codeofconduct": "Code of Conduct"
+}
diff --git a/i18n/codeofcontact/qqq.json b/i18n/codeofcontact/qqq.json
new file mode 100644
index 000..376b58a
--- /dev/null
+++ b/i18n/codeofcontact/qqq.json
@@ -0,0 +1,8 @@
+{
+ "@metadata": {
+ "authors": [
+ ]
+ },
+ "wm-codeofconduct-url": "{{optional}}\nURL to code of conduct for
Wikimedia technical spaces",
+ "wm-codeofconduct": "Footer label for code of conduct for Wikimedia
technical spaces link"
+}
--
To view, visit https://gerrit.wikimedia.org/r/354611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26d0618fc6d3e7ad96c24ae46b189e51f8cc3f00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaMessages
Gerrit-Branch: master
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Mattflaschen
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354651 )
Change subject: InputWidget: Introduce #setInputId and 'inputId' config option
..
InputWidget: Introduce #setInputId and 'inputId' config option
For legacy reasons, it is sometimes necessary to set the 'id'
attribute not just on the widget's $element (which is usually a
wrapped ``), but also on its $input (the actual ``).
This is especially useful when converting old interfaces.
Bug: T165854
Change-Id: I3000476c57e874f7df6f67ff82d79b778db3e0de
---
M php/widgets/InputWidget.php
M src/widgets/InputWidget.js
2 files changed, 30 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/51/354651/1
diff --git a/php/widgets/InputWidget.php b/php/widgets/InputWidget.php
index 8be7930..7044ecd 100644
--- a/php/widgets/InputWidget.php
+++ b/php/widgets/InputWidget.php
@@ -34,6 +34,7 @@
* @param string $config['name'] HTML input name (default: '')
* @param string $config['value'] Input value (default: '')
* @param string $config['dir'] The directionality of the input
(ltr/rtl)
+* @param string $config['inputId'] The value of the input’s HTML `id`
attribute.
*/
public function __construct( array $config = [] ) {
// Parent constructor
@@ -65,6 +66,9 @@
$this->setValue( isset( $config['value'] ) ? $config['value'] :
null );
if ( isset( $config['dir'] ) ) {
$this->setDir( $config['dir'] );
+ }
+ if ( isset( $config['inputId'] ) && $config['inputId'] ) {
+ $this->setInputId( $config['inputId'] );
}
}
@@ -138,6 +142,17 @@
return $this;
}
+ /**
+* Set the 'id' attribute of the `` element.
+*
+* @param string $id
+* @return $this
+*/
+ public function setInputId( $id ) {
+ $this->input->setAttributes( [ 'id' => $id ] );
+ return $this;
+ }
+
public function getConfig( &$config ) {
$name = $this->input->getAttribute( 'name' );
if ( $name !== null ) {
diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js
index f36360c..60bf326 100644
--- a/src/widgets/InputWidget.js
+++ b/src/widgets/InputWidget.js
@@ -19,6 +19,7 @@
* @cfg {string} [name=''] The value of the input’s HTML `name` attribute.
* @cfg {string} [value=''] The value of the input.
* @cfg {string} [dir] The directionality of the input (ltr/rtl).
+ * @cfg {string} [inputId] The value of the input’s HTML `id` attribute.
* @cfg {Function} [inputFilter] The name of an input filter function. Input
filters modify the value of an input
* before it is accepted.
*/
@@ -55,6 +56,9 @@
this.setValue( config.value );
if ( config.dir ) {
this.setDir( config.dir );
+ }
+ if ( config.inputId ) {
+ this.setInputId( config.inputId );
}
};
@@ -228,6 +232,17 @@
};
/**
+ * Set the 'id' attribute of the `` element.
+ *
+ * @param {string} id
+ * @chainable
+ */
+OO.ui.InputWidget.prototype.setInputId = function ( id ) {
+ this.$input.attr( 'id', id );
+ return this;
+};
+
+/**
* @inheritdoc
*/
OO.ui.InputWidget.prototype.restorePreInfuseState = function ( state ) {
--
To view, visit https://gerrit.wikimedia.org/r/354651
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3000476c57e874f7df6f67ff82d79b778db3e0de
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
DLynch has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354655 )
Change subject: demo.minimal should use getInitializedPromise
..
demo.minimal should use getInitializedPromise
Change-Id: I3ce04761f0ad624035c307096e81b6d5eebe71f4
---
M demos/ve/demo.minimal.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/55/354655/1
diff --git a/demos/ve/demo.minimal.js b/demos/ve/demo.minimal.js
index ddad9eb..0be6f52 100644
--- a/demos/ve/demo.minimal.js
+++ b/demos/ve/demo.minimal.js
@@ -5,7 +5,7 @@
*/
// Set up the platform and wait for i18n messages to load
-new ve.init.sa.Platform( ve.messagePaths ).initialize()
+new ve.init.sa.Platform( ve.messagePaths ).getInitializedPromise()
.fail( function () {
$( '.ve-instance' ).text( 'Sorry, this browser is not
supported.' );
} )
--
To view, visit https://gerrit.wikimedia.org/r/354655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ce04761f0ad624035c307096e81b6d5eebe71f4
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354618 )
Change subject: Assign column-agnostic UID to individual list entries
..
Assign column-agnostic UID to individual list entries
Unlike the other ID assignment mechanism, this is based on the item's
position in the JSON's native representation. This allows list items
to be edited regardless of how they appear in the rendered HTML.
Bug: T165672
Change-Id: I37da1639e2e70d1b51ba090444d2a5e73be94613
---
M includes/content/CollaborationListContent.php
M modules/ext.CollaborationKit.list.edit.js
M modules/ext.CollaborationKit.list.ui.js
3 files changed, 221 insertions(+), 150 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
Harej: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index 47c68ff..8027394 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -300,10 +300,19 @@
return $text;
}
+ $columns = $this->columns;
+
+ // Assign a UID to each list entry.
+ $uidCounter = 0;
+ foreach ( $columns as $colId => $column ) {
+ foreach ( $column->items as $rowId => $row ) {
+ $columns[$colId]->items[$rowId]->uid =
$uidCounter;
+ $uidCounter++;
+ }
+ }
+
if ( $this->displaymode === 'members' && count( $this->columns
) === 1 ) {
- $columns = $this->sortUsersIntoColumns(
$this->columns[0] );
- } else {
- $columns = $this->columns;
+ $columns = $this->sortUsersIntoColumns( $columns[0] );
}
$columns = $this->filterColumns( $columns, $options['columns']
);
@@ -335,106 +344,111 @@
if ( count( $column->items ) === 0 ) {
$text .= "\n";
$text .=
"{{mediawiki:collaborationkit-list-emptycolumn}}\n";
- $text .= "\n";
- continue;
- }
+ } else {
+ $curItem = 0;
- $curItem = 0;
+ $sortedItems = $column->items;
+ $this->sortList( $sortedItems,
$options['defaultSort'] );
- $sortedItems = $column->items;
- $this->sortList( $sortedItems, $options['defaultSort']
);
-
- $itemCounter = 0;
- foreach ( $sortedItems as $item ) {
- if ( $offset !== 0 ) {
- $offset--;
- continue;
- }
- $curItem++;
- if ( $maxItems !== false && $maxItems <
$curItem ) {
- break;
- }
-
- $itemTags = isset( $item->tags ) ? $item->tags
: [];
- if ( !$this->matchesTag( $options['tags'],
$itemTags ) ) {
- continue;
- }
-
- $titleForItem = null;
- if ( !isset( $item->link ) ) {
- $titleForItem = Title::newFromText(
$item->title );
- } elseif ( $item->link !== false ) {
- $titleForItem = Title::newFromText(
$item->link );
- }
- $text .= Html::openElement( 'div', [
- 'style' => "min-height:{$iconWidth}px",
- 'class' => 'mw-ck-list-item',
- 'data-collabkit-item-title' =>
$item->title,
- 'data-collabkit-item-id' => $colId .
'-' . $itemCounter
- ] );
- $itemCounter++;
- if ( $options['mode'] !== 'no-img' ) {
- if ( isset( $item->image ) ) {
- $text .= static::generateImage(
- $item->image,
- $this->displaymode,
- $titleForItem,
-
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354617 )
Change subject: Set empty PYTHONPATH in tox.ini
..
Set empty PYTHONPATH in tox.ini
Our jenkins instance is not actually running any pybal tests. The reason
is that we're using `trial pybal` in tox.ini and funnily enough trial
requires PYTHONPATH to be set (even if it is set to an empty string) or
else it won't manage to find any tests and just pretend everything is
fine, claiming the tests have passed.
Change-Id: I6541a8384bd8284bcc76adec04c6e2d2febecda1
Ref:
http://stackoverflow.com/questions/42425901/twisted-trial-pythonpath-and-sys-path
(cherry picked from commit 76e90a1e2f44c3b1885dc4e7383204ce8feb5046)
---
M tox.ini
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/tox.ini b/tox.ini
index 095c4e4..3de1bc3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,9 @@
envlist = py27, flake8
[testenv]
+setenv =
+ PYTHONPATH=
+
commands = trial pybal
deps =
twisted
--
To view, visit https://gerrit.wikimedia.org/r/354617
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6541a8384bd8284bcc76adec04c6e2d2febecda1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: 2.0-dev
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Ema
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354620 )
Change subject: [BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme
..
[BREAKING CHANGE] Drop 'MediaWiki' backwards-compatibility theme
Deprecated since v0.22.0.
Change-Id: I931638ceb91afbb678868f108ffcd65481adda6f
---
M Gruntfile.js
M bin/testsuitegenerator.rb
M build/modules.yaml
D php/themes/MediaWikiTheme.php
D src/themes/mediawiki/MediaWikiTheme.js
D src/themes/mediawiki/theme.less
6 files changed, 0 insertions(+), 46 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/20/354620/1
diff --git a/Gruntfile.js b/Gruntfile.js
index 9f3bbac..5ee4a6b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,7 +7,6 @@
pkg = grunt.file.readJSON( 'package.json' ),
themes = {
wikimediaui: 'WikimediaUI', // Do not change this line
or you'll break `grunt add-theme`
- mediawiki: 'MediaWiki', // Backwards-compatibility
wrapper
apex: 'Apex'
},
lessFiles = {},
diff --git a/bin/testsuitegenerator.rb b/bin/testsuitegenerator.rb
index bada71b..dec65b4 100644
--- a/bin/testsuitegenerator.rb
+++ b/bin/testsuitegenerator.rb
@@ -21,7 +21,6 @@
testable_classes = classes
.reject{|c| c[:abstract] } # can't test abstract classes
.reject{|c| !c[:parent] || c[:trait] || c[:parent] == 'Theme' }
# can't test abstract
- .reject{|c| c[:name] == 'MediaWikiTheme' } # can't test abstract
.reject{|c| %w[Element Widget Layout Theme].include? c[:name] }
# no toplevel
make_class_instance_placeholder = lambda do |klass, config|
diff --git a/build/modules.yaml b/build/modules.yaml
index 9e965dc..b68dfde 100644
--- a/build/modules.yaml
+++ b/build/modules.yaml
@@ -205,12 +205,6 @@
],
"theme": "wikimediaui"
},
- "oojs-ui-mediawiki-icons-accessibility": {
- "styles": [
- "src/themes/wikimediaui/icons-accessibility.json"
- ],
- "theme": "wikimediaui"
- },
"oojs-ui-{theme}-icons-movement": {
"styles": [
"src/themes/{theme}/icons-movement.json"
@@ -267,12 +261,6 @@
],
"theme": "wikimediaui"
},
- "oojs-ui-mediawiki-icons-location": {
- "styles": [
- "src/themes/wikimediaui/icons-location.json"
- ],
- "theme": "wikimediaui"
- },
"oojs-ui-{theme}-icons-user": {
"styles": [
"src/themes/{theme}/icons-user.json"
@@ -284,12 +272,6 @@
]
},
"oojs-ui-wikimediaui-icons-wikimedia": {
- "styles": [
- "src/themes/wikimediaui/icons-wikimedia.json"
- ],
- "theme": "wikimediaui"
- },
- "oojs-ui-mediawiki-icons-wikimedia": {
"styles": [
"src/themes/wikimediaui/icons-wikimedia.json"
],
diff --git a/php/themes/MediaWikiTheme.php b/php/themes/MediaWikiTheme.php
deleted file mode 100644
index 1c37218..000
--- a/php/themes/MediaWikiTheme.php
+++ /dev/null
@@ -1,6 +0,0 @@
-https://gerrit.wikimedia.org/r/354620
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I931638ceb91afbb678868f108ffcd65481adda6f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354625 )
Change subject: build: Replace jshint and jscs with eslint; upgrade other
devDeps
..
build: Replace jshint and jscs with eslint; upgrade other devDeps
grunt 0.4.5 → 1.0.1
grunt-banana-checker 0.4.0 → 0.6.0
grunt-jsonlint 1.0.7 → 1.1.0
Bug: T118941
Change-Id: I3b4c2e9620818dff6e90d782baf6636275f2f2d7
---
A .eslintrc.json
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M modules/ext.pageassessments.special.js
M package.json
7 files changed, 21 insertions(+), 49 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments
refs/changes/25/354625/1
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000..db53d75
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,10 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false,
+ "OO": false
+ }
+}
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index a2d7b13..000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index 3c3629e..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 6c9a3d6..000
--- a/.jshintrc
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "es3": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Environment
- "browser": true,
-
- "globals": {
-"mw": false,
-"$": false
- },
-
- "predef": [
-"jQuery",
-"mediaWiki",
-"OO"
- ]
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 56ff218..51388c8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,22 +1,16 @@
-/*jshint node:true */
+/* eslint-env node, es6 */
+
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'*.js',
'modules/**/*.js'
]
- },
- jscs: {
- src: '<%= jshint.all %>'
},
banana: {
all: 'i18n/'
@@ -30,6 +24,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/modules/ext.pageassessments.special.js
b/modules/ext.pageassessments.special.js
index 310fa4f..58cb196 100644
--- a/modules/ext.pageassessments.special.js
+++ b/modules/ext.pageassessments.special.js
@@ -49,4 +49,4 @@
}
} );
-} )( jQuery, mediaWiki, OO );
+}( jQuery, mediaWiki, OO ) );
diff --git a/package.json b/package.json
index 243c8cc..32aca31 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,10 @@
"test": "grunt test"
},
"devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.3",
-"grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.5.0",
-"grunt-jsonlint": "1.0.7",
-"jscs-preset-wikimedia": "1.0.0"
+"eslint-config-wikimedia": "0.4.0",
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.6.0",
+"grunt-eslint": "19.0.0",
+"grunt-jsonlint": "1.1.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/354625
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3b4c2e9620818dff6e90d782baf6636275f2f2d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
WMDE-Fisch has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354634 )
Change subject: Fix Ruby Selenium tests
..
Fix Ruby Selenium tests
Ruby Selenium tests where completly removed from core. This patch puts
the files needed into the extension's tests folder.
Change-Id: Iad9dfece6083f7907824a995edaa93ac4ad02457
---
M tests/browser/features/support/env.rb
A tests/browser/features/support/pages/edit_page.rb
A tests/browser/features/support/pages/ztargetpage.rb
A
tests/browser/features/support/step_definitions/create_and_follow_wiki_link_steps.rb
A tests/browser/features/support/step_definitions/edit_page_steps.rb
5 files changed, 64 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict
refs/changes/34/354634/1
diff --git a/tests/browser/features/support/env.rb
b/tests/browser/features/support/env.rb
index d754621..60d9870 100644
--- a/tests/browser/features/support/env.rb
+++ b/tests/browser/features/support/env.rb
@@ -2,5 +2,3 @@
require 'mediawiki_selenium/cucumber'
require 'mediawiki_selenium/pages'
require 'mediawiki_selenium/step_definitions'
-require_all File.dirname(__FILE__) +
'/../../../../../../tests/browser/features/support/pages'
-require_all File.dirname(__FILE__) +
'/../../../../../../tests/browser/features/step_definitions'
diff --git a/tests/browser/features/support/pages/edit_page.rb
b/tests/browser/features/support/pages/edit_page.rb
new file mode 100644
index 000..89ccf1b
--- /dev/null
+++ b/tests/browser/features/support/pages/edit_page.rb
@@ -0,0 +1,8 @@
+class EditPage
+ include PageObject
+
+ text_area(:edit_page_content, id: 'wpTextbox1')
+ button(:preview_button, css: '#wpPreview > input')
+ button(:show_changes_button, css: '#wpDiff > input')
+ button(:save_button, css: '#wpSave > input')
+end
diff --git a/tests/browser/features/support/pages/ztargetpage.rb
b/tests/browser/features/support/pages/ztargetpage.rb
new file mode 100644
index 000..da789e5
--- /dev/null
+++ b/tests/browser/features/support/pages/ztargetpage.rb
@@ -0,0 +1,7 @@
+class ZtargetPage < MainPage
+ include PageObject
+
+ page_url '<%=params[:article_name]%>'
+
+ a(:link_target_page_link, text: 'link to the test target page')
+end
diff --git
a/tests/browser/features/support/step_definitions/create_and_follow_wiki_link_steps.rb
b/tests/browser/features/support/step_definitions/create_and_follow_wiki_link_steps.rb
new file mode 100644
index 000..504d345
--- /dev/null
+++
b/tests/browser/features/support/step_definitions/create_and_follow_wiki_link_steps.rb
@@ -0,0 +1,26 @@
+Given(/^I go to the "(.+)" page with content "(.+)"$/) do |page_title,
page_content|
+ @wikitext = page_content
+ api.create_page page_title, page_content
+ step "I am on the #{page_title} page"
+end
+
+Given(/^I am on the (.+) page$/) do |article|
+ article = article.gsub(/ /, '_')
+ visit(ZtargetPage, using_params: { article_name: article })
+end
+
+Given(/^I create page "(.*?)" with content "(.*?)"$/) do |page_title,
page_content|
+ api.create_page page_title, page_content
+end
+
+When(/^I click the Link Target link$/) do
+ on(ZtargetPage).link_target_page_link
+end
+
+Then(/^I should be on the Link Target Test Page$/) do
+ expect(@browser.url).to match /Link_Target_Test_Page/
+end
+
+Then(/^the page content should contain "(.*?)"$/) do |content|
+ expect(on(ZtargetPage).page_content).to match content
+end
diff --git a/tests/browser/features/support/step_definitions/edit_page_steps.rb
b/tests/browser/features/support/step_definitions/edit_page_steps.rb
new file mode 100644
index 000..0e0aeb1
--- /dev/null
+++ b/tests/browser/features/support/step_definitions/edit_page_steps.rb
@@ -0,0 +1,23 @@
+When(/^I click Edit$/) do
+ on(MainPage).edit_link
+end
+
+When(/^I click Preview$/) do
+ on(EditPage).preview_button
+end
+
+When(/^I click Show Changes$/) do
+ on(EditPage).show_changes_button
+end
+
+When(/^I edit the page with "(.*?)"$/) do |edit_content|
+ on(EditPage).edit_page_content_element.send_keys(edit_content +
@random_string)
+end
+
+When(/^I save the edit$/) do
+ on(EditPage).save_button
+end
+
+Then(/^the edited page content should contain "(.*?)"$/) do |content|
+ expect(on(MainPage).page_content).to match(content + @random_string)
+end
--
To view, visit https://gerrit.wikimedia.org/r/354634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad9dfece6083f7907824a995edaa93ac4ad02457
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
BearND has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354633 )
Change subject: Add Antonio Roa for Hackathon 2017
..
Add Antonio Roa for Hackathon 2017
Change-Id: I8256363749f48533f63e449f745f0c0bcdcbfb12
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/33/354633/1
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 961c961..392da0a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -46,6 +46,7 @@
(?x) ^(?!(
.*?@wikimedia\.(org|de)
| 01tonythomas@gmail\.com
+| 6020peaks@gmail\.com
| aarcos\.wiki@gmail\.com
| adamr_carter@btinternet\.com
| addshorewiki@gmail\.com
@@ -332,6 +333,7 @@
- ^drenfro@vistaprint\.com$ # AlephNull
# Trusted long term users:
+ - ^6020peaks@gmail\.com$ # Hackathon 2017
- ^adamr_carter@btinternet\.com$ # UltrasonicNXT
- ^admin@alphacorp\.tk$ # Hydriz
- ^admin@glados\.cc$ # Unicodesnowman
--
To view, visit https://gerrit.wikimedia.org/r/354633
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8256363749f48533f63e449f745f0c0bcdcbfb12
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: BearND
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354643 )
Change subject: build: Replace jshint and jscs with eslint; bump other devDeps
..
build: Replace jshint and jscs with eslint; bump other devDeps
grunt 0.4.5 → 1.0.1
grunt-banana-checker 0.4.0 → 0.6.0
grunt-jsonlint 1.0.7 → 1.1.0
Change-Id: I9be7ee1eb23cded1e804237841654597c50ed9be
---
D .jscsrc
D .jshintignore
D .jshintrc
M Gruntfile.js
M package.json
5 files changed, 9 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageViewInfo
refs/changes/43/354643/1
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index 9d22e3f..000
--- a/.jscsrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "preset": "wikimedia"
-}
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index c2658d7..000
--- a/.jshintignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/
diff --git a/.jshintrc b/.jshintrc
deleted file mode 100644
index 66e3d48..000
--- a/.jshintrc
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- // Enforcing
- "bitwise": true,
- "eqeqeq": true,
- "freeze": true,
- "latedef": true,
- "noarg": true,
- "nonew": true,
- "undef": true,
- "unused": true,
- "strict": false,
-
- // Relaxing
- "es5": false,
-
- // Environment
- "browser": true,
- "jquery": true,
-
- "globals": {
- "mediaWiki": false,
- "OO": false
- }
-}
diff --git a/Gruntfile.js b/Gruntfile.js
index 5523196..3fcccfc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,23 +1,16 @@
-/*jshint node:true */
+/* eslint-env node, es6 */
module.exports = function ( grunt ) {
var conf = grunt.file.readJSON( 'extension.json' );
- grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-eslint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
- grunt.loadNpmTasks( 'grunt-jscs' );
grunt.initConfig( {
- jshint: {
- options: {
- jshintrc: true
- },
+ eslint: {
all: [
'resources/*.js',
'*.js'
]
- },
- jscs: {
- src: '<%= jshint.all %>'
},
banana: conf.MessagesDirs,
jsonlint: {
@@ -28,6 +21,6 @@
}
} );
- grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index ab30448..efe48f5 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
"test": "grunt test"
},
"devDependencies": {
-"grunt": "0.4.5",
-"grunt-cli": "0.1.13",
-"grunt-contrib-jshint": "0.11.3",
-"grunt-banana-checker": "0.4.0",
-"grunt-jscs": "2.1.0",
-"grunt-jsonlint": "1.0.7"
+"eslint-config-wikimedia": "0.4.0",
+"grunt": "1.0.1",
+"grunt-eslint": "19.0.0",
+"grunt-banana-checker": "0.6.0",
+"grunt-jsonlint": "1.1.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/354643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9be7ee1eb23cded1e804237841654597c50ed9be
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageViewInfo
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354121 )
Change subject: More service file improvements
..
More service file improvements
hhvm was failing, easiest way to fix it is to use RuntimeDirectory.
Made hhvm-development use a different directory.
Change-Id: I265d4dcac45729dd3d1246216c9284345c27f8b0
---
M puppet/modules/hhvm/files/development.ini
M puppet/modules/hhvm/files/hhvm-development.service
M puppet/modules/hhvm/files/hhvm.service
M puppet/modules/nginx/files/nginx.conf
M puppet/modules/wiki/files/mw-jobrunner.service
5 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/puppet/modules/hhvm/files/development.ini
b/puppet/modules/hhvm/files/development.ini
index aa27491..35016fc 100644
--- a/puppet/modules/hhvm/files/development.ini
+++ b/puppet/modules/hhvm/files/development.ini
@@ -1,6 +1,6 @@
; php options
-pid = /run/hhvm/hhvm-development.pid
+pid = /run/hhvm-development/hhvm.pid
display_errors = 1
memory_limit = 200M
@@ -10,13 +10,13 @@
; hhvm specific
hhvm.server.ip = 127.0.0.1
-hhvm.server.file_socket = /run/hhvm/development.sock
+hhvm.server.file_socket = /run/hhvm-development/hhvm.sock
hhvm.server.type = fastcgi
hhvm.server.gzip_compression_level = 0
hhvm.server.graceful_shutdown_wait = 5
hhvm.admin_server.port = 9002
-hhvm.repo.central.path = /run/hhvm/development.hhbc
+hhvm.repo.central.path = /run/hhvm-development/hhvm.hhbc
; Temporarily for https://github.com/facebook/hhvm/issues/7674
hhvm.repo.central.file_user=www-data
hhvm.repo.central.file_group=www-data
diff --git a/puppet/modules/hhvm/files/hhvm-development.service
b/puppet/modules/hhvm/files/hhvm-development.service
index a2303ed..5949255 100644
--- a/puppet/modules/hhvm/files/hhvm-development.service
+++ b/puppet/modules/hhvm/files/hhvm-development.service
@@ -4,11 +4,10 @@
[Service]
User=www-data
Group=www-data
-ExecStartPre=/bin/mkdir -p /run/hhvm
-ExecStartPre=/bin/chown -R www-data:www-data /run/hhvm
+RuntimeDirectory=hhvm-development
ExecStart=/usr/bin/hhvm -m daemon -c /etc/hhvm/php.ini -c
/etc/hhvm/development.ini
-ExecStop=/bin/rm -f /run/hhvm/hhvm-development.sock
-PIDFile=/run/hhvm/hhvm-development.pid
+ExecStop=/bin/rm -f /run/hhvm-development/hhvm.sock
+PIDFile=/run/hhvm-development/hhvm.pid
PrivateDevices=true
ProtectHome=read-only
ProtectSystem=full
diff --git a/puppet/modules/hhvm/files/hhvm.service
b/puppet/modules/hhvm/files/hhvm.service
index 6eaf8b6..5379db9 100644
--- a/puppet/modules/hhvm/files/hhvm.service
+++ b/puppet/modules/hhvm/files/hhvm.service
@@ -4,8 +4,7 @@
[Service]
User=www-data
Group=www-data
-ExecStartPre=/bin/mkdir -p /run/hhvm
-ExecStartPre=/bin/chown -R www-data:www-data /run/hhvm
+RuntimeDirectory=hhvm
ExecStart=/usr/bin/hhvm -m daemon -c /etc/hhvm/php.ini -c /etc/hhvm/server.ini
ExecStop=/bin/rm -f /run/hhvm/hhvm.sock
PIDFile=/run/hhvm/hhvm.pid
diff --git a/puppet/modules/nginx/files/nginx.conf
b/puppet/modules/nginx/files/nginx.conf
index fa8e990..e353ac6 100644
--- a/puppet/modules/nginx/files/nginx.conf
+++ b/puppet/modules/nginx/files/nginx.conf
@@ -54,7 +54,7 @@
}
upstream hhvm-dev {
- server unix:/run/hhvm/development.sock;
+ server unix:/run/hhvm-development/hhvm.sock;
}
include /etc/nginx/sites/*;
diff --git a/puppet/modules/wiki/files/mw-jobrunner.service
b/puppet/modules/wiki/files/mw-jobrunner.service
index 58680b1..761b972 100644
--- a/puppet/modules/wiki/files/mw-jobrunner.service
+++ b/puppet/modules/wiki/files/mw-jobrunner.service
@@ -1,6 +1,6 @@
[Unit]
Description=Processes MediaWiki jobs for production site
-Requires=mysql.service
+After=mysql.service hhvm.service network.target
[Service]
User=www-data
--
To view, visit https://gerrit.wikimedia.org/r/354121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I265d4dcac45729dd3d1246216c9284345c27f8b0
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Smalyshev has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354648 )
Change subject: Merging from cffe5b3ea5f726b5e88dbbeb9aa6ccdd306e5285:
..
Merging from cffe5b3ea5f726b5e88dbbeb9aa6ccdd306e5285:
Localisation updates from https://translatewiki.net.
Change-Id: Id1d9326f9107adbd900ab315f3c6abecb7c344f5
---
A css/embed.style.min.22cb00c77652586f7efa.css
D css/embed.style.min.255dd0aebdfd7b82334d.css
D css/style.min.2239745b99548f23d9b8.css
A css/style.min.fe9092e8eb3b77834582.css
M embed.html
M fonts/fontawesome-webfont.eot
M fonts/fontawesome-webfont.ttf
M fonts/fontawesome-webfont.woff
M fonts/fontawesome-webfont.woff2
D frame.html
M i18n/af.json
M i18n/ast.json
M i18n/az.json
M i18n/br.json
M i18n/da.json
M i18n/diq.json
M i18n/dty.json
M i18n/eu.json
M i18n/fr.json
M i18n/gd.json
M i18n/gu.json
M i18n/hant.json
M i18n/hi.json
M i18n/hy.json
M i18n/ia.json
M i18n/id.json
M i18n/ie.json
M i18n/io.json
M i18n/jv.json
M i18n/lb.json
M i18n/mg.json
M i18n/nl.json
M i18n/oc.json
M i18n/ps.json
M i18n/shn.json
M i18n/tarask.json
M i18n/te.json
M i18n/udm.json
M i18n/yi.json
M index.html
A js/embed.vendor.min.8262b8273dc9e77b4c73.js
D js/embed.vendor.min.a48cec24aa556691c844.js
A js/embed.wdqs.min.84434972d24d5966b235.js
D js/embed.wdqs.min.b344ab9c8402ab817acf.js
A js/shim.min.d1421fd3535f8c49c96c.js
D js/shim.min.e82702b2ab0ddd14f026.js
D js/vendor.min.3769a959a566f76468d3.js
A js/vendor.min.5088fa2672bbff9ee391.js
D js/wdqs.min.2fe2cb53c63db98bf269.js
A js/wdqs.min.f8aee51a695ba146023e.js
50 files changed, 183 insertions(+), 223 deletions(-)
Approvals:
Smalyshev: Verified; Looks good to me, approved
--
To view, visit https://gerrit.wikimedia.org/r/354648
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1d9326f9107adbd900ab315f3c6abecb7c344f5
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui-deploy
Gerrit-Branch: production
Gerrit-Owner: Smalyshev
Gerrit-Reviewer: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354656 )
Change subject: Update GUI
..
Update GUI
Change-Id: I91b555be1cb546ef43529bc5f41c309de4926d38
---
M gui
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/56/354656/1
diff --git a/gui b/gui
index 3e2879f..cffe5b3 16
--- a/gui
+++ b/gui
@@ -1 +1 @@
-Subproject commit 3e2879f1c9b996faff110e8fd15466b23d79d94d
+Subproject commit cffe5b3ea5f726b5e88dbbeb9aa6ccdd306e5285
--
To view, visit https://gerrit.wikimedia.org/r/354656
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I91b555be1cb546ef43529bc5f41c309de4926d38
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354655 )
Change subject: demo.minimal should use getInitializedPromise
..
demo.minimal should use getInitializedPromise
Change-Id: I3ce04761f0ad624035c307096e81b6d5eebe71f4
---
M demos/ve/demo.minimal.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/demos/ve/demo.minimal.js b/demos/ve/demo.minimal.js
index ddad9eb..0be6f52 100644
--- a/demos/ve/demo.minimal.js
+++ b/demos/ve/demo.minimal.js
@@ -5,7 +5,7 @@
*/
// Set up the platform and wait for i18n messages to load
-new ve.init.sa.Platform( ve.messagePaths ).initialize()
+new ve.init.sa.Platform( ve.messagePaths ).getInitializedPromise()
.fail( function () {
$( '.ve-instance' ).text( 'Sorry, this browser is not
supported.' );
} )
--
To view, visit https://gerrit.wikimedia.org/r/354655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ce04761f0ad624035c307096e81b6d5eebe71f4
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: DLynch
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354664 )
Change subject: 0.2.5 snapshot
..
0.2.5 snapshot
Change-Id: I4dc1aebd08b154198e96438f2c4a9481c00aefe1
---
M blazegraph/pom.xml
M common/pom.xml
M dist/pom.xml
M docs/ChangeLog
M pom.xml
M testTools/pom.xml
M tools/pom.xml
M war/pom.xml
8 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/64/354664/1
diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index cebc5bf..bf33ad5 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4
+0.2.5-SNAPSHOT
blazegraph
jar
diff --git a/common/pom.xml b/common/pom.xml
index 93902a2..a5c587e 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4
+0.2.5-SNAPSHOT
common
jar
diff --git a/dist/pom.xml b/dist/pom.xml
index 17f979a..c545c92 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4
+0.2.5-SNAPSHOT
service
pom
diff --git a/docs/ChangeLog b/docs/ChangeLog
index 206d47f..f9e2af4 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,5 @@
+0.2.5
+-
0.2.4
-
Add LDF server
diff --git a/pom.xml b/pom.xml
index 37d2f6b..48a2803 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
org.wikidata.query.rdf
parent
- 0.2.4
+ 0.2.5-SNAPSHOT
pom
diff --git a/testTools/pom.xml b/testTools/pom.xml
index 9e0004b..2916af8 100644
--- a/testTools/pom.xml
+++ b/testTools/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4
+0.2.5-SNAPSHOT
testTools
jar
diff --git a/tools/pom.xml b/tools/pom.xml
index f0331e3..290e2cd 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4
+0.2.5-SNAPSHOT
tools
jar
diff --git a/war/pom.xml b/war/pom.xml
index b22c630..c8b0ce4 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4
+0.2.5-SNAPSHOT
blazegraph-service
war
--
To view, visit https://gerrit.wikimedia.org/r/354664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dc1aebd08b154198e96438f2c4a9481c00aefe1
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Ema has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354507 )
Change subject: Add IPVSError as a generic IPVS-related exception
..
Add IPVSError as a generic IPVS-related exception
Change-Id: I67df1ff9d305c1ddfcbf6cd2d79bb8a76000c9a1
---
A pybal/ipvs/exception.py
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
Ema: Verified; Looks good to me, but someone else must approve
diff --git a/pybal/ipvs/exception.py b/pybal/ipvs/exception.py
new file mode 100644
index 000..922e24a
--- /dev/null
+++ b/pybal/ipvs/exception.py
@@ -0,0 +1,9 @@
+"""
+pybal.ipvs.exception
+
+Copyright (c) 2006-2017 Mark Bergsma
+
+LVS service interface for PyBal - Exceptions
+"""
+class IpvsError(Exception):
+pass
--
To view, visit https://gerrit.wikimedia.org/r/354507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67df1ff9d305c1ddfcbf6cd2d79bb8a76000c9a1
Gerrit-PatchSet: 3
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: 2.0-dev
Gerrit-Owner: Giuseppe Lavagetto
Gerrit-Reviewer: Ema
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354642 )
Change subject: WIP: Enable RevisionSlider for mobile diff pages
..
WIP: Enable RevisionSlider for mobile diff pages
With the dependant change, the RevisionSlider is enabled on mobile
devices, too.
This change ensures, that the design and functionality is working
on mobile devices. This includes:
* The jquery.ui.draggable module is only loaded, if the page is not
viewed in mobile loading all needed jquery dependencies in mobile
would be too much, and using the new concept of clicking in the
RevisionSlider works pretty well on mobile)
* The z-index is removed from most elements, except the pointer lines,
which will be behind the other content
Bug: T165835
Change-Id: I05677e555353361610b93df70d6d2fc81f718b89
Depends-On: I68cf50f5dd339f34802d70df1f32d2c3390944a3
---
M extension.json
M modules/ext.RevisionSlider.SliderView.js
M modules/ext.RevisionSlider.SliderViewTwo.js
M modules/ext.RevisionSlider.css
M modules/ext.RevisionSlider.init.js
M modules/ext.RevisionSlider.lazy.css
M src/RevisionSliderHooks.php
7 files changed, 130 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/42/354642/1
diff --git a/extension.json b/extension.json
index bbf27d1..36d4fe1 100644
--- a/extension.json
+++ b/extension.json
@@ -37,7 +37,11 @@
"styles": [
"modules/ext.RevisionSlider.lazy.css"
],
- "position": "top"
+ "position": "top",
+ "targets": [
+ "desktop",
+ "mobile"
+ ]
},
"ext.RevisionSlider.lazyJs": {
"scripts": [
@@ -46,7 +50,11 @@
"dependencies": [
"ext.RevisionSlider.Settings"
],
- "position": "top"
+ "position": "top",
+ "targets": [
+ "desktop",
+ "mobile"
+ ]
},
"ext.RevisionSlider.init": {
"scripts": [
@@ -80,19 +88,35 @@
"revisionslider-turn-on-auto-expand-title",
"revisionslider-turn-off-auto-expand-title"
],
- "position": "top"
+ "position": "top",
+ "targets": [
+ "desktop",
+ "mobile"
+ ]
},
"ext.RevisionSlider.noscript": {
- "styles": "modules/ext.RevisionSlider.noscript.css"
+ "styles": "modules/ext.RevisionSlider.noscript.css",
+ "targets": [
+ "desktop",
+ "mobile"
+ ]
},
"ext.RevisionSlider.util": {
"scripts": [
"modules/ext.RevisionSlider.util.js"
+ ],
+ "targets": [
+ "desktop",
+ "mobile"
]
},
"ext.RevisionSlider.Api": {
"scripts": [
"modules/ext.RevisionSlider.Api.js"
+ ],
+ "targets": [
+ "desktop",
+ "mobile"
]
},
"ext.RevisionSlider.Settings": {
@@ -103,6 +127,10 @@
"mediawiki.user",
"mediawiki.storage",
"mediawiki.cookie"
+ ],
+ "targets": [
+ "desktop",
+ "mobile"
]
},
"ext.RevisionSlider.Revision": {
@@ -111,6 +139,10 @@
],
"dependencies": [
"moment"
+ ],
+ "targets": [
+ "desktop",
+ "mobile"
]
},
"ext.RevisionSlider.Pointer": {
@@ -120,16 +152,28 @@
"dependencies": [
"ext.RevisionSlider.PointerView",
"ext.RevisionSlider.PointerLine"
+
Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354647 )
Change subject: Do not use the main config for extension configuration options
..
Do not use the main config for extension configuration options
This currently just works, because the currently used backend are
global variables. Once the main config uses a more scoped/focused
backend, such as a HashConfig or a database-based config, requesting
extension configurations from it will not work anymore.
Therefore, use the extensions Config object to request configuration
options for the extension.
Change-Id: Iea02d3c284f9a0e12abff33e3624dce9585ab51c
---
M extension.json
M src/RevisionSliderHooks.php
2 files changed, 24 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/47/354647/1
diff --git a/extension.json b/extension.json
index bbf27d1..957a328 100644
--- a/extension.json
+++ b/extension.json
@@ -18,6 +18,9 @@
"requires": {
"MediaWiki": ">= 1.25.0"
},
+ "ConfigRegistry": {
+ "revisionslider": "GlobalVarConfig::newInstance"
+ },
"config": {
"@RevisionSliderBetaFeature": "Make the RevisionSlider feature
a BetaFeature. Setting this requires the RevisionSlider extension and requires
each user to enable the BetaFeature.",
"RevisionSliderBetaFeature": false,
diff --git a/src/RevisionSliderHooks.php b/src/RevisionSliderHooks.php
index 2cabf66..4a303f2 100644
--- a/src/RevisionSliderHooks.php
+++ b/src/RevisionSliderHooks.php
@@ -10,12 +10,31 @@
*/
class RevisionSliderHooks {
+ /**
+* @var Config
+*/
+ private static $config;
+
+ /**
+* Returns the RevisionSlider extensions config.
+*
+* @return Config
+*/
+ private static function getConfig() {
+ if ( self::$config === null ) {
+ self::$config = MediaWikiServices::getInstance()
+ ->getConfigFactory()
+ ->makeConfig( 'revisionslider' );
+ }
+ return self::$config;
+ }
+
public static function onDiffViewHeader(
DifferenceEngine $diff,
Revision $oldRev,
Revision $newRev
) {
- $config = MediaWikiServices::getInstance()->getMainConfig();
+ $config = self::getConfig();
/**
* If this extension is configured to be a beta feature, and
the BetaFeatures extension
@@ -112,7 +131,7 @@
}
public static function getBetaFeaturePreferences( User $user, array
&$prefs ) {
- $config = MediaWikiServices::getInstance()->getMainConfig();
+ $config = self::getConfig();
$extensionAssetsPath = $config->get( 'ExtensionAssetsPath' );
if ( $config->get( 'RevisionSliderBetaFeature' ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/354647
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea02d3c284f9a0e12abff33e3624dce9585ab51c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Smalyshev has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354657 )
Change subject: 0.2.4
..
0.2.4
Change-Id: Id8e74d0f53cbaee8c6d1d3d7139d65ebceb9d165
---
M blazegraph/pom.xml
M common/pom.xml
M dist/pom.xml
M pom.xml
M testTools/pom.xml
M tools/pom.xml
M war/pom.xml
7 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/57/354657/1
diff --git a/blazegraph/pom.xml b/blazegraph/pom.xml
index 7698045..cebc5bf 100644
--- a/blazegraph/pom.xml
+++ b/blazegraph/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4-SNAPSHOT
+0.2.4
blazegraph
jar
diff --git a/common/pom.xml b/common/pom.xml
index 59ff861..93902a2 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4-SNAPSHOT
+0.2.4
common
jar
diff --git a/dist/pom.xml b/dist/pom.xml
index d8591f4..17f979a 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4-SNAPSHOT
+0.2.4
service
pom
diff --git a/pom.xml b/pom.xml
index fb26db8..37d2f6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
org.wikidata.query.rdf
parent
- 0.2.4-SNAPSHOT
+ 0.2.4
pom
diff --git a/testTools/pom.xml b/testTools/pom.xml
index cc8010e..9e0004b 100644
--- a/testTools/pom.xml
+++ b/testTools/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4-SNAPSHOT
+0.2.4
testTools
jar
diff --git a/tools/pom.xml b/tools/pom.xml
index bf0de91..f0331e3 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4-SNAPSHOT
+0.2.4
tools
jar
diff --git a/war/pom.xml b/war/pom.xml
index 44a4434..b22c630 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -4,7 +4,7 @@
org.wikidata.query.rdf
parent
-0.2.4-SNAPSHOT
+0.2.4
blazegraph-service
war
--
To view, visit https://gerrit.wikimedia.org/r/354657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8e74d0f53cbaee8c6d1d3d7139d65ebceb9d165
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Smalyshev
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354259 )
Change subject: Add ignored message keys to CommonsAndroid
..
Add ignored message keys to CommonsAndroid
These messages appear to be technical and internal.
Change-Id: I67afbcfb3705184cf94bed8263b680a2befcc9f1
---
M groups/Wikimedia/CommonsAndroid.yaml
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/groups/Wikimedia/CommonsAndroid.yaml
b/groups/Wikimedia/CommonsAndroid.yaml
index 1434e45..86598d8 100644
--- a/groups/Wikimedia/CommonsAndroid.yaml
+++ b/groups/Wikimedia/CommonsAndroid.yaml
@@ -55,6 +55,9 @@
- commons-android-strings-hello_world
ignored:
- commons-android-strings-beta_opt_in_link
+- commons-android-strings-map_theme_light
+- commons-android-strings-map_theme_dark
+- commons-android-strings-mapbox_commons_app_token
---
BASIC:
--
To view, visit https://gerrit.wikimedia.org/r/354259
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67afbcfb3705184cf94bed8263b680a2befcc9f1
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Mattflaschen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354665 )
Change subject: Trivial docfix in DiscussionParser
..
Trivial docfix in DiscussionParser
Change-Id: I105b297333017dbce71cc42528a0e76f8be5da4b
---
M includes/DiscussionParser.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo
refs/changes/65/354665/1
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index cba02b4..3759af0 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -277,7 +277,7 @@
* Set of arrays containing valid mentions and possible intended but
failed mentions.
* - [validMentions]: An array of valid users to mention with ID => ID.
* - [unknownUsers]: An array of DBKey strings representing unknown
users.
-* - [validMentions]: An array of DBKey strings representing anonymous
IP users.
+* - [anonymousUsers]: An array of DBKey strings representing anonymous
IP users.
*/
private static function getUserMentions( Title $title, $revisionUserId,
array $userLinks ) {
global $wgEchoMaxMentionsCount;
--
To view, visit https://gerrit.wikimedia.org/r/354665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I105b297333017dbce71cc42528a0e76f8be5da4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
01tonythomas has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354636 )
Change subject: Remove bogus DISTINCT nl_id on already UNIQUE nl_id field
..
Remove bogus DISTINCT nl_id on already UNIQUE nl_id field
Bug: T159083
Change-Id: I626a945c6af7a066c622019b679a6e6491391f54
---
M includes/specials/pagers/NewsletterTablePager.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/36/354636/1
diff --git a/includes/specials/pagers/NewsletterTablePager.php
b/includes/specials/pagers/NewsletterTablePager.php
index 70b9d11..be2b669 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -57,8 +57,7 @@
'nl_desc',
'nl_id',
'subscribers' => "( SELECT COUNT(*) FROM
$tblSubscriptions WHERE nls_newsletter_id = nl_id )",
- ],
- 'options' => [ 'DISTINCT nl_id' ],
+ ]
];
$info['conds'] = [ 'nl_active = 1' ];
--
To view, visit https://gerrit.wikimedia.org/r/354636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I626a945c6af7a066c622019b679a6e6491391f54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Halfak has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354652 )
Change subject: Adds textstat library
..
Adds textstat library
Change-Id: I3112d80a23afebcd98ab5c5d5e40a81b2f5aea37
---
A textstat-0.3.1-py3-none-any.whl
1 file changed, 0 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels
refs/changes/52/354652/1
diff --git a/textstat-0.3.1-py3-none-any.whl b/textstat-0.3.1-py3-none-any.whl
new file mode 100644
index 000..7c32567
--- /dev/null
+++ b/textstat-0.3.1-py3-none-any.whl
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/354652
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3112d80a23afebcd98ab5c5d5e40a81b2f5aea37
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Halfak
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338983 )
Change subject: Add CaighdeanWebService
..
Add CaighdeanWebService
Not enabled by default.
While doing this I felt the urge to improve the exception handling
a bit: configuration or input errors should not count towards errors
that cause service to be suspended.
I also had to extend TranslationQuery and TranslationQueryResult to
allow passing some data, for implementing an oracle algorithm for
adding whitespace between tokens.
Change-Id: I7dc265f72c1965bcee4b916780706c52361876be
---
M Autoload.php
M api/ApiQueryTranslationAids.php
M translationaids/MachineTranslationAid.php
M webservices/ApertiumWebService.php
A webservices/CaighdeanWebService.php
M webservices/CxserverWebService.php
M webservices/MicrosoftWebService.php
M webservices/QueryAggregator.php
M webservices/TranslationQuery.php
M webservices/TranslationQueryResponse.php
M webservices/TranslationWebService.php
A webservices/TranslationWebServiceConfigurationException.php
A webservices/TranslationWebServiceInvalidInputException.php
M webservices/YandexWebService.php
14 files changed, 242 insertions(+), 31 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/Autoload.php b/Autoload.php
index 11b6106..02cd90e 100644
--- a/Autoload.php
+++ b/Autoload.php
@@ -301,14 +301,19 @@
* @{
*/
$al['ApertiumWebService'] = "$dir/webservices/ApertiumWebService.php";
+$al['CaighdeanWebService'] = "$dir/webservices/CaighdeanWebService.php";
$al['CxserverWebService'] = "$dir/webservices/CxserverWebService.php";
$al['MicrosoftWebService'] = "$dir/webservices/MicrosoftWebService.php";
$al['RemoteTTMServerWebService'] =
"$dir/webservices/RemoteTTMServerWebService.php";
$al['TranslationQuery'] = "$dir/webservices/TranslationQuery.php";
$al['TranslationQueryResponse'] =
"$dir/webservices/TranslationQueryResponse.php";
$al['TranslationWebService'] = "$dir/webservices/TranslationWebService.php";
+$al['TranslationWebServiceConfigurationException'] =
+ "$dir/webservices/TranslationWebServiceConfigurationException.php";
$al['TranslationWebServiceException'] =
"$dir/webservices/TranslationWebServiceException.php";
+$al['TranslationWebServiceInvalidInputException'] =
+ "$dir/webservices/TranslationWebServiceInvalidInputException.php";
$al['QueryAggregator'] = "$dir/webservices/QueryAggregator.php";
$al['QueryAggregatorAware'] = "$dir/webservices/QueryAggregatorAware.php";
$al['YandexWebService'] = "$dir/webservices/YandexWebService.php";
diff --git a/api/ApiQueryTranslationAids.php b/api/ApiQueryTranslationAids.php
index 335e7aa..f394509 100644
--- a/api/ApiQueryTranslationAids.php
+++ b/api/ApiQueryTranslationAids.php
@@ -76,7 +76,13 @@
if ( $obj instanceof QueryAggregatorAware ) {
$obj->setQueryAggregator( $aggregator );
- $obj->populateQueries();
+ try {
+ $obj->populateQueries();
+ } catch ( TranslationHelperException $e ) {
+ $data[$type] = [ 'error' =>
$e->getMessage() ];
+ // Prevent processing this aids and
thus overwriting our error
+ continue;
+ }
}
$aids[$type] = $obj;
diff --git a/translationaids/MachineTranslationAid.php
b/translationaids/MachineTranslationAid.php
index b4f348d..ecd0ab8 100644
--- a/translationaids/MachineTranslationAid.php
+++ b/translationaids/MachineTranslationAid.php
@@ -26,20 +26,24 @@
continue;
}
- if ( $service->isSupportedLanguagePair( $from, $to ) ) {
- $this->storeQuery( $service, $from, $to,
$definition );
- continue;
- }
-
- // Loop of the the translations we have to see which
can be used as source
- // @todo: Support setting priority of languages like
Yandex used to have
- foreach ( $translations as $from => $text ) {
- if ( !$service->isSupportedLanguagePair( $from,
$to ) ) {
+ try {
+ if ( $service->isSupportedLanguagePair( $from,
$to ) ) {
+ $this->storeQuery( $service, $from,
$to, $definition );
continue;
}
- $this->storeQuery( $service, $from, $to, $text
);
- break;
+ // Loop of the the
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354658 )
Change subject: Fix instantly closing progress bars in jQuery 3
..
Fix instantly closing progress bars in jQuery 3
Change-Id: I6c2e507916e7c78181cdf0986856b0934a7759d2
---
M src/ui/dialogs/ve.ui.ProgressDialog.js
M src/ui/ve.ui.Surface.js
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/58/354658/1
diff --git a/src/ui/dialogs/ve.ui.ProgressDialog.js
b/src/ui/dialogs/ve.ui.ProgressDialog.js
index 6b29ecb..af0d0a0 100644
--- a/src/ui/dialogs/ve.ui.ProgressDialog.js
+++ b/src/ui/dialogs/ve.ui.ProgressDialog.js
@@ -128,7 +128,9 @@
ve.ui.ProgressDialog.prototype.progressComplete = function ( $row, failed ) {
this.inProgress--;
if ( !this.inProgress ) {
- this.close();
+ // Don't try to close while opening
+ // TODO: This should be fixed upstream.
+ this.getManager().opening.then( this.close.bind( this ) );
}
if ( failed ) {
$row.remove();
diff --git a/src/ui/ve.ui.Surface.js b/src/ui/ve.ui.Surface.js
index 4c89bee..eaa2926 100644
--- a/src/ui/ve.ui.Surface.js
+++ b/src/ui/ve.ui.Surface.js
@@ -738,6 +738,9 @@
return progressBarDeferred.promise();
};
+/**
+ * Show all current progress bars
+ */
ve.ui.Surface.prototype.showProgress = function () {
var dialogs = this.dialogs,
progresses = this.progresses;
--
To view, visit https://gerrit.wikimedia.org/r/354658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6c2e507916e7c78181cdf0986856b0934a7759d2
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353700 )
Change subject: Make sure all functions in Database.php are documented
..
Make sure all functions in Database.php are documented
Will add @inheritdoc in a follow-up commit for functions
documented in the parent classes.
Part of 2017 MediaWiki Documentation Day
Change-Id: I002a1f6451940ecbcacea7b3ca2fc6ad0f4eba47
---
M includes/libs/rdbms/database/Database.php
1 file changed, 68 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/rdbms/database/Database.php
b/includes/libs/rdbms/database/Database.php
index 28efcb5..ee7644f 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -416,6 +416,13 @@
return $conn;
}
+ /**
+* Set the PSR-3 logger interface to use for query logging. (The logger
+* interfaces for connection logging and error logging can be set with
the
+* constructor.)
+*
+* @param LoggerInterface $logger
+*/
public function setLogger( LoggerInterface $logger ) {
$this->queryLogger = $logger;
}
@@ -576,6 +583,12 @@
return $this->mTrxLevel ? $this->mTrxWriteCallers : [];
}
+ /**
+* Get the list of method names that have pending write queries or
callbacks
+* for this transaction
+*
+* @return array
+*/
protected function pendingWriteAndCallbackCallers() {
if ( !$this->mTrxLevel ) {
return [];
@@ -664,6 +677,9 @@
*/
abstract function strencode( $s );
+ /**
+* Set a custom error handler for logging errors during database
connection
+*/
protected function installErrorHandler() {
$this->mPHPError = false;
$this->htmlErrors = ini_set( 'html_errors', '0' );
@@ -671,6 +687,8 @@
}
/**
+* Restore the previous error handler and return the last PHP error for
this DB
+*
* @return bool|string
*/
protected function restoreErrorHandler() {
@@ -697,6 +715,7 @@
}
/**
+* Error handler for logging errors during database connection
* This method should not be used outside of Database classes
*
* @param int $errno
@@ -953,6 +972,17 @@
return $res;
}
+ /**
+* Helper method for query() that handles profiling and logging and
sends
+* the query to doQuery()
+*
+* @param string $sql Original SQL query
+* @param string $commentedSql SQL query with debugging/trace comment
+* @param bool $isWrite Whether the query is a (non-temporary) write
operation
+* @param string $fname Name of the calling function
+* @return bool|ResultWrapper True for a successful write query,
ResultWrapper
+* object for a successful read query, or false on failure
+*/
private function doProfiledQuery( $sql, $commentedSql, $isWrite, $fname
) {
$isMaster = !is_null( $this->getLBInfo( 'master' ) );
# generalizeSQL() will probably cut down the query to reasonable
@@ -1034,6 +1064,16 @@
}
}
+ /**
+* Determine whether or not it is safe to retry queries after a database
+* connection is lost
+*
+* @param string $sql SQL query
+* @param bool $priorWritesPending Whether there is a transaction open
with
+* possible write queries or transaction pre-commit/idle callbacks
+* waiting on it to finish.
+* @return bool True if it is safe to retry the query, false otherwise
+*/
private function canRecoverFromDisconnect( $sql, $priorWritesPending ) {
# Transaction dropped; this can mean lost writes, or
REPEATABLE-READ snapshots.
# Dropped connections also mean that named locks are
automatically released.
@@ -1054,6 +1094,11 @@
return true;
}
+ /**
+* Clean things up after transaction loss due to disconnection
+*
+* @return null|Exception
+*/
private function handleSessionLoss() {
$this->mTrxLevel = 0;
$this->mTrxIdleCallbacks = []; // T67263
@@ -2338,6 +2383,12 @@
return $this->insert( $destTable, $rows, $fname, $insertOptions
);
}
+ /**
+* Native server-side implementation of insertSelect() for situations
where
+* we don't want to select everything into memory
+*
+* @see IDatabase::insertSelect()
+*/
protected function nativeInsertSelect( $destTable,
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354650 )
Change subject: New Wikidata Build - 2017-05-20T10:00:02+
..
New Wikidata Build - 2017-05-20T10:00:02+
Change-Id: Ie907129efa29ad1f1d8a91042fa0bf4a98878631
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M Wikidata.localisation.php
M build/tasks/updatecomposer.js
M composer.json
M composer.lock
M extensions/Constraints/docs/user.js
M
extensions/Constraints/includes/ConstraintCheck/DelegatingConstraintChecker.php
A extensions/ExternalValidation/.coveralls.yml
A extensions/ExternalValidation/.gitignore
A extensions/ExternalValidation/.gitreview
A extensions/ExternalValidation/.jscsrc
A extensions/ExternalValidation/.jshintignore
A extensions/ExternalValidation/.jshintrc
A extensions/ExternalValidation/.stylelintrc
A extensions/ExternalValidation/.travis.yml
A extensions/ExternalValidation/COPYING
A extensions/ExternalValidation/Gruntfile.js
A extensions/ExternalValidation/README.md
A extensions/ExternalValidation/WikibaseQualityExternalValidation.alias.php
A extensions/ExternalValidation/WikibaseQualityExternalValidation.php
A extensions/ExternalValidation/WikibaseQualityExternalValidationHooks.php
A extensions/ExternalValidation/api/RunCrossCheck.php
A extensions/ExternalValidation/build/travis/after_script.sh
A extensions/ExternalValidation/build/travis/before_script.sh
A extensions/ExternalValidation/build/travis/script.sh
A extensions/ExternalValidation/composer.json
A extensions/ExternalValidation/i18n/ady-cyrl.json
A extensions/ExternalValidation/i18n/af.json
A extensions/ExternalValidation/i18n/arq.json
A extensions/ExternalValidation/i18n/ast.json
A extensions/ExternalValidation/i18n/ba.json
A extensions/ExternalValidation/i18n/bcl.json
A extensions/ExternalValidation/i18n/bg.json
A extensions/ExternalValidation/i18n/bn.json
A extensions/ExternalValidation/i18n/br.json
A extensions/ExternalValidation/i18n/ca.json
A extensions/ExternalValidation/i18n/ce.json
A extensions/ExternalValidation/i18n/ckb.json
A extensions/ExternalValidation/i18n/cs.json
A extensions/ExternalValidation/i18n/cu.json
A extensions/ExternalValidation/i18n/de.json
A extensions/ExternalValidation/i18n/el.json
A extensions/ExternalValidation/i18n/en-gb.json
A extensions/ExternalValidation/i18n/en.json
A extensions/ExternalValidation/i18n/es.json
A extensions/ExternalValidation/i18n/eu.json
A extensions/ExternalValidation/i18n/fa.json
A extensions/ExternalValidation/i18n/fr.json
A extensions/ExternalValidation/i18n/fy.json
A extensions/ExternalValidation/i18n/gl.json
A extensions/ExternalValidation/i18n/gu.json
A extensions/ExternalValidation/i18n/he.json
A extensions/ExternalValidation/i18n/ht.json
A extensions/ExternalValidation/i18n/hu.json
A extensions/ExternalValidation/i18n/id.json
A extensions/ExternalValidation/i18n/it.json
A extensions/ExternalValidation/i18n/ja.json
A extensions/ExternalValidation/i18n/ka.json
A extensions/ExternalValidation/i18n/kn.json
A extensions/ExternalValidation/i18n/ko.json
A extensions/ExternalValidation/i18n/ksh.json
A extensions/ExternalValidation/i18n/ku-latn.json
A extensions/ExternalValidation/i18n/lb.json
A extensions/ExternalValidation/i18n/lv.json
A extensions/ExternalValidation/i18n/mg.json
A extensions/ExternalValidation/i18n/mk.json
A extensions/ExternalValidation/i18n/mr.json
A extensions/ExternalValidation/i18n/nb.json
A extensions/ExternalValidation/i18n/ne.json
A extensions/ExternalValidation/i18n/nl.json
A extensions/ExternalValidation/i18n/oc.json
A extensions/ExternalValidation/i18n/olo.json
A extensions/ExternalValidation/i18n/or.json
A extensions/ExternalValidation/i18n/pam.json
A extensions/ExternalValidation/i18n/pl.json
A extensions/ExternalValidation/i18n/ps.json
A extensions/ExternalValidation/i18n/pt-br.json
A extensions/ExternalValidation/i18n/pt.json
A extensions/ExternalValidation/i18n/qqq.json
A extensions/ExternalValidation/i18n/ro.json
A extensions/ExternalValidation/i18n/ru.json
A extensions/ExternalValidation/i18n/sd.json
A extensions/ExternalValidation/i18n/si.json
A extensions/ExternalValidation/i18n/sv.json
A extensions/ExternalValidation/i18n/ta.json
A extensions/ExternalValidation/i18n/te.json
A extensions/ExternalValidation/i18n/tr.json
A extensions/ExternalValidation/i18n/uk.json
A extensions/ExternalValidation/i18n/vi.json
A extensions/ExternalValidation/i18n/yi.json
A extensions/ExternalValidation/i18n/zh-hans.json
A extensions/ExternalValidation/i18n/zh-hant.json
A
extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparer.php
A
extensions/ExternalValidation/includes/CrossCheck/Comparer/DataValueComparerFactory.php
A
extensions/ExternalValidation/includes/CrossCheck/Comparer/DispatchingDataValueComparer.php
A
extensions/ExternalValidation/includes/CrossCheck/Comparer/EntityIdValueComparer.php
A
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353841 )
Change subject: Remove duplicate "Message group" title
..
Remove duplicate "Message group" title
Bug: T165241
Change-Id: I480e28e0f5c3b6469f4aff35cdb62de9ed73de8f
---
M Resources.php
M resources/css/ext.translate.groupselector.css
M resources/js/ext.translate.groupselector.js
3 files changed, 3 insertions(+), 24 deletions(-)
Approvals:
TerraCodes: Looks good to me, but someone else must approve
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/Resources.php b/Resources.php
index 4dbd857..7f0bfbf 100644
--- a/Resources.php
+++ b/Resources.php
@@ -132,7 +132,6 @@
'mediawiki.jqueryMsg',
],
'messages' => [
- 'translate-msggroupselector-projects',
'translate-msggroupselector-search-all',
'translate-msggroupselector-search-placeholder',
'translate-msggroupselector-search-recent',
diff --git a/resources/css/ext.translate.groupselector.css
b/resources/css/ext.translate.groupselector.css
index 7f55924..790120f 100644
--- a/resources/css/ext.translate.groupselector.css
+++ b/resources/css/ext.translate.groupselector.css
@@ -51,19 +51,9 @@
content: none;
}
-.grid .row .tux-groupselector__title {
- border: 0;
- color: #555;
- font-size: 14pt;
- font-weight: normal;
- line-height: 1.25em;
- padding: 5px 0 0 10px; /* grid override */
- margin: 0;
-}
-
.tux-groupselector__filter {
height: 30px;
- border-bottom: solid 1px #c9c9c9;
+ padding-top: 10px;
}
.tux-groupselector__filter__search__input {
diff --git a/resources/js/ext.translate.groupselector.js
b/resources/js/ext.translate.groupselector.js
index 43a14b9..7469f2d 100644
--- a/resources/js/ext.translate.groupselector.js
+++ b/resources/js/ext.translate.groupselector.js
@@ -56,8 +56,7 @@
* Prepare the selector menu rendering
*/
prepareSelectorMenu: function () {
- var $groupTitle,
- $listFilters,
+ var $listFilters,
$listFiltersGroup,
$search,
$searchIcon,
@@ -66,15 +65,6 @@
this.$menu = $( '' )
.addClass( 'tux-groupselector' )
.addClass( 'grid' );
-
- $groupTitle = $( '' )
- .addClass( 'row' )
- .append(
- $( '' )
- .addClass(
'tux-groupselector__title' )
- .addClass( 'ten columns' )
- .text( mw.msg(
'translate-msggroupselector-projects' ) )
- );
$searchIcon = $( '' )
.addClass( 'two columns
tux-groupselector__filter__search__icon' );
@@ -125,7 +115,7 @@
this.$loader = $( '' )
.addClass( 'tux-loading-indicator
tux-loading-indicator--centered' );
- this.$menu.append( $groupTitle, $listFiltersGroup,
this.$loader, this.$list );
+ this.$menu.append( $listFiltersGroup, this.$loader,
this.$list );
$( 'body' ).append( this.$menu );
},
--
To view, visit https://gerrit.wikimedia.org/r/353841
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I480e28e0f5c3b6469f4aff35cdb62de9ed73de8f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: TerraCodes
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: TerraCodes
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354663 )
Change subject: Forward to 73e822ebdf7beefa3c6e805d1173193df118feaa
..
Forward to 73e822ebdf7beefa3c6e805d1173193df118feaa
Change-Id: I2a80237d35dd62c7775eaf017aa3e99a5b0658b6
---
A .csslintrc
D .eslintrc.json
M .gitignore
M .gitreview
A .jscsrc
A .jshintignore
A .jshintrc
D .rubocop.yml
M Gemfile
D Gemfile.lock
M Gruntfile.js
M README.md
A RevisionSlider.hooks.php
M composer.json
M extension.json
M i18n/ar.json
M i18n/ast.json
D i18n/atj.json
D i18n/az.json
M i18n/bg.json
D i18n/bgn.json
M i18n/bn.json
D i18n/bs.json
M i18n/ca.json
M i18n/ce.json
M i18n/cs.json
D i18n/csb.json
M i18n/de.json
M i18n/en.json
M i18n/es.json
D i18n/et.json
M i18n/eu.json
D i18n/fa.json
D i18n/fi.json
M i18n/fr.json
M i18n/gl.json
M i18n/he.json
D i18n/hr.json
M i18n/hu.json
D i18n/ilo.json
M i18n/it.json
M i18n/ja.json
D i18n/jv.json
M i18n/ka.json
M i18n/kk-cyrl.json
M i18n/ko.json
M i18n/ku-latn.json
M i18n/lb.json
M i18n/lv.json
M i18n/mk.json
M i18n/mr.json
D i18n/nb.json
M i18n/nl.json
D i18n/nn.json
M i18n/oc.json
M i18n/pl.json
M i18n/pt-br.json
M i18n/pt.json
M i18n/qqq.json
D i18n/ru.json
M i18n/sah.json
M i18n/sd.json
M i18n/sr-ec.json
D i18n/sr-el.json
M i18n/sv.json
D i18n/tr.json
D i18n/tt-cyrl.json
M i18n/uk.json
M i18n/ur.json
M i18n/vi.json
M i18n/zh-hans.json
M i18n/zh-hant.json
M modules/ext.RevisionSlider.Api.js
M modules/ext.RevisionSlider.DiffPage.js
D modules/ext.RevisionSlider.HelpButtonView.js
M modules/ext.RevisionSlider.HelpDialog.js
M modules/ext.RevisionSlider.Pointer.js
D modules/ext.RevisionSlider.PointerLine.js
M modules/ext.RevisionSlider.PointerView.js
M modules/ext.RevisionSlider.Revision.js
M modules/ext.RevisionSlider.RevisionListView.js
D modules/ext.RevisionSlider.Settings.js
M modules/ext.RevisionSlider.Slider.js
D modules/ext.RevisionSlider.SliderArrowView.js
M modules/ext.RevisionSlider.SliderView.js
D modules/ext.RevisionSlider.SliderViewTwo.js
M modules/ext.RevisionSlider.css
M modules/ext.RevisionSlider.init.js
D modules/ext.RevisionSlider.lazy.css
D modules/ext.RevisionSlider.lazy.js
D modules/ext.RevisionSlider.util.js
D modules/ext.RevisionSliderViewTwo.css
M package.json
A resources/RevisionSlider-beta-features-ltr.png
D resources/RevisionSlider-beta-features-ltr.svg
A resources/RevisionSlider-beta-features-rtl.png
D resources/RevisionSlider-beta-features-rtl.svg
R resources/ext.RevisionSlider.helpDialog/slide3-ltr.svg
A resources/ext.RevisionSlider.helpDialog/slide3-rtl.svg
D resources/ext.RevisionSlider.helpDialog/slide3a.svg
R resources/ext.RevisionSlider.helpDialog/slide4-ltr.svg
A resources/ext.RevisionSlider.helpDialog/slide4-rtl.svg
D resources/ext.RevisionSlider.helpDialog/slide4a.svg
D src/RevisionSliderHooks.php
M tests/browser/README.mediawiki
M tests/browser/environments.yml
M tests/browser/features/autoexpand.feature
A tests/browser/features/betafeature.feature
D tests/browser/features/difflinks.feature
M tests/browser/features/expand.feature
M tests/browser/features/help.feature
M tests/browser/features/history.feature
M tests/browser/features/pointers.feature
M tests/browser/features/support/env.rb
M tests/browser/features/support/hooks.rb
M tests/browser/features/support/pages/diff_page.rb
A tests/browser/features/support/pages/special_preferences_page.rb
M tests/browser/features/support/step_definitions/common_steps.rb
M tests/browser/features/support/step_definitions/help.rb
M tests/browser/features/support/step_definitions/pointers.rb
M tests/browser/features/support/step_definitions/timeline.rb
M tests/browser/features/support/step_definitions/tooltips.rb
M tests/browser/features/timeline.feature
M tests/browser/features/tooltips.feature
D tests/phan/config.php
D tests/phan/issues/.gitkeep
D tests/phan/stubs/README
D tests/phan/stubs/betafeatures.php
M tests/qunit/QUnit.revisionSlider.testOrSkip.js
M tests/qunit/RevisionSlider.DiffPage.test.js
M tests/qunit/RevisionSlider.HelpDialog.test.js
M tests/qunit/RevisionSlider.Pointer.test.js
M tests/qunit/RevisionSlider.PointerView.test.js
M tests/qunit/RevisionSlider.Revision.test.js
M tests/qunit/RevisionSlider.RevisionList.test.js
M tests/qunit/RevisionSlider.RevisionListView.test.js
M tests/qunit/RevisionSlider.Slider.test.js
M tests/qunit/RevisionSlider.SliderView.test.js
138 files changed, 1,168 insertions(+), 4,042 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/63/354663/1
--
To view, visit https://gerrit.wikimedia.org/r/354663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a80237d35dd62c7775eaf017aa3e99a5b0658b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: REL1_27
Gerrit-Owner: Addshore
___
MediaWiki-commits
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354662 )
Change subject: Revert "Use progress bar instead of text when initializing the
slider"
..
Revert "Use progress bar instead of text when initializing the slider"
This reverts commit 686bc5df9a7db38e321e67de49069b16ec84e9da.
Change-Id: I2f4e67b617fc410365b664087a1f0abc0691ac4f
---
M i18n/qqq.json
M src/RevisionSliderHooks.php
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RevisionSlider
refs/changes/62/354662/1
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 612c6ff..714f3c2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -20,6 +20,7 @@
"revisionslider-label-comment": "Label for the edit summary of the
revision.\n{{Identical|Comment}}",
"revisionslider-label-username": "Label for the revision's author's
username.\n\nParameters:\n$1 - Gender as in user preferences (suitable for
GENDER)\n{{Identical|Username}}",
"revisionslider-minoredit": "Text labeling a minor edit.",
+ "revisionslider-loading-placeholder": "Message shown while the
RevisionSlider is still loading on a diff page. Once loaded the message is
removed.",
"revisionslider-loading-failed": "Message shown if the RevisionSlider
fails to initially load.",
"revisionslider-toggle-title-expand": "Message shown as a \"title\" of
the exand button",
"revisionslider-toggle-title-collapse": "Message shown as a \"title\"
of the collapse button",
diff --git a/src/RevisionSliderHooks.php b/src/RevisionSliderHooks.php
index 2cabf66..39913ec 100644
--- a/src/RevisionSliderHooks.php
+++ b/src/RevisionSliderHooks.php
@@ -89,8 +89,6 @@
] );
$toggleButton->setAttributes( [ 'style' => 'width: 100%;
text-align: center;' ] );
- $progressBar = new OOUI\ProgressBarWidget( [ 'progress' =>
false ] );
-
$out->prependHTML(
Html::rawElement(
'div', [ 'class' => 'mw-revslider-container' ],
@@ -103,7 +101,7 @@
],
Html::rawElement(
'div', [ 'class' =>
'mw-revslider-placeholder' ],
- $progressBar
+ ( new Message(
'revisionslider-loading-placeholder' ) )->text()
)
)
)
--
To view, visit https://gerrit.wikimedia.org/r/354662
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f4e67b617fc410365b664087a1f0abc0691ac4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: REL1_27
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Ema has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354680 )
Change subject: Instrumentation fixes
..
Instrumentation fixes
- introduce a new global configuration option, 'instrumentation_ips', to
specify the IPs on which to bind the instrumentation TCP port
- use Content-Type: text/plain by default, application/json when returning
JSON content
- do not mention the URL in 404 response
Bug: T103882
Change-Id: Iedb821ef17234eb5825f6641d4eda0e0b5a41503
---
M pybal/instrumentation.py
M pybal/pybal.py
M pybal/test/test_instrumentation.py
3 files changed, 32 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal
refs/changes/80/354680/1
diff --git a/pybal/instrumentation.py b/pybal/instrumentation.py
index a2a88c0..da04b11 100644
--- a/pybal/instrumentation.py
+++ b/pybal/instrumentation.py
@@ -20,9 +20,13 @@
def wantJson(request):
-return (request.requestHeaders.hasHeader('Accept')
-and 'application/json' in
-request.requestHeaders.getRawHeaders('Accept'))
+if (request.requestHeaders.hasHeader('Accept')
+and 'application/json' in
request.requestHeaders.getRawHeaders('Accept')):
+request.responseHeaders.addRawHeader(b"content-type",
b"application/json")
+return True
+else:
+request.responseHeaders.addRawHeader(b"content-type", b"text/plain")
+return False
class Resp404(Resource):
@@ -31,7 +35,7 @@
def render_GET(self, request):
request.setResponseCode(404)
msg = {'error':
- "The desired url {} was not found".format(request.uri)}
+ "The desired url was not found"}
if wantJson(request):
return json.dumps(msg)
else:
diff --git a/pybal/pybal.py b/pybal/pybal.py
index 1521222..55f112e 100755
--- a/pybal/pybal.py
+++ b/pybal/pybal.py
@@ -625,9 +625,18 @@
# Run the web server for instrumentation
if configdict.getboolean('instrumentation', False):
from twisted.web.server import Site
-port = configdict.getint('instrumentation_port', 9090)
factory = Site(instrumentation.ServerRoot())
-reactor.listenTCP(port, factory)
+
+port = configdict.getint('instrumentation_port', 9090)
+
+# Bind on the IPs listed in 'instrumentation_ips'. Default to
+# localhost v4 and v6 if no IPs have been specified in the
+# configuration.
+instrumentation_ips = eval(configdict.get(
+'instrumentation_ips', '["127.0.0.1", "::1"]'))
+
+for ipaddr in instrumentation_ips:
+reactor.listenTCP(port, factory, interface=ipaddr)
reactor.run()
finally:
diff --git a/pybal/test/test_instrumentation.py
b/pybal/test/test_instrumentation.py
index da03734..326b8d6 100644
--- a/pybal/test/test_instrumentation.py
+++ b/pybal/test/test_instrumentation.py
@@ -184,8 +184,9 @@
def test_404(self):
"""Test case for an non-existent base url"""
-hdr, _ = self._httpReq(uri='/test')
+hdr, body = self._httpReq(uri='/test')
self.assertTrue(hdr.startswith('HTTP/1.1 404 Not Found'))
+self.assertEquals(body, 'The desired url was not found')
def test_pool(self):
"""Test case for requesting a specific pool"""
@@ -210,5 +211,16 @@
hdr, _ = self._httpReq(uri='/pools/test_pool0/mw1011')
self.assertTrue(hdr.startswith('HTTP/1.1 404 Not Found'))
+def test_content_type_text_plain(self):
+hdr, _ = self._httpReq(uri='/pools/test_pool0')
+self.assertTrue(hdr.startswith('HTTP/1.1 200 OK'))
+self.assertTrue("Content-Type: text/plain" in hdr)
+
+def test_content_type_application_json(self):
+hdr, _ = self._httpReq(uri='/pools/test_pool0',
+ headers={'Accept': 'application/json'})
+self.assertTrue(hdr.startswith('HTTP/1.1 200 OK'))
+self.assertTrue("Content-Type: application/json" in hdr)
+
def tearDown(self):
self.proto.connectionLost(Failure(TypeError("whatever")))
--
To view, visit https://gerrit.wikimedia.org/r/354680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedb821ef17234eb5825f6641d4eda0e0b5a41503
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Ema
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Siebrand has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354681 )
Change subject: Add support for Northern Thai
..
Add support for Northern Thai
Per request at
https://translatewiki.net/wiki/Thread:Support/New_localization_project_for_nod
Change-Id: Ia01893ceb014da66ef8f5a9c61e36b3228031273
---
M FallbackSettings.php
M LanguageSettings.php
2 files changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/81/354681/1
diff --git a/FallbackSettings.php b/FallbackSettings.php
index 218d6ce..18dabc1 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -88,6 +88,7 @@
$wgTranslateLanguageFallbacks['nds'] = [ 'da', 'nl', 'nds-nl', 'pdt' ];
$wgTranslateLanguageFallbacks['nds-nl'] = [ 'nds', 'pdt' ];
$wgTranslateLanguageFallbacks['njo'] = [ 'as', 'hi' ];
+$wgTranslateLanguageFallbacks['nod'] = 'th'; # Siebrand 2017-05-20
$wgTranslateLanguageFallbacks['nl-be'] = [ 'nl' ];
$wgTranslateLanguageFallbacks['nl-informal'] = [ 'nl' ];
$wgTranslateLanguageFallbacks['nn'] = [ 'nb', 'sv', 'da' ]; # Siebrand
2008-02-18
diff --git a/LanguageSettings.php b/LanguageSettings.php
index e2ef200..5689923 100644
--- a/LanguageSettings.php
+++ b/LanguageSettings.php
@@ -59,6 +59,7 @@
$wgExtraLanguageNames['mwv'] = 'Behase Mentawei'; # Mentawai / Siebrand
2008-05-07
$wgExtraLanguageNames['mww-latn'] = 'Hmoob Dawb'; # Hmong Daw / Siebrand
2013-12-02
$wgExtraLanguageNames['njo'] = 'Ao'; # Ao Naga
+$wgExtraLanguageNames['nod'] = 'คำเมือง'; # Northern Thai / Siebrand 2017-05-20
$wgExtraLanguageNames['nqo'] = 'ߒߞߏ'; # N'Ko / Siebrand 2011-01-11
$wgExtraLanguageNames['nys'] = 'Nyungar'; # Nyungar / Amir 2017-03-31
$wgExtraLanguageNames['ovd'] = 'övdalsk'; # Övdalian / Siebrand 2017-05-20
--
To view, visit https://gerrit.wikimedia.org/r/354681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia01893ceb014da66ef8f5a9c61e36b3228031273
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Krinkle has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354682 )
Change subject: OutputPage: Move hardcoded default modules to
Skin::getDefaultModules
..
OutputPage: Move hardcoded default modules to Skin::getDefaultModules
These modules should not be hardcoded in OutputPage::output() which
makes them impossible to override and also very hard to retreive
through the API for action=parse. Move these instead to Skin which
is where all other default module loading happens already.
Moving these modules is in preparation for customising ApiParse
to support "really" returning all would-be loaded modules on a page
when setting 'useskin', which is also needed for Live Preview
and in theory for ajax navigation and other scenarios where there
is a delay between the "initial" page rendering, and a later re-render
which may not have all all the necessary modules.
Bug: T130632
Change-Id: Ic4afccf0cd0d428d7fbc36d4e747415af3ab49f5
---
M includes/OutputPage.php
M includes/skins/Skin.php
2 files changed, 15 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/354682/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index e71cf18..ff80f1e 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2405,26 +2405,10 @@
}
$sk = $this->getSkin();
- // add skin specific modules
- $modules = $sk->getDefaultModules();
-
- // Enforce various default modules for all pages and
all skins
- $coreModules = [
- // Keep this list as small as possible
- 'site',
- 'mediawiki.page.startup',
- 'mediawiki.user',
- ];
-
- // Support for high-density display images if enabled
- if ( $config->get( 'ResponsiveImages' ) ) {
- $coreModules[] = 'mediawiki.hidpi';
- }
-
- $this->addModules( $coreModules );
- foreach ( $modules as $group ) {
+ foreach ( $sk->getDefaultModules() as $group ) {
$this->addModules( $group );
}
+
MWDebug::addModules( $this );
// Avoid PHP 7.1 warning of passing $this by reference
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 7f00767..21c94f9 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -160,6 +160,14 @@
$out = $this->getOutput();
$user = $out->getUser();
$modules = [
+ // modules not specific to any specific skin or page
+ 'core' => [
+ // Enforce various default modules for all
pages and all skins
+ // Keep this list as small as possible
+ 'site',
+ 'mediawiki.page.startup',
+ 'mediawiki.user',
+ ],
// modules that enhance the page content in some way
'content' => [
'mediawiki.page.ready',
@@ -172,6 +180,11 @@
'user' => [],
];
+ // Support for high-density display images if enabled
+ if ( $config->get( 'ResponsiveImages' ) ) {
+ $modules['core'][] = 'mediawiki.hidpi';
+ }
+
// Preload jquery.tablesorter for mediawiki.page.ready
if ( strpos( $out->getHTML(), 'sortable' ) !== false ) {
$modules['content'][] = 'jquery.tablesorter';
--
To view, visit https://gerrit.wikimedia.org/r/354682
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic4afccf0cd0d428d7fbc36d4e747415af3ab49f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354681 )
Change subject: Add support for Northern Thai
..
Add support for Northern Thai
Per request at
https://translatewiki.net/wiki/Thread:Support/New_localization_project_for_nod
Change-Id: Ia01893ceb014da66ef8f5a9c61e36b3228031273
---
M FallbackSettings.php
M LanguageSettings.php
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/FallbackSettings.php b/FallbackSettings.php
index 218d6ce..18dabc1 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -88,6 +88,7 @@
$wgTranslateLanguageFallbacks['nds'] = [ 'da', 'nl', 'nds-nl', 'pdt' ];
$wgTranslateLanguageFallbacks['nds-nl'] = [ 'nds', 'pdt' ];
$wgTranslateLanguageFallbacks['njo'] = [ 'as', 'hi' ];
+$wgTranslateLanguageFallbacks['nod'] = 'th'; # Siebrand 2017-05-20
$wgTranslateLanguageFallbacks['nl-be'] = [ 'nl' ];
$wgTranslateLanguageFallbacks['nl-informal'] = [ 'nl' ];
$wgTranslateLanguageFallbacks['nn'] = [ 'nb', 'sv', 'da' ]; # Siebrand
2008-02-18
diff --git a/LanguageSettings.php b/LanguageSettings.php
index e2ef200..5689923 100644
--- a/LanguageSettings.php
+++ b/LanguageSettings.php
@@ -59,6 +59,7 @@
$wgExtraLanguageNames['mwv'] = 'Behase Mentawei'; # Mentawai / Siebrand
2008-05-07
$wgExtraLanguageNames['mww-latn'] = 'Hmoob Dawb'; # Hmong Daw / Siebrand
2013-12-02
$wgExtraLanguageNames['njo'] = 'Ao'; # Ao Naga
+$wgExtraLanguageNames['nod'] = 'คำเมือง'; # Northern Thai / Siebrand 2017-05-20
$wgExtraLanguageNames['nqo'] = 'ߒߞߏ'; # N'Ko / Siebrand 2011-01-11
$wgExtraLanguageNames['nys'] = 'Nyungar'; # Nyungar / Amir 2017-03-31
$wgExtraLanguageNames['ovd'] = 'övdalsk'; # Övdalian / Siebrand 2017-05-20
--
To view, visit https://gerrit.wikimedia.org/r/354681
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia01893ceb014da66ef8f5a9c61e36b3228031273
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354689 )
Change subject: Add support for Nicaraguan Spanish
..
Add support for Nicaraguan Spanish
Per request at
https://translatewiki.net/wiki/Thread:Support/espa%C3%B1ol_nicarag%C3%BCense
Change-Id: I5d61c8289335596f442429e7c4ccb28b45b9920e
---
M FallbackSettings.php
M LanguageSettings.php
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/FallbackSettings.php b/FallbackSettings.php
index 18dabc1..b20af4e 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -33,6 +33,7 @@
$wgTranslateLanguageFallbacks['egl'] = [ 'it', 'rgn' ];
$wgTranslateLanguageFallbacks['es-formal'] = 'es';
$wgTranslateLanguageFallbacks['es-mx'] = 'es';
+$wgTranslateLanguageFallbacks['es-ni'] = 'es'; # Siebrand 2017-05-20
$wgTranslateLanguageFallbacks['et'] = 'fi';
$wgTranslateLanguageFallbacks['fax'] = 'es';
$wgTranslateLanguageFallbacks['fi'] = [ 'de', 'sv', 'et', 'vro' ];
diff --git a/LanguageSettings.php b/LanguageSettings.php
index 5689923..f6fe5f6 100644
--- a/LanguageSettings.php
+++ b/LanguageSettings.php
@@ -106,5 +106,6 @@
$wgExtraLanguageNames['zgh'] = 'ⵜⴰⵎⴰⵣⵉⵖⵜ'; # Standard Moroccan Tamazight /
Siebrand 2014-03-11
$wgExtraLanguageNames['nl-be'] = 'nl-be'; # Nikerabbit 2008-xx-xx - For FreeCol
$wgExtraLanguageNames['es-mx'] = 'español de México'; # Mexico; for iNaturalist
+$wgExtraLanguageNames['es-ni'] = 'español nicaragüense'; # Nicaraguan Spanish
$wgExtraLanguageNames['qqq'] = 'Message documentation'; # No linguistic
content. Used for documenting messages
$wgExtraLanguageNames['ike'] = 'ᐃᓄᒃᑎᑐᑦ/inuktitut'; # Dummy to have portal
appear in Special:SupportedLanguages
--
To view, visit https://gerrit.wikimedia.org/r/354689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d61c8289335596f442429e7c4ccb28b45b9920e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354699 )
Change subject: Remove untranslated "editinguser" message from tyv (tuvinian)
..
Remove untranslated "editinguser" message from tyv (tuvinian)
https://translatewiki.net/wiki/Thread:Support/MediaWiki:Editinguser/tyv
Change-Id: I7ac5da1d7bfeca09e88a8f7dc13073eed0195e69
---
M languages/i18n/tyv.json
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/languages/i18n/tyv.json b/languages/i18n/tyv.json
index 9b9a469..fd51e98 100644
--- a/languages/i18n/tyv.json
+++ b/languages/i18n/tyv.json
@@ -480,7 +480,6 @@
"prefs-signature": "Хол үжүү",
"prefs-diffs": "Ылгалдар",
"editusergroup": "Ажыглакчының бөлгүмнерни өскертири",
- "editinguser": "Changing user rights of user '''[[User:$1|$1]]'''
([[User
talk:$1|{{int:talkpagelinktext}}]]{{int:pipe-separator}}[[Special:Contributions/$1|{{int:contribslink}}]])",
"userrights-editusergroup": "Ажыглакчының бөлгүмнерни өскертири",
"saveusergroups": "{{GENDER:$1|Ажыглакчының|Ажыглакчының}} бөлгүмнерин
шыгжаар",
"userrights-reason": "Чылдагаан:",
--
To view, visit https://gerrit.wikimedia.org/r/354699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ac5da1d7bfeca09e88a8f7dc13073eed0195e69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354709 )
Change subject: fix undefined data_dumper
..
fix undefined data_dumper
was causing api.php?action=dump=wikipedias=csv for example not to
work
[Sat May 20 14:36:00.131779 2017] [:error] [pid 24238] [client
10.68.21.68:37570] PHP Fatal error: Uncaught Error: Call to undefined function
data_dumper() in /var/www/wikistats/api.php:51\nStack trace:\n#0 {main}\n
thrown in /var/www/wikistats/api.php on line 51
Bug: T165879
Change-Id: I6f5878e3e2675d89edc02370babd8250e6ab33b1
---
0 files changed, 0 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/wikistats
refs/changes/09/354709/1
--
To view, visit https://gerrit.wikimedia.org/r/354709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f5878e3e2675d89edc02370babd8250e6ab33b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/wikistats
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Aude has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354713 )
Change subject: Use PageImages::PROP_NAME_FREE page prop for commons media
values
..
Use PageImages::PROP_NAME_FREE page prop for commons media values
page_image / page_image_free page prop is only set for commons media
property values.
Wikimedia Commons has policy of only hosting free images:
https://meta.wikimedia.org/wiki/Non-free_content#Other_projects
So we should be able to use PageImages::PROP_NAME_FREE page prop.
(see also T156190 which would allow configuring Wikidata to
get retrieve free or 'any' (the old 'page_image') images from
the pageprop query api, to help fix Special:Nearby, mobile search
suggestions, etc. without having to purge pages to update the
page prop.)
Bug: T159678
Change-Id: I5317b5fdafde0331d33f3d8182682e528c312424
---
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/13/354713/1
diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index a01b476..82db285 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -191,7 +191,7 @@
if ( !empty( $this->preferredPageImagesProperties ) &&
class_exists( 'PageImages' ) ) {
$updaters[] = new PageImagesDataUpdater(
$this->preferredPageImagesProperties,
- PageImages::PROP_NAME
+ PageImages::PROP_NAME_FREE
);
}
--
To view, visit https://gerrit.wikimedia.org/r/354713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5317b5fdafde0331d33f3d8182682e528c312424
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Florianschmidtwelzow has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354720 )
Change subject: Request information from site via API
..
Request information from site via API
Instead of requiring people to insert information about their site,
with this change, the user can input the path to the api.php (without
the api.php) and save to request the information of the wiki.
Change-Id: Ie96c40413c21931a773b4082ca0934dbc0c925ca
---
M
app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
A app/src/main/java/org/wikipedia/settings/SiteInfo.java
M app/src/main/res/values/dev_settings_strings.xml
M app/src/main/res/xml/developer_preferences.xml
4 files changed, 159 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/20/354720/1
diff --git
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
index 6d5329a3..78a034a 100644
---
a/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
+++
b/app/src/main/java/org/wikipedia/settings/DeveloperSettingsPreferenceLoader.java
@@ -1,7 +1,13 @@
package org.wikipedia.settings;
+import android.app.Dialog;
+import android.app.ProgressDialog;
import android.content.Context;
+import android.content.DialogInterface;
import android.support.annotation.NonNull;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.preference.EditTextPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceFragmentCompat;
@@ -10,10 +16,26 @@
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
import org.wikipedia.crash.RemoteLogException;
+import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.dataclient.mwapi.MwException;
+import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import org.wikipedia.dataclient.retrofit.RetrofitException;
+import org.wikipedia.dataclient.retrofit.RetrofitFactory;
+import org.wikipedia.login.LoginClient;
import org.wikipedia.useroption.ui.UserOptionRowActivity;
import org.wikipedia.util.log.L;
+import java.io.IOException;
import java.util.List;
+import java.util.Map;
+
+import retrofit2.Call;
+import retrofit2.Response;
+import retrofit2.Retrofit;
+import retrofit2.http.Field;
+import retrofit2.http.FormUrlEncoded;
+import retrofit2.http.GET;
+import retrofit2.http.POST;
/*package*/ class DeveloperSettingsPreferenceLoader extends
BasePreferenceLoader {
@NonNull private final Context context;
@@ -50,6 +72,74 @@
setUpCrashButton(findPreference(getCrashButtonKey()));
setUpUserOptionButton(findPreference(getUserOptionButtonKey()));
setUpRemoteLogButton(findPreference(R.string.preference_key_remote_log));
+setUpMediaWikiBaseUri((EditTextPreference)
findPreference(R.string.preference_key_mediawiki_base_uri));
+}
+
+private void setUpMediaWikiBaseUri(final EditTextPreference pref) {
+pref.setOnPreferenceChangeListener(new
Preference.OnPreferenceChangeListener() {
+private static final String API_PHP_FILENAME = "api.php";
+
+@Override
+public boolean onPreferenceChange(Preference preference, final
Object newValue) {
+String apiUrl = (String) newValue;
+if (apiUrl.endsWith(API_PHP_FILENAME)) {
+apiUrl = apiUrl.replace(API_PHP_FILENAME, "");
+}
+final ProgressDialog dialog = ProgressDialog.show(
+getActivity(),
+"",
+
getActivity().getString(R.string.dialog_loading_siteinfo_wait),
+true
+);
+
+Retrofit retrofitClient = RetrofitFactory.newInstance(apiUrl,
new WikiSite(apiUrl));
+Service request = retrofitClient.create(Service.class);
+Call call =
request.requestSiteinfo();
+call.enqueue(new
retrofit2.Callback() {
+@Override public void
onResponse(Call call,
+
Response response) {
+if (response.isSuccessful()) {
+if (response.body().query().server() != null) {
+pref.setText(response.body().query().server());
+}
+} else {
+showAlert(getActivity().getString(
+R.string.dialog_loading_siteinfo_failed,
+Integer.toString(response.code())
+
Multichill has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354719 )
Change subject: Page might have been moved without redirect or deleted. Test if
the page actually exists.
..
Page might have been moved without redirect or deleted.
Test if the page actually exists.
Bug: T86491
Change-Id: Id5b6b0799bcac2aa69b26e9e8a7dd86e282f95c9
---
M scripts/newitem.py
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/19/354719/1
diff --git a/scripts/newitem.py b/scripts/newitem.py
index 5ee4901..ffdb423 100755
--- a/scripts/newitem.py
+++ b/scripts/newitem.py
@@ -94,6 +94,9 @@
self.current_page = page
+if not page.exists():
+pywikibot.output(u'%s does not exist. Skipping.' % page)
+return
if page.isRedirectPage():
pywikibot.output(u'%s is a redirect page. Skipping.' % page)
return
--
To view, visit https://gerrit.wikimedia.org/r/354719
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5b6b0799bcac2aa69b26e9e8a7dd86e282f95c9
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Multichill
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354718 )
Change subject: rebaser: Focus surface on load
..
rebaser: Focus surface on load
Change-Id: I5c7a921de014e5ad70063c6b46db6c23067af435
---
M rebaser/demo.js
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/18/354718/1
diff --git a/rebaser/demo.js b/rebaser/demo.js
index 83fbf4a..b5553f5 100644
--- a/rebaser/demo.js
+++ b/rebaser/demo.js
@@ -16,6 +16,7 @@
target.addSurface( ve.dm.converter.getModelFromDom(
ve.createDocumentFromHtml( '' ) ) );
synchronizer = new ve.dm.SurfaceSynchronizer( target.surface.model,
ve.docName );
target.surface.view.setSynchronizer( synchronizer );
+ target.surface.view.focus();
authorList = new ve.ui.AuthorListWidget( synchronizer );
--
To view, visit https://gerrit.wikimedia.org/r/354718
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c7a921de014e5ad70063c6b46db6c23067af435
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/353493 )
Change subject: Replace CodeMirror icons with new icons (#36C)
..
Replace CodeMirror icons with new icons (#36C)
Bug: T164441
Change-Id: I2e185dfa468ede51bd1a0e41b3b4dcf43a74313c
---
M resources/ext.CodeMirror.js
M resources/ext.CodeMirror.less
A resources/images/cm-icon.png
A resources/images/cm-icon.svg
M resources/images/cm-off.png
M resources/images/cm-off.svg
M resources/images/cm-on.png
M resources/images/cm-on.svg
M resources/images/old-cm-off.png
M resources/images/old-cm-off.svg
M resources/images/old-cm-on.png
M resources/images/old-cm-on.svg
12 files changed, 55 insertions(+), 264 deletions(-)
Approvals:
jenkins-bot: Verified
Kaldari: Looks good to me, approved
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index ed1ae7d..7f766dd 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -242,34 +242,40 @@
* Adds the CodeMirror button to WikiEditor
*/
function addCodeMirrorToWikiEditor() {
- if ( $( '#wikiEditor-section-main' ).length > 0 ) {
- $( '#wpTextbox1' ).wikiEditor(
- 'addToToolbar',
- {
- section: 'main',
- groups: {
- codemirror: {
- tools: {
- CodeMirror: {
- label:
mw.msg( 'codemirror-toggle-label' ),
- type:
'button',
- offset:
[ 2, 2 ],
- action:
{
-
type: 'callback',
-
execute: function ( context ) {
-
// eslint-disable-next-line no-use-before-define
-
switchCodeMirror( context );
-
}
+ var $codeMirrorButton;
+
+ $( '#wpTextbox1' ).wikiEditor(
+ 'addToToolbar',
+ {
+ section: 'main',
+ groups: {
+ codemirror: {
+ tools: {
+ CodeMirror: {
+ label: mw.msg(
'codemirror-toggle-label' ),
+ type: 'button',
+ action: {
+ type:
'callback',
+
execute: function () {
+
// eslint-disable-next-line no-use-before-define
+
switchCodeMirror();
}
}
}
}
}
}
- );
- // eslint-disable-next-line no-use-before-define
- updateToolbarButton( $( '#wpTextbox1' ).data(
'wikiEditor-context' ) );
- }
+ }
+ );
+
+ $codeMirrorButton = $( '#wpTextbox1' ).data(
'wikiEditor-context' ).modules.toolbar.$toolbar.find( 'a.tool[rel=CodeMirror]'
);
+ // FIXME in
extensions/WikiEditor/modules/jquery.wikiEditor.toolbar.js
+ $codeMirrorButton
+ .css( 'background-image', '' )
+ .attr( 'id', 'mw-editbutton-codemirror' );
+
+ // eslint-disable-next-line no-use-before-define
+ updateToolbarButton();
}
// define JQuery hook for searching and replacing text using JS if
CodeMirror is enabled, see Bug: T108711
@@ -309,27 +315,17 @@
/**
* Updates CodeMirror
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354672 )
Change subject: Add support for Övdalian (ovd)
..
Add support for Övdalian (ovd)
Per request at
https://translatewiki.net/wiki/Thread:Support/Request_for_new_language:_Elfdalian_(ovd)
Change-Id: Idf331dafb47870274d3565d0d8af27205387efd6
---
M FallbackSettings.php
M LanguageSettings.php
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/FallbackSettings.php b/FallbackSettings.php
index 5a5a924..5b75b73 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -93,6 +93,7 @@
$wgTranslateLanguageFallbacks['nn'] = [ 'nb', 'sv', 'da' ]; # Siebrand
2008-02-18
$wgTranslateLanguageFallbacks['nb'] = [ 'nn', 'da', 'sv' ]; # Siebrand
2008-02-18
$wgTranslateLanguageFallbacks['olo'] = [ 'ru' ]; # Mjbmr 2015-08-06
+$wgTranslateLanguageFallbacks['ovd'] = [ 'se' ]; # Mjbmr 2017-05-20
$wgTranslateLanguageFallbacks['pbb'] = [ 'es' ];
$wgTranslateLanguageFallbacks['pdt'] = [ 'de' ];
$wgTranslateLanguageFallbacks['ppl'] = [ 'es' ];
diff --git a/LanguageSettings.php b/LanguageSettings.php
index eea6133..44ffc85 100644
--- a/LanguageSettings.php
+++ b/LanguageSettings.php
@@ -60,6 +60,7 @@
$wgExtraLanguageNames['njo'] = 'Ao'; # Ao Naga
$wgExtraLanguageNames['nqo'] = 'ߒߞߏ'; # N'Ko / Siebrand 2011-01-11
$wgExtraLanguageNames['nys'] = 'Nyungar'; # Nyungar / Amir 2017-03-31
+$wgExtraLanguageNames['ovd'] = 'övdalsk'; # Övdalian / Siebrand 2017-05-20
$wgExtraLanguageNames['pbb'] = 'Nasa Yuwe'; # Páez / Siebrand 2013-08-08
$wgExtraLanguageNames['pis'] = 'Pijin'; # Pijin / Siebrand 2011-08-25
$wgExtraLanguageNames['pko'] = 'Pökoot'; # Pökoot
--
To view, visit https://gerrit.wikimedia.org/r/354672
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf331dafb47870274d3565d0d8af27205387efd6
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Siebrand
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Bartosz Dziewoński has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354679 )
Change subject: ve.ui.TableLineContext: Fancier popups
..
ve.ui.TableLineContext: Fancier popups
Remove the custom positioning and let the popups position themselves
next to the indicator.
Bug: T165865
Change-Id: I1335890b1c03059db33f9da362c43ae565de2939
---
M src/ce/nodes/ve.ce.TableNode.js
M src/ui/contexts/ve.ui.TableLineContext.js
M src/ui/styles/ve.ui.TableLineContext.css
3 files changed, 2 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/79/354679/1
diff --git a/src/ce/nodes/ve.ce.TableNode.js b/src/ce/nodes/ve.ce.TableNode.js
index 366fd2d..3fdafae 100644
--- a/src/ce/nodes/ve.ce.TableNode.js
+++ b/src/ce/nodes/ve.ce.TableNode.js
@@ -482,17 +482,11 @@
this.colContext.indicator.$element.css( {
width: selectionOffset.width
} );
- this.colContext.popup.$element.css( {
- 'margin-left': selectionOffset.width / 2
- } );
this.rowContext.$element.css( {
top: selectionOffset.top
} );
this.rowContext.indicator.$element.css( {
height: selectionOffset.height
- } );
- this.rowContext.popup.$element.css( {
- 'margin-top': selectionOffset.height / 2
} );
// Classes
diff --git a/src/ui/contexts/ve.ui.TableLineContext.js
b/src/ui/contexts/ve.ui.TableLineContext.js
index 8694aab..6eb3061 100644
--- a/src/ui/contexts/ve.ui.TableLineContext.js
+++ b/src/ui/contexts/ve.ui.TableLineContext.js
@@ -33,7 +33,8 @@
} );
this.popup = new OO.ui.PopupWidget( {
classes: [ 've-ui-tableLineContext-menu' ],
- $container: this.surface.$element,
+ $floatableContainer: this.indicator.$element,
+ position: itemGroup === 'col' ? 'below' : 'after',
width: 180
} );
diff --git a/src/ui/styles/ve.ui.TableLineContext.css
b/src/ui/styles/ve.ui.TableLineContext.css
index cdb355e..0033594 100644
--- a/src/ui/styles/ve.ui.TableLineContext.css
+++ b/src/ui/styles/ve.ui.TableLineContext.css
@@ -34,10 +34,3 @@
margin-left: -1.2em;
border-right: 0;
}
-
-/* Position the row context menu popup anchor below the center of the
indicator */
-.ve-ui-tableLineContext-row .oo-ui-popupWidget {
- /* Gap + half context width: 0.2em + 1em/2 */
- left: -0.7em;
- top: 0.4em;
-}
--
To view, visit https://gerrit.wikimedia.org/r/354679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1335890b1c03059db33f9da362c43ae565de2939
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354546 )
Change subject: Update ve.ui.MWWikitextStringTransferHandler.test results for
wrapping
..
Update ve.ui.MWWikitextStringTransferHandler.test results for wrapping
Change-Id: I782d13187e30d9a871b9805ee28e8a43eae6c61e
Depends-On: Ibd21e6a78c3958db1c0ec8f0317c4c07f3fa5735
---
M modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
b/modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
index 9072a8e..4479eae 100644
--- a/modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
+++ b/modules/ve-cite/tests/ve.ui.MWWikitextStringTransferHandler.test.js
@@ -31,6 +31,7 @@
'',
annotations: [],
expectedData: [
+ { type: 'paragraph' },
{
type: 'mwReference',
attributes: {
@@ -51,6 +52,7 @@
}
},
{ type: '/mwReference' },
+ { type: '/paragraph' },
{ type: 'internalList' },
{ type: 'internalItem' },
{ type: 'paragraph', internal: {
generated: 'wrapper' } },
--
To view, visit https://gerrit.wikimedia.org/r/354546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I782d13187e30d9a871b9805ee28e8a43eae6c61e
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Esanders
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/330041 )
Change subject: Map MediaWiki's fake language codes to real ones
..
Map MediaWiki's fake language codes to real ones
'My understanding of the problem is that when someone uses
{{#babel:zh-classical}}, the extension puts the user into "Category:User
zh-classical" instead of into "Category:User lzh" even though they mean
the same thing. Instead, it should understand that zh-classical is a
legacy code and convert it to lzh, to avoid duplicate categories.'
-- Nikki at the phab task
Bug: T101086
Depends-On: If73c74ee87d8235381449cab7dcd9f46b0f23590
Change-Id: I1ae053574805e4d118389f6bbf6dcf391fbed73b
---
M BabelLanguageCodes.class.php
M tests/phpunit/BabelLanguageCodesTest.php
2 files changed, 12 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
Nikerabbit: Looks good to me, approved
diff --git a/BabelLanguageCodes.class.php b/BabelLanguageCodes.class.php
index dfd2e73..41586de 100644
--- a/BabelLanguageCodes.class.php
+++ b/BabelLanguageCodes.class.php
@@ -21,11 +21,22 @@
* @return string|bool Language code, or false for invalid language
code.
*/
public static function getCode( $code ) {
+ // Is the code one of MediaWiki's legacy fake codes? If so,
return the modern
+ // equivalent code (T101086)
+ if ( method_exists( 'LanguageCode', 'getDeprecatedCodeMapping'
) ) {
+ $mapping = LanguageCode::getDeprecatedCodeMapping();
+ if ( isset( $mapping[strtolower( $code )] ) ) {
+ return $mapping[strtolower( $code )];
+ }
+ }
+
+ // Is the code known to MediaWiki?
$mediawiki = Language::fetchLanguageName( $code );
if ( $mediawiki !== '' ) {
return $code;
}
+ // Otherwise, fall back to the ISO 639 codes database
$codes = false;
try {
$codesCdb = Cdb\Reader::open( __DIR__ . '/codes.cdb' );
diff --git a/tests/phpunit/BabelLanguageCodesTest.php
b/tests/phpunit/BabelLanguageCodesTest.php
index 64cebec..624b65b 100644
--- a/tests/phpunit/BabelLanguageCodesTest.php
+++ b/tests/phpunit/BabelLanguageCodesTest.php
@@ -29,6 +29,7 @@
[ 'eng', 'en' ],
[ 'en-gb', 'en-gb' ],
[ 'de', 'de' ],
+ [ 'be-x-old', 'be-tarask' ],
];
}
--
To view, visit https://gerrit.wikimedia.org/r/330041
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ae053574805e4d118389f6bbf6dcf391fbed73b
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Babel
Gerrit-Branch: master
Gerrit-Owner: TTO
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Liuxinyu970226 <541329...@qq.com>
Gerrit-Reviewer: Nemo bis
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: TTO
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Srishakatux has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354694 )
Change subject: Added space between brackets in the NewsLetterEditPage.php
..
Added space between brackets in the NewsLetterEditPage.php
Bug: T159081
Change-Id: I8f8bf480df5ce6e84ad16ba37ed8e6fd1f071c99
---
M includes/NewsletterEditPage.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/94/354694/1
diff --git a/includes/NewsletterEditPage.php b/includes/NewsletterEditPage.php
index 1f8dedf..a945778 100644
--- a/includes/NewsletterEditPage.php
+++ b/includes/NewsletterEditPage.php
@@ -215,7 +215,7 @@
$rows = $dbr->select(
'nl_newsletters',
[ 'nl_name', 'nl_main_page_id', 'nl_active' ],
- $dbr->makeList([
+ $dbr->makeList( [
'nl_name' => $data['Name'],
$dbr->makeList(
[
--
To view, visit https://gerrit.wikimedia.org/r/354694
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f8bf480df5ce6e84ad16ba37ed8e6fd1f071c99
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Srishakatux
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Nikerabbit has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343899 )
Change subject: QueryAggregator: Add userAgent to make it easy to identify
Translate
..
QueryAggregator: Add userAgent to make it easy to identify Translate
Change-Id: I68fd14e4edd848aae97f4fe7b23a7d96df5873a2
---
M webservices/QueryAggregator.php
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Siebrand: Looks good to me, approved
diff --git a/webservices/QueryAggregator.php b/webservices/QueryAggregator.php
index a02a8ee..d1ba5cf 100644
--- a/webservices/QueryAggregator.php
+++ b/webservices/QueryAggregator.php
@@ -52,9 +52,14 @@
* Runs all the queries.
*/
public function run() {
+ global $wgSitename;
+
+ $version = TRANSLATE_VERSION;
+
$http = new MultiHttpClient( [
'reqTimeout' => $this->timeout,
- 'connTimeout' => 3
+ 'connTimeout' => 3,
+ 'userAgent' => "MediaWiki Translate extension $version
for $wgSitename"
] );
$responses = $http->runMulti( $this->getMultiHttpQueries(
$this->queries ) );
foreach ( $responses as $index => $response ) {
--
To view, visit https://gerrit.wikimedia.org/r/343899
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I68fd14e4edd848aae97f4fe7b23a7d96df5873a2
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354690 )
Change subject: Pin a version of pywikibot
..
Pin a version of pywikibot
We will also need to change our environement on labs to use the same
version.
This is a blocker for https://gerrit.wikimedia.org/r/#/c/309858/
Change-Id: Id1cb7016ee10b7604df557b2a9f264be120512da
---
M requirements.txt
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jean-Frédéric: Looks good to me, approved
jenkins-bot: Verified
diff --git a/requirements.txt b/requirements.txt
index 9b2a26e..6f0822c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-pywikibot
+pywikibot==3.0.20170403
MySQL-python
requests
PyYAML
--
To view, visit https://gerrit.wikimedia.org/r/354690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1cb7016ee10b7604df557b2a9f264be120512da
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil
Gerrit-Reviewer: Jean-Frédéric
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/347218 )
Change subject: Improve grammar of message on Special:GoToInterwiki
..
Improve grammar of message on Special:GoToInterwiki
Change-Id: Idd19a8455b82c86cf5a891efb17199fc9f625286
---
M languages/i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index e08a439..c0ca739 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4290,8 +4290,8 @@
"pageid": "page ID $1",
"rawhtml-notallowed": "html tags cannot be used outside of
normal pages.",
"gotointerwiki": "Leaving {{SITENAME}}",
- "gotointerwiki-invalid": "The specified title was invalid.",
- "gotointerwiki-external": "You are about to leave {{SITENAME}} to visit
[[$2]] which is a separate website.\n\n[$1 Click here to continue on to $1].",
+ "gotointerwiki-invalid": "The specified title is invalid.",
+ "gotointerwiki-external": "You are about to leave {{SITENAME}} to visit
[[$2]], which is a separate website.\n\n'''[$1 Continue to $1]'''",
"undelete-cantedit": "You cannot undelete this page as you are not
allowed to edit this page.",
"undelete-cantcreate": "You cannot undelete this page as there is no
existing page with this name and you are not allowed to create this page."
}
--
To view, visit https://gerrit.wikimedia.org/r/347218
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd19a8455b82c86cf5a891efb17199fc9f625286
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TTO
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: TTO
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Halfak has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354707 )
Change subject: Removes revscoring 1.3.10
..
Removes revscoring 1.3.10
Change-Id: Ie21d93978139b6dc4484f875ae5ce3d50063760c
---
D revscoring-1.3.10-py2.py3-none-any.whl
1 file changed, 0 insertions(+), 0 deletions(-)
Approvals:
Halfak: Verified; Looks good to me, approved
diff --git a/revscoring-1.3.10-py2.py3-none-any.whl
b/revscoring-1.3.10-py2.py3-none-any.whl
deleted file mode 100644
index ab2a767..000
--- a/revscoring-1.3.10-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/354707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie21d93978139b6dc4484f875ae5ce3d50063760c
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Halfak
Gerrit-Reviewer: Halfak
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/343134 )
Change subject: Describe group changes for references and references lists
..
Describe group changes for references and references lists
Bug: T160589
Change-Id: Ifccafdf08704f67027dae2703ff2ded809fb6ab7
---
M includes/CiteHooks.php
M modules/ve-cite/i18n/en.json
M modules/ve-cite/i18n/qqq.json
M modules/ve-cite/ve.dm.MWReferenceNode.js
M modules/ve-cite/ve.dm.MWReferencesListNode.js
5 files changed, 46 insertions(+), 6 deletions(-)
Approvals:
Tchanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/CiteHooks.php b/includes/CiteHooks.php
index b011178..e3ee7e6 100644
--- a/includes/CiteHooks.php
+++ b/includes/CiteHooks.php
@@ -151,6 +151,12 @@
"ext.visualEditor.mediawiki"
],
"messages" => [
+ "cite-ve-changedesc-ref-group-both",
+ "cite-ve-changedesc-ref-group-from",
+ "cite-ve-changedesc-ref-group-to",
+ "cite-ve-changedesc-reflist-group-both",
+ "cite-ve-changedesc-reflist-group-from",
+ "cite-ve-changedesc-reflist-group-to",
"cite-ve-dialog-reference-editing-reused",
"cite-ve-dialog-reference-options-group-label",
"cite-ve-dialog-reference-options-group-placeholder",
diff --git a/modules/ve-cite/i18n/en.json b/modules/ve-cite/i18n/en.json
index f3a57bd..6e6f7ae 100644
--- a/modules/ve-cite/i18n/en.json
+++ b/modules/ve-cite/i18n/en.json
@@ -22,6 +22,12 @@
"visualeditor-cite-tool-name-news": "News",
"visualeditor-cite-tool-name-web": "Website",
"cite-tool-definition.json": "null",
+ "cite-ve-changedesc-ref-group-both": "Reference group changed from
\"$1\" to \"$2\"",
+ "cite-ve-changedesc-ref-group-from": "Reference group changed from
\"$1\" to the general group",
+ "cite-ve-changedesc-ref-group-to": "Reference group changed from the
general group to \"$1\"",
+ "cite-ve-changedesc-reflist-group-both": "References list group changed
from \"$1\" to \"$2\"",
+ "cite-ve-changedesc-reflist-group-from": "References list group changed
from \"$1\" to the general group",
+ "cite-ve-changedesc-reflist-group-to": "References list group changed
from the general group to \"$1\"",
"cite-ve-dialog-reference-editing-reused": "This reference is used $1
{{PLURAL:$1|times}} on this page.",
"cite-ve-dialog-reference-options-group-label": "Use this group",
"cite-ve-dialog-reference-options-group-placeholder": "General
references",
@@ -46,4 +52,4 @@
"cite-ve-referenceslist-missingref": "This reference is defined in a
template or other generated block, and for now can only be edited in source
mode.",
"cite-ve-toolbar-group-label": "Cite",
"cite-ve-othergroup-item": "$1 reference"
-}
\ No newline at end of file
+}
diff --git a/modules/ve-cite/i18n/qqq.json b/modules/ve-cite/i18n/qqq.json
index 59efd59..ae99ba8 100644
--- a/modules/ve-cite/i18n/qqq.json
+++ b/modules/ve-cite/i18n/qqq.json
@@ -33,6 +33,12 @@
"visualeditor-cite-tool-name-news": "Title of tool that inserts a
citation for a news.\n{{Identical|News}}",
"visualeditor-cite-tool-name-web": "Title of tool that inserts a
citation for a website.\n{{Identical|Website}}",
"cite-tool-definition.json": "{{ignored}}\nJSON list of objects
detailing each citation with name (key referring to a
visualeditor-cite-tool-name-x message), icon ('ref-cite-book',
'ref-cite-journal', 'ref-cite-news', 'ref-cite-web'), and template
name\n{{Identical|Null}}",
+ "cite-ve-changedesc-ref-group-both": "Description of a reference
changing group\n\nParameters:\n* $1 – the name of the group it was before\n* $2
– the name of the group it is now",
+ "cite-ve-changedesc-ref-group-from": "Description of a reference
changing group to the general group\n\nParameters:\n* $1 – the name of the
group it was before",
+ "cite-ve-changedesc-ref-group-to": "Description of a reference changing
group from the general group\n\nParameters:\n* $1 – the name of the group it is
now",
+ "cite-ve-changedesc-reflist-group-both": "Description of a references
list changing group\n\nParameters:\n* $1 – the name of the group it was
before\n* $2 – the name of the group it is now",
+ "cite-ve-changedesc-reflist-group-from": "Description of a references
list changing group to the general group\n\nParameters:\n* $1 – the name of the
group it was before",
+ "cite-ve-changedesc-reflist-group-to": "Description of a references
list changing group from the general group\n\nParameters:\n* $1 –
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354518 )
Change subject: Ensure the number of fitlered pages respects all filters
..
Ensure the number of fitlered pages respects all filters
This is basically done by using the queries in ApiPageTriageList
except doing a COUNT.
Bug: T165738
Change-Id: Icfd6aea82fb834c1ae93d19cabf1b5c5967396b9
---
M SpecialNewPagesFeed.php
M api/ApiPageTriageList.php
M api/ApiPageTriageStats.php
M i18n/en.json
M i18n/qqq.json
M includes/PageTriageUtil.php
M modules/ext.pageTriage.views.list/ext.pageTriage.listControlNav.js
7 files changed, 112 insertions(+), 120 deletions(-)
Approvals:
jenkins-bot: Verified
Kaldari: Looks good to me, approved
diff --git a/SpecialNewPagesFeed.php b/SpecialNewPagesFeed.php
index a598f96..cba88fd 100644
--- a/SpecialNewPagesFeed.php
+++ b/SpecialNewPagesFeed.php
@@ -229,33 +229,40 @@
<%=
mw.msg( 'pagetriage-filter-second-show-heading' ) %>
-
+
<%= mw.msg( 'pagetriage-filter-no-categories' ) %>
-
+
<%= mw.msg( 'pagetriage-filter-orphan' ) %>
-
+
<%= mw.msg( 'pagetriage-filter-non-autoconfirmed' ) %>
-
+
<%= mw.msg( 'pagetriage-filter-blocked' ) %>
-
+
<%= mw.msg( 'pagetriage-filter-bot-edits' ) %>
-
+
<%= mw.msg( 'pagetriage-filter-user-heading' ) %>
-
+
<%= mw.msg( 'pagetriage-filter-all' ) %>
diff --git a/api/ApiPageTriageList.php b/api/ApiPageTriageList.php
index 87b4b52..160b35d 100644
--- a/api/ApiPageTriageList.php
+++ b/api/ApiPageTriageList.php
@@ -98,24 +98,27 @@
/**
* Return all the page ids in PageTraige matching the specified filters
-* @param $opts array of filtering options
-* @return array an array of ids
+* @param $opts array Array of filtering options
+* @param $count boolean Set to true to return a count instead
+* @return array|int an array of ids or total number of pages
*
-* @Todo - enforce a range of timestamp to reduce tag record scan
+* @todo - enforce a range of timestamp to reduce tag record scan
Nemo bis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354748 )
Change subject: Update jquery.ime from upstream
..
Update jquery.ime from upstream
Change-Id: I39f2b75710896802a68a64a5d292bc0d2fdd8a4c
---
M lib/jquery.ime/jquery.ime.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/48/354748/1
diff --git a/lib/jquery.ime/jquery.ime.js b/lib/jquery.ime/jquery.ime.js
index b431fa7..2817cef 100644
--- a/lib/jquery.ime/jquery.ime.js
+++ b/lib/jquery.ime/jquery.ime.js
@@ -1,4 +1,4 @@
-/*! jquery.ime - v0.1.0+20170509
+/*! jquery.ime - v0.1.0+20170520
* https://github.com/wikimedia/jquery.ime
* Copyright (c) 2017 Santhosh Thottingal; Licensed GPL, MIT */
( function ( $ ) {
--
To view, visit https://gerrit.wikimedia.org/r/354748
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39f2b75710896802a68a64a5d292bc0d2fdd8a4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nemo bis <federicol...@tiscali.it>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/354745 )
Change subject: Fix edit conflict handling in lists.
..
Fix edit conflict handling in lists.
We assume the current DOM is latest, (since the change to allow
duplicate entries), so that should be the base timestamp.
Bug: T165672
Change-Id: Ib2e083cb262cdd0a0377c139709e624a60b6d17c
---
M extension.json
M includes/content/CollaborationListContent.php
M modules/ext.CollaborationKit.list.edit.js
3 files changed, 28 insertions(+), 2 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 005c968..db5658e 100644
--- a/extension.json
+++ b/extension.json
@@ -86,6 +86,9 @@
],
"OutputPageBodyAttributes": [
"CollaborationHubContentEditor::setCollabkitTheme"
+ ],
+ "BeforePageDisplay": [
+ "CollaborationListContent::onBeforePageDisplay"
]
},
"@fixme": "Does having ext.CollaborationKit.list.styles as a dependency
double load from addModuleStyles?",
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index 8027394..f39a580 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -1206,6 +1206,7 @@
&& $title->userCan( 'edit', $user, 'quick' )
) {
$output->addJsConfigVars(
'wgEnableCollaborationKitListEdit', true );
+
// FIXME: only load .list.members if the list is a
member list
// (displaymode = members)
$output->addModules( [
@@ -1217,6 +1218,18 @@
}
/**
+* Hook to add timestamp for edit conflict detection
+*
+* @param OutputPage $out
+* @param Skin $skin
+*/
+ public static function onBeforePageDisplay( OutputPage $out, $skin ) {
+ // Used for edit conflict detection in lists.
+ $revTS = (int)$out->getRevisionTimestamp();
+ $out->addJsConfigVars( 'wgCollabkitLastEdit', $revTS );
+ }
+
+ /**
* Hook to use custom edit page for lists
*
* @param WikiPage|Article|ImagePage|CategoryPage|Page $page
diff --git a/modules/ext.CollaborationKit.list.edit.js
b/modules/ext.CollaborationKit.list.edit.js
index 85e8c0d..b01e31b 100644
--- a/modules/ext.CollaborationKit.list.edit.js
+++ b/modules/ext.CollaborationKit.list.edit.js
@@ -279,7 +279,9 @@
saveJson = function ( params, callback ) {
var api = new mw.Api(),
i,
- j;
+ j,
+ lastRevTS,
+ baseTimestamp = params.timestamp;
// Strip out UID; we don't want to save it.
for ( i = 0; i < params.content.columns.length; i++ ) {
@@ -288,6 +290,14 @@
}
}
+ // Since we depend on things in the DOM, make our base timestamp
+ // for edit conflict the earlier of the last edit + 1 second and
+ // the time data was fetched.
+ lastRevTS = mw.config.get( 'wgCollabkitLastEdit' );
+ if ( lastRevTS ) {
+ lastRevTS += 1; // 1 second after last rev timestamp
+ baseTimestamp = Math.min( lastRevTS, +(
params.timestamp.replace( /\D/g, '' ) ) );
+ }
// This will explode if we hit a captcha
api.postWithEditToken( {
action: 'edit',
@@ -298,7 +308,7 @@
summary: params.summary,
pageid: params.pageid,
text: JSON.stringify( params.content ),
- basetimestamp: params.timestamp
+ basetimestamp: baseTimestamp
} ).done( callback ).fail( function () {
// FIXME proper error handling.
alert( mw.msg( 'collaborationkit-list-error-saving' ) );
--
To view, visit https://gerrit.wikimedia.org/r/354745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2e083cb262cdd0a0377c139709e624a60b6d17c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
Gerrit-Reviewer: Harej
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
Jforrester has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/354753 )
Change subject: ce.ContentBranchNode#destroy: Also call parent
..
ce.ContentBranchNode#destroy: Also call parent
Change-Id: I975ada921cf7a3d8ce327608362f48e7b6124a57
---
M src/ce/ve.ce.ContentBranchNode.js
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/53/354753/1
diff --git a/src/ce/ve.ce.ContentBranchNode.js
b/src/ce/ve.ce.ContentBranchNode.js
index ba39b84..6e73bf5 100644
--- a/src/ce/ve.ce.ContentBranchNode.js
+++ b/src/ce/ve.ce.ContentBranchNode.js
@@ -476,4 +476,7 @@
*/
ve.ce.ContentBranchNode.prototype.destroy = function () {
this.$element.off( 'click', this.onClickHandler );
+
+ // Parent method
+ ve.ce.ContentBranchNode.super.prototype.destroy.call( this );
};
--
To view, visit https://gerrit.wikimedia.org/r/354753
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I975ada921cf7a3d8ce327608362f48e7b6124a57
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
1 - 100 of 266 matches
Mail list logo