date:20161106

[MediaWiki-commits] [Gerrit] operations...linux-meta[master]: Depend on new ABI name

2016-11-06 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: Depend on new ABI name
..


Depend on new ABI name

Change-Id: Icb7a83ca36ceca78532ff46c68a712db37d3da4b
---
M debian/control
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/debian/control b/debian/control
index 4897122..23e3a7f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@
 
 Package: linux-meta-4.4
 Architecture: any
-Depends: linux-image-4.4.0-2-amd64 [amd64], initramfs-tools, grub2-common, 
firmware-bnx2x (>= 20151018-2~wmf1)
+Depends: linux-image-4.4.0-3-amd64 [amd64], initramfs-tools, grub2-common, 
firmware-bnx2x (>= 20151018-2~wmf1)
 Description: Meta package for 4.4 kernel images
  This package depends on the latest Linux kernel used in the WMF environment.
  It can also serve to depend on firmware packages not part of the stock Linux

-- 
To view, visit https://gerrit.wikimedia.org/r/319870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icb7a83ca36ceca78532ff46c68a712db37d3da4b
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/linux-meta
Gerrit-Branch: master
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2042 for maintenance

2016-11-06 Thread Marostegui (Code Review)

Marostegui has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320166

Change subject: db-codfw.php: Depool db2042 for maintenance
..

db-codfw.php: Depool db2042 for maintenance

db2034 needs recloning and I would like to use db2042 for it. As they are both 
serving
the same services (rc).
I am unsure about leaving those arrays empy (as both db2034 and db2042 would be 
depooled).
The reason I am using db2042 as a clone source is to avoid the cross DC 
transfer and because
db2042 already has the partitions that db2034 will need.

