[MediaWiki-commits] [Gerrit] Call loadPageData() as needed in Title::moveToInternal. - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/55017 Change subject: Call loadPageData() as needed in Title::moveToInternal. .. Call loadPageData() as needed in Title::moveToInternal. * This avoids use of a slave for loading the page ID to do the updates using $newpage. That bug prevented page moves by using the old 0 ID and throwing an exception. bug : 45594 Change-Id: Iea3259dce6840e3f2959d98a20177acd60433b64 --- M includes/Title.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/17/55017/1 diff --git a/includes/Title.php b/includes/Title.php index e81023a..84848eb 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -3838,6 +3838,7 @@ $this->resetArticleID( 0 ); $nt->resetArticleID( $oldid ); + $newpage->loadPageData( WikiPage::READ_LOCKING ); // bug 46397 $newpage->updateRevisionOn( $dbw, $nullRevision ); -- To view, visit https://gerrit.wikimedia.org/r/55017 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea3259dce6840e3f2959d98a20177acd60433b64 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] [JobQueue] Added support for delayed jobs with JobQueueRedis. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: [JobQueue] Added support for delayed jobs with JobQueueRedis.
..
[JobQueue] Added support for delayed jobs with JobQueueRedis.
* The queue can handle delaying jobs until a given timestamp is reached.
* Added Job::getReleaseTimestamp() to let jobs specifiy delay amounts.
* Added a "checkDelay" option and a supportsDelayedJobs() function to JobQueue.
There are also getDelayedCount() and getAllDelayedJobs() functions.
* Simplified a bit of code in doBatchPush() and pushBlobs().
* Improved the logic in redisEval().
Change-Id: I40b3e3438e659f6844bdbdd5e9d3ccc6c4dc82b2
---
M includes/job/Job.php
M includes/job/JobQueue.php
M includes/job/JobQueueRedis.php
3 files changed, 247 insertions(+), 73 deletions(-)
Approvals:
Tim Starling: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/job/Job.php b/includes/job/Job.php
index bcf582e..d8f55c3 100644
--- a/includes/job/Job.php
+++ b/includes/job/Job.php
@@ -177,6 +177,16 @@
}
/**
+* @return integer|null UNIX timestamp to delay running this job until,
otherwise null
+* @since 1.22
+*/
+ public function getReleaseTimestamp() {
+ return isset( $this->params['jobReleaseTimestamp'] )
+ ? wfTimestampOrNull( TS_UNIX,
$this->params['jobReleaseTimestamp'] )
+ : null;
+ }
+
+ /**
* @return bool Whether only one of each identical set of jobs should
be run
*/
public function ignoreDuplicates() {
diff --git a/includes/job/JobQueue.php b/includes/job/JobQueue.php
index 5ef52b5..9c152cd 100644
--- a/includes/job/JobQueue.php
+++ b/includes/job/JobQueue.php
@@ -34,6 +34,7 @@
protected $order; // string; job priority for pop()
protected $claimTTL; // integer; seconds
protected $maxTries; // integer; maximum number of times to try a job
+ protected $checkDelay; // boolean; allow delayed jobs
const QoS_Atomic = 1; // integer; "all-or-nothing" job insertions
@@ -55,28 +56,36 @@
if ( !in_array( $this->order, $this->supportedOrders() ) ) {
throw new MWException( __CLASS__ . " does not support
'{$this->order}' order." );
}
+ $this->checkDelay = !empty( $params['checkDelay'] );
+ if ( $this->checkDelay && !$this->supportsDelayedJobs() ) {
+ throw new MWException( __CLASS__ . " does not support
delayed jobs." );
+ }
}
/**
* Get a job queue object of the specified type.
* $params includes:
-* - class: What job class to use (determines job type)
-* - wiki : wiki ID of the wiki the jobs are for (defaults to
current wiki)
-* - type : The name of the job types this queue handles
-* - order: Order that pop() selects jobs, one of "fifo",
"timestamp" or "random".
-*If "fifo" is used, the queue will effectively be
FIFO. Note that
-*job completion will not appear to be exactly FIFO if
there are multiple
-*job runners since jobs can take different times to
finish once popped.
-*If "timestamp" is used, the queue will at least be
loosely ordered
-*by timestamp, allowing for some jobs to be popped off
out of order.
-*If "random" is used, pop() will pick jobs in random
order.
-*Note that it may only be weakly random (e.g. a
lottery of the oldest X).
-*If "any" is choosen, the queue will use whatever
order is the fastest.
-*This might be useful for improving concurrency for
job acquisition.
-* - claimTTL : If supported, the queue will recycle jobs that have
been popped
-*but not acknowledged as completed after this many
seconds. Recycling
-*of jobs simple means re-inserting them into the
queue. Jobs can be
-*attempted up to three times before being discarded.
+* - class : What job class to use (determines job type)
+* - wiki : wiki ID of the wiki the jobs are for (defaults to
current wiki)
+* - type : The name of the job types this queue handles
+* - order : Order that pop() selects jobs, one of "fifo",
"timestamp" or "random".
+* If "fifo" is used, the queue will effectively be
FIFO. Note that job
+* completion will not appear to be exactly FIFO if
there are multiple
+* job runners since jobs can take different times to
finish once popped.
+* If "timestamp" is used, the
[MediaWiki-commits] [Gerrit] added functions to WikiDataAPI.php and added Omegawiki API. - change (mediawiki...WikiLexicalData)
Hiong3-eng5 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55018
Change subject: added functions to WikiDataAPI.php and added Omegawiki API.
..
added functions to WikiDataAPI.php and added Omegawiki API.
Change-Id: Iafc9fbb84045fc84d464b3ea0967075632f666ca
---
A includes/api/OmegaWikiExt.php
A includes/api/OmegaWikii18n.php
A includes/api/owAddSyntrans.php
A includes/api/owDefine.php
4 files changed, 404 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData
refs/changes/18/55018/1
diff --git a/includes/api/OmegaWikiExt.php b/includes/api/OmegaWikiExt.php
new file mode 100644
index 000..c49adc3
--- /dev/null
+++ b/includes/api/OmegaWikiExt.php
@@ -0,0 +1,46 @@
+ __FILE__,
+
+ // The name of the extension, which will appear on Special:Version.
+ 'name' => 'OmegaWiki',
+
+ // A description of the extension, which will appear on Special:Version.
+ 'description' => 'An Omegawiki API extension',
+
+ // Alternatively, you can specify a message key for the description.
+ 'descriptionmsg' => 'apiow-desc',
+
+ // The version of the extension, which will appear on Special:Version.
+ // This can be a number or a string.
+ 'version' => '1.0',
+
+ // Your name, which will appear on Special:Version.
+ 'author' => 'Hiong3-eng5',
+
+ // The URL to a wiki page/web page with information about the extension,
+ // which will appear on Special:Version.
+ 'url' => 'https://www.omegawiki.org/index.php/omegawiki api',
+
+);
+
+// Map class name to filename for autoloading
+ $wgAutoloadClasses['define'] = dirname( __FILE__ ) . '/owDefine.php';
+ $wgAutoloadClasses['addSyntrans'] = dirname( __FILE__ ) .
'/owAddSyntrans.php';
+
+// Map module name to class name
+ $wgAPIModules['ow_define'] = 'define';
+ $wgAPIModules['ow_add_syntrans'] = 'addSyntrans';
+
+// Load the internationalization file
+ $wgExtensionMessagesFiles['myextension']
+ = dirname( __FILE__ ) . '/OmegaWikii18n.php';
+
+// Return true so that MediaWiki continues to load extensions.
+ return true;
+?>
diff --git a/includes/api/OmegaWikii18n.php b/includes/api/OmegaWikii18n.php
new file mode 100644
index 000..7b220c6
--- /dev/null
+++ b/includes/api/OmegaWikii18n.php
@@ -0,0 +1,6 @@
+ "OmegaWiki's WikiLexicalData extension of the
mediawiki api.php"
+ ,
+);
diff --git a/includes/api/owAddSyntrans.php b/includes/api/owAddSyntrans.php
new file mode 100644
index 000..02b4e2b
--- /dev/null
+++ b/includes/api/owAddSyntrans.php
@@ -0,0 +1,234 @@
+http://www.gnu.org/copyleft/gpl.html
+ */
+
+require_once( 'extensions/WikiLexicalData/OmegaWiki/WikiDataAPI.php' );
+require_once( 'extensions/WikiLexicalData/OmegaWiki/Transaction.php' );
+
+class addSyntrans extends ApiBase {
+
+ public $spelling, $dm, $languageId, $identicalMeaning, $result, $fp;
+
+ public function __construct( $main, $action ) {
+ parent :: __construct( $main, $action, null);
+ }
+
+ public function execute() {
+ global $wgUser, $wgOut;
+
+ // limit access to bots
+ if ( ! $wgUser->isAllowed( 'bot' ) ) {
+ $this->dieUsage( 'you must have a bot flag to use this
API function', 'bot_only' );
+ }
+
+ // keep blocked bots out
+ if ( $wgUser->isBlocked() ) {
+ $this->dieUsage( 'your account is blocked.', 'blocked'
);
+ }
+
+ // Get the parameters
+ $params = $this->extractRequestParams();
+
+ // If file, use batch processing
+ if ( $params['file'] ) {
+ $file = $params['file'];
+ $this->getResult()->addValue( null,
$this->getModuleName(), array (
+ 'file' => $file ,
+ 'process' => 'batch processing'
+ )
+ );
+ if ( ! $fp = openFile( $file) ) {
+ $this->getResult()->addValue( null,
$this->getModuleName(),
+ array ( 'open' => array (
+ 'note' => "Can not open $file.",
+ ) )
+ );
+ return true;
+ }
+ else {
+ $ctr = 0;
+ while ( ! feof( $fp ) ) {
+ $line = trim( fgets( $fp, 1024 ) );
+ $sl = strlen( $line ) - 1; // line size
+ if ( $sl < 0 ) { continue; }
+
[MediaWiki-commits] [Gerrit] (bug 46381) Making entity search non-experimental - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55019
Change subject: (bug 46381) Making entity search non-experimental
..
(bug 46381) Making entity search non-experimental
Change-Id: I8a8d59a17371cbe88a531862aac3372e2447b5d9
---
M repo/Wikibase.hooks.php
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/19/55019/1
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index b0f9a36..03e2167 100755
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -46,9 +46,7 @@
* @return boolean
*/
public static function onBeforePageDisplay( \OutputPage &$out, \Skin
&$skin ) {
- if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) &&
WB_EXPERIMENTAL_FEATURES ) {
- $out->addModules( 'wikibase.ui.entitysearch' );
- }
+ $out->addModules( 'wikibase.ui.entitysearch' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/55019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a8d59a17371cbe88a531862aac3372e2447b5d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add more documentation and getter method to Notification - change (mediawiki...Echo)
Kaldari has submitted this change and it was merged.
Change subject: Add more documentation and getter method to Notification
..
Add more documentation and getter method to Notification
Change-Id: Idb64de7034e7ff3c615dcee6fe814d64102f66cc
---
M model/Notification.php
1 file changed, 46 insertions(+), 19 deletions(-)
Approvals:
Kaldari: Verified; Looks good to me, approved
diff --git a/model/Notification.php b/model/Notification.php
index e8b4900..ee5ac79 100644
--- a/model/Notification.php
+++ b/model/Notification.php
@@ -1,29 +1,42 @@
timestamp = wfTimestampNow();
@@ -36,14 +49,12 @@
}
}
- if ( !$obj->user instanceof User &&
- !$obj->user instanceof StubObject
- ) {
- throw new MWException( "Invalid user parameter: " .
get_class( $obj->user ) );
+ if ( !$obj->user instanceof User && !$obj->user instanceof
StubObject ) {
+ throw new MWException( 'Invalid user parameter,
expected: User/StubObject object' );
}
if ( !$obj->event instanceof EchoEvent ) {
- throw new MWException( "Invalid event parameter" );
+ throw new MWException( 'Invalid event parameter,
expected: EchoEvent object' );
}
$obj->insert();
@@ -82,4 +93,20 @@
public function getUser() {
return $this->user;
}
+
+ /**
+* Getter method
+* @return string Notification creation timestamp
+*/
+ public function getTimestamp() {
+ return $this->timestamp;
+ }
+
+ /**
+* Getter method
+* @return string|null Notification read timestamp
+*/
+ public function getReadTimestamp() {
+ return $this->readTimestamp;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/52191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb64de7034e7ff3c615dcee6fe814d64102f66cc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed raw use of file functions. - change (mediawiki...ConfirmAccount)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55020
Change subject: Fixed raw use of file functions.
..
Fixed raw use of file functions.
Change-Id: Ie7d5a788592ac210ec135795d0939cdde15aab0d
---
M business/AccountConfirmSubmission.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmAccount
refs/changes/20/55020/1
diff --git a/business/AccountConfirmSubmission.php
b/business/AccountConfirmSubmission.php
index a93a1dd..32f6731 100644
--- a/business/AccountConfirmSubmission.php
+++ b/business/AccountConfirmSubmission.php
@@ -302,7 +302,7 @@
$pathRel = UserAccountRequest::relPathFromKey(
$key );
$oldPath = $repoOld->getZonePath( 'public' ) .
'/' . $pathRel;
if ( $repoOld->fileExists( $oldPath ) ) {
- $repoOld->quickPurge( $oldPath ); //
delete!
+ $repoOld->getBackend()->delete( array(
'src' => $oldPath ) ); // delete!
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/55020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7d5a788592ac210ec135795d0939cdde15aab0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmAccount
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] Fixed raw use of file functions. - change (mediawiki...ConfirmAccount)
Aaron Schulz has submitted this change and it was merged.
Change subject: Fixed raw use of file functions.
..
Fixed raw use of file functions.
Change-Id: Ie7d5a788592ac210ec135795d0939cdde15aab0d
---
M business/AccountConfirmSubmission.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Aaron Schulz: Verified; Looks good to me, approved
diff --git a/business/AccountConfirmSubmission.php
b/business/AccountConfirmSubmission.php
index a93a1dd..32f6731 100644
--- a/business/AccountConfirmSubmission.php
+++ b/business/AccountConfirmSubmission.php
@@ -302,7 +302,7 @@
$pathRel = UserAccountRequest::relPathFromKey(
$key );
$oldPath = $repoOld->getZonePath( 'public' ) .
'/' . $pathRel;
if ( $repoOld->fileExists( $oldPath ) ) {
- $repoOld->quickPurge( $oldPath ); //
delete!
+ $repoOld->getBackend()->delete( array(
'src' => $oldPath ) ); // delete!
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/55020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7d5a788592ac210ec135795d0939cdde15aab0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmAccount
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing entity selector padding - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55021
Change subject: Removing entity selector padding
..
Removing entity selector padding
The default entity selector padding influences the appearance of the entity
selector
replacing the native search box which should use the browser's default padding.
If a certain entity selector padding is necessary, it should be set more
specifically.
This will probably be referenced when reviewing the css for the statement
section.
Change-Id: I2901ee031ff429ce69bb355a6e181043d7853e5c
---
M
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/21/55021/1
diff --git
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
index c19dce8..e3530a6 100644
---
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
+++
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
@@ -5,10 +5,6 @@
* @author H. Snater < mediaw...@snater.com >
*/
-.ui-entityselector-input {
- padding: .2em;
-}
-
.ui-entityselector-list {
padding: 0;
overflow-x: hidden;
--
To view, visit https://gerrit.wikimedia.org/r/55021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2901ee031ff429ce69bb355a6e181043d7853e5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add namespace translation for 'bs' - change (mediawiki...Scribunto)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/55022 Change subject: Add namespace translation for 'bs' .. Add namespace translation for 'bs' Translationn by Edinwiki https://translatewiki.net/wiki/Thread:Support/Module_namespace_translation_for_bs-wiki Change-Id: Id3849e413961e6475b44afb04a88f02b4c5b1509 --- M Scribunto.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/22/55022/1 diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index d4e454e..b13a7e0 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -18,6 +18,11 @@ 829 => 'Абмеркаваньне_модулю', ); +$namespaceNames['bs'] = array( + 828 => 'Modul', + 829 => 'Razgovor_o_modulu', +); + $namespaceNames['de'] = array( 828 => 'Modul', 829 => 'Modul_Diskussion', -- To view, visit https://gerrit.wikimedia.org/r/55022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3849e413961e6475b44afb04a88f02b4c5b1509 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Scribunto 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] Log level: WARNING by default, DEBUG w/'--debug' - change (mediawiki...EventLogging)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55023
Change subject: Log level: WARNING by default, DEBUG w/'--debug'
..
Log level: WARNING by default, DEBUG w/'--debug'
Logging all SQL was handy when this was a prototype, but it's a little
excessive now, since it essentially duplicates the entire event stream.
This change makes verbose debug output conditional on specifying the
'--debug' command-line parameter.
Change-Id: If10537e242d5dfe62570eea84050e40d3149f9f7
---
M server/bin/json2sql
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/23/55023/1
diff --git a/server/bin/json2sql b/server/bin/json2sql
index 080b18f..3238739 100755
--- a/server/bin/json2sql
+++ b/server/bin/json2sql
@@ -14,6 +14,7 @@
optional arguments:
-h, --help show this help message and exit
--sid SID set input socket identity
+--debug output all generated SQL to stderr
:copyright: (c) 2012 by Ori Livneh
:license: GNU General Public Licence 2.0 or later
@@ -33,10 +34,13 @@
parser.add_argument('input', help='URI of JSON event stream to consume')
parser.add_argument('db', help='URI of DB to write to')
parser.add_argument('--sid', help='set input socket identity')
+parser.add_argument('--debug', action='store_const', dest='loglevel',
+const=logging.INFO, default=logging.WARNING,
+help='output all generated SQL to stderr')
args = parser.parse_args()
-logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
-logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
+logging.basicConfig(stream=sys.stderr, level=args.loglevel)
+logging.getLogger('sqlalchemy.engine').setLevel(args.loglevel)
meta = sqlalchemy.MetaData(args.db)
--
To view, visit https://gerrit.wikimedia.org/r/55023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If10537e242d5dfe62570eea84050e40d3149f9f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46381) Making entity search non-experimental - change (mediawiki...Wikibase)
Aude has submitted this change and it was merged.
Change subject: (bug 46381) Making entity search non-experimental
..
(bug 46381) Making entity search non-experimental
Change-Id: I8a8d59a17371cbe88a531862aac3372e2447b5d9
---
M repo/Wikibase.hooks.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Aude: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index b0f9a36..03e2167 100755
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -46,9 +46,7 @@
* @return boolean
*/
public static function onBeforePageDisplay( \OutputPage &$out, \Skin
&$skin ) {
- if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) &&
WB_EXPERIMENTAL_FEATURES ) {
- $out->addModules( 'wikibase.ui.entitysearch' );
- }
+ $out->addModules( 'wikibase.ui.entitysearch' );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/55019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a8d59a17371cbe88a531862aac3372e2447b5d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Aude
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log level: WARNING by default, DEBUG w/'--debug' - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged.
Change subject: Log level: WARNING by default, DEBUG w/'--debug'
..
Log level: WARNING by default, DEBUG w/'--debug'
Logging all SQL was handy when this was a prototype, but it's a little
excessive now, since it essentially duplicates the entire event stream.
This change makes verbose debug output conditional on specifying the
'--debug' command-line parameter.
Change-Id: If10537e242d5dfe62570eea84050e40d3149f9f7
---
M server/bin/json2sql
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/server/bin/json2sql b/server/bin/json2sql
index 080b18f..3238739 100755
--- a/server/bin/json2sql
+++ b/server/bin/json2sql
@@ -14,6 +14,7 @@
optional arguments:
-h, --help show this help message and exit
--sid SID set input socket identity
+--debug output all generated SQL to stderr
:copyright: (c) 2012 by Ori Livneh
:license: GNU General Public Licence 2.0 or later
@@ -33,10 +34,13 @@
parser.add_argument('input', help='URI of JSON event stream to consume')
parser.add_argument('db', help='URI of DB to write to')
parser.add_argument('--sid', help='set input socket identity')
+parser.add_argument('--debug', action='store_const', dest='loglevel',
+const=logging.INFO, default=logging.WARNING,
+help='output all generated SQL to stderr')
args = parser.parse_args()
-logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
-logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
+logging.basicConfig(stream=sys.stderr, level=args.loglevel)
+logging.getLogger('sqlalchemy.engine').setLevel(args.loglevel)
meta = sqlalchemy.MetaData(args.db)
--
To view, visit https://gerrit.wikimedia.org/r/55023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If10537e242d5dfe62570eea84050e40d3149f9f7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EventLogging
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] allow CORS on both www.wikidata.org and wikidata.org - change (operations/mediawiki-config)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/55024 Change subject: allow CORS on both www.wikidata.org and wikidata.org .. allow CORS on both www.wikidata.org and wikidata.org - sometimes people are ending up on one or the other and requests are going between the two. - we want https://bugzilla.wikimedia.org/45005 solved to eliminate the no "www." part of the url, but that bug is not completely resolved and I think this change will help somewhat. Change-Id: Iaa47141086944dedc66264ecf296d17af7d1481b --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/24/55024/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 47d0f8b..835690a 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -810,6 +810,7 @@ 'wikisource.org', '*.wikiquote.org', '*.wikidata.org', + 'wikidata.org', 'www.mediawiki.org', 'wikimediafoundation.org', 'advisory.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/55024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaa47141086944dedc66264ecf296d17af7d1481b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aude ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] allow CORS on both www.wikidata.org and wikidata.org - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: allow CORS on both www.wikidata.org and wikidata.org .. allow CORS on both www.wikidata.org and wikidata.org - sometimes people are ending up on one or the other and requests are going between the two. - we want https://bugzilla.wikimedia.org/45005 solved to eliminate the no "www." part of the url, but that bug is not completely resolved and I think this change will help somewhat. Change-Id: Iaa47141086944dedc66264ecf296d17af7d1481b --- M wmf-config/CommonSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index 47d0f8b..835690a 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -810,6 +810,7 @@ 'wikisource.org', '*.wikiquote.org', '*.wikidata.org', + 'wikidata.org', 'www.mediawiki.org', 'wikimediafoundation.org', 'advisory.wikimedia.org', -- To view, visit https://gerrit.wikimedia.org/r/55024 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iaa47141086944dedc66264ecf296d17af7d1481b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Aude Gerrit-Reviewer: Daniel Kinzler Gerrit-Reviewer: Denny Vrandecic Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove references to wikidata.org w/o www - change (mediawiki...Wikibase)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/55025 Change subject: Remove references to wikidata.org w/o www .. Remove references to wikidata.org w/o www - although this setting is not used in production, it's not a good example. We always want the www. there Change-Id: Ib984568a8beee8255d24c66f47eb42df00fe47e0 --- M client/config/WikibaseClient.default.php M client/config/WikibaseClient.example.php 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/25/55025/1 diff --git a/client/config/WikibaseClient.default.php b/client/config/WikibaseClient.default.php index 0a94227..3ef1ab8 100644 --- a/client/config/WikibaseClient.default.php +++ b/client/config/WikibaseClient.default.php @@ -38,7 +38,7 @@ $wgWBClientSettings = array( 'namespaces' => array(), // by default, include all namespaces; deprecated as of 0.4 'excludeNamespaces' => array(), - 'repoUrl' => '//wikidata.org', + 'repoUrl' => '//www.wikidata.org', 'repoScriptPath' => $wgScriptPath, 'repoArticlePath' => $wgArticlePath, 'sort' => 'code', diff --git a/client/config/WikibaseClient.example.php b/client/config/WikibaseClient.example.php index 69a9508..d29c378 100644 --- a/client/config/WikibaseClient.example.php +++ b/client/config/WikibaseClient.example.php @@ -36,7 +36,7 @@ // Base URL for building links to the repository. // Assumes your wiki is setup as "http://repo.example.org/wiki/"; -// This can be protocol relative, such as "//wikidata.org" +// This can be protocol relative, such as "//www.wikidata.org" $wgWBSettings['repoUrl'] = "http://repo.example.org";; // This setting is optional if you have the same type of setup for your -- To view, visit https://gerrit.wikimedia.org/r/55025 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib984568a8beee8255d24c66f47eb42df00fe47e0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new version of EL Table into the fray - change (analytics/limn-mobile-data)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/55026 Change subject: Add new version of EL Table into the fray .. Add new version of EL Table into the fray Change-Id: Ie6d959e963f0708464cc561377f39eb0ba52f9d2 --- M mobile/config.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data refs/changes/26/55026/1 diff --git a/mobile/config.yaml b/mobile/config.yaml index 92aab52..2ae6fc8 100644 --- a/mobile/config.yaml +++ b/mobile/config.yaml @@ -1,5 +1,5 @@ tables: -upload_attempts: MobileAppUploadAttempts_5257716 +upload_attempts: (SELECT id, uuid, clientIp, isTruncated, clientValidated, timestamp, webHost, wiki, event_appversion, event_device, event_filename, 0 as event_multiple, event_platform, event_result, event_source, event_username FROM MobileAppUploadAttempts_5257716 UNION SELECT * FROM MobileAppUploadAttempts_5334329) as MobileAppUploadAttempts login_attempts: MobileAppLoginAttempts_5257721 upload_web: MobileWebUploads_5281063 intervals: -- To view, visit https://gerrit.wikimedia.org/r/55026 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie6d959e963f0708464cc561377f39eb0ba52f9d2 Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-mobile-data Gerrit-Branch: master Gerrit-Owner: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added .gitreview - change (analytics/limn-mobile-data)
Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/55027 Change subject: Added .gitreview .. Added .gitreview Change-Id: I56a57acf14b184276ecc5943ada57f1cf398efe2 --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data refs/changes/27/55027/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..abb5211 --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=analytics/limn-mobile-data +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/55027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56a57acf14b184276ecc5943ada57f1cf398efe2 Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-mobile-data Gerrit-Branch: master Gerrit-Owner: Yuvipanda ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add new version of EL Table into the fray - change (analytics/limn-mobile-data)
Ori.livneh has submitted this change and it was merged. Change subject: Add new version of EL Table into the fray .. Add new version of EL Table into the fray Change-Id: Ie6d959e963f0708464cc561377f39eb0ba52f9d2 --- M mobile/config.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/mobile/config.yaml b/mobile/config.yaml index 92aab52..2ae6fc8 100644 --- a/mobile/config.yaml +++ b/mobile/config.yaml @@ -1,5 +1,5 @@ tables: -upload_attempts: MobileAppUploadAttempts_5257716 +upload_attempts: (SELECT id, uuid, clientIp, isTruncated, clientValidated, timestamp, webHost, wiki, event_appversion, event_device, event_filename, 0 as event_multiple, event_platform, event_result, event_source, event_username FROM MobileAppUploadAttempts_5257716 UNION SELECT * FROM MobileAppUploadAttempts_5334329) as MobileAppUploadAttempts login_attempts: MobileAppLoginAttempts_5257721 upload_web: MobileWebUploads_5281063 intervals: -- To view, visit https://gerrit.wikimedia.org/r/55026 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie6d959e963f0708464cc561377f39eb0ba52f9d2 Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-mobile-data Gerrit-Branch: master Gerrit-Owner: Yuvipanda Gerrit-Reviewer: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove references to wikidata.org w/o www - change (mediawiki...Wikibase)
Daniel Kinzler has submitted this change and it was merged. Change subject: Remove references to wikidata.org w/o www .. Remove references to wikidata.org w/o www - although this setting is not used in production, it's not a good example. We always want the www. there Change-Id: Ib984568a8beee8255d24c66f47eb42df00fe47e0 --- M client/config/WikibaseClient.default.php M client/config/WikibaseClient.example.php 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Daniel Kinzler: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/client/config/WikibaseClient.default.php b/client/config/WikibaseClient.default.php index 0a94227..3ef1ab8 100644 --- a/client/config/WikibaseClient.default.php +++ b/client/config/WikibaseClient.default.php @@ -38,7 +38,7 @@ $wgWBClientSettings = array( 'namespaces' => array(), // by default, include all namespaces; deprecated as of 0.4 'excludeNamespaces' => array(), - 'repoUrl' => '//wikidata.org', + 'repoUrl' => '//www.wikidata.org', 'repoScriptPath' => $wgScriptPath, 'repoArticlePath' => $wgArticlePath, 'sort' => 'code', diff --git a/client/config/WikibaseClient.example.php b/client/config/WikibaseClient.example.php index 69a9508..d29c378 100644 --- a/client/config/WikibaseClient.example.php +++ b/client/config/WikibaseClient.example.php @@ -36,7 +36,7 @@ // Base URL for building links to the repository. // Assumes your wiki is setup as "http://repo.example.org/wiki/"; -// This can be protocol relative, such as "//wikidata.org" +// This can be protocol relative, such as "//www.wikidata.org" $wgWBSettings['repoUrl'] = "http://repo.example.org";; // This setting is optional if you have the same type of setup for your -- To view, visit https://gerrit.wikimedia.org/r/55025 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib984568a8beee8255d24c66f47eb42df00fe47e0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Aude Gerrit-Reviewer: Daniel Kinzler Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added .gitreview - change (analytics/limn-mobile-data)
Ori.livneh has submitted this change and it was merged. Change subject: Added .gitreview .. Added .gitreview Change-Id: I56a57acf14b184276ecc5943ada57f1cf398efe2 --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..abb5211 --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=analytics/limn-mobile-data +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/55027 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56a57acf14b184276ecc5943ada57f1cf398efe2 Gerrit-PatchSet: 1 Gerrit-Project: analytics/limn-mobile-data Gerrit-Branch: master Gerrit-Owner: Yuvipanda Gerrit-Reviewer: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing entity selector padding - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Removing entity selector padding
..
Removing entity selector padding
The default entity selector padding influences the appearance of the entity
selector
replacing the native search box which should use the browser's default padding.
If a certain entity selector padding is necessary, it should be set more
specifically.
This will probably be referenced when reviewing the css for the statement
section.
Change-Id: I2901ee031ff429ce69bb355a6e181043d7853e5c
---
M
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
index c19dce8..e3530a6 100644
---
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
+++
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css
@@ -5,10 +5,6 @@
* @author H. Snater < mediaw...@snater.com >
*/
-.ui-entityselector-input {
- padding: .2em;
-}
-
.ui-entityselector-list {
padding: 0;
overflow-x: hidden;
--
To view, visit https://gerrit.wikimedia.org/r/55021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2901ee031ff429ce69bb355a6e181043d7853e5c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] .gitreview file - change (operations...python-statsd)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/55028 Change subject: .gitreview file .. .gitreview file Change-Id: I718d6b7d981c612a611cf3fe81cf2d194d7ae53e --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-statsd refs/changes/28/55028/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..72118cb --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=operations/debs/python-statsd.git +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/55028 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I718d6b7d981c612a611cf3fe81cf2d194d7ae53e Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/python-statsd Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] require and include Ask extension only if in experimental mode - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: require and include Ask extension only if in experimental mode
..
require and include Ask extension only if in experimental mode
Change-Id: I7bcbb9f959bc427d6f1ab1f397e3771e97c71d2c
---
M lib/WikibaseLib.php
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/WikibaseLib.php b/lib/WikibaseLib.php
index 14b5208..8ef3798 100644
--- a/lib/WikibaseLib.php
+++ b/lib/WikibaseLib.php
@@ -50,9 +50,11 @@
@include_once( __DIR__ . '/../../DataValues/DataValues.php' );
}
-// Include the Ask extension if that hasn't been done yet, since it's required
for WikibaseLib to work.
-if ( !defined( 'Ask_VERSION' ) ) {
- @include_once( __DIR__ . '/../../Ask/Ask.php' );
+if ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES ) {
+ // Include the Ask extension if that hasn't been done yet, since it's
required for WikibaseLib to work.
+ if ( !defined( 'Ask_VERSION' ) ) {
+ @include_once( __DIR__ . '/../../Ask/Ask.php' );
+ }
}
$dependencies = array(
--
To view, visit https://gerrit.wikimedia.org/r/54979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7bcbb9f959bc427d6f1ab1f397e3771e97c71d2c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: Jeroen De Dauw
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable changesAsJson per default. - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review. https://gerrit.wikimedia.org/r/55029 Change subject: Enable changesAsJson per default. .. Enable changesAsJson per default. Change-Id: Ic703615f84d17bf950771cbfb0823bf8e8cc8dbc --- M docs/options.wiki M lib/config/WikibaseLib.default.php 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/29/55029/1 diff --git a/docs/options.wiki b/docs/options.wiki index 4860472..2914ab1 100644 --- a/docs/options.wiki +++ b/docs/options.wiki @@ -34,7 +34,7 @@ 'commonsMedia', ) - +;changesAsJson: Use JSON to represent changes in the database. This is true per default, and there is no reason to set it to false, except for compatibility with very old clinet side code. == Repository Settings == diff --git a/lib/config/WikibaseLib.default.php b/lib/config/WikibaseLib.default.php index 0f4756a..6445a26 100644 --- a/lib/config/WikibaseLib.default.php +++ b/lib/config/WikibaseLib.default.php @@ -53,8 +53,7 @@ // JSON is more robust against version differences between repo and client, // but only once the client can cope with the JSON form of the change. -// TODO: make this default to true! -$wgWBSettings['changesAsJson'] = false; +$wgWBSettings['changesAsJson'] = true; // list of logical database names of local client wikis. // may contain mappings from site-id to db-name. -- To view, visit https://gerrit.wikimedia.org/r/55029 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic703615f84d17bf950771cbfb0823bf8e8cc8dbc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add SpecialSearchResultsPrepend/Append to release notes - change (mediawiki/core)
Fo0bar has uploaded a new change for review. https://gerrit.wikimedia.org/r/55030 Change subject: Add SpecialSearchResultsPrepend/Append to release notes .. Add SpecialSearchResultsPrepend/Append to release notes Commit 1c3b2a1 added the SpecialSearchResultsPrepend and SpecialSearchResultsAppend hooks, which were documented in docs/hooks.txt, but were not added to the release notes. Change-Id: I226349aa0199f5d72da0d1fab61e4facf92306b6 --- M RELEASE-NOTES-1.21 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/30/55030/1 diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index fce42ff..13dc673 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -115,6 +115,7 @@ uz, vi. * Added 'CategoryAfterPageAdded' and 'CategoryAfterPageRemoved' hooks. * Added 'HistoryRevisionTools' and 'DiffRevisionTools' hooks. +* Added 'SpecialSearchResultsPrepend' and 'SpecialSearchResultsAppend' hooks. * (bug 33186) Add image rotation api "imagerotate" * (bug 34040) Add "User rights management" link on user page toolbox. * (bug 45526) Add QUnit assertion helper "QUnit.assert.htmlEqual" for asserting -- To view, visit https://gerrit.wikimedia.org/r/55030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I226349aa0199f5d72da0d1fab61e4facf92306b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Fo0bar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add null check for property in property lookup - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Add null check for property in property lookup
..
Add null check for property in property lookup
e.g. in case of a deleted property or other reason
Change-Id: I396df7016ccbcff3c5a5cf01d3bf2a708a30181b
---
M lib/includes/store/PropertySQLLookup.php
1 file changed, 7 insertions(+), 4 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/includes/store/PropertySQLLookup.php
b/lib/includes/store/PropertySQLLookup.php
index 877c7b3..3a39412 100644
--- a/lib/includes/store/PropertySQLLookup.php
+++ b/lib/includes/store/PropertySQLLookup.php
@@ -73,11 +73,14 @@
$statementsByProperty[$propertyId->getNumericId()][] =
$statement;
$property = $this->entityLookup->getEntity( $propertyId
);
- $propertyLabel = $property->getLabel( $langCode );
- if ( $propertyLabel !== false ) {
- $id = $property->getPrefixedId();
- $propertyList[$id] = $propertyLabel;
+ if ( $property !== null ) {
+ $propertyLabel = $property->getLabel( $langCode
);
+
+ if ( $propertyLabel !== false ) {
+ $id = $property->getPrefixedId();
+ $propertyList[$id] = $propertyLabel;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/54869
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I396df7016ccbcff3c5a5cf01d3bf2a708a30181b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude
Gerrit-Reviewer: Anja Jentzsch
Gerrit-Reviewer: Daniel Kinzler
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logmsbot is no more in #wikimedia-tech - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55031
Change subject: logmsbot is no more in #wikimedia-tech
..
logmsbot is no more in #wikimedia-tech
defd768 moved logmsbot to wikimedia-tech, it has then been added to the
wikimedia-ops channel with 7cc8d32 but not removed from wikimedia-tech
We want #wikimedia-tech to be a zone free of bots, so lets remove it.
That also cause !log entries to show up twice in server admin log.
Change-Id: I75abf6144d231f7335d025a59e448500d253fe13
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/55031/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 44cebdd..b3a6b7c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -710,7 +710,7 @@
$cluster = "misc"
$domain_search = "wikimedia.org pmtpa.wmnet eqiad.wmnet
esams.wikimedia.org"
- $ircecho_logs = { "/var/log/logmsg" =>
["#wikimedia-tech","#wikimedia-operations"] }
+ $ircecho_logs = { "/var/log/logmsg" => "#wikimedia-operations" }
$ircecho_nick = "logmsgbot"
$ircecho_server = "chat.freenode.net"
--
To view, visit https://gerrit.wikimedia.org/r/55031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75abf6144d231f7335d025a59e448500d253fe13
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed typos in documentation - change (mediawiki...Wikibase)
Tobias Gritschacher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55032
Change subject: Fixed typos in documentation
..
Fixed typos in documentation
Change-Id: Idea478299a023c2a4d4b58479842d0ff0d4f11b7
---
M lib/includes/store/EntityLookup.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/32/55032/1
diff --git a/lib/includes/store/EntityLookup.php
b/lib/includes/store/EntityLookup.php
index 2856e19..f61b21b 100644
--- a/lib/includes/store/EntityLookup.php
+++ b/lib/includes/store/EntityLookup.php
@@ -32,9 +32,9 @@
interface EntityLookup {
/**
-* Returns the entity with the provided id or null is there is no such
+* Returns the entity with the provided id or null if there is no such
* entity. If a $revision is given, the requested revision of the
entity is loaded.
-* The the revision does not belong to the given entity, null is
returned.
+* If the revision does not belong to the given entity, null is
returned.
*
* @since 0.3
*
--
To view, visit https://gerrit.wikimedia.org/r/55032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idea478299a023c2a4d4b58479842d0ff0d4f11b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable changesAsJson per default. - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: Enable changesAsJson per default. .. Enable changesAsJson per default. Change-Id: Ic703615f84d17bf950771cbfb0823bf8e8cc8dbc --- M docs/options.wiki M lib/config/WikibaseLib.default.php 2 files changed, 2 insertions(+), 3 deletions(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/docs/options.wiki b/docs/options.wiki index 4860472..2914ab1 100644 --- a/docs/options.wiki +++ b/docs/options.wiki @@ -34,7 +34,7 @@ 'commonsMedia', ) - +;changesAsJson: Use JSON to represent changes in the database. This is true per default, and there is no reason to set it to false, except for compatibility with very old clinet side code. == Repository Settings == diff --git a/lib/config/WikibaseLib.default.php b/lib/config/WikibaseLib.default.php index 0f4756a..6445a26 100644 --- a/lib/config/WikibaseLib.default.php +++ b/lib/config/WikibaseLib.default.php @@ -53,8 +53,7 @@ // JSON is more robust against version differences between repo and client, // but only once the client can cope with the JSON form of the change. -// TODO: make this default to true! -$wgWBSettings['changesAsJson'] = false; +$wgWBSettings['changesAsJson'] = true; // list of logical database names of local client wikis. // may contain mappings from site-id to db-name. -- To view, visit https://gerrit.wikimedia.org/r/55029 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic703615f84d17bf950771cbfb0823bf8e8cc8dbc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Daniel Kinzler Gerrit-Reviewer: Anja Jentzsch Gerrit-Reviewer: Aude Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update plural rules for Hebrew - change (mediawiki/core)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55033
Change subject: Update plural rules for Hebrew
..
Update plural rules for Hebrew
A recent CLDR update changed the plural rules for Hebrew
and added a "many" form. That rule has a mistake, however -
it is not suppoed to included the number 10.
This commit updates the plural overrides for Hebrew and makes
them closer to the latest CLDR, but with a fix for that rule.
It also updates the tests to include support for the new rule
and to make sure that the right fallbacks are used when
less than four rules are supplied, because usually that is
the case. It is thus a partial revert of the changes introduced
in I3d72e4105f6244b0695116940e62a2ddef66eb66 .
Mingle-Task: 2715
Change-Id: I1315e6900ef7a89bf246e748b786f7fc31a629c6
---
M languages/data/plurals-mediawiki.xml
M tests/phpunit/languages/LanguageHeTest.php
2 files changed, 62 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/33/55033/1
diff --git a/languages/data/plurals-mediawiki.xml
b/languages/data/plurals-mediawiki.xml
index 5ad6717..52b44dc 100644
--- a/languages/data/plurals-mediawiki.xml
+++ b/languages/data/plurals-mediawiki.xml
@@ -2,10 +2,15 @@
-
+
n is 1
n is 2
+n is not 0 AND n is not 10 AND n mod 10
is 0
n mod 100 is 1
diff --git a/tests/phpunit/languages/LanguageHeTest.php
b/tests/phpunit/languages/LanguageHeTest.php
index 1335e90..fd3baed 100644
--- a/tests/phpunit/languages/LanguageHeTest.php
+++ b/tests/phpunit/languages/LanguageHeTest.php
@@ -7,24 +7,71 @@
/** Tests for MediaWiki languages/classes/LanguageHe.php */
class LanguageHeTest extends LanguageClassesTestCase {
- /** @dataProvider providePlural */
- function testPlural( $result, $value ) {
+ /*
+ The most common usage for the plural forms is two forms,
+ for singular and plural. In this case, the second form
+ is technically dual, but in practice it's used as plural.
+ In some cases, usually with expressions of time, three forms
+ are needed - singular, dual and plural.
+ CLDR also specifies a fourth form for multiples of 10,
+ which is very rare. It also has a mistake, because
+ the number 10 itself is supposed to be just plural,
+ so currently it's overridden in MediaWiki.
+ */
+
+ /** @dataProvider provideTwoPluralForms */
+ function testTwoPluralForms( $result, $value ) {
+ $forms = array( 'one', 'other' );
+ $this->assertEquals( $result, $this->getLang()->convertPlural(
$value, $forms ) );
+ }
+
+ /** @dataProvider provideThreePluralForms */
+ function testThreePluralForms( $result, $value ) {
$forms = array( 'one', 'two', 'other' );
$this->assertEquals( $result, $this->getLang()->convertPlural(
$value, $forms ) );
}
- /** @dataProvider providePlural */
+ /** @dataProvider provideFourPluralForms */
+ function testFourPluralForms( $result, $value ) {
+ $forms = array( 'one', 'two', 'many', 'other' );
+ $this->assertEquals( $result, $this->getLang()->convertPlural(
$value, $forms ) );
+ }
+
+ /** @dataProvider provideFourPluralForms */
function testGetPluralRuleType( $result, $value ) {
$this->assertEquals( $result,
$this->getLang()->getPluralRuleType( $value ) );
}
- function providePlural() {
+ function provideTwoPluralForms() {
return array (
- array( 'other', 0 ),
- array( 'one', 1 ),
- array( 'two', 2 ),
- array( 'other', 3 ),
- array( 'other', 10 ),
+ array( 'other', 0 ), // Zero - plural
+ array( 'one', 1 ), // Singular
+ array( 'other', 2 ), // No third form provided, use it
as plural
+ array( 'other', 3 ), // Plural - other
+ array( 'other', 10 ), // No fourth form provided, use
it as plural
+ array( 'other', 20 ), // No fourth form provided, use
it as plural
+ );
+ }
+
+ function provideThreePluralForms() {
+ return array (
+ array( 'other', 0 ), // Zero - plural
+ array( 'one', 1 ), // Singular
+ array( 'two', 2 ), // Dual
+ array( 'other', 3 ), // Plural - other
+ array( 'other', 10 ), // No fourth form provided, use
it as plural
+ array( 'other', 20 ), // No fourth f
[MediaWiki-commits] [Gerrit] WikibaseClient uses __FILE__ instead of __DIR_ - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: WikibaseClient uses __FILE__ instead of __DIR_ .. WikibaseClient uses __FILE__ instead of __DIR_ By using __FILE__ the path will be wrong and the link is not generated on Special:Version. This is done already in WikibaseLib and Wikibase. Change-Id: I9c37ab4a5aeb1aaf7b8bced855ce0ca7c329a94a --- M client/WikibaseClient.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved Demon: Looks good to me, but someone else must approve John Erling Blad: Verified; Looks good to me, but someone else must approve jenkins-bot: Checked diff --git a/client/WikibaseClient.php b/client/WikibaseClient.php index af99a9c..82cc400 100644 --- a/client/WikibaseClient.php +++ b/client/WikibaseClient.php @@ -40,7 +40,7 @@ . ( defined( 'WB_EXPERIMENTAL_FEATURES' ) && WB_EXPERIMENTAL_FEATURES ? '/experimental' : '' ) ); $wgExtensionCredits['other'][] = array( - 'path' => __FILE__, + 'path' => __DIR__, 'name' => 'Wikibase Client', 'version' => WBC_VERSION, 'author' => array( -- To view, visit https://gerrit.wikimedia.org/r/54799 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9c37ab4a5aeb1aaf7b8bced855ce0ca7c329a94a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: John Erling Blad Gerrit-Reviewer: Demon Gerrit-Reviewer: John Erling Blad Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (testing) small fix in selenium rollback test - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged. Change subject: (testing) small fix in selenium rollback test .. (testing) small fix in selenium rollback test - sort before changing sitelink Change-Id: Ia6ef62be0f7af34fa09f2a0ee0c365f21c1e369c --- M repo/tests/selenium/special/rollback_spec.rb 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Tobias Gritschacher: Verified; Looks good to me, approved diff --git a/repo/tests/selenium/special/rollback_spec.rb b/repo/tests/selenium/special/rollback_spec.rb index 671e3bb..f66a793 100644 --- a/repo/tests/selenium/special/rollback_spec.rb +++ b/repo/tests/selenium/special/rollback_spec.rb @@ -40,6 +40,8 @@ page.saveAliases ajax_wait page.wait_for_api_callback + page.sitelinksHeaderCode_element.click + page.sitelinksHeaderCode_element.click page.editSitelinkLink page.pageInputFieldExistingSiteLink= sitelink_changed ajax_wait -- To view, visit https://gerrit.wikimedia.org/r/54853 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia6ef62be0f7af34fa09f2a0ee0c365f21c1e369c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Tobias Gritschacher Gerrit-Reviewer: Tobias Gritschacher Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] logmsbot is no more in #wikimedia-tech - change (operations/puppet)
ArielGlenn has submitted this change and it was merged.
Change subject: logmsbot is no more in #wikimedia-tech
..
logmsbot is no more in #wikimedia-tech
defd768 moved logmsbot to wikimedia-tech, it has then been added to the
wikimedia-ops channel with 7cc8d32 but not removed from wikimedia-tech
We want #wikimedia-tech to be a zone free of bots, so lets remove it.
That also cause !log entries to show up twice in server admin log.
Change-Id: I75abf6144d231f7335d025a59e448500d253fe13
---
M manifests/site.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 44cebdd..b3a6b7c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -710,7 +710,7 @@
$cluster = "misc"
$domain_search = "wikimedia.org pmtpa.wmnet eqiad.wmnet
esams.wikimedia.org"
- $ircecho_logs = { "/var/log/logmsg" =>
["#wikimedia-tech","#wikimedia-operations"] }
+ $ircecho_logs = { "/var/log/logmsg" => "#wikimedia-operations" }
$ircecho_nick = "logmsgbot"
$ircecho_server = "chat.freenode.net"
--
To view, visit https://gerrit.wikimedia.org/r/55031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75abf6144d231f7335d025a59e448500d253fe13
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar
Gerrit-Reviewer: ArielGlenn
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add namespace translation for 'bs' - change (mediawiki...Scribunto)
jenkins-bot has submitted this change and it was merged. Change subject: Add namespace translation for 'bs' .. Add namespace translation for 'bs' Translation by Edinwiki https://translatewiki.net/wiki/Thread:Support/Module_namespace_translation_for_bs-wiki Change-Id: Id3849e413961e6475b44afb04a88f02b4c5b1509 --- M Scribunto.namespaces.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Nikerabbit: Looks good to me, approved jenkins-bot: Verified diff --git a/Scribunto.namespaces.php b/Scribunto.namespaces.php index d4e454e..b13a7e0 100644 --- a/Scribunto.namespaces.php +++ b/Scribunto.namespaces.php @@ -18,6 +18,11 @@ 829 => 'Абмеркаваньне_модулю', ); +$namespaceNames['bs'] = array( + 828 => 'Modul', + 829 => 'Razgovor_o_modulu', +); + $namespaceNames['de'] = array( 828 => 'Modul', 829 => 'Modul_Diskussion', -- To view, visit https://gerrit.wikimedia.org/r/55022 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3849e413961e6475b44afb04a88f02b4c5b1509 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Anomie Gerrit-Reviewer: Nikerabbit Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix message key "widgets-error" - change (mediawiki...Widgets)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55034
Change subject: Fix message key "widgets-error"
..
Fix message key "widgets-error"
Change-Id: I44c5f041f2563747a0397388430262056fe48c7a
---
M WidgetRenderer.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Widgets
refs/changes/34/55034/1
diff --git a/WidgetRenderer.php b/WidgetRenderer.php
index 372771e..dbd86cd 100644
--- a/WidgetRenderer.php
+++ b/WidgetRenderer.php
@@ -127,7 +127,7 @@
try {
$output = $smarty->fetch( "wiki:$widgetName" );
} catch ( Exception $e ) {
- return '' . wfMsgExt(
'widgets-desc', array( 'parsemag' ), htmlentities( $widgetName ) ) . '';
+ return '' . wfMsgExt(
'widgets-error', array( 'parsemag' ), htmlentities( $widgetName ) ) . '';
}
// Hide the widget from the parser.
--
To view, visit https://gerrit.wikimedia.org/r/55034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44c5f041f2563747a0397388430262056fe48c7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Widgets
Gerrit-Branch: master
Gerrit-Owner: Shirayuki
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add SpecialSearchResultsPrepend/Append to release notes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add SpecialSearchResultsPrepend/Append to release notes .. Add SpecialSearchResultsPrepend/Append to release notes Commit 1c3b2a1 added the SpecialSearchResultsPrepend and SpecialSearchResultsAppend hooks, which were documented in docs/hooks.txt, but were not added to the release notes. Change-Id: I226349aa0199f5d72da0d1fab61e4facf92306b6 --- M RELEASE-NOTES-1.21 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: IAlex: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21 index fce42ff..13dc673 100644 --- a/RELEASE-NOTES-1.21 +++ b/RELEASE-NOTES-1.21 @@ -115,6 +115,7 @@ uz, vi. * Added 'CategoryAfterPageAdded' and 'CategoryAfterPageRemoved' hooks. * Added 'HistoryRevisionTools' and 'DiffRevisionTools' hooks. +* Added 'SpecialSearchResultsPrepend' and 'SpecialSearchResultsAppend' hooks. * (bug 33186) Add image rotation api "imagerotate" * (bug 34040) Add "User rights management" link on user page toolbox. * (bug 45526) Add QUnit assertion helper "QUnit.assert.htmlEqual" for asserting -- To view, visit https://gerrit.wikimedia.org/r/55030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I226349aa0199f5d72da0d1fab61e4facf92306b6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Fo0bar Gerrit-Reviewer: IAlex Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing coding error reference's snakview "add" toolbar - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55035
Change subject: Fixing coding error reference's snakview "add" toolbar
..
Fixing coding error reference's snakview "add" toolbar
Change-Id: Id71b0da441fa5eb8f49fd38d4cff6d018b9ace3b
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/35/55035/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 6bcc503..b7a5bf7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -157,7 +157,7 @@
change: function( event ) {
var referenceView = $( event.target ).data(
'referenceview' ),
addToolbar = $( event.target ).data(
'addtoolbar' );
- if ( toolbar ) {
+ if ( addToolbar ) {
addToolbar.toolbar[referenceView.isValid() ?
'enable' : 'disable']();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/55035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id71b0da441fa5eb8f49fd38d4cff6d018b9ace3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] entityselector: Instantly closing list of suggestions - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: entityselector: Instantly closing list of suggestions
..
entityselector: Instantly closing list of suggestions
When hitting "enter" on an item in the suggestion list of the entity selector
replacing the search box, the suggestion list will be closed instantly now.
Change-Id: I9f6701f14c32dd14acf28d2c6dcdc27f86257c95
---
M lib/resources/jquery.ui/jquery.ui.suggester.js
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/resources/jquery.ui/jquery.ui.suggester.js
b/lib/resources/jquery.ui/jquery.ui.suggester.js
index 9a59bc1..6454638 100644
--- a/lib/resources/jquery.ui/jquery.ui.suggester.js
+++ b/lib/resources/jquery.ui/jquery.ui.suggester.js
@@ -156,7 +156,7 @@
if ( event.keyCode === $.ui.keyCode.ENTER ) {
if ( self.menu.active ) {
var item =
self.menu.active.data( 'item.autocomplete' );
- if ( item.isCustom &&
item.customAction ) {
+ if ( item && item.isCustom &&
item.customAction ) {
// Custom actions are
supposed to be suggester-specific. If, for some
// reason, they should
interact with external components, the action(s)
// may trigger custom
events.
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 1856547..c4bf407 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -200,6 +200,7 @@
// entity.
event.stopImmediatePropagation();
event.preventDefault();
+
$.ui.autocomplete.prototype.close.call( self );
window.location.href =
self.selectedEntity().url;
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/54668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f6701f14c32dd14acf28d2c6dcdc27f86257c95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed typos in documentation - change (mediawiki...Wikibase)
John Erling Blad has submitted this change and it was merged.
Change subject: Fixed typos in documentation
..
Fixed typos in documentation
Change-Id: Idea478299a023c2a4d4b58479842d0ff0d4f11b7
---
M lib/includes/store/EntityLookup.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
John Erling Blad: Verified; Looks good to me, approved
Nikerabbit: Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/includes/store/EntityLookup.php
b/lib/includes/store/EntityLookup.php
index 2856e19..f61b21b 100644
--- a/lib/includes/store/EntityLookup.php
+++ b/lib/includes/store/EntityLookup.php
@@ -32,9 +32,9 @@
interface EntityLookup {
/**
-* Returns the entity with the provided id or null is there is no such
+* Returns the entity with the provided id or null if there is no such
* entity. If a $revision is given, the requested revision of the
entity is loaded.
-* The the revision does not belong to the given entity, null is
returned.
+* If the revision does not belong to the given entity, null is
returned.
*
* @since 0.3
*
--
To view, visit https://gerrit.wikimedia.org/r/55032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idea478299a023c2a4d4b58479842d0ff0d4f11b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher
Gerrit-Reviewer: John Erling Blad
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 45198) entity selector: Prevent closing of suggestion list - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (bug 45198) entity selector: Prevent closing of suggestion list
..
(bug 45198) entity selector: Prevent closing of suggestion list
List of suggestion will not be closed anymore if there is just one suggestion
left.
Change-Id: Ia7f11d8d0a3c724be9de9b9d562d0667e14c5a50
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index c4bf407..b719178 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -362,7 +362,7 @@
this.offset = 0;
this.menu.element.children().remove();
this.menu.refresh();
- } else {
+ } else if ( originalType !== 'programmatic' ) {
// Do not close the list of suggestions when
programmatically selecting an entity
// (e.g by typing an exact, unique entity
label), allowing the user to check that
// the typed string actually matches a single
entity.
--
To view, visit https://gerrit.wikimedia.org/r/54669
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7f11d8d0a3c724be9de9b9d562d0667e14c5a50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Relax checks for translation memory Solr - change (operations/puppet)
MaxSem has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55036
Change subject: Relax checks for translation memory Solr
..
Relax checks for translation memory Solr
Change-Id: I39d610cb24b2ebbdcfe0d361786a341115f10cc4
---
M manifests/role/solr.pp
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/36/55036/1
diff --git a/manifests/role/solr.pp b/manifests/role/solr.pp
index 3c04e49..07b5f1f 100644
--- a/manifests/role/solr.pp
+++ b/manifests/role/solr.pp
@@ -4,9 +4,11 @@
#
# == Parameters:
#
-# $schema:: Schema file for Solr (only one schema per instance
supported)
-# $replication_master:: Replication master, if this is current hostname, this
server will be a master
-class role::solr($schema = undef, $replication_master = undef ) {
+# $schema:: Schema file for Solr (only one schema per instance
supported)
+# $replication_master:: Replication master, if this is current hostname,
this server will be a master
+# $average_request_time:: Average request time check threshold, the format is
+# "warning threshold:error threshold", or simply
"error threshold"
+class role::solr($schema = undef, $replication_master = undef,
$average_request_time = "400:600" ) {
class { "::solr":
schema => $schema,
replication_master => $replication_master,
@@ -18,7 +20,7 @@
}
monitor_service { "Solr":
description => "Solr",
- check_command => "$check_command!400:600!5",
+ check_command => "$check_command!$average_request_time!5",
}
}
@@ -26,7 +28,8 @@
system_role { "solr": description => "ttm solr backend" }
class { "role::solr":
- schema => "puppet:///modules/solr/schema-ttmserver.xml"
+ schema => "puppet:///modules/solr/schema-ttmserver.xml",
+ average_request_time => '1000:1500', # Translate uses fairly
slow queries
}
}
--
To view, visit https://gerrit.wikimedia.org/r/55036
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I39d610cb24b2ebbdcfe0d361786a341115f10cc4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixing coding error reference's snakview "add" toolbar - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: Fixing coding error reference's snakview "add" toolbar
..
Fixing coding error reference's snakview "add" toolbar
Change-Id: Id71b0da441fa5eb8f49fd38d4cff6d018b9ace3b
---
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 6bcc503..b7a5bf7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -157,7 +157,7 @@
change: function( event ) {
var referenceView = $( event.target ).data(
'referenceview' ),
addToolbar = $( event.target ).data(
'addtoolbar' );
- if ( toolbar ) {
+ if ( addToolbar ) {
addToolbar.toolbar[referenceView.isValid() ?
'enable' : 'disable']();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/55035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id71b0da441fa5eb8f49fd38d4cff6d018b9ace3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46410) suggester widget: Always show custom item - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55037
Change subject: (bug 46410) suggester widget: Always show custom item
..
(bug 46410) suggester widget: Always show custom item
Always open the suggester menu when a custom item is defined.
Change-Id: I3d95d5365b03fb272faae56d43fc2118611bca3b
---
M lib/resources/jquery.ui/jquery.ui.suggester.js
1 file changed, 12 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/37/55037/1
diff --git a/lib/resources/jquery.ui/jquery.ui.suggester.js
b/lib/resources/jquery.ui/jquery.ui.suggester.js
index 6454638..f7675c0 100644
--- a/lib/resources/jquery.ui/jquery.ui.suggester.js
+++ b/lib/resources/jquery.ui/jquery.ui.suggester.js
@@ -259,6 +259,18 @@
},
/**
+* @see jquery.ui.autocomplete.__response
+*/
+ __response: function( content ) {
+ $.ui.autocomplete.prototype.__response.call( this,
content );
+ // There is no content but the menu should be visible
if there is a custom list item:
+ if ( !this.options.disabled && ( !content ||
!content.length ) && this.customListItem ) {
+ this._suggest( [] );
+ this._trigger( 'open' );
+ }
+ },
+
+ /**
* Handles the response when the API call returns successfully.
*
* @param {Object} response
--
To view, visit https://gerrit.wikimedia.org/r/55037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d95d5365b03fb272faae56d43fc2118611bca3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Initial upstream branch. - change (operations...python-statsd)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/55038 Change subject: Initial upstream branch. .. Initial upstream branch. Change-Id: Ife09658281c6cafe47309fa379e06d5879d269a9 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-statsd refs/changes/38/55038/1 -- To view, visit https://gerrit.wikimedia.org/r/55038 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ife09658281c6cafe47309fa379e06d5879d269a9 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/python-statsd Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Imported Upstream version 1.5.8 - change (operations...python-statsd)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55039
Change subject: Imported Upstream version 1.5.8
..
Imported Upstream version 1.5.8
Change-Id: Ib8efc1a5398d357d739f30d05bc01474c642f84b
---
A PKG-INFO
A README.rst
A python_statsd.egg-info/PKG-INFO
A python_statsd.egg-info/SOURCES.txt
A python_statsd.egg-info/dependency_links.txt
A python_statsd.egg-info/top_level.txt
A setup.cfg
A setup.py
A statsd/__init__.py
A statsd/average.py
A statsd/client.py
A statsd/connection.py
A statsd/counter.py
A statsd/gauge.py
A statsd/raw.py
A statsd/timer.py
16 files changed, 1,037 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-statsd
refs/changes/39/55039/1
diff --git a/PKG-INFO b/PKG-INFO
new file mode 100644
index 000..2520973
--- /dev/null
+++ b/PKG-INFO
@@ -0,0 +1,169 @@
+Metadata-Version: 1.1
+Name: python-statsd
+Version: 1.5.8
+Summary: statsd is a client for Etsy's node-js statsd server. A proxy for the
Graphite stats collection and graphing server.
+Home-page: https://github.com/WoLpH/python-statsd
+Author: Rick van Hattem
+Author-email: rick.van.hat...@fawo.nl
+License: BSD
+Description: Introduction
+
+
+`statsd` is a client for Etsy's statsd server, a front end/proxy for
the
+Graphite stats collection and graphing server.
+
+* Graphite
+- http://graphite.wikidot.com
+* Statsd
+- code: https://github.com/etsy/statsd
+- blog post:
http://codeascraft.etsy.com/2011/02/15/measure-anything-measure-everything/
+
+
+Install
+===
+
+To install simply execute `python setup.py install`.
+If you want to run the tests first, run `python setup.py nosetests`
+
+
+Usage
+=
+
+To get started real quick, just try something like this:
+
+Basic Usage
+---
+
+Timers
+^^
+
+>>> import statsd
+>>>
+>>> timer = statsd.Timer('MyApplication')
+>>>
+>>> timer.start()
+>>> # do something here
+>>> timer.stop('SomeTimer')
+
+
+Counters
+
+
+>>> import statsd
+>>>
+>>> counter = statsd.Counter('MyApplication')
+>>> # do something here
+>>> counter += 1
+
+
+Gauge
+^
+
+>>> import statsd
+>>>
+>>> gauge = statsd.Gauge('MyApplication')
+>>> # do something here
+>>> gauge.send('SomeName', value)
+
+
+Raw
+^^^
+
+Raw strings should be e.g. pre-summarized data or other data that will
+get passed directly to carbon. This can be used as a time and
+bandwidth-saving mechanism sending a lot of samples could use a lot of
+bandwidth (more b/w is used in udp headers than data for a gauge, for
+instance).
+
+
+
+>>> import statsd
+>>>
+>>> raw = statsd.Raw('MyApplication', connection)
+>>> # do something here
+>>> raw.send('SomeName', value, timestamp)
+
+The raw type wants to have a timestamp in seconds since the epoch (the
+standard unix timestamp, e.g. the output of "date +%s"), but if you
leave it out or
+provide None it will provide the current time as part of the message
+
+Average
+^^^
+
+>>> import statsd
+>>>
+>>> average = statsd.Average('MyApplication', connection)
+>>> # do something here
+>>> average.send('SomeName', 'somekey:%d'.format(value))
+
+
+Connection settings
+^^^
+
+If you need some settings other than the defaults for your
``Connection``,
+you can use ``Connection.set_defaults()``.
+
+>>> import statsd
+>>> statsd.Connection.set_defaults(host='localhost', port=8125,
sample_rate=1, disabled=False)
+
+Every interaction with statsd after these are set will use whatever you
+specify, unless you explicitly create a different ``Connection`` to use
+(described below).
+
+Defaults:
+
+- ``host`` = ``'localhost'``
+- ``port`` = ``8125``
+- ``sample_rate`` = ``1``
+- ``disabled`` = ``False``
+
+
+Advanced Usage
+--
+
+>>> import statsd
+>>>
+>>> # Open a connection to `server` on port `1234` with a `50%`
sample rate
+>>> s
[MediaWiki-commits] [Gerrit] Merge tag 'upstream/1.5.8' - change (operations...python-statsd)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/55040 Change subject: Merge tag 'upstream/1.5.8' .. Merge tag 'upstream/1.5.8' Upstream version 1.5.8 Change-Id: If2ad2a3791d6e19e40d58aec2a22b80cc09ae82e --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-statsd refs/changes/40/55040/1 -- To view, visit https://gerrit.wikimedia.org/r/55040 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If2ad2a3791d6e19e40d58aec2a22b80cc09ae82e Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/python-statsd Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Inital deb packaging - change (operations...python-statsd)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55041
Change subject: Inital deb packaging
..
Inital deb packaging
Current version is 1.5.8, properly tagged in upstream repo.
Close ITP #703613.
License and copyright confirmed by upstream to be BSD-3-Clause
https://github.com/WoLpH/python-statsd/issues/23
Change-Id: I191ae854916c2683750004b64af107a11055c4e6
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 92 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-statsd
refs/changes/41/55041/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..b835609
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+python-statsd (1.5.8-1) precise; urgency=low
+
+ * Initial release.
+
+ -- Antoine Musso Thu, 21 Mar 2013 09:54:18 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..dae8e64
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: python-statsd
+Section: python
+Priority: optional
+Maintainer: Antoine Musso
+Build-Depends: debhelper (>= 9), python-dev (>= 2.6.6-3)
+Standards-Version: 3.9.3
+Homepage: https://github.com/WoLpH/python-statsd
+X-Python-Version: >= 2.6
+
+Package: python-statsd
+Architecture: all
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python library to act as a client to statsd
+ Statsd is a client for Etsy's statsd server, a front end/proxy for the
+ Graphite stats collection and graphing server.
+ .
+ The module offer a high level API interface to easily send your data
+ to a statsd server.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..220c209
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: python-statsd
+Upstream-Contact: Rick van Hattem
+Source: https://github.com/WoLpH/python-statsd
+
+Files: *
+Copyright: 2011-2013 Rick van Hattem. All rights reserved.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ - Redistributions of source code must retain the above
copyright notice, this
+ list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above
copyright notice,
+ this list of conditions and the following
disclaimer in the documentation
+ and/or other materials provided with the
distribution.
+ - Neither the name of SwapOff.org nor the names of its
contributors may
+ be used to endorse or promote products derived
from this software without
+ specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2013 Antoine Musso
+License: GPL-2
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..c87b3c6
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,10 @@
+[DEFAULT]
+upstream-tag = v%(version)s
+
+[git-buildpackage]
+upstream-tree=tag
+debian-branch=master
+overlay = True
+no-create-orig = True
+tarball-dir = ../tarballs
+export-dir = ../build-area
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..0b678eb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with python2
+
+DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Vers
[MediaWiki-commits] [Gerrit] (bug 46383) correct constructor fields for prototypes not us... - change (mediawiki...Wikibase)
Daniel Werner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55042
Change subject: (bug 46383) correct constructor fields for prototypes not using
wb.utilities.inherit
..
(bug 46383) correct constructor fields for prototypes not using
wb.utilities.inherit
Since the object literal was used for those constructors prototypes, the
original prototype's
"constructor" field has not been there. Now we extend the original prototype
(which is also
just a plain object with the "constructor" field set) instead of overwriting it.
Also did some renaming and general cleanup around the constructors.
Change-Id: Ied01e553d16dd0b161fa97ea25d33d9f4efd0447
---
M lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
M
lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
M lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
M lib/resources/wikibase.datamodel/wikibase.Claim.js
M lib/resources/wikibase.datamodel/wikibase.PropertyNoValueSnak.js
M lib/resources/wikibase.datamodel/wikibase.PropertySomeValueSnak.js
M lib/resources/wikibase.datamodel/wikibase.PropertyValueSnak.js
M lib/resources/wikibase.datamodel/wikibase.Reference.js
M lib/resources/wikibase.datamodel/wikibase.Snak.js
M lib/resources/wikibase.datamodel/wikibase.SnakList.js
M lib/resources/wikibase.datamodel/wikibase.Statement.js
M lib/resources/wikibase.serialization/serialization.Serializer.js
M lib/resources/wikibase.serialization/serialization.Unserializer.js
13 files changed, 64 insertions(+), 63 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/42/55042/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
index 8b98cb4..ab85ff5 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.ViewState.js
@@ -25,7 +25,7 @@
}
this._view = snakView;
};
- SELF.prototype = {
+ $.extend( SELF.prototype, {
/**
* The widget object whose status is represented.
* @type jQuery.wikibase.snakview
@@ -69,6 +69,6 @@
isDisabled: function() {
return this._view.isDisabled();
}
- };
+ } );
}( mediaWiki, wikibase, jQuery ) );
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
index a3863bd..97f8cf0 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.snakview/snakview.variations.Variation.js
@@ -45,7 +45,7 @@
this._init();
};
- SELF.prototype = {
+ $.extend( SELF.prototype, {
/**
* A unique class for this variation. Will be set by the
variations factory when creating a
* new variation definition.
@@ -173,6 +173,6 @@
* @since 0.4
*/
blur: function() {}
- };
+ } );
}( mediaWiki, wikibase, jQuery ) );
diff --git
a/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
b/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
index 58fb00f..5b264af 100644
--- a/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
+++ b/lib/resources/wikibase.datamodel/datamodel.entities/wikibase.Entity.js
@@ -159,7 +159,7 @@
return fields1length === fields2length;
}
- SELF.prototype = {
+ $.extend( SELF.prototype, {
/**
* Internal representation of the object.
* @type Object
@@ -367,7 +367,7 @@
map.type = this.getType();
return map;
}
- };
+ } );
/**
* Creates a new Entity Object from a given Object with certain keys
and values, what an actual
diff --git a/lib/resources/wikibase.datamodel/wikibase.Claim.js
b/lib/resources/wikibase.datamodel/wikibase.Claim.js
index 6c542ac..d599a5b 100644
--- a/lib/resources/wikibase.datamodel/wikibase.Claim.js
+++ b/lib/resources/wikibase.datamodel/wikibase.Claim.js
@@ -2,7 +2,7 @@
* @file
* @ingroup WikibaseLib
* @licence GNU GPL v2+
- * @author Daniel Werner
+ * @author Daniel Werner < daniel.wer...@wikimedia.de >
*/
( function( wb, $ ) {
'use strict';
@@ -18,13 +18,20 @@
* @param {String|null} [guid] The Global Unique Identifier of this Claim. Can
be omitted or null
*if this is a new Claim, not yet stored in
[MediaWiki-commits] [Gerrit] HTML skelton for main page - change (translatewiki)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55043
Change subject: HTML skelton for main page
..
HTML skelton for main page
Work in progress
Change-Id: Ib39eeb48d346df833a6ceded2c420b7b88d307b9
---
M MainPage/MainPage.php
M MainPage/Resources.php
A MainPage/resources/banners/dance.jpg
A MainPage/resources/css/ext.translate.mainpage.css
A MainPage/resources/js/ext.translate.mainpage.js
M MainPage/specials/SpecialTwnMainPage.php
6 files changed, 211 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/43/55043/1
diff --git a/MainPage/MainPage.php b/MainPage/MainPage.php
index add4b24..11d690e 100644
--- a/MainPage/MainPage.php
+++ b/MainPage/MainPage.php
@@ -21,11 +21,13 @@
);
$dir = __DIR__;
-require_once( "$dir/Autoload.php" );
+
require_once( "$dir/Resources.php" );
+require_once( "$dir/Autoload.php" );
$wgExtensionMessagesFiles['MainPage'] = "$dir/MainPage.i18n.php";
$wgExtensionMessagesFiles['MainPageAlias'] = "$dir/MainPage.alias.php";
$wgSpecialPages['TwnMainPage'] = 'SpecialTwnMainPage';
+
diff --git a/MainPage/Resources.php b/MainPage/Resources.php
index b3d9bbc..dd09b79 100644
--- a/MainPage/Resources.php
+++ b/MainPage/Resources.php
@@ -1 +1,22 @@
__DIR__,
+ 'remoteExtPath' => 'MainPage'
+);
+
+$wgResourceModules['ext.translate.mainpage'] = array(
+ 'scripts' => 'resources/js/ext.translate.mainpage.js',
+ 'styles' => 'resources/css/ext.translate.mainpage.css',
+ 'dependencies' => array(
+ 'ext.translate.grid',
+ 'jquery.uls'
+ ),
+ 'position' =>'top',
+) + $resourcePaths;
diff --git a/MainPage/resources/banners/dance.jpg
b/MainPage/resources/banners/dance.jpg
new file mode 100644
index 000..ae9d76f
--- /dev/null
+++ b/MainPage/resources/banners/dance.jpg
Binary files differ
diff --git a/MainPage/resources/css/ext.translate.mainpage.css
b/MainPage/resources/css/ext.translate.mainpage.css
new file mode 100644
index 000..67984eb
--- /dev/null
+++ b/MainPage/resources/css/ext.translate.mainpage.css
@@ -0,0 +1,78 @@
+body {
+ background-color: #fff;
+}
+
+.twn-mainpage {
+ background-color: #fff;
+ width: 90%;
+ margin-left: 5%;
+ margin-right: 5%;
+}
+
+.twn-mainpage-header .uls-trigger {
+ padding-left: 20px;
+}
+
+.twn-mainpage-title { /* @embed */
+ background: transparent url('//translatewiki.net/static/logo.png')
+ no-repeat scroll left center;
+ /*FIXME: we need svgs too*/
+ background-size: 50px;
+ height: 75px;
+}
+
+.twn-mainpage-title .twn-brand-name,
+.twn-mainpage-title .twn-brand-motto {
+ padding-left: 50px;
+}
+
+.twn-mainpage-header {
+ border-bottom: 2px solid blue;
+ height: 100px;
+}
+
+.twn-mainpage-header .login {
+ float: right;
+}
+
+.twn-mainpage-banner {
+ height: 600px;
+ background: transparent url('../banners/dance.jpg') no-repeat scroll
+ left center;
+ background-size: 100%;
+}
+
+.twn-mainpage-search {
+ padding: 5px;
+ background-color: #000;
+}
+
+.twn-mainpage-loginform {
+ background-color: #fff;
+ height: 580px; padding : 10px;
+ opacity: 0.5;
+ margin: 10px;
+ padding: 10px;
+}
+
+.twn-mainpage-search input,
+.twn-mainpage-search button {
+ padding: 5px;
+ font-size: 16px;
+ height: 50px;
+}
+
+.twn-mainpage-footer {
+ background-color: rgb(190, 181, 181);
+ height: 100px;
+ font-size: 16px;
+ padding: 10px;
+ margin: 10px;
+}
+
+.twn-mainpage-project-tile {
+ border: 1px solid black;
+ margin: 10px;
+ padding: 10px;
+ height: 200px;
+}
\ No newline at end of file
diff --git a/MainPage/resources/js/ext.translate.mainpage.js
b/MainPage/resources/js/ext.translate.mainpage.js
new file mode 100644
index 000..c767de8
--- /dev/null
+++ b/MainPage/resources/js/ext.translate.mainpage.js
@@ -0,0 +1 @@
+//test
\ No newline at end of file
diff --git a/MainPage/specials/SpecialTwnMainPage.php
b/MainPage/specials/SpecialTwnMainPage.php
index 7009f7f..2ab7483 100644
--- a/MainPage/specials/SpecialTwnMainPage.php
+++ b/MainPage/specials/SpecialTwnMainPage.php
@@ -13,16 +13,119 @@
* @ingroup SpecialPage
*/
class SpecialTwnMainPage extends SpecialPage {
+
function __construct() {
parent::__construct( 'TwnMainPage' );
}
- public function execute( $parameters ) {
- $this->setHeaders();
- $this->getOutput()->addWikiText( "Hei maailma!" );
- }
-
public function getDescription() {
return $this->msg( 'twnmp-mainpage' );
}
+
+ public function execute( $parameters ) {
+ $this->setHeaders();
+ $out = $this->getOutput();
+ $out->setArticleBodyO
[MediaWiki-commits] [Gerrit] (bug 45997) Send changes to most stale wiki first . - change (mediawiki...Wikibase)
Daniel Kinzler has uploaded a new change for review. https://gerrit.wikimedia.org/r/55044 Change subject: (bug 45997) Send changes to most stale wiki first . .. (bug 45997) Send changes to most stale wiki first . Previously, we picked a target wiki for dispatching at random. This lead to a median dispatch lag of more than one hour of the Wikimedia cluster. This change introduces a new logic: Pick a random target from a small set of candidate targets. That set consosts of the n targets with the lowest processed change ID that satisfy the following conditions: have not been touched for $dispatchInterval seconds ( or are lagging by more changes than given by batchSize ) and are not locked ( or the lock is older than $lockGraceInterval ). and have not seen all changes and are not disabled Please test this with multiple instances of the dispatchChanges script running in parallel, dispatching to multiple target wikis. Bugs: 45997, 46259. Change-Id: Ibae269e72a9e77b9165c29c1c9214fa03ff0f02b --- M lib/maintenance/dispatchChanges.php 1 file changed, 239 insertions(+), 117 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/44/55044/1 diff --git a/lib/maintenance/dispatchChanges.php b/lib/maintenance/dispatchChanges.php index 53d706e..ca5391e 100644 --- a/lib/maintenance/dispatchChanges.php +++ b/lib/maintenance/dispatchChanges.php @@ -41,6 +41,11 @@ protected $stateTable; /** +* @var ChangesTable: access to the changes table +*/ + protected $changesTable; + + /** * @var string: the logical name of the repository's database */ protected $repoDB; @@ -78,9 +83,27 @@ protected $delay; /** -* @var int: the number of times to try to lock a client wiki before giving up. +* @var int: Number of seconds to wait before dispatching to the same wiki again. +* This affects the effective batch size, and this influences how changes +* can be coalesced. */ - protected $maxSelectTries; + protected $dispatchInterval = 60; + + /** +* @var int: Number of seconds to wait before testing a lock. Any target with a lock +* timestamp newer than this will not be considered for selection. +*/ + protected $lockGraceInterval = 60; + + /** +* @var int: Number of target wikis to select as a base set for random selection. +* Setting this to 1 causes strict "oldest first" behavior, with the possibility +* of grind/starvation if dispatching to the oldest wiki fails. +* Setting this equal to (or greater than) the number of target wikis +* causes a completely random selection of the target, regardless of when it +* was last selected for dispatch. +*/ + protected $randomness = 5; /** * @var bool: whether output should be version. @@ -98,9 +121,15 @@ and dispatches them to any client wikis using their job queue.'; $this->addOption( 'verbose', "Report activity." ); - $this->addOption( 'max-select-tries', "How often to try to find an idle client wiki before giving up. Default: 10", false, true ); - $this->addOption( 'pass-delay', "Seconds to sleep between passes. Default: 1", false, true ); - $this->addOption( 'max-passes', "The number of passes to do before exiting. Default: the number of client wikis if max-time isn't given. Infinite if it is.", false, true ); + $this->addOption( 'idle-delay', "Seconds to sleep when idle. Default: 10", false, true ); + $this->addOption( 'dispatch-interval', "How often to dispatch to each target wiki. " + . "Default: every 60 seconds", false, true ); + $this->addOption( 'lock-grace-interval', "Seconds after wich to probe for orphaned locks. " + . "Default: 60", false, true ); + $this->addOption( 'randomness', "Number of least current target wikis to pick from at random. " + . "Default: 5.", false, true ); + $this->addOption( 'max-passes', "The number of passes to do before exiting. " + . "Default: the number of client wikis if max-time isn't given. Infinite if it is.", false, true ); $this->addOption( 'max-time', "The number of seconds before exiting. Default: infinite.", false, true ); $this->addOption( 'batch-size', "Max number of changes to pass to a client at a time. Default: 1000", false, true ); } @@ -108,8 +137,9 @@ /** * Initializes member
[MediaWiki-commits] [Gerrit] Rename dashboard to be more accurate - change (analytics/limn-mobile-data)
Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55045
Change subject: Rename dashboard to be more accurate
..
Rename dashboard to be more accurate
Change-Id: I37a5822d458bef568821ecfe0f1f2fe47eaca246
---
M dashboards/reportcard.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/limn-mobile-data
refs/changes/45/55045/1
diff --git a/dashboards/reportcard.json b/dashboards/reportcard.json
index 280a1c1..85fee33 100644
--- a/dashboards/reportcard.json
+++ b/dashboards/reportcard.json
@@ -1,7 +1,7 @@
{
"id" : "reportcard",
-"headline" : "Mobile Wikipedia",
-"subhead" : "Contributions",
+"headline" : "Commons Mobile Contributions",
+"subhead" : "Apps & Web",
"tabs": [
{
"name": "Core",
--
To view, visit https://gerrit.wikimedia.org/r/55045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37a5822d458bef568821ecfe0f1f2fe47eaca246
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46383) correct constructor fields for prototypes not us... - change (mediawiki...DataValues)
Daniel Werner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55046
Change subject: (bug 46383) correct constructor fields for prototypes not using
dv.util.inherit
..
(bug 46383) correct constructor fields for prototypes not using dv.util.inherit
Same as Ied01e553d16dd0b161fa97ea25d33d9f4efd0447 for Wikibase but for
DataValues extensions.
Change-Id: Ib52694b932b5f9bdc0949b357960917c06593ef2
---
M DataTypes/resources/dataTypes.js
M DataTypes/resources/jquery/jquery.inputAutoExpand.js
M DataValues/resources/DataValue.js
M DataValues/resources/dataValues.util.js
M DataValues/tests/qunit/DataValue.tests.js
M ValueParsers/resources/ValueParser.js
M ValueParsers/resources/ValueParserFactory.js
7 files changed, 40 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues
refs/changes/46/55046/1
diff --git a/DataTypes/resources/dataTypes.js b/DataTypes/resources/dataTypes.js
index 865a3d3..5ab6bcb 100644
--- a/DataTypes/resources/dataTypes.js
+++ b/DataTypes/resources/dataTypes.js
@@ -37,7 +37,7 @@
* @param {Object} formatter
* @param {Object} validators
*/
- dt.DataType = function DtDataType( typeId, dataValueType, parser,
formatter, validators ) {
+ var SELF = dt.DataType = function DtDataType( typeId, dataValueType,
parser, formatter, validators ) {
// TODO: enforce the requirement or remove it after we
implemented and use all of the parts
if( dataValueType === undefined ) {
throw new Error( 'All arguments must be provided for
creating a new DataType object' );
@@ -52,7 +52,8 @@
this._formatter = formatter;
this._validators = validators;
};
- dt.DataType.prototype = {
+
+ $.extend( SELF.prototype, {
/**
* Returns the data type's identifier.
* @since 0.1
@@ -94,7 +95,7 @@
getLabel: function() {
return mw.message( 'datatypes-type-' + this.getId() );
}
- };
+ } );
/**
* Creates a new DataType object from a given JSON structure.
@@ -104,9 +105,9 @@
* @param {Object} json JSON structure containing data type info
* @return {dt.DataType} DataType object
*/
- dt.DataType.newFromJSON = function( typeId, json ) {
+ SELF.newFromJSON = function( typeId, json ) {
// TODO: inmplement parser, formatter and validators parameters
- return new dt.DataType( typeId, json.dataValueType );
+ return new SELF( typeId, json.dataValueType );
};
@@ -116,7 +117,7 @@
var dts = {};
$.each( mw.config.get( 'wbDataTypes' ) || {}, function( dtTypeId,
dtDefinition ) {
- dts[ dtTypeId ] = dt.DataType.newFromJSON( dtTypeId,
dtDefinition );
+ dts[ dtTypeId ] = SELF.newFromJSON( dtTypeId, dtDefinition );
} );
/**
diff --git a/DataTypes/resources/jquery/jquery.inputAutoExpand.js
b/DataTypes/resources/jquery/jquery.inputAutoExpand.js
index 7c06df2..2976ecb 100644
--- a/DataTypes/resources/jquery/jquery.inputAutoExpand.js
+++ b/DataTypes/resources/jquery/jquery.inputAutoExpand.js
@@ -287,7 +287,7 @@
return instances;
};
- AutoExpandInput.prototype = {
+ $.extend( AutoExpandInput.prototype, {
/**
* sets the input boxes width to fit the boxes content.
*
@@ -549,6 +549,6 @@
this.expand();
}
- };
+ } );
}( jQuery ) );
diff --git a/DataValues/resources/DataValue.js
b/DataValues/resources/DataValue.js
index 164d3a7..80c101a 100644
--- a/DataValues/resources/DataValue.js
+++ b/DataValues/resources/DataValue.js
@@ -15,9 +15,16 @@
* @abstract
* @since 0.1
*/
-dv.DataValue = function DvDataValue() {};
-dv.DataValue.prototype = {
+var SELF = dv.DataValue = function DvDataValue() {};
+/**
+ * Type of the DataValue. A static definition of the type like this has to be
defined for all
+ * DataValue implementations.
+ * @type String
+ */
+SELF.TYPE = null;
+
+$.extend( SELF.prototype, {
/**
* Returns the most basic representation of this Object's value.
*
@@ -70,13 +77,6 @@
getType: function() {
return this.constructor.TYPE;
}
-};
-
-/**
- * Type of the DataValue. A static definition of the type like this has to be
defined for all
- * DataValue implementations.
- * @type String
- */
-dv.DataValue.TYPE = null;
+} );
}( dataValues, jQuery ) );
diff --git a/DataValues/resources/dataValues.util.js
b/DataValues/resources/dataValues.util.js
index d64c70d..10fabe7 100644
--- a/DataValues/resources/dataValues.util.js
+++ b/DataValues/resources/dataValues.util.js
@@ -66,8
[MediaWiki-commits] [Gerrit] Merge branch 'parserhook/re-naming' into 1.9.x-feature - change (mediawiki...SemanticMediaWiki)
Mwjames has uploaded a new change for review. https://gerrit.wikimedia.org/r/55047 Change subject: Merge branch 'parserhook/re-naming' into 1.9.x-feature .. Merge branch 'parserhook/re-naming' into 1.9.x-feature Unresolved dependencies starts to killing me and I can't start testing without a proper integration therefore I use this feature branch to ensure all changes to the parser hook are working as suppose to. Change-Id: Icd4442ce5cc7921c4ec5174b5d499bbe91d92a82 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki refs/changes/47/55047/1 -- To view, visit https://gerrit.wikimedia.org/r/55047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icd4442ce5cc7921c4ec5174b5d499bbe91d92a82 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMediaWiki Gerrit-Branch: 1.9.x-feature Gerrit-Owner: Mwjames ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make hooks-bugzilla comment on abandoning/restoring a change - change (operations/puppet)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/55048 Change subject: Make hooks-bugzilla comment on abandoning/restoring a change .. Make hooks-bugzilla comment on abandoning/restoring a change Change-Id: I25423106c872b00b48691c7e64b6a92de1619b6e --- M templates/gerrit/gerrit.config.erb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/48/55048/1 diff --git a/templates/gerrit/gerrit.config.erb b/templates/gerrit/gerrit.config.erb index 3120509..68a4747 100644 --- a/templates/gerrit/gerrit.config.erb +++ b/templates/gerrit/gerrit.config.erb @@ -109,9 +109,9 @@ [bugzilla] url = https://bugzilla.wikimedia.org username = gerritad...@wikimedia.org - commentOnChangeAbandoned = false + commentOnChangeAbandoned = true commentOnChangeMerged = true - commentOnChangeRestored = false + commentOnChangeRestored = true commentOnCommentAdded = false commentOnPatchSetCreated = true commentOnRefUpdatedGitWeb = false -- To view, visit https://gerrit.wikimedia.org/r/55048 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25423106c872b00b48691c7e64b6a92de1619b6e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: QChris ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-enable AFTv5 on enwiki - change (operations/mediawiki-config)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55049
Change subject: Re-enable AFTv5 on enwiki
..
Re-enable AFTv5 on enwiki
* Add namespaces to enable AFTv5 for
* Disable AFTv5's watchlist page
Change-Id: I8a583bb108315417413f7962166cb6e2b0cf6c41
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/49/55049/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 47d0f8b..96edf75 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2052,6 +2052,7 @@
$wgArticleFeedbackv5LotteryOdds = $wmgArticleFeedbackv5LotteryOdds;
$wgArticleFeedbackAutoArchiveEnabled =
$wmgArticleFeedbackAutoArchiveEnabled;
$wgArticleFeedbackAutoArchiveTtl = $wmgArticleFeedbackAutoArchiveTtl;
+ $wgArticleFeedbackv5Watchlist = $wmgArticleFeedbackv5Watchlist;
// clear default permissions set in ArticleFeedbackv5.php
foreach ( $wgGroupPermissions as $group => $permissions ) {
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index d833b3d..b475cdf 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10393,15 +10393,8 @@
),
'wmgArticleFeedbackv5Namespaces' => array(
'default' => array( NS_MAIN ),
-
'dewiki' => array( NS_MAIN ),
- /*
-* Temporarily disabling to update code & merge data. We could disable
-* AFTv5 entirely by setting wmgUseArticleFeedbackv5 to false, but we
-* still want AFTv5 to be loaded because we'll want to run a maintenance
-* script to merge the data.
-*/
- 'enwiki' => array(), // array( NS_MAIN, NS_HELP, NS_PROJECT ),
+ 'enwiki' => array( NS_MAIN, NS_HELP, NS_PROJECT ),
'testwiki' => array( NS_MAIN, NS_HELP, NS_PROJECT ),
),
'wmgArticleFeedbackv5Categories' => array(
@@ -10551,6 +10544,11 @@
40 => '+2 days', // > 40: 2 days
)
),
+'wmgArticleFeedbackv5Watchlist' => array(
+ 'default' => false,
+ 'enwiki' => false,
+ 'dewiki' => true,
+),
'wmgUsePoolCounter' => array(
'default' => true,
--
To view, visit https://gerrit.wikimedia.org/r/55049
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a583bb108315417413f7962166cb6e2b0cf6c41
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make AFTv5 watchlist configurable - change (mediawiki...ArticleFeedbackv5)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55050
Change subject: Make AFTv5 watchlist configurable
..
Make AFTv5 watchlist configurable
Change-Id: I65568456a23f2b0d54ccc254caaa24c1551b5506
---
M ArticleFeedbackv5.hooks.php
M ArticleFeedbackv5.php
M SpecialArticleFeedbackv5Watchlist.php
M modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
4 files changed, 13 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/50/55050/1
diff --git a/ArticleFeedbackv5.hooks.php b/ArticleFeedbackv5.hooks.php
index 7b7d795..703ffef 100644
--- a/ArticleFeedbackv5.hooks.php
+++ b/ArticleFeedbackv5.hooks.php
@@ -216,6 +216,7 @@
$wgArticleFeedbackv5ThrottleThresholdPostsPerHour,
$wgArticleFeedbackv5TalkPageLink,
$wgArticleFeedbackv5WatchlistLink,
+ $wgArticleFeedbackv5Watchlist,
$wgArticleFeedbackv5DefaultSorts,
$wgArticleFeedbackv5LotteryOdds,
$wgArticleFeedbackv5MaxCommentLength;
@@ -234,6 +235,7 @@
$vars['wgArticleFeedbackv5SpecialWatchlistUrl'] =
SpecialPage::getTitleFor( 'ArticleFeedbackv5Watchlist' )->getPrefixedText();
$vars['wgArticleFeedbackv5TalkPageLink'] =
$wgArticleFeedbackv5TalkPageLink;
$vars['wgArticleFeedbackv5WatchlistLink'] =
$wgArticleFeedbackv5WatchlistLink;
+ $vars['wgArticleFeedbackv5Watchlist'] =
$wgArticleFeedbackv5Watchlist;
$vars['wgArticleFeedbackv5DefaultSorts'] =
$wgArticleFeedbackv5DefaultSorts;
$vars['wgArticleFeedbackv5LotteryOdds'] =
$wgArticleFeedbackv5LotteryOdds;
$vars['wgArticleFeedbackv5MaxCommentLength'] =
$wgArticleFeedbackv5MaxCommentLength;
diff --git a/ArticleFeedbackv5.php b/ArticleFeedbackv5.php
index 36b8a11..56863e5 100644
--- a/ArticleFeedbackv5.php
+++ b/ArticleFeedbackv5.php
@@ -126,6 +126,9 @@
// Defines whether or not there should be a link to the watchlisted feedback
on the watchlist page
$wgArticleFeedbackv5WatchlistLink = true;
+// Defines whether or not the special page for feedback on a user's
watchlisted pages is enabled
+$wgArticleFeedbackv5Watchlist = true;
+
// Email address to send oversight request emails to, if set to null no emails
are sent
$wgArticleFeedbackv5OversightEmails = null;
diff --git a/SpecialArticleFeedbackv5Watchlist.php
b/SpecialArticleFeedbackv5Watchlist.php
index 7bbe1c5..9cbf3ad 100644
--- a/SpecialArticleFeedbackv5Watchlist.php
+++ b/SpecialArticleFeedbackv5Watchlist.php
@@ -39,11 +39,14 @@
* @param $param string the parameter passed in the url
*/
public function execute( $param ) {
+ global $wgArticleFeedbackv5Watchlist;
+
$user = $this->getUser();
$out = $this->getOutput();
- if ( $user->isAnon() ) {
- $out->redirect(SpecialPage::getTitleFor(
'ArticleFeedbackv5' )->getFullUrl());
+ // if watchlist not enabled or anon user is visiting, redirect
to central feedback page
+ if ( !$wgArticleFeedbackv5Watchlist || $user->isAnon() ) {
+ $out->redirect( SpecialPage::getTitleFor(
'ArticleFeedbackv5' )->getFullUrl() );
}
parent::execute( $param );
diff --git a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
index 2bcdf56..a73be16 100644
--- a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
+++ b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.watchlist.js
@@ -5,8 +5,8 @@
/*** Main entry point ***/
jQuery( function( $ ) {
- // Check if the talk page link can be shown
- if ( mw.config.get( 'wgArticleFeedbackv5WatchlistLink' ) ) {
+ // Check if the watchlist is enabled & link can be shown
+ if ( mw.config.get( 'wgArticleFeedbackv5Watchlist' ) && mw.config.get(
'wgArticleFeedbackv5WatchlistLink' ) ) {
// Check if we're not dealing with anon user
if ( mw.user.anonymous() ) {
@@ -18,7 +18,7 @@
// the article's as in the front end tracking
$.aftTrack.init();
- // Build the url to the Special:ArticleFeedbackv5 page
+ // Build the url to the Special:ArticleFeedbackv5Watchlist page
var params = { ref: 'watchlist' };
var url = mw.config.get( 'wgScript' ) + '?title=' +
encodeURIComponent( mw.config.get(
'wgArticleFeedbackv5SpecialWatchlistUrl' ) ) +
--
To view, visit https://gerrit.wikimedia.org/r/55050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
[MediaWiki-commits] [Gerrit] Add TODO about the message "datasearch_showing_only" - change (mediawiki...WikiLexicalData)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55051
Change subject: Add TODO about the message "datasearch_showing_only"
..
Add TODO about the message "datasearch_showing_only"
Change-Id: Ie8d700579602b552b9ce22a7a335cd1b467b86d1
---
M OmegaWiki/SpecialDatasearch.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiLexicalData
refs/changes/51/55051/1
diff --git a/OmegaWiki/SpecialDatasearch.php b/OmegaWiki/SpecialDatasearch.php
index 4803752..3d54ea1 100644
--- a/OmegaWiki/SpecialDatasearch.php
+++ b/OmegaWiki/SpecialDatasearch.php
@@ -148,6 +148,7 @@
if ( $withinExternalIdentifiers ) {
$wgOut->addHTML( '' . wfMsg(
'datasearch_match_ext_ids', $searchText ) . '' );
+ // TODO: "datasearch_showing_only" requires a value for
$2
$wgOut->addHTML( '' . wfMsgExt(
'datasearch_showing_only', 'parsemag', 100 ) . '' );
$wgOut->addHTML( $this->searchExternalIdentifiers(
$searchText, $collectionId ) );
--
To view, visit https://gerrit.wikimedia.org/r/55051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8d700579602b552b9ce22a7a335cd1b467b86d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiLexicalData
Gerrit-Branch: master
Gerrit-Owner: Shirayuki
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46405) Fix errors in mw.title.new( pageid ) - change (mediawiki...Scribunto)
Anomie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55052
Change subject: (bug 46405) Fix errors in mw.title.new( pageid )
..
(bug 46405) Fix errors in mw.title.new( pageid )
mw.title.new( pageid ) should not throw an error for an nonexisting
pageid, just return nil. Similarly, it should always return nil for 0,
rather than returning the last non-existent title created.
Change-Id: I3cdbb24fc785aef0f8e75fba1feccd26ac5b7370
---
M engines/LuaCommon/TitleLibrary.php
M tests/engines/LuaCommon/TitleLibraryTest.php
M tests/engines/LuaCommon/TitleLibraryTests.lua
3 files changed, 22 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/52/55052/1
diff --git a/engines/LuaCommon/TitleLibrary.php
b/engines/LuaCommon/TitleLibrary.php
index c35c9e6..5125920 100644
--- a/engines/LuaCommon/TitleLibrary.php
+++ b/engines/LuaCommon/TitleLibrary.php
@@ -6,7 +6,7 @@
// addition besides the one for the current page calls
// incrementExpensiveFunctionCount()
private $titleCache = array();
- private $idCache = array();
+ private $idCache = array( 0 => null );
function register() {
$lib = array(
@@ -58,13 +58,11 @@
* @return array Lua data
*/
private function returnTitleToLua( Title $title ) {
- if ( !$title ) {
- return array( null );
- }
-
// Cache it
$this->titleCache[$title->getPrefixedDBkey()] = $title;
- $this->idCache[$title->getArticleID()] = $title;
+ if ( $title->getArticleID() > 0 ) {
+ $this->idCache[$title->getArticleID()] = $title;
+ }
// Record a link
if ( $this->getParser() && !$title->equals( $this->getTitle() )
) {
@@ -116,6 +114,9 @@
$title = Title::newFromID( $text_or_id );
$this->idCache[$text_or_id] = $title;
}
+ if ( !$title ) {
+ return array( null );
+ }
} elseif ( $type === 'string' ) {
$this->checkNamespace( 'title.new', 2,
$defaultNamespace, NS_MAIN );
diff --git a/tests/engines/LuaCommon/TitleLibraryTest.php
b/tests/engines/LuaCommon/TitleLibraryTest.php
index 72ec5af..6eaed0b 100644
--- a/tests/engines/LuaCommon/TitleLibraryTest.php
+++ b/tests/engines/LuaCommon/TitleLibraryTest.php
@@ -55,7 +55,7 @@
// Indicate to the tests that it's safe to create the title
objects
$interpreter = $this->getEngine()->getInterpreter();
$interpreter->callFunction(
- $interpreter->loadString( 'mw.ok = true', 'fortest' )
+ $interpreter->loadString( "mw.title.testPageId =
{$page->getId()}", 'fortest' )
);
$this->setMwGlobals( array(
diff --git a/tests/engines/LuaCommon/TitleLibraryTests.lua
b/tests/engines/LuaCommon/TitleLibraryTests.lua
index bd1454e..84b5465 100644
--- a/tests/engines/LuaCommon/TitleLibraryTests.lua
+++ b/tests/engines/LuaCommon/TitleLibraryTests.lua
@@ -1,7 +1,7 @@
local testframework = require 'Module:TestFramework'
-local title, title_copy, title2, title3, title4, title5, title4p
-if mw.ok then
+local title, title_copy, title2, title3, title4, title5, title6, title4p
+if mw.title.testPageId then
title = mw.title.getCurrentTitle()
title_copy = mw.title.getCurrentTitle()
title2 = mw.title.new( 'Module:TestFramework' )
@@ -119,6 +119,18 @@
args = { '' },
expect = { nil }
},
+ { name = 'title.new with nonexistent pageid', func = mw.title.new,
+ args = { -1 },
+ expect = { nil }
+ },
+ { name = 'title.new with pageid 0', func = mw.title.new,
+ args = { 0 },
+ expect = { nil }
+ },
+ { name = 'title.new with existing pageid', func = mw.title.new, type =
'ToString',
+ args = { mw.title.testPageId },
+ expect = { 'ScribuntoTestPage' }
+ },
{ name = 'title.makeTitle', func = mw.title.makeTitle, type =
'ToString',
args = { 'Module', 'TestFramework' },
--
To view, visit https://gerrit.wikimedia.org/r/55052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3cdbb24fc785aef0f8e75fba1feccd26ac5b7370
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Anomie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ParserHook re-naming to keep commit history - change (mediawiki...SemanticMediaWiki)
Mwjames has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55053
Change subject: ParserHook re-naming to keep commit history
..
ParserHook re-naming to keep commit history
This change is meant to be merged before [1] to ensure the
commit history is kept for moved files.
[1] https://gerrit.wikimedia.org/r/#/c/52598/
Change-Id: I6bc0c5014de2a4cbfc806872a373103935e6832c
---
M includes/parserhooks/AskParserFunction.php
M includes/parserhooks/ConceptParserFunction.php
M includes/parserhooks/RecurringEventsParserFunction.php
M includes/parserhooks/ShowParserFunction.php
M includes/parserhooks/SubobjectParserFunction.php
M tests/phpunit/includes/parserhooks/SubobjectParserFunctionTest.php
6 files changed, 353 insertions(+), 713 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki
refs/changes/53/55053/1
diff --git a/includes/parserhooks/AskParserFunction.php
b/includes/parserhooks/AskParserFunction.php
index 61b..1c7372c 100644
--- a/includes/parserhooks/AskParserFunction.php
+++ b/includes/parserhooks/AskParserFunction.php
@@ -1,136 +1,106 @@
http://semantic-mediawiki.org/wiki/Help:Inline_queries#Introduction_to_.23ask
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @see http://www.semantic-mediawiki.org/wiki/Help:Ask
- *
- * @since 1.9
- *
- * @file
+ * @since 1.5.3
* @ingroup SMW
* @ingroup ParserHooks
*
* @author Markus Krötzsch
* @author Jeroen De Dauw
- * @author mwjames
*/
-
-/**
- * Class that provides the {{#ask}} parser hook function
- *
- * @ingroup SMW
- * @ingroup ParserHooks
- */
-class AskParserFunction {
+class SMWAsk {
/**
-* Represents IParserData
-*/
- protected $parserData;
-
- /**
-* Represents IQueryProcessor
-*/
- protected $queryProcessor;
-
- /**
-* Represents QueryData
-*/
- protected $queryData;
-
- /**
-* Constructor
+* Method for handling the ask parser function.
*
-* @since 1.9
-*
-* @param IParserData $parserData
-* @param IQueryProcessor $queryProcessor
-* @param QueryData $queryData
-*/
- public function __construct( IParserData $parserData, IQueryProcessor
$queryProcessor, QueryData $queryData ) {
- $this->parserData = $parserData;
- $this->queryProcessor = $queryProcessor;
- $this->queryData = $queryData;
- }
-
- /**
-* Parse parameters and return results to the ParserOutput object
-*
-* @since 1.9
-*
-* @param array $params
-* @param boolean $enabled
-*
-* @return string|null
-*/
- public function parse( array $rawParams, $enabled = true ) {
- global $smwgIQRunningNumber;
-
- if ( !$enabled ) {
- return smwfEncodeMessages( array( wfMessage(
'smw_iq_disabled' )->inContentLanguage()->text() ) );
- }
-
- $smwgIQRunningNumber++;
-
- // Remove parser object from parameters array
- array_shift( $rawParams );
-
- // Process parameters
- $this->queryProcessor->map( $rawParams );
-
- // Add query data from the query
- $this->queryData->add(
- $this->queryProcessor->getQuery(),
- $this->queryProcessor->getParameters()
- );
-
- // Store query data to the semantic data instance
- $this->parserData->getData()->addPropertyObjectValue(
- $this->queryData->getProperty(),
- $this->queryData->getContainer()
- );
-
- // Update ParserOutput
- $this->parserData->updateOutput();
-
- return $this->queryProcessor->getResult();
- }
-
- /**
-* Method for handling the {{#ask}} parser function
-*
-* @since 1.9
+* @since 1.5.3
*
* @param Parser $parser
-*
-* @return string
*/
public static fu
[MediaWiki-commits] [Gerrit] Block misbehaving bot - change (operations/puppet)
Demon has uploaded a new change for review. https://gerrit.wikimedia.org/r/55054 Change subject: Block misbehaving bot .. Block misbehaving bot Change-Id: I26461ae7e163e4b6c178b42e18db04523ddabaa9 --- M templates/apache/sites/gerrit.wikimedia.org.erb 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/54/55054/1 diff --git a/templates/apache/sites/gerrit.wikimedia.org.erb b/templates/apache/sites/gerrit.wikimedia.org.erb index 45b74bb..4196eb7 100644 --- a/templates/apache/sites/gerrit.wikimedia.org.erb +++ b/templates/apache/sites/gerrit.wikimedia.org.erb @@ -61,6 +61,7 @@ AllowOverride None Order deny,allow deny from env=bad_browser + deny from 208.110.84.34 Options Indexes FollowSymLinks MultiViews -- To view, visit https://gerrit.wikimedia.org/r/55054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26461ae7e163e4b6c178b42e18db04523ddabaa9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Demon ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cache 4xx responses on the mobile backend servers for 5m - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55055
Change subject: Cache 4xx responses on the mobile backend servers for 5m
..
Cache 4xx responses on the mobile backend servers for 5m
Change-Id: I185626741b46543dfe2c2fa9ff7ffbcc37b6d2e3
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/55/55055/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 5b8d909..08ac5c6 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -645,6 +645,7 @@
},
vcl_config => {
'retry5xx' => 1,
+ 'cache4xx' => "5m",
},
backend_options => {
'port' => 80,
--
To view, visit https://gerrit.wikimedia.org/r/55055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I185626741b46543dfe2c2fa9ff7ffbcc37b6d2e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cache 4xx responses on the mobile backend servers for 5m - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Cache 4xx responses on the mobile backend servers for 5m
..
Cache 4xx responses on the mobile backend servers for 5m
Change-Id: I185626741b46543dfe2c2fa9ff7ffbcc37b6d2e3
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 5b8d909..08ac5c6 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -645,6 +645,7 @@
},
vcl_config => {
'retry5xx' => 1,
+ 'cache4xx' => "5m",
},
backend_options => {
'port' => 80,
--
To view, visit https://gerrit.wikimedia.org/r/55055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I185626741b46543dfe2c2fa9ff7ffbcc37b6d2e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename dashboard to be more accurate - change (analytics/limn-mobile-data)
Yuvipanda has submitted this change and it was merged.
Change subject: Rename dashboard to be more accurate
..
Rename dashboard to be more accurate
Change-Id: I37a5822d458bef568821ecfe0f1f2fe47eaca246
---
M dashboards/reportcard.json
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Yuvipanda: Verified; Looks good to me, approved
diff --git a/dashboards/reportcard.json b/dashboards/reportcard.json
index 280a1c1..85fee33 100644
--- a/dashboards/reportcard.json
+++ b/dashboards/reportcard.json
@@ -1,7 +1,7 @@
{
"id" : "reportcard",
-"headline" : "Mobile Wikipedia",
-"subhead" : "Contributions",
+"headline" : "Commons Mobile Contributions",
+"subhead" : "Apps & Web",
"tabs": [
{
"name": "Core",
--
To view, visit https://gerrit.wikimedia.org/r/55045
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37a5822d458bef568821ecfe0f1f2fe47eaca246
Gerrit-PatchSet: 1
Gerrit-Project: analytics/limn-mobile-data
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda
Gerrit-Reviewer: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add timeout and options to MediaWikiSite::normalizePageName - change (mediawiki/core)
John Erling Blad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55056
Change subject: Add timeout and options to MediaWikiSite::normalizePageName
..
Add timeout and options to MediaWikiSite::normalizePageName
In some cases it can be necessary to manipulate the timeout and
options to get a better and more predictable behavior.
Change-Id: I0a1d807155a1381715afc241b65d53cd7afd4b7a
---
M includes/site/MediaWikiSite.php
1 file changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/56/55056/1
diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php
index 0509272..51a13b3 100644
--- a/includes/site/MediaWikiSite.php
+++ b/includes/site/MediaWikiSite.php
@@ -90,11 +90,13 @@
* @since 1.21
*
* @param string $pageName
+* @param string $timeout
+* @param array $options
*
* @return string
* @throws MWException
*/
- public function normalizePageName( $pageName ) {
+ public function normalizePageName( $pageName, $timeout = 'default',
$options = array() ) {
// Check if we have strings as arguments.
if ( !is_string( $pageName ) ) {
@@ -133,8 +135,7 @@
$url = $this->getFileUrl( 'api.php' ) . '?' .
wfArrayToCgi( $args );
// Go on call the external site
- //@todo: we need a good way to specify a timeout here.
- $ret = Http::get( $url );
+ $ret = Http::get( $url, timeout, $options );
}
if ( $ret === false ) {
--
To view, visit https://gerrit.wikimedia.org/r/55056
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a1d807155a1381715afc241b65d53cd7afd4b7a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: John Erling Blad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Block misbehaving bot - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged. Change subject: Block misbehaving bot .. Block misbehaving bot Change-Id: I26461ae7e163e4b6c178b42e18db04523ddabaa9 --- M templates/apache/sites/gerrit.wikimedia.org.erb 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Mark Bergsma: Looks good to me, approved jenkins-bot: Verified diff --git a/templates/apache/sites/gerrit.wikimedia.org.erb b/templates/apache/sites/gerrit.wikimedia.org.erb index 45b74bb..0f80ff0 100644 --- a/templates/apache/sites/gerrit.wikimedia.org.erb +++ b/templates/apache/sites/gerrit.wikimedia.org.erb @@ -61,6 +61,7 @@ AllowOverride None Order deny,allow deny from env=bad_browser + deny from 208.110.84.34 Options Indexes FollowSymLinks MultiViews @@ -74,6 +75,7 @@ Order deny,allow deny from env=bad_browser + deny from 208.110.84.34 AllowEncodedSlashes NoDecode -- To view, visit https://gerrit.wikimedia.org/r/55054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I26461ae7e163e4b6c178b42e18db04523ddabaa9 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Demon Gerrit-Reviewer: Hashar Gerrit-Reviewer: Mark Bergsma Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Send analytics repos to #wikimedia-analytics - change (operations/puppet)
Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55057
Change subject: Send analytics repos to #wikimedia-analytics
..
Send analytics repos to #wikimedia-analytics
Change-Id: I9e6a5ef2a053e48e28a9c22831d8200ae621d221
---
M manifests/gerrit.pp
M templates/gerrit/hookconfig.py.erb
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/55057/1
diff --git a/manifests/gerrit.pp b/manifests/gerrit.pp
index 8c63ac2..6d9dfa5 100644
--- a/manifests/gerrit.pp
+++ b/manifests/gerrit.pp
@@ -346,6 +346,7 @@
"${ircecho_logbase}/wikimedia-dev.log" =>
"#wikimedia-dev",
"${ircecho_logbase}/semantic-mediawiki.log" =>
["#semantic-mediawiki", "#mediawiki"],
"${ircecho_logbase}/wikidata.log"=>
"#wikimedia-wikidata",
+ "${ircecho_logbase}/wikimedia-analytics.log" =>
"#wikimedia-analytics",
}
$ircecho_nick = "gerrit-wm"
$ircecho_server = "chat.freenode.net"
diff --git a/templates/gerrit/hookconfig.py.erb
b/templates/gerrit/hookconfig.py.erb
index aafcc3a..cf69199 100644
--- a/templates/gerrit/hookconfig.py.erb
+++ b/templates/gerrit/hookconfig.py.erb
@@ -30,7 +30,7 @@
"mediawiki/extensions/Parsoid": "parsoid.log",
"mediawiki/extensions/VisualEditor": "visualeditor.log",
"mediawiki/extensions/TemplateData": "visualeditor.log",
- "analytics/*" : "wikimedia-dev.log",
+ "analytics/*" : "wikimedia-analytics.log",
"integration/*" : "wikimedia-dev.log",
"labs/*" : "labs.log",
"mediawiki/*" : "mediawiki.log",
--
To view, visit https://gerrit.wikimedia.org/r/55057
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e6a5ef2a053e48e28a9c22831d8200ae621d221
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] expose realm in mw-deployment-vars.sh - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55058
Change subject: expose realm in mw-deployment-vars.sh
..
expose realm in mw-deployment-vars.sh
We sometime might want our shell script to act differently depending on
the realm ('labs' versus 'production') hence this patch expose the
puppet realm in the WMF_REALM environnement variable.
Change-Id: Ib32774c399de073724e5b3a27c1ebe6a96c587d1
---
M templates/misc/mw-deployment-vars.erb
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/55058/1
diff --git a/templates/misc/mw-deployment-vars.erb
b/templates/misc/mw-deployment-vars.erb
index e684163..c961be3 100644
--- a/templates/misc/mw-deployment-vars.erb
+++ b/templates/misc/mw-deployment-vars.erb
@@ -3,3 +3,4 @@
MW_DBLISTS=<%= dblist_common %>
MW_DBLISTS_SOURCE=<%= dblist_common_source %>
MW_CRON_LOGS=/home/wikipedia/logs/norotate
+WMF_REALM=<%= scope.lookupvar('::realm') %>
--
To view, visit https://gerrit.wikimedia.org/r/55058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib32774c399de073724e5b3a27c1ebe6a96c587d1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 41285) adapt `foreachwiki` for labs - change (operations/puppet)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55059
Change subject: (bug 41285) adapt `foreachwiki` for labs
..
(bug 41285) adapt `foreachwiki` for labs
The foreachwiki script was always attempting to use all.dblist which the
list of production wiki. On beta labs, we use the all-labs.dblist.
This patch requires WMF_REALM to be exposed in mw-deployment-vars.sh
Change-Id: Ib0f0f1851e3f131b34d6cc7e392112059ef36ae7
---
M files/misc/scripts/foreachwiki
1 file changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/55059/1
diff --git a/files/misc/scripts/foreachwiki b/files/misc/scripts/foreachwiki
index ebae1cb..5491b9f 100755
--- a/files/misc/scripts/foreachwiki
+++ b/files/misc/scripts/foreachwiki
@@ -1,4 +1,17 @@
#!/bin/bash
. /usr/local/lib/mw-deployment-vars.sh
-exec "$(dirname "$0")/foreachwikiindblist" "$MW_DBLISTS_SOURCE/all.dblist"
"${@}"
+
+case "$WMF_REALM" in
+ 'labs')
+ ALL_DBLIST='all-labs.dblist'
+ ;;
+ 'production')
+ ALL_DBLIST='all-labs.dblist'
+ ;;
+ *)
+ ALL_DBLIST='all.dblist'
+ ;;
+esac
+
+exec "$(dirname "$0")/foreachwikiindblist" "$MW_DBLISTS_SOURCE/$ALL_DBLIST"
"${@}"
--
To view, visit https://gerrit.wikimedia.org/r/55059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0f0f1851e3f131b34d6cc7e392112059ef36ae7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix typo "useful" - change (mediawiki...SemanticMaps)
Shirayuki has uploaded a new change for review. https://gerrit.wikimedia.org/r/55061 Change subject: Fix typo "useful" .. Fix typo "useful" Change-Id: I2c6a5ca85d30b4020bc580f3e7f661d0410be1dc --- M SemanticMaps.i18n.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMaps refs/changes/61/55061/1 diff --git a/SemanticMaps.i18n.php b/SemanticMaps.i18n.php index 8840429..e725ed6 100644 --- a/SemanticMaps.i18n.php +++ b/SemanticMaps.i18n.php @@ -40,7 +40,7 @@ // Parameter descriptions 'semanticmaps-par-staticlocations' => 'A list of locations to add to the map together with the queried data. Like with display_points, you can add a title, description and icon per location using the tilde "~" as separator.', 'semanticmaps-par-forceshow'=> 'Show the map even when there are no locations to display?', - 'semanticmaps-par-showtitle'=> 'Show a title in the marker info window or not. Disabling this is often usefull when using a template to format the info window content.', + 'semanticmaps-par-showtitle'=> 'Show a title in the marker info window or not. Disabling this is often useful when using a template to format the info window content.', 'semanticmaps-par-hidenamespace'=> 'Show the namespace title in the marker info window', 'semanticmaps-par-centre' => 'The center of the map. When not provided, the map will automatically pick the optimal center to display all markers on the map.', 'semanticmaps-par-template' => 'A template to use to format the info window contents.', -- To view, visit https://gerrit.wikimedia.org/r/55061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c6a5ca85d30b4020bc580f3e7f661d0410be1dc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMaps Gerrit-Branch: master Gerrit-Owner: Shirayuki ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46410) suggester widget: Always show custom item - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (bug 46410) suggester widget: Always show custom item
..
(bug 46410) suggester widget: Always show custom item
Always open the suggester menu when a custom item is defined.
Change-Id: I3d95d5365b03fb272faae56d43fc2118611bca3b
---
M lib/resources/jquery.ui/jquery.ui.suggester.js
1 file changed, 12 insertions(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/resources/jquery.ui/jquery.ui.suggester.js
b/lib/resources/jquery.ui/jquery.ui.suggester.js
index 6454638..f7675c0 100644
--- a/lib/resources/jquery.ui/jquery.ui.suggester.js
+++ b/lib/resources/jquery.ui/jquery.ui.suggester.js
@@ -259,6 +259,18 @@
},
/**
+* @see jquery.ui.autocomplete.__response
+*/
+ __response: function( content ) {
+ $.ui.autocomplete.prototype.__response.call( this,
content );
+ // There is no content but the menu should be visible
if there is a custom list item:
+ if ( !this.options.disabled && ( !content ||
!content.length ) && this.customListItem ) {
+ this._suggest( [] );
+ this._trigger( 'open' );
+ }
+ },
+
+ /**
* Handles the response when the API call returns successfully.
*
* @param {Object} response
--
To view, visit https://gerrit.wikimedia.org/r/55037
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d95d5365b03fb272faae56d43fc2118611bca3b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 46250) Re-focusing entity search box after clicking "more" - change (mediawiki...Wikibase)
Tobias Gritschacher has submitted this change and it was merged.
Change subject: (bug 46250) Re-focusing entity search box after clicking "more"
..
(bug 46250) Re-focusing entity search box after clicking "more"
Change-Id: I0c76a2a87483f742eefd3f12c9602cae0a78dd74
---
M lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Tobias Gritschacher: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
index 1856547..34af0a5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js
@@ -569,11 +569,13 @@
* @return {jQuery}
*/
_renderMoreLink: function() {
+ var self = this;
return this._renderCustomListItem( {
content: $( '' ).text(
this.options.messages['more'] ),
action: function( event, entityselector ) {
event.stopImmediatePropagation();
entityselector.more();
+ self.element.focus();
},
cssClass: 'ui-entityselector-more'
} );
--
To view, visit https://gerrit.wikimedia.org/r/54638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0c76a2a87483f742eefd3f12c9602cae0a78dd74
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
Gerrit-Reviewer: Tobias Gritschacher
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Inital deb packaging - change (operations...python-statsd)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55066
Change subject: Inital deb packaging
..
Inital deb packaging
Current version is 1.5.8, properly tagged in upstream repo.
Debian files based on the python-voluptuous package.
Close ITP #703613.
License and copyright confirmed by upstream to be BSD-3-Clause
https://github.com/WoLpH/python-statsd/issues/23
Change-Id: I2e2a993ec60de9c15259c6d95aee56ef6fca7c5b
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 92 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-statsd
refs/changes/66/55066/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..b835609
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+python-statsd (1.5.8-1) precise; urgency=low
+
+ * Initial release.
+
+ -- Antoine Musso Thu, 21 Mar 2013 09:54:18 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..dae8e64
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: python-statsd
+Section: python
+Priority: optional
+Maintainer: Antoine Musso
+Build-Depends: debhelper (>= 9), python-dev (>= 2.6.6-3)
+Standards-Version: 3.9.3
+Homepage: https://github.com/WoLpH/python-statsd
+X-Python-Version: >= 2.6
+
+Package: python-statsd
+Architecture: all
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python library to act as a client to statsd
+ Statsd is a client for Etsy's statsd server, a front end/proxy for the
+ Graphite stats collection and graphing server.
+ .
+ The module offer a high level API interface to easily send your data
+ to a statsd server.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..220c209
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: python-statsd
+Upstream-Contact: Rick van Hattem
+Source: https://github.com/WoLpH/python-statsd
+
+Files: *
+Copyright: 2011-2013 Rick van Hattem. All rights reserved.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ - Redistributions of source code must retain the above
copyright notice, this
+ list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above
copyright notice,
+ this list of conditions and the following
disclaimer in the documentation
+ and/or other materials provided with the
distribution.
+ - Neither the name of SwapOff.org nor the names of its
contributors may
+ be used to endorse or promote products derived
from this software without
+ specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2013 Antoine Musso
+License: GPL-2
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..c87b3c6
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,10 @@
+[DEFAULT]
+upstream-tag = v%(version)s
+
+[git-buildpackage]
+upstream-tree=tag
+debian-branch=master
+overlay = True
+no-create-orig = True
+tarball-dir = ../tarballs
+export-dir = ../build-area
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..0b678eb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with python2
+
+DEB_UPSTREAM_V
[MediaWiki-commits] [Gerrit] (Bug 46419) New: By using "Discuss on talk page" the page ge... - change (mediawiki...ArticleFeedbackv5)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/55067 Change subject: (Bug 46419) New: By using "Discuss on talk page" the page gets unwatched .. (Bug 46419) New: By using "Discuss on talk page" the page gets unwatched Change-Id: I0fe2e67bc454e29380337bc620eff8566334549d --- M ArticleFeedbackv5.render.php M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 refs/changes/67/55067/1 diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php index f6adce6..fc1a5a8 100644 --- a/ArticleFeedbackv5.render.php +++ b/ArticleFeedbackv5.render.php @@ -931,7 +931,8 @@ 'data-section-title' => $sectionTitleTruncated, 'data-section-content' => $sectionContent, 'data-section-edittime' => wfTimestampNow(), - 'data-section-edittoken' => $wgUser->getEditToken() + 'data-section-edittoken' => $wgUser->getEditToken(), + 'data-section-watchlist' => (int) $wgUser->isWatched( $discussPage ) ), wfMessage( "articlefeedbackv5-form-$action-$discussType" . ( $sectionExists ? '-exists' : '' ) )->text() ) diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js index 1147a70..6ad65c6 100644 --- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js +++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js @@ -1744,6 +1744,7 @@ var content = $( e.target ).data( 'section-content' ); var editTime = $( e.target ).data( 'section-edittime' ); var editToken = $( e.target ).data( 'section-edittoken' ); + var watchlist = $( e.target ).data( 'section-watchlist' ); var $form = $( '\ \ @@ -1753,6 +1754,7 @@ \ \ \ + \ \ ' ); @@ -1763,6 +1765,7 @@ $( '[name=wpStarttime]', $form ).val( editTime ); $( '[name=wpEditToken]', $form ).val( editToken ); $( '[name=wpPreview]', $form ).val( 1 ); + $( '[name=wpWatchthis]', $form ).val( watchlist ); $( e.target ).append( $form ); $form -- To view, visit https://gerrit.wikimedia.org/r/55067 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fe2e67bc454e29380337bc620eff8566334549d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5 Gerrit-Branch: master Gerrit-Owner: Matthias Mullie ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Inital deb packaging - change (operations...python-statsd)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55068
Change subject: Inital deb packaging
..
Inital deb packaging
Current version is 1.5.8, properly tagged in upstream repo.
Debian files based on the python-voluptuous package.
Close ITP #703613.
License and copyright confirmed by upstream to be BSD-3-Clause
https://github.com/WoLpH/python-statsd/issues/23
Change-Id: Ib4150db4eefcfa571144d24f37bad334f0930071
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 92 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-statsd
refs/changes/68/55068/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..b835609
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+python-statsd (1.5.8-1) precise; urgency=low
+
+ * Initial release.
+
+ -- Antoine Musso Thu, 21 Mar 2013 09:54:18 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..dae8e64
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: python-statsd
+Section: python
+Priority: optional
+Maintainer: Antoine Musso
+Build-Depends: debhelper (>= 9), python-dev (>= 2.6.6-3)
+Standards-Version: 3.9.3
+Homepage: https://github.com/WoLpH/python-statsd
+X-Python-Version: >= 2.6
+
+Package: python-statsd
+Architecture: all
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python library to act as a client to statsd
+ Statsd is a client for Etsy's statsd server, a front end/proxy for the
+ Graphite stats collection and graphing server.
+ .
+ The module offer a high level API interface to easily send your data
+ to a statsd server.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..220c209
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: python-statsd
+Upstream-Contact: Rick van Hattem
+Source: https://github.com/WoLpH/python-statsd
+
+Files: *
+Copyright: 2011-2013 Rick van Hattem. All rights reserved.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ - Redistributions of source code must retain the above
copyright notice, this
+ list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above
copyright notice,
+ this list of conditions and the following
disclaimer in the documentation
+ and/or other materials provided with the
distribution.
+ - Neither the name of SwapOff.org nor the names of its
contributors may
+ be used to endorse or promote products derived
from this software without
+ specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2013 Antoine Musso
+License: GPL-2
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..c87b3c6
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,10 @@
+[DEFAULT]
+upstream-tag = v%(version)s
+
+[git-buildpackage]
+upstream-tree=tag
+debian-branch=master
+overlay = True
+no-create-orig = True
+tarball-dir = ../tarballs
+export-dir = ../build-area
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..0b678eb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with python2
+
+DEB_UPSTREAM_V
[MediaWiki-commits] [Gerrit] Inital deb packaging - change (operations...python-statsd)
Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55069
Change subject: Inital deb packaging
..
Inital deb packaging
Current version is 1.5.8, properly tagged in upstream repo.
Debian files based on the python-voluptuous package.
Close ITP #703613.
License and copyright confirmed by upstream to be BSD-3-Clause
https://github.com/WoLpH/python-statsd/issues/23
Change-Id: I395ed3832f9af0c312d4833a8d2d154b53053c7a
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/gbp.conf
A debian/rules
A debian/source/format
A debian/watch
8 files changed, 92 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-statsd
refs/changes/69/55069/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..b835609
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+python-statsd (1.5.8-1) precise; urgency=low
+
+ * Initial release.
+
+ -- Antoine Musso Thu, 21 Mar 2013 09:54:18 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..dae8e64
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,18 @@
+Source: python-statsd
+Section: python
+Priority: optional
+Maintainer: Antoine Musso
+Build-Depends: debhelper (>= 9), python-dev (>= 2.6.6-3)
+Standards-Version: 3.9.3
+Homepage: https://github.com/WoLpH/python-statsd
+X-Python-Version: >= 2.6
+
+Package: python-statsd
+Architecture: all
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python library to act as a client to statsd
+ Statsd is a client for Etsy's statsd server, a front end/proxy for the
+ Graphite stats collection and graphing server.
+ .
+ The module offer a high level API interface to easily send your data
+ to a statsd server.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..220c209
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: python-statsd
+Upstream-Contact: Rick van Hattem
+Source: https://github.com/WoLpH/python-statsd
+
+Files: *
+Copyright: 2011-2013 Rick van Hattem. All rights reserved.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ - Redistributions of source code must retain the above
copyright notice, this
+ list of conditions and the following disclaimer.
+ - Redistributions in binary form must reproduce the above
copyright notice,
+ this list of conditions and the following
disclaimer in the documentation
+ and/or other materials provided with the
distribution.
+ - Neither the name of SwapOff.org nor the names of its
contributors may
+ be used to endorse or promote products derived
from this software without
+ specific prior written permission.
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2013 Antoine Musso
+License: GPL-2
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..c87b3c6
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,10 @@
+[DEFAULT]
+upstream-tag = v%(version)s
+
+[git-buildpackage]
+upstream-tree=tag
+debian-branch=master
+overlay = True
+no-create-orig = True
+tarball-dir = ../tarballs
+export-dir = ../build-area
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 000..0b678eb
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,20 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+ dh $@ --with python2
+
+DEB_UPSTREAM_V
[MediaWiki-commits] [Gerrit] Removing toolbar node from snaklistview template - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55070
Change subject: Removing toolbar node from snaklistview template
..
Removing toolbar node from snaklistview template
Introducing wb-ui-toolbar-container template as a wrapper for toolbars. The
template
allows to distinguish between separate toolbars that reside on the same DOM
level
which is required for removing the toolbar node from the snaklistview template.
Change-Id: I1bb03a3ecde9bddb54e8c04cff6c2133d69901ed
---
M lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
M lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.removetoolbar.js
M
lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.js
M lib/resources/templates.php
M lib/resources/wikibase.css
M repo/includes/EntityView.php
M selenium/lib/modules/reference_module.rb
M selenium/lib/modules/statement_module.rb
10 files changed, 49 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/70/55070/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
b/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
index 9fc3894..240b367 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
@@ -94,7 +94,8 @@
this.$toolbarParent = (
this.options.toolbarParentSelector )
? this.element.find(
this.options.toolbarParentSelector )
- : mw.template( 'wb-toolbar', '' ).appendTo(
this.element );
+ : mw.template( 'wb-toolbar-container',
this.widgetBaseClass, '' )
+ .appendTo( this.element );
this.toolbar = new wb.ui.Toolbar();
this.toolbar.innerGroup = new wb.ui.Toolbar.Group();
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
b/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
index 873555a..7078cf3 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
@@ -26,8 +26,9 @@
* interact with. (That widget needs to be initialized on the
same DOM node this toolbar
* is initialized on.)
*
-* @option toolbarParentSelector {string} (required) jQuery selector to
find the node the actual
-* toolbar buttons shall be appended to.
+* @option toolbarParentSelector {string} jQuery selector to find the
node the actual toolbar
+* buttons shall be appended to. If omitted, the DOM structure
required for the toolbar
+* will be created and appended to the node the toolbar is
initialized on.
*
* @option enableRemove {boolean} Whether a remove button shall be
shown. Regardless of setting
* this options, the "remove" button will not be shown if the
interaction object has no
@@ -92,9 +93,10 @@
if ( !this.options.interactionWidgetName ) {
throw new Error( 'jquery.wikibase.edittoolbar:
Missing interaction widget name' );
}
- if ( !this.options.toolbarParentSelector ) {
- throw new Error( 'jquery.wikibase.edittoolbar:
Missing toolbar parent selector' );
- }
+
+ this.$toolbarParent = (
this.options.toolbarParentSelector )
+ ? this.element.find(
this.options.toolbarParentSelector )
+ : mw.template( 'wb-toolbar-container',
this.widgetBaseClass, '' ).appendTo( this.element );
this._interactionWidget = this.element.data(
this.options.interactionWidgetName );
@@ -111,8 +113,6 @@
var m = missingMethods.join( ', ' );
throw new Error( 'jquery.wikibase.edittoolbar:
Missing required method(s) ' + m );
}
-
- this.$toolbarParent = this.element.find(
this.options.toolbarParentSelector );
this.toolbar = new wb.ui.Toolbar();
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index c605cbf..c492652 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -142,8 +142,7 @@
prototype: $.wikibase.referenceview.prototype
},
options: {
-
[MediaWiki-commits] [Gerrit] Using wb-ui-toolbar-container template for statementview widget - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55071
Change subject: Using wb-ui-toolbar-container template for statementview widget
..
Using wb-ui-toolbar-container template for statementview widget
Change-Id: Ia3f5d6ed6991122cb574081f34257ad17eac5444
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M
lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
M lib/resources/templates.php
M selenium/lib/modules/reference_module.rb
M selenium/lib/modules/statement_module.rb
5 files changed, 12 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/71/55071/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 6acf5b7..e08b7b5 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -34,7 +34,7 @@
],
templateShortCuts: {
'$mainSnak': '.wb-claim-mainsnak',
- '$toolbar': '.wb-claim-toolbar',
+ '$toolbar': '.wb-ui-toolbar-container',
'$refsHeading': '.wb-statement-references-heading',
'$references': '.wb-statement-references'
}
@@ -75,7 +75,8 @@
if( this.value() ) {
var statementGuid = this.value().getGuid();
- this.$references.append( mw.template( 'wb-toolbar', ''
) );
+ // TODO: Use toolbar controller
+ this.$references.append( mw.template(
'wb-toolbar-container', 'wb-addtoolbar', '' ) );
var $listview = $( '' )
.prependTo( this.$references )
@@ -337,7 +338,7 @@
},
options: {
interactionWidgetName:
$.wikibase.statementview.prototype.widgetName,
- toolbarParentSelector: '.wb-statement-claim .wb-claim-toolbar'
+ toolbarParentSelector: '.wb-statement-claim
.wb-ui-toolbar-container'
}
} );
@@ -347,7 +348,7 @@
eventPrefix: 'listview',
baseClass: 'wb-snaklistview-listview',
options: {
- toolbarParentSelector: '.wb-statement-references >
.wb-ui-toolbar',
+ toolbarParentSelector: '.wb-statement-references >
.wb-addtoolbar',
customAction: function( event, $parent ) {
var statementView = $parent.closest(
'.wb-statementview' ).data( 'statementview' ),
listview = statementView.$references.data(
'listview' );
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
b/lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
index 6f93cfe..f8ace02 100644
---
a/lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
+++
b/lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
@@ -45,7 +45,7 @@
* eventPrefix: 'claimsection',
* baseClass: widgetPrototype.widgetBaseClass,
* options: { // options passed to the toolbar
-* toolbarParentSelector: '.wb-claim-add .wb-claim-toolbar',
+* toolbarParentSelector: '.wb-claim-add
.wb-ui-toolbar-container',
* customAction: function( event, $parent ) {
* $parent.closest( '.wb-claimlistview' ).data( 'claimlistview'
)
* .enterNewClaimInSection( $parent.data( 'wb-propertyId' ) );
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index 2bdb74a..84eb608 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -96,7 +96,7 @@
$3
- $4
+ $4
$5
diff --git a/selenium/lib/modules/reference_module.rb
b/selenium/lib/modules/reference_module.rb
index 143e1ba..a58ac4e 100644
--- a/selenium/lib/modules/reference_module.rb
+++ b/selenium/lib/modules/reference_module.rb
@@ -36,7 +36,7 @@
link(:removeReferenceLine1, :xpath => "//div[contains(@class,
'wb-referenceview')]/div[contains(@class,
'wb-snaklistview-listview')]/div[contains(@class,
'wb-snakview')][1]/div[contains(@class,
'wb-removetoolbar')]/div/span/span/a[text()='remove']")
link(:removeReferenceLine2, :xpath => "//div[contains(@class,
'wb-referenceview')]/div[contains(@class,
'wb-snaklistview-listview')]/div[contains(@class,
'wb-snakview')][2]/div[contains(@class,
'wb-removetoolbar')]/div/span/span/a[text()='remove']")
link(:addRef
[MediaWiki-commits] [Gerrit] Merging wb-toolbar and wb-toolbar-container templates - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55072
Change subject: Merging wb-toolbar and wb-toolbar-container templates
..
Merging wb-toolbar and wb-toolbar-container templates
Change-Id: I4d9eedc22413a4ca4fdc9393917a567ccf0643a5
---
M lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
M lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
M lib/resources/jquery.wikibase/jquery.wikibase.removetoolbar.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M
lib/resources/jquery.wikibase/jquery.wikibase.toolbarcontroller/toolbarcontroller.definitions.js
M lib/resources/templates.php
M lib/resources/wikibase.css
M repo/includes/EntityView.php
M selenium/lib/modules/reference_module.rb
M selenium/lib/modules/statement_module.rb
10 files changed, 28 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/72/55072/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
b/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
index 240b367..214dd7b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.addtoolbar.js
@@ -94,8 +94,7 @@
this.$toolbarParent = (
this.options.toolbarParentSelector )
? this.element.find(
this.options.toolbarParentSelector )
- : mw.template( 'wb-toolbar-container',
this.widgetBaseClass, '' )
- .appendTo( this.element );
+ : mw.template( 'wb-toolbar',
this.widgetBaseClass, '' ).appendTo( this.element );
this.toolbar = new wb.ui.Toolbar();
this.toolbar.innerGroup = new wb.ui.Toolbar.Group();
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
b/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
index 7078cf3..2063baf 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.edittoolbar.js
@@ -96,7 +96,7 @@
this.$toolbarParent = (
this.options.toolbarParentSelector )
? this.element.find(
this.options.toolbarParentSelector )
- : mw.template( 'wb-toolbar-container',
this.widgetBaseClass, '' ).appendTo( this.element );
+ : mw.template( 'wb-toolbar',
this.widgetBaseClass, '' ).appendTo( this.element );
this._interactionWidget = this.element.data(
this.options.interactionWidgetName );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.removetoolbar.js
b/lib/resources/jquery.wikibase/jquery.wikibase.removetoolbar.js
index 107483b..54cc3f0 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.removetoolbar.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.removetoolbar.js
@@ -54,7 +54,7 @@
throw new Error(
'jquery.wikibase.removetoolbar: action needs to be defined' );
}
- this.$toolbarParent = mw.template(
'wb-toolbar-container', this.widgetBaseClass, '' )
+ this.$toolbarParent = mw.template( 'wb-toolbar',
this.widgetBaseClass, '' )
.appendTo( this.element );
var toolbar = this.toolbar = new wb.ui.Toolbar();
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index e08b7b5..ac91a3a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -34,7 +34,7 @@
],
templateShortCuts: {
'$mainSnak': '.wb-claim-mainsnak',
- '$toolbar': '.wb-ui-toolbar-container',
+ '$toolbar': '.wb-ui-toolbar',
'$refsHeading': '.wb-statement-references-heading',
'$references': '.wb-statement-references'
}
@@ -76,7 +76,7 @@
var statementGuid = this.value().getGuid();
// TODO: Use toolbar controller
- this.$references.append( mw.template(
'wb-toolbar-container', 'wb-addtoolbar', '' ) );
+ this.$references.append( mw.template( 'wb-toolbar',
'wb-addtoolbar', '' ) );
var $listview = $( '' )
.prependTo( this.$references )
@@ -338,7 +338,7 @@
},
options: {
interactionWidgetName:
$.wikibase.statementview.prototype.widgetName,
- toolbarParentSelector: '.wb-statement-claim
.
[MediaWiki-commits] [Gerrit] Fix search input dimensions on non-Webkit browsers - change (mediawiki...MobileFrontend)
JGonera has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55073
Change subject: Fix search input dimensions on non-Webkit browsers
..
Fix search input dimensions on non-Webkit browsers
In particular Firefox, possibly other.
Change-Id: I36857139e718c9f8996b3f3710c7a5026d065a7e
---
M less/modules/mf-search.less
M stylesheets/modules/mf-search.css
2 files changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/73/55073/1
diff --git a/less/modules/mf-search.less b/less/modules/mf-search.less
index 7bbc40f..aa5e091 100644
--- a/less/modules/mf-search.less
+++ b/less/modules/mf-search.less
@@ -33,6 +33,7 @@
height: @searchBoxHeight;
vertical-align: middle; /* don't use line height here as placeholder on
ripple positions incorrectly */
background-color: white; /* remove fennec default background */
+ .box-sizing( border-box );
&::-webkit-search-cancel-button {
-webkit-appearance: none;
}
diff --git a/stylesheets/modules/mf-search.css
b/stylesheets/modules/mf-search.css
index 1d7889b..c4c6ab6 100644
--- a/stylesheets/modules/mf-search.css
+++ b/stylesheets/modules/mf-search.css
@@ -31,6 +31,10 @@
background-color: white;
/* remove fennec default background */
+ -moz-box-sizing: border-box;
+ -o-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
/* visual indication that search is happening */
}
--
To view, visit https://gerrit.wikimedia.org/r/55073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36857139e718c9f8996b3f3710c7a5026d065a7e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix ugly menu borders in Firefox - change (mediawiki...MobileFrontend)
JGonera has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55074
Change subject: Fix ugly menu borders in Firefox
..
Fix ugly menu borders in Firefox
This doesn't change anything in Webkit-based browsers.
Change-Id: If5e61fc417ff494256baede35e250ece9a16d8fd
---
M less/common/mf-navigation.less
M stylesheets/common/mf-navigation.css
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/74/55074/1
diff --git a/less/common/mf-navigation.less b/less/common/mf-navigation.less
index f2cd442..ed1fd92 100644
--- a/less/common/mf-navigation.less
+++ b/less/common/mf-navigation.less
@@ -126,7 +126,7 @@
#mw-mf-menu-main li {
text-shadow: 0 1px 0 black;
- border-bottom: 1px inset #717171;
+ border-bottom: 1px solid #717171;
font-weight: normal;
}
@@ -138,7 +138,7 @@
background-repeat: no-repeat;
.background-size(24px, 24px);
background-position: 10px 50%;
- border-bottom: 1px inset #3e3e3e;
+ border-bottom: 1px solid #3e3e3e;
}
#mw-mf-menu-main li a:hover {
diff --git a/stylesheets/common/mf-navigation.css
b/stylesheets/common/mf-navigation.css
index 3241356..b005bf5 100644
--- a/stylesheets/common/mf-navigation.css
+++ b/stylesheets/common/mf-navigation.css
@@ -223,7 +223,7 @@
}
#mw-mf-menu-main li {
text-shadow: 0 1px 0 black;
- border-bottom: 1px inset #717171;
+ border-bottom: 1px solid #717171;
font-weight: normal;
}
#mw-mf-menu-main li a {
@@ -239,7 +239,7 @@
-webkit-background-size: 24px 24px;
background-size: 24px 24px;
background-position: 10px 50%;
- border-bottom: 1px inset #3e3e3e;
+ border-bottom: 1px solid #3e3e3e;
}
#mw-mf-menu-main li a:hover {
text-decoration: none;
--
To view, visit https://gerrit.wikimedia.org/r/55074
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5e61fc417ff494256baede35e250ece9a16d8fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RELEASE_NOTES changed: line formatting of legacy versions' R... - change (mediawiki...RSS)
Wikinaut has uploaded a new change for review. https://gerrit.wikimedia.org/r/55075 Change subject: RELEASE_NOTES changed: line formatting of legacy versions' RELEASE-NOTES .. RELEASE_NOTES changed: line formatting of legacy versions' RELEASE-NOTES I changed only the old items in the Changes section of the RELEASE-NOTES to make them better readible. Long lines were broken, and superfluous comments removed. Names of contributors remain in that list. Change-Id: I449d93066b6ba21ddf761abbbee69a337736955b --- M RELEASE-NOTES 1 file changed, 19 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RSS refs/changes/75/55075/2 diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8e6295e..c554bca 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -137,19 +137,22 @@ * i18n file added by TranslateWiki.net people == Change Log of pre-1.7 versions 2010 and before == -(latest on top) -*modified by [[User:K001|K001]] 15:15, 26 January 2010 (UTC): version 1.6, added support for date formats -*modified by Peter Newman: 03:15, 7 October 2009 (UTC) Added htmlspecialchars escaping to the displayed strings -*modified by [[User:Cmreigrut|Cmreigrut]] 19:05, 19 November 2008 (UTC): added date (if specified) to short output -*modified by --[[User:Wikinaut|Wikinaut]] 11:17, 7 May 2008 (UTC) : changed method to disable chaching; Extension is now compatible to MediaWiki 1.12 -*modified by Svanslyck 02.2008, replacing all « and » with " -*This has been updated to work better on newer (1.9) MediaWiki software, with the help of [[User:Duesentrieb]]. --[[User:CryptoQuick|CryptoQuick]] 14:26, 24 January 2007 (UTC) -**This appears not to be true; I have received numerous emails about it not working with 1.9+. I would love to help debug and fix the extension, but my host has not upgraded to PHP 5 and I'm thus stuck at MediaWiki 1.6.8, so that's as far as this is guaranteed to work properly. If anyone develops a fix, please post a link to it here! —[[User:Alxndr|Alxndr]] ([[User talk:Alxndr|t]]) 02:02, 16 June 2007 (UTC) -***I just found [http://nako.us/2007/03/16/mediawiki-19-fix-for-wfstrencode/ this fork] that purports to have a fix for the new loss of wfStrEncode(). I can't test it though so can anyone else verify that it works? —[[User:Alxndr|Alxndr]] ([[User talk:Alxndr|t]]) 02:18, 16 June 2007 (UTC) -*modified by Alxndr 09.2006 -*modified by Dzag 07.2006 -*extended by Niffler 28.02.2006 -*extended by Mafs 10.07.2005, 24.07.2005 -*extended by Rdb78 07.07.2005 -*extended by Duesentrieb 30.04.2005 -*original by mutante 25.03.2005 +* [[User:K001|K001]] 15:15, 26 January 2010 (UTC) + version 1.6, added support for date formats +* Peter Newman: 03:15, 7 October 2009 (UTC) + Added htmlspecialchars escaping to the displayed strings +* [User:Cmreigrut|Cmreigrut]] 19:05, 19 November 2008 (UTC) + added date (if specified) to short output +* [[User:Wikinaut|Wikinaut]] 11:17, 7 May 2008 (UTC) + changed method to disable chaching; Extension is now compatible to MW 1.12 +* Svanslyck 02.2008, replacing all « and » with " + [[User:Duesentrieb]]. + [User:CryptoQuick|CryptoQuick]] 14:26, 24 January 2007 (UTC) + ([[User talk:Alxndr|t]]) 02:02, 16 June 2007 (UTC) +* Alxndr 09.2006 +* Dzag 07.2006 +* Niffler 28.02.2006 +* Mafs 10.07.2005, 24.07.2005 +* Rdb78 07.07.2005 +* Duesentrieb 30.04.2005 +* Original by mutante 25.03.2005 -- To view, visit https://gerrit.wikimedia.org/r/55075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I449d93066b6ba21ddf761abbbee69a337736955b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/RSS Gerrit-Branch: master Gerrit-Owner: Wikinaut Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RELEASE_NOTES changed: line formatting of legacy versions' R... - change (mediawiki...RSS)
Wikinaut has submitted this change and it was merged. Change subject: RELEASE_NOTES changed: line formatting of legacy versions' RELEASE-NOTES .. RELEASE_NOTES changed: line formatting of legacy versions' RELEASE-NOTES I changed only the old items in the Changes section of the RELEASE-NOTES to make them better readible. Long lines were broken, and superfluous comments removed. Names of contributors remain in that list. Change-Id: I449d93066b6ba21ddf761abbbee69a337736955b --- M RELEASE-NOTES 1 file changed, 19 insertions(+), 16 deletions(-) Approvals: Wikinaut: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8e6295e..c554bca 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -137,19 +137,22 @@ * i18n file added by TranslateWiki.net people == Change Log of pre-1.7 versions 2010 and before == -(latest on top) -*modified by [[User:K001|K001]] 15:15, 26 January 2010 (UTC): version 1.6, added support for date formats -*modified by Peter Newman: 03:15, 7 October 2009 (UTC) Added htmlspecialchars escaping to the displayed strings -*modified by [[User:Cmreigrut|Cmreigrut]] 19:05, 19 November 2008 (UTC): added date (if specified) to short output -*modified by --[[User:Wikinaut|Wikinaut]] 11:17, 7 May 2008 (UTC) : changed method to disable chaching; Extension is now compatible to MediaWiki 1.12 -*modified by Svanslyck 02.2008, replacing all « and » with " -*This has been updated to work better on newer (1.9) MediaWiki software, with the help of [[User:Duesentrieb]]. --[[User:CryptoQuick|CryptoQuick]] 14:26, 24 January 2007 (UTC) -**This appears not to be true; I have received numerous emails about it not working with 1.9+. I would love to help debug and fix the extension, but my host has not upgraded to PHP 5 and I'm thus stuck at MediaWiki 1.6.8, so that's as far as this is guaranteed to work properly. If anyone develops a fix, please post a link to it here! —[[User:Alxndr|Alxndr]] ([[User talk:Alxndr|t]]) 02:02, 16 June 2007 (UTC) -***I just found [http://nako.us/2007/03/16/mediawiki-19-fix-for-wfstrencode/ this fork] that purports to have a fix for the new loss of wfStrEncode(). I can't test it though so can anyone else verify that it works? —[[User:Alxndr|Alxndr]] ([[User talk:Alxndr|t]]) 02:18, 16 June 2007 (UTC) -*modified by Alxndr 09.2006 -*modified by Dzag 07.2006 -*extended by Niffler 28.02.2006 -*extended by Mafs 10.07.2005, 24.07.2005 -*extended by Rdb78 07.07.2005 -*extended by Duesentrieb 30.04.2005 -*original by mutante 25.03.2005 +* [[User:K001|K001]] 15:15, 26 January 2010 (UTC) + version 1.6, added support for date formats +* Peter Newman: 03:15, 7 October 2009 (UTC) + Added htmlspecialchars escaping to the displayed strings +* [User:Cmreigrut|Cmreigrut]] 19:05, 19 November 2008 (UTC) + added date (if specified) to short output +* [[User:Wikinaut|Wikinaut]] 11:17, 7 May 2008 (UTC) + changed method to disable chaching; Extension is now compatible to MW 1.12 +* Svanslyck 02.2008, replacing all « and » with " + [[User:Duesentrieb]]. + [User:CryptoQuick|CryptoQuick]] 14:26, 24 January 2007 (UTC) + ([[User talk:Alxndr|t]]) 02:02, 16 June 2007 (UTC) +* Alxndr 09.2006 +* Dzag 07.2006 +* Niffler 28.02.2006 +* Mafs 10.07.2005, 24.07.2005 +* Rdb78 07.07.2005 +* Duesentrieb 30.04.2005 +* Original by mutante 25.03.2005 -- To view, visit https://gerrit.wikimedia.org/r/55075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I449d93066b6ba21ddf761abbbee69a337736955b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/RSS Gerrit-Branch: master Gerrit-Owner: Wikinaut Gerrit-Reviewer: Wikinaut Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing obsolete getInputElement QUnit test - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55076
Change subject: Removing obsolete getInputElement QUnit test
..
Removing obsolete getInputElement QUnit test
The getInputElement method used by eachchange jQuery plugin will not be
attached to
jQuery anymore.
Change-Id: I07e0308e562f18f4b7e12c4b657236872392b395
---
M lib/WikibaseLib.hooks.php
D lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tests.js
2 files changed, 0 insertions(+), 32 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/76/55076/1
diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php
index ebc2afa..f67c29f 100644
--- a/lib/WikibaseLib.hooks.php
+++ b/lib/WikibaseLib.hooks.php
@@ -151,7 +151,6 @@
'tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.NativeEventHandler.tests.js',
'tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.NativeEventHandler.testsOnObject.js',
'tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.NativeEventHandler.testsOnWidget.js',
-
'tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tests.js',
'tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tagadata.tests.js',
'tests/qunit/jquery.ui/jquery.ui.suggester.tests.js',
diff --git
a/lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tests.js
b/lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tests.js
deleted file mode 100644
index e05f367..000
--- a/lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.ui.tests.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * QUnit tests for Wikibase jQuery ui plugins / helper functions
- * @see https://www.mediawiki.org/wiki/Extension:Wikibase
- *
- * @since 0.1
- * @file
- * @ingroup WikibaseLib
- *
- * @licence GNU GPL v2+
- * @author H. Snater
- */
-
-( function( mw, wb, $, QUnit, undefined ) {
- 'use strict';
-
- QUnit.module( 'wikibase.utilities.jQuery.ui', QUnit.newWbEnvironment( {
- setup: function() {},
- teardown: function() {}
- } ) );
-
- QUnit.test( '$.getInputEvent()', function( assert ) {
- assert.ok(
- $.getInputEvent() ===
- 'input' ||
- 'input keyup' ||
- 'keyup keydown blur cut paste mousedown mouseup
mouseout',
- '$.getInputEvent()'
- );
- } );
-
-}( mediaWiki, wikibase, jQuery, QUnit ) );
--
To view, visit https://gerrit.wikimedia.org/r/55076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I07e0308e562f18f4b7e12c4b657236872392b395
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] more MediaWiki extensions - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/55077 Change subject: more MediaWiki extensions .. more MediaWiki extensions NavigationTiming Sudo Survey TemplateData Thanks Change-Id: Iae14408cfe2d9d27fbd31f4d5b3c67ac24488dae --- M mediawiki-extensions.yaml 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/77/55077/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index fcadfb1..4f940ea 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -224,6 +224,7 @@ - MwEmbedSupport - MWSearch - Narayam + - NavigationTiming - NewUserMessage - Nuke - OAI @@ -289,10 +290,14 @@ - StragegyWiki - SubPageList3 - SubpageSortkey + - Sudo + - Survey - SwiftCloudFiles - SVGEdit - SyntaxHighlight_GeSHi + - TemplateData - TemplateSandbox + - Thanks - TimedMediaHandler - TitleBlacklist - TitleKey -- To view, visit https://gerrit.wikimedia.org/r/55077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iae14408cfe2d9d27fbd31f4d5b3c67ac24488dae Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] more MediaWiki extensions - change (integration/jenkins-job-builder-config)
Hashar has submitted this change and it was merged. Change subject: more MediaWiki extensions .. more MediaWiki extensions NavigationTiming Sudo Survey TemplateData Thanks Change-Id: Iae14408cfe2d9d27fbd31f4d5b3c67ac24488dae --- M mediawiki-extensions.yaml 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Hashar: Verified; Looks good to me, approved diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index fcadfb1..4f940ea 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -224,6 +224,7 @@ - MwEmbedSupport - MWSearch - Narayam + - NavigationTiming - NewUserMessage - Nuke - OAI @@ -289,10 +290,14 @@ - StragegyWiki - SubPageList3 - SubpageSortkey + - Sudo + - Survey - SwiftCloudFiles - SVGEdit - SyntaxHighlight_GeSHi + - TemplateData - TemplateSandbox + - Thanks - TimedMediaHandler - TitleBlacklist - TitleKey -- To view, visit https://gerrit.wikimedia.org/r/55077 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iae14408cfe2d9d27fbd31f4d5b3c67ac24488dae Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar Gerrit-Reviewer: Hashar ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable AFTv5 tests because of a known bug at beta cluster - change (qa/browsertests)
Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/55078 Change subject: Disable AFTv5 tests because of a known bug at beta cluster .. Disable AFTv5 tests because of a known bug at beta cluster Bug: 46382 Change-Id: I311fdc0dded1d4153bc3feb0c88d6c4a91883ac9 --- M features/aftv5.feature 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/qa/browsertests refs/changes/78/55078/1 diff --git a/features/aftv5.feature b/features/aftv5.feature index 963dee0..a44778c 100644 --- a/features/aftv5.feature +++ b/features/aftv5.feature @@ -1,5 +1,6 @@ -# http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms -@ie6-bug @phantomjs-bug +# https://bugzilla.wikimedia.org/show_bug.cgi?id=46382 @bug +# http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms @ie6-bug @phantomjs-bug +@bug @ie6-bug @phantomjs-bug Feature: AFTv5 Scenario: Check if AFTv5 is on the page -- To view, visit https://gerrit.wikimedia.org/r/55078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I311fdc0dded1d4153bc3feb0c88d6c4a91883ac9 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable AFTv5 tests because of a known bug at beta cluster - change (qa/browsertests)
Cmcmahon has submitted this change and it was merged. Change subject: Disable AFTv5 tests because of a known bug at beta cluster .. Disable AFTv5 tests because of a known bug at beta cluster Bug: 46382 Change-Id: I311fdc0dded1d4153bc3feb0c88d6c4a91883ac9 --- M features/aftv5.feature 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: Cmcmahon: Verified; Looks good to me, approved diff --git a/features/aftv5.feature b/features/aftv5.feature index 963dee0..a44778c 100644 --- a/features/aftv5.feature +++ b/features/aftv5.feature @@ -1,5 +1,6 @@ -# http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms -@ie6-bug @phantomjs-bug +# https://bugzilla.wikimedia.org/show_bug.cgi?id=46382 @bug +# http://www.mediawiki.org/wiki/Article_feedback/Version_5/Feature_Requirements#Platforms @ie6-bug @phantomjs-bug +@bug @ie6-bug @phantomjs-bug Feature: AFTv5 Scenario: Check if AFTv5 is on the page -- To view, visit https://gerrit.wikimedia.org/r/55078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I311fdc0dded1d4153bc3feb0c88d6c4a91883ac9 Gerrit-PatchSet: 1 Gerrit-Project: qa/browsertests Gerrit-Branch: master Gerrit-Owner: Zfilipin Gerrit-Reviewer: Cmcmahon ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make "varnish" be the default instance name, instead of the ... - change (operations/puppet)
Mark Bergsma has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55079
Change subject: Make "varnish" be the default instance name, instead of the
hostname
..
Make "varnish" be the default instance name, instead of the hostname
Using the hostname in the metric name was a bad idea in hindsight,
as it doesn't allow for easy comparison and aggregation of metrics
between hosts in Ganglia and Torrus.
Change-Id: I4f2ecb61ca5fd9bfaf14a9c87edea8f4ec527414
---
M files/ganglia/plugins/varnish.py
1 file changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/79/55079/1
diff --git a/files/ganglia/plugins/varnish.py b/files/ganglia/plugins/varnish.py
index 31a39db..f11d9af 100644
--- a/files/ganglia/plugins/varnish.py
+++ b/files/ganglia/plugins/varnish.py
@@ -7,7 +7,7 @@
"""
from subprocess import Popen, PIPE
-import json, os, sys
+import json, sys
stats_cache = {}
varnishstat_path = "/usr/bin/varnishstat"
@@ -21,7 +21,7 @@
instances = params.get('instances', "").split(',')
try:
- instances[instances.index('')] = os.uname()[1]
+ instances[instances.index('')] = "varnish"
except ValueError:
pass
@@ -42,7 +42,7 @@
'slope': slope,
'format': '%u',
'description':
properties['description'].encode('ascii'),
- 'groups': "varnish " + instance
+ 'groups': "varnish " + (instance == "varnish"
and "(default instance)" or instance)
}
metrics.append(metric_properties)
@@ -61,7 +61,9 @@
global stats_cache, instances, GAUGE_METRICS
for instance in instances:
- stats_cache[instance] = json.load(Popen([varnishstat_path,
"-1", "-j", "-n", instance], stdout=PIPE).stdout)
+ params = [varnishstat_path, "-1", "-j"]
+ if instance != 'varnish': params += ["-n", instance]
+ stats_cache[instance] = json.load(Popen(params,
stdout=PIPE).stdout)
return stats_cache
--
To view, visit https://gerrit.wikimedia.org/r/55079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f2ecb61ca5fd9bfaf14a9c87edea8f4ec527414
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make "varnish" be the default instance name, instead of the ... - change (operations/puppet)
Mark Bergsma has submitted this change and it was merged.
Change subject: Make "varnish" be the default instance name, instead of the
hostname
..
Make "varnish" be the default instance name, instead of the hostname
Using the hostname in the metric name was a bad idea in hindsight,
as it doesn't allow for easy comparison and aggregation of metrics
between hosts in Ganglia and Torrus.
Change-Id: I4f2ecb61ca5fd9bfaf14a9c87edea8f4ec527414
---
M files/ganglia/plugins/varnish.py
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
Mark Bergsma: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/ganglia/plugins/varnish.py b/files/ganglia/plugins/varnish.py
index 31a39db..f11d9af 100644
--- a/files/ganglia/plugins/varnish.py
+++ b/files/ganglia/plugins/varnish.py
@@ -7,7 +7,7 @@
"""
from subprocess import Popen, PIPE
-import json, os, sys
+import json, sys
stats_cache = {}
varnishstat_path = "/usr/bin/varnishstat"
@@ -21,7 +21,7 @@
instances = params.get('instances', "").split(',')
try:
- instances[instances.index('')] = os.uname()[1]
+ instances[instances.index('')] = "varnish"
except ValueError:
pass
@@ -42,7 +42,7 @@
'slope': slope,
'format': '%u',
'description':
properties['description'].encode('ascii'),
- 'groups': "varnish " + instance
+ 'groups': "varnish " + (instance == "varnish"
and "(default instance)" or instance)
}
metrics.append(metric_properties)
@@ -61,7 +61,9 @@
global stats_cache, instances, GAUGE_METRICS
for instance in instances:
- stats_cache[instance] = json.load(Popen([varnishstat_path,
"-1", "-j", "-n", instance], stdout=PIPE).stdout)
+ params = [varnishstat_path, "-1", "-j"]
+ if instance != 'varnish': params += ["-n", instance]
+ stats_cache[instance] = json.load(Popen(params,
stdout=PIPE).stdout)
return stats_cache
--
To view, visit https://gerrit.wikimedia.org/r/55079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f2ecb61ca5fd9bfaf14a9c87edea8f4ec527414
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma
Gerrit-Reviewer: Mark Bergsma
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge commit 'refs/changes/40/53940/1' of https://gerrit.wik... - change (mediawiki...SemanticMediaWiki)
Mwjames has uploaded a new change for review. https://gerrit.wikimedia.org/r/55080 Change subject: Merge commit 'refs/changes/40/53940/1' of https://gerrit.wikimedia.org/r/mediawiki/extensions/SemanticMediaWiki into testing .. Merge commit 'refs/changes/40/53940/1' of https://gerrit.wikimedia.org/r/mediawiki/extensions/SemanticMediaWiki into testing Change-Id: I2e30511c5d1db8e9817b5f9f33c7045a6962e67c --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticMediaWiki refs/changes/80/55080/1 -- To view, visit https://gerrit.wikimedia.org/r/55080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e30511c5d1db8e9817b5f9f33c7045a6962e67c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticMediaWiki Gerrit-Branch: 1.9.x-feature Gerrit-Owner: Mwjames ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Stop PHPStorm hating me - change (mediawiki...TranslateSvg)
Jarry1250 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55081
Change subject: Stop PHPStorm hating me
..
Stop PHPStorm hating me
Mostly docs changes and type hinting. Also some more
substantive changes, but only really of the "tweak"
variety.
Change-Id: I3335526fc00bb8a5e0c1faaa7f1692486f93d98d
---
M SVGFormatReader.php
M SVGFormatWriter.php
M SVGMessageGroup.php
M TranslateSvgHooks.php
M TranslateSvgTasks.php
M resources/ext.translatesvg.filepage.js
6 files changed, 91 insertions(+), 61 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TranslateSvg
refs/changes/81/55081/1
diff --git a/SVGFormatReader.php b/SVGFormatReader.php
index a237a90..54319c9 100644
--- a/SVGFormatReader.php
+++ b/SVGFormatReader.php
@@ -143,8 +143,8 @@
foreach( $texts as $text ) {
$translatableNodes[] = $text;
}
-
foreach( $translatableNodes as $translatableNode ) {
+ /** @var DOMElement $translatableNode */
if( $translatableNode->hasAttribute( 'id' ) ) {
$id = trim( $translatableNode->getAttribute(
'id' ) );
$translatableNode->setAttribute( 'id', $id );
@@ -175,6 +175,7 @@
$textLength = $this->svg->getElementsByTagName( 'text'
)->length;
for( $i = 0; $i < $textLength; $i++ ) {
+ /** @var DOMElement $text */
$text = $texts->item( $i );
// Text strings like $1, $2 will cause problems later
because
@@ -191,6 +192,8 @@
$switch = $text->parentNode;
$siblings = $switch->childNodes;
foreach( $siblings as $sibling ) {
+ /** @var DOMElement $sibling */
+
$languagesPresent = array();
if( $sibling->nodeType ===
XML_TEXT_NODE ) {
if( trim( $sibling->textContent
) !== '' ) {
@@ -278,7 +281,7 @@
// Ensure that child tspan translations prompt new s to
be created
// by duplicating the fallback version.
- foreach( $translations as $key => $languages ) {
+ foreach( $translations as $languages ) {
foreach( $languages as $language => $translation ) {
if( isset(
$languages['fallback']['data-parent'] ) ) {
$parent =
$languages['fallback']['data-parent'];
@@ -313,7 +316,11 @@
// Some sort of deep hierarchy, can't translate
continue;
}
- $textId = $fallback->item( 0 )->getAttribute( 'id' );
+
+ /** @var DOMElement $fallbackText */
+ $fallbackText = $fallback->item( 0 );
+ $textId = $fallbackText->getAttribute( 'id' );
+
foreach( $translations[$textId] as $language =>
$translation ) {
// Sort out systemLanguage attribute
if( $language !== 'fallback' ) {
@@ -389,7 +396,9 @@
$translations = array();
$this->filteredTextNodes = array(); // Reset
for( $i = 0; $i < $number; $i++ ) {
+ /** @var DOMElement $switch */
$switch = $switches->item( $i );
+
$texts = $switch->getElementsByTagName( 'text' );
$count = $texts->length;
if( $count === 0 ) {
@@ -402,10 +411,16 @@
// Some sort of deep hierarchy, can't translate
continue;
}
- $textId = $fallback->item( 0 )->getAttribute( 'id' );
+
+ /** @var DOMElement $fallbackText */
+ $fallbackText = $fallback->item( 0 );
+ $textId = $fallbackText->getAttribute( 'id' );
+
for( $j = 0; $j < $count; $j++ ) {
// Don't want to manipulate actual node
- $text = clone $texts->item( $j );
+ /** @var DOMElement $actualNode */
+ $actualNode = $texts->item( $j );
+ $text = clone $actualNode;
$numChildren = $text->childNodes->length;
$hasActualTextContent =
TranslateSvgUtils::hasActualTextContent( $text );
$lang = $text->hasAttribute( 'systemL
[MediaWiki-commits] [Gerrit] Provide helper links on file description pages. - change (mediawiki...TranslateSvg)
Jarry1250 has submitted this change and it was merged.
Change subject: Provide helper links on file description pages.
..
Provide helper links on file description pages.
These come in a few different flavours: no translations,
do you wish to start?; translations, just view; and
translations, view and translate.
The &chooselanguage=1 parameter doesn't do anything yet,
but it will shortly.
Change-Id: I360f2fdc219d96e5c10670c34796d6f40fbed2b4
---
M TranslateSvg.php
M TranslateSvgHooks.php
A resources/ext.translatesvg.filepage.js
3 files changed, 237 insertions(+), 0 deletions(-)
Approvals:
Nikerabbit: Looks good to me, but someone else must approve
Jarry1250: Verified; Looks good to me, approved
diff --git a/TranslateSvg.php b/TranslateSvg.php
index d6d31ff..5321d9c 100644
--- a/TranslateSvg.php
+++ b/TranslateSvg.php
@@ -53,7 +53,28 @@
'remoteExtPath' => 'TranslateSvg'
);
+$wgResourceModules['ext.translatesvg.filepage'] = array(
+ 'scripts' => array( 'resources/ext.translatesvg.filepage.js' ),
+ 'dependencies' => array( 'mediawiki.Uri' ),
+ 'messages' => array(
+ 'translate-svg-filepage-caption',
+ 'translate-svg-filepage-caption-translator',
+ 'translate-svg-filepage-edit',
+ 'translate-svg-filepage-finish',
+ 'translate-svg-filepage-item',
+ 'translate-svg-filepage-another',
+ 'translate-svg-filepage-other',
+ 'translate-svg-filepage-invite',
+ 'comma-separator'
+ ),
+ 'localBasePath' => dirname( __FILE__ ),
+ 'remoteExtPath' => 'TranslateSvg'
+);
+
+$wgHooks['BeforePageDisplay'][] =
'TranslateSvgHooks::updateFileDescriptionPages';
$wgHooks['LoadExtensionSchemaUpdates'][] = 'TranslateSvgHooks::schemaUpdates';
+$wgHooks['MakeGlobalVariablesScript'][] =
'TranslateSvgHooks::makeFilePageGlobalVariables';
+$wgHooks['TranslateBeforeAddModules'][] = 'TranslateSvgHooks::addModules';
$wgHooks['TranslateGetBoxes'][] = 'TranslateSvgHooks::addThumbnail';
$wgHooks['TranslateGetBoxes'][] = 'TranslateSvgHooks::removeQQQ';
$wgHooks['TranslateGetSpecialTranslateOptions'][] =
'TranslateSvgHooks::makeExportAsSvgOptionDefault';
diff --git a/TranslateSvgHooks.php b/TranslateSvgHooks.php
index 68c8b64..dd8db19 100644
--- a/TranslateSvgHooks.php
+++ b/TranslateSvgHooks.php
@@ -259,6 +259,21 @@
return true;
}
+ /*
+* Function used to add modules via the resource loader on
+* the file pages of SVG files via the BeforePageDisplay MediaWiki hook
+*
+* @param $out Contextual OutputPage instance
+* @return \bool true
+*/
+ public static function updateFileDescriptionPages( $out ) {
+ $title = $out->getTitle();
+ if( TranslateSvgUtils::isSVGFilePage( $title ) ) {
+ $out->addModules( 'ext.translatesvg.filepage' );
+ }
+ return true;
+ }
+
/**
* Process the thumbnail property for use with the mgprop parameter of
* action=query&meta=messagegroups API queries.
@@ -344,7 +359,60 @@
$group = Title::newFromRow( $r )->getText();
$list[$group] = new SVGMessageGroup( $group );
}
+ return true;
+ }
+ /**
+* Function used to expose various new globals to the
+* JavaScript of the file description pages of SVG files
+* via the MakeGlobalVariablesScript MediaWiki hook.
+*
+* @param &$vars Array of variables to be exposed to JavaScript
+* @param $out Contextual OutputPage instance
+* @return \bool true
+*/
+ public static function makeFilePageGlobalVariables( &$vars, $out ) {
+ global $wgLanguageNames;
+
+ $title = $out->getTitle();
+ if( !TranslateSvgUtils::isSVGFilePage( $title ) ) {
+ return true;
+ }
+
+ $user = $out->getUser();
+ $vars['wgUserLanguageName'] = Language::fetchLanguageName(
+ $user->getOption( 'language' )
+ );
+ $vars['wgUserCanTranslate'] = $user->isAllowed( 'translate' );
+
+ $id = $title->getText();
+ $messageGroup = new SVGMessageGroup( $id );
+ $reader = new SVGFormatReader( $messageGroup );
+ $vars['wgFileCanBeTranslated'] = ( $reader !== null );
+ if( !$vars['wgFileCanBeTranslated'] ||
!MessageGroups::getGroup( $id ) ) {
+ // Not translatable or not yet translated, let's save
time and return immediately
+ $vars['wgFileFullTranslations'] = array();
+ $vars['wgFilePartialTranslations'] = array();
+ return tru
[MediaWiki-commits] [Gerrit] Stop PHPStorm hating me - change (mediawiki...TranslateSvg)
Jarry1250 has submitted this change and it was merged.
Change subject: Stop PHPStorm hating me
..
Stop PHPStorm hating me
Mostly docs changes and type hinting. Also some more
substantive changes, but only really of the "tweak"
variety.
Change-Id: I3335526fc00bb8a5e0c1faaa7f1692486f93d98d
---
M SVGFormatReader.php
M SVGFormatWriter.php
M SVGMessageGroup.php
M TranslateSvgHooks.php
M TranslateSvgTasks.php
M resources/ext.translatesvg.filepage.js
6 files changed, 91 insertions(+), 61 deletions(-)
Approvals:
Jarry1250: Verified; Looks good to me, approved
diff --git a/SVGFormatReader.php b/SVGFormatReader.php
index a237a90..54319c9 100644
--- a/SVGFormatReader.php
+++ b/SVGFormatReader.php
@@ -143,8 +143,8 @@
foreach( $texts as $text ) {
$translatableNodes[] = $text;
}
-
foreach( $translatableNodes as $translatableNode ) {
+ /** @var DOMElement $translatableNode */
if( $translatableNode->hasAttribute( 'id' ) ) {
$id = trim( $translatableNode->getAttribute(
'id' ) );
$translatableNode->setAttribute( 'id', $id );
@@ -175,6 +175,7 @@
$textLength = $this->svg->getElementsByTagName( 'text'
)->length;
for( $i = 0; $i < $textLength; $i++ ) {
+ /** @var DOMElement $text */
$text = $texts->item( $i );
// Text strings like $1, $2 will cause problems later
because
@@ -191,6 +192,8 @@
$switch = $text->parentNode;
$siblings = $switch->childNodes;
foreach( $siblings as $sibling ) {
+ /** @var DOMElement $sibling */
+
$languagesPresent = array();
if( $sibling->nodeType ===
XML_TEXT_NODE ) {
if( trim( $sibling->textContent
) !== '' ) {
@@ -278,7 +281,7 @@
// Ensure that child tspan translations prompt new s to
be created
// by duplicating the fallback version.
- foreach( $translations as $key => $languages ) {
+ foreach( $translations as $languages ) {
foreach( $languages as $language => $translation ) {
if( isset(
$languages['fallback']['data-parent'] ) ) {
$parent =
$languages['fallback']['data-parent'];
@@ -313,7 +316,11 @@
// Some sort of deep hierarchy, can't translate
continue;
}
- $textId = $fallback->item( 0 )->getAttribute( 'id' );
+
+ /** @var DOMElement $fallbackText */
+ $fallbackText = $fallback->item( 0 );
+ $textId = $fallbackText->getAttribute( 'id' );
+
foreach( $translations[$textId] as $language =>
$translation ) {
// Sort out systemLanguage attribute
if( $language !== 'fallback' ) {
@@ -389,7 +396,9 @@
$translations = array();
$this->filteredTextNodes = array(); // Reset
for( $i = 0; $i < $number; $i++ ) {
+ /** @var DOMElement $switch */
$switch = $switches->item( $i );
+
$texts = $switch->getElementsByTagName( 'text' );
$count = $texts->length;
if( $count === 0 ) {
@@ -402,10 +411,16 @@
// Some sort of deep hierarchy, can't translate
continue;
}
- $textId = $fallback->item( 0 )->getAttribute( 'id' );
+
+ /** @var DOMElement $fallbackText */
+ $fallbackText = $fallback->item( 0 );
+ $textId = $fallbackText->getAttribute( 'id' );
+
for( $j = 0; $j < $count; $j++ ) {
// Don't want to manipulate actual node
- $text = clone $texts->item( $j );
+ /** @var DOMElement $actualNode */
+ $actualNode = $texts->item( $j );
+ $text = clone $actualNode;
$numChildren = $text->childNodes->length;
$hasActualTextContent =
TranslateSvgUtils::hasActualTextContent( $text );
$lang = $text->hasAttribute( 'systemLanguage' )
? $text->getAttribute( 'systemLanguage' ) : 'fallback';
@@ -41
[MediaWiki-commits] [Gerrit] ParserHook re-naming to keep commit history - change (mediawiki...SemanticMediaWiki)
Mwjames has submitted this change and it was merged. Change subject: ParserHook re-naming to keep commit history .. ParserHook re-naming to keep commit history This change is meant to be merged before [1] to ensure the commit history is kept for moved files. [1] https://gerrit.wikimedia.org/r/#/c/52598/ Change-Id: I6bc0c5014de2a4cbfc806872a373103935e6832c --- M includes/Setup.php R includes/parserhooks/AskParserFunction.php R includes/parserhooks/ConceptParserFunction.php R includes/parserhooks/RecurringEventsParserFunction.php R includes/parserhooks/SetParserFunction.php R includes/parserhooks/ShowParserFunction.php R includes/parserhooks/SubobjectParserFunction.php R tests/phpunit/includes/parserhooks/SubobjectParserFunctionTest.php 8 files changed, 6 insertions(+), 6 deletions(-) Approvals: Mwjames: Looks good to me, approved diff --git a/includes/Setup.php b/includes/Setup.php index d9410f0..9d600f4 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -198,17 +198,17 @@ // Parser hooks $phDir = $smwgIP . 'includes/parserhooks/'; - $wgAutoloadClasses['SMWAsk']= $phDir . 'SMW_Ask.php'; - $wgAutoloadClasses['SMWShow'] = $phDir . 'SMW_Show.php'; + $wgAutoloadClasses['SMWAsk']= $phDir . 'AskParserFunction.php'; + $wgAutoloadClasses['SMWShow'] = $phDir . 'ShowParserFunction.php'; $wgAutoloadClasses['SMWInfo'] = $phDir . 'SMW_Info.php'; - $wgAutoloadClasses['SMWConcept']= $phDir . 'SMW_Concept.php'; + $wgAutoloadClasses['SMWConcept']= $phDir . 'ConceptParserFunction.php'; $wgAutoloadClasses['SMWDeclare']= $phDir . 'SMW_Declare.php'; $wgAutoloadClasses['SMWSMWDoc'] = $phDir . 'SMW_SMWDoc.php'; $wgAutoloadClasses['SMW\ParserParameter'] = $phDir . 'ParserParameter.php'; - $wgAutoloadClasses['SMW\SetParser'] = $phDir . 'SetParser.php'; - $wgAutoloadClasses['SMW\SubobjectHandler'] = $phDir . 'SubobjectHandler.php'; + $wgAutoloadClasses['SMW\SetParser'] = $phDir . 'SetParserFunction.php'; + $wgAutoloadClasses['SMW\SubobjectHandler'] = $phDir . 'SubobjectParserFunction.php'; $wgAutoloadClasses['SMW\Subobject'] = $phDir . 'Subobject.php'; - $wgAutoloadClasses['SMW\RecurringEventsHandler'] = $phDir . 'RecurringEventsHandler.php'; + $wgAutoloadClasses['SMW\RecurringEventsHandler'] = $phDir . 'RecurringEventsParserFunction.php'; $wgAutoloadClasses['SMW\RecurringEvents'] = $phDir . 'RecurringEvents.php'; // Stores & queries diff --git a/includes/parserhooks/SMW_Ask.php b/includes/parserhooks/AskParserFunction.php similarity index 100% rename from includes/parserhooks/SMW_Ask.php rename to includes/parserhooks/AskParserFunction.php diff --git a/includes/parserhooks/SMW_Concept.php b/includes/parserhooks/ConceptParserFunction.php similarity index 100% rename from includes/parserhooks/SMW_Concept.php rename to includes/parserhooks/ConceptParserFunction.php diff --git a/includes/parserhooks/RecurringEventsHandler.php b/includes/parserhooks/RecurringEventsParserFunction.php similarity index 100% rename from includes/parserhooks/RecurringEventsHandler.php rename to includes/parserhooks/RecurringEventsParserFunction.php diff --git a/includes/parserhooks/SetParser.php b/includes/parserhooks/SetParserFunction.php similarity index 100% rename from includes/parserhooks/SetParser.php rename to includes/parserhooks/SetParserFunction.php diff --git a/includes/parserhooks/SMW_Show.php b/includes/parserhooks/ShowParserFunction.php similarity index 100% rename from includes/parserhooks/SMW_Show.php rename to includes/parserhooks/ShowParserFunction.php diff --git a/includes/parserhooks/SubobjectHandler.php b/includes/parserhooks/SubobjectParserFunction.php similarity index 100% rename from includes/parserhooks/SubobjectHandler.php rename to includes/parserhooks/SubobjectParserFunction.php diff --git a/tests/phpunit/includes/parserhooks/SubobjectHandlerTest.php b/tests/phpunit/includes/parserhooks/SubobjectParserFunctionTest.php similarity index 100% rename from tests/phpunit/includes/parserhooks/SubobjectHandlerTest.php rename to tests/phpunit/includes/parserhooks/SubobjectParserFunctionTest.php -- To view, visit https://gerrit.wikimedia.org/r/53940 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6bc0c5014de2a4cbfc806872a373103935e6832c Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SemanticMediaWiki Gerrit-Branch: master Gerrit-Owner: Mwjames Gerrit-Reviewer: Mwjames Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.
[MediaWiki-commits] [Gerrit] Call loadPageData() as needed in Title::moveToInternal. - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Call loadPageData() as needed in Title::moveToInternal. .. Call loadPageData() as needed in Title::moveToInternal. * This avoids use of a slave for loading the page ID to do the updates using $newpage. That bug prevented page moves by using the old 0 ID and throwing an exception. Bug: 46397 Change-Id: Iea3259dce6840e3f2959d98a20177acd60433b64 --- M includes/Title.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Title.php b/includes/Title.php index e81023a..84848eb 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -3838,6 +3838,7 @@ $this->resetArticleID( 0 ); $nt->resetArticleID( $oldid ); + $newpage->loadPageData( WikiPage::READ_LOCKING ); // bug 46397 $newpage->updateRevisionOn( $dbw, $nullRevision ); -- To view, visit https://gerrit.wikimedia.org/r/55017 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iea3259dce6840e3f2959d98a20177acd60433b64 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz Gerrit-Reviewer: CSteipp Gerrit-Reviewer: Catrope Gerrit-Reviewer: Reedy Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding the Alef font for Hebrew - change (mediawiki...UniversalLanguageSelector)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55082
Change subject: Adding the Alef font for Hebrew
..
Adding the Alef font for Hebrew
Change-Id: Ie0936a690613e31204a967cb693b1ef615fad3f0
---
A data/fontrepo/fonts/Alef/Alef-Bold.eot
A data/fontrepo/fonts/Alef/Alef-Bold.ttf
A data/fontrepo/fonts/Alef/Alef-Bold.woff
A data/fontrepo/fonts/Alef/Alef-Regular.eot
A data/fontrepo/fonts/Alef/Alef-Regular.ttf
A data/fontrepo/fonts/Alef/Alef-Regular.woff
A data/fontrepo/fonts/Alef/font.ini
M resources/js/ext.uls.webfonts.repository.js
8 files changed, 17 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/82/55082/1
diff --git a/data/fontrepo/fonts/Alef/Alef-Bold.eot
b/data/fontrepo/fonts/Alef/Alef-Bold.eot
new file mode 100644
index 000..42112a8
--- /dev/null
+++ b/data/fontrepo/fonts/Alef/Alef-Bold.eot
Binary files differ
diff --git a/data/fontrepo/fonts/Alef/Alef-Bold.ttf
b/data/fontrepo/fonts/Alef/Alef-Bold.ttf
new file mode 100644
index 000..09b79dc
--- /dev/null
+++ b/data/fontrepo/fonts/Alef/Alef-Bold.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/Alef/Alef-Bold.woff
b/data/fontrepo/fonts/Alef/Alef-Bold.woff
new file mode 100644
index 000..f524aa7
--- /dev/null
+++ b/data/fontrepo/fonts/Alef/Alef-Bold.woff
Binary files differ
diff --git a/data/fontrepo/fonts/Alef/Alef-Regular.eot
b/data/fontrepo/fonts/Alef/Alef-Regular.eot
new file mode 100644
index 000..2dd6f2e
--- /dev/null
+++ b/data/fontrepo/fonts/Alef/Alef-Regular.eot
Binary files differ
diff --git a/data/fontrepo/fonts/Alef/Alef-Regular.ttf
b/data/fontrepo/fonts/Alef/Alef-Regular.ttf
new file mode 100644
index 000..3390fb9
--- /dev/null
+++ b/data/fontrepo/fonts/Alef/Alef-Regular.ttf
Binary files differ
diff --git a/data/fontrepo/fonts/Alef/Alef-Regular.woff
b/data/fontrepo/fonts/Alef/Alef-Regular.woff
new file mode 100644
index 000..9e4efd2
--- /dev/null
+++ b/data/fontrepo/fonts/Alef/Alef-Regular.woff
Binary files differ
diff --git a/data/fontrepo/fonts/Alef/font.ini
b/data/fontrepo/fonts/Alef/font.ini
new file mode 100644
index 000..d1b92bf
--- /dev/null
+++ b/data/fontrepo/fonts/Alef/font.ini
@@ -0,0 +1,16 @@
+[Alef]
+languages=he, yi, hbo
+version=1.0
+license=OFL 1.1
+licensefile=OFL.txt
+url=http://alef.hagilda.com/
+ttf=Alef-Regular.ttf
+eot=Alef-Regular.eot
+woff=Alef-Regular.woff
+bold=Alef Bold
+
+[Alef Bold]
+ttf=Alef-Bold.ttf
+eot=Alef-Bold.eot
+woff=Alef-Bold.woff
+fontweight=bold
diff --git a/resources/js/ext.uls.webfonts.repository.js
b/resources/js/ext.uls.webfonts.repository.js
index c23fe1f..cbc109c 100644
--- a/resources/js/ext.uls.webfonts.repository.js
+++ b/resources/js/ext.uls.webfonts.repository.js
@@ -1,5 +1,5 @@
// Please do not edit. This file is generated from data/fontrepo by
data/fontrepo/scripts/compile.php
( function ( $ ) {
$.webfonts = $.webfonts || {};
- $.webfonts.repository =
{"base":"..\/data\/fontrepo\/fonts\/","languages":{"af":["system","OpenDyslexic"],"ahr":["Lohit
Marathi"],"akk":["Akkadian"],"am":["AbyssinicaSIL"],"ar":["Amiri"],"arb":["Amiri"],"as":["system","Lohit
Assamese"],"bh":["Lohit Devanagari"],"bho":["Lohit
Devanagari"],"bk":["system","OpenDyslexic"],"bn":["Siyam Rupali","Lohit
Bengali"],"bo":["Jomolhari"],"bpy":["Siyam Rupali","Lohit
Bengali"],"bug":["Saweri"],"ca":["system","OpenDyslexic"],"cdo":["CharisSIL"],"cy":["system","OpenDyslexic"],"da":["system","OpenDyslexic"],"de":["system","OpenDyslexic"],"dz":["Jomolhari"],"en":["system","OpenDyslexic"],"es":["system","OpenDyslexic"],"et":["system","OpenDyslexic"],"fa":["Iranian
Sans","Amiri"],"fi":["system","OpenDyslexic"],"fo":["system","OpenDyslexic"],"fr":["system","OpenDyslexic"],"fy":["system","OpenDyslexic"],"ga":["system","OpenDyslexic"],"gd":["system","OpenDyslexic"],"gl":["system","OpenDyslexic"],"gom":["Lohit
Devanagari"],"gu":["Lohit Gujarati"],"hbo":["Taamey Frank
CLM"],"he":["system","Miriam CLM","Taamey Frank CLM"],"hi":["Lohit
Devanagari"],"hu":["system","OpenDyslexic"],"id":["system","OpenDyslexic"],"is":["system","OpenDyslexic"],"it":["system","OpenDyslexic"],"jv":["system","Tuladha
Jejeg"],"jv-java":["Tuladha
Jejeg"],"km":["KhmerOSbattambang","KhmerOS","KhmerOSbokor","KhmerOSfasthand","KhmerOSfreehand","KhmerOSmuol","KhmerOSmuollight","KhmerOSmuolpali","KhmerOSsiemreap"],"kn":["Lohit
Kannada","Gubbi"],"kok":["Lohit
Devanagari"],"lb":["system","OpenDyslexic"],"li":["system","OpenDyslexic"],"mai":["Lohit
Devanagari"],"mak":["Saweri"],"mi":["system","OpenDyslexic"],"ml":["Meera","AnjaliOldLipi"],"mr":["Lohit
Marathi"],"ms":["system","OpenDyslexic"],"my":["TharLon","Myanmar3","Padauk"],"nb":["system","OpenDyslexic"],"ne":["Lohit
Nepali","Madan"],"nl":["system","OpenDyslexic"],"oc":["system","OpenDyslexic"],"or":["Lohit
Oriya","Utkal"],"pa":["Lohit
Punjabi","Saab"]
[MediaWiki-commits] [Gerrit] Fix example links in API - change (mediawiki...Wikibase)
John Erling Blad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55083
Change subject: Fix example links in API
..
Fix example links in API
Some of the API links uses an old style prefix-less id. This type
of id was deprecated and unsupported a long time ago.
Change-Id: Ib86599ee068a13a3a66e61f5f52ee2a27937858d
---
M repo/includes/api/SetDescription.php
M repo/includes/api/SetLabel.php
M repo/includes/api/SetSiteLink.php
3 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/83/55083/1
diff --git a/repo/includes/api/SetDescription.php
b/repo/includes/api/SetDescription.php
index ffa76a2..16ef254 100644
--- a/repo/includes/api/SetDescription.php
+++ b/repo/includes/api/SetDescription.php
@@ -81,8 +81,8 @@
*/
protected function getExamples() {
return array(
-
'api.php?action=wbsetdescription&id=42&language=en&value=An%20encyclopedia%20that%20everyone%20can%20edit'
- => 'Set the string "An encyclopedia that
everyone can edit" for page with id "42" as a decription in English language',
+
'api.php?action=wbsetdescription&id=Q42&language=en&value=An%20encyclopedia%20that%20everyone%20can%20edit'
+ => 'Set the string "An encyclopedia that
everyone can edit" for page with id "Q42" as a decription in English language',
);
}
diff --git a/repo/includes/api/SetLabel.php b/repo/includes/api/SetLabel.php
index 9cfe93a..97ee0a7 100644
--- a/repo/includes/api/SetLabel.php
+++ b/repo/includes/api/SetLabel.php
@@ -80,8 +80,8 @@
*/
protected function getExamples() {
return array(
-
'api.php?action=wbsetlabel&id=42&language=en&value=Wikimedia&format=jsonfm'
- => 'Set the string "Wikimedia" for page with id
"42" as a label in English language and report it as pretty printed json',
+
'api.php?action=wbsetlabel&id=Q42&language=en&value=Wikimedia&format=jsonfm'
+ => 'Set the string "Wikimedia" for page with id
"Q42" as a label in English language and report it as pretty printed json',
);
}
diff --git a/repo/includes/api/SetSiteLink.php
b/repo/includes/api/SetSiteLink.php
index b5ccc73..5a5ec4b 100644
--- a/repo/includes/api/SetSiteLink.php
+++ b/repo/includes/api/SetSiteLink.php
@@ -197,10 +197,10 @@
*/
protected function getExamples() {
return array(
-
'api.php?action=wbsetsitelink&id=42&linksite=enwiki&linktitle=Wikimedia'
- => 'Add title "Wikimedia" for English page with id "42"
if the site link does not exist',
-
'api.php?action=wbsetsitelink&id=42&linksite=enwiki&linktitle=Wikimedia&summary=World%20domination%20will%20be%20mine%20soon!'
- => 'Add title "Wikimedia" for English page with id
"42", if the site link does not exist',
+
'api.php?action=wbsetsitelink&id=Q42&linksite=enwiki&linktitle=Wikimedia'
+ => 'Add title "Wikimedia" for English page with id
"Q42" if the site link does not exist',
+
'api.php?action=wbsetsitelink&id=Q42&linksite=enwiki&linktitle=Wikimedia&summary=World%20domination%20will%20be%20mine%20soon!'
+ => 'Add title "Wikimedia" for English page with id
"Q42", if the site link does not exist',
);
}
--
To view, visit https://gerrit.wikimedia.org/r/55083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib86599ee068a13a3a66e61f5f52ee2a27937858d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: John Erling Blad
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Skeleton for twn main page - change (translatewiki)
Santhosh has submitted this change and it was merged.
Change subject: Skeleton for twn main page
..
Skeleton for twn main page
Mingle-Story: 2736
Mingle-Task: 2777
Change-Id: I8d942fc09bbba0ad40ce4a823e0c186c2dd933bc
---
A MainPage/Autoload.php
A MainPage/MainPage.alias.php
A MainPage/MainPage.i18n.php
A MainPage/MainPage.php
A MainPage/Resources.php
A MainPage/specials/SpecialTwnMainPage.php
6 files changed, 86 insertions(+), 0 deletions(-)
Approvals:
Santhosh: Verified; Looks good to me, approved
diff --git a/MainPage/Autoload.php b/MainPage/Autoload.php
new file mode 100644
index 000..5e50a06
--- /dev/null
+++ b/MainPage/Autoload.php
@@ -0,0 +1,5 @@
+ array( 'MainPage' ),
+);
diff --git a/MainPage/MainPage.i18n.php b/MainPage/MainPage.i18n.php
new file mode 100644
index 000..13db123
--- /dev/null
+++ b/MainPage/MainPage.i18n.php
@@ -0,0 +1,13 @@
+ 'Provides the translatewiki.net main page',
+ 'twnmp-mainpage' => 'Main page',
+);
+
+$messages['qqq'] = array(
+ 'twnmp-desc' => '{{desc}}}',
+ 'twnmp-mainpage' => 'Html title of the page.',
+);
diff --git a/MainPage/MainPage.php b/MainPage/MainPage.php
new file mode 100644
index 000..add4b24
--- /dev/null
+++ b/MainPage/MainPage.php
@@ -0,0 +1,31 @@
+ __FILE__,
+ 'name' => 'Translatewiki.net main page',
+ 'version' => '2013-03-20',
+ 'author' => array( 'Niklas Laxström', 'Santhosh Thottingal' ),
+ 'descriptionmsg' => 'twnmp-desc',
+);
+
+$dir = __DIR__;
+require_once( "$dir/Autoload.php" );
+require_once( "$dir/Resources.php" );
+
+$wgExtensionMessagesFiles['MainPage'] = "$dir/MainPage.i18n.php";
+$wgExtensionMessagesFiles['MainPageAlias'] = "$dir/MainPage.alias.php";
+
+$wgSpecialPages['TwnMainPage'] = 'SpecialTwnMainPage';
+
diff --git a/MainPage/Resources.php b/MainPage/Resources.php
new file mode 100644
index 000..b3d9bbc
--- /dev/null
+++ b/MainPage/Resources.php
@@ -0,0 +1 @@
+setHeaders();
+ $this->getOutput()->addWikiText( "Hei maailma!" );
+ }
+
+ public function getDescription() {
+ return $this->msg( 'twnmp-mainpage' );
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/54843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8d942fc09bbba0ad40ce4a823e0c186c2dd933bc
Gerrit-PatchSet: 2
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Santhosh
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/me... - change (mediawiki/core)
Lwelling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55084
Change subject: Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/core into
review/lwelling/delayed_queue
..
Merge branch 'master' of ssh://gerrit.wikimedia.org:29418/mediawiki/core into
review/lwelling/delayed_queue
Conflicts:
includes/job/Job.php
includes/job/JobQueue.php
Change-Id: I5ed1b0897db6ca60e655a64446ee9e52c49af405
---
M includes/job/Job.php
M includes/job/JobQueue.php
2 files changed, 0 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/84/55084/1
diff --git a/includes/job/Job.php b/includes/job/Job.php
index 96c90be..b28bf66 100644
--- a/includes/job/Job.php
+++ b/includes/job/Job.php
@@ -196,15 +196,6 @@
}
/**
- * @return integer|null UNIX timestamp to delay running this job until,
otherwise null
- */
- public function delayUntilTimestamp() {
- return isset( $this->params['delayUntilTimestamp'] )
- ? wfTimestampOrNull( TS_UNIX,
$this->params['delayUntilTimestamp'] )
- : null;
- }
-
- /**
* @return integer|null UNIX timestamp to delay running this job until,
otherwise null
* @since 1.22
*/
diff --git a/includes/job/JobQueue.php b/includes/job/JobQueue.php
index bac4bfd..9c152cd 100644
--- a/includes/job/JobQueue.php
+++ b/includes/job/JobQueue.php
@@ -82,11 +82,7 @@
* but not acknowledged as completed after this many
seconds. Recycling
* of jobs simple means re-inserting them into the
queue. Jobs can be
* attempted up to three times before being discarded.
-<<< HEAD (ee2672 Allow job queues to optionally request jobs not be
processed)
-* - checkDelay : If supported, respect Job::delayUntilTimestamp() in
the push functions.
-===
* - checkDelay : If supported, respect Job::getReleaseTimestamp() in
the push functions.
->>> BRANCH (45b341 Add SpecialSearchResultsPrepend/Append to release notes)
* This lets delayed jobs wait in a staging area until
a given timestamp is
* reached, at which point they will enter the queue.
If this is not enabled
* or not supported, an exception will be thrown on
delayed job insertion.
@@ -224,10 +220,7 @@
*
* @return integer
* @throws MWException
-<<< HEAD (ee2672 Allow job queues to optionally request jobs not be
processed)
-===
* @since 1.22
->>> BRANCH (45b341 Add SpecialSearchResultsPrepend/Append to release notes)
*/
final public function getDelayedCount() {
wfProfileIn( __METHOD__ );
@@ -277,11 +270,7 @@
if ( $job->getType() !== $this->type ) {
throw new MWException(
"Got '{$job->getType()}' job; expected
a '{$this->type}' job." );
-<<< HEAD (ee2672 Allow job queues to optionally request jobs not be
processed)
- } elseif ( $job->delayUntilTimestamp() &&
!$this->checkDelay ) {
-===
} elseif ( $job->getReleaseTimestamp() &&
!$this->checkDelay ) {
->>> BRANCH (45b341 Add SpecialSearchResultsPrepend/Append to release notes)
throw new MWException(
"Got delayed '{$job->getType()}' job;
delays are not supported." );
}
@@ -550,13 +539,8 @@
/**
* Get an iterator to traverse over all available jobs in this queue.
-<<< HEAD (ee2672 Allow job queues to optionally request jobs not be
processed)
-* This does not include jobs that are current acquired. In general,
-* this should only be called on a queue that is no longer being popped.
-===
* This does not include jobs that are currently acquired or delayed.
* This should only be called on a queue that is no longer being popped.
->>> BRANCH (45b341 Add SpecialSearchResultsPrepend/Append to release notes)
*
* @return Iterator|Traversable|Array
* @throws MWException
--
To view, visit https://gerrit.wikimedia.org/r/55084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ed1b0897db6ca60e655a64446ee9e52c49af405
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Lwelling
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] adding coreutils to base::puppet - change (operations/puppet)
Pyoungmeister has uploaded a new change for review.
https://gerrit.wikimedia.org/r/55085
Change subject: adding coreutils to base::puppet
..
adding coreutils to base::puppet
it's not installed on all systems and provides timeout
Change-Id: I524c999352112513f8d717754112600cd662ab7e
---
M manifests/base.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/55085/1
diff --git a/manifests/base.pp b/manifests/base.pp
index d98effb..a2b10f4 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -87,7 +87,7 @@
include passwords::puppet::database
- package { [ "puppet", "facter" ]:
+ package { [ "puppet", "facter", "coreutils" ]:
ensure => latest;
}
--
To view, visit https://gerrit.wikimedia.org/r/55085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I524c999352112513f8d717754112600cd662ab7e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Pyoungmeister
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
