[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Hub image selector.
Harej has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317382
Change subject: Hub image selector.
..
Hub image selector.
This introduces VisualEditor as a dependency. So it goes.
Bug: T140165
Change-Id: Ifc629ad11550253ea6a5ff72547e41e266bcba2f
---
M extension.json
M i18n/en.json
M i18n/qqq.json
A includes/CollaborationHubContentEditor.php
M includes/SpecialCreateCollaborationHub.php
A modules/ext.CollaborationKit.hubimage.js
6 files changed, 346 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/82/317382/1
diff --git a/extension.json b/extension.json
index f8145af..6e82298 100644
--- a/extension.json
+++ b/extension.json
@@ -103,6 +103,23 @@
"cancel"
]
},
+ "ext.CollaborationKit.hubimage": {
+ "scripts": "ext.CollaborationKit.hubimage.js",
+ "dependencies": [
+ "oojs-ui",
+ "oojs-ui.styles.icons-movement",
+ "mediawiki.widgets",
+ "mediawiki.widgets.UserInputWidget",
+ "ext.visualEditor.mwimage",
+ "mediawiki.api"
+ ],
+ "messages": [
+ "collaborationkit-hubimage-browser",
+ "collaborationkit-hubimage-select",
+ "collaborationkit-hubimage-launchbutton",
+ "cancel"
+ ]
+ },
"ext.CollaborationKit.colour": {
"scripts": "ext.CollaborationKit.colour.js",
"dependencies": [
diff --git a/i18n/en.json b/i18n/en.json
index 6813fa5..086e3da 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -86,6 +86,9 @@
"collaborationkit-colour-launchbutton": "Browse colors",
"collaborationkit-colour-browser": "Color browser",
"collaborationkit-colour-select": "Select",
+ "collaborationkit-hubimage-launchbutton": "Browse images",
+ "collaborationkit-hubimage-browser": "Media browser",
+ "collaborationkit-hubimage-select": "Select",
"collaborationkit-subpage-toc-label": "Part of a project:",
"collaborationkit-red1": "Dark red",
"collaborationkit-red2": "Red",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 55802ad..0a4ebb3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -86,6 +86,9 @@
"collaborationkit-colour-launchbutton": "Button label for button that
launches the hub colour browser",
"collaborationkit-colour-browser": "Header label for the hub colour
browser",
"collaborationkit-colour-select": "Button for selecting a colour in the
hub colour browser",
+ "collaborationkit-hubimage-launchbutton": "Button label for button that
launches the hub image browser",
+ "collaborationkit-hubimage-browser": "Header label for the hub image
browser",
+ "collaborationkit-hubimage-select": "Button for selecting an image in
the hub image browser",
"collaborationkit-subpage-toc-label": "Label for the toc on a
Collaboration Hub subpage",
"collaborationkit-red1": "Color label",
"collaborationkit-red2": "Color label",
diff --git a/includes/CollaborationHubContentEditor.php
b/includes/CollaborationHubContentEditor.php
new file mode 100644
index 000..4bacd07
--- /dev/null
+++ b/includes/CollaborationHubContentEditor.php
@@ -0,0 +1,210 @@
+contentFormat =
CollaborationHubContentHandler::FORMAT_WIKI;
+ }
+
+ /**
+* Build and return the aossociative array for the content source field.
+* @param $mapping array
+* @return array
+*/
+ protected function getOptions( $mapping ) {
+ $options = [];
+ foreach ( $mapping as $msgKey => $option ) {
+ $options[] = [ 'label' => wfMessage( $msgKey
)->escaped(), 'data' => $option ];
+ }
+ return $options;
+ }
+
+ /**
+* @param $parts array
+* @return array
+*/
+ protected function getFormFields( $parts ) {
+
+ $fields = [
+ // Display name can be different from page title
+ 'display_name' => new OOUI\FieldLayout(
+ new OOUI\TextInputWidget( [
+ 'name' => 'wpCollabHubDisplayName',
+ 'id' => 'wpCollabHubDisplayName',
+ 'type' => 'text',
+ 'cssclass' => 'mw-ck-displayinput',
+ 'value' => $parts[0]
+
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Creating basic editing interface for CollaborationHubContent.
jenkins-bot has submitted this change and it was merged.
Change subject: Creating basic editing interface for CollaborationHubContent.
..
Creating basic editing interface for CollaborationHubContent.
Change-Id: Ia2d3a18272bf20d691e0038daabe4c6d44ef802f
---
M CollaborationKit.hooks.php
M extension.json
M i18n/en.json
M i18n/qqq.json
A includes/CollaborationHubContentEditor.php
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentHandler.php
M includes/content/CollaborationHubTOC.php
8 files changed, 451 insertions(+), 27 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index e2d439e..fc28f01 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -13,7 +13,7 @@
$title = $sktemplate->getTitle();
$request = $sktemplate->getRequest();
if ( isset( $links['views']['edit'] ) ) {
- if ( $title->hasContentModel(
'CollaborationListContent' ) ) {
+ if ( $title->hasContentModel(
'CollaborationListContent' ) || $title->hasContentModel(
'CollaborationHubContent' ) ) {
// Edit as JSON
$active = in_array( $request->getVal( 'action'
), [ 'edit', 'submit' ] )
&& $request->getVal( 'format' ) ===
'application/json';
@@ -29,7 +29,8 @@
// Make it not be selected when editing
json.
$links['views']['edit']['class'] =
false;
}
- } elseif ( $title->hasContentModel(
'CollaborationHubContent' ) ) {
+ }
+ if ( $title->hasContentModel( 'CollaborationHubContent'
) ) {
// Add feature
$links['actions']['addnewfeature'] = [
'class' => '',
diff --git a/extension.json b/extension.json
index f8145af..61cce63 100644
--- a/extension.json
+++ b/extension.json
@@ -20,13 +20,14 @@
"CollaborationKitHooks": "CollaborationKit.hooks.php",
"CollaborationHubContent":
"includes/content/CollaborationHubContent.php",
"CollaborationHubContentHandler":
"includes/content/CollaborationHubContentHandler.php",
+ "CollaborationHubContentEditor":
"includes/CollaborationHubContentEditor.php",
"CollaborationHubTOC":
"includes/content/CollaborationHubTOC.php",
"CollaborationKitIcon":
"includes/content/CollaborationKitIcon.php",
"CollaborationListContent":
"includes/content/CollaborationListContent.php",
"CollaborationListContentHandler":
"includes/content/CollaborationListContentHandler.php",
+ "CollaborationListContentEditor":
"includes/CollaborationListContentEditor.php",
"SpecialCreateCollaborationHub":
"includes/SpecialCreateCollaborationHub.php",
"SpecialCreateHubFeature":
"includes/SpecialCreateHubFeature.php",
- "CollaborationListContentEditor":
"includes/CollaborationListContentEditor.php",
"ResourceLoaderListStyleModule":
"includes/ResourceLoaderListStyleModule.php"
},
"ContentHandlers": {
@@ -63,7 +64,8 @@
"CollaborationListContent::onArticleViewHeader"
],
"CustomEditor": [
- "CollaborationListContent::onCustomEditor"
+ "CollaborationListContent::onCustomEditor",
+ "CollaborationHubContent::onCustomEditor"
],
"OutputPageBeforeHTML": [
"CollaborationKitHooks::onOutputPageBeforeHTML"
diff --git a/i18n/en.json b/i18n/en.json
index 6813fa5..15c9af9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -62,6 +62,12 @@
"collaborationkit-list-newitem-description": "Description (optional)",
"collaborationkit-listedit-description": "Description",
"collaborationkit-listedit-list": "List items",
+ "collaborationkit-hubedit-displayname": "Name to display",
+ "collaborationkit-hubedit-introduction": "Introduction",
+ "collaborationkit-hubedit-footer": "Footer",
+ "collaborationkit-hubedit-image": "Hub image",
+ "collaborationkit-hubedit-colour": "Color",
+ "collaborationkit-hubedit-content": "Features",
"collaborationkit-editjsontab": "Edit as JSON",
"collaborationkit-hub-announcements-initial": "A new collaboration hub
has been set up!",
"collaborationkit-hub-members-description": "Our members are below.
Those who have not edited in over a month are moved to the inactive section.",
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Removed unusual "]" in a comment
D3r1ck01 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317383
Change subject: Removed unusual "]" in a comment
..
Removed unusual "]" in a comment
* Deleted an unwanted "]" in a comments inside the
EditEntity.php file.
Change-Id: Iacb742ee2780a41addcca6d0610223e800d54678
---
M repo/includes/Api/EditEntity.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/317383/1
diff --git a/repo/includes/Api/EditEntity.php b/repo/includes/Api/EditEntity.php
index c88e63c..9ea789d 100644
--- a/repo/includes/Api/EditEntity.php
+++ b/repo/includes/Api/EditEntity.php
@@ -263,7 +263,7 @@
*/
private function getSummary( array $params ) {
//TODO: Construct a nice and meaningful summary from the
changes that get applied!
- // Perhaps that could be based on the resulting diff?]
+ // Perhaps that could be based on the resulting diff?
$summary = $this->createSummary( $params );
if ( isset( $params['id'] ) xor ( isset( $params['site'] ) &&
isset( $params['title'] ) ) ) {
$summary->setAction( $params['clear'] === false ?
'update' : 'override' );
--
To view, visit https://gerrit.wikimedia.org/r/317383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacb742ee2780a41addcca6d0610223e800d54678
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-10-23T10:00:01+0000
WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317384
Change subject: New Wikidata Build - 2016-10-23T10:00:01+
..
New Wikidata Build - 2016-10-23T10:00:01+
Change-Id: Idb947314b8d7bce7390097543c710bd0d5d860fb
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.i18n.magic.php
M extensions/Wikibase/client/config/WikibaseClient.default.php
M extensions/Wikibase/client/config/WikibaseClient.jenkins.php
M extensions/Wikibase/client/i18n/pt.json
M extensions/Wikibase/client/i18n/tr.json
M
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
M
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M extensions/Wikibase/client/includes/Hooks/ParserFunctionRegistrant.php
M
extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserFunctionRegistrantTest.php
M extensions/Wikibase/docs/options.wiki
M extensions/Wikibase/lib/i18n/en.json
M extensions/Wikibase/lib/i18n/is.json
M extensions/Wikibase/lib/i18n/pt.json
M extensions/Wikibase/lib/i18n/uk.json
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/is.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/pt.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/i18n/uk.json
M extensions/Wikibase/repo/includes/ItemDisambiguation.php
M vendor/composer/installed.json
23 files changed, 128 insertions(+), 52 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/84/317384/1
diff --git a/composer.lock b/composer.lock
index 750841a..9e1d5cf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1574,12 +1574,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "fac7b49ef1d5bb499c1819a2086eca714988aab7"
+"reference": "60cffa1069a20fe6949ad5028bfd286483c615e1"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fac7b49ef1d5bb499c1819a2086eca714988aab7";,
-"reference": "fac7b49ef1d5bb499c1819a2086eca714988aab7",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/60cffa1069a20fe6949ad5028bfd286483c615e1";,
+"reference": "60cffa1069a20fe6949ad5028bfd286483c615e1",
"shasum": ""
},
"require": {
@@ -1653,7 +1653,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2016-10-21 20:39:14"
+"time": "2016-10-22 20:49:56"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.i18n.magic.php
b/extensions/Wikibase/client/WikibaseClient.i18n.magic.php
index a87be89..7bf75c4 100644
--- a/extensions/Wikibase/client/WikibaseClient.i18n.magic.php
+++ b/extensions/Wikibase/client/WikibaseClient.i18n.magic.php
@@ -14,6 +14,7 @@
$magicWords['en'] = array(
'noexternallanglinks' => array( 0, 'noexternallanglinks' ),
'property' => array( 0, 'property' ),
+ 'statements' => array( 0, 'statements' ),
'wbreponame' => array( 0, 'wbreponame' ),
);
diff --git a/extensions/Wikibase/client/config/WikibaseClient.default.php
b/extensions/Wikibase/client/config/WikibaseClient.default.php
index 532b67d..b609d7d 100644
--- a/extensions/Wikibase/client/config/WikibaseClient.default.php
+++ b/extensions/Wikibase/client/config/WikibaseClient.default.php
@@ -50,6 +50,7 @@
// in the parser functions and via Lua.
// Allows users to split the ParserCache by user language.
'allowDataAccessInUserLanguage' => false,
+ 'enableStatementsParserFunction' => false,
/**
* Prefix to use for cache keys that should be shared among a
Wikibase Repo instance and all
diff --git a/extensions/Wikibase/client/config/WikibaseClient.jenkins.php
b/extensions/Wikibase/client/config/WikibaseClient.jenkins.php
index 4e98235..c354e41 100644
--- a/extensions/Wikibase/client/config/WikibaseClient.jenkins.php
+++ b/extensions/Wikibase/client/config/WikibaseClient.jenkins.php
@@ -15,3 +15,6 @@
// group in the sites table during testing.
// NOTE: This can be removed once T126596 is implemented.
$wgWBClientSettings['siteGroup'] = "mywikigroup";
+
+// TODO: Remove the feature flag when not needed any more!
+$wgWBClientSettings['enableStatementsParserFunction'] = true;
diff --git a/extensions/Wikibase/client/i18n/pt.json
b/extensions/Wikibase/client/i18n/pt.json
index a59c768..618a89e 100644
--- a/extensions/Wikibase/client/i18n/pt.json
+++ b/extensions/Wikibase/client/i18n/pt
[MediaWiki-commits] [Gerrit] translatewiki[master]: Add PageForms to translations list, Drop SemanticForms for t...
jenkins-bot has submitted this change and it was merged. Change subject: Add PageForms to translations list, Drop SemanticForms for translations .. Add PageForms to translations list, Drop SemanticForms for translations SemanticForms is being renamed to PageForms. https://gerrit.wikimedia.org/r/#/c/316907/ Bug: T147582 Change-Id: Ib03cd9ce6f8bdc1a854f54b07927dcbe60f22563 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 13 insertions(+), 5 deletions(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 058b0d9..ddb7f2a 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1749,6 +1749,13 @@ Page Disqus +# Renamed from SemanticForms to PageForms +Page Forms +aliasfile = PageForms/languages/PF_Aliases.php +magicfile = PageForms/languages/PF_Magic.php +ignored = pf_formedit_accesskey_saveandcontinueediting, accesskey-ca-formedit +optional = pf-datepicker-dateformatlong, pf-datepicker-dateformatshort, pf-datepicker-firstdayofweek + Page Images ignored = pageimages-blacklist @@ -2132,11 +2139,12 @@ Semantic Expressiveness magicfile = SemanticExpressiveness/SemanticExpressiveness.i18n.magic.php -Semantic Forms -aliasfile = SemanticForms/languages/SF_Aliases.php -magicfile = SemanticForms/languages/SF_Magic.php -ignored = sf_formedit_accesskey_saveandcontinueediting, accesskey-ca-formedit -optional = sf-datepicker-dateformatlong, sf-datepicker-dateformatshort, sf-datepicker-firstdayofweek +# Renamed to PageForms - T147582 +# Semantic Forms +# aliasfile = SemanticForms/languages/SF_Aliases.php +# magicfile = SemanticForms/languages/SF_Magic.php +# ignored = sf_formedit_accesskey_saveandcontinueediting, accesskey-ca-formedit +# optional = sf-datepicker-dateformatlong, sf-datepicker-dateformatshort, sf-datepicker-firstdayofweek Semantic Forms Inputs -- To view, visit https://gerrit.wikimedia.org/r/317272 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib03cd9ce6f8bdc1a854f54b07927dcbe60f22563 Gerrit-PatchSet: 4 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Paladox Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Siebrand Gerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [OpenStackManager] Remove deleted key
Raimond Spekking has submitted this change and it was merged. Change subject: [OpenStackManager] Remove deleted key .. [OpenStackManager] Remove deleted key Change-Id: I219428eed1c864157ccacb21536954c585e7bdd6 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 058b0d9..623e3ce 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1733,7 +1733,7 @@ Open Stack Manager aliasfile = OpenStackManager/OpenStackManager.alias.php -optional = openstackmanager-puppetdoclink, prefs-openstack +optional = prefs-openstack ignored = apihelp-novaaddress-param-id Oracle Text Search -- To view, visit https://gerrit.wikimedia.org/r/317385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I219428eed1c864157ccacb21536954c585e7bdd6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [OpenStackManager] Remove deleted key
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/317385 Change subject: [OpenStackManager] Remove deleted key .. [OpenStackManager] Remove deleted key Change-Id: I219428eed1c864157ccacb21536954c585e7bdd6 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/85/317385/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 058b0d9..623e3ce 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -1733,7 +1733,7 @@ Open Stack Manager aliasfile = OpenStackManager/OpenStackManager.alias.php -optional = openstackmanager-puppetdoclink, prefs-openstack +optional = prefs-openstack ignored = apihelp-novaaddress-param-id Oracle Text Search -- To view, visit https://gerrit.wikimedia.org/r/317385 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I219428eed1c864157ccacb21536954c585e7bdd6 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...StlHandler[master]: Removing unneccesary whitespaces
Arseny1992 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317386
Change subject: Removing unneccesary whitespaces
..
Removing unneccesary whitespaces
Tabs for indentation instead of spaces
https://www.mediawiki.org/wiki/Manual:Pre-commit_checklist
https://www.mediawiki.org/wiki/Manual:Coding_conventions
Change-Id: I3aff59d3107acaa8a881eecf312e443e91a5c60a
---
M StlHandler_body.php
M modules/stlviewer.js
M modules/three.js
3 files changed, 209 insertions(+), 209 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/StlHandler
refs/changes/86/317386/1
diff --git a/StlHandler_body.php b/StlHandler_body.php
index 7db9252..18e4d09 100644
--- a/StlHandler_body.php
+++ b/StlHandler_body.php
@@ -32,7 +32,7 @@
public static function onImageOpenShowImageInlineBefore( $imagepage,
$out ){
if ( $imagepage->getDisplayedFile()->getMimeType() ===
'application/sla' ){
$full_url =
$imagepage->getDisplayedFile()->getFullURL();
- $out->addHtml(
+ $out->addHtml(
"$longDesc");
$out->addHtml(ResourceLoader::makeInlineScript("mw.loader.using(
'ext.StlHandler',
function(){
diff --git a/modules/stlviewer.js b/modules/stlviewer.js
index 7ae0c2f..7faa769 100644
--- a/modules/stlviewer.js
+++ b/modules/stlviewer.js
@@ -1,257 +1,257 @@
- var rotateStartPoint = new THREE.Vector3(0, 0, 1);
- var rotateEndPoint = new THREE.Vector3(0, 0, 1);
- var deltaX = 0,
- deltaY = 0;
- var startPoint = {
- x: 0,
- y: 0
- };
+ var rotateStartPoint = new THREE.Vector3(0, 0, 1);
+ var rotateEndPoint = new THREE.Vector3(0, 0, 1);
+ var deltaX = 0,
+ deltaY = 0;
+ var startPoint = {
+ x: 0,
+ y: 0
+ };
- var windowHalfX = window.innerWidth / 2;
- var windowHalfY = window.innerHeight / 2;
+ var windowHalfX = window.innerWidth / 2;
+ var windowHalfY = window.innerHeight / 2;
- var isLoaded = false;
- var rotationSpeed = 10;
- var mesh;
- window.initScene = function(file) {
+ var isLoaded = false;
+ var rotationSpeed = 10;
+ var mesh;
+ window.initScene = function(file) {
- var myCanvas = document.getElementById('stlCanvas');
- renderer = new THREE.WebGLRenderer({
- antialias: true,
- alpha: true,
- canvas: myCanvas
- });
- renderer.setSize(myCanvas.offsetWidth, myCanvas.offsetHeight);
- scene = new THREE.Scene();
- var dirLight = new THREE.DirectionalLight(0xff, 1);
- dirLight.position.set(1, 1, 1);
- //scene.add(dirLight);
+ var myCanvas = document.getElementById('stlCanvas');
+ renderer = new THREE.WebGLRenderer({
+ antialias: true,
+ alpha: true,
+ canvas: myCanvas
+ });
+ renderer.setSize(myCanvas.offsetWidth, myCanvas.offsetHeight);
+ scene = new THREE.Scene();
+ var dirLight = new THREE.DirectionalLight(0xff, 1);
+ dirLight.position.set(1, 1, 1);
+ //scene.add(dirLight);
- var loader = new THREE.STLLoader();
+ var loader = new THREE.STLLoader();
- loader.load(file, function(geometry) {
- geometry.computeBoundingSphere();
- geometry.computeVertexNormals();
+ loader.load(file, function(geometry) {
+ geometry.computeBoundingSphere();
+ geometry.computeVertexNormals();
- var r = geometry.boundingSphere.radius;
- geometry.computeBoundingBox();
- geometry.center();
+ var r = geometry.boundingSphere.radius;
+ geometry.computeBoundingBox();
+ geometry.center();
- if (geometry.hasColors) {
- console.log("hascolors");
- console.log(geometry);
- material = new THREE.MeshPhongMaterial({
- opacity: geometry.alpha,
- vertexColors: THREE.VertexColors
- });
- } else {
- console.log(geometry);
- var material = new THREE.MeshLambertMaterial({
- color: 0x99,
- side: THREE.DoubleSide
- });
- }
- mesh = new THREE.Mesh(geometry, material);
- mesh.position.set(0, 0, 0.0);
- mesh.rotation.set(-Math.PI / 3, 0, 0);
- m
[MediaWiki-commits] [Gerrit] mediawiki...StlHandler[master]: Removing unneccesary whitespaces
HarriA has submitted this change and it was merged.
Change subject: Removing unneccesary whitespaces
..
Removing unneccesary whitespaces
Tabs for indentation instead of spaces
https://www.mediawiki.org/wiki/Manual:Pre-commit_checklist
https://www.mediawiki.org/wiki/Manual:Coding_conventions
Change-Id: I3aff59d3107acaa8a881eecf312e443e91a5c60a
---
M StlHandler_body.php
M modules/stlviewer.js
M modules/three.js
3 files changed, 209 insertions(+), 209 deletions(-)
Approvals:
HarriA: Verified; Looks good to me, approved
diff --git a/StlHandler_body.php b/StlHandler_body.php
index 7db9252..18e4d09 100644
--- a/StlHandler_body.php
+++ b/StlHandler_body.php
@@ -32,7 +32,7 @@
public static function onImageOpenShowImageInlineBefore( $imagepage,
$out ){
if ( $imagepage->getDisplayedFile()->getMimeType() ===
'application/sla' ){
$full_url =
$imagepage->getDisplayedFile()->getFullURL();
- $out->addHtml(
+ $out->addHtml(
"$longDesc");
$out->addHtml(ResourceLoader::makeInlineScript("mw.loader.using(
'ext.StlHandler',
function(){
diff --git a/modules/stlviewer.js b/modules/stlviewer.js
index 7ae0c2f..7faa769 100644
--- a/modules/stlviewer.js
+++ b/modules/stlviewer.js
@@ -1,257 +1,257 @@
- var rotateStartPoint = new THREE.Vector3(0, 0, 1);
- var rotateEndPoint = new THREE.Vector3(0, 0, 1);
- var deltaX = 0,
- deltaY = 0;
- var startPoint = {
- x: 0,
- y: 0
- };
+ var rotateStartPoint = new THREE.Vector3(0, 0, 1);
+ var rotateEndPoint = new THREE.Vector3(0, 0, 1);
+ var deltaX = 0,
+ deltaY = 0;
+ var startPoint = {
+ x: 0,
+ y: 0
+ };
- var windowHalfX = window.innerWidth / 2;
- var windowHalfY = window.innerHeight / 2;
+ var windowHalfX = window.innerWidth / 2;
+ var windowHalfY = window.innerHeight / 2;
- var isLoaded = false;
- var rotationSpeed = 10;
- var mesh;
- window.initScene = function(file) {
+ var isLoaded = false;
+ var rotationSpeed = 10;
+ var mesh;
+ window.initScene = function(file) {
- var myCanvas = document.getElementById('stlCanvas');
- renderer = new THREE.WebGLRenderer({
- antialias: true,
- alpha: true,
- canvas: myCanvas
- });
- renderer.setSize(myCanvas.offsetWidth, myCanvas.offsetHeight);
- scene = new THREE.Scene();
- var dirLight = new THREE.DirectionalLight(0xff, 1);
- dirLight.position.set(1, 1, 1);
- //scene.add(dirLight);
+ var myCanvas = document.getElementById('stlCanvas');
+ renderer = new THREE.WebGLRenderer({
+ antialias: true,
+ alpha: true,
+ canvas: myCanvas
+ });
+ renderer.setSize(myCanvas.offsetWidth, myCanvas.offsetHeight);
+ scene = new THREE.Scene();
+ var dirLight = new THREE.DirectionalLight(0xff, 1);
+ dirLight.position.set(1, 1, 1);
+ //scene.add(dirLight);
- var loader = new THREE.STLLoader();
+ var loader = new THREE.STLLoader();
- loader.load(file, function(geometry) {
- geometry.computeBoundingSphere();
- geometry.computeVertexNormals();
+ loader.load(file, function(geometry) {
+ geometry.computeBoundingSphere();
+ geometry.computeVertexNormals();
- var r = geometry.boundingSphere.radius;
- geometry.computeBoundingBox();
- geometry.center();
+ var r = geometry.boundingSphere.radius;
+ geometry.computeBoundingBox();
+ geometry.center();
- if (geometry.hasColors) {
- console.log("hascolors");
- console.log(geometry);
- material = new THREE.MeshPhongMaterial({
- opacity: geometry.alpha,
- vertexColors: THREE.VertexColors
- });
- } else {
- console.log(geometry);
- var material = new THREE.MeshLambertMaterial({
- color: 0x99,
- side: THREE.DoubleSide
- });
- }
- mesh = new THREE.Mesh(geometry, material);
- mesh.position.set(0, 0, 0.0);
- mesh.rotation.set(-Math.PI / 3, 0, 0);
- mesh.castShadow = true;
- mesh.receiveShadow = true;
- sc
[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Removed unusual "]" in a comment
jenkins-bot has submitted this change and it was merged.
Change subject: Removed unusual "]" in a comment
..
Removed unusual "]" in a comment
* Deleted an unwanted "]" in a comments inside the
EditEntity.php file.
Change-Id: Iacb742ee2780a41addcca6d0610223e800d54678
---
M repo/includes/Api/EditEntity.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/includes/Api/EditEntity.php b/repo/includes/Api/EditEntity.php
index c88e63c..9ea789d 100644
--- a/repo/includes/Api/EditEntity.php
+++ b/repo/includes/Api/EditEntity.php
@@ -263,7 +263,7 @@
*/
private function getSummary( array $params ) {
//TODO: Construct a nice and meaningful summary from the
changes that get applied!
- // Perhaps that could be based on the resulting diff?]
+ // Perhaps that could be based on the resulting diff?
$summary = $this->createSummary( $params );
if ( isset( $params['id'] ) xor ( isset( $params['site'] ) &&
isset( $params['title'] ) ) ) {
$summary->setAction( $params['clear'] === false ?
'update' : 'override' );
--
To view, visit https://gerrit.wikimedia.org/r/317383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iacb742ee2780a41addcca6d0610223e800d54678
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01
Gerrit-Reviewer: Addshore
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
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add all edited pages by myself to watchlist by default (for ...
Urbanecm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317387
Change subject: Add all edited pages by myself to watchlist by default (for new
users)
..
Add all edited pages by myself to watchlist by default (for new users)
Bug: T148328
Change-Id: I03936c93d770a6a14c53f01445913c09abddd9e8
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/87/317387/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2c89161..9572b18 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1868,7 +1868,14 @@
// Temporary override: WMF is not hardcore enough to enable this.
// See T37785, T38316, T47022 about it.
-$wgDefaultUserOptions['watchdefault'] = 0;
+if ( $wmgWatchlistdefault )
+{
+ $wgDefaultUserOptions['watchdefault'] = 1;
+}
+else
+{
+ $wgDefaultUserOptions['watchdefault'] = 0;
+}
$wgDefaultUserOptions['enotifwatchlistpages'] = 0;
$wgDefaultUserOptions['usenewrc'] = 0;
$wgDefaultUserOptions['extendwatchlist'] = 0;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 9698c64..93eef42 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -17595,6 +17595,11 @@
'nonglobal' => false,
],
+'wmgWatchlistdefault' => [
+ 'default' => false,
+ 'cswiki' => true, // T148328
+],
+
];
### WMF Labs override #
--
To view, visit https://gerrit.wikimedia.org/r/317387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03936c93d770a6a14c53f01445913c09abddd9e8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Urbanecm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Add portuguese localization
Sophivorus has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317388
Change subject: Add portuguese localization
..
Add portuguese localization
Change-Id: Ibfb87beb26ef4fc0bbda669f37bff601bfd4c3d8
---
M i18n/es.json
A i18n/pt.json
2 files changed, 21 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikipedia/gadgets/ProveIt
refs/changes/88/317388/1
diff --git a/i18n/es.json b/i18n/es.json
index e72fd64..8301c6d 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -14,7 +14,7 @@
"proveit-insert-button": "Insertar",
"proveit-update-button": "Actualizar",
"proveit-prompt-name": "La referencia necesita un nombre para ser
citada:",
- "proveit-confirm-remove": "Esto borrará la referencia y todas sus
citas. ¿Estás seguro?",
+ "proveit-confirm-remove": "Esto borra la referencia y todas sus citas.
¿Estás seguro?",
"proveit-no-template": "Sin plantilla",
"proveit-no-references": "No se han encontrado referencias"
}
\ No newline at end of file
diff --git a/i18n/pt.json b/i18n/pt.json
new file mode 100644
index 000..2a2665f
--- /dev/null
+++ b/i18n/pt.json
@@ -0,0 +1,20 @@
+{
+ "@metadata": {
+ "authors": [
+ "Felipe Schenone"
+ ]
+ },
+ "proveit-list-tab": "Lista ($1)",
+ "proveit-add-tab": "Adicionar",
+ "proveit-reference-name-label": "Nome de referência",
+ "proveit-reference-content-label": "Conteúdo de referência",
+ "proveit-reference-template-label": "Predefinição mestre",
+ "proveit-cite-button": "Citação",
+ "proveit-remove-button": "Excluir",
+ "proveit-insert-button": "Inserir",
+ "proveit-update-button": "Atualizar",
+ "proveit-prompt-name": "A referência precisa de um nome a ser citados:",
+ "proveit-confirm-remove": "Isso elimina a referência e todos os
compromissos. Tem certeza?",
+ "proveit-no-template": "Sem predefinição",
+ "proveit-no-references": "Não há referências encontradas"
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/317388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfb87beb26ef4fc0bbda669f37bff601bfd4c3d8
Gerrit-PatchSet: 1
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Add portuguese localization
Sophivorus has submitted this change and it was merged.
Change subject: Add portuguese localization
..
Add portuguese localization
Bug: T148337
Change-Id: Ibfb87beb26ef4fc0bbda669f37bff601bfd4c3d8
---
M i18n/es.json
A i18n/pt.json
2 files changed, 21 insertions(+), 1 deletion(-)
Approvals:
Sophivorus: Verified; Looks good to me, approved
diff --git a/i18n/es.json b/i18n/es.json
index e72fd64..8301c6d 100644
--- a/i18n/es.json
+++ b/i18n/es.json
@@ -14,7 +14,7 @@
"proveit-insert-button": "Insertar",
"proveit-update-button": "Actualizar",
"proveit-prompt-name": "La referencia necesita un nombre para ser
citada:",
- "proveit-confirm-remove": "Esto borrará la referencia y todas sus
citas. ¿Estás seguro?",
+ "proveit-confirm-remove": "Esto borra la referencia y todas sus citas.
¿Estás seguro?",
"proveit-no-template": "Sin plantilla",
"proveit-no-references": "No se han encontrado referencias"
}
\ No newline at end of file
diff --git a/i18n/pt.json b/i18n/pt.json
new file mode 100644
index 000..2a2665f
--- /dev/null
+++ b/i18n/pt.json
@@ -0,0 +1,20 @@
+{
+ "@metadata": {
+ "authors": [
+ "Felipe Schenone"
+ ]
+ },
+ "proveit-list-tab": "Lista ($1)",
+ "proveit-add-tab": "Adicionar",
+ "proveit-reference-name-label": "Nome de referência",
+ "proveit-reference-content-label": "Conteúdo de referência",
+ "proveit-reference-template-label": "Predefinição mestre",
+ "proveit-cite-button": "Citação",
+ "proveit-remove-button": "Excluir",
+ "proveit-insert-button": "Inserir",
+ "proveit-update-button": "Atualizar",
+ "proveit-prompt-name": "A referência precisa de um nome a ser citados:",
+ "proveit-confirm-remove": "Isso elimina a referência e todos os
compromissos. Tem certeza?",
+ "proveit-no-template": "Sem predefinição",
+ "proveit-no-references": "Não há referências encontradas"
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/317388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfb87beb26ef4fc0bbda669f37bff601bfd4c3d8
Gerrit-PatchSet: 2
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus
Gerrit-Reviewer: Sophivorus
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Revert "Let's disable l10nupdate completely until we have /s...
Dereckson has uploaded a new change for review. https://gerrit.wikimedia.org/r/317390 Change subject: Revert "Let's disable l10nupdate completely until we have /srv/mediawiki-staging back" .. Revert "Let's disable l10nupdate completely until we have /srv/mediawiki-staging back" /srv/mediawiki-staging has now back for some days, situation is all clear. This reverts commit 493f0fe7b4d8d17e1ab17612a49a1a2cdce03962. Change-Id: I6c14503f8f273be25af5e06b7eefd70fb3e1869b --- M hieradata/hosts/tin.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/317390/1 diff --git a/hieradata/hosts/tin.yaml b/hieradata/hosts/tin.yaml index 1aafc32..9250bb3 100644 --- a/hieradata/hosts/tin.yaml +++ b/hieradata/hosts/tin.yaml @@ -3,4 +3,4 @@ - eqiad.wmnet - codfw.wmnet cluster: misc -scap::l10nupdate::run_l10nupdate: false +scap::l10nupdate::run_l10nupdate: true -- To view, visit https://gerrit.wikimedia.org/r/317390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6c14503f8f273be25af5e06b7eefd70fb3e1869b Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dereckson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer[master]: Check more archive.org dump paths
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317391
Change subject: Check more archive.org dump paths
..
Check more archive.org dump paths
Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24
---
M
analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
M analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
2 files changed, 29 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/toolkit-analyzer
refs/changes/91/317391/1
diff --git
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
index 9825008..8675a4d 100644
---
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
+++
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
@@ -11,6 +11,8 @@
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
/**
* Class to download dumps from archive.org
@@ -83,29 +85,35 @@
String fileName = WmfDumpFile.getDumpFileName(DumpContentType.JSON,
this.projectName, this.dateStamp);
+List urls = new ArrayList<>();
+
// Like
http://archive.org/download/wikidata-json-20160104/wikidata-20160104-all.json.gz
-String urlString = "http://archive.org/download/wikidata-json-"; +
this.dateStamp + "/wikidata-" + this.dateStamp + "-all.json.gz";
+urls.add( "http://archive.org/download/wikidata-json-"; +
this.dateStamp + "/wikidata-" + this.dateStamp + "-all.json.gz" );
+// Like
https://archive.org/download/wikidata-json-20141020/20141020.json.gz
+urls.add( "http://archive.org/download/wikidata-json-"; +
this.dateStamp + "/" + this.dateStamp + ".json.gz" );
-logger.info("Downloading JSON dump file " + fileName + " from "
-+ urlString + " ...");
+for( String urlString : urls ) {
+logger.info("Downloading JSON dump file " + fileName + " from "
++ urlString + " ...");
-if (!isAvailable()) {
-throw new IOException(
-"Dump file not available (yet). Aborting dump retrieval.");
+if (!isAvailable()) {
+throw new IOException(
+"Dump file not available (yet). Aborting dump
retrieval.");
+}
+
+DirectoryManager dailyDirectoryManager =
this.dumpfileDirectoryManager
+
.getSubdirectoryManager(WmfDumpFile.getDumpFileDirectoryName(
+DumpContentType.JSON, this.dateStamp));
+
+try (InputStream inputStream = webResourceFetcher
+.getInputStreamForUrl(urlString)) {
+dailyDirectoryManager.createFileAtomic(fileName, inputStream);
+}
+
+this.isPrepared = true;
+
+logger.info("... completed download of JSON dump file " + fileName
++ " from " + urlString);
}
-
-DirectoryManager dailyDirectoryManager = this.dumpfileDirectoryManager
-.getSubdirectoryManager(WmfDumpFile.getDumpFileDirectoryName(
-DumpContentType.JSON, this.dateStamp));
-
-try (InputStream inputStream = webResourceFetcher
-.getInputStreamForUrl(urlString)) {
-dailyDirectoryManager.createFileAtomic(fileName, inputStream);
-}
-
-this.isPrepared = true;
-
-logger.info("... completed download of JSON dump file " + fileName
-+ " from " + urlString);
}
}
diff --git
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
index e2b98d1..0175431 100644
--- a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
+++ b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
@@ -94,7 +94,7 @@
String dumpLocation = entry.getKey();
MwDumpFile onlineDump = entry.getValue();
try{
-System.out.println("Looking for / downloading online dump
from: " + dumpLocation);
+System.out.println("Looking for & downloading online dump
from: " + dumpLocation);
onlineDump.prepareDumpFile();
System.out.println("Using dump from: " + dumpLocation);
return onlineDump;
--
To view, visit https://gerrit.wikimedia.org/r/317391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/toolkit-analyzer
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: registry: Update documentation
jenkins-bot has submitted this change and it was merged.
Change subject: registry: Update documentation
..
registry: Update documentation
Change-Id: Ibf2fbe8b31ffbb3f462c65b94c51a5dcb0996509
---
M registry/README.md
1 file changed, 16 insertions(+), 20 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/registry/README.md b/registry/README.md
index 0c3e4a9..292d956 100644
--- a/registry/README.md
+++ b/registry/README.md
@@ -2,8 +2,8 @@
this server instance provides.
The default registry includes all the services that cxserver is able to
support.
-You can tweak it for your site by having a different value in your config.js
-file. The value in config.js completely overrides the defaults.
+You can tweak it for your site by having a different value in your
registry.yaml
+file. The value in registry.yaml completely overrides the defaults.
Format
--
@@ -20,22 +20,18 @@
Example:
```
-es: {
- ca: {
- dictionary: {
- providers: [
- "JsonDict",
- "Dict"
- ]
- },
- mt: {
- providers: [
- "Apertium",
- "Bing"
- ]
- }
- }
-}
+dictionary:
+ Dictd:
+es:
+ - ca
+ JsonDict:
+es:
+ - ca
+mt:
+ Apertium:
+es:
+ - ca
+ - pt
```
Query
@@ -44,8 +40,8 @@
to get the dictionary services that translate words from Spanish to Catalan,
use a URL like this:
- http://example.com:8000/list/dictionary/es/ca
+ http://example.com:8080/v1/list/dictionary/es/ca
Machine translation can be queried by using,
- http://example.com:8000/list/mt/es/pt
+ http://example.com:8080/v1/list/mt/es/pt
--
To view, visit https://gerrit.wikimedia.org/r/317031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf2fbe8b31ffbb3f462c65b94c51a5dcb0996509
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer-build[master]: Check more archive.org dump paths
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/317392 Change subject: Check more archive.org dump paths .. Check more archive.org dump paths Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24 --- M toolkit-analyzer.jar 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/toolkit-analyzer-build refs/changes/92/317392/1 diff --git a/toolkit-analyzer.jar b/toolkit-analyzer.jar index ed908b3..145e4de 100644 --- a/toolkit-analyzer.jar +++ b/toolkit-analyzer.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/317392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/toolkit-analyzer-build Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer-build[production]: Check more archive.org dump paths
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/317393 Change subject: Check more archive.org dump paths .. Check more archive.org dump paths Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24 --- M toolkit-analyzer.jar 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/toolkit-analyzer-build refs/changes/93/317393/1 diff --git a/toolkit-analyzer.jar b/toolkit-analyzer.jar index ed908b3..145e4de 100644 --- a/toolkit-analyzer.jar +++ b/toolkit-analyzer.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/317393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/toolkit-analyzer-build Gerrit-Branch: production Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer-build[master]: Check more archive.org dump paths
Addshore has submitted this change and it was merged. Change subject: Check more archive.org dump paths .. Check more archive.org dump paths Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24 --- M toolkit-analyzer.jar 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Addshore: Verified; Looks good to me, approved diff --git a/toolkit-analyzer.jar b/toolkit-analyzer.jar index ed908b3..145e4de 100644 --- a/toolkit-analyzer.jar +++ b/toolkit-analyzer.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/317392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/toolkit-analyzer-build Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer[master]: Check more archive.org dump paths
Addshore has submitted this change and it was merged.
Change subject: Check more archive.org dump paths
..
Check more archive.org dump paths
Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24
---
M
analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
M analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
2 files changed, 29 insertions(+), 21 deletions(-)
Approvals:
Addshore: Verified; Looks good to me, approved
diff --git
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
index 9825008..8675a4d 100644
---
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
+++
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
@@ -11,6 +11,8 @@
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
/**
* Class to download dumps from archive.org
@@ -83,29 +85,35 @@
String fileName = WmfDumpFile.getDumpFileName(DumpContentType.JSON,
this.projectName, this.dateStamp);
+List urls = new ArrayList<>();
+
// Like
http://archive.org/download/wikidata-json-20160104/wikidata-20160104-all.json.gz
-String urlString = "http://archive.org/download/wikidata-json-"; +
this.dateStamp + "/wikidata-" + this.dateStamp + "-all.json.gz";
+urls.add( "http://archive.org/download/wikidata-json-"; +
this.dateStamp + "/wikidata-" + this.dateStamp + "-all.json.gz" );
+// Like
https://archive.org/download/wikidata-json-20141020/20141020.json.gz
+urls.add( "http://archive.org/download/wikidata-json-"; +
this.dateStamp + "/" + this.dateStamp + ".json.gz" );
-logger.info("Downloading JSON dump file " + fileName + " from "
-+ urlString + " ...");
+for( String urlString : urls ) {
+logger.info("Downloading JSON dump file " + fileName + " from "
++ urlString + " ...");
-if (!isAvailable()) {
-throw new IOException(
-"Dump file not available (yet). Aborting dump retrieval.");
+if (!isAvailable()) {
+throw new IOException(
+"Dump file not available (yet). Aborting dump
retrieval.");
+}
+
+DirectoryManager dailyDirectoryManager =
this.dumpfileDirectoryManager
+
.getSubdirectoryManager(WmfDumpFile.getDumpFileDirectoryName(
+DumpContentType.JSON, this.dateStamp));
+
+try (InputStream inputStream = webResourceFetcher
+.getInputStreamForUrl(urlString)) {
+dailyDirectoryManager.createFileAtomic(fileName, inputStream);
+}
+
+this.isPrepared = true;
+
+logger.info("... completed download of JSON dump file " + fileName
++ " from " + urlString);
}
-
-DirectoryManager dailyDirectoryManager = this.dumpfileDirectoryManager
-.getSubdirectoryManager(WmfDumpFile.getDumpFileDirectoryName(
-DumpContentType.JSON, this.dateStamp));
-
-try (InputStream inputStream = webResourceFetcher
-.getInputStreamForUrl(urlString)) {
-dailyDirectoryManager.createFileAtomic(fileName, inputStream);
-}
-
-this.isPrepared = true;
-
-logger.info("... completed download of JSON dump file " + fileName
-+ " from " + urlString);
}
}
diff --git
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
index e2b98d1..0175431 100644
--- a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
+++ b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/DumpFetcher.java
@@ -94,7 +94,7 @@
String dumpLocation = entry.getKey();
MwDumpFile onlineDump = entry.getValue();
try{
-System.out.println("Looking for / downloading online dump
from: " + dumpLocation);
+System.out.println("Looking for & downloading online dump
from: " + dumpLocation);
onlineDump.prepareDumpFile();
System.out.println("Using dump from: " + dumpLocation);
return onlineDump;
--
To view, visit https://gerrit.wikimedia.org/r/317391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/toolkit-analyzer
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Addshore
___
MediaWiki-com
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer-build[production]: Check more archive.org dump paths
Addshore has submitted this change and it was merged. Change subject: Check more archive.org dump paths .. Check more archive.org dump paths Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24 --- M toolkit-analyzer.jar 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Addshore: Verified; Looks good to me, approved diff --git a/toolkit-analyzer.jar b/toolkit-analyzer.jar index ed908b3..145e4de 100644 --- a/toolkit-analyzer.jar +++ b/toolkit-analyzer.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/317393 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia001cdf359d7daffa36213d44d1d0ddc5e361f24 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/toolkit-analyzer-build Gerrit-Branch: production Gerrit-Owner: Addshore Gerrit-Reviewer: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-10-23T10:00:01+0000
jenkins-bot has submitted this change and it was merged.
Change subject: New Wikidata Build - 2016-10-23T10:00:01+
..
New Wikidata Build - 2016-10-23T10:00:01+
Change-Id: Idb947314b8d7bce7390097543c710bd0d5d860fb
---
M composer.lock
M extensions/Wikibase/client/WikibaseClient.i18n.magic.php
M extensions/Wikibase/client/config/WikibaseClient.default.php
M extensions/Wikibase/client/config/WikibaseClient.jenkins.php
M extensions/Wikibase/client/i18n/pt.json
M extensions/Wikibase/client/i18n/tr.json
M
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/Runner.php
M
extensions/Wikibase/client/includes/DataAccess/PropertyParserFunction/StatementGroupRendererFactory.php
M extensions/Wikibase/client/includes/Hooks/ParserFunctionRegistrant.php
M
extensions/Wikibase/client/tests/phpunit/includes/Hooks/ParserFunctionRegistrantTest.php
M extensions/Wikibase/docs/options.wiki
M extensions/Wikibase/lib/i18n/en.json
M extensions/Wikibase/lib/i18n/is.json
M extensions/Wikibase/lib/i18n/pt.json
M extensions/Wikibase/lib/i18n/uk.json
M extensions/Wikibase/repo/i18n/en.json
M extensions/Wikibase/repo/i18n/is.json
M extensions/Wikibase/repo/i18n/pl.json
M extensions/Wikibase/repo/i18n/pt.json
M extensions/Wikibase/repo/i18n/qqq.json
M extensions/Wikibase/repo/i18n/uk.json
M extensions/Wikibase/repo/includes/ItemDisambiguation.php
M vendor/composer/installed.json
23 files changed, 128 insertions(+), 52 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 750841a..9e1d5cf 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1574,12 +1574,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
-"reference": "fac7b49ef1d5bb499c1819a2086eca714988aab7"
+"reference": "60cffa1069a20fe6949ad5028bfd286483c615e1"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/fac7b49ef1d5bb499c1819a2086eca714988aab7";,
-"reference": "fac7b49ef1d5bb499c1819a2086eca714988aab7",
+"url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/60cffa1069a20fe6949ad5028bfd286483c615e1";,
+"reference": "60cffa1069a20fe6949ad5028bfd286483c615e1",
"shasum": ""
},
"require": {
@@ -1653,7 +1653,7 @@
"wikibaserepo",
"wikidata"
],
-"time": "2016-10-21 20:39:14"
+"time": "2016-10-22 20:49:56"
},
{
"name": "wikibase/wikimedia-badges",
diff --git a/extensions/Wikibase/client/WikibaseClient.i18n.magic.php
b/extensions/Wikibase/client/WikibaseClient.i18n.magic.php
index a87be89..7bf75c4 100644
--- a/extensions/Wikibase/client/WikibaseClient.i18n.magic.php
+++ b/extensions/Wikibase/client/WikibaseClient.i18n.magic.php
@@ -14,6 +14,7 @@
$magicWords['en'] = array(
'noexternallanglinks' => array( 0, 'noexternallanglinks' ),
'property' => array( 0, 'property' ),
+ 'statements' => array( 0, 'statements' ),
'wbreponame' => array( 0, 'wbreponame' ),
);
diff --git a/extensions/Wikibase/client/config/WikibaseClient.default.php
b/extensions/Wikibase/client/config/WikibaseClient.default.php
index 532b67d..b609d7d 100644
--- a/extensions/Wikibase/client/config/WikibaseClient.default.php
+++ b/extensions/Wikibase/client/config/WikibaseClient.default.php
@@ -50,6 +50,7 @@
// in the parser functions and via Lua.
// Allows users to split the ParserCache by user language.
'allowDataAccessInUserLanguage' => false,
+ 'enableStatementsParserFunction' => false,
/**
* Prefix to use for cache keys that should be shared among a
Wikibase Repo instance and all
diff --git a/extensions/Wikibase/client/config/WikibaseClient.jenkins.php
b/extensions/Wikibase/client/config/WikibaseClient.jenkins.php
index 4e98235..c354e41 100644
--- a/extensions/Wikibase/client/config/WikibaseClient.jenkins.php
+++ b/extensions/Wikibase/client/config/WikibaseClient.jenkins.php
@@ -15,3 +15,6 @@
// group in the sites table during testing.
// NOTE: This can be removed once T126596 is implemented.
$wgWBClientSettings['siteGroup'] = "mywikigroup";
+
+// TODO: Remove the feature flag when not needed any more!
+$wgWBClientSettings['enableStatementsParserFunction'] = true;
diff --git a/extensions/Wikibase/client/i18n/pt.json
b/extensions/Wikibase/client/i18n/pt.json
index a59c768..618a89e 100644
--- a/extensions/Wikibase/client/i18n/pt.json
+++ b/extensions/Wikibase/client/i18n/pt.json
@@ -85,7 +85,7 @@
"wikibase-rc-show-wikidata-pre
[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Update portuguese localization
Sophivorus has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317395
Change subject: Update portuguese localization
..
Update portuguese localization
Change-Id: I6009980e337fec263beb92c52b1e56087ad87317
---
M i18n/pt.json
1 file changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikipedia/gadgets/ProveIt
refs/changes/95/317395/1
diff --git a/i18n/pt.json b/i18n/pt.json
index 2a2665f..6c1f4be 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -1,20 +1,21 @@
{
"@metadata": {
"authors": [
- "Felipe Schenone"
+ "Felipe Schenone",
+ "He7d3r"
]
},
"proveit-list-tab": "Lista ($1)",
"proveit-add-tab": "Adicionar",
- "proveit-reference-name-label": "Nome de referência",
+ "proveit-reference-name-label": "Nome da referência",
"proveit-reference-content-label": "Conteúdo de referência",
- "proveit-reference-template-label": "Predefinição mestre",
- "proveit-cite-button": "Citação",
+ "proveit-reference-template-label": "Predefinição principal",
+ "proveit-cite-button": "Citar",
"proveit-remove-button": "Excluir",
"proveit-insert-button": "Inserir",
"proveit-update-button": "Atualizar",
- "proveit-prompt-name": "A referência precisa de um nome a ser citados:",
- "proveit-confirm-remove": "Isso elimina a referência e todos os
compromissos. Tem certeza?",
+ "proveit-prompt-name": "A referência precisa de um nome para ser
citada:",
+ "proveit-confirm-remove": "Isso eliminará a referência e todas as
citações da mesma. Tem certeza?",
"proveit-no-template": "Sem predefinição",
- "proveit-no-references": "Não há referências encontradas"
+ "proveit-no-references": "Não foram encontradas referências"
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/317395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6009980e337fec263beb92c52b1e56087ad87317
Gerrit-PatchSet: 1
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Minor doc changes for the rename
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317396
Change subject: Minor doc changes for the rename
..
Minor doc changes for the rename
Change-Id: Ie7c00fc6fb57fcb44568281dd0a7fdcccea69fa9
---
M includes/PF_AutoeditAPI.php
M includes/PF_Hooks.php
M includes/PF_Template.php
M includes/PF_TemplateInForm.php
M languages/PF_Namespaces.php
M specials/PF_UploadForm.php
M specials/PF_UploadWindow.php
M tests/bootstrap.php
8 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/96/317396/1
diff --git a/includes/PF_AutoeditAPI.php b/includes/PF_AutoeditAPI.php
index 92c1459..8c835b1 100644
--- a/includes/PF_AutoeditAPI.php
+++ b/includes/PF_AutoeditAPI.php
@@ -1234,7 +1234,7 @@
*/
function getDescription() {
return <text();
- $smw_docu_row->addItem( ALItem::newFromExternalLink(
"http://www.mediawiki.org/wiki/Extension:Semantic_Forms";, $pf_docu_label ) );
+ $smw_docu_row->addItem( ALItem::newFromExternalLink(
"https://www.mediawiki.org/wiki/Extension:Page_Forms";, $pf_docu_label ) );
}
return true;
diff --git a/includes/PF_Template.php b/includes/PF_Template.php
index 803e59c..9c76462 100644
--- a/includes/PF_Template.php
+++ b/includes/PF_Template.php
@@ -98,7 +98,7 @@
// There was an error in the preg_match_all()
// call - let the user know about it.
if ( preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR ) {
- print 'Semantic Forms error: backtrace limit
exceeded during parsing! Please increase the value of http://www.php.net/manual/en/pcre.configuration.php#ini.pcre.backtrack-limit";>pcre.backtrack_limit
in php.ini or LocalSettings.php.';
+ print 'Page Forms error: backtrace limit
exceeded during parsing! Please increase the value of http://www.php.net/manual/en/pcre.configuration.php#ini.pcre.backtrack-limit";>pcre.backtrack_limit
in php.ini or LocalSettings.php.';
}
}
diff --git a/includes/PF_TemplateInForm.php b/includes/PF_TemplateInForm.php
index e379952..edddf1d 100644
--- a/includes/PF_TemplateInForm.php
+++ b/includes/PF_TemplateInForm.php
@@ -333,7 +333,7 @@
// the "free text" field - which is bad, but it's
harder for the code to detect
// the problem - though hopefully, easier for users.)
if ( $uncompleted_curly_brackets > 0 ||
$uncompleted_square_brackets > 0 ) {
- throw new MWException(
"SemanticFormsMismatchedBrackets" );
+ throw new MWException(
"PageFormsMismatchedBrackets" );
}
$this->mFullTextInPage = substr(
$existing_page_content, $start_char, $i - $start_char );
}
diff --git a/languages/PF_Namespaces.php b/languages/PF_Namespaces.php
index e7c3cc8..601244b 100644
--- a/languages/PF_Namespaces.php
+++ b/languages/PF_Namespaces.php
@@ -1,7 +1,7 @@
mSourceIds[] = $field['id'];
}
- // added for Semantic Forms
+ // added for Page Forms
$this->addHiddenField( 'pfInputID', $options['pfInputID'] );
$this->addHiddenField( 'pfDelimiter', $options['pfDelimiter'] );
diff --git a/specials/PF_UploadWindow.php b/specials/PF_UploadWindow.php
index d85fd7b..82c0a10 100644
--- a/specials/PF_UploadWindow.php
+++ b/specials/PF_UploadWindow.php
@@ -51,7 +51,7 @@
public $mCancelUpload; // The user clicked "Cancel and return
to upload form" button
public $mTokenOk;
- /** used by Semantic Forms **/
+ /** used by Page Forms **/
public $mInputID;
public $mDelimiter;
@@ -363,7 +363,7 @@
return $this->uploadError( $this->getOutput()->parse(
$status->getWikiText() ) );
// $this->getOutput()->redirect(
$this->mLocalFile->getTitle()->getFullURL() );
- // Semantic Forms change - output Javascript to either
+ // Page Forms change - output Javascript to either
// fill in or append to the field in original form, and
// close the window
# Chop off any directories in the given filename
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 17e188d..db0d032 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -29,7 +29,7 @@
if ( !$autoLoader instanceof \Composer\Autoload\ClassLoader ) {
// For now return true as long as PF is not compatible with
Composer
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Minor doc changes for the rename
Paladox has submitted this change and it was merged.
Change subject: Minor doc changes for the rename
..
Minor doc changes for the rename
Change-Id: Ie7c00fc6fb57fcb44568281dd0a7fdcccea69fa9
---
M includes/PF_AutoeditAPI.php
M includes/PF_Hooks.php
M includes/PF_Template.php
M includes/PF_TemplateInForm.php
M languages/PF_Namespaces.php
M specials/PF_UploadForm.php
M specials/PF_UploadWindow.php
M tests/bootstrap.php
8 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/includes/PF_AutoeditAPI.php b/includes/PF_AutoeditAPI.php
index 92c1459..8c835b1 100644
--- a/includes/PF_AutoeditAPI.php
+++ b/includes/PF_AutoeditAPI.php
@@ -1234,7 +1234,7 @@
*/
function getDescription() {
return <text();
- $smw_docu_row->addItem( ALItem::newFromExternalLink(
"http://www.mediawiki.org/wiki/Extension:Semantic_Forms";, $pf_docu_label ) );
+ $smw_docu_row->addItem( ALItem::newFromExternalLink(
"https://www.mediawiki.org/wiki/Extension:Page_Forms";, $pf_docu_label ) );
}
return true;
diff --git a/includes/PF_Template.php b/includes/PF_Template.php
index 803e59c..9c76462 100644
--- a/includes/PF_Template.php
+++ b/includes/PF_Template.php
@@ -98,7 +98,7 @@
// There was an error in the preg_match_all()
// call - let the user know about it.
if ( preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR ) {
- print 'Semantic Forms error: backtrace limit
exceeded during parsing! Please increase the value of http://www.php.net/manual/en/pcre.configuration.php#ini.pcre.backtrack-limit";>pcre.backtrack_limit
in php.ini or LocalSettings.php.';
+ print 'Page Forms error: backtrace limit
exceeded during parsing! Please increase the value of http://www.php.net/manual/en/pcre.configuration.php#ini.pcre.backtrack-limit";>pcre.backtrack_limit
in php.ini or LocalSettings.php.';
}
}
diff --git a/includes/PF_TemplateInForm.php b/includes/PF_TemplateInForm.php
index e379952..edddf1d 100644
--- a/includes/PF_TemplateInForm.php
+++ b/includes/PF_TemplateInForm.php
@@ -333,7 +333,7 @@
// the "free text" field - which is bad, but it's
harder for the code to detect
// the problem - though hopefully, easier for users.)
if ( $uncompleted_curly_brackets > 0 ||
$uncompleted_square_brackets > 0 ) {
- throw new MWException(
"SemanticFormsMismatchedBrackets" );
+ throw new MWException(
"PageFormsMismatchedBrackets" );
}
$this->mFullTextInPage = substr(
$existing_page_content, $start_char, $i - $start_char );
}
diff --git a/languages/PF_Namespaces.php b/languages/PF_Namespaces.php
index e7c3cc8..601244b 100644
--- a/languages/PF_Namespaces.php
+++ b/languages/PF_Namespaces.php
@@ -1,7 +1,7 @@
mSourceIds[] = $field['id'];
}
- // added for Semantic Forms
+ // added for Page Forms
$this->addHiddenField( 'pfInputID', $options['pfInputID'] );
$this->addHiddenField( 'pfDelimiter', $options['pfDelimiter'] );
diff --git a/specials/PF_UploadWindow.php b/specials/PF_UploadWindow.php
index d85fd7b..82c0a10 100644
--- a/specials/PF_UploadWindow.php
+++ b/specials/PF_UploadWindow.php
@@ -51,7 +51,7 @@
public $mCancelUpload; // The user clicked "Cancel and return
to upload form" button
public $mTokenOk;
- /** used by Semantic Forms **/
+ /** used by Page Forms **/
public $mInputID;
public $mDelimiter;
@@ -363,7 +363,7 @@
return $this->uploadError( $this->getOutput()->parse(
$status->getWikiText() ) );
// $this->getOutput()->redirect(
$this->mLocalFile->getTitle()->getFullURL() );
- // Semantic Forms change - output Javascript to either
+ // Page Forms change - output Javascript to either
// fill in or append to the field in original form, and
// close the window
# Chop off any directories in the given filename
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 17e188d..db0d032 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -29,7 +29,7 @@
if ( !$autoLoader instanceof \Composer\Autoload\ClassLoader ) {
// For now return true as long as PF is not compatible with
Composer
// of course if it is installed via
- // https://packagis
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Some minor doc / phpcs changes for the rename
Paladox has submitted this change and it was merged. Change subject: Some minor doc / phpcs changes for the rename .. Some minor doc / phpcs changes for the rename Change-Id: Ibecf1101fea0ad7c397536719e3e213e22168d0c --- M COPYING M libs/PF_autogrow.js M libs/PF_imagePreview.js M libs/PF_jsGrid.js M libs/PF_preview.js M phpunit.xml.dist M skins/PageForms.css 7 files changed, 7 insertions(+), 7 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved diff --git a/COPYING b/COPYING index 717ac37..d5d2989 100644 --- a/COPYING +++ b/COPYING @@ -3,7 +3,7 @@ "COPYING", or a subdirectory thereof. For those files, the license text contained in said file overrides any license information contained in directories of smaller depth. Alternative licenses are typically used for software that is provided by external -parties, and merely packaged with the Semantic Forms release for convenience. +parties, and merely packaged with the Page Forms release for convenience. GNU GENERAL PUBLIC LICENSE diff --git a/libs/PF_autogrow.js b/libs/PF_autogrow.js index dd044d3..c38647d 100644 --- a/libs/PF_autogrow.js +++ b/libs/PF_autogrow.js @@ -5,7 +5,7 @@ * Plugin' by Jevin O. Sewaruth: * http://www.technoreply.com/autogrow-textarea-plugin/ * - * Some modifications were made for the code to better work with Semantic + * Some modifications were made for the code to better work with Page * Forms. * * @author Jevin O. Sewaruth diff --git a/libs/PF_imagePreview.js b/libs/PF_imagePreview.js index 3ea167d..1ca7f0b 100644 --- a/libs/PF_imagePreview.js +++ b/libs/PF_imagePreview.js @@ -1,5 +1,5 @@ /** - * JavaScript for the Semantic Forms MediaWiki extension. + * JavaScript for the Page Forms MediaWiki extension. * * @licence GNU GPL v3+ * @author Jeroen De Dauw diff --git a/libs/PF_jsGrid.js b/libs/PF_jsGrid.js index bdd71ad..e493764 100644 --- a/libs/PF_jsGrid.js +++ b/libs/PF_jsGrid.js @@ -1,5 +1,5 @@ /** - * Code to integrate the pfGrid JavaScript library into Semantic Forms. + * Code to integrate the pfGrid JavaScript library into Page Forms. * * @author Yaron Koren */ diff --git a/libs/PF_preview.js b/libs/PF_preview.js index e925e84..d82c070 100644 --- a/libs/PF_preview.js +++ b/libs/PF_preview.js @@ -1,5 +1,5 @@ /** - * Handles dynamic Page Preview for Semantic Forms. + * Handles dynamic Page Preview for Page Forms. * * @author Stephan Gambke */ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index bd00243..e256910 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,7 +14,7 @@ strict="true" verbose="true"> - + tests/phpunit/includes diff --git a/skins/PageForms.css b/skins/PageForms.css index 3d6d813..5253c8a 100644 --- a/skins/PageForms.css +++ b/skins/PageForms.css @@ -1,5 +1,5 @@ /** - * The main CSS file for the Semantic Forms extension. + * The main CSS file for the Page Forms extension. */ /* Override "width: 100%" setting in standard MediaWiki skins */ -- To view, visit https://gerrit.wikimedia.org/r/317397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibecf1101fea0ad7c397536719e3e213e22168d0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Some minor doc / phpcs changes for the rename
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/317397 Change subject: Some minor doc / phpcs changes for the rename .. Some minor doc / phpcs changes for the rename Change-Id: Ibecf1101fea0ad7c397536719e3e213e22168d0c --- M COPYING M libs/PF_autogrow.js M libs/PF_imagePreview.js M libs/PF_jsGrid.js M libs/PF_preview.js M phpunit.xml.dist M skins/PageForms.css 7 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/97/317397/1 diff --git a/COPYING b/COPYING index 717ac37..d5d2989 100644 --- a/COPYING +++ b/COPYING @@ -3,7 +3,7 @@ "COPYING", or a subdirectory thereof. For those files, the license text contained in said file overrides any license information contained in directories of smaller depth. Alternative licenses are typically used for software that is provided by external -parties, and merely packaged with the Semantic Forms release for convenience. +parties, and merely packaged with the Page Forms release for convenience. GNU GENERAL PUBLIC LICENSE diff --git a/libs/PF_autogrow.js b/libs/PF_autogrow.js index dd044d3..c38647d 100644 --- a/libs/PF_autogrow.js +++ b/libs/PF_autogrow.js @@ -5,7 +5,7 @@ * Plugin' by Jevin O. Sewaruth: * http://www.technoreply.com/autogrow-textarea-plugin/ * - * Some modifications were made for the code to better work with Semantic + * Some modifications were made for the code to better work with Page * Forms. * * @author Jevin O. Sewaruth diff --git a/libs/PF_imagePreview.js b/libs/PF_imagePreview.js index 3ea167d..1ca7f0b 100644 --- a/libs/PF_imagePreview.js +++ b/libs/PF_imagePreview.js @@ -1,5 +1,5 @@ /** - * JavaScript for the Semantic Forms MediaWiki extension. + * JavaScript for the Page Forms MediaWiki extension. * * @licence GNU GPL v3+ * @author Jeroen De Dauw diff --git a/libs/PF_jsGrid.js b/libs/PF_jsGrid.js index bdd71ad..e493764 100644 --- a/libs/PF_jsGrid.js +++ b/libs/PF_jsGrid.js @@ -1,5 +1,5 @@ /** - * Code to integrate the pfGrid JavaScript library into Semantic Forms. + * Code to integrate the pfGrid JavaScript library into Page Forms. * * @author Yaron Koren */ diff --git a/libs/PF_preview.js b/libs/PF_preview.js index e925e84..d82c070 100644 --- a/libs/PF_preview.js +++ b/libs/PF_preview.js @@ -1,5 +1,5 @@ /** - * Handles dynamic Page Preview for Semantic Forms. + * Handles dynamic Page Preview for Page Forms. * * @author Stephan Gambke */ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index bd00243..e256910 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,7 +14,7 @@ strict="true" verbose="true"> - + tests/phpunit/includes diff --git a/skins/PageForms.css b/skins/PageForms.css index 3d6d813..5253c8a 100644 --- a/skins/PageForms.css +++ b/skins/PageForms.css @@ -1,5 +1,5 @@ /** - * The main CSS file for the Semantic Forms extension. + * The main CSS file for the Page Forms extension. */ /* Override "width: 100%" setting in standard MediaWiki skins */ -- To view, visit https://gerrit.wikimedia.org/r/317397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibecf1101fea0ad7c397536719e3e213e22168d0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikipedia...ProveIt[master]: Update portuguese localization
Sophivorus has submitted this change and it was merged.
Change subject: Update portuguese localization
..
Update portuguese localization
Change-Id: I6009980e337fec263beb92c52b1e56087ad87317
---
M i18n/pt.json
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Sophivorus: Verified; Looks good to me, approved
diff --git a/i18n/pt.json b/i18n/pt.json
index 2a2665f..6c1f4be 100644
--- a/i18n/pt.json
+++ b/i18n/pt.json
@@ -1,20 +1,21 @@
{
"@metadata": {
"authors": [
- "Felipe Schenone"
+ "Felipe Schenone",
+ "He7d3r"
]
},
"proveit-list-tab": "Lista ($1)",
"proveit-add-tab": "Adicionar",
- "proveit-reference-name-label": "Nome de referência",
+ "proveit-reference-name-label": "Nome da referência",
"proveit-reference-content-label": "Conteúdo de referência",
- "proveit-reference-template-label": "Predefinição mestre",
- "proveit-cite-button": "Citação",
+ "proveit-reference-template-label": "Predefinição principal",
+ "proveit-cite-button": "Citar",
"proveit-remove-button": "Excluir",
"proveit-insert-button": "Inserir",
"proveit-update-button": "Atualizar",
- "proveit-prompt-name": "A referência precisa de um nome a ser citados:",
- "proveit-confirm-remove": "Isso elimina a referência e todos os
compromissos. Tem certeza?",
+ "proveit-prompt-name": "A referência precisa de um nome para ser
citada:",
+ "proveit-confirm-remove": "Isso eliminará a referência e todas as
citações da mesma. Tem certeza?",
"proveit-no-template": "Sem predefinição",
- "proveit-no-references": "Não há referências encontradas"
+ "proveit-no-references": "Não foram encontradas referências"
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/317395
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6009980e337fec263beb92c52b1e56087ad87317
Gerrit-PatchSet: 2
Gerrit-Project: wikipedia/gadgets/ProveIt
Gerrit-Branch: master
Gerrit-Owner: Sophivorus
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Sophivorus
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Rename i18n messages part 1
Paladox has submitted this change and it was merged. Change subject: Rename i18n messages part 1 .. Rename i18n messages part 1 Bug: T147582 Change-Id: I3c17cf9f7206f877bc0088f35fc46fe2ad4a187f --- M i18n/af.json M i18n/aln.json M i18n/am.json M i18n/an.json M i18n/ar.json M i18n/arc.json M i18n/arz.json M i18n/ast.json M i18n/atj.json M i18n/avk.json M i18n/az.json M i18n/ba.json M i18n/bcc.json M i18n/bcl.json M i18n/be-tarask.json M i18n/be.json M i18n/bg.json M i18n/bgn.json M i18n/bjn.json M i18n/bn.json M i18n/bo.json M i18n/br.json M i18n/bs.json M i18n/ca.json M i18n/ce.json M i18n/ckb.json M i18n/cs.json M i18n/cu.json M i18n/cv.json M i18n/da.json M i18n/de-formal.json M i18n/de.json M i18n/diq.json M i18n/dsb.json M i18n/ee.json M i18n/el.json M i18n/eo.json M i18n/es.json M i18n/et.json M i18n/eu.json M i18n/fa.json M i18n/fi.json M i18n/fr.json M i18n/frp.json M i18n/frr.json M i18n/fy.json M i18n/ga.json M i18n/gl.json M i18n/gom-latn.json M i18n/gom.json M i18n/got.json M i18n/grc.json M i18n/gsw.json M i18n/gu.json M i18n/gv.json M i18n/ha.json M i18n/hak.json M i18n/haw.json M i18n/he.json M i18n/hi.json M i18n/hil.json M i18n/hr.json M i18n/hsb.json M i18n/ht.json M i18n/hu.json M i18n/ia.json M i18n/id.json 67 files changed, 4,440 insertions(+), 4,440 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/317398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c17cf9f7206f877bc0088f35fc46fe2ad4a187f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Rename i18n messages part 1
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/317398 Change subject: Rename i18n messages part 1 .. Rename i18n messages part 1 Bug: T147582 Change-Id: I3c17cf9f7206f877bc0088f35fc46fe2ad4a187f --- M i18n/af.json M i18n/aln.json M i18n/am.json M i18n/an.json M i18n/ar.json M i18n/arc.json M i18n/arz.json M i18n/ast.json M i18n/atj.json M i18n/avk.json M i18n/az.json M i18n/ba.json M i18n/bcc.json M i18n/bcl.json M i18n/be-tarask.json M i18n/be.json M i18n/bg.json M i18n/bgn.json M i18n/bjn.json M i18n/bn.json M i18n/bo.json M i18n/br.json M i18n/bs.json M i18n/ca.json M i18n/ce.json M i18n/ckb.json M i18n/cs.json M i18n/cu.json M i18n/cv.json M i18n/da.json M i18n/de-formal.json M i18n/de.json M i18n/diq.json M i18n/dsb.json M i18n/ee.json M i18n/el.json M i18n/eo.json M i18n/es.json M i18n/et.json M i18n/eu.json M i18n/fa.json M i18n/fi.json M i18n/fr.json M i18n/frp.json M i18n/frr.json M i18n/fy.json M i18n/ga.json M i18n/gl.json M i18n/gom-latn.json M i18n/gom.json M i18n/got.json M i18n/grc.json M i18n/gsw.json M i18n/gu.json M i18n/gv.json M i18n/ha.json M i18n/hak.json M i18n/haw.json M i18n/he.json M i18n/hi.json M i18n/hil.json M i18n/hr.json M i18n/hsb.json M i18n/ht.json M i18n/hu.json M i18n/ia.json M i18n/id.json 67 files changed, 4,440 insertions(+), 4,440 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/98/317398/1 -- To view, visit https://gerrit.wikimedia.org/r/317398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c17cf9f7206f877bc0088f35fc46fe2ad4a187f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: dev-T147086-passwordConfirmationHideInRegistration
MarySheikhha has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317400
Change subject: dev-T147086-passwordConfirmationHideInRegistration
..
dev-T147086-passwordConfirmationHideInRegistration
Change-Id: Ic99d0c5b9211b5c8df9398cf5e6dc76bcd14b548
---
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
1 file changed, 16 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/00/317400/1
diff --git
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index 1ff114d..72049b4 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -67,6 +67,8 @@
private CreateAccountFunnel funnel;
+private boolean passwordVisible;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -121,13 +123,21 @@
}
});
+passwordInput.setOnShowPasswordListener(new
PasswordTextInput.OnShowPasswordListener() {
+@Override
+public void onShowPasswordChecked(boolean checked) {
+passwordVisible = checked;
+passwordRepeatEdit.setVisibility(checked ? View.GONE :
View.VISIBLE);
+}
+});
+
// Don't allow user to submit registration unless they've put in a
username and password
new NonEmptyValidator(new
NonEmptyValidator.ValidationChangedCallback() {
@Override
public void onValidationChanged(boolean isValid) {
createAccountButton.setEnabled(isValid);
}
-}, usernameEdit, passwordEdit, passwordRepeatEdit);
+}, usernameEdit, passwordEdit);
// Don't allow user to continue when they're shown a captcha until
they fill it in
new NonEmptyValidator(new
NonEmptyValidator.ValidationChangedCallback() {
@@ -232,8 +242,12 @@
if (emailEdit.getText().length() != 0) {
email = emailEdit.getText().toString();
}
+
+String password = passwordEdit.getText().toString();
+String passwordRepeat = passwordVisible ? password :
passwordRepeatEdit.getText().toString();
+
new CreateAccountTask(usernameEdit.getText().toString(),
passwordEdit.getText().toString(),
- passwordRepeatEdit.getText().toString(), token,
email) {
+ passwordRepeat, token, email) {
@Override
public void onBeforeExecute() {
progressDialog.show();
--
To view, visit https://gerrit.wikimedia.org/r/317400
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic99d0c5b9211b5c8df9398cf5e6dc76bcd14b548
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: MarySheikhha
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer[master]: Don't bail after first archive.org dump try
Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317401
Change subject: Don't bail after first archive.org dump try
..
Don't bail after first archive.org dump try
Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751
---
M
analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
1 file changed, 23 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/toolkit-analyzer
refs/changes/01/317401/1
diff --git
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
index 8675a4d..a3537f7 100644
---
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
+++
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
@@ -93,27 +93,34 @@
urls.add( "http://archive.org/download/wikidata-json-"; +
this.dateStamp + "/" + this.dateStamp + ".json.gz" );
for( String urlString : urls ) {
-logger.info("Downloading JSON dump file " + fileName + " from "
-+ urlString + " ...");
+try {
+logger.info("Downloading JSON dump file " + fileName + " from "
++ urlString + " ...");
-if (!isAvailable()) {
-throw new IOException(
-"Dump file not available (yet). Aborting dump
retrieval.");
-}
+if (!isAvailable()) {
+continue;
+}
-DirectoryManager dailyDirectoryManager =
this.dumpfileDirectoryManager
-
.getSubdirectoryManager(WmfDumpFile.getDumpFileDirectoryName(
-DumpContentType.JSON, this.dateStamp));
+DirectoryManager dailyDirectoryManager =
this.dumpfileDirectoryManager
+
.getSubdirectoryManager(WmfDumpFile.getDumpFileDirectoryName(
+DumpContentType.JSON, this.dateStamp));
-try (InputStream inputStream = webResourceFetcher
-.getInputStreamForUrl(urlString)) {
+InputStream inputStream = webResourceFetcher
+.getInputStreamForUrl(urlString);
+
dailyDirectoryManager.createFileAtomic(fileName, inputStream);
+
+this.isPrepared = true;
+
+logger.info("... completed download of JSON dump file " +
fileName
++ " from " + urlString);
+return;
+} catch (Exception ignored) {
}
-
-this.isPrepared = true;
-
-logger.info("... completed download of JSON dump file " + fileName
-+ " from " + urlString);
}
+
+throw new IOException(
+"Dump file not available (yet). Aborting dump retrieval."
+);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/317401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/toolkit-analyzer
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer-build[production]: Don't bail after first archive.org dump try
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/317403 Change subject: Don't bail after first archive.org dump try .. Don't bail after first archive.org dump try Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751 --- M toolkit-analyzer.jar 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/toolkit-analyzer-build refs/changes/03/317403/1 diff --git a/toolkit-analyzer.jar b/toolkit-analyzer.jar index 145e4de..3a50dd7 100644 --- a/toolkit-analyzer.jar +++ b/toolkit-analyzer.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/317403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/toolkit-analyzer-build Gerrit-Branch: production Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer-build[master]: Don't bail after first archive.org dump try
Addshore has uploaded a new change for review. https://gerrit.wikimedia.org/r/317402 Change subject: Don't bail after first archive.org dump try .. Don't bail after first archive.org dump try Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751 --- M toolkit-analyzer.jar 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/toolkit-analyzer-build refs/changes/02/317402/1 diff --git a/toolkit-analyzer.jar b/toolkit-analyzer.jar index 145e4de..3a50dd7 100644 --- a/toolkit-analyzer.jar +++ b/toolkit-analyzer.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/317402 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/toolkit-analyzer-build Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer[master]: Don't bail after first archive.org dump try
Addshore has submitted this change and it was merged.
Change subject: Don't bail after first archive.org dump try
..
Don't bail after first archive.org dump try
Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751
---
M
analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
1 file changed, 23 insertions(+), 16 deletions(-)
Approvals:
Addshore: Verified; Looks good to me, approved
diff --git
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
index 8675a4d..a3537f7 100644
---
a/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
+++
b/analyzer/src/main/java/org/wikidata/analyzer/Fetcher/ArchiveOrgJsonOnlineDumpFile.java
@@ -93,27 +93,34 @@
urls.add( "http://archive.org/download/wikidata-json-"; +
this.dateStamp + "/" + this.dateStamp + ".json.gz" );
for( String urlString : urls ) {
-logger.info("Downloading JSON dump file " + fileName + " from "
-+ urlString + " ...");
+try {
+logger.info("Downloading JSON dump file " + fileName + " from "
++ urlString + " ...");
-if (!isAvailable()) {
-throw new IOException(
-"Dump file not available (yet). Aborting dump
retrieval.");
-}
+if (!isAvailable()) {
+continue;
+}
-DirectoryManager dailyDirectoryManager =
this.dumpfileDirectoryManager
-
.getSubdirectoryManager(WmfDumpFile.getDumpFileDirectoryName(
-DumpContentType.JSON, this.dateStamp));
+DirectoryManager dailyDirectoryManager =
this.dumpfileDirectoryManager
+
.getSubdirectoryManager(WmfDumpFile.getDumpFileDirectoryName(
+DumpContentType.JSON, this.dateStamp));
-try (InputStream inputStream = webResourceFetcher
-.getInputStreamForUrl(urlString)) {
+InputStream inputStream = webResourceFetcher
+.getInputStreamForUrl(urlString);
+
dailyDirectoryManager.createFileAtomic(fileName, inputStream);
+
+this.isPrepared = true;
+
+logger.info("... completed download of JSON dump file " +
fileName
++ " from " + urlString);
+return;
+} catch (Exception ignored) {
}
-
-this.isPrepared = true;
-
-logger.info("... completed download of JSON dump file " + fileName
-+ " from " + urlString);
}
+
+throw new IOException(
+"Dump file not available (yet). Aborting dump retrieval."
+);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/317401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/toolkit-analyzer
Gerrit-Branch: master
Gerrit-Owner: Addshore
Gerrit-Reviewer: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer-build[master]: Don't bail after first archive.org dump try
Addshore has submitted this change and it was merged. Change subject: Don't bail after first archive.org dump try .. Don't bail after first archive.org dump try Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751 --- M toolkit-analyzer.jar 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Addshore: Verified; Looks good to me, approved diff --git a/toolkit-analyzer.jar b/toolkit-analyzer.jar index 145e4de..3a50dd7 100644 --- a/toolkit-analyzer.jar +++ b/toolkit-analyzer.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/317402 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/toolkit-analyzer-build Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] analytics...toolkit-analyzer-build[production]: Don't bail after first archive.org dump try
Addshore has submitted this change and it was merged. Change subject: Don't bail after first archive.org dump try .. Don't bail after first archive.org dump try Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751 --- M toolkit-analyzer.jar 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Addshore: Verified; Looks good to me, approved diff --git a/toolkit-analyzer.jar b/toolkit-analyzer.jar index 145e4de..3a50dd7 100644 --- a/toolkit-analyzer.jar +++ b/toolkit-analyzer.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/317403 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4ef5406cf4d66f40b37986c498755f56bc76f751 Gerrit-PatchSet: 1 Gerrit-Project: analytics/wmde/toolkit-analyzer-build Gerrit-Branch: production Gerrit-Owner: Addshore Gerrit-Reviewer: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache frontends: 8x local ports 3120-3127
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317404
Change subject: cache frontends: 8x local ports 3120-3127
..
cache frontends: 8x local ports 3120-3127
Change-Id: Iee6bf43ef7a3a380f435bf866272da3b8b45cd10
---
M modules/role/manifests/cache/instances.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/317404/1
diff --git a/modules/role/manifests/cache/instances.pp
b/modules/role/manifests/cache/instances.pp
index e9c996f..d5e84e2 100644
--- a/modules/role/manifests/cache/instances.pp
+++ b/modules/role/manifests/cache/instances.pp
@@ -98,7 +98,7 @@
layer => 'frontend',
vcl=> "${title}-frontend",
extra_vcl => $fe_extra_vcl,
-ports => [ 80, 3127 ],
+ports => [ 80, 3120, 3121, 3122, 3123, 3124, 3125, 3126,
3127 ],
admin_port => 6082,
runtime_parameters => $fe_runtime_params,
storage=> "-s malloc,${fe_mem_gb}G",
--
To view, visit https://gerrit.wikimedia.org/r/317404
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee6bf43ef7a3a380f435bf866272da3b8b45cd10
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: tlsproxy: use 8x FE ports to balance
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317405
Change subject: tlsproxy: use 8x FE ports to balance
..
tlsproxy: use 8x FE ports to balance
Change-Id: I918b0ffe1163e705b11e4e74ca4189cfe8026ae0
---
M modules/role/manifests/cache/ssl/misc.pp
M modules/role/manifests/cache/ssl/unified.pp
M modules/tlsproxy/manifests/localssl.pp
M modules/tlsproxy/templates/localssl.erb
4 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/05/317405/1
diff --git a/modules/role/manifests/cache/ssl/misc.pp
b/modules/role/manifests/cache/ssl/misc.pp
index b817dc2..fe487f4 100644
--- a/modules/role/manifests/cache/ssl/misc.pp
+++ b/modules/role/manifests/cache/ssl/misc.pp
@@ -9,7 +9,7 @@
certs => ['ecc-star.wmfusercontent.org',
'star.wmfusercontent.org'],
server_name=> 'wmfusercontent.org',
server_aliases => ['*.wmfusercontent.org'],
-upstream_port => 3127,
+upstream_ports => [3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127],
redir_port => 8080,
}
@@ -18,7 +18,7 @@
certs => ['ecc-star.planet.wikimedia.org',
'star.planet.wikimedia.org'],
server_name=> 'planet.wikimedia.org',
server_aliases => ['*.planet.wikimedia.org'],
-upstream_port => 3127,
+upstream_ports => [3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127],
redir_port => 8080,
}
}
diff --git a/modules/role/manifests/cache/ssl/unified.pp
b/modules/role/manifests/cache/ssl/unified.pp
index 2141f52..0bec282 100644
--- a/modules/role/manifests/cache/ssl/unified.pp
+++ b/modules/role/manifests/cache/ssl/unified.pp
@@ -13,7 +13,7 @@
certs => ['ecc-uni.wikimedia.org', 'uni.wikimedia.org'],
default_server => true,
do_ocsp=> true,
-upstream_port => 3127,
+upstream_ports => [3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127],
redir_port => 8080,
}
}
@@ -24,7 +24,7 @@
default_server => true,
do_ocsp=> false,
skip_private => true,
-upstream_port => 3127,
+upstream_ports => [3120, 3121, 3122, 3123, 3124, 3125, 3126, 3127],
redir_port => 8080,
}
}
diff --git a/modules/tlsproxy/manifests/localssl.pp
b/modules/tlsproxy/manifests/localssl.pp
index 5902891..73cf7ff 100644
--- a/modules/tlsproxy/manifests/localssl.pp
+++ b/modules/tlsproxy/manifests/localssl.pp
@@ -22,8 +22,8 @@
# will be listed as Subject Alternative Names.
# There should be no more than 100 entries in this.
#
-# [*upstream_port*]
-# TCP port to proxy to. Defaults to '80'
+# [*upstream_ports*]
+# TCP ports array to proxy to. Defaults to ['80']
#
# [*redir_port*]
# TCP port to listen on as plain HTTP. This listener will redirect GET/HEAD
@@ -46,7 +46,7 @@
$server_name= $::fqdn,
$server_aliases = [],
$default_server = false,
-$upstream_port = '80',
+$upstream_ports = ['80'],
$redir_port = undef,
$do_ocsp= false,
$skip_private = false,
diff --git a/modules/tlsproxy/templates/localssl.erb
b/modules/tlsproxy/templates/localssl.erb
index 4cbdf1b..216cbe5 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -1,7 +1,9 @@
# Proxy site configuration file for <%= @name %>
# This file is managed by Puppet!
upstream local_fe_<%= @basename %> {
+<%- @upstream_ports do |upstream_port| -%>
server <%= @ipaddress %>:<%= @upstream_port %> max_fails=0;
+<%- end -%>
<% if @varnish_version4 and @keepalives_per_worker.to_i > 0 -%>
keepalive <%= @keepalives_per_worker %>; # Note: commonly up to 48 workers!
<% end -%>
--
To view, visit https://gerrit.wikimedia.org/r/317405
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I918b0ffe1163e705b11e4e74ca4189cfe8026ae0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: tlsproxy: raise worker connection limits, too
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317414
Change subject: tlsproxy: raise worker connection limits, too
..
tlsproxy: raise worker connection limits, too
Change-Id: Id15ef81f96027371ff70cf6d72676622e7856386
---
M modules/tlsproxy/manifests/instance.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/14/317414/1
diff --git a/modules/tlsproxy/manifests/instance.pp
b/modules/tlsproxy/manifests/instance.pp
index 889912c..ad9317e 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -19,7 +19,7 @@
$varnish_version4 = hiera('varnish_version4', false)
$keepalives_per_worker =
hiera('tlsproxy::localssl::keepalives_per_worker', 0)
$websocket_support = hiera('cache::websocket_support', false)
-$nginx_worker_connections = '32768'
+$nginx_worker_connections = '131072'
$nginx_ssl_conf = ssl_ciphersuite('nginx', 'compat')
$nginx_tune_for_media = hiera('cache::tune_for_media', false)
--
To view, visit https://gerrit.wikimedia.org/r/317414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id15ef81f96027371ff70cf6d72676622e7856386
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Using JavaScript colour/hubimage browsers in action=edit mode.
Harej has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317446
Change subject: Using JavaScript colour/hubimage browsers in action=edit mode.
..
Using JavaScript colour/hubimage browsers in action=edit mode.
Change-Id: I769eb8d6412d4c0b699011b309f24ffc1ca9d293
---
M includes/CollaborationHubContentEditor.php
1 file changed, 7 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/46/317446/1
diff --git a/includes/CollaborationHubContentEditor.php
b/includes/CollaborationHubContentEditor.php
index 4bacd07..c5af60a 100644
--- a/includes/CollaborationHubContentEditor.php
+++ b/includes/CollaborationHubContentEditor.php
@@ -29,7 +29,6 @@
* @return array
*/
protected function getFormFields( $parts ) {
-
$fields = [
// Display name can be different from page title
'display_name' => new OOUI\FieldLayout(
@@ -152,8 +151,14 @@
$out = RequestContext::getMain()->getOutput();
$pageLang = $this->getTitle()->getPageLanguage();
- $formFields = $this->getFormFields( $parts );
+ // Adding modules
+ $out->addModules( 'ext.CollaborationKit.colour' );
+ $out->addModules( 'ext.CollaborationKit.hubimage' );
+ $out->addModuleStyles(
'ext.CollaborationKit.colourbrowser.styles' );
+ $out->addJsConfigVars( 'wgCollaborationKitIconList',
CollaborationKitIcon::getCannedIcons() );
+ $out->addJsConfigVars( 'wgCollaborationKitColourList',
CollaborationHubContent::getThemeColours() );
+ $formFields = $this->getFormFields( $parts );
$htmlForm = new OOUI\FieldsetLayout( [ 'items' => $formFields ]
);
$out->enableOOUI();
$out->addHtml( $htmlForm );
--
To view, visit https://gerrit.wikimedia.org/r/317446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I769eb8d6412d4c0b699011b309f24ffc1ca9d293
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs...ZppixBot[master]: DO NOT SUBMIT. Test commit for grrrit.
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/317447 Change subject: DO NOT SUBMIT. Test commit for grrrit. .. DO NOT SUBMIT. Test commit for grrrit. Change-Id: Ibd49d52b54c15741cecb601a2595ecf8b1e8f542 --- A test-file 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/tools/ZppixBot refs/changes/47/317447/1 diff --git a/test-file b/test-file new file mode 100644 index 000..073bdfe --- /dev/null +++ b/test-file @@ -0,0 +1 @@ +test-file -- To view, visit https://gerrit.wikimedia.org/r/317447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd49d52b54c15741cecb601a2595ecf8b1e8f542 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/ZppixBot Gerrit-Branch: master Gerrit-Owner: QChris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Update i18n messages part 2
Paladox has submitted this change and it was merged. Change subject: Update i18n messages part 2 .. Update i18n messages part 2 Bug: T147582 Change-Id: Id8965cf716b0677a84d6187166653b7921662ba5 --- M i18n/en.json M i18n/ig.json M i18n/inh.json M i18n/io.json M i18n/is.json M i18n/it.json M i18n/ja.json M i18n/jbo.json M i18n/jv.json M i18n/ka.json M i18n/kiu.json M i18n/km.json M i18n/kn.json M i18n/ko.json M i18n/krc.json M i18n/kri.json M i18n/krj.json M i18n/ksh.json M i18n/ku-latn.json M i18n/kw.json M i18n/ky.json M i18n/li.json M i18n/lki.json M i18n/lt.json M i18n/lv.json M i18n/mhr.json M i18n/min.json M i18n/ml.json M i18n/mn.json M i18n/mr.json M i18n/ms.json M i18n/mt.json M i18n/myv.json M i18n/mzn.json M i18n/nah.json M i18n/nb.json M i18n/nds-nl.json M i18n/nds.json M i18n/ne.json M i18n/niu.json M i18n/nl.json M i18n/nn.json M i18n/nso.json M i18n/oc.json M i18n/om.json M i18n/os.json M i18n/pa.json M i18n/pam.json M i18n/pdc.json M i18n/pfl.json M i18n/pl.json M i18n/pms.json M i18n/ps.json M i18n/pt-br.json M i18n/qqq.json M i18n/rif.json M i18n/ro.json M i18n/roa-tara.json M i18n/ru.json M i18n/rue.json M i18n/sa.json M i18n/sah.json M i18n/sc.json M i18n/sco.json M i18n/si.json M i18n/sk.json M i18n/sl.json M i18n/sq.json M i18n/sr-ec.json M i18n/sr-el.json M i18n/stq.json M i18n/sv.json M i18n/sw.json M i18n/szl.json M i18n/ta.json M i18n/tcy.json M i18n/te.json M i18n/tet.json M i18n/tg-cyrl.json M i18n/tg-latn.json M i18n/th.json M i18n/tk.json M i18n/tl.json M i18n/tr.json M i18n/tt-cyrl.json M i18n/tzm.json M i18n/udm.json M i18n/uk.json M i18n/ur.json M i18n/uz.json M i18n/vep.json M i18n/vi.json M i18n/vo.json M i18n/wa.json M i18n/wuu.json M i18n/yi.json M i18n/zh-hans.json M i18n/zh-hant.json 98 files changed, 4,964 insertions(+), 4,964 deletions(-) Approvals: Paladox: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/317448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8965cf716b0677a84d6187166653b7921662ba5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Update i18n messages part 2
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/317448 Change subject: Update i18n messages part 2 .. Update i18n messages part 2 Bug: T147582 Change-Id: Id8965cf716b0677a84d6187166653b7921662ba5 --- M i18n/en.json M i18n/ig.json M i18n/inh.json M i18n/io.json M i18n/is.json M i18n/it.json M i18n/ja.json M i18n/jbo.json M i18n/jv.json M i18n/ka.json M i18n/kiu.json M i18n/km.json M i18n/kn.json M i18n/ko.json M i18n/krc.json M i18n/kri.json M i18n/krj.json M i18n/ksh.json M i18n/ku-latn.json M i18n/kw.json M i18n/ky.json M i18n/li.json M i18n/lki.json M i18n/lt.json M i18n/lv.json M i18n/mhr.json M i18n/min.json M i18n/ml.json M i18n/mn.json M i18n/mr.json M i18n/ms.json M i18n/mt.json M i18n/myv.json M i18n/mzn.json M i18n/nah.json M i18n/nb.json M i18n/nds-nl.json M i18n/nds.json M i18n/ne.json M i18n/niu.json M i18n/nl.json M i18n/nn.json M i18n/nso.json M i18n/oc.json M i18n/om.json M i18n/os.json M i18n/pa.json M i18n/pam.json M i18n/pdc.json M i18n/pfl.json M i18n/pl.json M i18n/pms.json M i18n/ps.json M i18n/pt-br.json M i18n/qqq.json M i18n/rif.json M i18n/ro.json M i18n/roa-tara.json M i18n/ru.json M i18n/rue.json M i18n/sa.json M i18n/sah.json M i18n/sc.json M i18n/sco.json M i18n/si.json M i18n/sk.json M i18n/sl.json M i18n/sq.json M i18n/sr-ec.json M i18n/sr-el.json M i18n/stq.json M i18n/sv.json M i18n/sw.json M i18n/szl.json M i18n/ta.json M i18n/tcy.json M i18n/te.json M i18n/tet.json M i18n/tg-cyrl.json M i18n/tg-latn.json M i18n/th.json M i18n/tk.json M i18n/tl.json M i18n/tr.json M i18n/tt-cyrl.json M i18n/tzm.json M i18n/udm.json M i18n/uk.json M i18n/ur.json M i18n/uz.json M i18n/vep.json M i18n/vi.json M i18n/vo.json M i18n/wa.json M i18n/wuu.json M i18n/yi.json M i18n/zh-hans.json M i18n/zh-hant.json 98 files changed, 4,964 insertions(+), 4,964 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/48/317448/1 -- To view, visit https://gerrit.wikimedia.org/r/317448 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8965cf716b0677a84d6187166653b7921662ba5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Add PageForms mw extension as a submodule
Paladox has uploaded a new change for review. https://gerrit.wikimedia.org/r/317449 Change subject: Add PageForms mw extension as a submodule .. Add PageForms mw extension as a submodule Bug: T147582 Change-Id: Ie0b31faf96449b235adb85bb0d3440ecf5cb56a0 --- M .gitmodules A PageForms 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/49/317449/1 diff --git a/.gitmodules b/.gitmodules index 75e792a..8e41185 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1806,6 +1806,10 @@ path = PagedTiffHandler url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PagedTiffHandler.git branch = . +[submodule "PageForms"] + path = PageForms + url = https://gerrit.wikimedia.org/r/mediawiki/extensions/PageForms + branch = . [submodule "PagesList"] path = PagesList url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/PagesList.git diff --git a/PageForms b/PageForms new file mode 16 index 000..8e87e78 --- /dev/null +++ b/PageForms @@ -0,0 +1 @@ +Subproject commit 8e87e78be7b9d1820064d38c4a390696d93400a7 -- To view, visit https://gerrit.wikimedia.org/r/317449 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0b31faf96449b235adb85bb0d3440ecf5cb56a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: POC: Secure redirect service
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317450
Change subject: POC: Secure redirect service
..
POC: Secure redirect service
This commit includes:
* Some config for testing on a specific labs instance
* Initial empty config for production
* A script to convert the existing redirects.dat file to the new config
structure
* A ruby function that chunks the list of configured domains for use with Let's
Encrypt
* Nginx site config and new puppet role
Copies some nginx config from the tlsproxy module.
Bug: T133548
Change-Id: If9199c914716fb165e7d6249a1fa5479a25d5859
---
A dump_secureredir_config.rb
A hieradata/labs/deployment-prep/host/deployment-secureredirexperiment.yaml
A hieradata/role/common/secureredir/server.yaml
A modules/role/lib/puppet/parser/functions/secureredir_letsencrypt.rb
A modules/role/manifests/secureredir/server.pp
A modules/role/templates/secureredir/nginx.conf.erb
6 files changed, 126 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/317450/1
diff --git a/dump_secureredir_config.rb b/dump_secureredir_config.rb
new file mode 100755
index 000..8d2b952
--- /dev/null
+++ b/dump_secureredir_config.rb
@@ -0,0 +1,36 @@
+#!/usr/bin/ruby
+domains = {}
+File.read('modules/mediawiki/files/apache/sites/redirects/redirects.dat').each_line
do |line|
+ if line[0] != '#' and line.strip != '' then
+parts = line.strip.split("\t")
+type = parts[0]
+domain = parts[1]
+if domain.include? "*" then
+ next # TODO: Figure out these cases
+end
+
+target = parts[2]
+if target[0..1] == '//' then
+ target = 'https:' + target
+end
+
+if type == 'override' then
+ urlparts = domain.split("/")
+ domain = urlparts[0]
+ path = "/" + urlparts[1..urlparts.length-1].join("/")
+elsif type == 'rewrite' then
+ path = nil
+ target = target + "/$1"
+elsif type == 'funnel' then
+ path = nil
+end
+
+if !domains.include? domain then
+ domains[domain] = {}
+end
+domains[domain][path] = target
+ end
+end
+
+require 'yaml'
+puts YAML.dump(domains)
\ No newline at end of file
diff --git
a/hieradata/labs/deployment-prep/host/deployment-secureredirexperiment.yaml
b/hieradata/labs/deployment-prep/host/deployment-secureredirexperiment.yaml
new file mode 100644
index 000..db85a67
--- /dev/null
+++ b/hieradata/labs/deployment-prep/host/deployment-secureredirexperiment.yaml
@@ -0,0 +1,7 @@
+secureredirconfig:
+1.secureredirtest.wmflabs.org:
+! "": https://store.wikimedia.org
+2.secureredirtest.wmflabs.org:
+! "": https://cs.wikinews.org/$1
+3.secureredirtest.wmflabs.org:
+/evaluating:
https://commons.wikimedia.org/wiki/File:Evaluating_Wikipedia_brochure.pdf
diff --git a/hieradata/role/common/secureredir/server.yaml
b/hieradata/role/common/secureredir/server.yaml
new file mode 100644
index 000..55af229
--- /dev/null
+++ b/hieradata/role/common/secureredir/server.yaml
@@ -0,0 +1 @@
+secureredirconfig: {}
\ No newline at end of file
diff --git
a/modules/role/lib/puppet/parser/functions/secureredir_letsencrypt.rb
b/modules/role/lib/puppet/parser/functions/secureredir_letsencrypt.rb
new file mode 100644
index 000..4153135
--- /dev/null
+++ b/modules/role/lib/puppet/parser/functions/secureredir_letsencrypt.rb
@@ -0,0 +1,23 @@
+module Puppet::Parser::Functions
+ newfunction(:secureredir_letsencrypt, :type => :rvalue, :arity => 1) do
|args|
+cert_groups = {}
+CERT_GROUP_LIMIT = 100
+# chunk args[0] by CERT_GROUP_LIMIT
+i = 0
+while true
+ certs = args[0][i..i+CERT_GROUP_LIMIT-1]
+ if certs and certs.length > 0 then
+id = i / CERT_GROUP_LIMIT
+cert_groups["secureredir_#{id}"] = {
+ 'subjects' => certs.join(','),
+ 'puppet_svc'=> 'nginx',
+ 'system_svc'=> 'nginx'
+}
+ else
+break # done
+ end
+ i += CERT_GROUP_LIMIT
+end
+return cert_groups
+ end
+end
diff --git a/modules/role/manifests/secureredir/server.pp
b/modules/role/manifests/secureredir/server.pp
new file mode 100644
index 000..8d1c293
--- /dev/null
+++ b/modules/role/manifests/secureredir/server.pp
@@ -0,0 +1,12 @@
+class role::secureredir::server {
+include ::letsencrypt
+$nginx_cfg = hiera_hash('secureredirconfig', {})
+
+$letsencrypt_cfg = secureredir_letsencrypt(keys($nginx_cfg))
+create_resources(letsencrypt::cert::integrated, $letsencrypt_cfg)
+
+$fastopen_pending_max = 150 # TODO
+nginx::site { 'ncredir.wikimedia.org':
+content => template('role/secureredir/nginx.conf.erb')
+}
+}
diff --git a/modules/role/templates/secureredir/nginx.conf.erb
b/modules/role/templates/secureredir/nginx.conf.erb
new file mode 100644
index 000..d0be710
--- /dev/null
+++ b/modules/role/templates/securere
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaPageViewInfo[master]: [WIP] Add cache layer to the service
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317451
Change subject: [WIP] Add cache layer to the service
..
[WIP] Add cache layer to the service
TODO:
* add tests
Change-Id: Ib8feb757caf1f19c0b245fd90aec42537b0a84a7
---
M extension.json
A includes/CachedPageViewService.php
M includes/PageViewInfo.hooks.php
M includes/ServiceWiring.php
4 files changed, 182 insertions(+), 28 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaPageViewInfo
refs/changes/51/317451/1
diff --git a/extension.json b/extension.json
index 3b0a945..8724a18 100644
--- a/extension.json
+++ b/extension.json
@@ -14,6 +14,7 @@
"AutoloadClasses": {
"PageViewInfo\\Hooks": "includes/PageViewInfo.hooks.php",
"PageViewInfo\\PageViewService": "includes/PageViewService.php",
+ "PageViewInfo\\CachedPageViewService":
"includes/CachedPageViewService.php",
"PageViewInfo\\WikimediaPageViewService":
"includes/WikimediaPageViewService.php"
},
"MessagesDirs": {
diff --git a/includes/CachedPageViewService.php
b/includes/CachedPageViewService.php
new file mode 100644
index 000..3a00f32
--- /dev/null
+++ b/includes/CachedPageViewService.php
@@ -0,0 +1,166 @@
+service = $service;
+ $this->cache = $cache;
+ $this->prefix = $prefix;
+ }
+
+ public function supports( $metric, $scope ) {
+ return $this->service->supports( $metric, $scope );
+ }
+
+ public function getPageData( array $titles, $metric = self::METRIC_VIEW
) {
+ $data = [];
+ $status = StatusValue::newGood( [] );
+ foreach ( $titles as $title ) {
+ /** @var Title $title */
+ $key = $this->cache->makeKey( 'pvi', $this->prefix,
$metric, md5( $title->getPrefixedText() ) );
+ $pageData = $this->cache->get( $key );
+ if ( $pageData ) {
+ $data[$title->getPrefixedDBkey()] = $pageData;
+ }
+ }
+ }
+
+ public function getSiteData( $metric = self::METRIC_VIEW ) {
+ return $this->getWithCache( $metric, self::SCOPE_SITE );
+ }
+
+ public function getTopPages( $metric = self::METRIC_VIEW ) {
+ return $this->getWithCache( $metric, self::SCOPE_TOP );
+ }
+
+ public function getCacheExpiry( $metric, $scope ) {
+ return $this->service->getCacheExpiry( $metric, $scope );
+ }
+
+ /**
+* Like BagOStuff::getWithSetCallback, but returns a StatusValue like
PageViewService calls do.
+* @param string $metric A METRIC_* constant
+* @param string $scope A SCOPE_* constant (except SCOPE_ARTICLE which
has its own method)
+* @return StatusValue
+*/
+ protected function getWithCache( $metric, $scope ) {
+ $key = $this->cache->makeKey( 'pvi', $this->prefix, $metric,
$scope );
+ $data = $this->cache->get( $key );
+ if ( $data !== false ) {
+ $status = StatusValue::newGood();
+ if ( isset( $data['#status'] ) ) {
+ $status =
StatusValue::newFromSerializableRepresentation( $data['#status'] );
+ unset( $data['#status'] );
+ }
+ $status->setResult( $status->isOK(), $data );
+ } else {
+ /** @var StatusValue $status */
+ switch ( $scope ) {
+ case self::SCOPE_SITE:
+ $status = $this->service->getSiteData(
$metric );
+ break;
+ case self::SCOPE_TOP:
+ $status = $this->service->getTopPages(
$metric );
+ break;
+ default:
+ throw new InvalidArgumentException(
"invalid scope: $scope" );
+ }
+ $data = $status->getValue();
+ if ( !$status->isGood() ) {
+ $data['#status'] =
$status->getSerializableRepresentation();
+ }
+ if ( $status->isOK() ) {
+ $expiry = $this->service->getCacheExpiry(
$metric, $scope );
+ } else {
+ $expiry = self::ERROR_EXPIRY;
+ }
+ $this->cache->set( $key, $data, $expiry );
+ }
+ return $status;
+ }
+
+ /**
+* The equivalent of getWithCache for multiple
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaPageViewInfo[master]: [WIP] Add API endpoints
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317452
Change subject: [WIP] Add API endpoints
..
[WIP] Add API endpoints
TODO:
* fix prop=pageviews result setting
* add uniques
* i18n
Bug: T144865
Change-Id: Icc3b078180c3ddb7f30c82f6033a931be09e5f22
---
M extension.json
M i18n/en.json
A includes/ApiQueryMostViewed.php
A includes/ApiQueryPageViews.php
A includes/ApiQuerySiteViews.php
5 files changed, 230 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaPageViewInfo
refs/changes/52/317452/1
diff --git a/extension.json b/extension.json
index 8724a18..77002f9 100644
--- a/extension.json
+++ b/extension.json
@@ -15,7 +15,19 @@
"PageViewInfo\\Hooks": "includes/PageViewInfo.hooks.php",
"PageViewInfo\\PageViewService": "includes/PageViewService.php",
"PageViewInfo\\CachedPageViewService":
"includes/CachedPageViewService.php",
- "PageViewInfo\\WikimediaPageViewService":
"includes/WikimediaPageViewService.php"
+ "PageViewInfo\\WikimediaPageViewService":
"includes/WikimediaPageViewService.php",
+ "PageViewInfo\\ApiQueryMostViewed":
"includes/ApiQueryMostViewed.php",
+ "PageViewInfo\\ApiQuerySiteViews":
"includes/ApiQuerySiteViews.php",
+ "PageViewInfo\\ApiQueryPageViews":
"includes/ApiQueryPageViews.php"
+ },
+ "APIListModules": {
+ "mostviewed": "PageViewInfo\\ApiQueryMostViewed"
+ },
+ "APIMetaModules": {
+ "siteviews": "PageViewInfo\\ApiQuerySiteViews"
+ },
+ "APIPropModules": {
+ "pageviews": "PageViewInfo\\ApiQueryPageViews"
},
"MessagesDirs": {
"PageViewInfo": [
diff --git a/i18n/en.json b/i18n/en.json
index 4ee786d..3e056c8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -8,5 +8,6 @@
"wmpvi-month-count": "Page views in the past 30 days",
"wmpvi-close": "Close",
"wmpvi-range": "$1 - $2",
- "wmpvi-app-uniques-not-supported": "Unique device counts for mobile
apps are not supported"
+ "wmpvi-app-uniques-not-supported": "Unique device counts for mobile
apps are not supported",
+ "apihelp-query+siteviews-description": "Return pageview totals for the
site",
}
diff --git a/includes/ApiQueryMostViewed.php b/includes/ApiQueryMostViewed.php
new file mode 100644
index 000..a4ac1e3
--- /dev/null
+++ b/includes/ApiQueryMostViewed.php
@@ -0,0 +1,93 @@
+run();
+ }
+
+ public function executeGenerator( $resultPageSet ) {
+ $this->run( $resultPageSet );
+ }
+
+ /**
+* @param ApiPageSet|null $resultPageSet
+*/
+ private function run( ApiPageSet $resultPageSet = null ) {
+ /** @var PageViewService $service */
+ $service = MediaWikiServices::getInstance()->getService(
'PageViewService' );
+ $status = $service->getTopPages();
+
+ if ( $status->isOK() ) {
+ $params = $this->extractRequestParams();
+ $limit = $params['limit'];
+ $offset = $params['offset'];
+
+ $data = $status->getValue();
+ if ( count( $data ) > $offset +$limit ) {
+ $this->setContinueEnumParameter( 'offset',
$offset + $limit );
+ }
+ $data = array_slice( $data, $offset, $limit, true );
+
+ if ( $resultPageSet ) {
+ $titles = [];
+ foreach ( $data as $title => $_ ) {
+ $titles[] = Title::newFromText( $title
);
+ }
+ $resultPageSet->populateFromTitles( $titles );
+ } else {
+ $result = $this->getResult();
+ $result->addValue( 'query',
$this->getModuleName(), $data );
+ $result->addIndexedTagName( [ 'query',
$this->getModuleName() ], 'page' );
+ }
+ }
+ $this->getErrorFormatter()->addMessagesFromStatus(
$this->getModuleName(),
+ Status::wrap( $status ) );
+ }
+
+ public function getCacheMode( $params ) {
+ return 'public';
+ }
+
+ public function getAllowedParams() {
+ return [
+ 'limit' => [
+ ApiBase::PARAM_DFLT => ApiBase::LIMIT_BIG1,
+ ApiBase::PARAM_TYPE => 'limit',
+ ApiBase::PARAM_MIN => 1,
+ ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
+ Api
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve some StatusValue type hints
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317454
Change subject: Improve some StatusValue type hints
..
Improve some StatusValue type hints
Change-Id: I6deb76f8906aa86481b84ce1aaebaddf3a52e31d
---
M includes/Status.php
M includes/libs/StatusValue.php
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/54/317454/1
diff --git a/includes/Status.php b/includes/Status.php
index 07828fe..a35af6e 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -113,7 +113,7 @@
* 1 => object(Status) # The Status with warning messages, only
* ]
*
-* @return array
+* @return Status[]
*/
public function splitByErrorType() {
list( $errorsOnlyStatus, $warningsOnlyStatus ) =
parent::splitByErrorType();
diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php
index ecd88e4..930534f 100644
--- a/includes/libs/StatusValue.php
+++ b/includes/libs/StatusValue.php
@@ -103,7 +103,7 @@
* 1 => object(StatusValue) # The StatusValue with warning
messages, only
* ]
*
-* @return array
+* @return StatusValue[]
*/
public function splitByErrorType() {
$errorsOnlyStatusValue = clone $this;
--
To view, visit https://gerrit.wikimedia.org/r/317454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6deb76f8906aa86481b84ce1aaebaddf3a52e31d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Allow partial serialization of StatusValue
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317453
Change subject: Allow partial serialization of StatusValue
..
Allow partial serialization of StatusValue
StatusValue cannot be properly serizalized because
StatusValue::$value might not be serializable (plus we have
subclasses which don't expect to be serialized, e.g.
Status::$cleanCallback is not serializable either). Making it
a Serializable which drops those properties on serialization
would be confusing as users rightly expect a major detail like
the status value to survive serialization. So, add explicit
methods for partially serializing/unserializing which do not
create false impressions.
This is rather awkward but, with StatusValue::$result being used
all over the place and PHP's crappy support for checking whether
something is serializable, it still seems the least bad option
for allowing the results of an external operation (which is normally
serializable but could be replaced by or marked with some error
message at several different levels of processing) to be cacheable.
Change-Id: I395099e17f8150f0c43067cdb4143e557603cb71
---
M includes/libs/StatusValue.php
1 file changed, 37 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/317453/1
diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php
index bff9abd..ecd88e4 100644
--- a/includes/libs/StatusValue.php
+++ b/includes/libs/StatusValue.php
@@ -80,6 +80,21 @@
}
/**
+* Recreates a (lossily) serialized StatusValue. See
getSerializableRepresentation() for
+* caveats.
+* @param array $data
+*/
+ public static function newFromSerializableRepresentation( array $data )
{
+ $result = new static();
+ $result->errors = $data['errors'];
+ $result->ok = $data['ok'];
+ $result->success = $data['success'];
+ $result->successCount = $data['successCount'];
+ $result->failCount = $data['failCount'];
+ return $result;
+ }
+
+ /**
* Splits this StatusValue object into two new StatusValue objects, one
which contains only
* the error messages, and one that contains the warnings, only. The
returned array is
* defined as:
@@ -144,6 +159,28 @@
return $this->errors;
}
+
+ /**
+* Get a serializable representation of the StatusValue object.
+*
+* StatusValue itself cannot be fully serializable because the value
can be anything;
+* subclasses might contain other non-serializable details. Making it a
Serializable and
+* silently dropping the value would be confusing. Instead, this method
(together with
+* newFromSerializableRepresentation) allows partial serialization.
+* The contents of the returned array should be considered opaque and
not manipulated in any way.
+*
+* @return array
+*/
+ public function getSerializableRepresentation() {
+ return [
+ 'errors' => $this->errors,
+ 'ok' => $this->ok,
+ 'success' => $this->success,
+ 'successCount' => $this->successCount,
+ 'failCount' => $this->failCount,
+ ];
+ }
+
/**
* Change operation status
*
--
To view, visit https://gerrit.wikimedia.org/r/317453
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I395099e17f8150f0c43067cdb4143e557603cb71
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Add example links to the API options
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317455
Change subject: Add example links to the API options
..
Add example links to the API options
Change-Id: I0bf952f5e845eb405348c18e3e49d7367ccf7546
Depends-On: Icc3b078180c3ddb7f30c82f6033a931be09e5f22
---
M puppet/modules/role/files/pageviewinfo/VagrantRolePageViewInfo.wiki
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/55/317455/1
diff --git
a/puppet/modules/role/files/pageviewinfo/VagrantRolePageViewInfo.wiki
b/puppet/modules/role/files/pageviewinfo/VagrantRolePageViewInfo.wiki
index cca906c..9405c8b 100644
--- a/puppet/modules/role/files/pageviewinfo/VagrantRolePageViewInfo.wiki
+++ b/puppet/modules/role/files/pageviewinfo/VagrantRolePageViewInfo.wiki
@@ -1,3 +1,6 @@
The [[mw:Extension:WikimediaPageViewInfo|WikimediaPageViewInfo]] extension
provides pageview data via
* action=info ([{{fullurl:Main Page|action=info}} example])
+* API prop=pageviews
([[Special:ApiSandbox#action=query&format=json&prop=pageviews&list=&titles=Main+Page|example]])
+* API meta=siteviews
([[Special:ApiSandbox#action=query&format=json&meta=siteviews|example]])
+* API list=mostviewed
([[Special:ApiSandbox#action=query&format=json&list=mostviewed&pvimlimit=50|example]],
[[Special:ApiSandbox#action=query&format=json&generator=mostviewed&gpvimlimit=10|generator
example]])
--
To view, visit https://gerrit.wikimedia.org/r/317455
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bf952f5e845eb405348c18e3e49d7367ccf7546
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Unify and align `margin` and `padding` of f...
VolkerE has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317456
Change subject: MediaWiki theme: Unify and align `margin` and `padding` of form
elements
..
MediaWiki theme: Unify and align `margin` and `padding` of form elements
Unifying and aligning `margin` and `padding` of form elements across
fieldLayouts and to M101 design guideline.
Applying `margin-top` with `:first-child` override as it's supported by
IE 7+ in contrast to `:last-child`. Also using more appropriate `margin`
over `border` when applicable.
Results in reduced, still more harmonious usage of whitespace and
denser form views.
Bug: T136790
Bug: T145675
Change-Id: Id721c75439c27da1b72f4c686268e9da6ef3f252
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/layouts.less
2 files changed, 37 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/56/317456/1
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index f9c6c8a..fda22e6 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -122,7 +122,7 @@
@border-color-input-binary-active: @color-progressive-active;
@border-color-input-binary-on: @color-progressive;
@box-shadow-input-binary: 0 0 0 1px rgba( 0, 0, 0, 0.1 );
-@padding-input-binary-label: 0.25em 0.25em 0.25em 0.5em;
+@padding-input-binary-label: 0.25em 0.25em 0.25em 0.46875em;
// Theme mixins
diff --git a/src/themes/mediawiki/layouts.less
b/src/themes/mediawiki/layouts.less
index 8767ed6..2a169c4 100644
--- a/src/themes/mediawiki/layouts.less
+++ b/src/themes/mediawiki/layouts.less
@@ -35,46 +35,52 @@
}
.theme-oo-ui-fieldLayout () {
- margin-bottom: 1em;
+ // At base `font-size: 12.8px` we just relatively follow M101 design
guideline here
+ margin-top: 1.640625em; // `1.5em` in the guideline, we go for
`21px`/`1.640625em`
- &:last-child {
- margin-bottom: 0;
- }
-
- &.oo-ui-fieldLayout-align-left,
- &.oo-ui-fieldLayout-align-right {
- &.oo-ui-labelElement > .oo-ui-fieldLayout-body >
.oo-ui-labelElement-label {
- padding-top: 0.5em;
- margin-right: 5%;
- width: 35%;
- }
-
- > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field {
- width: 60%;
- }
- }
-
+ &.oo-ui-labelElement,
&.oo-ui-fieldLayout-align-inline {
- margin-bottom: 1.25em;
+ margin-top: 1.171875em; // `1.25em` in the guideline, we go for
`15px`/`1.171875em`
+ }
- &.oo-ui-labelElement > .oo-ui-fieldLayout-body >
.oo-ui-labelElement-label {
- padding: @padding-input-binary-label;
+ &,
+ &.oo-ui-labelElement,
+ &.oo-ui-fieldLayout-align-inline {
+ &:first-child {
+ margin-top: 0;
}
}
- &.oo-ui-fieldLayout-align-top {
- &.oo-ui-labelElement > .oo-ui-fieldLayout-body >
.oo-ui-labelElement-label {
- padding-top: 0.25em;
- padding-bottom: 0.5em;
+ &.oo-ui-labelElement {
+ & > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label {
+ padding-bottom: 0.3125em; // equals `4px` at base
`font-size: 12.8px`
}
- }
- > .oo-ui-popupButtonWidget {
- .oo-ui-inline-spacing( 0 );
+ &.oo-ui-fieldLayout-align-inline > .oo-ui-fieldLayout-body >
.oo-ui-labelElement-label {
+ padding: 0.3125em 0.46875em; // equals `4px 6px` at
base `font-size: 12.8px`
+ // `6px` is not aligned to M101 design guideline, as
checkbox and radios sizes aren't either
+ }
+
+ &.oo-ui-fieldLayout-align-left,
+ &.oo-ui-fieldLayout-align-right {
+ & > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label
{
+ width: 35%;
+ margin-right: 5%;
+ padding-top: 0.3125em;
+ }
+
+ > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field {
+ width: 60%;
+ }
+ }
}
&-disabled > .oo-ui-fieldLayout-body > .oo-ui-labelElement-label {
color: @color-disabled;
+ }
+
+ > .oo-ui-popupButtonWidget {
+ .oo-ui-inline-spacing( 0 );
}
&-messages {
@@ -90,12 +96,11 @@
.oo-ui-iconWidget {
display: table-cell;
- border-right: 0.5em solid transparent;
}
.oo-ui-labelWidget {
display: table-cell;
-
[MediaWiki-commits] [Gerrit] oojs/ui[master]: SelectFileWidget: No action indicating cursor on empty state...
VolkerE has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317457
Change subject: SelectFileWidget: No action indicating cursor on empty state
label
..
SelectFileWidget: No action indicating cursor on empty state label
Changing cursor on SelectFileWidget's `-empty` state to default in
order to clearer indicate that the action is happening at the button.
Change-Id: Iee3d200facd5f9088a3b1e380f157fe42120bb04
---
M src/styles/widgets/SelectFileWidget.less
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/57/317457/1
diff --git a/src/styles/widgets/SelectFileWidget.less
b/src/styles/widgets/SelectFileWidget.less
index 69fbf05..937459e 100644
--- a/src/styles/widgets/SelectFileWidget.less
+++ b/src/styles/widgets/SelectFileWidget.less
@@ -154,6 +154,10 @@
}
&-empty.oo-ui-widget-enabled {
+ .oo-ui-selectFileWidget-label {
+ cursor: default;
+ }
+
.oo-ui-selectFileWidget-dropLabel {
display: block;
}
--
To view, visit https://gerrit.wikimedia.org/r/317457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee3d200facd5f9088a3b1e380f157fe42120bb04
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clean up newWANCacheFromParams() getInstance() calls
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317458
Change subject: Clean up newWANCacheFromParams() getInstance() calls
..
Clean up newWANCacheFromParams() getInstance() calls
Change-Id: I0daa2531708d0a110e8028c4a5641153a23c0a97
---
M includes/objectcache/ObjectCache.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/58/317458/1
diff --git a/includes/objectcache/ObjectCache.php
b/includes/objectcache/ObjectCache.php
index 53a474b..0a4f0ed 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -326,9 +326,9 @@
* @throws UnexpectedValueException
*/
public static function newWANCacheFromParams( array $params ) {
+ $erGroup =
MediaWikiServices::getInstance()->getEventRelayerGroup();
foreach ( $params['channels'] as $action => $channel ) {
- $params['relayers'][$action] =
MediaWikiServices::getInstance()->getEventRelayerGroup()
- ->getRelayer( $channel );
+ $params['relayers'][$action] = $erGroup->getRelayer(
$channel );
$params['channels'][$action] = $channel;
}
$params['cache'] = self::newFromParams( $params['store'] );
--
To view, visit https://gerrit.wikimedia.org/r/317458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0daa2531708d0a110e8028c4a5641153a23c0a97
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add error file/line information to exceptions caught by the API
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317460
Change subject: Add error file/line information to exceptions caught by the API
..
Add error file/line information to exceptions caught by the API
MWExceptionHandler::getRedactedTraceAsString() only displays the
stack trace (starting with the file/line of the start of the method
in which the exception was thrown), not the exact file/line of the
exception.
Change-Id: I02f7ef5e4647091ee5cb3e5562d7f4a048a16436
---
M includes/api/ApiMain.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/317460/1
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index c8f4460..2559bd3 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1008,6 +1008,7 @@
ApiResult::setContentValue(
$errMessage,
'trace',
+ $e->getFile() . '(' . $e->getLine() .
')' . PHP_EOL .
MWExceptionHandler::getRedactedTraceAsString( $e )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/317460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I02f7ef5e4647091ee5cb3e5562d7f4a048a16436
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Force boolean type for $ok in StatusValue::setResult
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317459
Change subject: Force boolean type for $ok in StatusValue::setResult
..
Force boolean type for $ok in StatusValue::setResult
Change-Id: Ie9e933fba3445872e39d70ab3a8230f204106996
---
M includes/libs/StatusValue.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/59/317459/1
diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php
index 930534f..772079e 100644
--- a/includes/libs/StatusValue.php
+++ b/includes/libs/StatusValue.php
@@ -197,7 +197,7 @@
* @param mixed $value
*/
public function setResult( $ok, $value = null ) {
- $this->ok = $ok;
+ $this->ok = (bool)$ok;
$this->value = $value;
}
--
To view, visit https://gerrit.wikimedia.org/r/317459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie9e933fba3445872e39d70ab3a8230f204106996
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: replace Button with TextView
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317461
Change subject: Hygiene: replace Button with TextView
..
Hygiene: replace Button with TextView
A follow up to 58eee82, replace Buttons with TextViews and add
appropriate styling where needed to maintain the current appearance.
Button is nearly identical to TextView. It seems more appropriate to use
TextViews with styles directly than subclasses for such little gain.
Also update the ButtonGray style directly rather than each usage.
Change-Id: I2fcbc1b38df1523b801889030e497e4034c14a4a
---
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M app/src/main/java/org/wikipedia/editing/CaptchaHandler.java
M app/src/main/java/org/wikipedia/editing/EditSectionActivity.java
M app/src/main/java/org/wikipedia/page/PageInfoDialog.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
M app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
M app/src/main/java/org/wikipedia/views/WikiErrorView.java
M app/src/main/res/layout/activity_create_account.xml
M app/src/main/res/layout/activity_edit_section.xml
M app/src/main/res/layout/activity_wiki_login.xml
M app/src/main/res/layout/custom_error_view.xml
M app/src/main/res/layout/dialog_link_preview_overlay.xml
M app/src/main/res/layout/dialog_page_info.xml
M app/src/main/res/layout/dialog_share_preview.xml
M app/src/main/res/layout/dialog_themechooser.xml
M app/src/main/res/layout/group_captcha.xml
M app/src/main/res/layout/include_add_to_reading_list_onboarding.xml
M app/src/main/res/layout/include_crash_report.xml
M app/src/main/res/values/styles.xml
19 files changed, 138 insertions(+), 115 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/61/317461/1
diff --git
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index 1ff114d..08b5c45 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -4,17 +4,19 @@
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
-import android.view.MenuItem;
import android.view.KeyEvent;
+import android.view.MenuItem;
import android.view.View;
import android.view.View.OnKeyListener;
-import android.widget.Button;
import android.widget.EditText;
+import android.widget.TextView;
+
import com.mobsandgeeks.saripaar.ValidationError;
import com.mobsandgeeks.saripaar.Validator;
import com.mobsandgeeks.saripaar.annotation.ConfirmPassword;
import com.mobsandgeeks.saripaar.annotation.NotEmpty;
import com.mobsandgeeks.saripaar.annotation.Password;
+
import org.mediawiki.api.json.Api;
import org.mediawiki.api.json.RequestBuilder;
import org.wikipedia.NonEmptyValidator;
@@ -31,8 +33,8 @@
import java.util.List;
-import static org.wikipedia.util.FeedbackUtil.setErrorPopup;
import static org.wikipedia.util.DeviceUtil.hideSoftKeyboard;
+import static org.wikipedia.util.FeedbackUtil.setErrorPopup;
public class CreateAccountActivity extends ThemedActionBarActivity {
public static final int RESULT_ACCOUNT_CREATED = 1;
@@ -54,8 +56,8 @@
@OptionalEmail(messageResId = R.string.create_account_email_error)
private EditText emailEdit;
-private Button createAccountButton;
-private Button createAccountButtonCaptcha;
+private TextView createAccountButton;
+private TextView createAccountButtonCaptcha;
private ProgressDialog progressDialog;
@@ -75,8 +77,8 @@
usernameEdit = (EditText) findViewById(R.id.create_account_username);
passwordRepeatEdit = (EditText)
findViewById(R.id.create_account_password_repeat);
emailEdit = (EditText) findViewById(R.id.create_account_email);
-createAccountButton = (Button)
findViewById(R.id.create_account_submit_button);
-createAccountButtonCaptcha = (Button)
findViewById(R.id.captcha_submit_button);
+createAccountButton = (TextView)
findViewById(R.id.create_account_submit_button);
+createAccountButtonCaptcha = (TextView)
findViewById(R.id.captcha_submit_button);
EditText captchaText = (EditText) findViewById(R.id.captcha_text);
View primaryContainer =
findViewById(R.id.create_account_primary_container);
PasswordTextInput passwordInput = (PasswordTextInput)
findViewById(R.id.create_account_password_input);
diff --git a/app/src/main/java/org/wikipedia/editing/CaptchaHandler.java
b/app/src/main/java/org/wikipedia/editing/CaptchaHandler.java
index 3f07ca0..198c83c 100644
--- a/app/src/main/java/org/wikipedia/editing/CaptchaHandler.java
+++ b/app/src/main/java/org/wikipedia/editing/CaptchaHandler.java
@@ -9,18 +9,19 @@
import android.support.annotation.Nullable;
import android
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Small DB classes IDEA warning fixes and cleanups
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317462
Change subject: Small DB classes IDEA warning fixes and cleanups
..
Small DB classes IDEA warning fixes and cleanups
Change-Id: I65b5f452a364b329bb671540f4115dbc4f40eebd
---
M includes/libs/rdbms/database/DatabasePostgres.php
M maintenance/Maintenance.php
M maintenance/update.php
3 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/62/317462/1
diff --git a/includes/libs/rdbms/database/DatabasePostgres.php
b/includes/libs/rdbms/database/DatabasePostgres.php
index 016b9cd..7acd8dc 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -1087,7 +1087,7 @@
if ( !is_array( $types ) ) {
$types = [ $types ];
}
- if ( !$schema ) {
+ if ( $schema === false ) {
$schema = $this->getCoreSchema();
}
$table = $this->realTableName( $table, 'raw' );
@@ -1236,7 +1236,6 @@
function strencode( $s ) {
// Should not be called by us
-
return pg_escape_string( $this->getBindingHandle(), $s );
}
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 1cb5eef..208cf17 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -104,7 +104,7 @@
/**
* Used by getDB() / setDB()
-* @var IDatabase
+* @var Database
*/
private $mDb = null;
@@ -726,6 +726,7 @@
if ( is_array( $wgProfiler ) && isset( $wgProfiler['class'] ) )
{
$class = $wgProfiler['class'];
+ /** @var Profiler $profiler */
$profiler = new $class(
[ 'sampling' => 1, 'output' => [ $output ] ]
+ $wgProfiler
@@ -1182,6 +1183,7 @@
$this->beginTransaction( $dbw, __METHOD__ );
# Get "active" text records from the revisions table
+ $cur = [];
$this->output( 'Searching for active text records in revisions
table...' );
$res = $dbw->select( 'revision', 'rev_text_id', [], __METHOD__,
[ 'DISTINCT' ] );
foreach ( $res as $row ) {
diff --git a/maintenance/update.php b/maintenance/update.php
index b96e7eb..a672e29 100755
--- a/maintenance/update.php
+++ b/maintenance/update.php
@@ -145,6 +145,7 @@
$this->output( "Going to run database updates for " .
wfWikiID() . "\n" );
if ( $db->getType() === 'sqlite' ) {
+ /** @var Database|DatabaseSqlite $db */
$this->output( "Using SQLite file:
'{$db->getDbFilePath()}'\n" );
}
$this->output( "Depending on the size of your database this may
take a while!\n" );
--
To view, visit https://gerrit.wikimedia.org/r/317462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65b5f452a364b329bb671540f4115dbc4f40eebd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Force boolean type for $ok in StatusValue::setResult
jenkins-bot has submitted this change and it was merged.
Change subject: Force boolean type for $ok in StatusValue::setResult
..
Force boolean type for $ok in StatusValue::setResult
Change-Id: Ie9e933fba3445872e39d70ab3a8230f204106996
---
M includes/libs/StatusValue.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php
index bff9abd..b0b26db 100644
--- a/includes/libs/StatusValue.php
+++ b/includes/libs/StatusValue.php
@@ -160,7 +160,7 @@
* @param mixed $value
*/
public function setResult( $ok, $value = null ) {
- $this->ok = $ok;
+ $this->ok = (bool)$ok;
$this->value = $value;
}
--
To view, visit https://gerrit.wikimedia.org/r/317459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie9e933fba3445872e39d70ab3a8230f204106996
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Improve Status/StatusValue::splitByErrorType type hint
jenkins-bot has submitted this change and it was merged.
Change subject: Improve Status/StatusValue::splitByErrorType type hint
..
Improve Status/StatusValue::splitByErrorType type hint
Change-Id: I6deb76f8906aa86481b84ce1aaebaddf3a52e31d
---
M includes/Status.php
M includes/libs/StatusValue.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Status.php b/includes/Status.php
index 07828fe..a35af6e 100644
--- a/includes/Status.php
+++ b/includes/Status.php
@@ -113,7 +113,7 @@
* 1 => object(Status) # The Status with warning messages, only
* ]
*
-* @return array
+* @return Status[]
*/
public function splitByErrorType() {
list( $errorsOnlyStatus, $warningsOnlyStatus ) =
parent::splitByErrorType();
diff --git a/includes/libs/StatusValue.php b/includes/libs/StatusValue.php
index bff9abd..c0acc27 100644
--- a/includes/libs/StatusValue.php
+++ b/includes/libs/StatusValue.php
@@ -88,7 +88,7 @@
* 1 => object(StatusValue) # The StatusValue with warning
messages, only
* ]
*
-* @return array
+* @return StatusValue[]
*/
public function splitByErrorType() {
$errorsOnlyStatusValue = clone $this;
--
To view, visit https://gerrit.wikimedia.org/r/317454
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6deb76f8906aa86481b84ce1aaebaddf3a52e31d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
Gerrit-Reviewer: Aaron Schulz
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Apply platform language to SA target
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317464
Change subject: Apply platform language to SA target
..
Apply platform language to SA target
Change-Id: I1d4eac0ee55148033b4eb0223fc4781e9faecf07
---
M demos/ve/ve.demo.init.js
M src/init/sa/ve.init.sa.Target.js
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/64/317464/1
diff --git a/demos/ve/ve.demo.init.js b/demos/ve/ve.demo.init.js
index 0650075..8c86aca 100644
--- a/demos/ve/ve.demo.init.js
+++ b/demos/ve/ve.demo.init.js
@@ -11,7 +11,7 @@
target = new ve.demo.target(),
hashChanging = false,
- currentLang = $.i18n().locale,
+ currentLang = ve.init.platform.getUserLanguages()[ 0 ],
currentDir = target.$element.css( 'direction' ) || 'ltr',
device = ve.demo.target === ve.init.sa.DesktopTarget ?
'desktop' : 'mobile',
@@ -69,7 +69,6 @@
languageInput.setLangAndDir( currentLang, currentDir );
// Dir doesn't change on init but styles need to be set
updateStylesFromDir();
- target.$element.attr( 'lang', currentLang );
languageInput.on( 'change', function ( lang, dir ) {
if ( dir === currentDir && lang !== 'qqx' &&
ve.availableLanguages.indexOf( lang ) === -1 ) {
diff --git a/src/init/sa/ve.init.sa.Target.js b/src/init/sa/ve.init.sa.Target.js
index d6f2de0..9f2e67b 100644
--- a/src/init/sa/ve.init.sa.Target.js
+++ b/src/init/sa/ve.init.sa.Target.js
@@ -35,7 +35,9 @@
// Parent constructor
ve.init.sa.Target.super.call( this, config );
- this.$element.addClass( 've-init-sa-target' );
+ this.$element
+ .addClass( 've-init-sa-target' )
+ .attr( 'lang', ve.init.platform.getUserLanguages()[ 0 ] );
};
/* Inheritance */
--
To view, visit https://gerrit.wikimedia.org/r/317464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d4eac0ee55148033b4eb0223fc4781e9faecf07
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Suggested fixes to demo
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317463
Change subject: Suggested fixes to demo
..
Suggested fixes to demo
Feel free to squash
Change-Id: I0f15ab26cdb9e8d59bf86912f5c355f1a4bdf4c9
---
A demos/ve/VisualEditor-pad-logo.svg
M demos/ve/demo.css
M rebaser/demo.js
M rebaser/views/editor.ejs
M src/dm/ve.dm.SurfaceSynchronizer.js
5 files changed, 50 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/63/317463/1
diff --git a/demos/ve/VisualEditor-pad-logo.svg
b/demos/ve/VisualEditor-pad-logo.svg
new file mode 100644
index 000..2ef0d5f
--- /dev/null
+++ b/demos/ve/VisualEditor-pad-logo.svg
@@ -0,0 +1,35 @@
+
+http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xml:space="preserve"
+ enable-background="new 72.5 191.5 641 225"
+ viewBox="72.5 191.5 400 225"
+ height="225"
+ width="400"
+ y="0px"
+ x="0px"
+ id="Layer_1"
+ version="1.1">image/svg+xmlhttp://purl.org/dc/dcmitype/StillImage";
/>
\ No newline at end of file
diff --git a/demos/ve/demo.css b/demos/ve/demo.css
index b6b909a..843a644 100644
--- a/demos/ve/demo.css
+++ b/demos/ve/demo.css
@@ -14,11 +14,22 @@
/* Demo */
+.ve-pad-logo,
.ve-demo-logo {
float: right;
margin: 0.5em 0 0 0;
- background: url( VisualEditor-logo.svg ) no-repeat;
+ background-repeat: no-repeat;
background-size: contain; /* stylelint-disable-line
no-unsupported-browser-features */
+}
+
+.ve-pad-logo {
+ background-image: url( VisualEditor-pad-logo.svg );
+ width: 8.5em;
+ height: 3.75em;
+}
+
+.ve-demo-logo {
+ background-image: url( VisualEditor-logo.svg );
width: 10.75em;
height: 3.75em;
}
diff --git a/rebaser/demo.js b/rebaser/demo.js
index f3cb9cb..83c3829 100644
--- a/rebaser/demo.js
+++ b/rebaser/demo.js
@@ -7,7 +7,6 @@
new ve.init.sa.Platform( ve.messagePaths ).initialize().done( function () {
var
$editor = $( '.ve-demo-editor' ),
- // $toolbar = $( '.ve-demo-targetToolbar' ),
target = new ve.demo.target();
$editor.append( target.$element );
diff --git a/rebaser/views/editor.ejs b/rebaser/views/editor.ejs
index a1eb835..22f7179 100644
--- a/rebaser/views/editor.ejs
+++ b/rebaser/views/editor.ejs
@@ -12,9 +12,6 @@
<%= docName %> - VisualEditor Rebase Demo
-
-
-
@@ -35,7 +32,7 @@
-
+
diff --git a/src/dm/ve.dm.SurfaceSynchronizer.js
b/src/dm/ve.dm.SurfaceSynchronizer.js
index 4093991..0ca5399 100644
--- a/src/dm/ve.dm.SurfaceSynchronizer.js
+++ b/src/dm/ve.dm.SurfaceSynchronizer.js
@@ -41,7 +41,7 @@
// Whether we are currently synchronizing the model
this.applying = false;
- if ( window.QUnit ) {
+ if ( window.QUnit || !window.io ) {
return;
}
@@ -230,7 +230,7 @@
this.surface.setAuthor( this.author );
// HACK
if ( !window.QUnit ) {
- document.body.insertBefore( document.createTextNode(
this.author ), document.body.firstChild );
+ $( '.ve-demo-editor' ).prepend( this.author );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/317463
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f15ab26cdb9e8d59bf86912f5c355f1a4bdf4c9
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Add CopyPatrol
Samwilson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/317465
Change subject: Add CopyPatrol
..
Add CopyPatrol
Change-Id: Iba804e5955c57b683dd6f3a877dba6b43cf06454
---
M TranslateSettings.php
M bin/EXTERNAL-PROJECTS
M bin/REPONG-PROJECTS
A groups/Wikimedia/CopyPatrol.yaml
M repoconfig.commit.json
M repoconfig.json
6 files changed, 32 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/65/317465/1
diff --git a/TranslateSettings.php b/TranslateSettings.php
index 2bb8912..b7d363c 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -233,6 +233,7 @@
wfAddNamespace( 1206, 'Wikimedia' );
$wgTranslateGroupFiles[] = "$GROUPS/wikidata/wikidata.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/CitationHunt.yaml";
+$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/CopyPatrol.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/crosswatch.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/GapFinder.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/jquery.uls.yaml";
diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index 862b1ed..66a9369 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -1,6 +1,7 @@
blockly
citationhunt
codev
+copypatrol
crosswatch
entryscape
eol
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index 0e53c9c..4673275 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -1,6 +1,7 @@
blockly
citationhunt
codev
+copypatrol
crosswatch
int-dcatap
int-heritage
diff --git a/groups/Wikimedia/CopyPatrol.yaml b/groups/Wikimedia/CopyPatrol.yaml
new file mode 100644
index 000..34fe297
--- /dev/null
+++ b/groups/Wikimedia/CopyPatrol.yaml
@@ -0,0 +1,11 @@
+BASIC:
+ id: copypatrol
+ label: CopyPatrol
+ icon: wiki://Copypatrol logo.png
+ description: "{{Special:MyLanguage/Translations:Group
descriptions/copypatrol/en}}"
+ class: FileBasedMessageGroup
+ namespace: NS_WIKIMEDIA
+
+FILES:
+ class: JsonFFS
+ sourcePattern: "%GROUPROOT%/copypatrol/public_html/i18n/%CODE%.json"
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index df75a56..ff3bf6c 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -33,6 +33,15 @@
}
}
},
+ "copypatrol": {
+ "group": "copypatrol",
+ "repos": {
+ "codev": {
+ "type": "git",
+ "url":
"g...@github.com:wikimedia/CopyPatrol.git"
+ }
+ }
+ },
"crosswatch": {
"group": "crosswatch",
"repos": {
diff --git a/repoconfig.json b/repoconfig.json
index 21177f2..fbbc52e 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -33,6 +33,15 @@
}
}
},
+ "copypatrol": {
+ "group": "copypatrol",
+ "repos": {
+ "codev": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/CopyPatrol.git";
+ }
+ }
+ },
"crosswatch": {
"group": "crosswatch",
"repos": {
--
To view, visit https://gerrit.wikimedia.org/r/317465
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba804e5955c57b683dd6f3a877dba6b43cf06454
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Samwilson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