Bug: T149553
Change-Id: I54bf1196b6834be3eb523c96d209b7b81aba563b
---
M wmf-config/db-codfw.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/66/320166/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 129d1f2..de9448e 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -95,7 +95,7 @@
's1' => [
'db2016' => 0,   # 2.9TB  96GB, master
 #  'db2034' => 50,  # 2.9TB 160GB, rc, log #Maintenance - T149553
-   'db2042' => 50,  # 2.9TB 160GB, rc, log
+#  'db2042' => 50,  # 2.9TB 160GB, rc, log
'db2048' => 400, # 2.9TB 160GB
'db2055' => 50,  # 3.3TB 160GB, dump (inactive), vslow
'db2062' => 100, # 3.3TB 160GB, api
@@ -219,23 +219,23 @@
's1' => [
'watchlist' => [
 #  'db2034' => 1,
-   'db2042' => 1,
+#  'db2042' => 1,
],
'recentchanges' => [
 #  'db2034' => 1,
-   'db2042' => 1,
+#  'db2042' => 1,
],
'recentchangeslinked' => [
 #  'db2034' => 1,
-   'db2042' => 1,
+#  'db2042' => 1,
],
'contributions' => [
 #  'db2034' => 1,
-   'db2042' => 1,
+#  'db2042' => 1,
],
'logpager' => [
 #  'db2034' => 1,
-   'db2042' => 1,
+#  'db2042' => 1,
],
'dump' => [
'db2055' => 1,

-- 
To view, visit https://gerrit.wikimedia.org/r/320166
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I54bf1196b6834be3eb523c96d209b7b81aba563b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: carbon_pickled: Restrict to production networks

2016-11-06 Thread Muehlenhoff (Code Review)

Muehlenhoff has submitted this change and it was merged.

Change subject: carbon_pickled: Restrict to production networks
..


carbon_pickled: Restrict to production networks

We're getting rid of $INTERNAL, since it's needlessly broad. Restrict
access to production networks as for the other ferm services.

Change-Id: I905da6072ec71cb32fe7e85e6caaf35f248ca045
---
M modules/role/manifests/graphite/production.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/graphite/production.pp 
b/modules/role/manifests/graphite/production.pp
index ab7661e..7d9e4f6 100644
--- a/modules/role/manifests/graphite/production.pp
+++ b/modules/role/manifests/graphite/production.pp
@@ -75,7 +75,7 @@
 ferm::service { 'carbon_pickled':
 proto  => 'tcp',
 port   => '2004',
-srange => '$INTERNAL',
+srange => '$PRODUCTION_NETWORKS',
 }
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/319878
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I905da6072ec71cb32fe7e85e6caaf35f248ca045
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: changed Quiz.class.php and extension.json. Added Question.php

2016-11-06 Thread Raspberrypy20 (Code Review)

Raspberrypy20 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320165

Change subject: changed Quiz.class.php and extension.json. Added Question.php
..

changed Quiz.class.php and extension.json. Added Question.php

Change-Id: I4dc2c4f5edbaa819f91205e79f424ec2f4478367
---
A Question.php
M Quiz.class.php
M extension.json
3 files changed, 444 insertions(+), 438 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/65/320165/1

diff --git a/Question.php b/Question.php
new file mode 100644
index 000..4c519d4
--- /dev/null
+++ b/Question.php
@@ -0,0 +1,443 @@
+mRequest = &$wgRequest;
+   $this->mQuestionId = $questionId;
+   $this->mBeingCorrected = $beingCorrected;
+   $this->mCaseSensitive = $caseSensitive;
+   $this->mParser = $parser;
+   $this->mState = ( $beingCorrected ) ? 'NA' : '';
+   $this->mType = 'multipleChoice';
+   $this->mCoef = 1;
+   $this->mProposalPattern = '`^([+-]) ?(.*)`';
+   $this->mCorrectionPattern   = '`^\|\|(.*)`';
+   $this->mCategoryPattern = '`^\|(\n|[^\|].*\n)`';
+   $this->mTextFieldPattern= '`\{ ([^\}]*?)(_([\d]*) ?| 
)\}`';
+   }
+
+   /**
+* Mutator of the question state
+*
+* @protected
+* @param $pState String:
+*/
+   function setState( $pState ) {
+   if (
+   $pState == 'error' ||
+   ( $pState == 'wrong' && $this->mState != 'error' ) ||
+   ( $pState == 'right' && ( $this->mState == 'NA' || 
$this->mState == 'na_right' ) ) ||
+   ( $pState == 'na_wrong' && ( $this->mState == 'NA' || 
$this->mState == 'na_right' ) ) ||
+   ( $pState == 'na_right' && ( $this->mState == 'NA' ) ) 
||
+   ( $pState == 'new_NA' && ( $this->mState == 'NA' || 
$this->mState == 'right' ) )
+   )
+   {
+   $this->mState = $pState;
+   }
+   # Special cases
+   if( ( $pState == 'na_wrong' && $this->mState == 'right' ) || ( 
$pState == 'right' && $this->mState == 'na_wrong' ) ) {
+   $this->mState = 'wrong';
+   }
+   return;
+   }
+
+   /**
+* Accessor of the question state.
+*
+* @protected
+*/
+   function getState() {
+   if ( $this->mState == 'na_right' ) {
+   return 'right';
+   } elseif ( $this->mState == 'na_wrong' || $this->mState == 
'new_NA' ) {
+   return 'NA';
+   } else {
+   return $this->mState;
+   }
+   }
+
+   /**
+* Convert the question's header into HTML.
+*
+* @param $input String: the quiz header in quiz syntax.
+* @return string
+*/
+   function parseHeader( $input ) {
+   $parametersPattern = '`\n\|([^\|].*)\s*$`';
+   $input = preg_replace_callback( $parametersPattern, array( 
$this, 'parseParameters' ), $input );
+   $splitHeaderPattern = '`\n\|\|`';
+   $unparsedHeader = preg_split( $splitHeaderPattern, $input );
+   $output = $this->mParser->recursiveTagParse( trim( 
$unparsedHeader[0] ) . "\n" );
+   if( array_key_exists( 1, $unparsedHeader ) ) {
+   $output .= '';
+   $output .= '' .
+   $this->mParser->recursiveTagParse( trim( 
$unparsedHeader[1] ) ) .
+   '';
+   $output .= '';
+   }
+   return $output;
+   }
+
+   /**
+* Determine the question's parameters.
+*
+* @param $matches Array: elements matching $parametersPattern
+*  $matches[0] are the 
potential question parameters.
+*/
+   function parseParameters( $matches ) {
+   $typePattern = '`t[yi]p[eo]?="(.*?)"`';
+   if( preg_match( $typePattern, $matches[1], $type ) ) {
+   # List of all object type code and the correspondant 
question type.
+   switch( $type[1] ) {
+   case '{}':
+   $this->mType = 'textField';
+   break;
+   case '()':
+   $this->mType = 'singleChoice';
+   break;
+   case '[]':
+   $this->mType = 'multipleChoice';
+   break;
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rewording BotPasswords message to reflect what "grant" reall...

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Rewording BotPasswords message to reflect what "grant" really 
does
..


Rewording BotPasswords message to reflect what "grant" really does

Bug: T150080
Change-Id: Ie2ba9cc0638ab44966cf31f83dbf90036234c0e7
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 8ac4089..6b80f4d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -564,7 +564,7 @@
"botpasswords-label-delete": "Delete",
"botpasswords-label-resetpassword": "Reset the password",
"botpasswords-label-grants": "Applicable grants:",
-   "botpasswords-help-grants": "Each grant gives access to listed user 
rights that a user account already has. See the [[Special:ListGrants|table of 
grants]] for more information.",
+   "botpasswords-help-grants": "Grants allow access to rights already held 
by your user account. Enabling a grant here does not provide access to any 
rights that your user account would not otherwise have. See the 
[[Special:ListGrants|table of grants]] for more information.",
"botpasswords-label-grants-column": "Granted",
"botpasswords-bad-appid": "The bot name \"$1\" is not valid.",
"botpasswords-insert-failed": "Failed to add bot name \"$1\". Was it 
already added?",

-- 
To view, visit https://gerrit.wikimedia.org/r/320110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2ba9cc0638ab44966cf31f83dbf90036234c0e7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Huji 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Huji 
Gerrit-Reviewer: Reedy 
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] mediawiki...Quiz[master]: adding Quiz.class and extension.json

2016-11-06 Thread Raspberrypy20 (Code Review)

Raspberrypy20 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320164

Change subject: adding Quiz.class and extension.json
..

adding Quiz.class and extension.json

Change-Id: I36c75482656092e19bf23caed2a624ae32c52be7
---
M Quiz.class.php
M extension.json
2 files changed, 1 insertion(+), 438 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/64/320164/1

diff --git a/Quiz.class.php b/Quiz.class.php
index f1d8e2a..2b9db9c 100644
--- a/Quiz.class.php
+++ b/Quiz.class.php
@@ -353,440 +353,3 @@
}
 }
 
-class Question {
-   /**
-* Constructor
-*
-* @param $beingCorrected Boolean.
-* @param $caseSensitive Boolean.
-* @param $questionId Integer: the Identifier of the question used to 
generate input names.
-* @param $parser Parser the wikitext parser.
-*/
-   public function __construct( $beingCorrected, $caseSensitive, 
$questionId, &$parser ) {
-   global $wgRequest;
-   $this->mRequest = &$wgRequest;
-   $this->mQuestionId = $questionId;
-   $this->mBeingCorrected = $beingCorrected;
-   $this->mCaseSensitive = $caseSensitive;
-   $this->mParser = $parser;
-   $this->mState = ( $beingCorrected ) ? 'NA' : '';
-   $this->mType = 'multipleChoice';
-   $this->mCoef = 1;
-   $this->mProposalPattern = '`^([+-]) ?(.*)`';
-   $this->mCorrectionPattern   = '`^\|\|(.*)`';
-   $this->mCategoryPattern = '`^\|(\n|[^\|].*\n)`';
-   $this->mTextFieldPattern= '`\{ ([^\}]*?)(_([\d]*) ?| 
)\}`';
-   }
-
-   /**
-* Mutator of the question state
-*
-* @protected
-* @param $pState String:
-*/
-   function setState( $pState ) {
-   if (
-   $pState == 'error' ||
-   ( $pState == 'wrong' && $this->mState != 'error' ) ||
-   ( $pState == 'right' && ( $this->mState == 'NA' || 
$this->mState == 'na_right' ) ) ||
-   ( $pState == 'na_wrong' && ( $this->mState == 'NA' || 
$this->mState == 'na_right' ) ) ||
-   ( $pState == 'na_right' && ( $this->mState == 'NA' ) ) 
||
-   ( $pState == 'new_NA' && ( $this->mState == 'NA' || 
$this->mState == 'right' ) )
-   )
-   {
-   $this->mState = $pState;
-   }
-   # Special cases
-   if( ( $pState == 'na_wrong' && $this->mState == 'right' ) || ( 
$pState == 'right' && $this->mState == 'na_wrong' ) ) {
-   $this->mState = 'wrong';
-   }
-   return;
-   }
-
-   /**
-* Accessor of the question state.
-*
-* @protected
-*/
-   function getState() {
-   if ( $this->mState == 'na_right' ) {
-   return 'right';
-   } elseif ( $this->mState == 'na_wrong' || $this->mState == 
'new_NA' ) {
-   return 'NA';
-   } else {
-   return $this->mState;
-   }
-   }
-
-   /**
-* Convert the question's header into HTML.
-*
-* @param $input String: the quiz header in quiz syntax.
-* @return string
-*/
-   function parseHeader( $input ) {
-   $parametersPattern = '`\n\|([^\|].*)\s*$`';
-   $input = preg_replace_callback( $parametersPattern, array( 
$this, 'parseParameters' ), $input );
-   $splitHeaderPattern = '`\n\|\|`';
-   $unparsedHeader = preg_split( $splitHeaderPattern, $input );
-   $output = $this->mParser->recursiveTagParse( trim( 
$unparsedHeader[0] ) . "\n" );
-   if( array_key_exists( 1, $unparsedHeader ) ) {
-   $output .= '';
-   $output .= '' .
-   $this->mParser->recursiveTagParse( trim( 
$unparsedHeader[1] ) ) .
-   '';
-   $output .= '';
-   }
-   return $output;
-   }
-
-   /**
-* Determine the question's parameters.
-*
-* @param $matches Array: elements matching $parametersPattern
-*  $matches[0] are the 
potential question parameters.
-*/
-   function parseParameters( $matches ) {
-   $typePattern = '`t[yi]p[eo]?="(.*?)"`';
-   if( preg_match( $typePattern, $matches[1], $type ) ) {
-   # List of all object type code and the correspondant 
question type.
-   switch( $type[1] ) {
-   case '{}':
-

[MediaWiki-commits] [Gerrit] operations...nginx[wmf-1.11.4]: remove debian perl ldflags patch

2016-11-06 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320161

Change subject: remove debian perl ldflags patch
..

remove debian perl ldflags patch

Change-Id: I0d2d7df23443b6194e0d8c2157dd560bf75a8f88
---
D debian/patches/perl-use-dpkg-buildflags.patch
M debian/patches/series
2 files changed, 0 insertions(+), 27 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/nginx 
refs/changes/61/320161/1

diff --git a/debian/patches/perl-use-dpkg-buildflags.patch 
b/debian/patches/perl-use-dpkg-buildflags.patch
deleted file mode 100644
index fb71fb3..000
--- a/debian/patches/perl-use-dpkg-buildflags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Use linker flags from environment for perl (dpkg-buildflags).
- Necessary for hardening flags.
-Author: Christos Trochalakis 
-diff --git a/src/http/modules/perl/Makefile.PL 
b/src/http/modules/perl/Makefile.PL
-index 7edadcb..3b6799c 100644
 a/src/http/modules/perl/Makefile.PL
-+++ b/src/http/modules/perl/Makefile.PL
-@@ -3,6 +3,7 @@
- # Copyright (C) Nginx, Inc.
- 
- use 5.006001;
-+use Config;
- use ExtUtils::MakeMaker;
- 
- WriteMakefile(
-@@ -16,7 +17,9 @@ WriteMakefile(
- CCFLAGS   => "$ENV{NGX_PM_CFLAGS}",
- OPTIMIZE  => '-O',
- 
--LDDLFLAGS => "$ENV{NGX_PM_LDFLAGS}",
-+# Pass link hardening flags
-+# $ENV{NGX_PM_LDFLAGS} is the default
-+LDDLFLAGS => "$ENV{NGX_PM_LDFLAGS} 
$ENV{DEBIAN_NGINX_PERL_LDFLAGS}",
- 
- INC   => join(" ", map {
-  m#^/# ? "-I $_" : "-I ../../../../../$_"
diff --git a/debian/patches/series b/debian/patches/series
index 8d8969e..9f0fc8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 -src-update-master.patch
-perl-use-dpkg-buildflags.patch
 0002-Make-sure-signature-stays-the-same-in-all-nginx-buil.patch
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 0100-dynamic-tls-records.patch

-- 
To view, visit https://gerrit.wikimedia.org/r/320161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d2d7df23443b6194e0d8c2157dd560bf75a8f88
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.4
Gerrit-Owner: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...nginx[wmf-1.11.4]: depend on lsb-base >= 3.0-6

2016-11-06 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320162

Change subject: depend on lsb-base >= 3.0-6
..

depend on lsb-base >= 3.0-6

Change-Id: I8917059225315a3b67f3628c28a8410e93fb6e37
---
M debian/control
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/nginx 
refs/changes/62/320162/1

diff --git a/debian/control b/debian/control
index 265a1df..4638698 100644
--- a/debian/control
+++ b/debian/control
@@ -56,7 +56,7 @@
 Package: nginx-common
 Architecture: all
 Multi-Arch: foreign
-Depends: lsb-base, ${misc:Depends}
+Depends: lsb-base (>= 3.0-6), ${misc:Depends}
 Suggests: fcgiwrap, nginx-doc, ssl-cert
 Description: small, powerful, scalable web/proxy server - common files
  Nginx ("engine X") is a high-performance web and reverse proxy server

-- 
To view, visit https://gerrit.wikimedia.org/r/320162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8917059225315a3b67f3628c28a8410e93fb6e37
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.4
Gerrit-Owner: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[wmf/1.29.0-wmf.1]: Fix monobook (missing debounce dep)

2016-11-06 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320160

Change subject: Fix monobook  (missing debounce dep)
..

Fix monobook  (missing debounce dep)

Bug: T145521
Change-Id: Ie834bc98e1ea0bd4fd592450aadcd490fa91cf6a
(cherry picked from commit 71169daa6d3194826c49dbf155cbb56862d55d2c)
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/60/320160/1

diff --git a/extension.json b/extension.json
index 34dbb5a..e505f93 100644
--- a/extension.json
+++ b/extension.json
@@ -167,6 +167,7 @@
"mediawiki.api",
"mediawiki.Uri",
"oojs-ui.styles.icons-media",
+   "jquery.throttle-debounce",
"mapbox",
"ext.kartographer.lib.topojson",
"ext.kartographer",

-- 
To view, visit https://gerrit.wikimedia.org/r/320160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie834bc98e1ea0bd4fd592450aadcd490fa91cf6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: wmf/1.29.0-wmf.1
Gerrit-Owner: Yurik 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fix monobook (missing debounce dep)

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix monobook  (missing debounce dep)
..


Fix monobook  (missing debounce dep)

Bug: T145521
Change-Id: Ie834bc98e1ea0bd4fd592450aadcd490fa91cf6a
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 34dbb5a..e505f93 100644
--- a/extension.json
+++ b/extension.json
@@ -167,6 +167,7 @@
"mediawiki.api",
"mediawiki.Uri",
"oojs-ui.styles.icons-media",
+   "jquery.throttle-debounce",
"mapbox",
"ext.kartographer.lib.topojson",
"ext.kartographer",

-- 
To view, visit https://gerrit.wikimedia.org/r/320159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie834bc98e1ea0bd4fd592450aadcd490fa91cf6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fix monobook (missing debounce dep)

2016-11-06 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320159

Change subject: Fix monobook  (missing debounce dep)
..

Fix monobook  (missing debounce dep)

Bug: T145521
Change-Id: Ie834bc98e1ea0bd4fd592450aadcd490fa91cf6a
---
M extension.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/59/320159/1

diff --git a/extension.json b/extension.json
index 34dbb5a..e505f93 100644
--- a/extension.json
+++ b/extension.json
@@ -167,6 +167,7 @@
"mediawiki.api",
"mediawiki.Uri",
"oojs-ui.styles.icons-media",
+   "jquery.throttle-debounce",
"mapbox",
"ext.kartographer.lib.topojson",
"ext.kartographer",

-- 
To view, visit https://gerrit.wikimedia.org/r/320159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie834bc98e1ea0bd4fd592450aadcd490fa91cf6a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Added Maps extension role

2016-11-06 Thread Jeroen De Dauw (Code Review)

Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320158

Change subject: Added Maps extension role
..

Added Maps extension role

Change-Id: I0db27c4544e111dffdbbfd0553573398b064582f
---
A puppet/modules/role/manifests/maps.pp
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/58/320158/1

diff --git a/puppet/modules/role/manifests/maps.pp 
b/puppet/modules/role/manifests/maps.pp
new file mode 100644
index 000..bd7e002
--- /dev/null
+++ b/puppet/modules/role/manifests/maps.pp
@@ -0,0 +1,11 @@
+# == Class: role::maps
+# Adds various mapping features to MediaWiki
+class role::maps {
+
+require ::role::mediawiki
+
+mediawiki::composer::require { 'Maps':
+package => 'mediawiki/maps',
+version => '*'
+}
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/320158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0db27c4544e111dffdbbfd0553573398b064582f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Error display for missing table in Special:CargoTables

2016-11-06 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Error display for missing table in Special:CargoTables
..


Error display for missing table in Special:CargoTables

Change-Id: I3d5e9d8661c12616348b708c901a8a43260096d4
---
M specials/CargoTables.php
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/specials/CargoTables.php b/specials/CargoTables.php
index 08b2929..05e2119 100644
--- a/specials/CargoTables.php
+++ b/specials/CargoTables.php
@@ -141,6 +141,14 @@
$this->msg( 'cargo-cargotables-tablelist' )->numParams( 
count( $tableNames ) )->parse() ) . "\n";
$text .= "\n";
foreach ( $tableNames as $tableName ) {
+   if ( !$cdb->tableExists( $tableName ) ) {
+   $tableText = "$tableName - ";
+   // @TODO - this should probably be an i18n 
message.
+   $tableText .= "Table is 
registered, but does not exist!";
+   $text .= Html::rawElement( 'li', null, 
$tableText );
+   continue;
+   }
+
$actionLinks = Html::element( 'a', array( 'href' => 
"$ctURL/$tableName", ),
$this->msg( 'view' )->text() );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/320154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3d5e9d8661c12616348b708c901a8a43260096d4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...AbuseFilter[master]: Fix the associativity of boolean logic operators

2016-11-06 Thread Victor Vasiliev (Code Review)

Victor Vasiliev has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320157

Change subject: Fix the associativity of boolean logic operators
..

Fix the associativity of boolean logic operators

Change-Id: Icaf0fde0d74064532af4b110faef4014f8303f80
---
M AbuseFilter.parser.new.php
A tests/parserTests/bool-assoc.r
A tests/parserTests/bool-assoc.t
3 files changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter 
refs/changes/57/320157/1

diff --git a/AbuseFilter.parser.new.php b/AbuseFilter.parser.new.php
index 82afcbe..af7911a 100644
--- a/AbuseFilter.parser.new.php
+++ b/AbuseFilter.parser.new.php
@@ -143,7 +143,7 @@
// Current token handled by the parser and its position.
public $mCur, $mPos;
 
-   const CACHE_VERSION = 1;
+   const CACHE_VERSION = 2;
 
/**
 * Create a new instance
@@ -415,14 +415,14 @@
protected function doLevelBoolOps() {
$leftOperand = $this->doLevelCompares();
$ops = [ '&', '|', '^' ];
-   if ( $this->mCur->type == AFPToken::TOP && in_array( 
$this->mCur->value, $ops ) ) {
+   while ( $this->mCur->type == AFPToken::TOP && in_array( 
$this->mCur->value, $ops ) ) {
$op = $this->mCur->value;
$position = $this->mPos;
$this->move();
 
-   $rightOperand = $this->doLevelBoolOps();
+   $rightOperand = $this->doLevelCompares();
 
-   return new AFPTreeNode(
+   $leftOperand = new AFPTreeNode(
AFPTreeNode::LOGIC,
[ $op, $leftOperand, $rightOperand ],
$position
diff --git a/tests/parserTests/bool-assoc.r b/tests/parserTests/bool-assoc.r
new file mode 100644
index 000..4736e08
--- /dev/null
+++ b/tests/parserTests/bool-assoc.r
@@ -0,0 +1 @@
+MATCH
diff --git a/tests/parserTests/bool-assoc.t b/tests/parserTests/bool-assoc.t
new file mode 100644
index 000..4b236bd
--- /dev/null
+++ b/tests/parserTests/bool-assoc.t
@@ -0,0 +1 @@
+!(true | false & false)

-- 
To view, visit https://gerrit.wikimedia.org/r/320157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaf0fde0d74064532af4b110faef4014f8303f80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Victor Vasiliev 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Prevent double escaping of 'usergroups' field label in Prefe...

2016-11-06 Thread Pmlineditor (Code Review)

Pmlineditor has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320156

Change subject: Prevent double escaping of 'usergroups' field label in 
Preferences
..

Prevent double escaping of 'usergroups' field label in Preferences

Replaced 'label' member of $defaultPreferences['usergroups'] with
'label-raw' to prevent double escaping of parsed message.

Bug: T142882
Change-Id: I02bb9351e49fa2cbd44fc63a9196fb4faff33434
---
M includes/Preferences.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/56/320156/1

diff --git a/includes/Preferences.php b/includes/Preferences.php
index 9f8c06b..2106bb0 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -244,7 +244,7 @@
 
$defaultPreferences['usergroups'] = [
'type' => 'info',
-   'label' => $context->msg( 'prefs-memberingroups' 
)->numParams(
+   'label-raw' => $context->msg( 'prefs-memberingroups' 
)->numParams(
count( $userGroups ) )->params( $userName 
)->parse(),
'default' => $context->msg( 'prefs-memberingroups-type' 
)
->rawParams( $lang->commaList( $userGroups ), 
$lang->commaList( $userMembers ) )

-- 
To view, visit https://gerrit.wikimedia.org/r/320156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I02bb9351e49fa2cbd44fc63a9196fb4faff33434
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Pmlineditor 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: UsageTracker: show number of open analyses

2016-11-06 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320155

Change subject: UsageTracker: show number of open analyses
..

UsageTracker: show number of open analyses

Now shows the number of analyses yet to be made. Also, as long as
analyses are open, it is not possible to trigger the re-analysis.

Change-Id: I036b55d31824383217b591626588eee272514665
---
M UsageTracker/UsageTracker.class.php
M UsageTracker/i18n/de.json
M UsageTracker/i18n/en.json
M UsageTracker/i18n/qqq.json
M UsageTracker/src/specials/SpecialUsageTracker.php
5 files changed, 46 insertions(+), 15 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/55/320155/1

diff --git a/UsageTracker/UsageTracker.class.php 
b/UsageTracker/UsageTracker.class.php
index 37e42ec..7ee9528 100644
--- a/UsageTracker/UsageTracker.class.php
+++ b/UsageTracker/UsageTracker.class.php
@@ -71,7 +71,7 @@
foreach ( $this->aCollectors as $oCollector ) {
$oCollector->registerJob();
}
-   return true;
+   return $this->aCollectors;
}
 
foreach ( $this->aCollectors as $oCollector ) {
diff --git a/UsageTracker/i18n/de.json b/UsageTracker/i18n/de.json
index ad43b21..c0543ed 100644
--- a/UsageTracker/i18n/de.json
+++ b/UsageTracker/i18n/de.json
@@ -15,5 +15,6 @@
"bs-usagetracker-col-last-updated": "Zuletzt aktualisiert",
"bs-usagetracker-caution": "Bitte beachte: Die Aktualisierung der 
Nutzungsstatistiken kann einige Zeit und Ressourcen in Anspruch nehmen. Löse 
die Aktualisierung nur aus, wenn du wirklich aktuelle Daten benötigst. Die 
Aktualisierung wird über verzögerte Aufträge ausgeführt, so dass du die Seite 
mehrere Male neu laden musst, bis die Daten vollständig gesammelt wurden.",
"bs-usagetracker-base-collector-desc": "Anzahl der Seiten, die $1 
nutzen",
-   "bs-usagetracker-tag-collector-desc": "Anzahl der Seiten, die das Tag 
<$1> nutzen"
+   "bs-usagetracker-tag-collector-desc": "Anzahl der Seiten, die das Tag 
<$1> nutzen",
+   "bs-usagetracker-open-tasks" : "Die Plattform wird gerade analysiert. 
$1 Analysen stehen noch aus. (Neu laden)"
 }
diff --git a/UsageTracker/i18n/en.json b/UsageTracker/i18n/en.json
index 3fadc35..f8af9cc 100644
--- a/UsageTracker/i18n/en.json
+++ b/UsageTracker/i18n/en.json
@@ -15,5 +15,6 @@
"bs-usagetracker-col-last-updated" : "Last updated",
"bs-usagetracker-caution" : "Be aware: Updating usage statistics may 
take some time and resources. Only trigger the update when you really, really 
need current data. The update is done via deferred jobs, so you might have to 
reload several times until the data is fully collected.",
"bs-usagetracker-base-collector-desc" : "Number of pages using $1",
-   "bs-usagetracker-tag-collector-desc" : "Number of pages using tag <$1>"
+   "bs-usagetracker-tag-collector-desc" : "Number of pages using tag <$1>",
+   "bs-usagetracker-open-tasks" : "Site analysis is currently in progress. 
$1 analyses are still open. (Refresh)"
 }
diff --git a/UsageTracker/i18n/qqq.json b/UsageTracker/i18n/qqq.json
index 1b6a26c..af936dd 100644
--- a/UsageTracker/i18n/qqq.json
+++ b/UsageTracker/i18n/qqq.json
@@ -14,5 +14,7 @@
"bs-usagetracker-col-desc": "Used in [[Special:Usage_Tracker]], label 
for description column\n{{Identical|Description}}",
"bs-usagetracker-col-count": "Used in [[Special:Usage_Tracker]], label 
for count column\n{{Identical|Count}}",
"bs-usagetracker-col-last-updated": "Used in [[Special:Usage_Tracker]], 
label for last updated column\n{{Identical|Last updated}}",
-   "bs-usagetracker-caution": "Used in [[Special:Usage_Tracker]], text to 
warn users not that the feature is resource intense"
+   "bs-usagetracker-caution": "Used in [[Special:Usage_Tracker]], text to 
warn users not that the feature is resource intense",
+   "bs-usagetracker-open-tasks" : "Used in [[Special:Usage_Tracker]], text 
to show that site analysis is currently in progress.\n\n* $1 is the number of 
open jobs."
+
 }
diff --git a/UsageTracker/src/specials/SpecialUsageTracker.php 
b/UsageTracker/src/specials/SpecialUsageTracker.php
index 05efe33..2609ba7 100644
--- a/UsageTracker/src/specials/SpecialUsageTracker.php
+++ b/UsageTracker/src/specials/SpecialUsageTracker.php
@@ -16,6 +16,8 @@
 
 class SpecialUsageTracker extends BsSpecialPage {
 
+   public $iOpenTasks = null;
+
/**
 * Constructor of SpecialUsageTracker class
 */
@@ -38,11 +40,21 @@
 
// Handle update requests (in case the user has the neccesary 
rights)
if ( $this->getUser()->isAllowed( 'usagetracker-update') ) {
-   $this->showUpdateForm();
-
if (

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: PageAssignments: Improved API performance

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: PageAssignments: Improved API performance
..


PageAssignments: Improved API performance

Now generating links on the client

Change-Id: I6798af5fa6d1f2eefe8f6cddd8fd354d7db6bd13
---
M PageAssignments/includes/api/BSApiPageAssignmentStore.php
M PageAssignments/resources/BS.PageAssignments/panel/Manager.js
2 files changed, 10 insertions(+), 2 deletions(-)

Approvals:
  Mglaser: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/PageAssignments/includes/api/BSApiPageAssignmentStore.php 
b/PageAssignments/includes/api/BSApiPageAssignmentStore.php
index 6150f43..5c23b9a 100644
--- a/PageAssignments/includes/api/BSApiPageAssignmentStore.php
+++ b/PageAssignments/includes/api/BSApiPageAssignmentStore.php
@@ -13,7 +13,6 @@
$oDataSet = (object)array(
'page_id' => $oTitle->getArticleID(),
'page_prefixedtext' => 
$oTitle->getPrefixedText(),
-   'page_link' => Linker::link( $oTitle ),
'assignments' => array()
);
 
diff --git a/PageAssignments/resources/BS.PageAssignments/panel/Manager.js 
b/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
index 320033b..3322d9f 100644
--- a/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
+++ b/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
@@ -11,7 +11,16 @@
sortable: true,
filterable:true,
renderer: function( value, metaData, record, 
rowIndex, colIndex, store, view ) {
-   return record.get('page_link');
+   var title = new mw.Title( value );
+   return mw.html.element(
+   'a',
+   {
+   'href': title.getUrl(),
+   'data-bs-title': value,
+   'target': '_blank'
+   },
+   value
+   );
}
},
{

-- 
To view, visit https://gerrit.wikimedia.org/r/320119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6798af5fa6d1f2eefe8f6cddd8fd354d7db6bd13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Error display for missing table in Special:CargoTables

2016-11-06 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320154

Change subject: Error display for missing table in Special:CargoTables
..

Error display for missing table in Special:CargoTables

Change-Id: I3d5e9d8661c12616348b708c901a8a43260096d4
---
M specials/CargoTables.php
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/54/320154/2

diff --git a/specials/CargoTables.php b/specials/CargoTables.php
index 08b2929..05e2119 100644
--- a/specials/CargoTables.php
+++ b/specials/CargoTables.php
@@ -141,6 +141,14 @@
$this->msg( 'cargo-cargotables-tablelist' )->numParams( 
count( $tableNames ) )->parse() ) . "\n";
$text .= "\n";
foreach ( $tableNames as $tableName ) {
+   if ( !$cdb->tableExists( $tableName ) ) {
+   $tableText = "$tableName - ";
+   // @TODO - this should probably be an i18n 
message.
+   $tableText .= "Table is 
registered, but does not exist!";
+   $text .= Html::rawElement( 'li', null, 
$tableText );
+   continue;
+   }
+
$actionLinks = Html::element( 'a', array( 'href' => 
"$ctURL/$tableName", ),
$this->msg( 'view' )->text() );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/320154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d5e9d8661c12616348b708c901a8a43260096d4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: (WIP) "shapred" external data support

2016-11-06 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320153

Change subject: (WIP) "shapred" external data support
..

(WIP) "shapred" external data support

Change-Id: I933fdb5de26e905e6e7fa6e3dbfd0293c9267b53
---
M i18n/en.json
M i18n/qqq.json
M includes/SimpleStyleParser.php
M schemas/geojson.json
4 files changed, 79 insertions(+), 42 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/53/320153/1

diff --git a/i18n/en.json b/i18n/en.json
index 04d61d9..9d22bf3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -28,6 +28,7 @@
"kartographer-error-bad_data": "The JSON content is not valid 
GeoJSON+simplestyle",
"kartographer-error-latlon": "Either both \"latitude\" and 
\"longitude\" parameters should be supplied or neither of them",
"kartographer-error-service-name": "Invalid cartographic service 
\"$1\"",
+   "kartographer-error-title": "Title \"$1\" is not a valid map data page",
"kartographer-tracking-category": 
"{{#switch:{{NAMESPACE}}|{{ns:File}}=Files|#default=Pages}} with maps",
"kartographer-tracking-category-desc": "The page includes a map",
"kartographer-coord-combined": "$1 $2",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index eb386fd..c55c2b3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -32,6 +32,7 @@
"kartographer-error-bad_data": "This error is shown if the content of 
the tag is syntactically valid JSON however it does not adhere to GeoJSON and 
simplestyle specifications",
"kartographer-error-latlon": "Error shown by maplink or 
mapframe when certain parameters are incorrect",
"kartographer-error-service-name": "Error shown by maplink or 
mapframe. Parameters:\n* $1 - service name.",
+   "kartographer-error-title": "Error shown by maplink or 
mapframe. Parameters:\n* $1 - page title.",
"kartographer-tracking-category": "Name of the tracking category",
"kartographer-tracking-category-desc": "Description on 
[[Special:TrackingCategories]] for the 
{{msg-mw|kartographer-tracking-category}} tracking category.",
"kartographer-coord-combined": "{{optional}}\nJoins two parts of 
geogrpahical coordinates. $1 and $2 are latitude and longitude, respectively.",
diff --git a/includes/SimpleStyleParser.php b/includes/SimpleStyleParser.php
index d773ef2..bc5a8b0 100644
--- a/includes/SimpleStyleParser.php
+++ b/includes/SimpleStyleParser.php
@@ -3,6 +3,8 @@
 namespace Kartographer;
 
 use FormatJson;
+use JsonConfig\JCMapDataContent;
+use JsonConfig\JCSingleton;
 use JsonSchema\Validator;
 use MediaWiki\MediaWikiServices;
 use Parser;
@@ -15,8 +17,6 @@
  */
 class SimpleStyleParser {
private static $parsedProps = [ 'title', 'description' ];
-
-   private static $services = [ 'geoshape', 'geoline', 'geomask' ];
 
/** @var Parser */
private $parser;
@@ -204,38 +204,59 @@
 * @return Status
 */
private function normalizeExternalData( &$object ) {
-   if ( !in_array( $object->service, self::$services ) ) {
-   return Status::newFatal( 
'kartographer-error-service-name', $object->service );
-   }
 
$ret = (object)[
'type' => 'ExternalData',
'service' => $object->service,
];
 
-   $query = [
-   'getgeojson' => 1
-   ];
+   switch ( $object->service ) {
+   default:
+   return Status::newFatal( 
'kartographer-error-service-name', $object->service );
 
-   if ( property_exists( $object, 'ids' ) ) {
-   $query['ids'] = is_array( $object->ids )
-   ? join( ',', $object->ids )
-   : preg_replace( '/\s*,\s*/', ',', $object->ids 
);
-   }
-   if ( property_exists( $object, 'query' ) ) {
-   $query['query'] = $object->query;
-   }
+   case 'geoshape':
+   case 'geoline':
+   case 'geomask':
+   $query = [ 'getgeojson' => 1 ];
+   if ( property_exists( $object, 'ids' ) ) {
+   $query['ids'] =
+   is_array( $object->ids ) ? 
join( ',', $object->ids )
+   : preg_replace( 
'/\s*,\s*/', ',', $object->ids );
+   }
+   if ( property_exists( $object, 'query' ) ) {
+   $query['query'] = $object->query;
+   }
+   // 'geomask' service is the same as inverted 
geoshape

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Made table deletion somewhat more robust

2016-11-06 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Made table deletion somewhat more robust
..


Made table deletion somewhat more robust

Change-Id: Icfe3407dbfa070a2a10f895003477ffc6eddb553
---
M CargoUtils.php
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/CargoUtils.php b/CargoUtils.php
index d89ec95..b5282cf 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -404,6 +404,10 @@
}
$tableSchema = CargoTableSchema::newFromDBString( 
$tableSchemaString );
 
+   if ( $tableName == null ) {
+   $tableName = self::getPageProp( $templatePageID, 
'CargoTableName' );
+   }
+
$dbw = wfGetDB( DB_MASTER );
$cdb = self::getDB();
 
@@ -430,10 +434,6 @@
}
 
$dbw->delete( 'cargo_tables', array( 'template_id' => 
$templatePageID ) );
-
-   if ( $tableName == null ) {
-   $tableName = self::getPageProp( $templatePageID, 
'CargoTableName' );
-   }
 
self::createCargoTableOrTables( $cdb, $dbw, $tableName, 
$tableSchema, $tableSchemaString, $templatePageID );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/320152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icfe3407dbfa070a2a10f895003477ffc6eddb553
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Made table deletion somewhat more robust

2016-11-06 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320152

Change subject: Made table deletion somewhat more robust
..

Made table deletion somewhat more robust

Change-Id: Icfe3407dbfa070a2a10f895003477ffc6eddb553
---
M CargoUtils.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo 
refs/changes/52/320152/2

diff --git a/CargoUtils.php b/CargoUtils.php
index d89ec95..b5282cf 100644
--- a/CargoUtils.php
+++ b/CargoUtils.php
@@ -404,6 +404,10 @@
}
$tableSchema = CargoTableSchema::newFromDBString( 
$tableSchemaString );
 
+   if ( $tableName == null ) {
+   $tableName = self::getPageProp( $templatePageID, 
'CargoTableName' );
+   }
+
$dbw = wfGetDB( DB_MASTER );
$cdb = self::getDB();
 
@@ -430,10 +434,6 @@
}
 
$dbw->delete( 'cargo_tables', array( 'template_id' => 
$templatePageID ) );
-
-   if ( $tableName == null ) {
-   $tableName = self::getPageProp( $templatePageID, 
'CargoTableName' );
-   }
 
self::createCargoTableOrTables( $cdb, $dbw, $tableName, 
$tableSchema, $tableSchemaString, $templatePageID );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/320152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfe3407dbfa070a2a10f895003477ffc6eddb553
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Kartographer[master]: Fixed marker-size simplestyle json schema

2016-11-06 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320151

Change subject: Fixed marker-size simplestyle json schema
..

Fixed marker-size simplestyle json schema

Change-Id: I4c217b903f0d2b01adce0eb93de12dd2fac82c2d
---
M schemas/geojson.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/51/320151/1

diff --git a/schemas/geojson.json b/schemas/geojson.json
index b8db853..e750152 100644
--- a/schemas/geojson.json
+++ b/schemas/geojson.json
@@ -258,7 +258,7 @@
"properties": {
"title": { "type": "string" },
"description": { "type": "string" },
-   "marker-size": { "type": { "enum": ["small", 
"medium", "large"] } },
+   "marker-size": { "enum": ["small", "medium", 
"large"] },
"marker-symbol": { "type": "string", "pattern": 
"^(|[0-9]|[a-z-]+)$" },
"marker-color": { "$ref": "#/definitions/color" 
},
"stroke": { "$ref": "#/definitions/color" },

-- 
To view, visit https://gerrit.wikimedia.org/r/320151
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c217b903f0d2b01adce0eb93de12dd2fac82c2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: AVoid stating the ReCaptcha box is below, might be anywhere

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: AVoid stating the ReCaptcha box is below, might be anywhere
..


AVoid stating the ReCaptcha box is below, might be anywhere

Bug: T137692
Change-Id: I643dd7882c2202faaffd3c0fb167871f2697e6f9
---
M ReCaptcha/i18n/en.json
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ReCaptcha/i18n/en.json b/ReCaptcha/i18n/en.json
index 62d0587..c600bc6 100644
--- a/ReCaptcha/i18n/en.json
+++ b/ReCaptcha/i18n/en.json
@@ -3,12 +3,12 @@
"authors": []
},
"recaptcha-desc": "reCAPTCHA module for Confirm Edit",
-   "recaptcha-edit": "To protect the wiki against automated edit spam, we 
kindly ask you to type the words you see in the box below:",
-   "recaptcha-addurl": "Your edit includes new external links. To protect 
the wiki against automated spam, we kindly ask you to type the words you see in 
the box below:",
-   "recaptcha-badlogin": "To protect the wiki against automated password 
cracking, we kindly ask you to type the words you see in the box below:",
-   "recaptcha-createaccount": "To protect the wiki against automated 
account creation, we kindly ask you to type the words you see in the box 
below:",
+   "recaptcha-edit": "To protect the wiki against automated edit spam, we 
kindly ask you to type the words you see in the box.",
+   "recaptcha-addurl": "Your edit includes new external links. To protect 
the wiki against automated spam, we kindly ask you to type the words you see in 
the box.",
+   "recaptcha-badlogin": "To protect the wiki against automated password 
cracking, we kindly ask you to type the words you see in the box.",
+   "recaptcha-createaccount": "To protect the wiki against automated 
account creation, we kindly ask you to type the words you see in the box.",
"recaptcha-createaccount-fail": "Incorrect or missing reCAPTCHA 
answer.",
-   "recaptcha-create": "To protect the wiki against automated page 
creation, we kindly ask you to type the words you see in the box below:",
+   "recaptcha-create": "To protect the wiki against automated page 
creation, we kindly ask you to type the words you see in the box.",
"recaptcha-info": "Please solve a ReCaptcha challenge and return the 
challenge and response values as captchaId and captchaWord.",
"recaptcha-apihelp-param-recaptcha_challenge_field": "Field from the 
ReCaptcha widget",
"recaptcha-apihelp-param-recaptcha_response_field": "Field from the 
ReCaptcha widget",

-- 
To view, visit https://gerrit.wikimedia.org/r/320117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I643dd7882c2202faaffd3c0fb167871f2697e6f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 
Gerrit-Reviewer: Florianschmidtwelzow 
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] mediawiki...Citoid[master]: Close inspector after re-using a reference

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Close inspector after re-using a reference
..


Close inspector after re-using a reference

Change-Id: I663f5e89bab6194da9352f29fc6b681dbbe5495f
---
M modules/ve.ui.CiteFromIdInspector.js
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Mvolz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve.ui.CiteFromIdInspector.js 
b/modules/ve.ui.CiteFromIdInspector.js
index aa8f60a..72dac36 100644
--- a/modules/ve.ui.CiteFromIdInspector.js
+++ b/modules/ve.ui.CiteFromIdInspector.js
@@ -329,6 +329,8 @@
 
ref.insertReferenceNode( this.getFragment() );
this.getFragment().getSurface().applyStaging();
+
+   this.close();
 };
 
 /**

-- 
To view, visit https://gerrit.wikimedia.org/r/320009
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I663f5e89bab6194da9352f29fc6b681dbbe5495f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Citoid
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Mvolz 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] oojs/ui[master]: demo: Remove deprecated TextInputWidget (type=search)

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: demo: Remove deprecated TextInputWidget (type=search)
..


demo: Remove deprecated TextInputWidget (type=search)

Following-up I3d60fb5bea40e – removing deprecated
TextInputWidget (type=search) from demo and changing it slightly
to emphasize distinct usage of SearchInputWidget.

Change-Id: I935c89bb44dba8fdf23cd786dc2821c46207a844
---
M demos/pages/widgets.js
M demos/pages/widgets.php
2 files changed, 8 insertions(+), 15 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index e5efd51..70e15ea 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -909,7 +909,7 @@
}
),
new OO.ui.FieldLayout(
-   new OO.ui.TextInputWidget( { icon: 
'search' } ),
+   new OO.ui.TextInputWidget( { icon: 
'help' } ),
{
label: 'TextInputWidget 
(icon)\u200E',
align: 'top'
@@ -961,16 +961,19 @@
}
),
new OO.ui.FieldLayout(
-   new OO.ui.TextInputWidget( { type: 
'search' } ),
+   new OO.ui.TextInputWidget( {
+   value: 'Disabled',
+   disabled: true
+   } ),
{
-   label: 'TextInputWidget 
(type=search)\u200E',
+   label: 'TextInputWidget 
(disabled)\u200E',
align: 'top'
}
),
new OO.ui.FieldLayout(
new OO.ui.SearchInputWidget(),
{
-   label: 
'SearchInputWidget\u200E',
+   label: 'SearchInputWidget 
(type=search)\u200E',
align: 'top'
}
),
@@ -985,16 +988,6 @@
new OO.ui.SearchInputWidget( { 
disabled: true, value: 'test' } ),
{
label: 'SearchInputWidget 
(disabled, filled)\u200E',
-   align: 'top'
-   }
-   ),
-   new OO.ui.FieldLayout(
-   new OO.ui.TextInputWidget( {
-   value: 'Disabled',
-   disabled: true
-   } ),
-   {
-   label: 'TextInputWidget 
(disabled)\u200E',
align: 'top'
}
),
diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php
index 10584d4..3ceea2b 100644
--- a/demos/pages/widgets.php
+++ b/demos/pages/widgets.php
@@ -481,7 +481,7 @@
]
),
new OOUI\FieldLayout(
-   new OOUI\TextInputWidget( [ 'icon' => 'search' ] ),
+   new OOUI\TextInputWidget( [ 'icon' => 'help' ] ),
[
'label' => "TextInputWidget (icon)\xE2\x80\x8E",
'align' => 'top'

-- 
To view, visit https://gerrit.wikimedia.org/r/320015
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I935c89bb44dba8fdf23cd786dc2821c46207a844
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: PageAssignments: Improved API performance

2016-11-06 Thread Robert Vogel (Code Review)

Robert Vogel has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320119

Change subject: PageAssignments: Improved API performance
..

PageAssignments: Improved API performance

Now generating links on the client

Change-Id: I6798af5fa6d1f2eefe8f6cddd8fd354d7db6bd13
---
M PageAssignments/includes/api/BSApiPageAssignmentStore.php
M PageAssignments/resources/BS.PageAssignments/panel/Manager.js
2 files changed, 10 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/19/320119/1

diff --git a/PageAssignments/includes/api/BSApiPageAssignmentStore.php 
b/PageAssignments/includes/api/BSApiPageAssignmentStore.php
index 6150f43..5c23b9a 100644
--- a/PageAssignments/includes/api/BSApiPageAssignmentStore.php
+++ b/PageAssignments/includes/api/BSApiPageAssignmentStore.php
@@ -13,7 +13,6 @@
$oDataSet = (object)array(
'page_id' => $oTitle->getArticleID(),
'page_prefixedtext' => 
$oTitle->getPrefixedText(),
-   'page_link' => Linker::link( $oTitle ),
'assignments' => array()
);
 
diff --git a/PageAssignments/resources/BS.PageAssignments/panel/Manager.js 
b/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
index 320033b..3322d9f 100644
--- a/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
+++ b/PageAssignments/resources/BS.PageAssignments/panel/Manager.js
@@ -11,7 +11,16 @@
sortable: true,
filterable:true,
renderer: function( value, metaData, record, 
rowIndex, colIndex, store, view ) {
-   return record.get('page_link');
+   var title = new mw.Title( value );
+   return mw.html.element(
+   'a',
+   {
+   'href': title.getUrl(),
+   'data-bs-title': value,
+   'target': '_blank'
+   },
+   value
+   );
}
},
{

-- 
To view, visit https://gerrit.wikimedia.org/r/320119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6798af5fa6d1f2eefe8f6cddd8fd354d7db6bd13
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] translatewiki[master]: Full key for ignored message in heritage.yaml

2016-11-06 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320118

Change subject: Full key for ignored message in heritage.yaml
..

Full key for ignored message in heritage.yaml

Per 063bf8ec6c47f6b59554647c72b1631000e2a29b

Bug: T137951
Change-Id: I01992eda57a70e7d0d446c4654b4b74de911302e
---
M groups/Intuition/heritage.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/18/320118/1

diff --git a/groups/Intuition/heritage.yaml b/groups/Intuition/heritage.yaml
index 6c88bce..e02d997 100644
--- a/groups/Intuition/heritage.yaml
+++ b/groups/Intuition/heritage.yaml
@@ -17,4 +17,4 @@
 
 TAGS:
   ignored:
-- title
+- monumentsapi-title

-- 
To view, visit https://gerrit.wikimedia.org/r/320118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I01992eda57a70e7d0d446c4654b4b74de911302e
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...ConfirmEdit[master]: AVoid stating the ReCaptcha box is below, might be anywhere

2016-11-06 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320117

Change subject: AVoid stating the ReCaptcha box is below, might be anywhere
..

AVoid stating the ReCaptcha box is below, might be anywhere

Bug: T137692
Change-Id: I643dd7882c2202faaffd3c0fb167871f2697e6f9
---
M ReCaptcha/i18n/en.json
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmEdit 
refs/changes/17/320117/1

diff --git a/ReCaptcha/i18n/en.json b/ReCaptcha/i18n/en.json
index 62d0587..c600bc6 100644
--- a/ReCaptcha/i18n/en.json
+++ b/ReCaptcha/i18n/en.json
@@ -3,12 +3,12 @@
"authors": []
},
"recaptcha-desc": "reCAPTCHA module for Confirm Edit",
-   "recaptcha-edit": "To protect the wiki against automated edit spam, we 
kindly ask you to type the words you see in the box below:",
-   "recaptcha-addurl": "Your edit includes new external links. To protect 
the wiki against automated spam, we kindly ask you to type the words you see in 
the box below:",
-   "recaptcha-badlogin": "To protect the wiki against automated password 
cracking, we kindly ask you to type the words you see in the box below:",
-   "recaptcha-createaccount": "To protect the wiki against automated 
account creation, we kindly ask you to type the words you see in the box 
below:",
+   "recaptcha-edit": "To protect the wiki against automated edit spam, we 
kindly ask you to type the words you see in the box.",
+   "recaptcha-addurl": "Your edit includes new external links. To protect 
the wiki against automated spam, we kindly ask you to type the words you see in 
the box.",
+   "recaptcha-badlogin": "To protect the wiki against automated password 
cracking, we kindly ask you to type the words you see in the box.",
+   "recaptcha-createaccount": "To protect the wiki against automated 
account creation, we kindly ask you to type the words you see in the box.",
"recaptcha-createaccount-fail": "Incorrect or missing reCAPTCHA 
answer.",
-   "recaptcha-create": "To protect the wiki against automated page 
creation, we kindly ask you to type the words you see in the box below:",
+   "recaptcha-create": "To protect the wiki against automated page 
creation, we kindly ask you to type the words you see in the box.",
"recaptcha-info": "Please solve a ReCaptcha challenge and return the 
challenge and response values as captchaId and captchaWord.",
"recaptcha-apihelp-param-recaptcha_challenge_field": "Field from the 
ReCaptcha widget",
"recaptcha-apihelp-param-recaptcha_response_field": "Field from the 
ReCaptcha widget",

-- 
To view, visit https://gerrit.wikimedia.org/r/320117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I643dd7882c2202faaffd3c0fb167871f2697e6f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Remove redundant "below" from authmanager-create-from-login

2016-11-06 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320116

Change subject: Remove redundant "below" from authmanager-create-from-login
..

Remove redundant "below" from authmanager-create-from-login

System messages should not hardcode references to specific positions
of the interface elements, especially when such specifications do not
help understanding.

Bug: T137690
Change-Id: I306efc768bf20f6b4aa03cbca42f0cdf084b9a31
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/16/320116/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 8ac4089..42cbe51 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -4165,7 +4165,7 @@
"authmanager-authn-autocreate-failed": "Auto-creation of a local 
account failed: $1",
"authmanager-change-not-supported": "The supplied credentials cannot be 
changed, as nothing would use them.",
"authmanager-create-disabled": "Account creation is disabled.",
-   "authmanager-create-from-login": "To create your account, please fill 
in the fields below.",
+   "authmanager-create-from-login": "To create your account, please fill 
in the fields.",
"authmanager-create-not-in-progress": "Account creation is not in 
progress or session data has been lost. Please start again from the beginning.",
"authmanager-create-no-primary": "The supplied credentials could not be 
used for account creation.",
"authmanager-link-no-primary": "The supplied credentials could not be 
used for account linking.",

-- 
To view, visit https://gerrit.wikimedia.org/r/320116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I306efc768bf20f6b4aa03cbca42f0cdf084b9a31
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...nginx[wmf-1.11.4]: remove stapling_proxy patch

2016-11-06 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320113

Change subject: remove stapling_proxy patch
..

remove stapling_proxy patch

Change-Id: I9ae09c5f1c740dac5ca314a863aec03044d0e3d9
---
M debian/patches/series
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/nginx 
refs/changes/13/320113/1

diff --git a/debian/patches/series b/debian/patches/series
index 0f054cd..91e58f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,5 @@
 0003-define_gnu_source-on-other-glibc-based-platforms.patch
 0100-dynamic-tls-records.patch
 0500-ssl-curve.patch
-0600-stapling-proxy.patch
 0660-version-too-low.patch
 -no-readahead.patch

-- 
To view, visit https://gerrit.wikimedia.org/r/320113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ae09c5f1c740dac5ca314a863aec03044d0e3d9
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.4
Gerrit-Owner: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...nginx[wmf-1.11.4]: add stapling-multi-file patch

2016-11-06 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320115

Change subject: add stapling-multi-file patch
..

add stapling-multi-file patch

Change-Id: Ie076b36732d3147262a5054bd8f2714179e34248
---
A debian/patches/0600-stapling-multi-file.patch
M debian/patches/series
2 files changed, 341 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/nginx 
refs/changes/15/320115/1

diff --git a/debian/patches/0600-stapling-multi-file.patch 
b/debian/patches/0600-stapling-multi-file.patch
new file mode 100644
index 000..63c02e4
--- /dev/null
+++ b/debian/patches/0600-stapling-multi-file.patch
@@ -0,0 +1,340 @@
+diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c
+index 464917c..8f2295f 100644
+--- a/src/event/ngx_event_openssl.c
 b/src/event/ngx_event_openssl.c
+@@ -322,30 +322,39 @@ ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, 
void *data)
+ 
+ ngx_int_t
+ ngx_ssl_certificates(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_array_t *certs,
+-ngx_array_t *keys, ngx_array_t *passwords)
++ngx_array_t *keys, ngx_array_t *passwords, ngx_flag_t stapling,
++ngx_array_t *stapling_files, ngx_str_t *stapling_responder,
++ngx_uint_t stapling_verify)
+ {
+-ngx_str_t   *cert, *key;
++ngx_str_t   *cert, *key, *staple_file;
+ ngx_uint_t   i;
+ 
+ cert = certs->elts;
+ key = keys->elts;
++staple_file = stapling_files ? stapling_files->elts : NULL;
+ 
+ for (i = 0; i < certs->nelts; i++) {
+-
+-if (ngx_ssl_certificate(cf, ssl, [i], [i], passwords)
+-!= NGX_OK)
++if (ngx_ssl_certificate(cf, ssl, [i], [i], passwords,
++stapling, staple_file ? _file[i] : 
NULL,
++stapling_responder, stapling_verify) != 
NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+ }
+ 
++if (stapling) {
++SSL_CTX_set_tlsext_status_cb(ssl->ctx,
++ ngx_ssl_certificate_status_callback);
++}
++
+ return NGX_OK;
+ }
+ 
+-
+ ngx_int_t
+ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *cert,
+-ngx_str_t *key, ngx_array_t *passwords)
++ngx_str_t *key, ngx_array_t *passwords, ngx_flag_t stapling,
++ngx_str_t* staple_file, ngx_str_t* stapling_responder,
++ngx_uint_t stapling_verify)
+ {
+ BIO *bio;
+ X509*x509;
+@@ -560,6 +569,15 @@ ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl, 
ngx_str_t *cert,
+ return NGX_ERROR;
+ }
+ 
++if (stapling) {
++if (ngx_ssl_stapling_certificate(cf, ssl, x509, staple_file,
++ stapling_responder, stapling_verify)
++!= NGX_OK)
++{
++return NGX_ERROR;
++}
++}
++
+ SSL_CTX_set_default_passwd_cb(ssl->ctx, NULL);
+ 
+ return NGX_OK;
+diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h
+index 5df90e0..354b2d2 100644
+--- a/src/event/ngx_event_openssl.h
 b/src/event/ngx_event_openssl.h
+@@ -154,9 +154,13 @@ typedef struct {
+ ngx_int_t ngx_ssl_init(ngx_log_t *log);
+ ngx_int_t ngx_ssl_create(ngx_ssl_t *ssl, ngx_uint_t protocols, void *data);
+ ngx_int_t ngx_ssl_certificates(ngx_conf_t *cf, ngx_ssl_t *ssl,
+-ngx_array_t *certs, ngx_array_t *keys, ngx_array_t *passwords);
++ngx_array_t *certs, ngx_array_t *keys, ngx_array_t *passwords,
++ngx_flag_t stapling, ngx_array_t *stapling_files,
++ngx_str_t *stapling_responder, ngx_uint_t stapling_verify);
+ ngx_int_t ngx_ssl_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
+-ngx_str_t *cert, ngx_str_t *key, ngx_array_t *passwords);
++ngx_str_t *cert, ngx_str_t *key, ngx_array_t *passwords,
++ngx_flag_t stapling, ngx_str_t* staple_file,
++ngx_str_t* stapling_responder, ngx_uint_t stapling_verify);
+ ngx_int_t ngx_ssl_ciphers(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *ciphers,
+ ngx_uint_t prefer_server_ciphers);
+ ngx_int_t ngx_ssl_client_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
+@@ -164,10 +168,12 @@ ngx_int_t ngx_ssl_client_certificate(ngx_conf_t *cf, 
ngx_ssl_t *ssl,
+ ngx_int_t ngx_ssl_trusted_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
+ ngx_str_t *cert, ngx_int_t depth);
+ ngx_int_t ngx_ssl_crl(ngx_conf_t *cf, ngx_ssl_t *ssl, ngx_str_t *crl);
+-ngx_int_t ngx_ssl_stapling(ngx_conf_t *cf, ngx_ssl_t *ssl,
+-ngx_str_t *file, ngx_str_t *responder, ngx_uint_t verify);
++ngx_int_t ngx_ssl_stapling_certificate(ngx_conf_t *cf, ngx_ssl_t *ssl,
++X509 *cert, ngx_str_t *file, ngx_str_t *responder, ngx_uint_t verify);
+ ngx_int_t ngx_ssl_stapling_resolver(ngx_conf_t *cf, ngx_ssl_t *ssl,
+ ngx_resolver_t *resolver, ngx_msec_t resolver_timeout);
++int ngx_ssl_certificate_status_callback(ngx_ssl_conn_t *ssl_conn,
++void *data);
+ RSA *ngx_ssl_rsa512_key_callback(ngx_ssl_conn_t *ssl_conn, int

[MediaWiki-commits] [Gerrit] operations...nginx[wmf-1.11.4]: remove readahead patch

2016-11-06 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320114

Change subject: remove readahead patch
..

remove readahead patch

Change-Id: If4531c762244f6f1c2deb33e973e72de414cf2a5
---
M debian/patches/series
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/nginx 
refs/changes/14/320114/1

diff --git a/debian/patches/series b/debian/patches/series
index 91e58f0..af6103d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
 0100-dynamic-tls-records.patch
 0500-ssl-curve.patch
 0660-version-too-low.patch
--no-readahead.patch

-- 
To view, visit https://gerrit.wikimedia.org/r/320114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If4531c762244f6f1c2deb33e973e72de414cf2a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.4
Gerrit-Owner: BBlack 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for helper forms when SMW not installed

2016-11-06 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Fix for helper forms when SMW not installed
..


Fix for helper forms when SMW not installed

Change-Id: I74a8e216ed849dd7225bab6722de96af14421193
---
M includes/PF_HelperFormAction.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/PF_HelperFormAction.php b/includes/PF_HelperFormAction.php
index e2087f5..60c99be 100644
--- a/includes/PF_HelperFormAction.php
+++ b/includes/PF_HelperFormAction.php
@@ -139,7 +139,7 @@
 */
static function displayForm( $action, $article ) {
$title = $article->getTitle();
-   if ( $title->getNamespace() == SMW_NS_PROPERTY ) {
+   if ( defined( 'SMW_NS_PROPERTY' ) && $title->getNamespace() == 
SMW_NS_PROPERTY ) {
$createPropertyPage = new PFCreateProperty();
$createPropertyPage->execute( $title->getText() );
} elseif ( $title->getNamespace() == NS_TEMPLATE ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/320111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I74a8e216ed849dd7225bab6722de96af14421193
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for helper forms when SMW not installed

2016-11-06 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320111

Change subject: Fix for helper forms when SMW not installed
..

Fix for helper forms when SMW not installed

Change-Id: I74a8e216ed849dd7225bab6722de96af14421193
---
M includes/PF_HelperFormAction.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/11/320111/2

diff --git a/includes/PF_HelperFormAction.php b/includes/PF_HelperFormAction.php
index e2087f5..60c99be 100644
--- a/includes/PF_HelperFormAction.php
+++ b/includes/PF_HelperFormAction.php
@@ -139,7 +139,7 @@
 */
static function displayForm( $action, $article ) {
$title = $article->getTitle();
-   if ( $title->getNamespace() == SMW_NS_PROPERTY ) {
+   if ( defined( 'SMW_NS_PROPERTY' ) && $title->getNamespace() == 
SMW_NS_PROPERTY ) {
$createPropertyPage = new PFCreateProperty();
$createPropertyPage->execute( $title->getText() );
} elseif ( $title->getNamespace() == NS_TEMPLATE ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/320111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I74a8e216ed849dd7225bab6722de96af14421193
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Clarify "while blocked" where something else could be "block...

2016-11-06 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320112

Change subject: Clarify "while blocked" where something else could be "blocked" 
too
..

Clarify "while blocked" where something else could be "blocked" too

In some sentences more than others, it's not clear to everyone that
the adjective refers to "you".

Bug: T135431
Change-Id: I62f7bf9f3b1a8e3b88560507b74df69c462962bb
---
M languages/i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/12/320112/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 8ac4089..ab213c7 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3702,7 +3702,7 @@
"tags-deactivate": "deactivate",
"tags-hitcount": "$1 {{PLURAL:$1|change|changes}}",
"tags-manage-no-permission": "You do not have permission to manage 
change tags.",
-   "tags-manage-blocked": "You cannot manage change tags while blocked.",
+   "tags-manage-blocked": "You cannot manage change tags while you are 
blocked.",
"tags-create-heading": "Create a new tag",
"tags-create-explanation": "By default, newly created tags will be made 
available for use by users and bots.",
"tags-create-tag-name": "Tag name:",
@@ -3738,11 +3738,11 @@
"tags-deactivate-not-allowed": "It is not possible to deactivate the 
tag \"$1\".",
"tags-deactivate-submit": "Deactivate",
"tags-apply-no-permission": "You do not have permission to apply change 
tags along with your changes.",
-   "tags-apply-blocked": "You cannot apply change tags along with your 
changes while blocked.",
+   "tags-apply-blocked": "You cannot apply change tags along with your 
changes while you are blocked.",
"tags-apply-not-allowed-one": "The tag \"$1\" is not allowed to be 
manually applied.",
"tags-apply-not-allowed-multi": "The following {{PLURAL:$2|tag is|tags 
are}} not allowed to be manually applied: $1",
"tags-update-no-permission": "You do not have permission to add or 
remove change tags from individual revisions or log entries.",
-   "tags-update-blocked": "You cannot add or remove change tags while 
blocked.",
+   "tags-update-blocked": "You cannot add or remove change tags while you 
are blocked.",
"tags-update-add-not-allowed-one": "The tag \"$1\" is not allowed to be 
manually added.",
"tags-update-add-not-allowed-multi": "The following {{PLURAL:$2|tag 
is|tags are}} not allowed to be manually added: $1",
"tags-update-remove-not-allowed-one": "The tag \"$1\" is not allowed to 
be removed.",

-- 
To view, visit https://gerrit.wikimedia.org/r/320112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62f7bf9f3b1a8e3b88560507b74df69c462962bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Rewording BotPasswords message to reflect what "grant" reall...

2016-11-06 Thread Huji (Code Review)

Huji has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320110

Change subject: Rewording BotPasswords message to reflect what "grant" really 
does
..

Rewording BotPasswords message to reflect what "grant" really does

Bug: T150080
Change-Id: Ie2ba9cc0638ab44966cf31f83dbf90036234c0e7
---
M languages/i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/10/320110/1

diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 8ac4089..b7db77d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -564,7 +564,7 @@
"botpasswords-label-delete": "Delete",
"botpasswords-label-resetpassword": "Reset the password",
"botpasswords-label-grants": "Applicable grants:",
-   "botpasswords-help-grants": "Each grant gives access to listed user 
rights that a user account already has. See the [[Special:ListGrants|table of 
grants]] for more information.",
+   "botpasswords-help-grants": "Grants can only allow a access to rights 
already held to the user account. Enabling a grant here does not provide new 
access to the user account. All rights must be earned through normal procedures 
which vary by wiki. See the [[Special:ListGrants|table of grants]] for more 
information.",
"botpasswords-label-grants-column": "Granted",
"botpasswords-bad-appid": "The bot name \"$1\" is not valid.",
"botpasswords-insert-failed": "Failed to add bot name \"$1\". Was it 
already added?",

-- 
To view, visit https://gerrit.wikimedia.org/r/320110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2ba9cc0638ab44966cf31f83dbf90036234c0e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Huji 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for "label=" with single-instance templates

2016-11-06 Thread Yaron Koren (Code Review)

Yaron Koren has submitted this change and it was merged.

Change subject: Fix for "label=" with single-instance templates
..


Fix for "label=" with single-instance templates

Change-Id: I715194edc51090b849424db50efba8951c4fa89d
---
M includes/PF_FormPrinter.php
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Yaron Koren: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index 55bc85c..c304096 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -1415,6 +1415,8 @@
}
} elseif ( $tif && $tif->getDisplay() == 'table' ) {
$form_text .= $this->tableHTML( $tif, 0 );
+   } elseif ( $tif && !$tif->allowsMultiple() && 
$tif->getLabel() != null ) {
+   $form_text .= $section . "\n";
} else {
$form_text .= $section;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/320109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I715194edc51090b849424db50efba8951c4fa89d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for "label=" with single-instance templates

2016-11-06 Thread Yaron Koren (Code Review)

Yaron Koren has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320109

Change subject: Fix for "label=" with single-instance templates
..

Fix for "label=" with single-instance templates

Change-Id: I715194edc51090b849424db50efba8951c4fa89d
---
M includes/PF_FormPrinter.php
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms 
refs/changes/09/320109/2

diff --git a/includes/PF_FormPrinter.php b/includes/PF_FormPrinter.php
index 55bc85c..c304096 100644
--- a/includes/PF_FormPrinter.php
+++ b/includes/PF_FormPrinter.php
@@ -1415,6 +1415,8 @@
}
} elseif ( $tif && $tif->getDisplay() == 'table' ) {
$form_text .= $this->tableHTML( $tif, 0 );
+   } elseif ( $tif && !$tif->allowsMultiple() && 
$tif->getLabel() != null ) {
+   $form_text .= $section . "\n";
} else {
$form_text .= $section;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/320109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I715194edc51090b849424db50efba8951c4fa89d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Adding myself as an author to Newsletter extension

2016-11-06 Thread 01tonythomas (Code Review)

01tonythomas has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320108

Change subject: Adding myself as an author to Newsletter extension
..

Adding myself as an author to Newsletter extension

Time to be responsible for all the havoc due to ContentHandler
migration

Change-Id: I8392cbfe4e203757d75040ce06639c394f0806d1
---
M extension.json
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/08/320108/1

diff --git a/extension.json b/extension.json
index 6876d65..4c7e503 100644
--- a/extension.json
+++ b/extension.json
@@ -3,7 +3,8 @@
"version": "1.2.0",
"author": [
"Siebrand Mazeland",
-   "Tina Johnson"
+   "Tina Johnson",
+   "Tony Thomas"
],
"url": "https://www.mediawiki.org/wiki/Extension:Newsletter;,
"descriptionmsg": "newsletter-extension-desc",

-- 
To view, visit https://gerrit.wikimedia.org/r/320108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8392cbfe4e203757d75040ce06639c394f0806d1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Theme[master]: Actually describe the functionality in theme-desc

2016-11-06 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320107

Change subject: Actually describe the functionality in theme-desc
..

Actually describe the functionality in theme-desc

Bug: T136291
Change-Id: I1c52d547545abcbdd2a6769d178ff99889f2d067
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Theme 
refs/changes/07/320107/1

diff --git a/i18n/en.json b/i18n/en.json
index fbebbfe..95ea532 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3,5 +3,5 @@
"authors": []
},
"theme-extensionname": "Theme",
-   "theme-desc": "Theme loader extension for skins"
+   "theme-desc": "Controls the installation of CSS variants of the wiki's 
skins"
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/320107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c52d547545abcbdd2a6769d178ff99889f2d067
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Theme
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Html2Wiki[master]: Make html2wiki-summary an actual summary

2016-11-06 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320106

Change subject: Make html2wiki-summary an actual summary
..

Make html2wiki-summary an actual summary

Bug: T136288
Change-Id: I9328aaa90c59593abcede854d26de2c3197a0c0c
---
M i18n/en.json
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Html2Wiki 
refs/changes/06/320106/1

diff --git a/i18n/en.json b/i18n/en.json
index a796bc6..e5f1840 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -10,7 +10,7 @@
"html2wiki-desc": "Import HTML content into your wiki",
"html2wiki-dry-run": "Dry run:",
"html2wiki-dry-run-heading": "Preview only! Contents were not saved:",
-   "html2wiki-summary": "Description appearing on top of 
[[Special:Html2Wiki]] - but it's not.",
+   "html2wiki-summary": "Import HTML pages into the wiki",
"html2wiki-importbtn": "Import",
"html2wiki-intro": "Use this form to import HTML content into your 
wiki.\n\nIf you upload a zip file, the Collection Name field is used to 
differentiate the collection from a later version. Also all files will be 
grouped in a category by the same name. For example, let's say you're importing 
a collection of HTML files output from your software documentation system, you 
would enter a unique Collection ID like 'FluxCapacitor-v1.1' so that the whole 
collection is imported into an article hierarchy starting with 
'FluxCapacitor-v1.1'. This way 10 different collections can be imported without 
clobbering each other.\n\nSpecifying an existing Collection Name (or parent 
path) will update existing wiki content.\n\nIf you want to import a single file 
into an existing article hierarchy, simply specify it's 'parent' as the 
Collection Name.\n\nFor example, if importing a new 'advanced_topics.html' that 
should exist at 'FluxCapacitor-v1.1/docs/advanced_topics.html', 
the parent would be 'FluxCapacitor-v1.1/docs/'",
"html2wiki-title": "Import HTML",
@@ -25,4 +25,4 @@
"html2wiki_uploaderror": "There was an error handling the file 
upload:\n$1",
"html2wiki_parse-error": "QueryPath (http://querypath.org/) was unable 
to parse the supplied content at $1",
"logentry-html2wiki": "$1 {{GENDER:$2|imported}} page $3"
-}
\ No newline at end of file
+}

-- 
To view, visit https://gerrit.wikimedia.org/r/320106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9328aaa90c59593abcede854d26de2c3197a0c0c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Html2Wiki
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Test: Do not merge

2016-11-06 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320105

Change subject: Test: Do not merge
..

Test: Do not merge

Change-Id: I81cd4817815df047f7c28fefea73f1c11efc18c2
---
A .phplint.yml
M composer.json
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/05/320105/1

diff --git a/.phplint.yml b/.phplint.yml
new file mode 100644
index 000..e239847
--- /dev/null
+++ b/.phplint.yml
@@ -0,0 +1,6 @@
+path: .
+jobs: 20
+extensions:
+  - php
+exclude:
+  - vendor
diff --git a/composer.json b/composer.json
index 4d2922c..1a604a5 100644
--- a/composer.json
+++ b/composer.json
@@ -4,11 +4,13 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
+   "overtrue/phplint": "0.2.0",
"mediawiki/mediawiki-codesniffer": "0.7.2"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
+   "vendor/bin/phplint",
"phpcs -p -s"
],
"fix": [

-- 
To view, visit https://gerrit.wikimedia.org/r/320105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81cd4817815df047f7c28fefea73f1c11efc18c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...EditUser[master]: Make action-edituser-exempt compatible with permissionserror...

2016-11-06 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320104

Change subject: Make action-edituser-exempt compatible with 
permissionserrorstext-withaction
..

Make action-edituser-exempt compatible with permissionserrorstext-withaction

Bug: T136287
Change-Id: I33d40b04d9995f41ab827b6374fe44ece6601b84
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EditUser 
refs/changes/04/320104/1

diff --git a/i18n/en.json b/i18n/en.json
index e5f9f7e..646376c 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -14,5 +14,5 @@
"right-edituser": "Edit the preferences of other users",
"right-edituser-exempt": "Others cannot edit this user's preferences",
"action-edituser": "edit the preferences of other users",
-   "action-edituser-exempt": "others cannot edit this user's preferences"
+   "action-edituser-exempt": "edit the preferences of this user"
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b3fb5d0..eaaa0a3 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -19,5 +19,5 @@
"right-edituser": "{{doc-right|edituser}}",
"right-edituser-exempt": "{{doc-right|edituser-exempt}}",
"action-edituser": "{{doc-action|edituser}}",
-   "action-edituser-exempt": "{{doc-action|edituser-exempt}}"
+   "action-edituser-exempt": "Error presented when trying to edit the 
preferences of a user for which this special feature is not 
available.\n\n{{doc-action|edituser-exempt}}"
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/320104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33d40b04d9995f41ab827b6374fe44ece6601b84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EditUser
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Add test framework for diffElement

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add test framework for diffElement
..


Add test framework for diffElement

Just one simple text diff test for now.

Change-Id: I298db26624da3bcba499a6da19d88e4c12b1c4fe
---
M build/modules.json
M tests/index.html
A tests/ui/ve.ui.DiffElement.test.js
3 files changed, 39 insertions(+), 0 deletions(-)

Approvals:
  Tchanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/build/modules.json b/build/modules.json
index fcbf15b..d50d6ba 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -658,6 +658,7 @@
"tests/init/ve.init.sa.Platform.test.js",
"tests/ui/ve.ui.DataTransferHandlerFactory.test.js",
"tests/ui/ve.ui.Trigger.test.js",
+   "tests/ui/ve.ui.DiffElement.test.js",
"tests/ui/actions/ve.ui.AnnotationAction.test.js",
"tests/ui/actions/ve.ui.ContentAction.test.js",
"tests/ui/actions/ve.ui.FormatAction.test.js",
diff --git a/tests/index.html b/tests/index.html
index 1af691b..bbc90f8 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -477,6 +477,7 @@



+   



diff --git a/tests/ui/ve.ui.DiffElement.test.js 
b/tests/ui/ve.ui.DiffElement.test.js
new file mode 100644
index 000..c5c
--- /dev/null
+++ b/tests/ui/ve.ui.DiffElement.test.js
@@ -0,0 +1,37 @@
+/*!
+ * VisualEditor DiffElement Trigger tests.
+ *
+ * @copyright 2011-2016 VisualEditor Team and others; see 
http://ve.mit-license.org
+ */
+
+QUnit.module( 've.ui.DiffElement' );
+
+/* Tests */
+
+QUnit.test( 'Diffing', function ( assert ) {
+   var i, len, visualDiff, diffElement,
+   cases = [
+   {
+   msg: 'Simple text change',
+   oldDoc: 'foo bar baz',
+   newDoc: 'foo car baz',
+   expected:
+   '' +
+   '' +
+   'foo ' +
+   'bar  car' +
+   ' baz' +
+   '' +
+   ''
+   }
+   ];
+
+   for ( i = 0, len = cases.length; i < len; i++ ) {
+   visualDiff = new ve.dm.VisualDiff(
+   ve.dm.converter.getModelFromDom( 
ve.createDocumentFromHtml( cases[ i ].oldDoc ) ),
+   ve.dm.converter.getModelFromDom( 
ve.createDocumentFromHtml( cases[ i ].newDoc ) )
+   );
+   diffElement = new ve.ui.DiffElement( visualDiff );
+   assert.strictEqual( diffElement.$element.html(), cases[ i 
].expected, cases[ i ].msg );
+   }
+} );

-- 
To view, visit https://gerrit.wikimedia.org/r/319988
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I298db26624da3bcba499a6da19d88e4c12b1c4fe
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Tchanders 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Bug : T122280

2016-11-06 Thread Raspberrypy20 (Code Review)

Raspberrypy20 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320103

Change subject: Bug : T122280
..

Bug : T122280

Change-Id: I0191c77bfb904d33841b29be83ad1045f873028f
---
M includes/api/ApiCheckToken.php
1 file changed, 8 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/03/320103/1

diff --git a/includes/api/ApiCheckToken.php b/includes/api/ApiCheckToken.php
index 1e9bab8..fb49e65 100644
--- a/includes/api/ApiCheckToken.php
+++ b/includes/api/ApiCheckToken.php
@@ -22,16 +22,19 @@
  * @file
  */
 
+ use MediaWiki\user\User;
+
 /**
  * @since 1.25
  * @ingroup API
  */
 class ApiCheckToken extends ApiBase {
 
- public function verifyToken($token){
-$suffix=User::EDIT_TOKEN_SUFFIX;
-$suffixlength=strlen($suffix);
-  if(substr( $token, -$suffixLength ) !== $suffix)){
+ public function verifyToken($token) {
+$suffix = User::EDIT_TOKEN_SUFFIX;
+$suffixlength = strlen($suffix);
+  if(substr( $token, -$suffixLength ) !== $suffix))
+  {
  return NULL;
  }
   else{
@@ -53,7 +56,7 @@
);
 
 //check if the token is a valid and contains suffix '+\\'
-$tokenresult=verifyToken($token);
+$tokenresult = self::verifyToken($token);
 
 if($tokenresult == NULL){
 $res['result'] = 'Warning';

-- 
To view, visit https://gerrit.wikimedia.org/r/320103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0191c77bfb904d33841b29be83ad1045f873028f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Raspberrypy20 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Bug : T122280

2016-11-06 Thread Raspberrypy20 (Code Review)

Raspberrypy20 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320102

Change subject: Bug : T122280
..

Bug : T122280

Change-Id: I8b363bdcae95af0c77e0c7235b058cc6da30b77a
---
M includes/api/ApiCheckToken.php
1 file changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/02/320102/1

diff --git a/includes/api/ApiCheckToken.php b/includes/api/ApiCheckToken.php
index 3d2159c..1e9bab8 100644
--- a/includes/api/ApiCheckToken.php
+++ b/includes/api/ApiCheckToken.php
@@ -28,6 +28,18 @@
  */
 class ApiCheckToken extends ApiBase {
 
+ public function verifyToken($token){
+$suffix=User::EDIT_TOKEN_SUFFIX;
+$suffixlength=strlen($suffix);
+  if(substr( $token, -$suffixLength ) !== $suffix)){
+ return NULL;
+ }
+  else{
+ return 'valid token';
+  }  
+
+   }
+
public function execute() {
$params = $this->extractRequestParams();
$token = $params['token'];
@@ -39,6 +51,13 @@
$tokenObj = ApiQueryTokens::getToken(
$this->getUser(), $this->getRequest()->getSession(), 
$salts[$params['type']]
);
+
+//check if the token is a valid and contains suffix '+\\'
+$tokenresult=verifyToken($token);
+
+if($tokenresult == NULL){
+$res['result'] = 'Warning';
+}
if ( $tokenObj->match( $token, $maxage ) ) {
$res['result'] = 'valid';
} elseif ( $maxage !== null && $tokenObj->match( $token ) ) {
@@ -79,4 +98,6 @@
=> 'apihelp-checktoken-example-simple',
];
}
+
+   
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/320102
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b363bdcae95af0c77e0c7235b058cc6da30b77a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Raspberrypy20 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Replace reference to current doc with this.newDoc

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Replace reference to current doc with this.newDoc
..


Replace reference to current doc with this.newDoc

Change-Id: Ibf72ae271c91e3d930f845ec51e45cf16693e9e0
---
M src/ui/elements/ve.ui.DiffElement.js
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Tchanders: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index b22a64e..648cf2b 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -463,7 +463,7 @@
for ( i = 1, ilen = linearDiff.length; i < ilen; i++ ) {
diffDocData = diffDocData.concat( linearDiff[ i ][ 1 ] );
}
-   diffDoc = ve.init.target.surface.model.documentModel.cloneWithData( 
diffDocData );
+   diffDoc = this.newDoc.cloneWithData( diffDocData );
 
// Add spans with the appropriate class for removes and inserts
// TODO: do insert and remove outside of loop

-- 
To view, visit https://gerrit.wikimedia.org/r/319987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf72ae271c91e3d930f845ec51e45cf16693e9e0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 
Gerrit-Reviewer: Tchanders 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Refactor diff element getChangedNodeHtml

2016-11-06 Thread Tchanders (Code Review)

Tchanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320101

Change subject: Refactor diff element getChangedNodeHtml
..

Refactor diff element getChangedNodeHtml

Change-Id: I23d0c982e3a5c2073ea2dc2e73d451d8eb7bc7dd
---
M src/ui/elements/ve.ui.DiffElement.js
1 file changed, 109 insertions(+), 163 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/01/320101/1

diff --git a/src/ui/elements/ve.ui.DiffElement.js 
b/src/ui/elements/ve.ui.DiffElement.js
index b22a64e..c75bb2c 100644
--- a/src/ui/elements/ve.ui.DiffElement.js
+++ b/src/ui/elements/ve.ui.DiffElement.js
@@ -163,15 +163,11 @@
  */
 ve.ui.DiffElement.prototype.getChangedNodeHtml = function ( oldNodeIndex, move 
) {
var i, ilen, j, jlen, k, klen,
-   iModified, jModified, nodeHtml,
+   iModified, jModified, classes, nodeHtml,
newNodeIndex = this.oldToNew[ oldNodeIndex ].node,
nodeRange = this.newDocChildren[ newNodeIndex ].getOuterRange(),
nodeData = this.newDoc.getData( nodeRange ),
alreadyProcessed = {
-   remove: [],
-   insert: []
-   },
-   markedNodes = {
remove: [],
insert: []
},
@@ -185,139 +181,112 @@
correspondingNodes = this.oldToNew[ oldNodeIndex 
].correspondingNodes;
 
/**
-* Modify the linear data to reflect the diff, one node at a time. 
(Nodes here
-* are descendants of the child of the document, which have been tree 
diffed.)
-* At this level, a ve.dm.BranchNode could either have been inserted or 
removed,
-* whereas a ve.dm.ContentBranchNode could also have been changed, 
meaning that
-* part of its data has been inserted and/or removed.
+* Splice in the removed data for the subtree rooted at this node, from 
the old
+* document.
 *
-* We start with data from the new document, then (1) splice in data
-* corresponding to any removed nodes from the old document, and (2) 
highlight
-* and data that has been removed or inserted.
-*
-* @param {number} nodeIndex The index of the node in its tree's 
orderedNodes
-* array.
-* @param {string} action 'remove', 'insert' or 'change'
-* @param {string} [move] 'up' or 'down' if the node has moved
+* @param {number} nodeIndex The index of this node in the subtree 
rooted at
+* this document child
 */
-   function nodesInsertOrRemove( nodeIndex, action, move ) {
-   var i, ilen,
-   doc, nodes,
-   subNodeTreeNode,
-   subNode,
-   subNodeRange,
-   subNodeData,
-   spliceIndex,
-   annotatedData,
-   descendant, descendants,
-   outerNodeRange, outerNodeData,
-   correspondingNodesObject, tree,
-   parentNode, siblingNodes,
-   rightMostLeftSiblingNode,
-   oldPreviousNode, newPreviousNodeRange,
-   insertIndex;
+   function highlightRemovedSubTree( nodeIndex ) {
+   var i, ilen, subTreeRootNode, subTreeRootNodeData, siblingNodes,
+   newPreviousNodeIndex, oldPreviousNodeIndex, 
insertIndex, descendants;
 
-   // Define tree and doc
-   tree = action === 'remove' ? oldTree : newTree;
-   doc = action === 'remove' ? this.oldDoc : this.newDoc;
-   nodes = action === 'remove' ? oldNodes : newNodes;
+   // Get outer data for this node from the old doc and add remove 
class
+   subTreeRootNode = oldNodes[ nodeIndex ];
+   subTreeRootNodeData = this.oldDoc.getData( 
subTreeRootNode.node.getOuterRange() );
+   subTreeRootNodeData[ 0 ] = this.addClassesToNode( 
subTreeRootNodeData[ 0 ], this.oldDoc, 'remove' );
 
-   // Get the outer node
-   outerNodeRange = action === 'remove' ? tree.orderedNodes[ 
nodeIndex ].node.getOuterRange() : nodeRange;
-   outerNodeData = action === 'remove' ? doc.getData( 
outerNodeRange ) : nodeData;
-   subNodeTreeNode = nodes[ nodeIndex ];
-
-   // Get subNode and add action class
-   subNode = subNodeTreeNode.node;
-   subNodeRange = subNode.getOuterRange();
-   spliceIndex = subNodeRange.from - outerNodeRange.from;
-   subNodeData = outerNodeData.splice( spliceIndex, 
subNodeRange.to - subNodeRange.from );
-   subNodeData[ 0 ] = this.addClassesToNode( subNodeData[ 0 ], 
doc, action, move );
-
-

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [DOC] site.allpages parameters start and prefix must be a ba...

2016-11-06 Thread Xqt (Code Review)

Xqt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320100

Change subject: [DOC] site.allpages parameters start and prefix must be a 
basestring
..

[DOC] site.allpages parameters start and prefix must be a basestring

- add type to the doc string
- verify it for the start parameter which is mandatory

Change-Id: I03c7a8701d7d3f84fe7e5e95b5caf60dec4044ad
---
M pywikibot/site.py
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/00/320100/1

diff --git a/pywikibot/site.py b/pywikibot/site.py
index 780b48b..db79339 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -4012,7 +4012,9 @@
 """Iterate pages in a single namespace.
 
 @param start: Start at this title (page need not exist).
+@type start: str
 @param prefix: Only yield pages starting with this string.
+@type prefix: str
 @param namespace: Iterate pages from this (single) namespace
 @type namespace: int or Namespace.
 @param filterredir: if True, only yield redirects; if False (and not
@@ -4050,6 +4052,7 @@
 warn('The value "{0!r}" for "filterredir" is deprecated; use '
  '{1} instead.'.format(old, filterredir), DeprecationWarning, 
3)
 
+assert isinstance(start, basestring), 'start parameter must be str 
type'
 apgen = self._generator(api.PageGenerator, type_arg="allpages",
 namespaces=namespace,
 gapfrom=start, total=total,

-- 
To view, visit https://gerrit.wikimedia.org/r/320100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03c7a8701d7d3f84fe7e5e95b5caf60dec4044ad
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Cleanup elements passed to MWImageNode mixin

2016-11-06 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320099

Change subject: Cleanup elements passed to MWImageNode mixin
..

Cleanup elements passed to MWImageNode mixin

Change-Id: Idc736bca6ec7f9cae18d065303364ff5b7828a3b
---
M modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
M modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
3 files changed, 28 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/99/320099/1

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
index ea966ee..281579e 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
@@ -17,7 +17,7 @@
  * @param {Object} [config] Configuration options
  */
 ve.ce.MWBlockImageNode = function VeCeMWBlockImageNode() {
-   var type, isError;
+   var type, isError, $image;
 
// Parent constructor
ve.ce.MWBlockImageNode.super.apply( this, arguments );
@@ -35,19 +35,20 @@
//this.$image
//  this.caption.view.$element
 
-   // Build DOM:
-   this.$image = $( '' )
-   .attr( 'src', this.getResolvedAttribute( 'src' ) );
 
+   // Build DOM:
if ( isError ) {
+   $image = $( [] );
this.$a = $( '' )
.addClass( 'new' )
.text( this.model.getFilename() );
} else {
+   $image = $( '' )
+   .attr( 'src', this.getResolvedAttribute( 'src' ) );
this.$a = $( '' )
.addClass( 'image' )
.attr( 'href', this.getResolvedAttribute( 'href' ) )
-   .append( this.$image );
+   .append( $image );
}
 
this.$element
@@ -63,12 +64,12 @@
// type. The model deals with converting it
.attr( 'typeof', this.typeToRdfa[ type ] );
 
+   // Mixin constructors
+   ve.ce.MWImageNode.call( this, this.$element, $image );
+
this.updateCaption();
 
this.updateSize();
-
-   // Mixin constructors
-   ve.ce.MWImageNode.call( this, this.$element, this.$image );
 };
 
 /* Inheritance */
@@ -265,6 +266,9 @@
  * @inheritdoc
  */
 ve.ce.MWBlockImageNode.prototype.onAttributeChange = function ( key, from, to 
) {
+   // Mixin method
+   ve.ce.MWImageNode.prototype.onAttributeChange.apply( this, arguments );
+
if ( key === 'height' || key === 'width' ) {
to = parseInt( to, 10 );
}
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
index b5e0ab9..bcf3ab9 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js
@@ -15,18 +15,17 @@
  * @mixins ve.ce.MWResizableNode
  *
  * @constructor
- * @param {jQuery} $figure Figure element
- * @param {jQuery} $image Image element
+ * @param {jQuery} $focusable Focusable part of the node
+ * @param {jQuery} $image Image part of the node
  * @param {Object} [config] Configuration options
  */
-ve.ce.MWImageNode = function VeCeMWImageNode( $figure, $image, config ) {
+ve.ce.MWImageNode = function VeCeMWImageNode( $focusable, $image, config ) {
config = ve.extendObject( {
enforceMax: false,
minDimensions: { width: 1, height: 1 }
}, config );
 
// Properties
-   this.$figure = $figure;
this.$image = $image;
// Parent constructor triggers render so this must precede it
this.renderedDimensions = null;
@@ -35,8 +34,10 @@
ve.ce.GeneratedContentNode.call( this );
 
// Mixin constructors
-   ve.ce.FocusableNode.call( this, this.$figure, config );
-   ve.ce.MWResizableNode.call( this, this.$image, config );
+   ve.ce.FocusableNode.call( this, $focusable, config );
+   if ( this.$image.length ) {
+   ve.ce.MWResizableNode.call( this, this.$image, config );
+   }
 
// Events
this.model.connect( this, { attributeChange: 'onAttributeChange' } );
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js 
b/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
index 33c73af..cc628ba 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js
@@ -17,7 +17,7 @@
  * @param {Object} [config] Configuration options
  */
 ve.ce.MWInlineImageNode = function VeCeMWInlineImageNode() {
-   var isError;
+   var isError, $image;
// Parent constructor
ve.ce.MWInlineImageNode.super.apply( this, arguments );
 
@@ -27,20 +27,20 @@
this.$element = $( '' )
.addClass( 'new' )

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Test: Do not merge

2016-11-06 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320098

Change subject: Test: Do not merge
..

Test: Do not merge

Change-Id: I097322d456d2baa69ee71b3c140bd01d1ffbc20d
---
M autoload.php
M composer.lock
M composer/ClassLoader.php
M composer/autoload_real.php
A composer/autoload_static.php
5 files changed, 847 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor 
refs/changes/98/320098/1

diff --git a/autoload.php b/autoload.php
index 9bcfa9f..a5957bd 100644
--- a/autoload.php
+++ b/autoload.php
@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit_mediawiki_vendor::getLoader();
diff --git a/composer.lock b/composer.lock
index f4e63e9..e601e43 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
 "Read more about it at 
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file;,
 "This file is @generated automatically"
 ],
-"hash": "c74fe46f9fdcf3e76526c28d9cc33baf",
+"hash": "794fc2b90749457e89ba14b320f3fe84",
 "content-hash": "82c8d10ea460b81de3a0b28b36a2e957",
 "packages": [
 {
diff --git a/composer/ClassLoader.php b/composer/ClassLoader.php
index ff6ecfb..ac67d30 100644
--- a/composer/ClassLoader.php
+++ b/composer/ClassLoader.php
@@ -53,8 +53,8 @@
 
 private $useIncludePath = false;
 private $classMap = array();
-
 private $classMapAuthoritative = false;
+private $missingClasses = array();
 
 public function getPrefixes()
 {
@@ -322,20 +322,20 @@
 if (isset($this->classMap[$class])) {
 return $this->classMap[$class];
 }
-if ($this->classMapAuthoritative) {
+if ($this->classMapAuthoritative || 
isset($this->missingClasses[$class])) {
 return false;
 }
 
 $file = $this->findFileWithExtension($class, '.php');
 
 // Search for Hack files if we are running on HHVM
-if ($file === null && defined('HHVM_VERSION')) {
+if (false === $file && defined('HHVM_VERSION')) {
 $file = $this->findFileWithExtension($class, '.hh');
 }
 
-if ($file === null) {
+if (false === $file) {
 // Remember that this class does not exist.
-return $this->classMap[$class] = false;
+$this->missingClasses[$class] = true;
 }
 
 return $file;
@@ -399,6 +399,8 @@
 if ($this->useIncludePath && $file = 
stream_resolve_include_path($logicalPathPsr0)) {
 return $file;
 }
+
+return false;
 }
 }
 
diff --git a/composer/autoload_real.php b/composer/autoload_real.php
index a8565e8..6a50b69 100644
--- a/composer/autoload_real.php
+++ b/composer/autoload_real.php
@@ -27,15 +27,26 @@
 array_push($includePaths, get_include_path());
 set_include_path(join(PATH_SEPARATOR, $includePaths));
 
-$classMap = require __DIR__ . '/autoload_classmap.php';
-if ($classMap) {
-$loader->addClassMap($classMap);
+$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION');
+if ($useStaticLoader) {
+require_once __DIR__ . '/autoload_static.php';
+
+
call_user_func(\Composer\Autoload\ComposerStaticInit_mediawiki_vendor::getInitializer($loader));
+} else {
+$classMap = require __DIR__ . '/autoload_classmap.php';
+if ($classMap) {
+$loader->addClassMap($classMap);
+}
 }
 
 $loader->setClassMapAuthoritative(true);
 $loader->register(false);
 
-$includeFiles = require __DIR__ . '/autoload_files.php';
+if ($useStaticLoader) {
+$includeFiles = 
Composer\Autoload\ComposerStaticInit_mediawiki_vendor::$files;
+} else {
+$includeFiles = require __DIR__ . '/autoload_files.php';
+}
 foreach ($includeFiles as $fileIdentifier => $file) {
 composerRequire_mediawiki_vendor($fileIdentifier, $file);
 }
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
new file mode 100644
index 000..f173eac
--- /dev/null
+++ b/composer/autoload_static.php
@@ -0,0 +1,823 @@
+ __DIR__ . '/..' . 
'/mediawiki/at-ease/src/Functions.php',
+'c3f7f0e81464740a933532e81fa26cc7' => __DIR__ . '/..' . 
'/wikimedia/base-convert/src/Functions.php',
+'d55c27a601de788b19a09b7d057d07ae' => __DIR__ . '/..' . 
'/wikimedia/relpath/src/RelPath.php',
+);
+
+public static $prefixLengthsPsr4 = array (
+'W' => 
+array (
+'WrappedString\\' => 14,
+'Wikimedia\\Composer\\' => 19,
+'Wikimedia\\Assert\\Test\\' => 22,
+

[MediaWiki-commits] [Gerrit] mediawiki...CommentStreams[master]: Make comments searchable; refactor

2016-11-06 Thread Cicalese (Code Review)

Cicalese has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320096

Change subject: Make comments searchable; refactor
..

Make comments searchable; refactor

Change-Id: Idbc0c57c569d10c21fcd5ada6953dc1526d8e5dc
---
D CommentStreams.php
D api/ApiCSQueryDatabase.php
R includes/ApiCSDeleteComment.php
R includes/ApiCSEditComment.php
R includes/ApiCSPostComment.php
R includes/ApiCSQueryComment.php
R includes/Comment.php
R includes/CommentStreams.php
R includes/CommentStreamsHooks.php
D js+css/CommentStreams.Data.js
D js+css/images/more.png
D js+css/images/thumbs-down.png
D js+css/images/thumbs-up.png
D js+css/images/user.png
D php/DatabaseQuerier.php
R resources/CommentStreams.css
R resources/CommentStreams.js
R resources/CommentStreamsQuerier.js
R resources/spin.min.js
D sql/downvotes.sql
D sql/nextComment.sql
D sql/upvotes.sql
22 files changed, 0 insertions(+), 405 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommentStreams 
refs/changes/96/320096/1

diff --git a/CommentStreams.php b/CommentStreams.php
deleted file mode 100644
index aa50561..000
--- a/CommentStreams.php
+++ /dev/null
@@ -1,43 +0,0 @@
-https://www.mediawiki.org/wiki/Extension_registration for 
more details.'
-   );
-   return;
-}
-else {
-   die( 'This version of CommentStreams requires MediaWiki 1.25+.');
-}
diff --git a/api/ApiCSQueryDatabase.php b/api/ApiCSQueryDatabase.php
deleted file mode 100644
index cde58f4..000
--- a/api/ApiCSQueryDatabase.php
+++ /dev/null
@@ -1,74 +0,0 @@
-getMain()->getVal( 'query' );
-   if($query == 'childrenCount') {
-   $parent = $this->getMain()->getVal( 'parentCommentId' );
-   if(!$parent) {
-   $this->getResult()->addValue(null, "error", 
array('code' => 'missingparent', 
-   
'info' => 'you must 
provide a parent comment page ID'));
-   return true;
-   }
-   $childrenCount = 
DatabaseQuerier::numberOfChildCommentsForParentCommentId($parent);
-   $this->getResult()->addValue( null, 
$this->getModuleName(), array('query' => $query,
-   

'childrenCount' => $childrenCount));
-   }
-   else {
-   $this->getResult()->addValue(null, "error", 
array('code' => 'unrecognizedparameter', 'info' => 'query parameter 
unrecognized'));
-   }
-   return true;
-   }
-   public function getDescription() {
-   return 'Query for CommentStreams information.';
-   }
-   public function getAllowedParams() {
-   return array(
-   'query' => array(
-   ApiBase::PARAM_TYPE => 'string',
-   ApiBase::PARAM_REQUIRED => true
-   ),
-   'parentCommentId' => array(
-   ApiBase::PARAM_TYPE => 'integer',
-   ApiBase::PARAM_REQUIRED => false
-   )
-   );
-   }
-   public function getParamDescription() {
-   return array(
-   'query' => 'type of query. Allowed values: 
childrenCount',
-   'parentCommentId' => 'page ID of the parent comment'
-   );
-   }
-   public function getExamples() {
-   return null;
-   }
-   public function getHelpUrls() {
-   return '';
-   }
-}
diff --git a/api/ApiCSDeleteComment.php b/includes/ApiCSDeleteComment.php
similarity index 100%
rename from api/ApiCSDeleteComment.php
rename to includes/ApiCSDeleteComment.php
diff --git a/api/ApiCSEditComment.php b/includes/ApiCSEditComment.php
similarity index 100%
rename from api/ApiCSEditComment.php
rename to includes/ApiCSEditComment.php
diff --git a/api/ApiCSPostComment.php b/includes/ApiCSPostComment.php
similarity index 100%
rename from api/ApiCSPostComment.php
rename to includes/ApiCSPostComment.php
diff --git a/api/ApiCSQueryComment.php b/includes/ApiCSQueryComment.php
similarity index 100%
rename from api/ApiCSQueryComment.php
rename to includes/ApiCSQueryComment.php
diff --git a/php/Comment.php b/includes/Comment.php
similarity index 100%
rename from php/Comment.php
rename to includes/Comment.php
diff --git a/php/CommentManager.php b/includes/CommentStreams.php
similarity index 100%
rename from php/CommentManager.php
rename to includes/CommentStreams.php
diff --git a/php/CommentStreams_body.php b/includes/CommentStreamsHooks.php
similarity index 100%

[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Add videojs/video.js for TimedMediaHandler

2016-11-06 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320095

Change subject: Add videojs/video.js for TimedMediaHandler
..

Add videojs/video.js for TimedMediaHandler

Bug: T150128
Change-Id: I5a0703d8af023258bfa9df5ab3dba554268231d5
---
M composer.json
M composer.lock
M composer/installed.json
A videojs/video.js/.babelrc
A videojs/video.js/.editorconfig
A videojs/video.js/.gitignore
A videojs/video.js/.npmignore
A videojs/video.js/.travis.yml
A videojs/video.js/CHANGELOG.md
A videojs/video.js/CONTRIBUTING.md
A videojs/video.js/Gruntfile.js
A videojs/video.js/ISSUE_TEMPLATE.md
A videojs/video.js/LICENSE
A videojs/video.js/PULL_REQUEST_TEMPLATE.md
A videojs/video.js/README.md
A videojs/video.js/bower.json
A videojs/video.js/build/bin/prerelease
A videojs/video.js/build/bin/version
A videojs/video.js/build/grunt.js
A videojs/video.js/build/license-header.txt
A videojs/video.js/build/options-customizer.js
A videojs/video.js/build/tasks/cdn-links.js
A videojs/video.js/build/tasks/languages.js
A videojs/video.js/build/tasks/style-injection.js
A videojs/video.js/build/tasks/test-local.js
A videojs/video.js/build/tasks/vjs-version.js
A videojs/video.js/component.json
A videojs/video.js/composer.json
A videojs/video.js/contrib.json
A videojs/video.js/docs/examples/elephantsdream/captions.ar.vtt
A videojs/video.js/docs/examples/elephantsdream/captions.en.vtt
A videojs/video.js/docs/examples/elephantsdream/captions.ja.vtt
A videojs/video.js/docs/examples/elephantsdream/captions.ru.vtt
A videojs/video.js/docs/examples/elephantsdream/captions.sv.vtt
A videojs/video.js/docs/examples/elephantsdream/chapters.en.vtt
A videojs/video.js/docs/examples/elephantsdream/descriptions.en.vtt
A videojs/video.js/docs/examples/elephantsdream/index.html
A videojs/video.js/docs/examples/shared/example-captions.vtt
A videojs/video.js/docs/examples/simple-embed/index.html
A videojs/video.js/docs/guides/api.md
A videojs/video.js/docs/guides/audio-tracks.md
A videojs/video.js/docs/guides/components.md
A videojs/video.js/docs/guides/glossary.md
A videojs/video.js/docs/guides/languages.md
A videojs/video.js/docs/guides/options.md
A videojs/video.js/docs/guides/plugins.md
A videojs/video.js/docs/guides/removing-players.md
A videojs/video.js/docs/guides/setup.md
A videojs/video.js/docs/guides/skins.md
A videojs/video.js/docs/guides/tech.md
A videojs/video.js/docs/guides/text-tracks.md
A videojs/video.js/docs/guides/tracks.md
A videojs/video.js/docs/guides/video-tracks.md
A videojs/video.js/docs/index.md
A videojs/video.js/docs/translations-needed.md
A videojs/video.js/lang/ar.json
A videojs/video.js/lang/ba.json
A videojs/video.js/lang/bg.json
A videojs/video.js/lang/ca.json
A videojs/video.js/lang/cs.json
A videojs/video.js/lang/da.json
A videojs/video.js/lang/de.json
A videojs/video.js/lang/el.json
A videojs/video.js/lang/en.json
A videojs/video.js/lang/es.json
A videojs/video.js/lang/fa.json
A videojs/video.js/lang/fi.json
A videojs/video.js/lang/fr.json
A videojs/video.js/lang/hr.json
A videojs/video.js/lang/hu.json
A videojs/video.js/lang/it.json
A videojs/video.js/lang/ja.json
A videojs/video.js/lang/ko.json
A videojs/video.js/lang/nb.json
A videojs/video.js/lang/nl.json
A videojs/video.js/lang/nn.json
A videojs/video.js/lang/pl.json
A videojs/video.js/lang/pt-BR.json
A videojs/video.js/lang/ru.json
A videojs/video.js/lang/sr.json
A videojs/video.js/lang/sv.json
A videojs/video.js/lang/tr.json
A videojs/video.js/lang/uk.json
A videojs/video.js/lang/vi.json
A videojs/video.js/lang/zh-CN.json
A videojs/video.js/lang/zh-TW.json
A videojs/video.js/package.json
A videojs/video.js/sandbox/descriptions.html.example
A videojs/video.js/sandbox/icons.html.example
A videojs/video.js/sandbox/index.html.example
A videojs/video.js/sandbox/language.html.example
A videojs/video.js/sandbox/plugin.html.example
A videojs/video.js/src/css/_print.scss
A videojs/video.js/src/css/_private-variables.scss
A videojs/video.js/src/css/_utilities.scss
A videojs/video.js/src/css/_variables.scss
A videojs/video.js/src/css/components/_adaptive.scss
A videojs/video.js/src/css/components/_audio.scss
A videojs/video.js/src/css/components/_big-play.scss
A videojs/video.js/src/css/components/_button.scss
A videojs/video.js/src/css/components/_captions-settings.scss
A videojs/video.js/src/css/components/_captions.scss
A videojs/video.js/src/css/components/_chapters.scss
A videojs/video.js/src/css/components/_close-button.scss
A videojs/video.js/src/css/components/_control-bar.scss
A videojs/video.js/src/css/components/_control-spacer.scss
A videojs/video.js/src/css/components/_control.scss
A videojs/video.js/src/css/components/_descriptions.scss
A videojs/video.js/src/css/components/_error.scss
A videojs/video.js/src/css/components/_fullscreen.scss
A videojs/video.js/src/css/components/_layout.scss
A videojs/video.js/src/css/components/_live.scss
A

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-11-06T10:00:01+0000

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: New Wikidata Build - 2016-11-06T10:00:01+
..


New Wikidata Build - 2016-11-06T10:00:01+

Change-Id: I6b78fb7a990bb7dfbf579826be04949eac62c8ee
---
M composer.lock
M extensions/Wikibase/client/i18n/hr.json
M extensions/Wikibase/client/i18n/ja.json
M extensions/Wikibase/repo/i18n/el.json
M extensions/Wikibase/repo/i18n/lt.json
M extensions/Wikibase/repo/i18n/nl.json
A extensions/WikimediaBadges/i18n/lij.json
M vendor/composer/installed.json
8 files changed, 42 insertions(+), 18 deletions(-)

Approvals:
  Hoo man: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.lock b/composer.lock
index 749ef23..d095bf4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1581,12 +1581,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "771c426014b4eb0c290e6fea0655779a70fdb80e"
+"reference": "082ffddb013866bb6c76e28f9c94f50ab53eb133"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/771c426014b4eb0c290e6fea0655779a70fdb80e;,
-"reference": "771c426014b4eb0c290e6fea0655779a70fdb80e",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/082ffddb013866bb6c76e28f9c94f50ab53eb133;,
+"reference": "082ffddb013866bb6c76e28f9c94f50ab53eb133",
 "shasum": ""
 },
 "require": {
@@ -1660,7 +1660,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-11-04 21:53:29"
+"time": "2016-11-05 21:59:01"
 },
 {
 "name": "wikibase/wikimedia-badges",
@@ -1668,7 +1668,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikimediaBadges;,
-"reference": "a36b775e3f91ec62c7b52e504dafd41898917e7c"
+"reference": "2142f185c708a3e449189d03af06d2eb9bb3c6bd"
 },
 "require": {
 "php": ">=5.3.0"
@@ -1702,7 +1702,7 @@
 "support": {
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2016-11-01 21:52:51"
+"time": "2016-11-05 21:59:33"
 },
 {
 "name": "wikimedia/assert",
diff --git a/extensions/Wikibase/client/i18n/hr.json 
b/extensions/Wikibase/client/i18n/hr.json
index 7457eb6..f8eed6d 100644
--- a/extensions/Wikibase/client/i18n/hr.json
+++ b/extensions/Wikibase/client/i18n/hr.json
@@ -38,7 +38,7 @@
"wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
"wikibase-rc-hide-wikidata-hide": "sakrij",
"wikibase-rc-hide-wikidata-show": "prikaži",
-   "wikibase-rc-show-wikidata-pref": "Prikaži {{WBREPONAME}} promjene na 
popisu nedavnih promjena",
+   "wikibase-rc-show-wikidata-pref": "Prikaži promjene projekta 
{{WBREPONAME}} na popisu nedavnih promjena",
"wikibase-rc-wikibase-edit-letter": "D",
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} uređivanje",
"wikibase-replicationnote": "Molimo Vas, vodite računa da može proći 
nekoliko minuta dok izmjene ne budu vidljive na svim wikijima.",
diff --git a/extensions/Wikibase/client/i18n/ja.json 
b/extensions/Wikibase/client/i18n/ja.json
index ed80b5b..269bbda 100644
--- a/extensions/Wikibase/client/i18n/ja.json
+++ b/extensions/Wikibase/client/i18n/ja.json
@@ -15,7 +15,7 @@
"tooltip-t-wikibase": "関連付けられたデータリポジトリ項目へのリンク",
"wikibase-after-page-move": 
"移動されたページにある言語リンクを維持するために、関連付けられた{{WBREPONAME}}項目を[$1 更新]することもできます。",
"wikibase-after-page-move-queued": "このページに関連付けられた[$1 
{{WBREPONAME}}項目]は、まもなく自動的に更新されます。これは瞬時には起きない場合があるので、気をつけてください。",
-   "wikibase-after-page-delete": "この操作によって[{{WBREPONAME}} 項目 
$1]からこのページへのリンクも取り除かれました。",
+   "wikibase-after-page-delete": "言語間リンクの整合性を保つため、[$1 
関連付けられた{{WBREPONAME}}の項目]からこのページへのリンクが取り除かれます。",
"wikibase-after-page-delete-queued": "このページに関連付けられた[$1 
{{WBREPONAME}}項目]は、自動的に更新されます。瞬時には更新されないかもしれないので、気をつけてください。",
"wikibase-comment-add": "{{WBREPONAME}}項目を作成しました。",
"wikibase-comment-remove": 
"関連付けられた{{WBREPONAME}}項目を削除しました。言語リンクを除去しました。",
diff --git a/extensions/Wikibase/repo/i18n/el.json 
b/extensions/Wikibase/repo/i18n/el.json
index 6d7ed63..d4b1bb2 100644
--- a/extensions/Wikibase/repo/i18n/el.json
+++ b/extensions/Wikibase/repo/i18n/el.json
@@ -27,6 +27,9 @@
"wikibase-save-inprogress": "Αποθηκεύεται...",
"wikibase-remove-inprogress": "Αφαιρείται...",
"wikibase-statementlistview-add": "προσθήκη",
+   "wikibase-statementlistview-add-tooltip":

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add an Icinga check for Graphite metric freshness

2016-11-06 Thread Ori.livneh (Code Review)

Ori.livneh has submitted this change and it was merged.

Change subject: Add an Icinga check for Graphite metric freshness
..


Add an Icinga check for Graphite metric freshness

Checks a Graphite metric and generates WARNING or CRITICAL states if the most
recent datapoint is older than the required freshness threshold.

Change-Id: I2dcb8b08f2aa70108ead46c9510cfcb521abe158
---
A modules/monitoring/manifests/graphite_freshness.pp
A modules/nagios_common/files/check_commands/check_graphite_freshness
A modules/nagios_common/files/check_commands/check_graphite_freshness.cfg
M modules/nagios_common/manifests/commands.pp
4 files changed, 141 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/monitoring/manifests/graphite_freshness.pp 
b/modules/monitoring/manifests/graphite_freshness.pp
new file mode 100644
index 000..60baa43
--- /dev/null
+++ b/modules/monitoring/manifests/graphite_freshness.pp
@@ -0,0 +1,53 @@
+# == Define: monitoring::graphite_freshness
+#
+# Provisions an Icinga check that ensures a Graphite metric is 'fresh':
+# that is, continuing to receive updates.
+#
+# === Parameters
+#
+# [*metric*]
+#   Graphite metric name. For example: 'reqstats.500'.
+#   Defaults to the resource title.
+#
+# [*warning*]
+#   Warn if most recent datapoint is older than this value.
+#   Value suffix may be one of 's', 'm', 'h' or 'd' for seconds,
+#   minutes, hours, or days, respectively.
+#
+# [*critical*]
+#   Crit if most recent datapoint is older than this value.
+#   Value suffix may be one of 's', 'm', 'h' or 'd' for seconds,
+#   minutes, hours, or days, respectively.
+#
+# [*graphite_url*]
+#   URL of Graphite's render API endpoint.
+#   Defaults to 'https://graphite.wikimedia.org/render'.
+#
+# [*contact_group*]
+#   Icinga contact group that should receive alerts.
+#   Defaults to 'admins'.
+#
+# === Examples
+#
+#  # Emit a warning if most recent datapoint for metric 'reqerror.500'
+#  # is older than 5 minutes, and a critical alert if older than 10.
+#  monitoring::graphite_freshness { 'reqerror.500':
+#warning  => '5m',
+#critical => '10m',
+#  }
+#
+define monitoring::graphite_freshness(
+$warning,
+$critical,
+$metric= $title,
+$ensure= present,
+$graphite_url  = 'https://graphite.wikimedia.org/render',
+$contact_group = 'admins'
+) {
+monitoring::service { $title:
+ensure=> $ensure,
+description   => "'${metric}' Graphite freshness",
+check_command => 
"check_graphite_freshness!${metric}!${graphite_url}!${warning}!${critical}",
+contact_group => $contact_group,
+}
+}
diff --git 
a/modules/nagios_common/files/check_commands/check_graphite_freshness 
b/modules/nagios_common/files/check_commands/check_graphite_freshness
new file mode 100755
index 000..bc6fb7e
--- /dev/null
+++ b/modules/nagios_common/files/check_commands/check_graphite_freshness
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+  check_graphite_freshness
+  
+
+  Checks a Graphite metric and generates WARNING or CRITICAL states if
+  the most recent datapoint is older than the required freshness threshold.
+
+  Usage:
+check_graphite_freshness [-w THRESHOLD] [-c THRESHOLD] METRIC RENDER_URL
+
+  Positional arguments:
+METRICmetric name
+RENDER_URLURL of graphite's render API
+
+  Optional arguments:
+-w THRESHOLD, --warning THRESHOLD   warn if most recent datapoint
+is older than this value
+-c THRESHOLD, --critical THRESHOLD  alert if most recent datapoint
+is older than this value
+
+"""
+from __future__ import print_function
+
+import sys
+reload(sys)
+sys.setdefaultencoding("utf-8")
+
+import argparse
+import datetime
+import json
+import time
+import urllib2
+
+
+def time_spec(spec_string):
+"""Parse a time specification string consisting of a number
+followed by an optional letter specifying the unit."""
+units = {'s': 'seconds', 'm': 'minutes', 'h': 'hours', 'd': 'days'}
+if spec_string[-1].isalpha():
+unit = units[spec_string[-1]]
+count = int(spec_string[:-1])
+else:
+unit = 'seconds'
+count = int(spec_string)
+return datetime.timedelta(**{unit: count})
+
+
+ap = argparse.ArgumentParser(description='Graphite staleness alert')
+ap.add_argument('metric', help='metric name')
+ap.add_argument('render_url', help="URL of graphite's render API")
+ap.add_argument('-w', '--warning', type=time_spec, metavar='THRESHOLD',
+help='warn if most recent datapoint is older than this value')
+ap.add_argument('-c', '--critical', type=time_spec, metavar='THRESHOLD',
+help='alert if most recent datapoint is older than this value')
+args =

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: [WIP] Bring in video.js from composer

2016-11-06 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320094

Change subject: [WIP] Bring in video.js from composer
..

[WIP] Bring in video.js from composer

Module definition in hooks needs updating... More to come later

Bug: T150128
Change-Id: I1bd7385a532ba543f31d0d1764a40696572c03bb
---
M composer.json
D resources/videojs/font/VideoJS.eot
D resources/videojs/font/VideoJS.svg
D resources/videojs/font/VideoJS.ttf
D resources/videojs/font/VideoJS.woff
D resources/videojs/ie8/videojs-ie8.js
D resources/videojs/lang/ar.js
D resources/videojs/lang/ba.js
D resources/videojs/lang/bg.js
D resources/videojs/lang/ca.js
D resources/videojs/lang/cs.js
D resources/videojs/lang/da.js
D resources/videojs/lang/de.js
D resources/videojs/lang/el.js
D resources/videojs/lang/en.js
D resources/videojs/lang/es.js
D resources/videojs/lang/fa.js
D resources/videojs/lang/fi.js
D resources/videojs/lang/fr.js
D resources/videojs/lang/hr.js
D resources/videojs/lang/hu.js
D resources/videojs/lang/it.js
D resources/videojs/lang/ja.js
D resources/videojs/lang/ko.js
D resources/videojs/lang/nb.js
D resources/videojs/lang/nl.js
D resources/videojs/lang/nn.js
D resources/videojs/lang/pl.js
D resources/videojs/lang/pt-BR.js
D resources/videojs/lang/ru.js
D resources/videojs/lang/sr.js
D resources/videojs/lang/sv.js
D resources/videojs/lang/tr.js
D resources/videojs/lang/uk.js
D resources/videojs/lang/vi.js
D resources/videojs/lang/zh-CN.js
D resources/videojs/lang/zh-TW.js
D resources/videojs/video-js.css
D resources/videojs/video-js.swf
D resources/videojs/video.js
40 files changed, 2 insertions(+), 29,869 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/94/320094/1


-- 
To view, visit https://gerrit.wikimedia.org/r/320094
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bd7385a532ba543f31d0d1764a40696572c03bb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Reedy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Remove excessive indenting

2016-11-06 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320093

Change subject: Remove excessive indenting
..

Remove excessive indenting

Add/fix some docblocks and param documentation

Change-Id: I319f6fb3986e755f34bd54e7880876cd67c58a43
---
M TimedMediaHandler.hooks.php
1 file changed, 124 insertions(+), 110 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/93/320093/1

diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index 5123520..199b317 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -39,108 +39,108 @@
 
$resourceModules = [
'mw.PopUpMediaTransform' => $baseExtensionResource + [
-   'scripts' => 
'resources/mw.PopUpThumbVideo.js',
-   'dependencies' => [
-   'mw.MwEmbedSupport',
-   'mediawiki.Title',
-   'mw.PopUpMediaTransform.styles'
-   ],
-   'position' => 'top',
+   'scripts' => 'resources/mw.PopUpThumbVideo.js',
+   'dependencies' => [
+   'mw.MwEmbedSupport',
+   'mediawiki.Title',
+   'mw.PopUpMediaTransform.styles'
],
+   'position' => 'top',
+   ],
'mw.PopUpMediaTransform.styles' => 
$baseExtensionResource + [
-   'position' => 'top',
-   'styles' => 
'resources/PopUpThumbVideo.css',
-   ],
+   'position' => 'top',
+   'styles' => 'resources/PopUpThumbVideo.css',
+   ],
'mw.TMHGalleryHook.js' => $baseExtensionResource + [
-   'scripts' => 
'resources/mw.TMHGalleryHook.js',
-   // position top needed as it needs to 
load before mediawiki.page.gallery
-   'position' => 'top',
-   ],
+   'scripts' => 'resources/mw.TMHGalleryHook.js',
+   // position top needed as it needs to load 
before mediawiki.page.gallery
+   'position' => 'top',
+   ],
'ext.tmh.embedPlayerIframe' => $baseExtensionResource + 
[
-   'scripts' => 
'resources/ext.tmh.embedPlayerIframe.js',
-   'dependencies' => [
-   'jquery.embedPlayer',
-   'mw.MwEmbedSupport',
-   ],
+   'scripts' => 
'resources/ext.tmh.embedPlayerIframe.js',
+   'dependencies' => [
+   'jquery.embedPlayer',
+   'mw.MwEmbedSupport',
],
+   ],
"mw.MediaWikiPlayerSupport" =>  $baseExtensionResource 
+ [
-   'scripts' => 
'resources/mw.MediaWikiPlayerSupport.js',
-   'dependencies'=> [
-   'mw.Api',
-   'mw.MwEmbedSupport',
-   ],
+   'scripts' => 
'resources/mw.MediaWikiPlayerSupport.js',
+   'dependencies'=> [
+   'mw.Api',
+   'mw.MwEmbedSupport',
],
+   ],
// adds support MediaWikiPlayerSupport player bindings
"mw.MediaWikiPlayer.loader" => $baseExtensionResource + 
[
-   'scripts' => 
'resources/mw.MediaWikiPlayer.loader.js',
-   'dependencies' => [
-   "mw.EmbedPlayer.loader",
-   "mw.TimedText.loader",
-   ],
-   'position' => 'top',
+   'scripts' => 
'resources/mw.MediaWikiPlayer.loader.js',
+   'dependencies' => [
+

[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Remove minified videojs-responsive-layout.js

2016-11-06 Thread Reedy (Code Review)

Reedy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320092

Change subject: Remove minified videojs-responsive-layout.js
..

Remove minified videojs-responsive-layout.js

RL will minify where necessary

Change-Id: Ifdbec9bdea0bf85f2e8f338f40b1dd44f5e0156f
---
D resources/videojs-responsive-layout/videojs-responsive-layout.min.js
1 file changed, 0 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/92/320092/1

diff --git 
a/resources/videojs-responsive-layout/videojs-responsive-layout.min.js 
b/resources/videojs-responsive-layout/videojs-responsive-layout.min.js
deleted file mode 100644
index 5715da4..000
--- a/resources/videojs-responsive-layout/videojs-responsive-layout.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * videojs-responsive-layout
- * @version 1.1.1
- * @copyright 2016 Derk-Jan Hartman
- * @license (MIT OR Apache-2.0)
- */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof 
module)module.exports=e();else if("function"==typeof 
define&)define([],e);else{var t;t="undefined"!=typeof 
window?window:"undefined"!=typeof global?global:"undefined"!=typeof 
self?self:this,t.videojsResponsiveLayout=e()}}(function(){return function 
e(t,n,o){function i(u,a){if(!n[u]){if(!t[u]){var l="function"==typeof 
require&if(!a&)return l(u,!0);if(r)return r(u,!0);var s=new 
Error("Cannot find module '"+u+"'");throw s.code="MODULE_NOT_FOUND",s}var 
f=n[u]={exports:{}};t[u][0].call(f.exports,function(e){var n=t[u][1][e];return 
i(n?n:e)},f,f.exports,e,t,n,o)}return n[u].exports}for(var r="function"==typeof 
require&,u=0;ue?o():t!==!0&&(u=setTimeout(i?r:o,void 0===i?e-s:e))}var 
u,a=0;return"boolean"!=typeof t&&(i=n,n=t,t=void 
0),o&&&(r.guid=n.guid=n.guid||o.guid++),r}},{jquery:1}],5:[function(e,t,n){(function(o){"use
 strict";function i(e){return e&__esModule?e:{"default":e}}function 
r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a 
function")}Object.defineProperty(n,"__esModule",{value:!0});var 
u=function(){function e(e,t){for(var n=0;n0||e.offsetHeight>0},h=function w(){var e=function(e){var 
t=e.player.el(),n=e.options.layoutMap[e.currentLayout_];"defaults"!==n.layoutClassName&["default"].addClass(t,n.layoutClassName),e.options.layoutMap.forEach(function(n,o){o!==e.currentLayout_&&"defaults"!==n.layoutClassName&["default"].removeClass(t,n.layoutClassName)})},t=function(t,n,o,i){var
 
r=t.options.layoutMap;o>n&_>0?(t.currentLayout_--,e(t),window.setTimeout(w.bind(t),1)):t.currentLayout_=r[t.currentLayout_+1].width*i&&(t.currentLayout_++,e(t),window.setTimeout(w.bind(t),1))};if(this.el&&!this.player.usingNativeControls()&(this.el.querySelectorAll(".vjs-control-bar")[0])){var
 
n=this.getPlayerWidth(),o=this.getControlWidth(),i=this.getControlBarWidth();this.options.calculateLayout?this.options.calculateLayout(this,n,i,o):t(this,n,i,o)}},p=function(){function
 
e(t,n){r(this,e),this.player_=t,this.options_=n,this.currentLayout_=n.layoutMap.length-1,this.debouncedCheckSize_=s(n.debounceDelay,h)}return
 u(e,[{key:"ready",value:function(){var 
e=this;this.player.addClass("vjs-responsive-layout"),this.windowResizeListener_=window.addEventListener("resize",function(){return
 e.debouncedCheckSize_()}),this.player.on(["play","resize"],function(){return 
e.debouncedCheckSize_()}),this.player.on("dispose",function(){window.removeEventListener("resize",this.windowResizeListener_)}),this.player.trigger("resize")}},{key:"getControlWidth",value:function(){return

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Use mw.msg() for parameter substitution

2016-11-06 Thread Fomafix (Code Review)

Fomafix has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320091

Change subject: Use mw.msg() for parameter substitution
..

Use mw.msg() for parameter substitution

mw.msg() has already a parameter substitution of $1.
A separate .replace( '$1', ... ) is not necessary.

Change-Id: Ie77bddc4dfb60df36211ce821c1a6f7223cde706
---
M resources/js/ext.uls.ime.js
M resources/js/ext.uls.inputsettings.js
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/91/320091/1

diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index 8871346..5ebca05 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -301,7 +301,7 @@
helpHandler: function ( ime ) {
return $( '' )
.attr( {
-   href: mw.msg( 
'uls-ime-helppage' ).replace( '$1', ime ),
+   href: mw.msg( 
'uls-ime-helppage', ime ),
target: '_blank',
title: $.i18n( 
'ext-uls-ime-help' )
} )
diff --git a/resources/js/ext.uls.inputsettings.js 
b/resources/js/ext.uls.inputsettings.js
index dd3e871..f977530 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -189,7 +189,7 @@
$helplink = $( '' )
.addClass( 'uls-ime-help' )
.text( $.i18n( 'ext-uls-ime-help' ) )
-   .attr( 'href', mw.msg( 
'uls-ime-helppage' ).replace( '$1', imeId ) )
+   .attr( 'href', mw.msg( 
'uls-ime-helppage', imeId ) )
.attr( 'target', '_blank' );
if ( !inputmethod ) {
// The input method definition(rules) 
not loaded.

-- 
To view, visit https://gerrit.wikimedia.org/r/320091
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie77bddc4dfb60df36211ce821c1a6f7223cde706
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: DiscussionCount: revert previous change and fix typo

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: DiscussionCount: revert previous change and fix typo
..


DiscussionCount: revert previous change and fix typo

This reverts commit 319881 as there is a better approach in
BlueSpiceFoundation. Also fixed a typo in a variable name.

Change-Id: I4098f8475301baa2f5de6b99bbec0d33ef527cd9
---
M resources/components/skin.contentActions.js
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/components/skin.contentActions.js 
b/resources/components/skin.contentActions.js
index a7ce6e0..e18c9f2 100644
--- a/resources/components/skin.contentActions.js
+++ b/resources/components/skin.contentActions.js
@@ -1,9 +1,9 @@
 (function(mw, $){
$(function(){
if ( mw.config.get('wgIsArticle') === true && 
mw.config.get('wgArticleId') !== 0 ) {
-   bs.api.tasks.execSilent( 'wikipage', 
'getDiscussionCount', { "page_id": mw.config.get('wgArticleId') } ).done( 
function( repsonse ) {
-   if( repsonse.success ) {
-   var $discussAmount = $(' 
('+repsonse.payload+')');
+   bs.api.tasks.execSilent( 'wikipage', 
'getDiscussionCount' ).done( function( response ) {
+   if( response.success ) {
+   var $discussAmount = $(' 
('+response.payload+')');
$discussAmount.hide();
$discussAmount.appendTo( $('#ca-talk > 
a').first() );
$discussAmount.css( 'display', 'inline' 
).fadeIn();

-- 
To view, visit https://gerrit.wikimedia.org/r/320084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4098f8475301baa2f5de6b99bbec0d33ef527cd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: ApiWikiPageTasks: fixed notice

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ApiWikiPageTasks: fixed notice
..


ApiWikiPageTasks: fixed notice

When page_id or page_title is not set, the code used to produce
a php notice. Checking for availability of these variable now.

Change-Id: Id5030af14784cc8ab40d05fb0fbee414e5ad704b
---
M includes/api/BSApiWikiPageTasks.php
1 file changed, 5 insertions(+), 2 deletions(-)

Approvals:
  Robert Vogel: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/api/BSApiWikiPageTasks.php 
b/includes/api/BSApiWikiPageTasks.php
index d38396a..6850e46 100644
--- a/includes/api/BSApiWikiPageTasks.php
+++ b/includes/api/BSApiWikiPageTasks.php
@@ -376,8 +376,11 @@
 * @todo: Maybe have this logic in "parent::getTitle" altogether
 */
protected function getTitleFromTaskData( $oTaskData ) {
-   $oTitle = Title::newFromID( $oTaskData->page_id );
-   if ( $oTitle instanceof Title === false ) {
+   $oTitle = null;
+   if ( isset( $oTaskData->page_id ) ) {
+   $oTitle = Title::newFromID( $oTaskData->page_id );
+   }
+   if ( $oTitle instanceof Title === false && isset( 
$oTaskData->page_title ) ) {
$oTitle = Title::newFromText( $oTaskData->page_title );
}
if ( $oTitle instanceof Title === false ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/320085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id5030af14784cc8ab40d05fb0fbee414e5ad704b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Mglaser 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: On deleting the main page, remove the newsletter from DB too

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: On deleting the main page, remove the newsletter from DB too
..


On deleting the main page, remove the newsletter from DB too

Bug: T150114
Change-Id: Id38bc798a1e6cca411e8d75b334ce39b298d498d
---
M Newsletter.hooks.php
M extension.json
2 files changed, 37 insertions(+), 0 deletions(-)

Approvals:
  01tonythomas: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index d765bf1..4536962 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -174,4 +174,38 @@
$editPage->edit();
return false;
}
+
+   /**
+* @param WikiPage $wikiPage
+* @param User $user
+* @param string $reason
+* @param string $error
+* @param Status $status
+* @param $suppress
+* @return bool
+* @throws PermissionsError
+*/
+   public static function onArticleDelete( &$wikiPage, &$user, &$reason, 
&$error, Status &$status, $suppress) {
+   global $wgOut;
+   if ( !$wikiPage->getTitle()->inNamespace( NS_NEWSLETTER ) ) {
+   return true;
+   }
+   $newsletter = Newsletter::newFromName( 
$wikiPage->getTitle()->getText() );
+   if ( $newsletter ) {
+   if ( !$newsletter->canDelete( $user ) ) {
+   throw new PermissionsError( 'newsletter-delete' 
);
+   }
+   $success = NewsletterStore::getDefaultInstance()
+   ->deleteNewsletter( $newsletter, $reason );
+   if ( $success ) {
+   return $status->newGood();
+   } else {
+   // Show error message and allow resubmitting in 
case of failure
+   return $status->newFatal(
+   $wgOut->msg( 
'newsletter-delete-failure' )->rawParams( $newsletter->getName() )
+   );
+   }
+   }
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 6876d65..2e1c8af 100644
--- a/extension.json
+++ b/extension.json
@@ -157,6 +157,9 @@
],
"CustomEditor": [
"NewsletterHooks::onCustomEditor"
+   ],
+   "ArticleDelete": [
+   "NewsletterHooks::onArticleDelete"
]
},
"namespaces": [

-- 
To view, visit https://gerrit.wikimedia.org/r/320090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id38bc798a1e6cca411e8d75b334ce39b298d498d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: On deleting the main page, remove the newsletter from DB too

2016-11-06 Thread 01tonythomas (Code Review)

01tonythomas has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320090

Change subject: On deleting the main page, remove the newsletter from DB too
..

On deleting the main page, remove the newsletter from DB too

Change-Id: Id38bc798a1e6cca411e8d75b334ce39b298d498d
---
M Newsletter.hooks.php
M extension.json
2 files changed, 37 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/90/320090/1

diff --git a/Newsletter.hooks.php b/Newsletter.hooks.php
index d765bf1..4536962 100755
--- a/Newsletter.hooks.php
+++ b/Newsletter.hooks.php
@@ -174,4 +174,38 @@
$editPage->edit();
return false;
}
+
+   /**
+* @param WikiPage $wikiPage
+* @param User $user
+* @param string $reason
+* @param string $error
+* @param Status $status
+* @param $suppress
+* @return bool
+* @throws PermissionsError
+*/
+   public static function onArticleDelete( &$wikiPage, &$user, &$reason, 
&$error, Status &$status, $suppress) {
+   global $wgOut;
+   if ( !$wikiPage->getTitle()->inNamespace( NS_NEWSLETTER ) ) {
+   return true;
+   }
+   $newsletter = Newsletter::newFromName( 
$wikiPage->getTitle()->getText() );
+   if ( $newsletter ) {
+   if ( !$newsletter->canDelete( $user ) ) {
+   throw new PermissionsError( 'newsletter-delete' 
);
+   }
+   $success = NewsletterStore::getDefaultInstance()
+   ->deleteNewsletter( $newsletter, $reason );
+   if ( $success ) {
+   return $status->newGood();
+   } else {
+   // Show error message and allow resubmitting in 
case of failure
+   return $status->newFatal(
+   $wgOut->msg( 
'newsletter-delete-failure' )->rawParams( $newsletter->getName() )
+   );
+   }
+   }
+   return true;
+   }
 }
diff --git a/extension.json b/extension.json
index 6876d65..2e1c8af 100644
--- a/extension.json
+++ b/extension.json
@@ -157,6 +157,9 @@
],
"CustomEditor": [
"NewsletterHooks::onCustomEditor"
+   ],
+   "ArticleDelete": [
+   "NewsletterHooks::onArticleDelete"
]
},
"namespaces": [

-- 
To view, visit https://gerrit.wikimedia.org/r/320090
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id38bc798a1e6cca411e8d75b334ce39b298d498d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: on Creating a newsletter via Special:CreateNewsletter save i...

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: on Creating a newsletter via Special:CreateNewsletter save it 
correctly
..


on Creating a newsletter via Special:CreateNewsletter save it correctly

Bug: T150075
Change-Id: I178d5a01c0ad835ec6abae17072bf80ec0ccb32d
---
M includes/specials/SpecialNewsletterCreate.php
1 file changed, 18 insertions(+), 4 deletions(-)

Approvals:
  01tonythomas: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/specials/SpecialNewsletterCreate.php 
b/includes/specials/SpecialNewsletterCreate.php
index 84005fa..cd952fe 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -126,9 +126,23 @@
$newsletterCreated = $store->addNewsletter( $this->newsletter );
 
if ( $newsletterCreated ) {
-   $this->onPostCreation( $user );
-
-   return Status::newGood();
+   $title = Title::makeTitleSafe( NS_NEWSLETTER, trim( 
$data['Name'] ) );
+   $editSummaryMsg = $this->msg( 
'newsletter-create-editsummary' );
+   $result = NewsletterContentHandler::edit(
+   $title,
+   $data['Description'],
+   $input['mainpage'],
+   array( $user->getName() ),
+   $editSummaryMsg->inContentLanguage()->plain(),
+   $this->getContext()
+   );
+   if ( $result->isGood() ) {
+   $this->onPostCreation( $user );
+   return Status::newGood();
+   } else {
+   // The content creation was unsuccessful, lets 
rollback the newsletter from db
+   $store->rollBackNewsletterAddition( 
$this->newsletter );
+   }
}
 
// Couldn't insert to the DB..
@@ -147,7 +161,7 @@
}
 
public function onSuccess() {
-   $this->getOutput()->addWikiMsg( 
'newsletter-create-confirmation', $this->newsletter->getId() );
+   $this->getOutput()->addWikiMsg( 
'newsletter-create-confirmation', $this->newsletter->getName() );
}
 
public function doesWrites() {

-- 
To view, visit https://gerrit.wikimedia.org/r/320089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I178d5a01c0ad835ec6abae17072bf80ec0ccb32d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: on Creating a newsletter via Special:CreateNewsletter save i...

2016-11-06 Thread 01tonythomas (Code Review)

01tonythomas has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320089

Change subject: on Creating a newsletter via Special:CreateNewsletter save it 
correctly
..

on Creating a newsletter via Special:CreateNewsletter save it correctly

Bug: T150075
Change-Id: I178d5a01c0ad835ec6abae17072bf80ec0ccb32d
---
M includes/specials/SpecialNewsletterCreate.php
1 file changed, 18 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter 
refs/changes/89/320089/1

diff --git a/includes/specials/SpecialNewsletterCreate.php 
b/includes/specials/SpecialNewsletterCreate.php
index 84005fa..cd952fe 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -126,9 +126,23 @@
$newsletterCreated = $store->addNewsletter( $this->newsletter );
 
if ( $newsletterCreated ) {
-   $this->onPostCreation( $user );
-
-   return Status::newGood();
+   $title = Title::makeTitleSafe( NS_NEWSLETTER, trim( 
$data['Name'] ) );
+   $editSummaryMsg = $this->msg( 
'newsletter-create-editsummary' );
+   $result = NewsletterContentHandler::edit(
+   $title,
+   $data['Description'],
+   $input['mainpage'],
+   array( $user->getName() ),
+   $editSummaryMsg->inContentLanguage()->plain(),
+   $this->getContext()
+   );
+   if ( $result->isGood() ) {
+   $this->onPostCreation( $user );
+   return Status::newGood();
+   } else {
+   // The content creation was unsuccessful, lets 
rollback the newsletter from db
+   $store->rollBackNewsletterAddition( 
$this->newsletter );
+   }
}
 
// Couldn't insert to the DB..
@@ -147,7 +161,7 @@
}
 
public function onSuccess() {
-   $this->getOutput()->addWikiMsg( 
'newsletter-create-confirmation', $this->newsletter->getId() );
+   $this->getOutput()->addWikiMsg( 
'newsletter-create-confirmation', $this->newsletter->getName() );
}
 
public function doesWrites() {

-- 
To view, visit https://gerrit.wikimedia.org/r/320089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I178d5a01c0ad835ec6abae17072bf80ec0ccb32d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Test: Do not merge

2016-11-06 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320088

Change subject: Test: Do not merge
..

Test: Do not merge

Change-Id: I26b0b996854e20682f5cd478c9891109cd14d00e
---
M includes/installer/MysqlUpdater.php
M includes/installer/SqliteUpdater.php
A maintenance/archives/patch-l10n_cache-primary-key.sql
A maintenance/sqlite/archives/patch-l10n_cache-primary-key.sql
M maintenance/tables.sql
5 files changed, 18 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/88/320088/1

diff --git a/includes/installer/MysqlUpdater.php 
b/includes/installer/MysqlUpdater.php
index a637ce0..dd4a163 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -291,6 +291,7 @@
[ 'addField', 'change_tag', 'ct_id', 
'patch-change_tag-ct_id.sql' ],
[ 'addField', 'tag_summary', 'ts_id', 
'patch-tag_summary-ts_id.sql' ],
[ 'modifyField', 'recentchanges', 'rc_ip', 
'patch-rc_ip_modify.sql' ],
+   [ 'dropIndex', 'l10n_cache', 'lc_lang_key', 
'patch-l10n_cache-primary-key.sql' ],
];
}
 
diff --git a/includes/installer/SqliteUpdater.php 
b/includes/installer/SqliteUpdater.php
index 388c034..996a580 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -158,6 +158,7 @@

'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
[ 'addField', 'change_tag', 'ct_id', 
'patch-change_tag-ct_id.sql' ],
[ 'addField', 'tag_summary', 'ts_id', 
'patch-tag_summary-ts_id.sql' ],
+   [ 'dropIndex', 'l10n_cache', 'lc_lang_key', 
'patch-l10n_cache-primary-key.sql' ],
];
}
 
diff --git a/maintenance/archives/patch-l10n_cache-primary-key.sql 
b/maintenance/archives/patch-l10n_cache-primary-key.sql
new file mode 100644
index 000..2c5154f
--- /dev/null
+++ b/maintenance/archives/patch-l10n_cache-primary-key.sql
@@ -0,0 +1,7 @@
+--
+-- patch-l10n_cache-primary-key.sql
+--
+-- Bug T146591. Add l10n_cache primary key
+DROP INDEX IF EXISTS lc_lang_key;
+
+ALTER TABLE /*$wgDBprefix*/l10n_cache ADD PRIMARY KEY (lc_lang, lc_key);
diff --git a/maintenance/sqlite/archives/patch-l10n_cache-primary-key.sql 
b/maintenance/sqlite/archives/patch-l10n_cache-primary-key.sql
new file mode 100644
index 000..2c5154f
--- /dev/null
+++ b/maintenance/sqlite/archives/patch-l10n_cache-primary-key.sql
@@ -0,0 +1,7 @@
+--
+-- patch-l10n_cache-primary-key.sql
+--
+-- Bug T146591. Add l10n_cache primary key
+DROP INDEX IF EXISTS lc_lang_key;
+
+ALTER TABLE /*$wgDBprefix*/l10n_cache ADD PRIMARY KEY (lc_lang, lc_key);
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 03ce508..bcc44db 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1522,9 +1522,9 @@
   -- Cache key
   lc_key varchar(255) NOT NULL,
   -- Value
-  lc_value mediumblob NOT NULL
+  lc_value mediumblob NOT NULL,
+  PRIMARY KEY (lc_lang, lc_key)
 ) /*$wgDBTableOptions*/;
-CREATE INDEX /*i*/lc_lang_key ON /*_*/l10n_cache (lc_lang, lc_key);
 
 -- Table caching which local files a module depends on that aren't
 -- registered directly, used for fast retrieval of file dependency.

-- 
To view, visit https://gerrit.wikimedia.org/r/320088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26b0b996854e20682f5cd478c9891109cd14d00e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Tjlsangria 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add new modifyTable function to DatabaseUpdater

2016-11-06 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320087

Change subject: Add new modifyTable function to DatabaseUpdater
..

Add new modifyTable function to DatabaseUpdater

Reason is because there is no function that we can use to add public keys
on existing tables without dropping the table and recreating it.

For example this would be really good for
I85ab18bfa30e562e76253e3ef71653dbf46db041

Change-Id: Ief8e0290f537ae00ec892b0c90d9656c50bd8788
---
M includes/installer/DatabaseUpdater.php
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/87/320087/1

diff --git a/includes/installer/DatabaseUpdater.php 
b/includes/installer/DatabaseUpdater.php
index 6a702e9..91318d2 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -737,6 +737,22 @@
}
 
/**
+* Modify table on the database
+*
+* @param string $name Name of the table
+* @param string $patch Path to the patch file
+* @param bool $fullpath Whether to treat $patch path as a relative or 
not
+* @return bool False if this was skipped because schema changes are 
skipped
+*/
+   protected function modifyTable( $name, $patch, $fullpath = false ) {
+   if ( $this->db->tableExists( $name, __METHOD__ ) ) {
+   return $this->applyPatch( $patch, $fullpath, "Modifying 
$name table" );
+   }
+
+   return true;
+   }
+
+   /**
 * Add a new field to an existing table
 *
 * @param string $table Name of the table to modify

-- 
To view, visit https://gerrit.wikimedia.org/r/320087
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief8e0290f537ae00ec892b0c90d9656c50bd8788
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Don't bother testing data on direction key tests

2016-11-06 Thread Esanders (Code Review)

Esanders has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320086

Change subject: Don't bother testing data on direction key tests
..

Don't bother testing data on direction key tests

Also remove QUnit.expect counts as they are no longer required.

Change-Id: Ieb3eaf215a0512ba541fdea18e572a2ce34ddf73
---
M tests/ce/ve.ce.Surface.test.js
1 file changed, 4 insertions(+), 77 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/86/320086/1

diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index f6cb2b7..0743891 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -51,14 +51,16 @@
);
}
}
-   expectedData( data );
+   if ( expectedData ) {
+   expectedData( data );
+   assert.equalLinearData( model.getDocument().getFullData(), 
data, msg + ': data' );
+   }
 
expectedSelection = ve.dm.Selection.static.newFromJSON( 
model.getDocument(), expectedRangeOrSelection instanceof ve.Range ?
{ type: 'linear', range: expectedRangeOrSelection } :
expectedRangeOrSelection
);
 
-   assert.equalLinearData( model.getDocument().getFullData(), data, msg + 
': data' );
assert.equalHash( model.getSelection(), expectedSelection, msg + ': 
selection' );
view.destroy();
 };
@@ -520,8 +522,6 @@
}
];
 
-   QUnit.expect( cases.length * 2 );
-
for ( i = 0; i < cases.length; i++ ) {
ve.test.utils.runSurfaceHandleSpecialKeyTest(
assert, cases[ i ].htmlOrDoc, cases[ i 
].rangeOrSelection, cases[ i ].keys,
@@ -543,7 +543,6 @@
fromRow: 0
},
keys: [ 'ENTER' ],
-   expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 11 ),
msg: 'Enter to edit a table cell'
},
@@ -556,7 +555,6 @@
fromRow: 0
},
keys: [ 'ENTER', 'ESCAPE' ],
-   expectedData: function () {},
expectedRangeOrSelection: {
type: 'table',
tableRange: new ve.Range( 0, 171 ),
@@ -574,7 +572,6 @@
fromRow: 0
},
keys: [ 'ENTER', 'TAB' ],
-   expectedData: function () {},
expectedRangeOrSelection: {
type: 'table',
tableRange: new ve.Range( 0, 171 ),
@@ -592,7 +589,6 @@
fromRow: 0
},
keys: [ 'ENTER', 'SHIFT+TAB' ],
-   expectedData: function () {},
expectedRangeOrSelection: {
type: 'table',
tableRange: new ve.Range( 0, 171 ),
@@ -638,7 +634,6 @@
fromRow: 0
},
keys: [ 'UP' ],
-   expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 0 ),
msg: 'Up in first row of table moves out of 
table'
},
@@ -652,13 +647,10 @@
fromRow: 6
},
keys: [ 'DOWN' ],
-   expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 171 ),
msg: 'Down in last row of table moves out of 
table'
}
];
-
-   QUnit.expect( cases.length * 2 );
 
for ( i = 0; i < cases.length; i++ ) {
ve.test.utils.runSurfaceHandleSpecialKeyTest(
@@ -687,7 +679,6 @@
rangeOrSelection: new ve.Range( 2 ),
keys: [ 'LEFT' ],
forceSelection: new ve.Range( 1 ),
-   expectedData: function () {},
expectedRangeOrSelection: new ve.Range( 1 ),
msg: 'Cursor left in text'
},
@@ -696,7 +687,6 @@
rangeOrSelection: new ve.Range( 2 ),

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: ApiWikiPageTasks: fixed notice

2016-11-06 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320085

Change subject: ApiWikiPageTasks: fixed notice
..

ApiWikiPageTasks: fixed notice

When page_id or page_title is not set, the code used to produce
a php notice. Checking for availability of these variable now.

Change-Id: Id5030af14784cc8ab40d05fb0fbee414e5ad704b
---
M includes/api/BSApiWikiPageTasks.php
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/85/320085/1

diff --git a/includes/api/BSApiWikiPageTasks.php 
b/includes/api/BSApiWikiPageTasks.php
index d38396a..6850e46 100644
--- a/includes/api/BSApiWikiPageTasks.php
+++ b/includes/api/BSApiWikiPageTasks.php
@@ -376,8 +376,11 @@
 * @todo: Maybe have this logic in "parent::getTitle" altogether
 */
protected function getTitleFromTaskData( $oTaskData ) {
-   $oTitle = Title::newFromID( $oTaskData->page_id );
-   if ( $oTitle instanceof Title === false ) {
+   $oTitle = null;
+   if ( isset( $oTaskData->page_id ) ) {
+   $oTitle = Title::newFromID( $oTaskData->page_id );
+   }
+   if ( $oTitle instanceof Title === false && isset( 
$oTaskData->page_title ) ) {
$oTitle = Title::newFromText( $oTaskData->page_title );
}
if ( $oTitle instanceof Title === false ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/320085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5030af14784cc8ab40d05fb0fbee414e5ad704b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Mglaser 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceSkin[master]: DiscussionCount: revert previous change and fix typo

2016-11-06 Thread Mglaser (Code Review)

Mglaser has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320084

Change subject: DiscussionCount: revert previous change and fix typo
..

DiscussionCount: revert previous change and fix typo

This reverts commit 319881 as there is a better approach in
BlueSpiceFoundation. Also fixed a typo in a variable name.

Change-Id: I4098f8475301baa2f5de6b99bbec0d33ef527cd9
---
M resources/components/skin.contentActions.js
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin 
refs/changes/84/320084/1

diff --git a/resources/components/skin.contentActions.js 
b/resources/components/skin.contentActions.js
index a7ce6e0..e18c9f2 100644
--- a/resources/components/skin.contentActions.js
+++ b/resources/components/skin.contentActions.js
@@ -1,9 +1,9 @@
 (function(mw, $){
$(function(){
if ( mw.config.get('wgIsArticle') === true && 
mw.config.get('wgArticleId') !== 0 ) {
-   bs.api.tasks.execSilent( 'wikipage', 
'getDiscussionCount', { "page_id": mw.config.get('wgArticleId') } ).done( 
function( repsonse ) {
-   if( repsonse.success ) {
-   var $discussAmount = $(' 
('+repsonse.payload+')');
+   bs.api.tasks.execSilent( 'wikipage', 
'getDiscussionCount' ).done( function( response ) {
+   if( response.success ) {
+   var $discussAmount = $(' 
('+response.payload+')');
$discussAmount.hide();
$discussAmount.appendTo( $('#ca-talk > 
a').first() );
$discussAmount.css( 'display', 'inline' 
).fadeIn();

-- 
To view, visit https://gerrit.wikimedia.org/r/320084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4098f8475301baa2f5de6b99bbec0d33ef527cd9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Mglaser 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] translatewiki[master]: Add French (fr) as fallback for Atikamekw (atj)

2016-11-06 Thread Nemo bis (Code Review)

Nemo bis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320083

Change subject: Add French (fr) as fallback for Atikamekw (atj)
..

Add French (fr) as fallback for Atikamekw (atj)

Bug: T149093
Change-Id: I77647d6e8c71f95b8ea4006d3f13e0e2f22975d3
---
M FallbackSettings.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/83/320083/1

diff --git a/FallbackSettings.php b/FallbackSettings.php
index f459879..0e8db31 100644
--- a/FallbackSettings.php
+++ b/FallbackSettings.php
@@ -7,6 +7,7 @@
 $wgTranslateLanguageFallbacks['aro'] = 'es';
 $wgTranslateLanguageFallbacks['ary'] = 'ar';
 $wgTranslateLanguageFallbacks['as'] = 'bn';
+$wgTranslateLanguageFallbacks['atj'] = 'fr';
 $wgTranslateLanguageFallbacks['awa'] = [ 'hi' ];
 $wgTranslateLanguageFallbacks['ba'] = [ 'tt-cyrl', 'ru' ];
 $wgTranslateLanguageFallbacks['ban'] = [ 'id', 'jv' ];

-- 
To view, visit https://gerrit.wikimedia.org/r/320083
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77647d6e8c71f95b8ea4006d3f13e0e2f22975d3
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Nemo bis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Silence warnings

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Silence warnings
..


Silence warnings

Set value of self.site before refering to it

Bug: T146580
Change-Id: I60f757a9281810453caea66f6a50a9200765a439
---
M scripts/image.py
1 file changed, 3 insertions(+), 1 deletion(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/image.py b/scripts/image.py
index 59464b0..bfd3b32 100755
--- a/scripts/image.py
+++ b/scripts/image.py
@@ -120,6 +120,7 @@
 
 super(ImageRobot, self).__init__(self.generator, replacements,
  always=self.getOption('always'),
+ site=self.site,
  summary=summary)
 
 
@@ -156,7 +157,8 @@
 old_imagepage = pywikibot.FilePage(site, old_image)
 gen = pagegenerators.FileLinksGenerator(old_imagepage)
 preloadingGen = pagegenerators.PreloadingGenerator(gen)
-bot = ImageRobot(preloadingGen, old_image, new_image, **options)
+bot = ImageRobot(preloadingGen, old_image, new_image,
+ site=site, **options)
 bot.run()
 return True
 else:

-- 
To view, visit https://gerrit.wikimedia.org/r/316060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I60f757a9281810453caea66f6a50a9200765a439
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: OdysseasKr 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Bidi-isolate input method name in the input method selector

2016-11-06 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320082

Change subject: Bidi-isolate input method name in the input method selector
..

Bidi-isolate input method name in the input method selector

Without this isolation the input method name can be shown
incorrectly when its direction is different from the direction
of the "How to use" element.

This only breaks on Firefox; Chrome somehow shows it correctly
without isolation, but isolation makes sense in any case.

Change-Id: I3c906f4fdd259b94f909b36bab91474cae2971af
---
M resources/css/ext.uls.inputsettings.less
M resources/js/ext.uls.inputsettings.js
2 files changed, 11 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/82/320082/1

diff --git a/resources/css/ext.uls.inputsettings.less 
b/resources/css/ext.uls.inputsettings.less
index 09225e0..a6095bc 100644
--- a/resources/css/ext.uls.inputsettings.less
+++ b/resources/css/ext.uls.inputsettings.less
@@ -98,6 +98,11 @@
margin: 12px 0;
padding: 6px 10px;
background: #f0f0f0;
+
+   .uls-input-settings-name {
+   unicode-bidi: -moz-isolate;
+   unicode-bidi: isolate;
+   }
 }
 
 .uls-input-settings-inputmethods-list .mw-ui-radio {
diff --git a/resources/js/ext.uls.inputsettings.js 
b/resources/js/ext.uls.inputsettings.js
index dd3e871..9154f46 100644
--- a/resources/js/ext.uls.inputsettings.js
+++ b/resources/js/ext.uls.inputsettings.js
@@ -203,8 +203,12 @@
}
 
$imeLabel.append(
-   $( '' ).text( name ),
-   $( '' ).text( description ),
+   $( '' )
+   .addClass( 'uls-input-settings-name' )
+   .text( name ),
+   $( '' )
+   .addClass( 
'uls-input-settings-description' )
+   .text( description ),
$helplink
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/320082
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c906f4fdd259b94f909b36bab91474cae2971af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Required changes made in the file

2016-11-06 Thread Raspberrypy20 (Code Review)

Raspberrypy20 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320081

Change subject: Required changes made in the file
..

Required changes made in the file

Change-Id: I76979a804ae87b675a64e300620dfb343092d95b
---
A Question.php
1 file changed, 443 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz 
refs/changes/81/320081/1

diff --git a/Question.php b/Question.php
new file mode 100644
index 000..4c519d4
--- /dev/null
+++ b/Question.php
@@ -0,0 +1,443 @@
+mRequest = &$wgRequest;
+   $this->mQuestionId = $questionId;
+   $this->mBeingCorrected = $beingCorrected;
+   $this->mCaseSensitive = $caseSensitive;
+   $this->mParser = $parser;
+   $this->mState = ( $beingCorrected ) ? 'NA' : '';
+   $this->mType = 'multipleChoice';
+   $this->mCoef = 1;
+   $this->mProposalPattern = '`^([+-]) ?(.*)`';
+   $this->mCorrectionPattern   = '`^\|\|(.*)`';
+   $this->mCategoryPattern = '`^\|(\n|[^\|].*\n)`';
+   $this->mTextFieldPattern= '`\{ ([^\}]*?)(_([\d]*) ?| 
)\}`';
+   }
+
+   /**
+* Mutator of the question state
+*
+* @protected
+* @param $pState String:
+*/
+   function setState( $pState ) {
+   if (
+   $pState == 'error' ||
+   ( $pState == 'wrong' && $this->mState != 'error' ) ||
+   ( $pState == 'right' && ( $this->mState == 'NA' || 
$this->mState == 'na_right' ) ) ||
+   ( $pState == 'na_wrong' && ( $this->mState == 'NA' || 
$this->mState == 'na_right' ) ) ||
+   ( $pState == 'na_right' && ( $this->mState == 'NA' ) ) 
||
+   ( $pState == 'new_NA' && ( $this->mState == 'NA' || 
$this->mState == 'right' ) )
+   )
+   {
+   $this->mState = $pState;
+   }
+   # Special cases
+   if( ( $pState == 'na_wrong' && $this->mState == 'right' ) || ( 
$pState == 'right' && $this->mState == 'na_wrong' ) ) {
+   $this->mState = 'wrong';
+   }
+   return;
+   }
+
+   /**
+* Accessor of the question state.
+*
+* @protected
+*/
+   function getState() {
+   if ( $this->mState == 'na_right' ) {
+   return 'right';
+   } elseif ( $this->mState == 'na_wrong' || $this->mState == 
'new_NA' ) {
+   return 'NA';
+   } else {
+   return $this->mState;
+   }
+   }
+
+   /**
+* Convert the question's header into HTML.
+*
+* @param $input String: the quiz header in quiz syntax.
+* @return string
+*/
+   function parseHeader( $input ) {
+   $parametersPattern = '`\n\|([^\|].*)\s*$`';
+   $input = preg_replace_callback( $parametersPattern, array( 
$this, 'parseParameters' ), $input );
+   $splitHeaderPattern = '`\n\|\|`';
+   $unparsedHeader = preg_split( $splitHeaderPattern, $input );
+   $output = $this->mParser->recursiveTagParse( trim( 
$unparsedHeader[0] ) . "\n" );
+   if( array_key_exists( 1, $unparsedHeader ) ) {
+   $output .= '';
+   $output .= '' .
+   $this->mParser->recursiveTagParse( trim( 
$unparsedHeader[1] ) ) .
+   '';
+   $output .= '';
+   }
+   return $output;
+   }
+
+   /**
+* Determine the question's parameters.
+*
+* @param $matches Array: elements matching $parametersPattern
+*  $matches[0] are the 
potential question parameters.
+*/
+   function parseParameters( $matches ) {
+   $typePattern = '`t[yi]p[eo]?="(.*?)"`';
+   if( preg_match( $typePattern, $matches[1], $type ) ) {
+   # List of all object type code and the correspondant 
question type.
+   switch( $type[1] ) {
+   case '{}':
+   $this->mType = 'textField';
+   break;
+   case '()':
+   $this->mType = 'singleChoice';
+   break;
+   case '[]':
+   $this->mType = 'multipleChoice';
+   break;
+   }
+   }
+   $coefPattern = '`[ck]oef="(.*?)"`';
+

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2016-11-06T10:00:01+0000

2016-11-06 Thread WikidataBuilder (Code Review)

WikidataBuilder has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320080

Change subject: New Wikidata Build - 2016-11-06T10:00:01+
..

New Wikidata Build - 2016-11-06T10:00:01+

Change-Id: I6b78fb7a990bb7dfbf579826be04949eac62c8ee
---
M composer.lock
M extensions/Wikibase/client/i18n/hr.json
M extensions/Wikibase/client/i18n/ja.json
M extensions/Wikibase/repo/i18n/el.json
M extensions/Wikibase/repo/i18n/lt.json
M extensions/Wikibase/repo/i18n/nl.json
A extensions/WikimediaBadges/i18n/lij.json
M vendor/composer/installed.json
8 files changed, 42 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/80/320080/1

diff --git a/composer.lock b/composer.lock
index 749ef23..d095bf4 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1581,12 +1581,12 @@
 "source": {
 "type": "git",
 "url": 
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git;,
-"reference": "771c426014b4eb0c290e6fea0655779a70fdb80e"
+"reference": "082ffddb013866bb6c76e28f9c94f50ab53eb133"
 },
 "dist": {
 "type": "zip",
-"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/771c426014b4eb0c290e6fea0655779a70fdb80e;,
-"reference": "771c426014b4eb0c290e6fea0655779a70fdb80e",
+"url": 
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/082ffddb013866bb6c76e28f9c94f50ab53eb133;,
+"reference": "082ffddb013866bb6c76e28f9c94f50ab53eb133",
 "shasum": ""
 },
 "require": {
@@ -1660,7 +1660,7 @@
 "wikibaserepo",
 "wikidata"
 ],
-"time": "2016-11-04 21:53:29"
+"time": "2016-11-05 21:59:01"
 },
 {
 "name": "wikibase/wikimedia-badges",
@@ -1668,7 +1668,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikimediaBadges;,
-"reference": "a36b775e3f91ec62c7b52e504dafd41898917e7c"
+"reference": "2142f185c708a3e449189d03af06d2eb9bb3c6bd"
 },
 "require": {
 "php": ">=5.3.0"
@@ -1702,7 +1702,7 @@
 "support": {
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2016-11-01 21:52:51"
+"time": "2016-11-05 21:59:33"
 },
 {
 "name": "wikimedia/assert",
diff --git a/extensions/Wikibase/client/i18n/hr.json 
b/extensions/Wikibase/client/i18n/hr.json
index 7457eb6..f8eed6d 100644
--- a/extensions/Wikibase/client/i18n/hr.json
+++ b/extensions/Wikibase/client/i18n/hr.json
@@ -38,7 +38,7 @@
"wikibase-rc-hide-wikidata": "$1 {{WBREPONAME}}",
"wikibase-rc-hide-wikidata-hide": "sakrij",
"wikibase-rc-hide-wikidata-show": "prikaži",
-   "wikibase-rc-show-wikidata-pref": "Prikaži {{WBREPONAME}} promjene na 
popisu nedavnih promjena",
+   "wikibase-rc-show-wikidata-pref": "Prikaži promjene projekta 
{{WBREPONAME}} na popisu nedavnih promjena",
"wikibase-rc-wikibase-edit-letter": "D",
"wikibase-rc-wikibase-edit-title": "{{WBREPONAME}} uređivanje",
"wikibase-replicationnote": "Molimo Vas, vodite računa da može proći 
nekoliko minuta dok izmjene ne budu vidljive na svim wikijima.",
diff --git a/extensions/Wikibase/client/i18n/ja.json 
b/extensions/Wikibase/client/i18n/ja.json
index ed80b5b..269bbda 100644
--- a/extensions/Wikibase/client/i18n/ja.json
+++ b/extensions/Wikibase/client/i18n/ja.json
@@ -15,7 +15,7 @@
"tooltip-t-wikibase": "関連付けられたデータリポジトリ項目へのリンク",
"wikibase-after-page-move": 
"移動されたページにある言語リンクを維持するために、関連付けられた{{WBREPONAME}}項目を[$1 更新]することもできます。",
"wikibase-after-page-move-queued": "このページに関連付けられた[$1 
{{WBREPONAME}}項目]は、まもなく自動的に更新されます。これは瞬時には起きない場合があるので、気をつけてください。",
-   "wikibase-after-page-delete": "この操作によって[{{WBREPONAME}} 項目 
$1]からこのページへのリンクも取り除かれました。",
+   "wikibase-after-page-delete": "言語間リンクの整合性を保つため、[$1 
関連付けられた{{WBREPONAME}}の項目]からこのページへのリンクが取り除かれます。",
"wikibase-after-page-delete-queued": "このページに関連付けられた[$1 
{{WBREPONAME}}項目]は、自動的に更新されます。瞬時には更新されないかもしれないので、気をつけてください。",
"wikibase-comment-add": "{{WBREPONAME}}項目を作成しました。",
"wikibase-comment-remove": 
"関連付けられた{{WBREPONAME}}項目を削除しました。言語リンクを除去しました。",
diff --git a/extensions/Wikibase/repo/i18n/el.json 
b/extensions/Wikibase/repo/i18n/el.json
index 6d7ed63..d4b1bb2 100644
--- a/extensions/Wikibase/repo/i18n/el.json
+++ b/extensions/Wikibase/repo/i18n/el.json
@@ -27,6 +27,9 @@
"wikibase-save-inprogress": "Αποθηκεύεται...",
"wikibase-remove-inprogress": "Αφαιρείται...",
"wikibase-statementlistview-add":

[MediaWiki-commits] [Gerrit] mediawiki...UniversalLanguageSelector[master]: Localisation update from upstream

2016-11-06 Thread Amire80 (Code Review)

Amire80 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320079

Change subject: Localisation update from upstream
..

Localisation update from upstream

Update to commit
https://github.com/wikimedia/jquery.uls/commit/4806dbc58c6cc4bcd1954ee7f621044e20379c4b

Change-Id: Iebfa4b867701f7f83d8e07d184204c97b896904b
---
M lib/jquery.uls/i18n/ar.json
M lib/jquery.uls/i18n/bgn.json
M lib/jquery.uls/i18n/br.json
M lib/jquery.uls/i18n/is.json
M lib/jquery.uls/i18n/nah.json
M lib/jquery.uls/i18n/nl.json
M lib/jquery.uls/i18n/nso.json
7 files changed, 33 insertions(+), 23 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/79/320079/1

diff --git a/lib/jquery.uls/i18n/ar.json b/lib/jquery.uls/i18n/ar.json
index 1825157..0fb3dbb 100644
--- a/lib/jquery.uls/i18n/ar.json
+++ b/lib/jquery.uls/i18n/ar.json
@@ -5,7 +5,8 @@
"DRIHEM",
"ترجمان05",
"Hhaboh162002",
-   "Meno25"
+   "Meno25",
+   "ديفيد"
]
},
"uls-region-WW": "في جميع أنحاء العالم",
@@ -20,6 +21,6 @@
"uls-no-results-found": "لم يتم العثور على نتائج",
"uls-common-languages": "اللغات المقترحة",
"uls-no-results-suggestion-title": "قد تكون مهتما بما يلي:",
-   "uls-search-help": "يمكنك البحث مستخدما اسم اللغة، اسم السكريبت، رمز 
اللغة القياسي أو يمكنك التصفح حسب المنطقة.",
+   "uls-search-help": "يمكنك البحث مستخدما اسم اللغة، أو اسم السكريبت، أو 
رمز اللغة القياسي أو يمكنك التصفح حسب المنطقة.",
"uls-search-placeholder": "بحث عن لغة"
 }
diff --git a/lib/jquery.uls/i18n/bgn.json b/lib/jquery.uls/i18n/bgn.json
index c939621..5c3939d 100644
--- a/lib/jquery.uls/i18n/bgn.json
+++ b/lib/jquery.uls/i18n/bgn.json
@@ -1,7 +1,8 @@
 {
"@metadata": {
"authors": [
-   "Baloch Afghanistan"
+   "Baloch Afghanistan",
+   "Ibrahim khashrowdi"
]
},
"uls-region-WW": "بی موچین دونیایی تا",
@@ -12,9 +13,10 @@
"uls-region-AS": "آسیا",
"uls-region-ME": "خاورمیانه",
"uls-region-PA": "اقیانوس آرام",
+   "uls-region-all": "موچین زبانان",
"uls-no-results-found": "هیچ نتیجه ودئ نبوت",
-   "uls-common-languages": "رواجین زبانان",
+   "uls-common-languages": "پیشنهاد بوته‌این زبانان",
"uls-no-results-suggestion-title": "ممکن اینت علاقه‌مند بئیت:",
-   "uls-search-help": "شما ئه توانیت بی زبانی نامی اساسا،اسکریپت نامی، 
استاندارتین زبانی کودی یا بی اساس منطقه ئه بگردیت:",
-   "uls-search-placeholder": "گَشتین په زبان خاتیرا"
+   "uls-search-help": "شما ئه توانیت به زبانی نامئ اساسا، نامئ اسکریپت، 
زبانئ استاندارتین کود یا به منطقه‌ای اساسا بگردیت.",
+   "uls-search-placeholder": "گَشتین په یک زبانئ خاتیرا"
 }
diff --git a/lib/jquery.uls/i18n/br.json b/lib/jquery.uls/i18n/br.json
index 77858db..fb89a66 100644
--- a/lib/jquery.uls/i18n/br.json
+++ b/lib/jquery.uls/i18n/br.json
@@ -13,9 +13,10 @@
"uls-region-AS": "Azia",
"uls-region-ME": "Reter-Kreiz",
"uls-region-PA": "Habask",
+   "uls-region-all": "An holl yezhoù",
"uls-no-results-found": "N'eus bet kavet disoc'h ebet",
-   "uls-common-languages": "Yezhoù boutin",
+   "uls-common-languages": "Yezhoù aliet",
"uls-no-results-suggestion-title": "Gallout a reot bezañ dedennet gant 
:",
"uls-search-help": "Gallout a reot klask dre anv yezh, anv skript, kod 
yezh ISO pe gallout a reot klask dre rannvro.",
-   "uls-search-placeholder": "Klask yezh"
+   "uls-search-placeholder": "Klask ur yezh"
 }
diff --git a/lib/jquery.uls/i18n/is.json b/lib/jquery.uls/i18n/is.json
index d9fe2c1..d1d77da 100644
--- a/lib/jquery.uls/i18n/is.json
+++ b/lib/jquery.uls/i18n/is.json
@@ -12,9 +12,10 @@
"uls-region-AS": "Asía",
"uls-region-ME": "Mið-Austurlönd",
"uls-region-PA": "Kyrrahaf",
+   "uls-region-all": "Öll tungumál",
"uls-no-results-found": "Ekkert fannst",
"uls-common-languages": "Uppástungur að tungumálum",
"uls-no-results-suggestion-title": "Þú gætir haft áhuga á:",
"uls-search-help": "Þú getur leitað eftir nafni tungumáls, nafni 
skriftunar, ISO kóða tungumálsins eða þú getur leitað eftir svæði.",
-   "uls-search-placeholder": "Tungumála leit"
+   "uls-search-placeholder": "Leita eftir tungumáli"
 }
diff --git a/lib/jquery.uls/i18n/nah.json b/lib/jquery.uls/i18n/nah.json
index 8697582..2f34158 100644
--- a/lib/jquery.uls/i18n/nah.json
+++ b/lib/jquery.uls/i18n/nah.json
@@ -3,20 +3,22 @@
"authors": [
"Taresi",
"Teòtlalili",
-   "Ricardo gs"
+   "Ricardo gs",
+

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add documentaion for User 'my' permission

2016-11-06 Thread Harish halo (Code Review)

Harish halo has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320078

Change subject: Add documentaion for User 'my' permission
..

Add documentaion for User 'my' permission

Documentation for user 'my' rights is added at the end of the document,
Obtained from [[mw:Manual:User rights]].

bug: T69167
Change-Id: I825a0c203bd7a7d49ad096dae90f8724c66fcce7
---
M includes/DefaultSettings.php
1 file changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/78/320078/1

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 68e4f5d..32894bf 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -8462,6 +8462,24 @@
 ];
 
 /**
+ *User 'my' rights
+ *
+ *RightDescription 
Versions
+ *
+ *editmyusercssEdit your own user CSS files
1.22+
+ *editmyuserjs Edit your own user JavaScript files 
1.22+
+ *editmywatchlist  Edit your own watchlist. Note some actions will still 
+ * add pages even without this right.  
1.22+
+ *
+ *viewmywatchlist  View your own watchlist 
1.22+
+ *editmyprivateinfoEdit your own private data (e.g. email address, real 
name)  1.22+
+ *viewmyprivateinfoView your own private data (e.g. email address, real 
name)  1.22+
+ *editmyoptionsEdit your own preferences   
1.22+
+ * 
+ *All user groups have access to these rights by default
+ */
+
+/**
  * For really cool vim folding this needs to be at the end:
  * vim: foldmarker=@{,@} foldmethod=marker
  * @}

-- 
To view, visit https://gerrit.wikimedia.org/r/320078
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I825a0c203bd7a7d49ad096dae90f8724c66fcce7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Harish halo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: POC: Add Phan config file

2016-11-06 Thread Phuedx (Code Review)

Phuedx has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/320077

Change subject: POC: Add Phan config file
..

POC: Add Phan config file

Bug: T133664
Change-Id: I45089e4ec312cbe2c9ffe0dd0f5cbb9e502ea654
---
A .phan/config.php
1 file changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/77/320077/1

diff --git a/.phan/config.php b/.phan/config.php
new file mode 100644
index 000..a14e02e
--- /dev/null
+++ b/.phan/config.php
@@ -0,0 +1,30 @@
+ array_merge( $DEPENDENCIES_DIRECTORY_LIST, [
+   'includes/',
+   ] ),
+
+   'exclude_analysis_directory_list' => $DEPENDENCIES_DIRECTORY_LIST,
+
+   'ignore_undeclared_variables_in_global_scope' => true,
+];

-- 
To view, visit https://gerrit.wikimedia.org/r/320077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45089e4ec312cbe2c9ffe0dd0f5cbb9e502ea654
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: noreference.py: Add template for frwiki

2016-11-06 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: noreference.py: Add template for frwiki
..


noreference.py: Add template for frwiki

Change-Id: I246ee6d05474924d373d4ee331b594bac7f20fc5
---
M scripts/noreferences.py
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Xqt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/scripts/noreferences.py b/scripts/noreferences.py
index 7f49df5..112897a 100755
--- a/scripts/noreferences.py
+++ b/scripts/noreferences.py
@@ -130,6 +130,7 @@
 ],
 'fr': [
 u'Liens externes',
+u'Lien externe',
 u'Voir aussi',
 u'Notes'
 ],
@@ -425,6 +426,7 @@
 'dsb': u'{{referency}}',
 'fa': u'{{پانویس}}',
 'fi': u'{{viitteet}}',
+'fr': u'{{références}}',
 'he': u'{{הערות שוליים}}',
 'hsb': u'{{referency}}',
 'hu': u'{{Források}}',

-- 
To view, visit https://gerrit.wikimedia.org/r/320011
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I246ee6d05474924d373d4ee331b594bac7f20fc5
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Framawiki 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Xqt 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

79 matches

Mail list logo