[MediaWiki-commits] [Gerrit] Make descriptionview match the appropriate language direction - change (mediawiki...Wikibase)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164757
Change subject: Make descriptionview match the appropriate language direction
..
Make descriptionview match the appropriate language direction
Change-Id: Ic8e8a1fb0fd0ddcdd5a740248618d756856cdae9
---
M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
1 file changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/57/164757/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
index 51d098a..2d7067d 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
@@ -126,12 +126,19 @@
var self = this;
+ var dir = ( $.uls $.uls.data ) ?
+ $.uls.data.getDir( this.options.value.language ) :
+ $( 'html' ).prop( 'dir' );
+
var $input = $( 'input/' )
- // TODO: Inject correct placeholder via options
- .attr( 'placeholder', mw.msg(
- 'wikibase-description-edit-placeholder-language-aware',
- wb.getLanguageNameByCode( this.options.value.language )
- ) )
+ .attr( {
+ // TODO: Inject correct placeholder via options
+ placeholder: mw.msg(
+
'wikibase-description-edit-placeholder-language-aware',
+ wb.getLanguageNameByCode(
this.options.value.language )
+ ),
+ dir: dir
+ })
.on( 'eachchange.' + this.widgetName, function( event ) {
self._trigger( 'change' );
} );
--
To view, visit https://gerrit.wikimedia.org/r/164757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic8e8a1fb0fd0ddcdd5a740248618d756856cdae9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.ui: Collapse border in ui-helper-clearfix - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.ui: Collapse border in ui-helper-clearfix
..
jquery.ui: Collapse border in ui-helper-clearfix
Backport of upstream change released in jQuery UI v1.10.1
* http://bugs.jqueryui.com/ticket/8442
* https://github.com/jquery/jquery-ui/commit/cb42ee7ccd
This fixes the currently broken display of the media player in the
Listen template on en.wikipedia.org.
Bug: 71601
Change-Id: Ib3e0fc577c3f617955d6d12335a333587c6ddaa8
---
M resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
index 2e088ca..d4f7db3 100644
--- a/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
+++ b/resources/lib/jquery.ui/themes/smoothness/jquery.ui.core.css
@@ -14,7 +14,7 @@
.ui-helper-hidden { display: none; }
.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px;
margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height:
1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ; display:
table; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ; display:
table; border-collapse: collapse; }
.ui-helper-clearfix:after { clear: both; }
.ui-helper-clearfix { zoom: 1; }
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position:
absolute; opacity: 0; filter:Alpha(Opacity=0); }
--
To view, visit https://gerrit.wikimedia.org/r/164521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib3e0fc577c3f617955d6d12335a333587c6ddaa8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Kaldari rkald...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Mdale md...@wikimedia.org
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make buttons respond to :active events - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Make buttons respond to :active events
..
Make buttons respond to :active events
These changes mostly help with the use of these styles against static
HTML generated by PHP in the forthcoming implementation.
Bonus:
* Fix spacing issues with indicator-only buttons
* Don't render outlines while focused or active
Change-Id: Ia39647238756bc938127b11fc85e4652d039f4d9
---
M src/themes/apex/elements.less
M src/themes/mediawiki/elements.less
2 files changed, 46 insertions(+), 8 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index 4151669..f105903 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -10,7 +10,13 @@
.oo-ui-indicatorElement-indicator {
margin-right: -0.75em;
+ margin-left: -0.75em;
}
+ }
+
+ .oo-ui-labelElement .oo-ui-buttonElement-button
.oo-ui-indicatorElement-indicator,
+ .oo-ui-iconElement .oo-ui-buttonElement-button
.oo-ui-indicatorElement-indicator {
+ margin-left: 0;
}
.oo-ui-indicatorElement .oo-ui-buttonElement-button
.oo-ui-indicatorElement-indicator,
@@ -29,6 +35,8 @@
:hover,
:focus {
+ outline: none;
+
.oo-ui-iconElement-icon {
opacity: 1;
}
@@ -80,6 +88,7 @@
:hover,
:focus {
border-color: #aaa;
+ outline: none;
}
.oo-ui-labelElement-label {
@@ -87,6 +96,7 @@
}
}
+ .oo-ui-widget-enabled .oo-ui-buttonElement-button:active,
.oo-ui-buttonElement-active .oo-ui-buttonElement-button,
.oo-ui-buttonElement-pressed .oo-ui-buttonElement-button {
box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.07);
@@ -119,6 +129,7 @@
}
}
+ .oo-ui-widget-enabled
.oo-ui-buttonElement-button:active,
.oo-ui-buttonElement-active
.oo-ui-buttonElement-button,
.oo-ui-buttonElement-pressed
.oo-ui-buttonElement-button {
border: solid 1px #a6cee1;
@@ -136,6 +147,8 @@
border-color: #adcb89;
}
}
+
+ .oo-ui-widget-enabled
.oo-ui-buttonElement-button:active,
.oo-ui-buttonElement-active
.oo-ui-buttonElement-button,
.oo-ui-buttonElement-pressed
.oo-ui-buttonElement-button {
border: solid 1px #b8d892;
diff --git a/src/themes/mediawiki/elements.less
b/src/themes/mediawiki/elements.less
index 600574e..63454cb 100644
--- a/src/themes/mediawiki/elements.less
+++ b/src/themes/mediawiki/elements.less
@@ -10,7 +10,13 @@
.oo-ui-indicatorElement-indicator {
margin-right: -0.75em;
+ margin-left: -0.75em;
}
+ }
+
+ .oo-ui-labelElement .oo-ui-buttonElement-button
.oo-ui-indicatorElement-indicator,
+ .oo-ui-iconElement .oo-ui-buttonElement-button
.oo-ui-indicatorElement-indicator {
+ margin-left: 0;
}
.oo-ui-indicatorElement .oo-ui-buttonElement-button
.oo-ui-indicatorElement-indicator,
@@ -31,8 +37,15 @@
}
-frameless {
-.oo-ui-buttonElement-button .oo-ui-labelElement-label {
- margin-left: 0.25em;
+.oo-ui-buttonElement-button {
+ :hover,
+ :focus {
+ outline: none;
+ }
+
+.oo-ui-labelElement-label {
+ margin-left: 0.25em;
+ }
}
.oo-ui-widget-enabled {
@@ -66,6 +79,11 @@
margin: 0.1em 0;
padding: 0.3em 1.2em;
border-radius: 0.3em;
+
+ :hover,
+ :focus {
+ outline: none;
+ }
.oo-ui-transition(
background 0.1s ease-in-out,
@@ -109,6 +127,7 @@
[MediaWiki-commits] [Gerrit] Add LVS for citoid - change (operations/puppet)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164759
Change subject: Add LVS for citoid
..
Add LVS for citoid
10.2.2.19 (citoid.svc.eqiad.wmnet) on port 1970
Change-Id: I482f3bb9abbca5b8e8a243588f67d0b755d48cb6
---
M manifests/role/lvs.pp
M modules/lvs/manifests/configuration.pp
M modules/lvs/manifests/monitor.pp
3 files changed, 19 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/164759/1
diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index cdd10e4..796c4dc 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -50,6 +50,7 @@
$sip['swift'][$::site],
$sip['parsoid'][$::site],
$sip['mathoid'][$::site],
+$sip['citoid'][$::site],
$sip['search'][$::site],
],
diff --git a/modules/lvs/manifests/configuration.pp
b/modules/lvs/manifests/configuration.pp
index f3b8d20..acf73d8 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -238,6 +238,9 @@
'mathoid' = {
'eqiad' = 10.2.2.20,
},
+'citoid' = {
+'eqiad' = 10.2.2.19,
+},
},
'labs' = {
'text' = {
@@ -271,6 +274,7 @@
'dns_rec' = {},
'https' = {},
'mathoid' = {},
+'citoid' = {},
'misc_web' = {},
'mobile' = {},
'ocg' = {},
@@ -896,5 +900,18 @@
'IdleConnection' = $idleconnection_monitor_options,
},
},
+'citoid' = {
+'description' = 'Citation lookup service, citoid.svc.eqiad.wmnet',
+'class' = 'low-traffic',
+'sites' = [ 'eqiad' ],
+'ip' = $service_ips['citoid'][$::site],
+'port' = 1970,
+'bgp' = 'yes',
+'depool-threshold' = '.5',
+'monitors' = {
+'ProxyFetch' = { 'url' = [ 'http://citoid.svc.eqiad.wmnet' ]
},
+'IdleConnection' = $idleconnection_monitor_options,
+}
+}
}
}
diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp
index 6a7fc5d..44d4890 100644
--- a/modules/lvs/manifests/monitor.pp
+++ b/modules/lvs/manifests/monitor.pp
@@ -16,6 +16,7 @@
lvs::monitor_service_http { search.svc.eqiad.wmnet: ip_address =
10.2.2.30, check_command = check_http_on_port!9200, contact_group =
admins }
lvs::monitor_service_http { 'ocg.svc.eqiad.wmnet': ip_address =
$ip['ocg']['eqiad'], check_command =
check_http_lvs_on_port!ocg.svc.eqiad.wmnet!8000!/?command=health }
lvs::monitor_service_http { 'mathoid.svc.eqiad.wmnet': ip_address =
$ip['mathoid']['eqiad'], check_command =
check_http_lvs_on_port!mathoid.svc.eqiad.wmnet!10042 }
+lvs::monitor_service_http { 'citoid.svc.eqiad.wmnet': ip_address =
$ip['citoid']['eqiad'], check_command =
check_http_lvs_on_port!citoid.svc.eqiad.wmnet!1970 }
lvs::monitor_service_custom { search-pool1.svc.eqiad.wmnet: ip_address
= 10.2.2.11, port = 8123, description = LVS Lucene, check_command =
check_lucene }
lvs::monitor_service_custom { search-pool2.svc.eqiad.wmnet: ip_address
= 10.2.2.12, port = 8123, description = LVS Lucene, check_command =
check_lucene }
--
To view, visit https://gerrit.wikimedia.org/r/164759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I482f3bb9abbca5b8e8a243588f67d0b755d48cb6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add citoid module to sca1001 and sca1002 - change (operations/puppet)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164758
Change subject: Add citoid module to sca1001 and sca1002
..
Add citoid module to sca1001 and sca1002
Change-Id: I9c57d9b08ec4cfa794a64ff1772a6e1e2e2d206c
---
M manifests/site.pp
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/164758/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 99e4223..02bc5c7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -3054,11 +3054,14 @@
include standard
include role::mathoid::production
+include role::citoid::production
class { 'admin':
groups = [
'mathoid-roots',
- 'mathoid-admin'
+ 'mathoid-admin',
+ 'citoid-roots',
+ 'citoid-admin'
]
}
}
--
To view, visit https://gerrit.wikimedia.org/r/164758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c57d9b08ec4cfa794a64ff1772a6e1e2e2d206c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove space from the begin and the end of the heading - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review. https://gerrit.wikimedia.org/r/164760 Change subject: Remove space from the begin and the end of the heading .. Remove space from the begin and the end of the heading Whitespaces between the opening tag h1 and the content and between the content and the closing tag /h1 gets converted to a space when selecting the heading by a triple click and coping it to clipboard. See Ic9887a079734b28155f46ffaeedec02ff8ad81ca for skin Vector. Change-Id: If90928b5f66dc10e3e8024e31d96be25462e446c --- M includes/skins/SkinFallbackTemplate.php 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/60/164760/1 diff --git a/includes/skins/SkinFallbackTemplate.php b/includes/skins/SkinFallbackTemplate.php index 603ee5c..ea94fad 100644 --- a/includes/skins/SkinFallbackTemplate.php +++ b/includes/skins/SkinFallbackTemplate.php @@ -91,9 +91,7 @@ /form div class=mw-body role=main - h1 class=firstHeading - span dir=auto?php $this-html( 'title' ) ?/span - /h1 + h1 class=firstHeadingspan dir=auto?php $this-html( 'title' ) ?/span/h1 div class=mw-body-content ?php $this-html( 'bodytext' ) ? -- To view, visit https://gerrit.wikimedia.org/r/164760 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If90928b5f66dc10e3e8024e31d96be25462e446c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com Gerrit-Reviewer: Gerrit Patch Uploader gerritpatchuploa...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Introduce wb.getMwApiForRepo - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Introduce wb.getMwApiForRepo
..
Introduce wb.getMwApiForRepo
This is supposed to be a replacement for most usages of wb.RepoApi and
should help with handling recent and upcoming breaking changes to wb.RepoApi.
Change-Id: I24f69b7e5af50763826c3b3bc9c482fdfc714bf1
---
M client/resources/Resources.php
A client/resources/wikibase.client.getMwApiForRepo.js
M client/resources/wikibase.client.linkitem.init.js
3 files changed, 31 insertions(+), 5 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/resources/Resources.php b/client/resources/Resources.php
index ecdc010..ba5d402 100644
--- a/client/resources/Resources.php
+++ b/client/resources/Resources.php
@@ -8,6 +8,15 @@
);
return array(
+ 'wikibase.client.getMwRepoForApi' = $moduleTemplate + array(
+ 'scripts' = array(
+ 'wikibase.client.getMwRepoForApi.js'
+ ),
+ 'dependencies' = array(
+ 'mw.config.values.wbRepo',
+ 'wikibase.api.getLocationAgnosticMwApi',
+ )
+ ),
'wikibase.client.init' = $moduleTemplate + array(
'position' = 'top',
'skinStyles' = array(
diff --git a/client/resources/wikibase.client.getMwApiForRepo.js
b/client/resources/wikibase.client.getMwApiForRepo.js
new file mode 100644
index 000..e8238c4
--- /dev/null
+++ b/client/resources/wikibase.client.getMwApiForRepo.js
@@ -0,0 +1,19 @@
+/*
+ * @licence GNU GPL v2+
+ * @author: Adrian Lang adrian.l...@wikimedia.de
+ */
+( function( mw, wb ) {
+ 'use strict';
+
+ var MODULE = wb;
+
+ /**
+* @return {mediaWiki.Api}
+*/
+ MODULE.getMwApiForRepo = function() {
+ var repoConfig = mw.config.get( 'wbRepo' ),
+ repoApiEndpoint = repoConfig.url +
repoConfig.scriptPath + '/api.php',
+ mwApiForRepo = wikibase.api.getLocationAgnosticMwApi(
repoApiEndpoint );
+ return mwApiForRepo;
+ };
+}( mediaWiki, wikibase ) );
diff --git a/client/resources/wikibase.client.linkitem.init.js
b/client/resources/wikibase.client.linkitem.init.js
index 6b5e66b..ad7fce9 100644
--- a/client/resources/wikibase.client.linkitem.init.js
+++ b/client/resources/wikibase.client.linkitem.init.js
@@ -21,19 +21,17 @@
'jquery.wikibase.linkitem',
'mediawiki.Title',
'mw.config.values.wbRepo',
- 'wikibase.api.getLocationAgnosticMwApi'
+ 'wikibase.client.getMwRepoForApi',
],
function() {
$spinner.remove();
- var repoConfig = mw.config.get( 'wbRepo' ),
- repoApiEndpoint = repoConfig.url +
repoConfig.scriptPath + '/api.php',
- mwApiForRepo =
wikibase.api.getLocationAgnosticMwApi( repoApiEndpoint );
+ var repoConfig = mw.config.get( 'wbRepo' );
$linkItemLink
.show()
.linkitem( {
- mwApiForRepo: mwApiForRepo,
+ mwApiForRepo:
wikibase.getMwApiForRepo(),
pageTitle: ( new mw.Title(
mw.config.get( 'wgTitle' ),
mw.config.get(
'wgNamespaceNumber' )
--
To view, visit https://gerrit.wikimedia.org/r/163845
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I24f69b7e5af50763826c3b3bc9c482fdfc714bf1
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Ensure that the namenode directory exists before starting th... - change (operations...cdh)
Hello Ottomata, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/164761 to review the following change. Change subject: Ensure that the namenode directory exists before starting the namenode .. Ensure that the namenode directory exists before starting the namenode The namenode service does not start without the namenode directory. Change-Id: I8b6b4289b6810d12e66b1051985d2e7943545d33 --- M manifests/hadoop/namenode.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cdh refs/changes/61/164761/1 diff --git a/manifests/hadoop/namenode.pp b/manifests/hadoop/namenode.pp index f785e9c..dd597fb 100644 --- a/manifests/hadoop/namenode.pp +++ b/manifests/hadoop/namenode.pp @@ -51,6 +51,6 @@ hasstatus = true, hasrestart = true, alias = 'namenode', -require= Exec['hadoop-namenode-format'], +require= [Exec['hadoop-namenode-format'], File[$::cdh::hadoop::dfs_name_dir]] } } -- To view, visit https://gerrit.wikimedia.org/r/164761 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b6b4289b6810d12e66b1051985d2e7943545d33 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/cdh Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Declare datanode's mount directories only once - change (operations/puppet)
Hello Ottomata, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/164763 to review the following change. Change subject: Declare datanode's mount directories only once .. Declare datanode's mount directories only once The datanode_mounts was declared in both /etc/puppet/manifests/role/analytics/hadoop.pp:279 /etc/puppet/modules/cdh/manifests/hadoop/worker/paths.pp:49 which made puppet fail with “Duplicate declaration”. We drop the role's definition of it, as the directory is only needed on workers anyways. Change-Id: I33cd98361c6fba5e2874031a090867a1ec3b16c4 --- M manifests/role/analytics/hadoop.pp 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/63/164763/1 diff --git a/manifests/role/analytics/hadoop.pp b/manifests/role/analytics/hadoop.pp index ea3baa1..4c4fbe7 100644 --- a/manifests/role/analytics/hadoop.pp +++ b/manifests/role/analytics/hadoop.pp @@ -273,7 +273,6 @@ $hadoop_var_directory, $hadoop_journal_directory, $hadoop_data_directory, -$datanode_mounts, ]: ensure = 'directory', } -- To view, visit https://gerrit.wikimedia.org/r/164763 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33cd98361c6fba5e2874031a090867a1ec3b16c4 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: QChris christ...@quelltextlich.at Gerrit-Reviewer: Ottomata o...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Declare namenode directory only once - change (operations/puppet)
Hello Ottomata,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/164762
to review the following change.
Change subject: Declare namenode directory only once
..
Declare namenode directory only once
The namenode's base directory was declared in both
/etc/puppet/manifests/role/analytics/hadoop.pp:280
/etc/puppet/modules/cdh/manifests/hadoop/namenode.pp:36
which made puppet fail with “Duplicate declaration”. We drop the
role's definition of it, as the directory is only needed on namenodes
anyways.
Change-Id: I8a5a6de00731af2dadb8ab2b3d36ad43faf2f49c
---
M manifests/role/analytics/hadoop.pp
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/164762/1
diff --git a/manifests/role/analytics/hadoop.pp
b/manifests/role/analytics/hadoop.pp
index eed172f..ea3baa1 100644
--- a/manifests/role/analytics/hadoop.pp
+++ b/manifests/role/analytics/hadoop.pp
@@ -271,7 +271,6 @@
# below, I just create them here.
file { [
$hadoop_var_directory,
-$hadoop_name_directory,
$hadoop_journal_directory,
$hadoop_data_directory,
$datanode_mounts,
--
To view, visit https://gerrit.wikimedia.org/r/164762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a5a6de00731af2dadb8ab2b3d36ad43faf2f49c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris christ...@quelltextlich.at
Gerrit-Reviewer: Ottomata o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [DO NOT MERGE] Test commit to show thaht plain upload works - change (mediawiki...Metrolook)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/164764 Change subject: [DO NOT MERGE] Test commit to show thaht plain upload works .. [DO NOT MERGE] Test commit to show thaht plain upload works It was said that this project is broken. This commit should demonstrate that plain upload for review works. Change-Id: I3461104b1d7670ad7b71ef7b6221c08ef687509d --- A dummy 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook refs/changes/64/164764/1 diff --git a/dummy b/dummy new file mode 100644 index 000..e69de29 --- /dev/null +++ b/dummy -- To view, visit https://gerrit.wikimedia.org/r/164764 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3461104b1d7670ad7b71ef7b6221c08ef687509d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/Metrolook Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] For Postgres, force cast the pr_id column (an int) to text, ... - change (mediawiki/core)
Greg Sabino Mullane has uploaded a new change for review. https://gerrit.wikimedia.org/r/164765 Change subject: For Postgres, force cast the pr_id column (an int) to text, so we can safely compare it to the pr_value column (text). The uncasted comparison is no longer allowed by Postgres. Sadly, we have to carve out this exception because something like a general CA .. For Postgres, force cast the pr_id column (an int) to text, so we can safely compare it to the pr_value column (text). The uncasted comparison is no longer allowed by Postgres. Sadly, we have to carve out this exception because something like a general CAST() will not work: MySQL cannot cast to VARCHAR, and Oracle would need a cast to VARCHAR2. While we could in theory start adding a lot of attributes to the database class to prevent the hard-coded comparison to 'postgres', it seems of little use given the differences in databases here. Change-Id: I7b5f5ff7906c5f7f54f64a532eeb7570aacdcc66 --- M includes/specials/SpecialProtectedpages.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/65/164765/1 diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php index 0ba7385..bfcc5d3 100644 --- a/includes/specials/SpecialProtectedpages.php +++ b/includes/specials/SpecialProtectedpages.php @@ -541,7 +541,8 @@ 'join_conds' = array( 'log_search' = array( 'LEFT JOIN', array( - 'ls_field' = 'pr_id', 'ls_value = pr_id' + 'ls_field' = 'pr_id', + $wgDBtype === 'postgres' ? 'ls_value = pr_id::text' : 'ls_value = pr_id' ) ), 'logging' = array( -- To view, visit https://gerrit.wikimedia.org/r/164765 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b5f5ff7906c5f7f54f64a532eeb7570aacdcc66 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Greg Sabino Mullane g...@turnstep.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent search engines from indexing user pages and all talk... - change (operations/mediawiki-config)
Calak has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164766
Change subject: Prevent search engines from indexing user pages and all talk
pages on ckbwiki
..
Prevent search engines from indexing user pages and all talk pages on ckbwiki
Bug: 71663
Change-Id: Ic09ad561e9a9cbb976f341101d42f444e7c92fa2
---
M wmf-config/InitialiseSettings.php
1 file changed, 14 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/66/164766/1
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index e248e27..d644028 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9368,6 +9368,20 @@
# ROBOT @{
'wgNamespaceRobotPolicies' = array(
+ 'ckbwiki' = array(
+ NS_TALK = 'noindex,follow',
+ NS_USER = 'noindex,follow',
+ NS_USER_TALK = 'noindex,follow',
+ NS_PROJECT_TALK = 'noindex,follow',
+ NS_IMAGE_TALK = 'noindex,follow',
+ NS_MEDIAWIKI_TALK = 'noindex,follow',
+ NS_TEMPLATE_TALK = 'noindex,follow',
+ NS_HELP_TALK = 'noindex,follow',
+ NS_CATEGORY_TALK = 'noindex,follow',
+ 101 = 'noindex,follow', // portal talk
+ 103 = 'noindex,follow', // wikiproject talk
+ 829 = 'noindex,follow', // module talk
+ ), // bug 71663
'dewiki' = array(
NS_TALK = 'noindex,follow',
NS_USER = 'noindex,follow', // Bug 36181
--
To view, visit https://gerrit.wikimedia.org/r/164766
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic09ad561e9a9cbb976f341101d42f444e7c92fa2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Calak calakw...@yahoo.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix reference snaks handling in ClaimHtmlGenerator - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164767
Change subject: Fix reference snaks handling in ClaimHtmlGenerator
..
Fix reference snaks handling in ClaimHtmlGenerator
If we pass $reference-getSnaks() as a constructor param
for ByPropertyIdArray, then in some situations the snaks
in the reference itself are getting cast to array and then
HashArray-setElement() has an array instead of SnakList
which causes an uncaught exception.
Instead storing $snaks as a local variable and converting
that to an array, when instantiating the ByPropertyIdArray,
then this issue is avoided and the code will be more robust.
Bug: 71479
Change-Id: Ia5e9e7d7f7010fd3a3faa73067d3075225cb91e5
---
M repo/includes/ClaimHtmlGenerator.php
1 file changed, 4 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/67/164767/1
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index 165f8e0..1ce9220 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -121,7 +121,7 @@
* @return string
*/
protected function getHtmlForQualifiers( Snaks $qualifiers, array
$entityInfo ) {
- $qualifiersByProperty = new ByPropertyIdArray( $qualifiers );
+ $qualifiersByProperty = new ByPropertyIdArray(
iterator_to_array( $qualifiers ) );
$qualifiersByProperty-buildIndex();
$snaklistviewsHtml = '';
@@ -171,7 +171,9 @@
* @return string
*/
protected function getHtmlForReference( $reference, array $entityInfo )
{
- $referenceSnaksByProperty = new ByPropertyIdArray(
$reference-getSnaks() );
+ $snaks = $reference-getSnaks();
+
+ $referenceSnaksByProperty = new ByPropertyIdArray(
iterator_to_array( $snaks ) );
$referenceSnaksByProperty-buildIndex();
$snaklistviewsHtml = '';
--
To view, visit https://gerrit.wikimedia.org/r/164767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5e9e7d7f7010fd3a3faa73067d3075225cb91e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve initialization of ext.inputBox.js - change (mediawiki...InputBox)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164768
Change subject: Improve initialization of ext.inputBox.js
..
Improve initialization of ext.inputBox.js
Change-Id: I45b6a6106ece16f069907076a8f1f635d95fd2df
---
M resources/ext.inputBox.js
1 file changed, 5 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/InputBox
refs/changes/68/164768/1
diff --git a/resources/ext.inputBox.js b/resources/ext.inputBox.js
index 9f9ac39..b8eaa07 100644
--- a/resources/ext.inputBox.js
+++ b/resources/ext.inputBox.js
@@ -8,10 +8,8 @@
( function ( $, mw ) {
'use strict';
mw.hook( 'wikipage.content' ).add( function( $content ) {
- var onChange,
- events = 'keyup input change';
-
- onChange = function() {
+ var $input = $content.find( '.createboxInput' ),
+ onChange = function() {
var $textbox = $( this ),
$submit = $textbox.data( 'form-submit' );
@@ -23,11 +21,7 @@
$submit.prop( 'disabled', $textbox.val().length 1 );
};
- $content
- .find( '.createboxInput' )
- .on( events, onChange )
- .trigger( 'keyup' )
- .off( events, onChange )
- .on( events, $.debounce( 50, onChange ) );
+ onChange.apply( $input );
+ $input.on( 'keyup input change', $.debounce( 50, onChange ) );
} );
-}( jQuery, mediaWiki ) );
\ No newline at end of file
+}( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/164768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I45b6a6106ece16f069907076a8f1f635d95fd2df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/InputBox
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move files into an includes folder - change (mediawiki...GlobalBlocking)
Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/164769 Change subject: Move files into an includes folder .. Move files into an includes folder This is the standard way of doing this and makes the extension's root much less messy. Change-Id: If25eae8fa99ea88fae3d9a5de34f4591dc0f7dfc --- M GlobalBlocking.php R includes/GlobalBlocking.class.php R includes/api/ApiGlobalBlock.php R includes/api/ApiQueryGlobalBlocks.php R includes/specials/SpecialGlobalBlock.php R includes/specials/SpecialGlobalBlockList.php R includes/specials/SpecialGlobalBlockStatus.php R includes/specials/SpecialRemoveGlobalBlock.php 8 files changed, 9 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalBlocking refs/changes/69/164769/1 diff --git a/GlobalBlocking.php b/GlobalBlocking.php index b1a06fc..6305420 100644 --- a/GlobalBlocking.php +++ b/GlobalBlocking.php @@ -16,7 +16,7 @@ * @author Andrew Garrett and...@epstone.net * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ -$dir = dirname( __FILE__ ); +$dir = __DIR__; $wgExtensionCredits['other'][] = array( 'path' = __FILE__, 'name' = 'GlobalBlocking', @@ -36,21 +36,21 @@ $wgHooks['SpecialContributionsBeforeMainOutput'][] = 'GlobalBlocking::onSpecialContributionsBeforeMainOutput'; $wgHooks['UserMergeAccountFields'][] = 'GlobalBlocking::onUserMergeAccountFields'; -$wgAutoloadClasses['SpecialGlobalBlock'] = $dir/SpecialGlobalBlock.php; +$wgAutoloadClasses['SpecialGlobalBlock'] = $dir/includes/specials/SpecialGlobalBlock.php; $wgSpecialPages['GlobalBlock'] = 'SpecialGlobalBlock'; -$wgAutoloadClasses['SpecialGlobalBlockList'] = $dir/SpecialGlobalBlockList.php; -$wgAutoloadClasses['GlobalBlockListPager'] = $dir/SpecialGlobalBlockList.php; +$wgAutoloadClasses['SpecialGlobalBlockList'] = $dir/includes/specials/SpecialGlobalBlockList.php; +$wgAutoloadClasses['GlobalBlockListPager'] = $dir/includes/specials/SpecialGlobalBlockList.php; $wgSpecialPages['GlobalBlockList'] = 'SpecialGlobalBlockList'; -$wgAutoloadClasses['SpecialGlobalBlockStatus'] = $dir/SpecialGlobalBlockStatus.php; +$wgAutoloadClasses['SpecialGlobalBlockStatus'] = $dir/includes/specials/SpecialGlobalBlockStatus.php; $wgSpecialPages['GlobalBlockStatus'] = 'SpecialGlobalBlockStatus'; -$wgAutoloadClasses['SpecialRemoveGlobalBlock'] = $dir/SpecialRemoveGlobalBlock.php; +$wgAutoloadClasses['SpecialRemoveGlobalBlock'] = $dir/includes/specials/SpecialRemoveGlobalBlock.php; $wgSpecialPages['RemoveGlobalBlock'] = 'SpecialRemoveGlobalBlock'; -$wgAutoloadClasses['ApiQueryGlobalBlocks'] = $dir/ApiQueryGlobalBlocks.php; +$wgAutoloadClasses['ApiQueryGlobalBlocks'] = $dir/includes/api/ApiQueryGlobalBlocks.php; $wgAPIListModules['globalblocks'] = 'ApiQueryGlobalBlocks'; -$wgAutoloadClasses['ApiGlobalBlock'] = $dir/ApiGlobalBlock.php; +$wgAutoloadClasses['ApiGlobalBlock'] = $dir/includes/api/ApiGlobalBlock.php; $wgAPIModules['globalblock'] = 'ApiGlobalBlock'; -$wgAutoloadClasses['GlobalBlocking'] = $dir/GlobalBlocking.class.php; +$wgAutoloadClasses['GlobalBlocking'] = $dir/includes/GlobalBlocking.class.php; $wgSpecialPageGroups['GlobalBlock'] = 'users'; $wgSpecialPageGroups['GlobalBlockList'] = 'users'; diff --git a/GlobalBlocking.class.php b/includes/GlobalBlocking.class.php similarity index 100% rename from GlobalBlocking.class.php rename to includes/GlobalBlocking.class.php diff --git a/ApiGlobalBlock.php b/includes/api/ApiGlobalBlock.php similarity index 100% rename from ApiGlobalBlock.php rename to includes/api/ApiGlobalBlock.php diff --git a/ApiQueryGlobalBlocks.php b/includes/api/ApiQueryGlobalBlocks.php similarity index 100% rename from ApiQueryGlobalBlocks.php rename to includes/api/ApiQueryGlobalBlocks.php diff --git a/SpecialGlobalBlock.php b/includes/specials/SpecialGlobalBlock.php similarity index 100% rename from SpecialGlobalBlock.php rename to includes/specials/SpecialGlobalBlock.php diff --git a/SpecialGlobalBlockList.php b/includes/specials/SpecialGlobalBlockList.php similarity index 100% rename from SpecialGlobalBlockList.php rename to includes/specials/SpecialGlobalBlockList.php diff --git a/SpecialGlobalBlockStatus.php b/includes/specials/SpecialGlobalBlockStatus.php similarity index 100% rename from SpecialGlobalBlockStatus.php rename to includes/specials/SpecialGlobalBlockStatus.php diff --git a/SpecialRemoveGlobalBlock.php b/includes/specials/SpecialRemoveGlobalBlock.php similarity index 100% rename from SpecialRemoveGlobalBlock.php rename to includes/specials/SpecialRemoveGlobalBlock.php -- To view, visit https://gerrit.wikimedia.org/r/164769 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If25eae8fa99ea88fae3d9a5de34f4591dc0f7dfc Gerrit-PatchSet: 1 Gerrit-Project:
[MediaWiki-commits] [Gerrit] Fix reference snaks handling in ClaimHtmlGenerator - change (mediawiki...Wikibase)
Jeroen De Dauw has submitted this change and it was merged.
Change subject: Fix reference snaks handling in ClaimHtmlGenerator
..
Fix reference snaks handling in ClaimHtmlGenerator
If we pass $reference-getSnaks() as a constructor param
for ByPropertyIdArray, then in some situations the snaks
in the reference itself are getting cast to array and then
HashArray-setElement() has an array instead of SnakList
which causes an uncaught exception.
Instead storing $snaks as a local variable and converting
that to an array, when instantiating the ByPropertyIdArray,
then this issue is avoided and the code will be more robust.
Bug: 71479
Change-Id: Ia5e9e7d7f7010fd3a3faa73067d3075225cb91e5
---
M repo/includes/ClaimHtmlGenerator.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jeroen De Dauw: Looks good to me, approved
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index 165f8e0..1ce9220 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -121,7 +121,7 @@
* @return string
*/
protected function getHtmlForQualifiers( Snaks $qualifiers, array
$entityInfo ) {
- $qualifiersByProperty = new ByPropertyIdArray( $qualifiers );
+ $qualifiersByProperty = new ByPropertyIdArray(
iterator_to_array( $qualifiers ) );
$qualifiersByProperty-buildIndex();
$snaklistviewsHtml = '';
@@ -171,7 +171,9 @@
* @return string
*/
protected function getHtmlForReference( $reference, array $entityInfo )
{
- $referenceSnaksByProperty = new ByPropertyIdArray(
$reference-getSnaks() );
+ $snaks = $reference-getSnaks();
+
+ $referenceSnaksByProperty = new ByPropertyIdArray(
iterator_to_array( $snaks ) );
$referenceSnaksByProperty-buildIndex();
$snaklistviewsHtml = '';
--
To view, visit https://gerrit.wikimedia.org/r/164767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e9e7d7f7010fd3a3faa73067d3075225cb91e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SVN exported r2730 from ShoutWiki SVN, /branches/jack/Challenge - change (mediawiki...Challenge)
Jack Phoenix has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164770
Change subject: SVN exported r2730 from ShoutWiki SVN, /branches/jack/Challenge
..
SVN exported r2730 from ShoutWiki SVN, /branches/jack/Challenge
This extension is still very much under development and not yet suitable
for a production wiki. See the extension's MediaWiki.org info page for
more details.
Change-Id: I87ae4147794558be54c570fd0b7f40c5faf1ae03
---
A Challenge.alias.php
A Challenge.class.php
A Challenge.php
A ChallengeAction.php
A ChallengeHistory.php
A ChallengeStandings.php
A ChallengeUser.php
A ChallengeView.php
A challenge.sql
A i18n/en.json
A i18n/fi.json
A resources/css/ext.challenge.history.css
A resources/css/ext.challenge.standings.css
A resources/css/ext.challenge.user.css
A resources/css/ext.challenge.view.css
A resources/images/userpageIcon.png
A resources/js/Challenge.js
A resources/js/DatePicker.js
A resources/js/ValidateDate.js
A templates/challengeuser.tmpl.php
A templates/challengeview.tmpl.php
21 files changed, 2,538 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Challenge
refs/changes/70/164770/1
diff --git a/Challenge.alias.php b/Challenge.alias.php
new file mode 100644
index 000..a93424a
--- /dev/null
+++ b/Challenge.alias.php
@@ -0,0 +1,27 @@
+?php
+/**
+ * Special page aliases for the Challenge extension.
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+$aliases = array();
+
+/** English */
+$aliases['en'] = array(
+ 'ChallengeAction' = array( 'ChallengeAction' ),
+ 'ChallengeHistory' = array( 'ChallengeHistory' ),
+ 'ChallengeStandings' = array( 'ChallengeStandings' ),
+ 'ChallengeUser' = array( 'ChallengeUser' ),
+ 'ChallengeView' = array( 'ChallengeView' ),
+);
+
+/** Finnish (Suomi) */
+$aliases['fi'] = array(
+ 'ChallengeAction' = array( 'Haastetoiminto' ),
+ 'ChallengeHistory' = array( 'Haastehistoria' ),
+ 'ChallengeStandings' = array( 'Haastetilastot' ),
+ 'ChallengeUser' = array( 'Haasta_käyttäjä' ),
+ 'ChallengeView' = array( 'Tarkastele_haastetta' ),
+);
\ No newline at end of file
diff --git a/Challenge.class.php b/Challenge.class.php
new file mode 100644
index 000..e580f86
--- /dev/null
+++ b/Challenge.class.php
@@ -0,0 +1,576 @@
+?php
+/**
+ * @file
+ */
+class Challenge {
+
+ public $rating_names = array(
+ 1 = 'positive',
+ -1 = 'negative',
+ 0 = 'neutral'
+ );
+
+ /**
+* Quickie wrapper function for sending out an email as properly
rendered
+* HTML instead of plaintext.
+*
+* The functions in this class that call this function used to use
+* User::sendMail(), but it was causing the mentioned bug, hence why
this
+* function had to be introduced.
+*
+* @see https://bugzilla.wikimedia.org/show_bug.cgi?id=68045
+* @see https://gerrit.wikimedia.org/r/#/c/146514/
+*
+* @param User $string User (object) whom to send an email
+* @param string $subject Email subject
+* @param $string $body Email contents (HTML)
+* @return Status object
+*/
+ public function sendMail( $user, $subject, $body ) {
+ global $wgPasswordSender;
+ $sender = new MailAddress( $wgPasswordSender,
+ wfMessage( 'emailsender' )-inContentLanguage()-text()
);
+ $to = new MailAddress( $user );
+ return UserMailer::send( $to, $sender, $subject, $body, null,
'text/html; charset=UTF-8' );
+ }
+
+ /**
+* Add a challenge to the database and send a challenge request mail to
the
+* challenged user.
+*
+* @param string $user_to Name of the person who was challenged
+* @param $info
+* @param $event_date
+* @param string $description User-supplied description of the challenge
+* @param string $win_terms User-supplied win terms
+* @param string $lose_terms User-supplied lose terms
+*/
+ public function addChallenge( $user_to, $info, $event_date,
$description, $win_terms, $lose_terms ) {
+ global $wgUser;
+
+ $user_id_to = User::idFromName( $user_to );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw-insert(
+ 'challenge',
+ array(
+ 'challenge_user_id_1' = $wgUser-getId(),
+ 'challenge_username1' = $wgUser-getName(),
+ 'challenge_user_id_2' = $user_id_to,
+ 'challenge_username2' = $user_to,
+ 'challenge_info' = $info,
+ 'challenge_description' = $description,
+
[MediaWiki-commits] [Gerrit] SVN exported r2730 from ShoutWiki SVN, /branches/jack/Challenge - change (mediawiki...Challenge)
Jack Phoenix has submitted this change and it was merged.
Change subject: SVN exported r2730 from ShoutWiki SVN, /branches/jack/Challenge
..
SVN exported r2730 from ShoutWiki SVN, /branches/jack/Challenge
This extension is still very much under development and not yet suitable
for a production wiki. See the extension's MediaWiki.org info page for
more details.
Change-Id: I87ae4147794558be54c570fd0b7f40c5faf1ae03
---
A Challenge.alias.php
A Challenge.class.php
A Challenge.php
A ChallengeAction.php
A ChallengeHistory.php
A ChallengeStandings.php
A ChallengeUser.php
A ChallengeView.php
A challenge.sql
A i18n/en.json
A i18n/fi.json
A resources/css/ext.challenge.history.css
A resources/css/ext.challenge.standings.css
A resources/css/ext.challenge.user.css
A resources/css/ext.challenge.view.css
A resources/images/userpageIcon.png
A resources/js/Challenge.js
A resources/js/DatePicker.js
A resources/js/ValidateDate.js
A templates/challengeuser.tmpl.php
A templates/challengeview.tmpl.php
21 files changed, 2,538 insertions(+), 0 deletions(-)
Approvals:
Jack Phoenix: Verified; Looks good to me, approved
diff --git a/Challenge.alias.php b/Challenge.alias.php
new file mode 100644
index 000..a93424a
--- /dev/null
+++ b/Challenge.alias.php
@@ -0,0 +1,27 @@
+?php
+/**
+ * Special page aliases for the Challenge extension.
+ *
+ * @file
+ * @ingroup Extensions
+ */
+
+$aliases = array();
+
+/** English */
+$aliases['en'] = array(
+ 'ChallengeAction' = array( 'ChallengeAction' ),
+ 'ChallengeHistory' = array( 'ChallengeHistory' ),
+ 'ChallengeStandings' = array( 'ChallengeStandings' ),
+ 'ChallengeUser' = array( 'ChallengeUser' ),
+ 'ChallengeView' = array( 'ChallengeView' ),
+);
+
+/** Finnish (Suomi) */
+$aliases['fi'] = array(
+ 'ChallengeAction' = array( 'Haastetoiminto' ),
+ 'ChallengeHistory' = array( 'Haastehistoria' ),
+ 'ChallengeStandings' = array( 'Haastetilastot' ),
+ 'ChallengeUser' = array( 'Haasta_käyttäjä' ),
+ 'ChallengeView' = array( 'Tarkastele_haastetta' ),
+);
\ No newline at end of file
diff --git a/Challenge.class.php b/Challenge.class.php
new file mode 100644
index 000..e580f86
--- /dev/null
+++ b/Challenge.class.php
@@ -0,0 +1,576 @@
+?php
+/**
+ * @file
+ */
+class Challenge {
+
+ public $rating_names = array(
+ 1 = 'positive',
+ -1 = 'negative',
+ 0 = 'neutral'
+ );
+
+ /**
+* Quickie wrapper function for sending out an email as properly
rendered
+* HTML instead of plaintext.
+*
+* The functions in this class that call this function used to use
+* User::sendMail(), but it was causing the mentioned bug, hence why
this
+* function had to be introduced.
+*
+* @see https://bugzilla.wikimedia.org/show_bug.cgi?id=68045
+* @see https://gerrit.wikimedia.org/r/#/c/146514/
+*
+* @param User $string User (object) whom to send an email
+* @param string $subject Email subject
+* @param $string $body Email contents (HTML)
+* @return Status object
+*/
+ public function sendMail( $user, $subject, $body ) {
+ global $wgPasswordSender;
+ $sender = new MailAddress( $wgPasswordSender,
+ wfMessage( 'emailsender' )-inContentLanguage()-text()
);
+ $to = new MailAddress( $user );
+ return UserMailer::send( $to, $sender, $subject, $body, null,
'text/html; charset=UTF-8' );
+ }
+
+ /**
+* Add a challenge to the database and send a challenge request mail to
the
+* challenged user.
+*
+* @param string $user_to Name of the person who was challenged
+* @param $info
+* @param $event_date
+* @param string $description User-supplied description of the challenge
+* @param string $win_terms User-supplied win terms
+* @param string $lose_terms User-supplied lose terms
+*/
+ public function addChallenge( $user_to, $info, $event_date,
$description, $win_terms, $lose_terms ) {
+ global $wgUser;
+
+ $user_id_to = User::idFromName( $user_to );
+
+ $dbw = wfGetDB( DB_MASTER );
+ $dbw-insert(
+ 'challenge',
+ array(
+ 'challenge_user_id_1' = $wgUser-getId(),
+ 'challenge_username1' = $wgUser-getName(),
+ 'challenge_user_id_2' = $user_id_to,
+ 'challenge_username2' = $user_to,
+ 'challenge_info' = $info,
+ 'challenge_description' = $description,
+ 'challenge_win_terms' = $win_terms,
+
[MediaWiki-commits] [Gerrit] [Splash] Add new message keys to ignore - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/164771 Change subject: [Splash] Add new message keys to ignore .. [Splash] Add new message keys to ignore https://gerrit.wikimedia.org/r/#/c/164691/1/i18n/en.json,unified Change-Id: I3b54a1c2f055bf4033c9edb85a5e9f0fbe008818 --- M groups/MediaWiki/mediawiki-skins.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/71/164771/1 diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index a323c9d..3d025cb 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -39,7 +39,7 @@ #Nostalgia Splash -ignored = site-banner +ignored = site-banner, global-links-menu, content-footer Vector optional = skinname-vector, vector.css, vector.js -- To view, visit https://gerrit.wikimedia.org/r/164771 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b54a1c2f055bf4033c9edb85a5e9f0fbe008818 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [Splash] Add new message keys to ignore - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [Splash] Add new message keys to ignore .. [Splash] Add new message keys to ignore https://gerrit.wikimedia.org/r/#/c/164691/1/i18n/en.json,unified Change-Id: I3b54a1c2f055bf4033c9edb85a5e9f0fbe008818 --- M groups/MediaWiki/mediawiki-skins.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index a323c9d..3d025cb 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -39,7 +39,7 @@ #Nostalgia Splash -ignored = site-banner +ignored = site-banner, global-links-menu, content-footer Vector optional = skinname-vector, vector.css, vector.js -- To view, visit https://gerrit.wikimedia.org/r/164771 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b54a1c2f055bf4033c9edb85a5e9f0fbe008818 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't add #undefined as redirectHash - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164772
Change subject: Don't add #undefined as redirectHash
..
Don't add #undefined as redirectHash
wgInternalRedirect contains the complete internal redirect, not only
the hash, which results into undefined, if there is no hash. Check for
this, before add the hash to toggle the section.
Follow up: I88f847b488d57c3c3f4dab6bac6cd41a371640de
Bug: 71573
Change-Id: Ie96f0a2a3315b619947b88b26042a09fa3e104ad
---
M javascripts/modules/toggling/toggle.js
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/72/164772/1
diff --git a/javascripts/modules/toggling/toggle.js
b/javascripts/modules/toggling/toggle.js
index 614fc75..852e349 100644
--- a/javascripts/modules/toggling/toggle.js
+++ b/javascripts/modules/toggling/toggle.js
@@ -120,15 +120,15 @@
} );
function checkHash() {
- var internalRedirect = mw.config.get(
'wgInternalRedirectTargetUrl' ),
+ var intRedirect = mw.config.get(
'wgInternalRedirectTargetUrl' ),
+ intRedirectHash = intRedirect ?
intRedirect.split( '#' )[1] : undefined,
hash = window.location.hash;
if ( hash.indexOf( '#' ) === 0 ) {
reveal( hash );
- } else if ( internalRedirect ) {
- internalRedirect = '#' +
internalRedirect.split( '#' )[1];
- window.location.hash = internalRedirect;
- reveal( internalRedirect );
+ } else if ( intRedirectHash ) {
+ window.location.hash = intRedirectHash;
+ reveal( intRedirectHash );
}
}
checkHash();
--
To view, visit https://gerrit.wikimedia.org/r/164772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie96f0a2a3315b619947b88b26042a09fa3e104ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add namespace alias on fa.wikivoyage - change (operations/mediawiki-config)
Calak has uploaded a new change for review. https://gerrit.wikimedia.org/r/164773 Change subject: Add namespace alias on fa.wikivoyage .. Add namespace alias on fa.wikivoyage Bug: 71668 Change-Id: I938f70c82950496910875eb4d1e7ab1ed5e0ec84 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/73/164773/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index e248e27..0337160 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -2820,6 +2820,10 @@ 'گفتگو_پدیدآورنده' = 103, 'ون' = NS_PROJECT, ), + '+fawikivoyage' = array( + 'وس' = NS_PROJECT, + 'عن' = 106, + ), // bug 71668 '+fawiktionary' = array( 'وو' = NS_PROJECT, ), -- To view, visit https://gerrit.wikimedia.org/r/164773 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I938f70c82950496910875eb4d1e7ab1ed5e0ec84 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Calak calakw...@yahoo.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug 71115: Mark Zhuang wiktionary (za) as obsolete - change (pywikibot/core)
Mpaa has uploaded a new change for review. https://gerrit.wikimedia.org/r/164774 Change subject: Bug 71115: Mark Zhuang wiktionary (za) as obsolete .. Bug 71115: Mark Zhuang wiktionary (za) as obsolete Remove za also from self.languages_by_size. Change-Id: I7c07a1f35e8e39490fb023b5c551d30bfab1ab4b --- M pywikibot/families/wiktionary_family.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/74/164774/1 diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index c28680b..bb2504f 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -29,7 +29,7 @@ 'ang', 'mn', 'co', 'tg', 'gn', 'mr', 'ug', 'csb', 'st', 'so', 'ia', 'sd', 'si', 'vec', 'kl', 'an', 'jbo', 'ln', 'fo', 'bn', 'zu', 'gv', 'kw', 'gu', 'rw', 'om', 'na', 'qu', 'ss', 'ie', 'mt', 'pa', -'roa-rup', 'iu', 'su', 'am', 'mi', 'za', 'ne', 'gd', 'tpi', 'yi', +'roa-rup', 'iu', 'su', 'am', 'mi', 'ne', 'gd', 'tpi', 'yi', 'ti', 'sg', 'tn', 'dv', 'ts', 'ha', 'ks', 'ay', ] -- To view, visit https://gerrit.wikimedia.org/r/164774 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c07a1f35e8e39490fb023b5c551d30bfab1ab4b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa mpaa.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bug 71115: Mark Zhuang wiktionary (za) as obsolete - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Bug 71115: Mark Zhuang wiktionary (za) as obsolete .. Bug 71115: Mark Zhuang wiktionary (za) as obsolete Remove za also from self.languages_by_size. Change-Id: I7c07a1f35e8e39490fb023b5c551d30bfab1ab4b --- M pywikibot/families/wiktionary_family.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index c28680b..bb2504f 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -29,7 +29,7 @@ 'ang', 'mn', 'co', 'tg', 'gn', 'mr', 'ug', 'csb', 'st', 'so', 'ia', 'sd', 'si', 'vec', 'kl', 'an', 'jbo', 'ln', 'fo', 'bn', 'zu', 'gv', 'kw', 'gu', 'rw', 'om', 'na', 'qu', 'ss', 'ie', 'mt', 'pa', -'roa-rup', 'iu', 'su', 'am', 'mi', 'za', 'ne', 'gd', 'tpi', 'yi', +'roa-rup', 'iu', 'su', 'am', 'mi', 'ne', 'gd', 'tpi', 'yi', 'ti', 'sg', 'tn', 'dv', 'ts', 'ha', 'ks', 'ay', ] -- To view, visit https://gerrit.wikimedia.org/r/164774 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7c07a1f35e8e39490fb023b5c551d30bfab1ab4b Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa mpaa.w...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164775
Change subject: Update Metrolook
..
Update Metrolook
Bumps version to 3.0 beta 4
Bumps required mediawiki version to 1.25
* Fixes bugs and improves other things. please see README.md for settings.
Change-Id: I13b0e99cc9651ed4968c4f423b9fd93cd78ca3c1
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M components/common.less
M components/navigation.less
M components/tabs.less
M images/arrow-collapsed-ltr.svg
M images/arrow-collapsed-rtl.svg
M images/arrow-expanded.svg
M images/external-link-ltr-icon.svg
M images/external-link-rtl-icon.svg
M images/unwatch-icon-hl.svg
M images/unwatch-icon.svg
M images/uploadlogo.svg
M images/watch-icon-hl.svg
M images/watch-icon-loading.svg
M images/watch-icon.svg
M screen-hd.less
M screen.less
A theme.css
21 files changed, 1,207 insertions(+), 114 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/75/164775/1
diff --git a/Metrolook.php b/Metrolook.php
index 6d8f357..a821720 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -1,7 +1,6 @@
?php
/**
- * Vector - Modern version of MonoBook with fresh look and many usability
- * improvements.
+ * Metrolook - Metro look for website.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '2.3.8',
+ 'version' = '3.0 beta 4',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -61,16 +60,49 @@
$GLOBALS['wgVectorUseIconWatch'] = true;
/* To enable logo. Note that if enabled it will not show properly.*/
-$GLOBALS['Logoshow'] = false;
+$GLOBALS['Logoshow'] = true;
/* to enable search bar on the sidebar and disables the search bar on the top
bar */
$GLOBALS['SearchBar'] = true;
+
+$GLOBALS['DownArrow'] = true;
+
+$GLOBALS['link1'] = true;
+
+$GLOBALS['image1'] = true;
+
+$GLOBALS['link2'] = true;
+
+$GLOBALS['image2'] = true;
+
+$GLOBALS['link3'] = true;
+
+$GLOBALS['image3'] = true;
+
+$GLOBALS['link4'] = true;
+
+$GLOBALS['image4'] = true;
+
+$GLOBALS['link5'] = false;
+
+$GLOBALS['image5'] = false;
+
+$GLOBALS['link6'] = false;
+
+$GLOBALS['image6'] = false;
+
+$GLOBALS['UploadButton'] = true;
+
+$GLOBALS['logo'] = false;
+
+$GLOBALS['transparent'] = __DIR__ . '/images/Transparent.gif';
// Register modules
$GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array(
'styles' = array(
'screen.less' = array( 'media' = 'screen' ),
'screen-hd.less' = array( 'media' = 'screen and (min-width:
982px)' ),
+ 'theme.css' = array( 'media' = 'screen' ),
),
'remoteSkinPath' = 'Metrolook',
'localBasePath' = __DIR__,
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 00fe118..9bd9c4c 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -1,7 +1,6 @@
?php
/**
- * Vector - Modern version of MonoBook with fresh look and many usability
- * improvements.
+ * Metrolook - Metro look for website.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -40,6 +39,34 @@
public function execute() {
global $Logoshow;
global $SearchBar;
+ global $DownArrow;
+ global $image1;
+ global $link1;
+ global $picture1;
+ global $url1;
+ global $image2;
+ global $link2;
+ global $picture2;
+ global $url2;
+ global $image3;
+ global $link3;
+ global $picture3;
+ global $url3;
+ global $image4;
+ global $link4;
+ global $picture4;
+ global $url4;
+ global $image5;
+ global $link5;
+ global $picture5;
+ global $url5;
+ global $image6;
+ global $link6;
+ global $picture6;
+ global $url6;
+ global $UploadButton;
+ global $logo;
+ global $transparent;
// Build additional attributes for navigation urls
$nav = $this-data['content_navigation'];
@@ -115,16 +142,16 @@
}
html,
body {
- margin: 0px 0px 0px 0px ;
- padding: 0px 0px 0px 0px ;
+ margin: 0px 0px 0px 0px;
+ padding: 0px 0px 0px 0px;
height:100%;
}
#top-tile-bar {
- background:transparent ;
-
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
..
Update Metrolook
Bumps version to 3.0 beta 4
Bumps required mediawiki version to 1.25
* Fixes bugs and improves other things. please see README.md for settings.
Change-Id: I13b0e99cc9651ed4968c4f423b9fd93cd78ca3c1
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
M SkinMetrolook.php
M components/common.less
M components/tabs.less
M images/arrow-collapsed-ltr.svg
M images/arrow-collapsed-rtl.svg
M images/arrow-expanded.svg
M images/uploadlogo.svg
M screen-hd.less
M screen.less
A theme.css
13 files changed, 268 insertions(+), 45 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index 6b8c178..a821720 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -1,7 +1,6 @@
?php
/**
- * Vector - Modern version of MonoBook with fresh look and many usability
- * improvements.
+ * Metrolook - Metro look for website.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -26,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '2.4',
+ 'version' = '3.0 beta 4',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -61,7 +60,7 @@
$GLOBALS['wgVectorUseIconWatch'] = true;
/* To enable logo. Note that if enabled it will not show properly.*/
-$GLOBALS['Logoshow'] = false;
+$GLOBALS['Logoshow'] = true;
/* to enable search bar on the sidebar and disables the search bar on the top
bar */
$GLOBALS['SearchBar'] = true;
@@ -92,11 +91,18 @@
$GLOBALS['image6'] = false;
+$GLOBALS['UploadButton'] = true;
+
+$GLOBALS['logo'] = false;
+
+$GLOBALS['transparent'] = __DIR__ . '/images/Transparent.gif';
+
// Register modules
$GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array(
'styles' = array(
'screen.less' = array( 'media' = 'screen' ),
'screen-hd.less' = array( 'media' = 'screen and (min-width:
982px)' ),
+ 'theme.css' = array( 'media' = 'screen' ),
),
'remoteSkinPath' = 'Metrolook',
'localBasePath' = __DIR__,
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index ffae9ce..9bd9c4c 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -1,7 +1,6 @@
?php
/**
- * Vector - Modern version of MonoBook with fresh look and many usability
- * improvements.
+ * Metrolook - Metro look for website.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -65,6 +64,9 @@
global $link6;
global $picture6;
global $url6;
+ global $UploadButton;
+ global $logo;
+ global $transparent;
// Build additional attributes for navigation urls
$nav = $this-data['content_navigation'];
@@ -228,7 +230,9 @@
});
});
/script
+script src=skins/Metrolook/overthrow.js/script
script src=/skins/Metrolook/overthrow.js/script
+script src=../skins/Metrolook/overthrow.js/script
div id=mw-page-base class=noprint/div
div id=mw-head-base class=noprint/div
div id=content class=mw-body class=overthrow role=main
@@ -380,7 +384,7 @@
else {
echo htmlspecialchars( $this-getSkin()-getUser()-getName() );
}
- ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em;
src=/skins/Metrolook/images/Transparent.gif //span/a
+ ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em; src=?php echo $transparent ?
onerror='this.onerror = null;
this.src=/skins/Metrolook/images/Transparent.gif' //span/a
div class=menu
style=position:absolute;top:40px;right:0px;margin:0;width:200px;
?php $this-renderNavigation( 'PERSONAL' ); ?
/div
@@ -392,7 +396,7 @@
?
/ul
/div
-div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div class=title-name
style=font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;?php echo
$GLOBALS['wgSitename'] ?/div/a/h4/divimg class=custom2
src=/skins/Metrolook/images/Transparent.gif style=float:left; /?php if (
$DownArrow ): ?img class=custom3
src=/skins/Metrolook/images/Transparent.gif
style=height:60px;width:27px;cursor:pointer;
onclick=toggleDiv('bartile');/?php else:
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164776
Change subject: Update Metrolook
..
Update Metrolook
* Fixes images not working localhost and website.
* Please see README.md for information on customizing and options
* Bumps version to 2.4.4
Change-Id: Ic22f87bafdf179bc4dcec725546bddfdf75b56d9
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
3 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/76/164776/1
diff --git a/Metrolook.php b/Metrolook.php
index b9b6795..5dd719a 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '2.4.3',
+ 'version' = '2.4.4',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -95,6 +95,8 @@
$GLOBALS['logo'] = false;
+$GLOBALS['transparent'] = __DIR__ . '/images/Transparent.gif';
+
// Register modules
$GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array(
'styles' = array(
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 865f8c5..9bd9c4c 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -66,6 +66,7 @@
global $url6;
global $UploadButton;
global $logo;
+ global $transparent;
// Build additional attributes for navigation urls
$nav = $this-data['content_navigation'];
@@ -230,6 +231,7 @@
});
/script
script src=skins/Metrolook/overthrow.js/script
+script src=/skins/Metrolook/overthrow.js/script
script src=../skins/Metrolook/overthrow.js/script
div id=mw-page-base class=noprint/div
div id=mw-head-base class=noprint/div
@@ -382,7 +384,7 @@
else {
echo htmlspecialchars( $this-getSkin()-getUser()-getName() );
}
- ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em;
src=skins/Metrolook/images/Transparent.gif onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif' //span/a
+ ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em; src=?php echo $transparent ?
onerror='this.onerror = null;
this.src=/skins/Metrolook/images/Transparent.gif' //span/a
div class=menu
style=position:absolute;top:40px;right:0px;margin:0;width:200px;
?php $this-renderNavigation( 'PERSONAL' ); ?
/div
@@ -394,7 +396,7 @@
?
/ul
/div
-?php if ( $logo ): ?div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?img alt=?php echo
$this-text('sitename'); ? src=?php echo $this-text('logopath') ?
style=max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;/div/h4/a?php else: ?div
style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div class=title-name
style=font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;?php echo
$GLOBALS['wgSitename'] ?/div/a/h4/div?php endif; ?img
class=custom2 src=skins/Metrolook/images/Transparent.gif
onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif' style=float:left;
/?php if ( $DownArrow ): ?img class=custom3
src=skins/Metrolook/images/Transparent.gif onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif'
style=height:60px;width:27px;cursor:pointer;
onclick=toggleDiv('bartile');/?php else: ??php endif; ?/div/div
+?php if ( $logo ): ?div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?img alt=?php echo
$this-text('sitename'); ? src=?php echo $this-text('logopath') ?
style=max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;/div/h4/a?php else: ?div
style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div class=title-name
style=font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display:
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
..
Update Metrolook
* Fixes images not working localhost and website.
* Please see README.md for information on customizing and options
* Bumps version to 2.4.4
Change-Id: Ic22f87bafdf179bc4dcec725546bddfdf75b56d9
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
3 files changed, 11 insertions(+), 9 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index b9b6795..5dd719a 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '2.4.3',
+ 'version' = '2.4.4',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -95,6 +95,8 @@
$GLOBALS['logo'] = false;
+$GLOBALS['transparent'] = __DIR__ . '/images/Transparent.gif';
+
// Register modules
$GLOBALS['wgResourceModules']['skins.metrolook.styles'] = array(
'styles' = array(
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index 865f8c5..9bd9c4c 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -66,6 +66,7 @@
global $url6;
global $UploadButton;
global $logo;
+ global $transparent;
// Build additional attributes for navigation urls
$nav = $this-data['content_navigation'];
@@ -230,6 +231,7 @@
});
/script
script src=skins/Metrolook/overthrow.js/script
+script src=/skins/Metrolook/overthrow.js/script
script src=../skins/Metrolook/overthrow.js/script
div id=mw-page-base class=noprint/div
div id=mw-head-base class=noprint/div
@@ -382,7 +384,7 @@
else {
echo htmlspecialchars( $this-getSkin()-getUser()-getName() );
}
- ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em;
src=skins/Metrolook/images/Transparent.gif onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif' //span/a
+ ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em; src=?php echo $transparent ?
onerror='this.onerror = null;
this.src=/skins/Metrolook/images/Transparent.gif' //span/a
div class=menu
style=position:absolute;top:40px;right:0px;margin:0;width:200px;
?php $this-renderNavigation( 'PERSONAL' ); ?
/div
@@ -394,7 +396,7 @@
?
/ul
/div
-?php if ( $logo ): ?div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?img alt=?php echo
$this-text('sitename'); ? src=?php echo $this-text('logopath') ?
style=max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;/div/h4/a?php else: ?div
style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div class=title-name
style=font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;?php echo
$GLOBALS['wgSitename'] ?/div/a/h4/div?php endif; ?img
class=custom2 src=skins/Metrolook/images/Transparent.gif
onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif' style=float:left;
/?php if ( $DownArrow ): ?img class=custom3
src=skins/Metrolook/images/Transparent.gif onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif'
style=height:60px;width:27px;cursor:pointer;
onclick=toggleDiv('bartile');/?php else: ??php endif; ?/div/div
+?php if ( $logo ): ?div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?img alt=?php echo
$this-text('sitename'); ? src=?php echo $this-text('logopath') ?
style=max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;/div/h4/a?php else: ?div
style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div class=title-name
style=font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;?php echo
$GLOBALS['wgSitename']
[MediaWiki-commits] [Gerrit] Undefined variable: attrs in HistoryAction.php on line 202 - change (mediawiki/core)
Umherirrender has uploaded a new change for review. https://gerrit.wikimedia.org/r/164777 Change subject: Undefined variable: attrs in HistoryAction.php on line 202 .. Undefined variable: attrs in HistoryAction.php on line 202 Replaced by an array() and removed an unused variable near by. Follow-Up: I61bb3c358f755ed9f2153d94b744c1a9da02c456 Change-Id: I5c4dc22e1e9346bfc410a9dda4353d5297a5825e --- M includes/actions/HistoryAction.php 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/77/164777/1 diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index dd0c94c..3be8aff 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -181,7 +181,6 @@ // Add the general form $action = htmlspecialchars( wfScript() ); - $className = 'historysubmit mw-history-compareselectedversions-button'; $out-addHTML( form action=\$action\ method=\get\ id=\mw-history-searchform\ . Xml::fieldset( @@ -199,7 +198,7 @@ $checkDeleted . Html::submitButton( $this-msg( 'allpagessubmit' )-text(), - $attrs, + array(), array( 'mw-ui-progressive' ) ) . \n . '/fieldset/form' -- To view, visit https://gerrit.wikimedia.org/r/164777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5c4dc22e1e9346bfc410a9dda4353d5297a5825e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164778
Change subject: Update Metrolook
..
Update Metrolook
* Fixes some bugs and fixes images.
* Bumps version to 1.3.1.
* Please see README.md for customising your top bar and for settings.
Change-Id: I5f34765b1283a5bb60a6fc8b40ac188f2b70bcd7
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
3 files changed, 38 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Metrolook
refs/changes/78/164778/1
diff --git a/Metrolook.php b/Metrolook.php
index 95605e4..277c098 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,11 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
+ HEAD
'version' = '1.3',
+===
+ 'version' = '1.3.1',
+ Update Metrolook
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -73,6 +77,12 @@
$UploadButton = true;
$logo = false;
+ HEAD
+===
+
+$transparent = __DIR__ . '/images/Transparent.gif';
+
+ Update Metrolook
// Register modules
$wgResourceModules['skins.metrolook.styles'] = array(
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index fb242b3..bdb579e 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -67,6 +67,10 @@
global $url6;
global $UploadButton;
global $logo;
+ HEAD
+===
+ global $transparent;
+ Update Metrolook
// Build additional attributes for navigation urls
$nav = $this-data['content_navigation'];
@@ -229,6 +233,10 @@
/script
script src=skins/Metrolook/overthrow.js/script
+ HEAD
+===
+script src=/skins/Metrolook/overthrow.js/script
+ Update Metrolook
script src=../skins/Metrolook/overthrow.js/script
div id=mw-page-base class=noprint/div
div id=mw-head-base class=noprint/div
@@ -313,7 +321,11 @@
else {
echo htmlspecialchars( $this-getSkin()-getUser()-getName() );
}
+ HEAD
?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em;
src=skins/Metrolook/images/Transparent.gif onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif' //span/a
+===
+ ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em; src=?php echo $transparent ?
onerror='this.onerror = null;
this.src=/skins/Metrolook/images/Transparent.gif' //span/a
+ Update Metrolook
div class=menu
style=position:absolute;top:40px;right:0px;margin:0;width:200px;
?php $this-renderNavigation( 'PERSONAL' ); ?
/div
@@ -325,7 +337,11 @@
?
/ul
/div
+ HEAD
?php if ( $logo ): ?div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?img alt=?php echo
$this-text('sitename'); ? src=?php echo $this-text('logopath') ?
style=max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;/div/h4/a?php else: ?div
style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div class=title-name
style=font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;?php echo
$GLOBALS['wgSitename'] ?/div/a/h4/div?php endif; ?img
class=custom2 src=skins/Metrolook/images/Transparent.gif
onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif' style=float:left;
/?php if ( $DownArrow ): ?img class=custom3
src=skins/Metrolook/images/Transparent.gif onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif'
style=height:60px;width:27px;cursor:pointer; onclick=toggleDiv('bartile');
/?php else: ??php endif; ?/div/div
+===
+?php if ( $logo ): ?div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?img alt=?php echo
$this-text('sitename'); ? src=?php echo $this-text('logopath') ?
style=max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;/div/h4/a?php else: ?div
style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div
[MediaWiki-commits] [Gerrit] Update Metrolook - change (mediawiki...Metrolook)
Paladox has submitted this change and it was merged.
Change subject: Update Metrolook
..
Update Metrolook
* Fixes some bugs and fixes images.
* Bumps version to 1.3.1.
* Please see README.md for customising your top bar and for settings.
Change-Id: I5f34765b1283a5bb60a6fc8b40ac188f2b70bcd7
---
M Metrolook.php
M MetrolookTemplate.php
M README.md
3 files changed, 13 insertions(+), 12 deletions(-)
Approvals:
Paladox: Verified; Looks good to me, approved
diff --git a/Metrolook.php b/Metrolook.php
index 95605e4..a2a3974 100644
--- a/Metrolook.php
+++ b/Metrolook.php
@@ -25,7 +25,7 @@
'path' = __FILE__,
'name' = 'Metrolook',
'description' = 'Metrolook skin for MediaWiki.',
- 'version' = '1.3',
+ 'version' = '1.3.1',
'url' = 'https://www.mediawiki.org/wiki/Skin:Metrolook',
'author' = array( 'immewnity', 'paladox2015', 'Craig Davison',
'lagleki' ),
'license-name' = 'GPLv2+',
@@ -74,6 +74,9 @@
$logo = false;
+$transparent = __DIR__ . '/images/Transparent.gif';
+
+
// Register modules
$wgResourceModules['skins.metrolook.styles'] = array(
'styles' = array(
diff --git a/MetrolookTemplate.php b/MetrolookTemplate.php
index fb242b3..a69ae45 100644
--- a/MetrolookTemplate.php
+++ b/MetrolookTemplate.php
@@ -67,6 +67,7 @@
global $url6;
global $UploadButton;
global $logo;
+ global $transparent;
// Build additional attributes for navigation urls
$nav = $this-data['content_navigation'];
@@ -229,6 +230,7 @@
/script
script src=skins/Metrolook/overthrow.js/script
+script src=/skins/Metrolook/overthrow.js/script
script src=../skins/Metrolook/overthrow.js/script
div id=mw-page-base class=noprint/div
div id=mw-head-base class=noprint/div
@@ -313,7 +315,7 @@
else {
echo htmlspecialchars( $this-getSkin()-getUser()-getName() );
}
- ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em;
src=skins/Metrolook/images/Transparent.gif onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif' //span/a
+ ?span style=word-spacing:4px; /spanimg class=custom4
style=position:relative;top:0.4em; src=?php echo $transparent ?
onerror='this.onerror = null;
this.src=/skins/Metrolook/images/Transparent.gif' //span/a
div class=menu
style=position:absolute;top:40px;right:0px;margin:0;width:200px;
?php $this-renderNavigation( 'PERSONAL' ); ?
/div
@@ -325,7 +327,7 @@
?
/ul
/div
-?php if ( $logo ): ?div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?img alt=?php echo
$this-text('sitename'); ? src=?php echo $this-text('logopath') ?
style=max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;/div/h4/a?php else: ?div
style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div class=title-name
style=font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;?php echo
$GLOBALS['wgSitename'] ?/div/a/h4/div?php endif; ?img
class=custom2 src=skins/Metrolook/images/Transparent.gif
onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif' style=float:left;
/?php if ( $DownArrow ): ?img class=custom3
src=skins/Metrolook/images/Transparent.gif onerror='this.onerror = null;
this.src=../skins/Metrolook/images/Transparent.gif'
style=height:60px;width:27px;cursor:pointer; onclick=toggleDiv('bartile');
/?php else: ??php endif; ?/div/div
+?php if ( $logo ): ?div style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?img alt=?php echo
$this-text('sitename'); ? src=?php echo $this-text('logopath') ?
style=max-width: 65px;height:auto; max-height:36px; display: inline-block;
vertical-align:middle; padding-right:5px;
padding-left:5px;/div/h4/a?php else: ?div
style=padding-left:10px;div class=lighthover
style=height:40px;float:left;div class=onhoverbg
style=height:40px;float:left;h4 class=title-namea href=?php echo
$this-data['nav_urls']['mainpage']['href']; ?div class=title-name
style=font-size: 0.9em;
padding-left:0.4em;padding-right:0.4em;color:white;max-width: auto;height:auto;
max-height:700px; display: inline-block; vertical-align:middle;?php echo
$GLOBALS['wgSitename'] ?/div/a/h4/div?php endif; ?img
class=custom2
[MediaWiki-commits] [Gerrit] Undefined variable: attrs in HistoryAction.php on line 202 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Undefined variable: attrs in HistoryAction.php on line 202 .. Undefined variable: attrs in HistoryAction.php on line 202 Replaced by an array() and removed an unused variable near by. Follow-Up: I61bb3c358f755ed9f2153d94b744c1a9da02c456 Change-Id: I5c4dc22e1e9346bfc410a9dda4353d5297a5825e --- M includes/actions/HistoryAction.php 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php index dd0c94c..3be8aff 100644 --- a/includes/actions/HistoryAction.php +++ b/includes/actions/HistoryAction.php @@ -181,7 +181,6 @@ // Add the general form $action = htmlspecialchars( wfScript() ); - $className = 'historysubmit mw-history-compareselectedversions-button'; $out-addHTML( form action=\$action\ method=\get\ id=\mw-history-searchform\ . Xml::fieldset( @@ -199,7 +198,7 @@ $checkDeleted . Html::submitButton( $this-msg( 'allpagessubmit' )-text(), - $attrs, + array(), array( 'mw-ui-progressive' ) ) . \n . '/fieldset/form' -- To view, visit https://gerrit.wikimedia.org/r/164777 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c4dc22e1e9346bfc410a9dda4353d5297a5825e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Umherirrender umherirrender_de...@web.de Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org Gerrit-Reviewer: Kaldari rkald...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add TeX annotation - change (mediawiki...mathoid)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164779
Change subject: Add TeX annotation
..
Add TeX annotation
Adds the the tex annotation to the MathML element.
Bug: 71673
Change-Id: I8f7718bf9d39dad4a49038b7cc8c25f5471ac072
---
M MathJax/unpacked/jax/input/TeX/jax.js
M mathoid.config.json
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid
refs/changes/79/164779/1
diff --git a/MathJax/unpacked/jax/input/TeX/jax.js
b/MathJax/unpacked/jax/input/TeX/jax.js
index a6a660c..43c1c4c 100644
--- a/MathJax/unpacked/jax/input/TeX/jax.js
+++ b/MathJax/unpacked/jax/input/TeX/jax.js
@@ -2087,7 +2087,7 @@
this.prefilterHooks.Execute(data); math = data.math;
try {
mml = TEX.Parse(math).mml();
-//mml =
MML.semantics(mml,MML.annotation(math).With({encoding:application/x-tex}));
+mml =
MML.semantics(mml,MML.annotation(math).With({encoding:application/x-tex}));
} catch(err) {
if (!err.texError) {throw err}
mml = this.formatError(err,math,display,script);
diff --git a/mathoid.config.json b/mathoid.config.json
index 69a88e3..0967ef4 100644
--- a/mathoid.config.json
+++ b/mathoid.config.json
@@ -1 +1 @@
-{}
+{}
--
To view, visit https://gerrit.wikimedia.org/r/164779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f7718bf9d39dad4a49038b7cc8c25f5471ac072
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tune Skin::preloadExistence - change (mediawiki/core)
Umherirrender has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164780
Change subject: Tune Skin::preloadExistence
..
Tune Skin::preloadExistence
Just preload user page and talk, when the personal bar is shown.
Use Skin::getRelevantTitle for the title to have the correct title
preloaded, when using for example [[Special:WhatLinksHere]].
Change-Id: I4363a9f3fd909cfdc341dc1a8c6c0189efd9b736
---
M includes/skins/Skin.php
1 file changed, 16 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/80/164780/1
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index e378278..c8c4ba4 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -239,25 +239,33 @@
* Preload the existence of three commonly-requested pages in a single
query
*/
function preloadExistence() {
+ $titles = array();
+
$user = $this-getUser();
+ $title = $this-getRelevantTitle();
// User/talk link
- $titles = array( $user-getUserPage(), $user-getTalkPage() );
+ if ( $user-isLoggedIn() || $this-showIPinHeader() ) {
+ $titles[] = $user-getUserPage();
+ $titles[] = $user-getTalkPage();
+ }
// Other tab link
- if ( $this-getTitle()-isSpecialPage() ) {
+ if ( $title-isSpecialPage() ) {
// nothing
- } elseif ( $this-getTitle()-isTalkPage() ) {
- $titles[] = $this-getTitle()-getSubjectPage();
+ } elseif ( $title-isTalkPage() ) {
+ $titles[] = $title-getSubjectPage();
} else {
- $titles[] = $this-getTitle()-getTalkPage();
+ $titles[] = $title-getTalkPage();
}
wfRunHooks( 'SkinPreloadExistence', array( $titles, $this ) );
- $lb = new LinkBatch( $titles );
- $lb-setCaller( __METHOD__ );
- $lb-execute();
+ if ( count( $titles ) ) {
+ $lb = new LinkBatch( $titles );
+ $lb-setCaller( __METHOD__ );
+ $lb-execute();
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/164780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4363a9f3fd909cfdc341dc1a8c6c0189efd9b736
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender umherirrender_de...@web.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add TeX annotation - change (mediawiki...mathoid)
Physikerwelt has submitted this change and it was merged.
Change subject: Add TeX annotation
..
Add TeX annotation
Adds the the tex annotation to the MathML element.
Bug: 71673
Change-Id: I8f7718bf9d39dad4a49038b7cc8c25f5471ac072
---
M MathJax/unpacked/jax/input/TeX/jax.js
M mathoid.config.json
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Frédéric Wang: Looks good to me, but someone else must approve
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MathJax/unpacked/jax/input/TeX/jax.js
b/MathJax/unpacked/jax/input/TeX/jax.js
index a6a660c..43c1c4c 100644
--- a/MathJax/unpacked/jax/input/TeX/jax.js
+++ b/MathJax/unpacked/jax/input/TeX/jax.js
@@ -2087,7 +2087,7 @@
this.prefilterHooks.Execute(data); math = data.math;
try {
mml = TEX.Parse(math).mml();
-//mml =
MML.semantics(mml,MML.annotation(math).With({encoding:application/x-tex}));
+mml =
MML.semantics(mml,MML.annotation(math).With({encoding:application/x-tex}));
} catch(err) {
if (!err.texError) {throw err}
mml = this.formatError(err,math,display,script);
diff --git a/mathoid.config.json b/mathoid.config.json
index 69a88e3..0967ef4 100644
--- a/mathoid.config.json
+++ b/mathoid.config.json
@@ -1 +1 @@
-{}
+{}
--
To view, visit https://gerrit.wikimedia.org/r/164779
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8f7718bf9d39dad4a49038b7cc8c25f5471ac072
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: Frédéric Wang fred.w...@free.fr
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improve the way mathematical formulas are exposed to screen ... - change (mediawiki...Math)
Physikerwelt has submitted this change and it was merged.
Change subject: Improve the way mathematical formulas are exposed to screen
readers.
..
Improve the way mathematical formulas are exposed to screen readers.
- Mark the png and svg fallback as aria-hidden=true.
- For browsers without good enough MathML visual rendering,
hide the math tag in a way that still makes it accessible to
screen readers.
Bug: 66537
Change-Id: I7ecf07a4da669d927e11265fd497a813786c6410
---
M MathMathML.php
M modules/ext.math.css
2 files changed, 20 insertions(+), 5 deletions(-)
Approvals:
Physikerwelt: Verified; Looks good to me, approved
diff --git a/MathMathML.php b/MathMathML.php
index 3d1a931..d4f19fe 100644
--- a/MathMathML.php
+++ b/MathMathML.php
@@ -393,7 +393,7 @@
if ( $class ) { $attribs['class'] = $class; }
if ( $style ) { $attribs['style'] = $style; }
// an alternative for svg might be an object with
type=image/svg+xml
- return Xml::element( 'img', $this-getAttributes( 'img',
$attribs , array( 'src' = $url ) ) );
+ return Xml::element( 'img', $this-getAttributes( 'img',
$attribs , array( 'src' = $url, 'aria-hidden' = 'true' ) ) );
}
diff --git a/modules/ext.math.css b/modules/ext.math.css
index dc3abde..72a9a35 100644
--- a/modules/ext.math.css
+++ b/modules/ext.math.css
@@ -8,8 +8,17 @@
@namespace m url('http://www.w3.org/1998/Math/MathML');
/* Default style for MathML. */
-.mwe-math-mathml-inline { display: none; }
-.mwe-math-mathml-display { display: none; margin-left: auto; margin-right:
auto; }
+.mwe-math-mathml-inline { display: inline !important; }
+.mwe-math-mathml-display { display: block !important; margin-left: auto;
margin-right: auto; }
+.mwe-math-mathml-inline, .mwe-math-mathml-display {
+/* We try to hide the MathML formula in a way that still makes it
accessible to screen readers. */
+clip: rect(1px, 1px, 1px, 1px);
+overflow: hidden;
+position: absolute;
+width: 1px;
+height: 1px;
+opacity: 0;
+}
m|math {
/* Try OpenType MATH fonts, the WOFF fallback and the old math fonts */
font-family: Cambria Math, Latin Modern Math, STIX Math,
LatinModernMathWOFF, MathJax_Main, STIXGeneral, serif;
@@ -48,8 +57,14 @@
@-moz-document url-prefix() {
/* For Gecko browsers, hide the SVG fallback and show the MathML instead.
We override the style for SVG and MathML above */
-.mwe-math-mathml-inline { display: inline !important; }
-.mwe-math-mathml-display { display: block !important; }
+.mwe-math-mathml-inline, .mwe-math-mathml-display {
+clip: auto;
+overflow: visible;
+position: static;
+width: auto;
+height: auto;
+opacity: 1;
+}
:root * .mwe-math-mathml-inline + img.mwe-math-fallback-svg-inline,
:root * .mwe-math-mathml-display + img.mwe-math-fallback-svg-display {
display: none !important; }
}
--
To view, visit https://gerrit.wikimedia.org/r/164736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ecf07a4da669d927e11265fd497a813786c6410
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Frédéric Wang fred.w...@free.fr
Gerrit-Reviewer: Frédéric Wang fred.w...@free.fr
Gerrit-Reviewer: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update usage of getTitleSnippet(), getRedirectSnippet() and ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update usage of getTitleSnippet(), getRedirectSnippet() and
getSectionSnippet()
..
Update usage of getTitleSnippet(), getRedirectSnippet() and getSectionSnippet()
According to I5aae8caf, the parameter is gone now. Found while
tracking down a strict warning in MWSearch.
Change-Id: I571e015814ea756771c66c243cb8db86448db463
---
M includes/api/ApiQuerySearch.php
M includes/specials/SpecialSearch.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index b7dcd0e..a4db57a 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -168,7 +168,7 @@
$vals['timestamp'] = wfTimestamp(
TS_ISO_8601, $result-getTimestamp() );
}
if ( isset( $prop['titlesnippet'] ) ) {
- $vals['titlesnippet'] =
$result-getTitleSnippet( $terms );
+ $vals['titlesnippet'] =
$result-getTitleSnippet();
}
if ( !is_null( $result-getRedirectTitle() ) ) {
if ( isset( $prop['redirecttitle'] ) ) {
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index adc248e..e3e2f4e 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -591,7 +591,7 @@
$title = $result-getTitle();
- $titleSnippet = $result-getTitleSnippet( $terms );
+ $titleSnippet = $result-getTitleSnippet();
if ( $titleSnippet == '' ) {
$titleSnippet = null;
--
To view, visit https://gerrit.wikimedia.org/r/162934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I571e015814ea756771c66c243cb8db86448db463
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix checkLocalNames - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164781
Change subject: Fix checkLocalNames
..
Fix checkLocalNames
Also cleanup in using __METHOD__ instead of __FUNCTION__, use
wfGetDB directly instead of wfGetLB.
Change-Id: Ic40e8cd2511491445f530faadd6fdf5a2873a5e2
(cherry picked from commit 605d61f786f73ebea6f8429108159af96f19933f)
---
M maintenance/checkLocalNames.php
1 file changed, 11 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/81/164781/1
diff --git a/maintenance/checkLocalNames.php b/maintenance/checkLocalNames.php
index ab1e6bc..50131a9 100644
--- a/maintenance/checkLocalNames.php
+++ b/maintenance/checkLocalNames.php
@@ -49,7 +49,7 @@
'localnames',
array( 'ln_wiki' ),
,
- __FUNCTION__,
+ __METHOD__,
array(
DISTINCT,
ORDER BY = ln_wiki ASC
@@ -63,7 +63,7 @@
// iterate through the wikis
foreach( $wikis as $wiki ) {
- $localdb = wfGetLB( $wiki )-getConnection( DB_SLAVE ,
array(), $wiki );
+ $localdb = wfGetDB( DB_SLAVE , array(), $wiki );
$lastUsername = ;
$this-output( Checking localnames for $wiki ...\n );
@@ -73,12 +73,12 @@
$this-output( \t ... querying from
'$lastUsername'\n );
$result = $centralSlave-select(
'localnames',
- array( 'ln_user' ),
+ array( 'ln_name' ),
array(
ln_wiki = $wiki,
-ln_user .
$centralSlave-addQuotes( $lastUsername )
+ln_name .
$centralSlave-addQuotes( $lastUsername )
),
- __FUNCTION__,
+ __METHOD__,
array(
LIMIT = $this-batchSize,
ORDER BY = ln_name ASC
@@ -90,14 +90,14 @@
$localUser = $localdb-select(
'user',
array( 'user_name' ),
- array( user_name =
$u-user_name ),
- __FUNCTION__
+ array( user_name =
$u-ln_name ),
+ __METHOD__
);
// check to see if the user did not
exist in the local user table
if( $localUser-numRows() == 0 ) {
if( $this-verbose ) {
- $this-output( Local
user not found for localname entry $u-user_name@$wiki\n );
+ $this-output( Local
user not found for localname entry $u-ln_name@$wiki\n );
}
$this-total++;
if( !$this-dryrun ){
@@ -106,15 +106,15 @@
'localnames',
array(
ln_wiki = $wiki,
-
ln_user = $u-user_name
+
ln_name = $u-ln_name
),
- __FUNCTION__
+ __METHOD__
);
// TODO: is there
anyway to check the success of the delete?
$this-deleted++;
}
}
- $lastUsername = $u-user_name;
+
[MediaWiki-commits] [Gerrit] category.py: consider also /doc subpages in template ns - change (pywikibot/core)
Mpaa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164782
Change subject: category.py: consider also /doc subpages in template ns
..
category.py: consider also /doc subpages in template ns
For templates, categories can be in /doc subpage.
Added the check of the /doc page as well.
Modified:
- textlib.removeDisabledParts()
- textlib.getCategoryLinks()
- page.change_category()
to optionally consider also categories in tags otherwise removed.
Also Pep257 fixes in textlib.py
bug 55017
Change-Id: I8faecb5f0de75c0f9b635815c6a73ac367bfb2f1
---
M pywikibot/page.py
M pywikibot/textlib.py
M scripts/category.py
3 files changed, 33 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/82/164782/1
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 7c1d9d3..013afd4 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1669,7 +1669,7 @@
return self.site.protect(self, protections, reason, **kwargs)
def change_category(self, oldCat, newCat, comment=None, sortKey=None,
-inPlace=True):
+inPlace=True, include=[]):
Remove page from oldCat and add it to newCat.
@@ -1683,17 +1683,21 @@
@param inPlace: if True, change categories in place rather than
rearranging them.
+
+@param include: list of tags not to be disabled by default in relevant
+textlib functions, where CategoryLinks can be searched.
+@type: list
+
@return: True if page was saved changed, otherwise False.
# get list of Category objects the article is in and remove possible
# duplicates
cats = []
-for cat in textlib.getCategoryLinks(self.text, site=self.site):
+for cat in textlib.getCategoryLinks(self.text, site=self.site,
+include=include):
if cat not in cats:
cats.append(cat)
-
-site = self.site
if not sortKey:
sortKey = oldCat.sortKey
@@ -1718,7 +1722,7 @@
site=self.site)
else:
if newCat:
-cats[cats.index(oldCat)] = Category(site, newCat.title(),
+cats[cats.index(oldCat)] = Category(self.site, newCat.title(),
sortKey=sortKey)
else:
cats.pop(cats.index(oldCat))
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 4b3934b..f4e4f0d 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -273,7 +273,7 @@
return text
-def removeDisabledParts(text, tags=['*']):
+def removeDisabledParts(text, tags=['*'], include=[]):
Return text without portions where wiki markup is disabled.
@@ -284,7 +284,9 @@
* includeonly tags
The exact set of parts which should be removed can be passed as the
-'parts' parameter, which defaults to all.
+'tags' parameter, which defaults to all.
+Or, in alternative, default parts that shall not be removed can be
+specified in the 'include' param.
regexes = {
@@ -298,7 +300,7 @@
if '*' in tags:
tags = list(regexes.keys())
# add alias
-tags = set(tags)
+tags = set(tags) - set(include)
if 'source' in tags:
tags.add('syntaxhighlight')
toRemoveR = re.compile('|'.join([regexes[tag] for tag in tags]),
@@ -659,8 +661,12 @@
# Functions dealing with category links
# -
-def getCategoryLinks(text, site=None):
+def getCategoryLinks(text, site=None, include=[]):
Return a list of category links found in text.
+
+@param include: list of tags which should not be removed by
+removeDisabledParts() and where CategoryLinks can be searched.
+@type: list
@return: all category links found
@rtype: list of Category objects
@@ -670,7 +676,7 @@
site = pywikibot.Site()
# Ignore category links within nowiki tags, pre tags, includeonly tags,
# and HTML comments
-text = removeDisabledParts(text)
+text = removeDisabledParts(text, include=include)
catNamespace = '|'.join(site.category_namespaces())
R = re.compile(r'\[\[\s*(?Pnamespace%s)\s*:\s*(?Prest.+?)\]\]'
% catNamespace, re.I)
@@ -1130,7 +1136,7 @@
def does_text_contain_section(pagetext, section):
-Determines whether the page text contains the given section title.
+Determine whether the page text contains the given section title.
@param pagetext: The wikitext of a page
@type text: unicode or string
@@ -1187,9 +1193,7 @@
class TimeStripper(object):
-
-Find timestamp in page and return it as timezone aware datetime object.
-
+Find timestamp in page and return it as
[MediaWiki-commits] [Gerrit] Fix checkLocalNames - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix checkLocalNames
..
Fix checkLocalNames
Also cleanup in using __METHOD__ instead of __FUNCTION__, use
wfGetDB directly instead of wfGetLB.
Change-Id: Ic40e8cd2511491445f530faadd6fdf5a2873a5e2
(cherry picked from commit 605d61f786f73ebea6f8429108159af96f19933f)
---
M maintenance/checkLocalNames.php
1 file changed, 11 insertions(+), 11 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/checkLocalNames.php b/maintenance/checkLocalNames.php
index ab1e6bc..50131a9 100644
--- a/maintenance/checkLocalNames.php
+++ b/maintenance/checkLocalNames.php
@@ -49,7 +49,7 @@
'localnames',
array( 'ln_wiki' ),
,
- __FUNCTION__,
+ __METHOD__,
array(
DISTINCT,
ORDER BY = ln_wiki ASC
@@ -63,7 +63,7 @@
// iterate through the wikis
foreach( $wikis as $wiki ) {
- $localdb = wfGetLB( $wiki )-getConnection( DB_SLAVE ,
array(), $wiki );
+ $localdb = wfGetDB( DB_SLAVE , array(), $wiki );
$lastUsername = ;
$this-output( Checking localnames for $wiki ...\n );
@@ -73,12 +73,12 @@
$this-output( \t ... querying from
'$lastUsername'\n );
$result = $centralSlave-select(
'localnames',
- array( 'ln_user' ),
+ array( 'ln_name' ),
array(
ln_wiki = $wiki,
-ln_user .
$centralSlave-addQuotes( $lastUsername )
+ln_name .
$centralSlave-addQuotes( $lastUsername )
),
- __FUNCTION__,
+ __METHOD__,
array(
LIMIT = $this-batchSize,
ORDER BY = ln_name ASC
@@ -90,14 +90,14 @@
$localUser = $localdb-select(
'user',
array( 'user_name' ),
- array( user_name =
$u-user_name ),
- __FUNCTION__
+ array( user_name =
$u-ln_name ),
+ __METHOD__
);
// check to see if the user did not
exist in the local user table
if( $localUser-numRows() == 0 ) {
if( $this-verbose ) {
- $this-output( Local
user not found for localname entry $u-user_name@$wiki\n );
+ $this-output( Local
user not found for localname entry $u-ln_name@$wiki\n );
}
$this-total++;
if( !$this-dryrun ){
@@ -106,15 +106,15 @@
'localnames',
array(
ln_wiki = $wiki,
-
ln_user = $u-user_name
+
ln_name = $u-ln_name
),
- __FUNCTION__
+ __METHOD__
);
// TODO: is there
anyway to check the success of the delete?
$this-deleted++;
}
}
- $lastUsername = $u-user_name;
+ $lastUsername = $u-ln_name;
[MediaWiki-commits] [Gerrit] Move files into an includes folder - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged. Change subject: Move files into an includes folder .. Move files into an includes folder This is the standard way of doing this and makes the extension's root much less messy. Also delete the diagrams folder as it doesn't contain any value. Change-Id: I4e333cb95023c43556985d8150c7bea0911a2622 --- M CentralAuth.php D diagrams/login.dia D diagrams/login.png D diagrams/registration.dia D diagrams/registration.png R includes/CentralAuthGroupMembershipProxy.php R includes/CentralAuthHooks.php R includes/CentralAuthPlugin.php R includes/CentralAuthReadOnlyError.php R includes/CentralAuthUser.php R includes/CentralAuthUserArray.php R includes/EmailableUser.php R includes/GlobalRename/GlobalRenameLogFormatter.php R includes/GlobalRename/GlobalRenameRequest.php R includes/GlobalRename/GlobalRenameUser.php R includes/GlobalRename/GlobalRenameUserDatabaseUpdates.php R includes/GlobalRename/GlobalRenameUserLogger.php R includes/GlobalRename/GlobalRenameUserStatus.php R includes/GlobalRename/GlobalRenameUserValidator.php R includes/GlobalRename/GlobalUserMerge.php R includes/GlobalRename/GlobalUserMergeDatabaseUpdates.php R includes/GlobalRename/GlobalUserMergeLogFormatter.php R includes/GlobalRename/GlobalUserMergeLogger.php R includes/GlobalRename/UserMergeNoopLogger.php R includes/LocalRenameJob/LocalRenameJob.php R includes/LocalRenameJob/LocalRenameUserJob.php R includes/LocalRenameJob/LocalUserMergeJob.php R includes/SuppressUserJob.php R includes/WikiSet.php R includes/api/ApiCentralAuthToken.php R includes/api/ApiDeleteGlobalAccount.php R includes/api/ApiQueryGlobalAllUsers.php R includes/api/ApiQueryGlobalGroups.php R includes/api/ApiQueryGlobalUserInfo.php R includes/api/ApiQueryWikiSets.php R includes/api/ApiSetGlobalAccountStatus.php R includes/specials/SpecialCentralAuth.php R includes/specials/SpecialCentralAutoLogin.php R includes/specials/SpecialCentralLogin.php R includes/specials/SpecialGlobalGroupMembership.php R includes/specials/SpecialGlobalGroupPermissions.php R includes/specials/SpecialGlobalRenameProgress.php R includes/specials/SpecialGlobalRenameRequest.php R includes/specials/SpecialGlobalRenameUser.php R includes/specials/SpecialGlobalUserMerge.php R includes/specials/SpecialGlobalUsers.php R includes/specials/SpecialMergeAccount.php R includes/specials/SpecialMultiLock.php R includes/specials/SpecialWikiSets.php 49 files changed, 44 insertions(+), 44 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/CentralAuth.php b/CentralAuth.php index 1be5161..9dc732c 100644 --- a/CentralAuth.php +++ b/CentralAuth.php @@ -252,52 +252,52 @@ * Initialization of the autoloaders, and special extension pages. */ $caBase = __DIR__; -$wgAutoloadClasses['SpecialCentralAuth'] = $caBase/specials/SpecialCentralAuth.php; -$wgAutoloadClasses['SpecialCentralLogin'] = $caBase/specials/SpecialCentralLogin.php; -$wgAutoloadClasses['SpecialMergeAccount'] = $caBase/specials/SpecialMergeAccount.php; -$wgAutoloadClasses['SpecialGlobalUsers'] = $caBase/specials/SpecialGlobalUsers.php; -$wgAutoloadClasses['SpecialMultiLock'] = $caBase/specials/SpecialMultiLock.php; -$wgAutoloadClasses['CentralAuthUser'] = $caBase/CentralAuthUser.php; -$wgAutoloadClasses['CentralAuthPlugin'] = $caBase/CentralAuthPlugin.php; -$wgAutoloadClasses['CentralAuthHooks'] = $caBase/CentralAuthHooks.php; -$wgAutoloadClasses['CentralAuthSuppressUserJob'] = $caBase/SuppressUserJob.php; -$wgAutoloadClasses['WikiSet'] = $caBase/WikiSet.php; -$wgAutoloadClasses['SpecialCentralAutoLogin'] = $caBase/specials/SpecialCentralAutoLogin.php; -$wgAutoloadClasses['CentralAuthUserArray'] = $caBase/CentralAuthUserArray.php; -$wgAutoloadClasses['CentralAuthUserArrayFromResult'] = $caBase/CentralAuthUserArray.php; -$wgAutoloadClasses['SpecialGlobalGroupMembership'] = $caBase/specials/SpecialGlobalGroupMembership.php; -$wgAutoloadClasses['CentralAuthGroupMembershipProxy'] = $caBase/CentralAuthGroupMembershipProxy.php; -$wgAutoloadClasses['SpecialGlobalGroupPermissions'] = $caBase/specials/SpecialGlobalGroupPermissions.php; -$wgAutoloadClasses['SpecialWikiSets'] = $caBase/specials/SpecialWikiSets.php; -$wgAutoloadClasses['ApiQueryGlobalUserInfo'] = $caBase/api/ApiQueryGlobalUserInfo.php; -$wgAutoloadClasses['ApiDeleteGlobalAccount'] = $caBase/api/ApiDeleteGlobalAccount.php; -$wgAutoloadClasses['ApiSetGlobalAccountStatus'] = $caBase/api/ApiSetGlobalAccountStatus.php; -$wgAutoloadClasses['ApiQueryGlobalGroups'] = $caBase/api/ApiQueryGlobalGroups.php; -$wgAutoloadClasses['ApiQueryWikiSets'] = $caBase/api/ApiQueryWikiSets.php; -$wgAutoloadClasses['ApiQueryGlobalAllUsers'] = $caBase/api/ApiQueryGlobalAllUsers.php; -$wgAutoloadClasses['ApiCentralAuthToken'] = $caBase/api/ApiCentralAuthToken.php; -$wgAutoloadClasses['CentralAuthReadOnlyError'] =
[MediaWiki-commits] [Gerrit] Move files into an includes folder - change (mediawiki...GlobalBlocking)
jenkins-bot has submitted this change and it was merged. Change subject: Move files into an includes folder .. Move files into an includes folder This is the standard way of doing this and makes the extension's root much less messy. Change-Id: If25eae8fa99ea88fae3d9a5de34f4591dc0f7dfc --- M GlobalBlocking.php R includes/GlobalBlocking.class.php R includes/api/ApiGlobalBlock.php R includes/api/ApiQueryGlobalBlocks.php R includes/specials/SpecialGlobalBlock.php R includes/specials/SpecialGlobalBlockList.php R includes/specials/SpecialGlobalBlockStatus.php R includes/specials/SpecialRemoveGlobalBlock.php 8 files changed, 9 insertions(+), 9 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/GlobalBlocking.php b/GlobalBlocking.php index b1a06fc..6305420 100644 --- a/GlobalBlocking.php +++ b/GlobalBlocking.php @@ -16,7 +16,7 @@ * @author Andrew Garrett and...@epstone.net * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later */ -$dir = dirname( __FILE__ ); +$dir = __DIR__; $wgExtensionCredits['other'][] = array( 'path' = __FILE__, 'name' = 'GlobalBlocking', @@ -36,21 +36,21 @@ $wgHooks['SpecialContributionsBeforeMainOutput'][] = 'GlobalBlocking::onSpecialContributionsBeforeMainOutput'; $wgHooks['UserMergeAccountFields'][] = 'GlobalBlocking::onUserMergeAccountFields'; -$wgAutoloadClasses['SpecialGlobalBlock'] = $dir/SpecialGlobalBlock.php; +$wgAutoloadClasses['SpecialGlobalBlock'] = $dir/includes/specials/SpecialGlobalBlock.php; $wgSpecialPages['GlobalBlock'] = 'SpecialGlobalBlock'; -$wgAutoloadClasses['SpecialGlobalBlockList'] = $dir/SpecialGlobalBlockList.php; -$wgAutoloadClasses['GlobalBlockListPager'] = $dir/SpecialGlobalBlockList.php; +$wgAutoloadClasses['SpecialGlobalBlockList'] = $dir/includes/specials/SpecialGlobalBlockList.php; +$wgAutoloadClasses['GlobalBlockListPager'] = $dir/includes/specials/SpecialGlobalBlockList.php; $wgSpecialPages['GlobalBlockList'] = 'SpecialGlobalBlockList'; -$wgAutoloadClasses['SpecialGlobalBlockStatus'] = $dir/SpecialGlobalBlockStatus.php; +$wgAutoloadClasses['SpecialGlobalBlockStatus'] = $dir/includes/specials/SpecialGlobalBlockStatus.php; $wgSpecialPages['GlobalBlockStatus'] = 'SpecialGlobalBlockStatus'; -$wgAutoloadClasses['SpecialRemoveGlobalBlock'] = $dir/SpecialRemoveGlobalBlock.php; +$wgAutoloadClasses['SpecialRemoveGlobalBlock'] = $dir/includes/specials/SpecialRemoveGlobalBlock.php; $wgSpecialPages['RemoveGlobalBlock'] = 'SpecialRemoveGlobalBlock'; -$wgAutoloadClasses['ApiQueryGlobalBlocks'] = $dir/ApiQueryGlobalBlocks.php; +$wgAutoloadClasses['ApiQueryGlobalBlocks'] = $dir/includes/api/ApiQueryGlobalBlocks.php; $wgAPIListModules['globalblocks'] = 'ApiQueryGlobalBlocks'; -$wgAutoloadClasses['ApiGlobalBlock'] = $dir/ApiGlobalBlock.php; +$wgAutoloadClasses['ApiGlobalBlock'] = $dir/includes/api/ApiGlobalBlock.php; $wgAPIModules['globalblock'] = 'ApiGlobalBlock'; -$wgAutoloadClasses['GlobalBlocking'] = $dir/GlobalBlocking.class.php; +$wgAutoloadClasses['GlobalBlocking'] = $dir/includes/GlobalBlocking.class.php; $wgSpecialPageGroups['GlobalBlock'] = 'users'; $wgSpecialPageGroups['GlobalBlockList'] = 'users'; diff --git a/GlobalBlocking.class.php b/includes/GlobalBlocking.class.php similarity index 100% rename from GlobalBlocking.class.php rename to includes/GlobalBlocking.class.php diff --git a/ApiGlobalBlock.php b/includes/api/ApiGlobalBlock.php similarity index 100% rename from ApiGlobalBlock.php rename to includes/api/ApiGlobalBlock.php diff --git a/ApiQueryGlobalBlocks.php b/includes/api/ApiQueryGlobalBlocks.php similarity index 100% rename from ApiQueryGlobalBlocks.php rename to includes/api/ApiQueryGlobalBlocks.php diff --git a/SpecialGlobalBlock.php b/includes/specials/SpecialGlobalBlock.php similarity index 100% rename from SpecialGlobalBlock.php rename to includes/specials/SpecialGlobalBlock.php diff --git a/SpecialGlobalBlockList.php b/includes/specials/SpecialGlobalBlockList.php similarity index 100% rename from SpecialGlobalBlockList.php rename to includes/specials/SpecialGlobalBlockList.php diff --git a/SpecialGlobalBlockStatus.php b/includes/specials/SpecialGlobalBlockStatus.php similarity index 100% rename from SpecialGlobalBlockStatus.php rename to includes/specials/SpecialGlobalBlockStatus.php diff --git a/SpecialRemoveGlobalBlock.php b/includes/specials/SpecialRemoveGlobalBlock.php similarity index 100% rename from SpecialRemoveGlobalBlock.php rename to includes/specials/SpecialRemoveGlobalBlock.php -- To view, visit https://gerrit.wikimedia.org/r/164769 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If25eae8fa99ea88fae3d9a5de34f4591dc0f7dfc Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GlobalBlocking Gerrit-Branch: master Gerrit-Owner: Hoo man
[MediaWiki-commits] [Gerrit] mw.Platform: Use 'mediawiki.language' for more things - change (mediawiki...VisualEditor)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164783
Change subject: mw.Platform: Use 'mediawiki.language' for more things
..
mw.Platform: Use 'mediawiki.language' for more things
Bonus:
* Remove doubled dependency on mediawiki.Uri
* Add missing dependency on mediawiki.language
Change-Id: Ide716aad7b9f08ae9a24f99812f07273d89da33a
---
M VisualEditor.php
M modules/ve-mw/init/ve.init.mw.Platform.js
2 files changed, 2 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/83/164783/1
diff --git a/VisualEditor.php b/VisualEditor.php
index f15c32c..182a617 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -280,8 +280,8 @@
'jquery.visibleText',
'jquery.byteLength',
'jquery.client',
- 'mediawiki.Uri',
'mediawiki.api',
+ 'mediawiki.language',
'mediawiki.Title',
'mediawiki.Uri',
'mediawiki.user',
diff --git a/modules/ve-mw/init/ve.init.mw.Platform.js
b/modules/ve-mw/init/ve.init.mw.Platform.js
index f5cdfb0..0f5be8f 100644
--- a/modules/ve-mw/init/ve.init.mw.Platform.js
+++ b/modules/ve-mw/init/ve.init.mw.Platform.js
@@ -105,15 +105,7 @@
/** @inheritdoc */
ve.init.mw.Platform.prototype.getUserLanguages = function () {
- var lang = mw.config.get( 'wgUserLanguage' ),
- langParts = lang.split( '-' ),
- langs = [ lang ];
-
- if ( langParts.length 1 ) {
- langs.push( langParts[0] );
- }
-
- return langs;
+ return mw.language.getFallbackLanguageChain();
};
/* Initialization */
--
To view, visit https://gerrit.wikimedia.org/r/164783
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide716aad7b9f08ae9a24f99812f07273d89da33a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Emit change event when dimensions change in MediaSizeWidget - change (VisualEditor/VisualEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164784
Change subject: Emit change event when dimensions change in MediaSizeWidget
..
Emit change event when dimensions change in MediaSizeWidget
Whether the dimensions are valid or not, the 'change' event should
be emitted when the dimension inputs are changed. This will cause
the dialog to revalidate the size widget in general and hide or
show the 'apply' button accordingly.
Bug: 70861
Change-Id: Idb82d597d5b2b6664401208a54d33d26edbf6d31
---
M src/ui/widgets/ve.ui.MediaSizeWidget.js
1 file changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/84/164784/1
diff --git a/src/ui/widgets/ve.ui.MediaSizeWidget.js
b/src/ui/widgets/ve.ui.MediaSizeWidget.js
index db1123e..2093196 100644
--- a/src/ui/widgets/ve.ui.MediaSizeWidget.js
+++ b/src/ui/widgets/ve.ui.MediaSizeWidget.js
@@ -193,6 +193,7 @@
* the value is numeric. Invoke validation for every change.
* @param {string} type The input that was updated, 'width' or 'height'
* @param {string} value The new value of the input
+ * @fires change
*/
ve.ui.MediaSizeWidget.prototype.onDimensionsChange = function ( type, value ) {
var dimensions = {};
@@ -208,6 +209,9 @@
this.validateDimensions();
}
}
+
+ // Emit change event
+ this.emit( 'change', this.currentDimensions );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/164784
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb82d597d5b2b6664401208a54d33d26edbf6d31
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update usage of getRedirectSnippet() and getSectionSnippet() - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164789
Change subject: Update usage of getRedirectSnippet() and getSectionSnippet()
..
Update usage of getRedirectSnippet() and getSectionSnippet()
Meant to include this in I571e015814ea756771c66c243cb8db86448db463 but
it was missed.
Change-Id: I9ff805daee1c10d7ea75dedd0ba59b467aaadd50
---
M includes/api/ApiQuerySearch.php
M includes/specials/SpecialSearch.php
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/89/164789/1
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index a4db57a..bcf5d91 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -175,7 +175,7 @@
$vals['redirecttitle'] =
$result-getRedirectTitle();
}
if ( isset( $prop['redirectsnippet'] )
) {
- $vals['redirectsnippet'] =
$result-getRedirectSnippet( $terms );
+ $vals['redirectsnippet'] =
$result-getRedirectSnippet();
}
}
if ( !is_null( $result-getSectionTitle() ) ) {
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index 8ff4097..c922fbd 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -615,9 +615,9 @@
// format redirects / relevant sections
$redirectTitle = $result-getRedirectTitle();
- $redirectText = $result-getRedirectSnippet( $terms );
+ $redirectText = $result-getRedirectSnippet();
$sectionTitle = $result-getSectionTitle();
- $sectionText = $result-getSectionSnippet( $terms );
+ $sectionText = $result-getSectionSnippet();
$redirect = '';
if ( !is_null( $redirectTitle ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/164789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ff805daee1c10d7ea75dedd0ba59b467aaadd50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger m...@nichework.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Modify the math font-family for native MathML - change (mediawiki...Math)
Frédéric Wang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164796
Change subject: Modify the math font-family for native MathML
..
Modify the math font-family for native MathML
- upgrade to Latin Modern Math 1.959 with tweaked ascent/descent.
- always use the WOFF tweaked latin modern math by default.
- remove obsolete local fonts (MathJax and STIXGeneral).
Bug: 70360
Change-Id: Icb6ae3770a3d56bc03453ff5604eabb4699f2595
---
M modules/LatinModern/MANIFEST-Latin-Modern-Math.txt
D modules/LatinModern/README-Latin-Modern-Math.txt
D modules/LatinModern/latinmodern-math.woff
A modules/LatinModern/tweakedlatinmodern-math.woff
M modules/ext.math.css
5 files changed, 13 insertions(+), 128 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/96/164796/1
diff --git a/modules/LatinModern/MANIFEST-Latin-Modern-Math.txt
b/modules/LatinModern/MANIFEST-Latin-Modern-Math.txt
index b8ec614..a5417bd 100644
--- a/modules/LatinModern/MANIFEST-Latin-Modern-Math.txt
+++ b/modules/LatinModern/MANIFEST-Latin-Modern-Math.txt
@@ -1,27 +1,11 @@
-###
- The TeX Gyre Collection of Fonts
-###
+This directory contains the Latin Modern Math font version 1.959 from
-Font: Latin Modern Math
-Authors: Bogus\l{}aw Jackowski, Piotr Strzelczyk and Piotr Pianowski
-Version: 1.958
-Date: 14 I 2013
+ http://www.gust.org.pl/projects/e-foundry/lm-math/download/
-Copyright 2012--2013 for TeX Gyre math extensions by B. Jackowski,
-P. Strzelczyk and P. Pianowski (on behalf of TeX Users Groups).
-
-This work can be freely used and distributed under
-the GUST Font License (GFL -- see GUST-FONT-LICENSE.txt)
-which is actually an instance of the LaTeX Project Public License
-(LPPL -- see http://www.latex-project.org/lppl.txt).
-
-This work has the maintenance status maintained. The Current Maintainer
-of this work is Bogus\l{}aw Jackowski, Piotr Strzelczyk and Piotr Pianowski.
-
-This work consists of the files listed in this file.
+that has been adjusted to fix ascent/descent bugs in web rendering engines.
Below, in three sections required by the GUST Font License,
-font names and file names specific for the Latin Modern Math
+font names and file names specific for the Tweaked Latin Modern Math
font are listed.
NOTE: the names of the directories are not subject to the renaming
@@ -31,30 +15,15 @@
by clause 1 of GUST-FONT-LICENSE.txt
1.1 OTF menu names
- Latin Modern Math
- LatinModernMath-Regular
+ Tweaked Latin Modern Math
+ TweakedLatinModernMath-Regular
2. Files whose names should be changed in derived works as requested
by clause 1 of GUST-FONT-LICENSE.txt
- 2.1 otf/latinmodern-math.otf
-
- 2.2 doc/MANIFEST-Latin-Modern-Math.txt
- doc/README-Latin-Modern-Math.txt
- doc/presentation-lmodern_math.pdf
- doc/math-test.tex
- doc/math-test-context.tex
- doc/test-context-latinmodern_math.pdf
- doc/test-context-latinmodern_math.tex
- doc/test-lualatex-latinmodern_math.pdf
- doc/test-lualatex-latinmodern_math.tex
- doc/test-xelatex-latinmodern_math.pdf
- doc/test-xelatex-latinmodern_math.tex
- doc/test-word-tg_latinmodern_math.docx
- doc/test-word-tg_latinmodern_math.pdf
+ 2.1 tweakedlatinmodern-math.woff
3. Files whose names need not be changed in derived works as requested
by clause 1 of GUST-FONT-LICENSE.txt
- doc/GUST-FONT-LICENSE.txt
- doc/INSTALL.txt
+ GUST-FONT-LICENSE.txt
diff --git a/modules/LatinModern/README-Latin-Modern-Math.txt
b/modules/LatinModern/README-Latin-Modern-Math.txt
deleted file mode 100644
index 6697b5d..000
--- a/modules/LatinModern/README-Latin-Modern-Math.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-###
- Latin Modern Collection of Fonts
-###
-
-Font: Latin Modern Math
-Authors: Bogus\l{}aw Jackowski, Piotr Strzelczyk and Piotr Pianowski
-Version: 1.958
-Date: 14 I 2013
-
-License:
- % Copyright 2012--2013 for the Latin Modern math extensions by B. Jackowski,
- % P. Strzelczyk and P. Pianowski (on behalf of TeX Users Groups).
- %
- % This work can be freely used and distributed under
- % the GUST Font License (GFL -- see GUST-FONT-LICENSE.txt)
- % which is actually an instance of the LaTeX Project Public License
- % (LPPL -- see http://www.latex-project.org/lppl.txt).
- %
- % This work has the maintenance status maintained. The Current Maintainer
- % of this work is Bogus\l{}aw Jackowski, Piotr Strzelczyk and Piotr
Pianowski.
- %
- % This work consists of
[MediaWiki-commits] [Gerrit] Update usage of getRedirectSnippet() and getSectionSnippet() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update usage of getRedirectSnippet() and getSectionSnippet()
..
Update usage of getRedirectSnippet() and getSectionSnippet()
Meant to include this in I571e015814ea756771c66c243cb8db86448db463 but
it was missed.
Change-Id: I9ff805daee1c10d7ea75dedd0ba59b467aaadd50
---
M includes/api/ApiQuerySearch.php
M includes/specials/SpecialSearch.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index a4db57a..bcf5d91 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -175,7 +175,7 @@
$vals['redirecttitle'] =
$result-getRedirectTitle();
}
if ( isset( $prop['redirectsnippet'] )
) {
- $vals['redirectsnippet'] =
$result-getRedirectSnippet( $terms );
+ $vals['redirectsnippet'] =
$result-getRedirectSnippet();
}
}
if ( !is_null( $result-getSectionTitle() ) ) {
diff --git a/includes/specials/SpecialSearch.php
b/includes/specials/SpecialSearch.php
index 8ff4097..c922fbd 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -615,9 +615,9 @@
// format redirects / relevant sections
$redirectTitle = $result-getRedirectTitle();
- $redirectText = $result-getRedirectSnippet( $terms );
+ $redirectText = $result-getRedirectSnippet();
$sectionTitle = $result-getSectionTitle();
- $sectionText = $result-getSectionSnippet( $terms );
+ $sectionText = $result-getSectionSnippet();
$redirect = '';
if ( !is_null( $redirectTitle ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/164789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9ff805daee1c10d7ea75dedd0ba59b467aaadd50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger m...@nichework.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove loadedLibraries - change (mediawiki...Scribunto)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164788
Change subject: Remove loadedLibraries
..
Remove loadedLibraries
Nothing actually uses this, so I'm not sure why we ever kept track of it.
Change-Id: I60480b96a83731c7b25aed55099886a86efc08b1
---
M engines/LuaCommon/LuaCommon.php
1 file changed, 1 insertion(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto
refs/changes/88/164788/2
diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php
index a9d6aee..2368385 100644
--- a/engines/LuaCommon/LuaCommon.php
+++ b/engines/LuaCommon/LuaCommon.php
@@ -38,7 +38,6 @@
protected $currentFrames = array();
protected $expandCache = array();
protected $availableLibraries = array();
- protected $loadedLibraries = array();
const MAX_EXPAND_CACHE_SIZE = 100;
@@ -71,7 +70,6 @@
$this-interpreter = null;
$this-mw = null;
$this-expandCache = null;
- $this-loadedLibraries = null;
parent::destroy();
}
@@ -431,18 +429,7 @@
throw new MWException( No class for library
\$name\ );
}
}
- $this-loadedLibraries[$name] = $class;
- $ret = $this-loadedLibraries[$name]-register();
-
- // @todo $this-loadedLibraries[$name] should always be unset
when $ret
- // is null, but we can't do that in the non-deferred case yet,
since we
- // need to maintain BC with extensions that don't yet return
the output
- // of registerInterface.
- if ( $ret === null $loadDeferred ) {
- unset( $this-loadedLibraries[$name] );
- }
-
- return $ret;
+ return $class-register();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/164788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60480b96a83731c7b25aed55099886a86efc08b1
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Scribunto
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ff91655..70fe9aa - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/164872 Change subject: Syncronize VisualEditor: ff91655..70fe9aa .. Syncronize VisualEditor: ff91655..70fe9aa Change-Id: I66c4d57ee04b0dd0ab9b6d8d8c67d0193734b9af --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/72/164872/1 diff --git a/VisualEditor b/VisualEditor index ff91655..70fe9aa 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ff91655d9430cfc55e9e75ccfa89a4ed50b5b55f +Subproject commit 70fe9aac4d5695bd4824666888c5b86700cf6473 -- To view, visit https://gerrit.wikimedia.org/r/164872 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66c4d57ee04b0dd0ab9b6d8d8c67d0193734b9af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ff91655..70fe9aa - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: ff91655..70fe9aa .. Syncronize VisualEditor: ff91655..70fe9aa Change-Id: I66c4d57ee04b0dd0ab9b6d8d8c67d0193734b9af --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index ff91655..70fe9aa 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ff91655d9430cfc55e9e75ccfa89a4ed50b5b55f +Subproject commit 70fe9aac4d5695bd4824666888c5b86700cf6473 -- To view, visit https://gerrit.wikimedia.org/r/164872 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I66c4d57ee04b0dd0ab9b6d8d8c67d0193734b9af Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Allow custom headers and remote endpoint to be specified at ... - change (apps...java-mwapi)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164873
Change subject: Allow custom headers and remote endpoint to be specified at the
same time when constructing Api
..
Allow custom headers and remote endpoint to be specified at the same time when
constructing Api
(But really most of this commit is messing around with all the different
constructors)
Change-Id: I4b54b2368c0b6fe54b14ebf8f670305e5c6b94b7
---
M src/main/java/org/mediawiki/api/json/Api.java
1 file changed, 59 insertions(+), 53 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/java-mwapi
refs/changes/73/164873/1
diff --git a/src/main/java/org/mediawiki/api/json/Api.java
b/src/main/java/org/mediawiki/api/json/Api.java
index d281a4b..d444345 100644
--- a/src/main/java/org/mediawiki/api/json/Api.java
+++ b/src/main/java/org/mediawiki/api/json/Api.java
@@ -37,91 +37,96 @@
private HashMapString,String customHeaders;
/**
- * Create an Api class with the default endpoint path.
+ * Create an Api object with given only hostname.
*
- * Uses https by default (isSecure is true).
- * Default endpoint path is /w/json.php.
+ * Defaults to HTTPS
+ * No custom headers to send with each request
+ * Default endpoint (/w/api.php) will be used.
*
- * @param domain Domain name of the server with the wiki to connect to
+ * @param domain Domain name of the MediaWiki API to connect to
*/
public Api(final String domain) {
-this(domain, true);
+this(domain, true, /w/api.php, null);
}
/**
- * Create an Api class with the default endpoint path using custom
User-Agent.
+ * Create an Api object with given only hostname and user agent.
*
- * Uses https by default (isSecure is true).
- * Default endpoint path is /w/json.php.
+ * Defaults to HTTPS
+ * Default endpoint (/w/api.php) will be used
*
- * @param domain Domain name of the server with the wiki to connect to
+ * @param domain Domain name of the MediaWiki API to connect to
* @param userAgent Custom User-Agent to simplify identification of
consuming application
*/
public Api(final String domain, final String userAgent) {
-this(domain, true);
-if (userAgent != null) {
-this.customHeaders = new HashMapString,String();
-this.customHeaders.put(User-Agent, userAgent);
-}
+this(domain, true, /w/api.php, new HashMapString, String());
+this.customHeaders.put(User-Agent, userAgent);
}
/**
- * Create an Api class with the default endpoint path using custom
User-Agent
- * and additional headers.
+ * Create an Api object with given only hostname and custom headers.
*
- * Uses https by default (isSecure is true).
- * Default endpoint path is /w/json.php.
- * If User-Agent key is set in customHeaders it will override the
userAgent parameter.
+ * Defaults to HTTPS
+ * Default endpoint (/w/api.php) will be used
*
- * @param domain Domain name of the server with the wiki to connect to
- * @param userAgent Custom User-Agent to simplify identification of
consuming application
- * @param customHeaders Additional custom headers to enrich request
- */
-public Api(final String domain, final String userAgent,
HashMapString,String customHeaders) {
-this(domain, userAgent);
-if (customHeaders != null) {
-if (this.customHeaders == null) {
-this.customHeaders = customHeaders;
-} else {
-this.customHeaders.putAll(customHeaders);
-}
-}
-}
-
-/**
- * Create an Api class with the default endpoint path using custom headers.
- *
- * Uses https by default (isSecure is true).
- * Default endpoint path is /w/json.php.
- *
- * @param domain Domain name of the server with the wiki to connect to
- * @param customHeaders Additional custom headers to enrich request
+ * @param domain Domain name of the MediaWiki API to connect to
+ * @param customHeaders Any extra headers to send with each request, e.g.
User-Agent.
*/
public Api(final String domain, HashMapString,String customHeaders) {
-this(domain, true);
-if (customHeaders != null) {
-this.customHeaders = customHeaders;
-}
+this(domain, true, /w/api.php, customHeaders);
}
/**
- * Create an Api class with the default endpoint path.
+ * Create an Api object with given only hostname, custom headers, and user
agent.
*
- * @param domain Domain name of the mediawiki installation to connect to
+ * Defaults to HTTPS
+ * Default endpoint (/w/api.php) will be used
+ *
+ * @param domain Domain name of the MediaWiki API to connect to
+ * @param
[MediaWiki-commits] [Gerrit] [MobileDetect] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/164874 Change subject: [MobileDetect] Register extension .. [MobileDetect] Register extension Add 3 extension as remarks due to incomplete message documentation Change-Id: Ic7885f0546f131b2be8d87eb89b7a9304c7e7053 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/74/164874/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 3ce11fc..b6e0ec3 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -498,6 +498,9 @@ aliasfile = CentralNotice/CentralNotice.alias.php optional = centralnotice-language-listing, centralnotice-log-label, centralnotice-user-links +# No message documentation - 2014-10-05 +# Challenge + Char Insert #magicfile = CharInsert/CharInsert.i18n.magic.php @@ -785,6 +788,9 @@ ignored = echo-email-batch-separator Edit Page Tracking + +# Incomplete message documentation file - 2014-10-05 +# Edit Similar Edit Subpages @@ -1081,6 +1087,9 @@ Image Metrics +# Incomplete message documentation file - 2014-10-05 +# Image Tagging + Index Function aliasfile = IndexFunction/IndexFunction.alias.php ignored = index-exclude-categories @@ -1233,6 +1242,8 @@ Mobile App +Mobile Detect + Mobile Frontend descmsg = mobile-frontend-desc aliasfile = MobileFrontend/MobileFrontend.alias.php -- To view, visit https://gerrit.wikimedia.org/r/164874 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7885f0546f131b2be8d87eb89b7a9304c7e7053 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [MobileDetect] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [MobileDetect] Register extension .. [MobileDetect] Register extension Add 3 extension as remarks due to incomplete message documentation Change-Id: Ic7885f0546f131b2be8d87eb89b7a9304c7e7053 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 3ce11fc..b6e0ec3 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -498,6 +498,9 @@ aliasfile = CentralNotice/CentralNotice.alias.php optional = centralnotice-language-listing, centralnotice-log-label, centralnotice-user-links +# No message documentation - 2014-10-05 +# Challenge + Char Insert #magicfile = CharInsert/CharInsert.i18n.magic.php @@ -785,6 +788,9 @@ ignored = echo-email-batch-separator Edit Page Tracking + +# Incomplete message documentation file - 2014-10-05 +# Edit Similar Edit Subpages @@ -1081,6 +1087,9 @@ Image Metrics +# Incomplete message documentation file - 2014-10-05 +# Image Tagging + Index Function aliasfile = IndexFunction/IndexFunction.alias.php ignored = index-exclude-categories @@ -1233,6 +1242,8 @@ Mobile App +Mobile Detect + Mobile Frontend descmsg = mobile-frontend-desc aliasfile = MobileFrontend/MobileFrontend.alias.php -- To view, visit https://gerrit.wikimedia.org/r/164874 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic7885f0546f131b2be8d87eb89b7a9304c7e7053 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking raimond.spekk...@gmail.com Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use mw-ui for All notifications link - change (mediawiki...MobileFrontend)
Florianschmidtwelzow has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164875
Change subject: Use mw-ui for All notifications link
..
Use mw-ui for All notifications link
* Link is a cta to another step of the show notification process
* Be consistent with Read as wiki page in talk overlay
(I1c8c708056fcaa87d800b9726f4891293ef03e7c)
Change-Id: I6f20b6d9f7ecb8e2b3fbf282826d0c6046c8680f
---
M templates/modules/notifications/NotificationsOverlayFooter.hogan
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/75/164875/1
diff --git a/templates/modules/notifications/NotificationsOverlayFooter.hogan
b/templates/modules/notifications/NotificationsOverlayFooter.hogan
index 25c6d42..d87f0bf 100644
--- a/templates/modules/notifications/NotificationsOverlayFooter.hogan
+++ b/templates/modules/notifications/NotificationsOverlayFooter.hogan
@@ -1 +1 @@
-a href={{archiveLink}}
class=notifications-archive-link{{archiveLinkMsg}}/a
+a href={{archiveLink}} class=mw-ui-progressive mw-ui-button mw-ui-quiet
notifications-archive-link{{archiveLinkMsg}}/a
--
To view, visit https://gerrit.wikimedia.org/r/164875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f20b6d9f7ecb8e2b3fbf282826d0c6046c8680f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Drag some Wikipedia domain stuff into the Site class - change (apps...wikipedia)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164876
Change subject: Drag some Wikipedia domain stuff into the Site class
..
Drag some Wikipedia domain stuff into the Site class
So it's (mostly) all in one place and changing some code to make it target a
LAN wiki is easy.
This means you basically just have to change 5 methods in the Site class to get
it to run on your
own wiki. (different API endpoint URL, no HTTPS, no external load.php, change
of domain in forLang
and isSupportedSite)
Doesn't touch EventLogging or MobileApp stuff
Relies on I4b54b236
Change-Id: I8ee046f5f5b25b81db4b5b039503e8ec1e11ceb0
---
M wikipedia/src/main/java/org/wikipedia/Site.java
M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
M wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
M wikipedia/src/main/java/org/wikipedia/editing/CaptchaResult.java
M wikipedia/src/main/java/org/wikipedia/migration/ArticleImporter.java
5 files changed, 27 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/76/164876/1
diff --git a/wikipedia/src/main/java/org/wikipedia/Site.java
b/wikipedia/src/main/java/org/wikipedia/Site.java
index 007ae08..8d2e1de 100644
--- a/wikipedia/src/main/java/org/wikipedia/Site.java
+++ b/wikipedia/src/main/java/org/wikipedia/Site.java
@@ -6,21 +6,37 @@
import android.text.TextUtils;
/**
- * Represents a particular Wikimedia project.
+ * Represents a particular wiki.
*/
public class Site implements Parcelable {
private final String domain;
+private final String language;
public Site(String domain) {
+this(domain, domain.split(\\.)[0]);
+}
+public Site(String domain, String language) {
this.domain = domain.replaceFirst(\\.m\\., .);
+this.language = language;
+}
+
+public Site(Parcel in) {
+this(in.readString());
+}
+
+public String getScriptPath(String script) {
+if (script.equals(load.php)) {
+return https://bits.wikimedia.org/%s.wikipedia.org/load.php;;
+}
+return /w/ + script;
}
public String getApiDomain() {
return WikipediaApp.getInstance().getSslFallback() ? domain :
domain.replaceFirst(\\., .m.);
}
-public Site(Parcel in) {
-domain = in.readString();
+public boolean getUseSecure() {
+return true;
}
public String getDomain() {
@@ -69,8 +85,8 @@
+ '}';
}
-public String getFullUrl(String path) {
-return WikipediaApp.getInstance().getNetworkProtocol() + :// +
getDomain() + path;
+public String getFullUrl(String script) {
+return WikipediaApp.getInstance().getNetworkProtocol() + :// +
getDomain() + getScriptPath(script);
}
/**
@@ -98,16 +114,12 @@
return titleForInternalLink(path);
}
-private String language;
public String getLanguage() {
-if (language == null) {
-language = domain.split(\\.)[0];
-}
return language;
}
public static Site forLang(String lang) {
-return new Site(lang + .wikipedia.org);
+return new Site(lang + .wikipedia.org, lang);
}
/**
diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
index b117dba..eb8aa82 100644
--- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
+++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java
@@ -281,7 +281,7 @@
if (api == null) {
String domainAndApiAndVariantKey = site.getDomain() + - +
site.getApiDomain() + - + acceptLanguage;
if (!apis.containsKey(domainAndApiAndVariantKey)) {
-apis.put(domainAndApiAndVariantKey, new
Api(site.getApiDomain(), customHeaders));
+apis.put(domainAndApiAndVariantKey, new
Api(site.getApiDomain(), site.getUseSecure(), site.getScriptPath(api.php),
customHeaders));
}
api = apis.get(domainAndApiAndVariantKey);
}
@@ -298,7 +298,7 @@
*/
public Site getPrimarySite() {
if (primarySite == null) {
-primarySite = new Site(getPrimaryLanguage() + .wikipedia.org);
+primarySite = Site.forLang(getPrimaryLanguage());
}
return primarySite;
diff --git a/wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
b/wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
index 36890bd..72bacd1 100644
--- a/wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/bridge/StyleFetcherTask.java
@@ -43,7 +43,7 @@
Site site = ((WikipediaApp)
getContext().getApplicationContext()).getPrimarySite();
try {
return String.format(
-
[MediaWiki-commits] [Gerrit] Backport sessionclean from Debian package - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164877
Change subject: Backport sessionclean from Debian package
..
Backport sessionclean from Debian package
Backport the PHP5 sessionclean script and cron job from the latest
Debian package. This replaces the potentially buggy sessionclean
implementation packaged with PHP 5.5 in Ubuntu 14.04. Hiera can also be
used to completely remove the sessionclean script and cron job by
setting 'php::sessionclean::ensure: absent' in a hiera file.
Bug: 71645
Change-Id: I82b5628b4bc7652c57bdf77415c277df7828866f
---
M puppet/hieradata/common.yaml
A puppet/modules/php/files/php5.cron.d
A puppet/modules/php/files/sessionclean
M puppet/modules/php/manifests/init.pp
A puppet/modules/php/manifests/sessionclean.pp
5 files changed, 90 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/77/164877/1
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index a61f77d..e91cb71 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -83,6 +83,8 @@
mathoid::log_dir: /vagrant/logs
mathoid::port: 10042
+php::sessionclean::ensure: present
+
iegreview::vhost_name: iegreview.local.wmftest.net
iegreview::db_name: iegreview
iegreview::db_user: iegreview
diff --git a/puppet/modules/php/files/php5.cron.d
b/puppet/modules/php/files/php5.cron.d
new file mode 100644
index 000..73cc5ea
--- /dev/null
+++ b/puppet/modules/php/files/php5.cron.d
@@ -0,0 +1,15 @@
+# /etc/cron.d/php5: crontab fragment for php5
+# This purges session files in session.save_path older than X,
+# where X is defined in seconds as the largest value of
+# session.gc_maxlifetime from all your SAPI php.ini files
+# or 24 minutes if not defined. The script triggers only
+# when session.save_handler=files.
+#
+# WARNING: The scripts tries hard to honour all relevant
+# session PHP options, but if you do something unusual
+# you have to disable this script and take care of your
+# sessions yourself.
+# Source:
http://anonscm.debian.org/cgit/pkg-php/php.git/commit/debian/php5-common.php5.cron.d?id=4eb6c8234dd6085e3c96a5ebca86b1d70ac481e3
+
+# Look for and purge old sessions every 30 minutes
+09,39 * * * * root [ -x /usr/lib/php5/sessionclean ]
/usr/lib/php5/sessionclean
diff --git a/puppet/modules/php/files/sessionclean
b/puppet/modules/php/files/sessionclean
new file mode 100755
index 000..06b94d3
--- /dev/null
+++ b/puppet/modules/php/files/sessionclean
@@ -0,0 +1,35 @@
+#!/bin/sh -e
+# PHP session cleanup script
+# Source:
http://anonscm.debian.org/cgit/pkg-php/php.git/commit/debian/sessionclean?id=4eb6c8234dd6085e3c96a5ebca86b1d70ac481e3
+# See: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/1356113
+
+SAPIS=apache2:apache2\napache2filter:apache2\ncgi:php5\nfpm:php5-fpm\n
+
+# Iterate through all web SAPIs
+(
+proc_names=
+printf $SAPIS | \
+while IFS=: read -r conf_dir proc_name; do
+if [ -e /etc/php5/${conf_dir}/php.ini ]; then
+# Get all session variables once so we don't need to start PHP to get
each config option
+session_config=$(php5 -c /etc/php5/${conf_dir}/php.ini -d
error_reporting='~E_ALL' -r 'foreach(ini_get_all(session) as $k = $v) echo
$k=.$v[local_value].\n;')
+save_handler=$(echo $session_config | sed -ne
's/^session\.save_handler=\(.*\)$/\1/p')
+save_path=$(echo $session_config | sed -ne
's/^session\.save_path=\(.*\)$/\1/p')
+gc_maxlifetime=$(($(echo $session_config | sed -ne
's/^session\.gc_maxlifetime=\(.*\)$/\1/p')/60))
+
+if [ $save_handler = files -a -d $save_path ]; then
+proc_names=$proc_names $proc_name;
+printf %s:%s\n $save_path $gc_maxlifetime
+fi
+fi
+done
+# first find all open session files and touch them (hope it's not massive
amount of files)
+for pid in $(pidof $proc_names); do
+find /proc/$pid/fd -ignore_readdir_race -lname $save_path/sess_\*
-exec touch -c {} \;
+done
+) | sort -rn -t: -k2,2 | sort -u -t: -k 1,1 | while IFS=: read -r save_path
gc_maxlifetime; do
+# find all files older then maxlifetime and delete them
+find -O3 $save_path -depth -mindepth 1 -name 'sess_*'
-ignore_readdir_race -type f -cmin +$gc_maxlifetime -delete
+done
+
+exit 0
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index 6ba400e..41ad82f 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -8,8 +8,9 @@
include ::apache
include ::apache::mod::php5
-include php::remote_debug
-include php::composer
+include ::php::remote_debug
+include ::php::composer
+include ::php::sessionclean
package { [
'php5',
diff --git a/puppet/modules/php/manifests/sessionclean.pp
b/puppet/modules/php/manifests/sessionclean.pp
new file mode 100644
index
[MediaWiki-commits] [Gerrit] textlib_tests.py: restore value before self.assert - change (pywikibot/core)
Mpaa has uploaded a new change for review. https://gerrit.wikimedia.org/r/164878 Change subject: textlib_tests.py: restore value before self.assert .. textlib_tests.py: restore value before self.assert If assert statement raises an error, the correct value is not resored. Move restoring of value before self.assert statement. Change-Id: Iffea89f8910bd05001e2b1480ce89b491276a632 --- M tests/textlib_tests.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/78/164878/1 diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 49d5e5f..cafa378 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -172,8 +172,9 @@ sep = config.LS config.line_separator = '' # use an empty separator temporarily new = textlib.replaceCategoryLinks(old, cats, site=self.site) +# restore the default separator +config.line_separator = sep self.assertEqual(old, new) -config.line_separator = sep # restore the default separator class TestTemplatesInCategory(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/164878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffea89f8910bd05001e2b1480ce89b491276a632 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa mpaa.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update hooks-bugzilla to 6e1e659eedc8719a2a0ea0906266738a18... - change (operations...plugins)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/164879 Change subject: Update hooks-bugzilla to 6e1e659eedc8719a2a0ea0906266738a18c7aa42 .. Update hooks-bugzilla to 6e1e659eedc8719a2a0ea0906266738a18c7aa42 (hooks-its at a421db414500141249af7fe4fa4c03e453e902ef) This change adds an its-name property (always its-bugzilla for this plugin) to events, which we can use with the upcoming its-phabricator to select on which Its an action should take place. Bug: T169 Change-Id: Id69f28029a89dbfbb94397718d38ef3cfda591f5 --- M hooks-bugzilla.jar 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/gerrit/plugins refs/changes/79/164879/1 diff --git a/hooks-bugzilla.jar b/hooks-bugzilla.jar index 091a240..02e433d 100644 --- a/hooks-bugzilla.jar +++ b/hooks-bugzilla.jar Binary files differ -- To view, visit https://gerrit.wikimedia.org/r/164879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id69f28029a89dbfbb94397718d38ef3cfda591f5 Gerrit-PatchSet: 1 Gerrit-Project: operations/gerrit/plugins Gerrit-Branch: master Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Linkify Phabricator Task references in gerrit - change (operations/puppet)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/164880 Change subject: Linkify Phabricator Task references in gerrit .. Linkify Phabricator Task references in gerrit Bug: T169 Change-Id: Id2f0d5aa2d4e61a50c2e26256c186394c324ee58 --- M templates/gerrit/gerrit.config.erb 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/164880/1 diff --git a/templates/gerrit/gerrit.config.erb b/templates/gerrit/gerrit.config.erb index 3444f48..a2cf9f7 100644 --- a/templates/gerrit/gerrit.config.erb +++ b/templates/gerrit/gerrit.config.erb @@ -94,6 +94,9 @@ [commentlink ci-test-result] match = li([^ ]+) (a href=\https://integration\\.wikimedia\\.org/ci/[a-zA-Z0-9/_.-]+\; target=\_blank\)[^]+/a : ([a-zA-Z_]+)([^]*)/li html = li class=\ci_comment_test\span class=\ci_comment_test_name\$2$1/a/span span class=\ci_comment_test_result\span class=\ci_result_$3\$3/span$4/span/li +[commentlink its-phabricator] +match = \\bT(\\d+)\\b +link = https://phabricator.wikimedia.org/T$1 [mimetype application/javascript] safe = true [mimetype application/x-php] -- To view, visit https://gerrit.wikimedia.org/r/164880 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2f0d5aa2d4e61a50c2e26256c186394c324ee58 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make gerrit set PATCH_TO_REVIEW status only in bugzilla - change (operations/puppet)
QChris has uploaded a new change for review. https://gerrit.wikimedia.org/r/164881 Change subject: Make gerrit set PATCH_TO_REVIEW status only in bugzilla .. Make gerrit set PATCH_TO_REVIEW status only in bugzilla As the PATCH_TO_REVIEW status is only available in bugzilla (not in phabricator), we restrict setting it to gerrit's bugzilla plugin and thereby prepare for running both the gerrit's bugzilla and gerrit's phabricator plugin in parallel. Bug: T169 Change-Id: Ib1cfc0c3435bebbd2a02b097c1ac7c9b24fb5650 --- M files/gerrit/its/action.config 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/81/164881/1 diff --git a/files/gerrit/its/action.config b/files/gerrit/its/action.config index 04ba61d..2d189ee 100644 --- a/files/gerrit/its/action.config +++ b/files/gerrit/its/action.config @@ -10,11 +10,13 @@ status = !,DRAFT is-draft = !,true association = added@subject,added@footer-Bug,added@footer-bug + its-name = its-bugzilla action = add-standard-comment action = status PATCH_TO_REVIEW [rule changeDraftPublished] event-type = draft-published association = subject,footer-Bug,footer-bug + its-name = its-bugzilla action = add-velocity-comment DraftPublished action = status PATCH_TO_REVIEW -- To view, visit https://gerrit.wikimedia.org/r/164881 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1cfc0c3435bebbd2a02b097c1ac7c9b24fb5650 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: QChris christ...@quelltextlich.at ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] If a user logs in while not on https, then the user should b... - change (mediawiki/core)
Stephenliang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164882
Change subject: If a user logs in while not on https, then the user should be
sent back to the non-secure website if they did not explicitly choose to stay
on the secure site
..
If a user logs in while not on https, then the user should be sent back to the
non-secure website if they did not explicitly choose to stay on the secure site
Change-Id: Ib92d4d39eb8a100ae8dc2691c83be071751724d6
---
M includes/specials/SpecialUserlogin.php
M includes/templates/Userlogin.php
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/82/164882/1
diff --git a/includes/specials/SpecialUserlogin.php
b/includes/specials/SpecialUserlogin.php
index bdd6751..576ebd5 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1435,6 +1435,11 @@
$template-set( 'signupend', $this-msg( 'signupend'
)-parse() );
}
+ // If using HTTPS coming from HTTP, then the 'fromhttp'
parameter must be preserved
+ if ( $usingHTTPS ) {
+ $template-set( 'fromhttp', $this-mFromHTTP );
+ }
+
// Give authentication and captcha plugins a chance to modify
the form
$wgAuth-modifyUITemplate( $template, $this-mType );
if ( $this-mType == 'signup' ) {
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 99fe218..2f7b291 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -187,6 +187,7 @@
?php if ( $this-haveData( 'uselang' ) ) { ?input
type=hidden name=uselang value=?php $this-text( 'uselang' ); ? /?php
} ?
?php if ( $this-haveData( 'token' ) ) { ?input
type=hidden name=wpLoginToken value=?php $this-text( 'token' ); ?
/?php } ?
?php if ( $this-data['cansecurelogin'] ) {?input
type=hidden name=wpForceHttps value=?php $this-text( 'stickhttps' ); ?
/?php } ?
+ ?php if ( $this-data['cansecurelogin']
$this-haveData( 'fromhttp' )) {?input type=hidden name=fromhttp
value=?php $this-text( 'fromhttp' ); ? /?php } ?
/form
/div
/div
--
To view, visit https://gerrit.wikimedia.org/r/164882
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib92d4d39eb8a100ae8dc2691c83be071751724d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Stephenliang wikime...@stephenliang.pw
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: install `perf` on Trusty app servers - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164883
Change subject: mediawiki: install `perf` on Trusty app servers
..
mediawiki: install `perf` on Trusty app servers
Change-Id: I94b090bd99fc7d94d9f2abb19ae3e7e83223
---
M modules/mediawiki/manifests/hhvm.pp
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/164883/1
diff --git a/modules/mediawiki/manifests/hhvm.pp
b/modules/mediawiki/manifests/hhvm.pp
index e9e80dc..394ea7a 100644
--- a/modules/mediawiki/manifests/hhvm.pp
+++ b/modules/mediawiki/manifests/hhvm.pp
@@ -72,4 +72,12 @@
require = Package['hhvm'],
before = Service['hhvm'],
}
+
+
+# Install perf, a tool for instrumenting CPU performance counters
+# and tracepoints.
+
+package { 'linux-tools-lts-trusty':
+ensure = present,
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/164883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94b090bd99fc7d94d9f2abb19ae3e7e83223
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] textlib_tests.py: restore value before self.assert - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: textlib_tests.py: restore value before self.assert .. textlib_tests.py: restore value before self.assert If assert statement raises an error, the correct value is not resored. Move restoring of value before self.assert statement. Change-Id: Iffea89f8910bd05001e2b1480ce89b491276a632 --- M tests/textlib_tests.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 49d5e5f..cafa378 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -172,8 +172,9 @@ sep = config.LS config.line_separator = '' # use an empty separator temporarily new = textlib.replaceCategoryLinks(old, cats, site=self.site) +# restore the default separator +config.line_separator = sep self.assertEqual(old, new) -config.line_separator = sep # restore the default separator class TestTemplatesInCategory(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/164878 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffea89f8910bd05001e2b1480ce89b491276a632 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Mpaa mpaa.w...@gmail.com Gerrit-Reviewer: John Vandenberg jay...@gmail.com Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused $wmgMediaViewerBeta - change (operations/mediawiki-config)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164884
Change subject: Remove unused $wmgMediaViewerBeta
..
Remove unused $wmgMediaViewerBeta
MediaViewer is default everywhere now, so no need
for this var.
Change-Id: Ie892bd94e4f334ef78b5ef04dd85f9cd6cd20146
---
M wmf-config/CommonSettings-labs.php
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
4 files changed, 0 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/84/164884/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index c0097a9..e12fd7e 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -66,10 +66,6 @@
if ( $wmgUseMultimediaViewer ) {
require_once( $IP/extensions/MultimediaViewer/MultimediaViewer.php );
$wgNetworkPerformanceSamplingFactor =
$wmgNetworkPerformanceSamplingFactor;
-
- if ( $wmgMediaViewerBeta ) {
- $wgMediaViewerIsInBeta = true;
- }
}
if ( $wmgUseVectorBeta ) {
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 36d6aa6..023816b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1936,10 +1936,6 @@
$wgMediaViewerDimensionLoggingSamplingFactor =
$wmgMediaViewerDimensionLoggingSamplingFactor;
$wgMediaViewerActionLoggingSamplingFactorMap =
$wmgMediaViewerActionLoggingSamplingFactorMap;
- if ( $wmgMediaViewerBeta ) {
- $wgMediaViewerIsInBeta = true;
- }
-
if ( isset( $wmgMediaViewerEnableByDefault ) ) {
$wgMediaViewerEnableByDefault = $wmgMediaViewerEnableByDefault;
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 139e5d5..366a528 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -299,11 +299,6 @@
'default' = true,
),
- 'wmgMediaViewerBeta' = array(
- 'default' = false,
- 'enwiktionary' = true,
- ),
-
'wmgNetworkPerformanceSamplingFactor' = array(
'default' = 1,
),
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index e248e27..3b1f05b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -11066,10 +11066,6 @@
'private' = false,
),
-'wmgMediaViewerBeta' = array(
- 'default' = false,
-),
-
'wmgMediaViewerEnableByDefault' = array(
'default' = true,
'commonswiki' = false, // bug 69363
--
To view, visit https://gerrit.wikimedia.org/r/164884
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie892bd94e4f334ef78b5ef04dd85f9cd6cd20146
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apache_status: get stats from 127.0.0.1, not localhost - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164885
Change subject: apache_status: get stats from 127.0.0.1, not localhost
..
apache_status: get stats from 127.0.0.1, not localhost
Because of the location of the /server-status configuration block in the Apache
config, Apache will disallow access with a 403 if 'localhost' is sent as the
host header on the request.
Change-Id: I5aa77861aba54b70256a205cc78cf46043180baf
---
M modules/apache/files/apache_status.pyconf
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/164885/1
diff --git a/modules/apache/files/apache_status.pyconf
b/modules/apache/files/apache_status.pyconf
index 00ae764..28d20c7 100644
--- a/modules/apache/files/apache_status.pyconf
+++ b/modules/apache/files/apache_status.pyconf
@@ -3,7 +3,7 @@
name = apache_status
language = python
param url {
-value = http://localhost:80/server-status;
+value = http://127.0.0.1:80/server-status;
}
# Which metric group should these metrics be put into
--
To view, visit https://gerrit.wikimedia.org/r/164885
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5aa77861aba54b70256a205cc78cf46043180baf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Automatically join mw.api array params with | - change (mediawiki/core)
saper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164886
Change subject: Automatically join mw.api array params with |
..
Automatically join mw.api array params with |
Change-Id: Ie8ea48712dc7b726266e25080b2931aebe659f0d
---
M resources/src/mediawiki.api/mediawiki.api.js
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/86/164886/1
diff --git a/resources/src/mediawiki.api/mediawiki.api.js
b/resources/src/mediawiki.api/mediawiki.api.js
index b85c8e8..592a37b 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -49,6 +49,16 @@
* console.log( data );
* } );
*
+* Multiple values for the parameter can be specified using an array:
+*
+* var api = new mw.Api();
+* api.get( {
+* action: 'query',
+* meta: ['userinfo', 'siteinfo']
+* } ).done ( function ( data ) {
+* console.log( data );
+* } );
+*
* @class
*
* @constructor
@@ -124,6 +134,12 @@
delete parameters.token;
}
+ for ( key in parameters ) {
+ if ( parameters[key] instanceof Array ) {
+ parameters[key] = parameters[key].join(
'|' );
+ }
+ }
+
// If multipart/form-data has been requested and
emulation is possible, emulate it
if (
ajaxOptions.type === 'POST'
--
To view, visit https://gerrit.wikimedia.org/r/164886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8ea48712dc7b726266e25080b2931aebe659f0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: saper sa...@saper.info
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: consistency tweaks - change (mediawiki...CentralAuth)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164887
Change subject: i18n: consistency tweaks
..
i18n: consistency tweaks
- capitalize
- add full-stops
Change-Id: I1f9ff529f34c2de048772c474f5f60a49edea450
---
M i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/87/164887/1
diff --git a/i18n/en.json b/i18n/en.json
index 6d04a20..d685d2b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -211,9 +211,9 @@
centralauth-renameuser-merged: User $1 has been migrated to the
unified login system.\nRenaming it will cause the local account to be detached
from the global one.,
centralauth-renameuser-reserved: Username $2 is reserved for a
global account.,
centralauth-invalid-wiki: No such wiki database: $1,
- centralauth-account-exists: Cannot create account: the requested
username is already taken in the unified login system.,
- centralauth-account-unattached-exists: Cannot create account: the
requested username would conflict with another username in the unified login
system,
- centralauth-account-rename-exists: Cannot create account: The
requested username would conflict with another username in the unified login
system,
+ centralauth-account-exists: Cannot create account: The requested
username is already taken in the unified login system.,
+ centralauth-account-unattached-exists: Cannot create account: The
requested username would conflict with another username in the unified login
system.,
+ centralauth-account-rename-exists: Cannot create account: The
requested username would conflict with another username in the unified login
system.,
centralauth-account-exists-reset: The username $1 is not registered
on this wiki, but you can reset its password on [[Special:CentralAuth/$1|a wiki
where it is]].,
centralauth-login-progress: Logging you in to wikis of
{{int:Centralauth-groupname}}:,
centralauth-logout-progress: Logging you out from other wikis of
{{int:Centralauth-groupname}}:,
--
To view, visit https://gerrit.wikimedia.org/r/164887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f9ff529f34c2de048772c474f5f60a49edea450
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: consistency tweaks - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: i18n: consistency tweaks
..
i18n: consistency tweaks
- capitalize
- add full-stops
Change-Id: I1f9ff529f34c2de048772c474f5f60a49edea450
---
M i18n/en.json
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 6d04a20..d685d2b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -211,9 +211,9 @@
centralauth-renameuser-merged: User $1 has been migrated to the
unified login system.\nRenaming it will cause the local account to be detached
from the global one.,
centralauth-renameuser-reserved: Username $2 is reserved for a
global account.,
centralauth-invalid-wiki: No such wiki database: $1,
- centralauth-account-exists: Cannot create account: the requested
username is already taken in the unified login system.,
- centralauth-account-unattached-exists: Cannot create account: the
requested username would conflict with another username in the unified login
system,
- centralauth-account-rename-exists: Cannot create account: The
requested username would conflict with another username in the unified login
system,
+ centralauth-account-exists: Cannot create account: The requested
username is already taken in the unified login system.,
+ centralauth-account-unattached-exists: Cannot create account: The
requested username would conflict with another username in the unified login
system.,
+ centralauth-account-rename-exists: Cannot create account: The
requested username would conflict with another username in the unified login
system.,
centralauth-account-exists-reset: The username $1 is not registered
on this wiki, but you can reset its password on [[Special:CentralAuth/$1|a wiki
where it is]].,
centralauth-login-progress: Logging you in to wikis of
{{int:Centralauth-groupname}}:,
centralauth-logout-progress: Logging you out from other wikis of
{{int:Centralauth-groupname}}:,
--
To view, visit https://gerrit.wikimedia.org/r/164887
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f9ff529f34c2de048772c474f5f60a49edea450
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove DataValuesCommon and ShortUrlApi (broken) - change (mediawiki/extensions)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/164888 Change subject: Remove DataValuesCommon and ShortUrlApi (broken) .. Remove DataValuesCommon and ShortUrlApi (broken) Getting errors like: fatal: Needed a single revision Unable to find current revision in submodule path 'DataValuesCommon' when trying to $ git submodule update Change-Id: I3d09a1d7e05c128a2f270755e40eb0e5bd3cae90 --- M .gitmodules D DataValuesCommon D ShortUrlApi 3 files changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/88/164888/1 diff --git a/.gitmodules b/.gitmodules index d9f917d..1a465fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -534,10 +534,6 @@ path = DataValueImplementations url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DataValueImplementations.git branch = . -[submodule DataValuesCommon] - path = DataValuesCommon - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DataValuesCommon.git - branch = . [submodule DataValuesInterfaces] path = DataValuesInterfaces url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DataValuesInterfaces.git @@ -2169,10 +2165,6 @@ [submodule ShortUrl] path = ShortUrl url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ShortUrl.git - branch = . -[submodule ShortUrlApi] - path = ShortUrlApi - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ShortUrlApi.git branch = . [submodule ShoutBox] path = ShoutBox diff --git a/DataValuesCommon b/DataValuesCommon deleted file mode 16 index ef435dc..000 --- a/DataValuesCommon +++ /dev/null -Subproject commit ef435dc86e89cf630b2786990a2b40c4259617e9 diff --git a/ShortUrlApi b/ShortUrlApi deleted file mode 16 index d4c3236..000 --- a/ShortUrlApi +++ /dev/null -Subproject commit d4c32365417ebd5b345539004c503610cd66335b -- To view, visit https://gerrit.wikimedia.org/r/164888 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d09a1d7e05c128a2f270755e40eb0e5bd3cae90 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove DataValuesCommon and ShortUrlApi (broken) - change (mediawiki/extensions)
Legoktm has submitted this change and it was merged. Change subject: Remove DataValuesCommon and ShortUrlApi (broken) .. Remove DataValuesCommon and ShortUrlApi (broken) Getting errors like: fatal: Needed a single revision Unable to find current revision in submodule path 'DataValuesCommon' when trying to $ git submodule update Change-Id: I3d09a1d7e05c128a2f270755e40eb0e5bd3cae90 --- M .gitmodules D DataValuesCommon D ShortUrlApi 3 files changed, 0 insertions(+), 8 deletions(-) Approvals: Legoktm: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index d9f917d..1a465fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -534,10 +534,6 @@ path = DataValueImplementations url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DataValueImplementations.git branch = . -[submodule DataValuesCommon] - path = DataValuesCommon - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DataValuesCommon.git - branch = . [submodule DataValuesInterfaces] path = DataValuesInterfaces url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/DataValuesInterfaces.git @@ -2169,10 +2165,6 @@ [submodule ShortUrl] path = ShortUrl url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ShortUrl.git - branch = . -[submodule ShortUrlApi] - path = ShortUrlApi - url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/ShortUrlApi.git branch = . [submodule ShoutBox] path = ShoutBox diff --git a/DataValuesCommon b/DataValuesCommon deleted file mode 16 index ef435dc..000 --- a/DataValuesCommon +++ /dev/null -Subproject commit ef435dc86e89cf630b2786990a2b40c4259617e9 diff --git a/ShortUrlApi b/ShortUrlApi deleted file mode 16 index d4c3236..000 --- a/ShortUrlApi +++ /dev/null -Subproject commit d4c32365417ebd5b345539004c503610cd66335b -- To view, visit https://gerrit.wikimedia.org/r/164888 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3d09a1d7e05c128a2f270755e40eb0e5bd3cae90 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 71633) Include categories in Special:ExpandTemplates - change (mediawiki/core)
Jackmcbarn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164889
Change subject: (bug 71633) Include categories in Special:ExpandTemplates
..
(bug 71633) Include categories in Special:ExpandTemplates
Change-Id: I4c003fb1f42b29602cd8924b224ff7642e8cf857
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/89/164889/1
diff --git a/includes/specials/SpecialExpandTemplates.php
b/includes/specials/SpecialExpandTemplates.php
index 2d99d60..f3adeba 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -251,6 +251,7 @@
) ) );
$out-addParserOutputContent( $pout );
$out-addHTML( Html::closeElement( 'div' ) );
+ $out-setCategoryLinks( $pout-getCategories() );
}
protected function getGroupName() {
--
To view, visit https://gerrit.wikimedia.org/r/164889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c003fb1f42b29602cd8924b224ff7642e8cf857
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use appropriate direction on searchinputbox - change (mediawiki...Translate)
Ebrahim has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164890
Change subject: Use appropriate direction on searchinputbox
..
Use appropriate direction on searchinputbox
And override .sitedir-ltr input { direction: ltr; } on it useful
for translatewiki search
Change-Id: I793f2e32c238903f18810d4acbed7c5c11cf5028
---
M specials/SpecialSearchTranslations.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/90/164890/1
diff --git a/specials/SpecialSearchTranslations.php
b/specials/SpecialSearchTranslations.php
index cad64ca..6fb2037 100644
--- a/specials/SpecialSearchTranslations.php
+++ b/specials/SpecialSearchTranslations.php
@@ -307,6 +307,7 @@
$attribs = array(
'placeholder' = $this-msg( 'tux-sst-search-ph' ),
'class' = 'searchinputbox',
+ 'dir' = $this-getLanguage()-getDir(),
);
$title = Html::hidden( 'title',
$this-getTitle()-getPrefixedText() );
--
To view, visit https://gerrit.wikimedia.org/r/164890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I793f2e32c238903f18810d4acbed7c5c11cf5028
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@gnu.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] v1.10.1.1 - change (xowa)
Gnosygnu has uploaded a new change for review. https://gerrit.wikimedia.org/r/164891 Change subject: v1.10.1.1 .. v1.10.1.1 Change-Id: I6bafaace294632bc0a79302fba93e3d9803e1fa7 --- M 100_core/src_110_primitive/gplx/Bry_.java M 100_core/src_110_primitive/gplx/Bry_fmtr.java M 100_core/src_311_gfoObj/gplx/GfoMsg.java M 100_core/src_311_gfoObj/gplx/GfoMsg_.java M 150_gfui/lib/swt.jar M 400_xowa/.classpath A 400_xowa/lib/jtidy_xowa.jar M 400_xowa/src/gplx/xowa/Xoa_app.java M 400_xowa/src/gplx/xowa/Xoa_app_.java M 400_xowa/src/gplx/xowa/apis/Xoapi_root.java M 400_xowa/src/gplx/xowa/apis/xowa/Xoapi_xtns.java M 400_xowa/src/gplx/xowa/apis/xowa/html/Xoapi_toggle_itm.java M 400_xowa/src/gplx/xowa/apis/xowa/html/Xoapi_toggle_mgr.java M 400_xowa/src/gplx/xowa/apis/xowa/html/modules/Xoapi_popups.java A 400_xowa/src/gplx/xowa/apis/xowa/xtns/Xoapi_wikibase.java M 400_xowa/src/gplx/xowa/bldrs/imports/Xobc_core_batch.java M 400_xowa/src/gplx/xowa/cfgs/Xoa_cfg_grp_tid.java M 400_xowa/src/gplx/xowa/gui/Xoa_gui_mgr.java M 400_xowa/src/gplx/xowa/html/Xoh_page_wtr_wkr.java M 400_xowa/src/gplx/xowa/html/Xow_html_mgr.java M 400_xowa/src/gplx/xowa/html/lnkis/Xoh_lnki_wtr.java M 400_xowa/src/gplx/xowa/html/modules/popups/Xow_popup_parser.java M 400_xowa/src/gplx/xowa/html/portal/Xoh_page_body_cls.java M 400_xowa/src/gplx/xowa/html/portal/Xoh_page_body_cls_tst.java M 400_xowa/src/gplx/xowa/html/portal/Xow_portal_mgr.java M 400_xowa/src/gplx/xowa/html/tocs/Xow_hdr_mgr.java M 400_xowa/src/gplx/xowa/setup/maints/Wmf_dump_list_parser_tst.java M 400_xowa/src/gplx/xowa/setup/maints/Xoa_maint_mgr.java M 400_xowa/src/gplx/xowa/users/Xou_user.java M 400_xowa/src/gplx/xowa/wikis/Xoa_wiki_mgr.java R 400_xowa/src/gplx/xowa/wikis/Xow_wiki_alias.java R 400_xowa/src/gplx/xowa/wikis/Xow_wiki_alias_tst.java M 400_xowa/src/gplx/xowa/wikis/Xow_wiki_domain.java M 400_xowa/src/gplx/xowa/wikis/Xow_wiki_domain_.java M 400_xowa/src/gplx/xowa/wikis/Xow_wiki_domain_tst.java M 400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_itm_.java M 400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr.java M 400_xowa/src/gplx/xowa/wikis/xwikis/Xow_xwiki_mgr_tst.java M 400_xowa/src/gplx/xowa/xtns/Xow_xtn_mgr.java M 400_xowa/src/gplx/xowa/xtns/Xox_mgr_base.java M 400_xowa/src/gplx/xowa/xtns/mapSources/Map_dd2dms_func.java M 400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_core.java M 400_xowa/src/gplx/xowa/xtns/scribunto/Scrib_invoke_func.java M 400_xowa/src/gplx/xowa/xtns/scribunto/lib/Scrib_lib_wikibase_srl.java M 400_xowa/src/gplx/xowa/xtns/scribunto/lib/Scrib_lib_wikibase_srl_tst.java A 400_xowa/src/gplx/xowa/xtns/scribunto/lib/Scrib_lib_wikibase_srl_visitor.java M 400_xowa/src/gplx/xowa/xtns/wdatas/Wdata_doc.java M 400_xowa/src/gplx/xowa/xtns/wdatas/Wdata_doc_bldr.java A 400_xowa/src/gplx/xowa/xtns/wdatas/Wdata_prop_val_visitor.java M 400_xowa/src/gplx/xowa/xtns/wdatas/Wdata_wiki_mgr.java M 400_xowa/src/gplx/xowa/xtns/wdatas/Wdata_wiki_mgr_fxt.java A 400_xowa/src/gplx/xowa/xtns/wdatas/Wdata_xtn_mgr.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_alias_itm.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_base.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_core.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_entity.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_globecoordinate.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_monolingualtext.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_quantity.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_str.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_system.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_itm_time.java C 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_claim_visitor.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_date.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_date_tst.java R 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_lang_sortable.java A 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_lang_sorter.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_langtext_itm.java M 400_xowa/src/gplx/xowa/xtns/wdatas/core/Wdata_sitelink_itm.java A 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__claim.java M 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__json.java A 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__langtext.java A 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__oview.java D 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__sitelink_tbl.java A 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__slink.java A 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__toc.java D 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtr__toc_div.java D 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_fmtrs.java M 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_mgr.java M 400_xowa/src/gplx/xowa/xtns/wdatas/hwtrs/Wdata_hwtr_mgr_tst.java M
[MediaWiki-commits] [Gerrit] Set the timezone for the NSDateFormatter to UTC - change (apps...wikipedia)
Saltymule has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164892
Change subject: Set the timezone for the NSDateFormatter to UTC
..
Set the timezone for the NSDateFormatter to UTC
The timezone needed to be generated in UTC time, because ISO-8601
formatted times are in UTC, but the NSDateFormatter automatically
assumes that you are parsing dates for the current default time
zone.
Bug: 66884
Change-Id: Ie3e5dc6db8b78ed329b8f7c00016001ee0e27e48
---
M wikipedia/Categories/NSString+Extras.m
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/92/164892/1
diff --git a/wikipedia/Categories/NSString+Extras.m
b/wikipedia/Categories/NSString+Extras.m
index 9cf4334..67a32e4 100644
--- a/wikipedia/Categories/NSString+Extras.m
+++ b/wikipedia/Categories/NSString+Extras.m
@@ -64,6 +64,7 @@
{
// See: https://www.mediawiki.org/wiki/Manual:WfTimestamp
NSDateFormatter * formatter = [[NSDateFormatter alloc] init];
+[formatter setTimeZone:[NSTimeZone timeZoneWithName:@UTC]];
[formatter setDateFormat:@'-'MM'-'dd'T'HH':'mm':'ss'Z'];
return [formatter dateFromString:self];
}
--
To view, visit https://gerrit.wikimedia.org/r/164892
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3e5dc6db8b78ed329b8f7c00016001ee0e27e48
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Saltymule danielmuel...@uwalumni.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] searchSuggest.js: Pass user ns preferences to API - change (mediawiki/core)
saper has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164893
Change subject: searchSuggest.js: Pass user ns preferences to API
..
searchSuggest.js: Pass user ns preferences to API
Bug: 24214
Change-Id: I53ba99bbe9d445262804a8239ac85b48fef4d716
---
M includes/resourceloader/ResourceLoaderUserOptionsModule.php
M resources/Resources.php
M resources/src/mediawiki/mediawiki.searchSuggest.js
3 files changed, 23 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/93/164893/1
diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index bd97a8e..f9f5d72 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -58,12 +58,30 @@
public function getScript( ResourceLoaderContext $context ) {
global $wgUser;
return Xml::encodeJsCall( 'mw.user.options.set',
- array( $wgUser-getOptions() ),
+ array( $wgUser-getOptions() + $this-getSearchNs(
$wgUser-getOptions() ) ),
ResourceLoader::inDebugMode()
);
}
/**
+* Convert searchNsXXX into one array of namespaces to search
+*
+* @param array
+* @return array
+*/
+ protected function getSearchNS( $options ) {
+ $namespaces = array();
+ foreach( $options as $optname = $optval ) {
+ if ( strpos( $optname, 'searchNs' ) === 0 ) {
+ if ( $optval ) {
+ $namespaces[] = substr(
$optname, 8 );
+ }
+ }
+ }
+ return array( 'searchNS' = $namespaces );
+ }
+
+ /**
* @return bool
*/
public function supportsURLLoading() {
diff --git a/resources/Resources.php b/resources/Resources.php
index 53759a6..bee745a 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -929,6 +929,7 @@
'jquery.placeholder',
'jquery.suggestions',
'mediawiki.api',
+ 'user.options',
),
),
'mediawiki.Title' = array(
@@ -966,7 +967,8 @@
'scripts' = 'resources/src/mediawiki/mediawiki.userSuggest.js',
'dependencies' = array(
'jquery.suggestions',
- 'mediawiki.api'
+ 'mediawiki.api',
+ 'user.options'
)
),
'mediawiki.util' = array(
diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js
b/resources/src/mediawiki/mediawiki.searchSuggest.js
index a214cb3..7aa 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -130,7 +130,7 @@
$.data( node, 'request', api.get( {
action: 'opensearch',
search: query,
- namespace: 0,
+ namespace: mw.user.options.get(
'searchNS' ),
suggest: ''
} ).done( function ( data ) {
response( data[ 1 ] );
--
To view, visit https://gerrit.wikimedia.org/r/164893
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53ba99bbe9d445262804a8239ac85b48fef4d716
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: saper sa...@saper.info
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for apostrophes in titles - change (mediawiki...SemanticResultFormats)
Poke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164894
Change subject: Add support for apostrophes in titles
..
Add support for apostrophes in titles
The href attribute is urlencoded, so (for example) apostrophes appear as
%27. This causes the API request to contain the percent-encoded name
instead of the the actual file name; thus, the API request fails and the
overlay will not work.
To fix this, decode the title from the URL first to get a valid title
representation for the API.
Change-Id: I00f96c9c870b878ca25792a878f3ceb7e9aefacc
---
M formats/gallery/resources/ext.srf.gallery.overlay.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticResultFormats
refs/changes/94/164894/1
diff --git a/formats/gallery/resources/ext.srf.gallery.overlay.js
b/formats/gallery/resources/ext.srf.gallery.overlay.js
index 430cb34..b9b21ae 100644
--- a/formats/gallery/resources/ext.srf.gallery.overlay.js
+++ b/formats/gallery/resources/ext.srf.gallery.overlay.js
@@ -104,7 +104,7 @@
util.spinner.create( { context:
$this, selector: 'img' } );
// Re-assign image url
- util.getImageURL( { 'title': ns
+ ':' + title[1] },
+ util.getImageURL( { 'title': ns
+ ':' + decodeURIComponent( title[1] ) },
function( url ) { if (
url === false ) {
image.attr(
'href', '' );
// Release
thumb image
--
To view, visit https://gerrit.wikimedia.org/r/164894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00f96c9c870b878ca25792a878f3ceb7e9aefacc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticResultFormats
Gerrit-Branch: master
Gerrit-Owner: Poke patrickwesterh...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use plain-text title attribute - change (mediawiki...SemanticResultFormats)
Poke has uploaded a new change for review. https://gerrit.wikimedia.org/r/164895 Change subject: Use plain-text title attribute .. Use plain-text title attribute Since the image caption can contain rich content (in the simplest case, a page link to the image or another article), using the element's HTML content will show HTML tags within the title text. Instead, use the combined text content (with whitespace trimmed) as this will show the content as plain text. Change-Id: I5bcc7adcca5a9a2ff953a42f4174245e8701abaf --- M formats/gallery/resources/ext.srf.gallery.overlay.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticResultFormats refs/changes/95/164895/1 diff --git a/formats/gallery/resources/ext.srf.gallery.overlay.js b/formats/gallery/resources/ext.srf.gallery.overlay.js index 430cb34..d7561ba 100644 --- a/formats/gallery/resources/ext.srf.gallery.overlay.js +++ b/formats/gallery/resources/ext.srf.gallery.overlay.js @@ -77,7 +77,7 @@ var $this = $( this ), h = mw.html, image = $this.find( 'a.image' ), - imageText = $this.find( '.gallerytext p' ).html(); + imageText = $.trim( $this.find( '.gallerytext p' ).text() ); // Group images image.attr( 'rel', image.has( 'img' ).length ? galleryID : '' ); -- To view, visit https://gerrit.wikimedia.org/r/164895 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bcc7adcca5a9a2ff953a42f4174245e8701abaf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SemanticResultFormats Gerrit-Branch: master Gerrit-Owner: Poke patrickwesterh...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Include categories in Special:ExpandTemplates - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Include categories in Special:ExpandTemplates
..
Include categories in Special:ExpandTemplates
Show the categories box at the bottom of the page,
which more accurately represents what the page would
look like and allows users to see the effective
categories of the expanded page.
Bug: 71633
Change-Id: I4c003fb1f42b29602cd8924b224ff7642e8cf857
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Parent5446: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialExpandTemplates.php
b/includes/specials/SpecialExpandTemplates.php
index 2d99d60..f3adeba 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -251,6 +251,7 @@
) ) );
$out-addParserOutputContent( $pout );
$out-addHTML( Html::closeElement( 'div' ) );
+ $out-setCategoryLinks( $pout-getCategories() );
}
protected function getGroupName() {
--
To view, visit https://gerrit.wikimedia.org/r/164889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c003fb1f42b29602cd8924b224ff7642e8cf857
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Parent5446 tylerro...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Create CLI utility for ReplaceText jobs - change (mediawiki...ReplaceText)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164896
Change subject: Create CLI utility for ReplaceText jobs
..
Create CLI utility for ReplaceText jobs
This creates a new class (ReplaceTextSearch) to move the logic from
the special page so that it is available for CLI access. Also creates
replace.php which can be used for search-replace tasks that need to be
automated.
Change-Id: I8ccec61f570f33043d8a8d00c52b40acd9d6894a
---
M ReplaceText.php
A ReplaceTextSearch.php
M SpecialReplaceText.php
A replace.php
4 files changed, 326 insertions(+), 58 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ReplaceText
refs/changes/96/164896/1
diff --git a/ReplaceText.php b/ReplaceText.php
index 20df86a..8fdd798 100644
--- a/ReplaceText.php
+++ b/ReplaceText.php
@@ -47,6 +47,7 @@
$wgSpecialPageGroups['ReplaceText'] = 'wiki';
$wgAutoloadClasses['ReplaceText'] = $rtgIP . 'SpecialReplaceText.php';
$wgAutoloadClasses['ReplaceTextJob'] = $rtgIP . 'ReplaceTextJob.php';
+$wgAutoloadClasses['ReplaceTextSearch'] = $rtgIP . 'ReplaceTextSearch.php';
/**
* This function should really go into a ReplaceText_body.php file.
diff --git a/ReplaceTextSearch.php b/ReplaceTextSearch.php
new file mode 100644
index 000..73a9f62
--- /dev/null
+++ b/ReplaceTextSearch.php
@@ -0,0 +1,59 @@
+?php
+
+class ReplaceTextSearch {
+ public static function doSearchQuery( $search, $namespaces, $category,
$prefix, $use_regex = false ) {
+ $dbr = wfGetDB( DB_SLAVE );
+ $tables = array( 'page', 'revision', 'text' );
+ $vars = array( 'page_id', 'page_namespace', 'page_title',
'old_text' );
+ if ( $use_regex ) {
+ $comparisonCond = self::regexCond( $dbr, 'old_text',
$search );
+ } else {
+ $any = $dbr-anyString();
+ $comparisonCond = 'old_text ' . $dbr-buildLike( $any,
$search, $any );
+ }
+ $conds = array(
+ $comparisonCond,
+ 'page_namespace' = $namespaces,
+ 'rev_id = page_latest',
+ 'rev_text_id = old_id'
+ );
+
+ self::categoryCondition( $category, $tables, $conds );
+ self::prefixCondition( $prefix, $conds );
+ $sort = array( 'ORDER BY' = 'page_namespace, page_title' );
+
+ return $dbr-select( $tables, $vars, $conds, __METHOD__ , $sort
);
+ }
+
+ static protected function categoryCondition( $category, $tables,
$conds ) {
+ if ( strval( $category ) !== '' ) {
+ $category = Title::newFromText( $category )-getDbKey();
+ $tables[] = 'categorylinks';
+ $conds[] = 'page_id = cl_from';
+ $conds['cl_to'] = $category;
+ }
+ }
+
+ static protected function prefixCondition( $prefix, $conds ) {
+ if ( strval( $prefix ) === '' ) {
+ return;
+ }
+
+ $dbr = wfGetDB( DB_SLAVE );
+ $title = Title::newFromText( $prefix );
+ if ( !is_null( $title ) ) {
+ $prefix = $title-getDbKey();
+ }
+ $any = $dbr-anyString();
+ $conds[] = 'page_title ' . $dbr-buildLike( $prefix, $any );
+ }
+
+ static private function regexCond( $dbr, $column, $regex ) {
+ if ( $dbr instanceof DatabasePostgres ) {
+ $op = '~';
+ } else {
+ $op = 'REGEXP';
+ }
+ return $column $op . $dbr-addQuotes( $regex );
+ }
+}
\ No newline at end of file
diff --git a/SpecialReplaceText.php b/SpecialReplaceText.php
index 9499712..8b70dcf 100644
--- a/SpecialReplaceText.php
+++ b/SpecialReplaceText.php
@@ -128,7 +128,7 @@
// if user is replacing text within pages...
if ( $this-edit_pages ) {
- $res = $this-doSearchQuery(
+ $res = ReplaceTextSearch::doSearchQuery(
$this-target,
$this-selected_namespaces,
$this-category,
@@ -209,7 +209,7 @@
if ( $this-replacement === '' ) {
$warning_msg =
$this-msg('replacetext_blankwarning')-text();
} elseif ( count( $titles_for_edit ) 0 ) {
- $res = $this-doSearchQuery(
$this-replacement, $this-selected_namespaces, $this-category, $this-prefix,
$this-use_regex );
+ $res =
[MediaWiki-commits] [Gerrit] phabricator - raise HSTS max-age to 1 year - change (operations/puppet)
Chmarkine has uploaded a new change for review. https://gerrit.wikimedia.org/r/164897 Change subject: phabricator - raise HSTS max-age to 1 year .. phabricator - raise HSTS max-age to 1 year Ide46c131 enabled HSTS one week ago with max-age of 7 days. If there is nothing unexpected happened, we can now raise the max-age to 1 year. Bug: 38516 Change-Id: Ic07decaac2b4371c58f9c78401692b85c071d9ee --- M modules/phabricator/templates/phabricator-default.conf.erb 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/97/164897/1 diff --git a/modules/phabricator/templates/phabricator-default.conf.erb b/modules/phabricator/templates/phabricator-default.conf.erb index b67a39f..608ad34 100644 --- a/modules/phabricator/templates/phabricator-default.conf.erb +++ b/modules/phabricator/templates/phabricator-default.conf.erb @@ -23,7 +23,7 @@ Header always merge Vary X-Forwarded-Proto env=ProtoRedirect # enable HTTP Strict Transport Security - Header set Strict-Transport-Security max-age=604800 + Header set Strict-Transport-Security max-age=31536000 %# Apache 2.4 and Newer % % if @lsbdistcodename == 'trusty'% -- To view, visit https://gerrit.wikimedia.org/r/164897 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic07decaac2b4371c58f9c78401692b85c071d9ee Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chmarkine chmark...@hotmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change command line api for role management - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164899
Change subject: Change command line api for role management
..
Change command line api for role management
Deprecate the *-roles vagrant commands in favor of a `vagrant roles`
command with sub-commands. The legacy *-roles commands will still work
but they will no longer be listed in the default command list provided
by Vagrant.
$ vagrant roles
Usage: vagrant roles command [args]
Available subcommands:
disable disables a mediawiki-vagrant role
enable enables a mediawiki-vagrant role
list lists available mediawiki-vagrant roles
resetdisables all optional mediawiki-vagrant roles
For help on any individual command run `vagrant roles COMMAND -h`
Change-Id: I56509c815b9ac4d09970f2e37a79ebe5c5c4577b
---
M lib/mediawiki-vagrant.rb
M lib/mediawiki-vagrant/roles.rb
M lib/mediawiki-vagrant/version.rb
3 files changed, 118 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/99/164899/1
diff --git a/lib/mediawiki-vagrant.rb b/lib/mediawiki-vagrant.rb
index 4f39894..2e54184 100644
--- a/lib/mediawiki-vagrant.rb
+++ b/lib/mediawiki-vagrant.rb
@@ -2,6 +2,11 @@
class Plugin Vagrant.plugin('2')
name 'MediaWiki-Vagrant'
+command 'roles' do
+require 'mediawiki-vagrant/roles'
+Roles
+end
+
command 'config' do
require 'mediawiki-vagrant/config'
Config
@@ -27,22 +32,26 @@
GitUpdates
end
-command 'list-roles' do
+command('list-roles', primary: false) do
+# deprecated in favor of `vagrant roles list`
require 'mediawiki-vagrant/roles'
ListRoles
end
-command 'reset-roles' do
+command('reset-roles', primary: false) do
+# deprecated in favor of `vagrant roles reset`
require 'mediawiki-vagrant/roles'
ResetRoles
end
-command 'enable-role' do
+command('enable-role', primary:false) do
+# deprecated in favor of `vagrant roles enable`
require 'mediawiki-vagrant/roles'
EnableRole
end
-command 'disable-role' do
+command('disable-role', primary:false) do
+# deprecated in favor of `vagrant roles disable`
require 'mediawiki-vagrant/roles'
DisableRole
end
diff --git a/lib/mediawiki-vagrant/roles.rb b/lib/mediawiki-vagrant/roles.rb
index 032997f..b549d3e 100644
--- a/lib/mediawiki-vagrant/roles.rb
+++ b/lib/mediawiki-vagrant/roles.rb
@@ -1,7 +1,72 @@
require 'mediawiki-vagrant/plugin_environment'
module MediaWikiVagrant
-COMMIT_CHANGES = Ok. Run 'vagrant provision' to apply your changes.
+COMMIT_CHANGES = 'Ok. Run `vagrant provision` to apply your changes.'
+
+# Provides a command-line interface for managing Puppet roles.
+#
+class Roles Vagrant.plugin(2, :command)
+include PluginEnvironment
+
+def self.synopsis
+'manage mediawiki-vagrant roles: list, enable, disable, etc.'
+end
+
+def initialize(argv, env)
+super
+
+@args, @command, @sub_args = split_main_and_subcommand(argv)
+
+@subcommands = Vagrant::Registry.new
+@subcommands.register(:list) do
+ListRoles
+end
+@subcommands.register(:reset) do
+ResetRoles
+end
+@subcommands.register(:enable) do
+EnableRole
+end
+@subcommands.register(:disable) do
+DisableRole
+end
+end
+
+def execute
+if @args.include?('-h') || @args.include?('--help')
+return help
+end
+
+command_class = @subcommands.get(@command.to_sym) if @command
+return help if !command_class || !@command
+
+command_class.new(@sub_args, @env).execute
+end
+
+def help
+opts = OptionParser.new do |o|
+o.banner = 'Usage: vagrant roles command [args]'
+o.separator ''
+o.separator 'Available subcommands:'
+
+commands = {}
+longest = 0
+@subcommands.each do |key, klass|
+key = key.to_s
+commands[key] = klass.synopsis
+longest = key.length if key.length longest
+end
+
+commands.keys.sort.each do |key|
+o.separator #{key.ljust(longest+1)} #{commands[key]}
+end
+
+o.separator ''
+o.separator 'For help on any individual command run `vagrant
roles COMMAND -h`'
+
[MediaWiki-commits] [Gerrit] Add `vagrant role info` command - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164901
Change subject: Add `vagrant role info` command
..
Add `vagrant role info` command
Add a custom vagrant command that can be used to view the documentation
for a role.
Change-Id: Id46177034bfa7d9c927be851059f81354207dfb1
---
M lib/mediawiki-vagrant/environment.rb
A lib/mediawiki-vagrant/roles/info.rb
M lib/mediawiki-vagrant/roles/root.rb
M puppet/modules/role/manifests/mediawiki.pp
4 files changed, 59 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/01/164901/1
diff --git a/lib/mediawiki-vagrant/environment.rb
b/lib/mediawiki-vagrant/environment.rb
index db08726..a4ac562 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -74,6 +74,20 @@
hiera_set('classes', classes)
end
+# Get comment header for a role
+#
+def role_docstring(role)
+role_file = module_path(role/manifests/#{role}.pp)
+return nil unless role_file.exist?
+
+doc_str = ''
+role_file.read.each_line do |l|
+break unless l =~ /^#( |$)/
+doc_str += l.gsub(/^# ?/, '')
+end
+doc_str
+end
+
# If it has been a week or more since remote commits have been fetched,
# run 'git fetch origin', unless the user disabled automatic fetching.
# You can disable automatic fetching by creating an empty 'no-updates'
diff --git a/lib/mediawiki-vagrant/roles/info.rb
b/lib/mediawiki-vagrant/roles/info.rb
new file mode 100644
index 000..efd1bf7
--- /dev/null
+++ b/lib/mediawiki-vagrant/roles/info.rb
@@ -0,0 +1,39 @@
+require 'mediawiki-vagrant/plugin_environment'
+require 'rdoc'
+
+module MediaWikiVagrant
+ module Roles
+class Info Vagrant.plugin(2, :command)
+ include PluginEnvironment
+
+ def self.synopsis
+'get information about a mediawiki-vagrant role'
+ end
+
+ def execute
+opts = OptionParser.new do |o|
+ o.banner = 'Usage: vagrant roles info role'
+ o.separator ''
+ o.separator ' Describe a mediawiki-vagrant role.'
+ o.separator ''
+end
+
+argv = parse_options(opts)
+return if !argv
+raise Vagrant::Errors::CLIInvalidUsage, help: opts.help.chomp if
argv.length 1
+
+role = argv[0].downcase
+doc = @mwv.role_docstring(role)
+if doc.nil?
+ @env.ui.error '#{role}' is not a valid role.
+ return 1
+end
+
+rd = RDoc::Markup::ToAnsi.new
+@env.ui.info rd.convert(doc)
+
+0
+ end
+end
+ end
+end
diff --git a/lib/mediawiki-vagrant/roles/root.rb
b/lib/mediawiki-vagrant/roles/root.rb
index 47461b8..51be6d7 100644
--- a/lib/mediawiki-vagrant/roles/root.rb
+++ b/lib/mediawiki-vagrant/roles/root.rb
@@ -30,6 +30,10 @@
require_relative 'disable'
Disable
end
+@subcommands.register(:info) do
+ require_relative 'info'
+ Info
+end
end
def execute
diff --git a/puppet/modules/role/manifests/mediawiki.pp
b/puppet/modules/role/manifests/mediawiki.pp
index f3631d3..03d5ebf 100644
--- a/puppet/modules/role/manifests/mediawiki.pp
+++ b/puppet/modules/role/manifests/mediawiki.pp
@@ -1,9 +1,8 @@
# == Class: role::mediawiki
-# Provisions a MediaWiki instance powered by PHP, MySQL, and redis.
+# Provisions a MediaWiki instance powered by HHVM, MySQL, and redis.
#
# === Parameters
-#
-# [*hostname*]
+# [+hostname+]
# Hostname for the main wiki.
#
class role::mediawiki(
--
To view, visit https://gerrit.wikimedia.org/r/164901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id46177034bfa7d9c927be851059f81354207dfb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lint fixes - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164898
Change subject: Lint fixes
..
Lint fixes
Change-Id: Ia5eba1c586787d524adbc126842aef66b148d796
---
M puppet/modules/mediawiki/manifests/wiki.pp
M puppet/modules/role/manifests/cirrussearch.pp
2 files changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/98/164898/1
diff --git a/puppet/modules/mediawiki/manifests/wiki.pp
b/puppet/modules/mediawiki/manifests/wiki.pp
index e886a8e..8384d95 100644
--- a/puppet/modules/mediawiki/manifests/wiki.pp
+++ b/puppet/modules/mediawiki/manifests/wiki.pp
@@ -81,7 +81,7 @@
exec { ${db_name}_setup:
command = template('mediawiki/wiki/run_installer.erb'),
unless = template('mediawiki/wiki/check_installed.erb'),
-require = Class[mysql],
+require = Class['mysql'],
}
exec { ${db_name}_include_extra_settings:
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index 89296ab..d1de517 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -48,7 +48,10 @@
vagrant::settings { 'cirrussearch':
ram = 2000,
-forward_ports = { 9200 = 9200, 9300 = 9300 },
+forward_ports = {
+ 9200 = 9200,
+ 9300 = 9300,
+},
}
exec { 'build_search_index':
--
To view, visit https://gerrit.wikimedia.org/r/164898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5eba1c586787d524adbc126842aef66b148d796
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reorganize vagrant roles commands - change (mediawiki/vagrant)
BryanDavis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164900
Change subject: Reorganize vagrant roles commands
..
Reorganize vagrant roles commands
Change-Id: I152b18ec188e1db07861980559150f0adf45dc1d
---
M lib/mediawiki-vagrant.rb
D lib/mediawiki-vagrant/roles.rb
A lib/mediawiki-vagrant/roles/disable.rb
A lib/mediawiki-vagrant/roles/enable.rb
A lib/mediawiki-vagrant/roles/list.rb
A lib/mediawiki-vagrant/roles/reset.rb
A lib/mediawiki-vagrant/roles/root.rb
7 files changed, 231 insertions(+), 203 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/00/164900/1
diff --git a/lib/mediawiki-vagrant.rb b/lib/mediawiki-vagrant.rb
index 2e54184..d791713 100644
--- a/lib/mediawiki-vagrant.rb
+++ b/lib/mediawiki-vagrant.rb
@@ -3,8 +3,8 @@
name 'MediaWiki-Vagrant'
command 'roles' do
-require 'mediawiki-vagrant/roles'
-Roles
+require 'mediawiki-vagrant/roles/root'
+Roles::Root
end
command 'config' do
@@ -34,26 +34,26 @@
command('list-roles', primary: false) do
# deprecated in favor of `vagrant roles list`
-require 'mediawiki-vagrant/roles'
-ListRoles
+require 'mediawiki-vagrant/roles/list'
+Roles::List
end
command('reset-roles', primary: false) do
# deprecated in favor of `vagrant roles reset`
-require 'mediawiki-vagrant/roles'
-ResetRoles
+require 'mediawiki-vagrant/roles/reset'
+Roles::Reset
end
command('enable-role', primary:false) do
# deprecated in favor of `vagrant roles enable`
-require 'mediawiki-vagrant/roles'
-EnableRole
+require 'mediawiki-vagrant/roles/enable'
+Roles::Enable
end
command('disable-role', primary:false) do
# deprecated in favor of `vagrant roles disable`
-require 'mediawiki-vagrant/roles'
-DisableRole
+require 'mediawiki-vagrant/roles/disable'
+Roles::Disable
end
command 'import-dump' do
diff --git a/lib/mediawiki-vagrant/roles.rb b/lib/mediawiki-vagrant/roles.rb
deleted file mode 100644
index b549d3e..000
--- a/lib/mediawiki-vagrant/roles.rb
+++ /dev/null
@@ -1,193 +0,0 @@
-require 'mediawiki-vagrant/plugin_environment'
-
-module MediaWikiVagrant
-COMMIT_CHANGES = 'Ok. Run `vagrant provision` to apply your changes.'
-
-# Provides a command-line interface for managing Puppet roles.
-#
-class Roles Vagrant.plugin(2, :command)
-include PluginEnvironment
-
-def self.synopsis
-'manage mediawiki-vagrant roles: list, enable, disable, etc.'
-end
-
-def initialize(argv, env)
-super
-
-@args, @command, @sub_args = split_main_and_subcommand(argv)
-
-@subcommands = Vagrant::Registry.new
-@subcommands.register(:list) do
-ListRoles
-end
-@subcommands.register(:reset) do
-ResetRoles
-end
-@subcommands.register(:enable) do
-EnableRole
-end
-@subcommands.register(:disable) do
-DisableRole
-end
-end
-
-def execute
-if @args.include?('-h') || @args.include?('--help')
-return help
-end
-
-command_class = @subcommands.get(@command.to_sym) if @command
-return help if !command_class || !@command
-
-command_class.new(@sub_args, @env).execute
-end
-
-def help
-opts = OptionParser.new do |o|
-o.banner = 'Usage: vagrant roles command [args]'
-o.separator ''
-o.separator 'Available subcommands:'
-
-commands = {}
-longest = 0
-@subcommands.each do |key, klass|
-key = key.to_s
-commands[key] = klass.synopsis
-longest = key.length if key.length longest
-end
-
-commands.keys.sort.each do |key|
-o.separator #{key.ljust(longest+1)} #{commands[key]}
-end
-
-o.separator ''
-o.separator 'For help on any individual command run `vagrant
roles COMMAND -h`'
-end
-@env.ui.info(opts.help, prefix: false)
-end
-end
-
-class ListRoles Vagrant.plugin(2, :command)
-include PluginEnvironment
-
-def self.synopsis
-lists available mediawiki-vagrant roles
-end
-
-def execute
-opts = OptionParser.new do |o|
-o.banner = 'Usage: vagrant
[MediaWiki-commits] [Gerrit] Remove unwanted comma - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Remove unwanted comma
..
Remove unwanted comma
Change-Id: Icc7f501a7ada7b2a5cde6acc0822ebaca720
---
M modules/tools/ext.cx.tools.mt.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jsahleen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 9f170f6..11d7d1a 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -167,7 +167,7 @@
.children()
.attr( {
id: 'cx' + sourceId,
- 'data-source': sourceId,
+ 'data-source': sourceId
} )
.data( 'cx-state', 'mt' )
);
--
To view, visit https://gerrit.wikimedia.org/r/164518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc7f501a7ada7b2a5cde6acc0822ebaca720
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added 4 ppl to notifyOnAllChanges for zero portal - change (operations/mediawiki-config)
Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/164902
Change subject: Added 4 ppl to notifyOnAllChanges for zero portal
..
Added 4 ppl to notifyOnAllChanges for zero portal
Change-Id: I4fc0f8f7de153b5ce9f3e4f0a4f484c70e69beb5
---
M wmf-config/CommonSettings.php
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/02/164902/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 36d6aa6..85b05c0 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2779,6 +2779,11 @@
$wgZeroPortalImpersonateUser = 'Impersonator';
unset( $zpUserRights );
+
+ $wgUsersNotifiedOnAllChanges[] = 'ABaso(WMF)';
+ $wgUsersNotifiedOnAllChanges[] = 'Dfoy';
+ $wgUsersNotifiedOnAllChanges[] = 'Jhobs';
+ $wgUsersNotifiedOnAllChanges[] = 'Yurik';
} else {
// metawiki
$wgGroupPermissions['zeroadmin']['zero-edit'] = true;
--
To view, visit https://gerrit.wikimedia.org/r/164902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fc0f8f7de153b5ce9f3e4f0a4f484c70e69beb5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lint fixes - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Lint fixes
..
Lint fixes
Change-Id: Ia5eba1c586787d524adbc126842aef66b148d796
---
M puppet/modules/mediawiki/manifests/wiki.pp
M puppet/modules/role/manifests/cirrussearch.pp
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/mediawiki/manifests/wiki.pp
b/puppet/modules/mediawiki/manifests/wiki.pp
index e886a8e..8384d95 100644
--- a/puppet/modules/mediawiki/manifests/wiki.pp
+++ b/puppet/modules/mediawiki/manifests/wiki.pp
@@ -81,7 +81,7 @@
exec { ${db_name}_setup:
command = template('mediawiki/wiki/run_installer.erb'),
unless = template('mediawiki/wiki/check_installed.erb'),
-require = Class[mysql],
+require = Class['mysql'],
}
exec { ${db_name}_include_extra_settings:
diff --git a/puppet/modules/role/manifests/cirrussearch.pp
b/puppet/modules/role/manifests/cirrussearch.pp
index 89296ab..d1de517 100644
--- a/puppet/modules/role/manifests/cirrussearch.pp
+++ b/puppet/modules/role/manifests/cirrussearch.pp
@@ -48,7 +48,10 @@
vagrant::settings { 'cirrussearch':
ram = 2000,
-forward_ports = { 9200 = 9200, 9300 = 9300 },
+forward_ports = {
+ 9200 = 9200,
+ 9300 = 9300,
+},
}
exec { 'build_search_index':
--
To view, visit https://gerrit.wikimedia.org/r/164898
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5eba1c586787d524adbc126842aef66b148d796
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] i18n: add Special:MyLanguage - change (mediawiki...CommonsMetadata)
jenkins-bot has submitted this change and it was merged. Change subject: i18n: add Special:MyLanguage .. i18n: add Special:MyLanguage - Add Special:MyLanguage to the Commons URLs Change-Id: Id635d91e12b2a3ce86409b944a7df4c18ba964c3 --- M i18n/en.json 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: Gilles: Looks good to me, approved jenkins-bot: Verified diff --git a/i18n/en.json b/i18n/en.json index 273f0e2..83604a1 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4,11 +4,11 @@ }, commonsmetadata-desc: Extends the \extmetadata\ property of the image information API module to include information stored in image description pages that use the templates commonly used on Wikimedia Commons, commonsmetadata-trackingcategory-no-license: Files with no machine-readable license, - commonsmetadata-trackingcategory-no-license-desc: The file does not have any [https://commons.wikimedia.org/wiki/Commons:Machine-readable_data machine-readable] license template., + commonsmetadata-trackingcategory-no-license-desc: The file does not have any [https://commons.wikimedia.org/wiki/Special:MyLanguage/Commons:Machine-readable_data machine-readable] license template., commonsmetadata-trackingcategory-no-description: Files with no machine-readable description, - commonsmetadata-trackingcategory-no-description-desc: The file does not have a [https://commons.wikimedia.org/wiki/Commons:Machine-readable_data machine-readable] information template, or its description field is not filled out., + commonsmetadata-trackingcategory-no-description-desc: The file does not have a [https://commons.wikimedia.org/wiki/Special:MyLanguage/Commons:Machine-readable_data machine-readable] information template, or its description field is not filled out., commonsmetadata-trackingcategory-no-author: Files with no machine-readable author, - commonsmetadata-trackingcategory-no-author-desc: The file does not have a [https://commons.wikimedia.org/wiki/Commons:Machine-readable_data machine-readable] information template, or its author field is not filled out., + commonsmetadata-trackingcategory-no-author-desc: The file does not have a [https://commons.wikimedia.org/wiki/Special:MyLanguage/Commons:Machine-readable_data machine-readable] information template, or its author field is not filled out., commonsmetadata-trackingcategory-no-source: Files with no machine-readable source, - commonsmetadata-trackingcategory-no-source-desc: The file does not have a [https://commons.wikimedia.org/wiki/Commons:Machine-readable_data machine-readable] information template, or its source field is not filled out. + commonsmetadata-trackingcategory-no-source-desc: The file does not have a [https://commons.wikimedia.org/wiki/Special:MyLanguage/Commons:Machine-readable_data machine-readable] information template, or its source field is not filled out. } -- To view, visit https://gerrit.wikimedia.org/r/164751 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id635d91e12b2a3ce86409b944a7df4c18ba964c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommonsMetadata Gerrit-Branch: master Gerrit-Owner: Shirayuki shirayuk...@gmail.com Gerrit-Reviewer: Gilles gdu...@wikimedia.org Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
