[MediaWiki-commits] [Gerrit] Remove mw1151 from the bits appservers - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134059
Change subject: Remove mw1151 from the bits appservers
..
Remove mw1151 from the bits appservers
mw1151 has a failed disk, removing it from pool while we wait for the
disk change.
Change-Id: I0a81273c4c406bb4f4808a64aa9e0481a21ccc06
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M manifests/role/cache.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/134059/1
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 848edf8..38850f4 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -355,7 +355,7 @@
},
'bits_appservers' = {
'pmtpa' = [ srv248.pmtpa.wmnet, srv249.pmtpa.wmnet,
mw60.pmtpa.wmnet, mw61.pmtpa.wmnet ],
-'eqiad' = [ mw1149.eqiad.wmnet, mw1150.eqiad.wmnet,
mw1151.eqiad.wmnet, mw1152.eqiad.wmnet ],
+'eqiad' = [ mw1149.eqiad.wmnet, mw1150.eqiad.wmnet,
mw1152.eqiad.wmnet ],
},
'test_appservers' = {
'pmtpa' = [ mw1017.eqiad.wmnet ],
--
To view, visit https://gerrit.wikimedia.org/r/134059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a81273c4c406bb4f4808a64aa9e0481a21ccc06
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] erbium: fix template variable scoping - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134060
Change subject: erbium: fix template variable scoping
..
erbium: fix template variable scoping
Change-Id: Ifef60ab9b7ced7df985443b8daf36361b2c138e3
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M templates/udp2log/filters.erbium.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/134060/1
diff --git a/templates/udp2log/filters.erbium.erb
b/templates/udp2log/filters.erbium.erb
index 2c2b849..9a80985 100644
--- a/templates/udp2log/filters.erbium.erb
+++ b/templates/udp2log/filters.erbium.erb
@@ -21,7 +21,7 @@
pipe 1 /usr/local/bin/filter | /usr/bin/log2udp -h gadolinium.wikimedia.org -p
3815
### API Usage
-pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %=
webrequest_log_directory %/api-usage.tsv.log
+pipe 100 /usr/bin/udp-filter -F '\t' -p /w/api.php %=
scope.lookupvar('role::logging::udp2log::oxygen::webrequest_log_directory')
%/api-usage.tsv.log
### GLAM NARA / National Archives - RT 2212
pipe 10 /usr/bin/udp-filter -F '\t' -p _NARA_ -g -b country
%=log_directory %/glam_nara.tsv.log
--
To view, visit https://gerrit.wikimedia.org/r/134060
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifef60ab9b7ced7df985443b8daf36361b2c138e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pmactt: correct compilation under puppet 3 - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134061
Change subject: pmactt: correct compilation under puppet 3
..
pmactt: correct compilation under puppet 3
Change-Id: I5974b6e19ac60ea60f22f1ef7dfeab99308f1902
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/pmacct/manifests/configs.pp
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/134061/1
diff --git a/modules/pmacct/manifests/configs.pp
b/modules/pmacct/manifests/configs.pp
index 02c4b9e..95385e9 100644
--- a/modules/pmacct/manifests/configs.pp
+++ b/modules/pmacct/manifests/configs.pp
@@ -1,9 +1,9 @@
# pmacct::makeconfig
# Generates a unique config file per device and pretag file.
-define pmacct::configs ($name, $port, $ip, $samplerate) {
+define pmacct::configs ($port, $ip, $samplerate) {
# Single confile file per device
-file { /etc/pmacct/config-${name}.cfg:
+file { /etc/pmacct/config-${title}.cfg:
ensure = 'file',
owner = 'pmacct',
group = 'pmacct',
@@ -20,7 +20,7 @@
}
# Corresponding ferm rule for bgp redirects
-ferm::rule {pmacct_${name}_bgp_redirect:
+ferm::rule {pmacct_${title}_bgp_redirect:
domain = '(ip)', # ipv6 doesn't have a 'nat' table
prio = '20',
rule = proto tcp dport 179 source ${ip} REDIRECT to-ports
${port};,
--
To view, visit https://gerrit.wikimedia.org/r/134061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5974b6e19ac60ea60f22f1ef7dfeab99308f1902
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pmactt: correct compilation under puppet 3 - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: pmactt: correct compilation under puppet 3
..
pmactt: correct compilation under puppet 3
Change-Id: I5974b6e19ac60ea60f22f1ef7dfeab99308f1902
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/pmacct/manifests/configs.pp
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/pmacct/manifests/configs.pp
b/modules/pmacct/manifests/configs.pp
index 02c4b9e..95385e9 100644
--- a/modules/pmacct/manifests/configs.pp
+++ b/modules/pmacct/manifests/configs.pp
@@ -1,9 +1,9 @@
# pmacct::makeconfig
# Generates a unique config file per device and pretag file.
-define pmacct::configs ($name, $port, $ip, $samplerate) {
+define pmacct::configs ($port, $ip, $samplerate) {
# Single confile file per device
-file { /etc/pmacct/config-${name}.cfg:
+file { /etc/pmacct/config-${title}.cfg:
ensure = 'file',
owner = 'pmacct',
group = 'pmacct',
@@ -20,7 +20,7 @@
}
# Corresponding ferm rule for bgp redirects
-ferm::rule {pmacct_${name}_bgp_redirect:
+ferm::rule {pmacct_${title}_bgp_redirect:
domain = '(ip)', # ipv6 doesn't have a 'nat' table
prio = '20',
rule = proto tcp dport 179 source ${ip} REDIRECT to-ports
${port};,
--
To view, visit https://gerrit.wikimedia.org/r/134061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5974b6e19ac60ea60f22f1ef7dfeab99308f1902
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] new mw release 1.24wmf4 - change (pywikibot/compat)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134062
Change subject: new mw release 1.24wmf4
..
new mw release 1.24wmf4
Change-Id: Iae3c3df58ec06702a78fed552346c4174714ce83
---
M family.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/62/134062/1
diff --git a/family.py b/family.py
index 8c68b3c..4a2c53a 100644
--- a/family.py
+++ b/family.py
@@ -4960,7 +4960,7 @@
Return Wikimedia projects version number as a string.
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
-return '1.24wmf3'
+return '1.24wmf4'
def shared_image_repository(self, code):
return ('commons', 'commons')
--
To view, visit https://gerrit.wikimedia.org/r/134062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iae3c3df58ec06702a78fed552346c4174714ce83
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] new mw release 1.24wmf4 - change (pywikibot/compat)
jenkins-bot has submitted this change and it was merged.
Change subject: new mw release 1.24wmf4
..
new mw release 1.24wmf4
Change-Id: Iae3c3df58ec06702a78fed552346c4174714ce83
---
M family.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/family.py b/family.py
index 8c68b3c..4a2c53a 100644
--- a/family.py
+++ b/family.py
@@ -4960,7 +4960,7 @@
Return Wikimedia projects version number as a string.
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
-return '1.24wmf3'
+return '1.24wmf4'
def shared_image_repository(self, code):
return ('commons', 'commons')
--
To view, visit https://gerrit.wikimedia.org/r/134062
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae3c3df58ec06702a78fed552346c4174714ce83
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt i...@gno.de
Gerrit-Reviewer: Xqt i...@gno.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] Fix function not being defined - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix function not being defined
..
Fix function not being defined
Change-Id: I4b8bc9f25dda5725fa4d25d59d3e39f98f8fc084
---
M pywikibot/page.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 0c28043..3883961 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -787,7 +787,7 @@
return False
else:
bots = template[1][0].split(',')
-if 'all' in bots or calledModuleName() in bots \
+if 'all' in bots or pywikibot.calledModuleName() in bots \
or username in bots:
return False
elif title == 'Bots':
@@ -801,9 +801,9 @@
if ttype == 'deny':
return not ('all' in bots or username in bots)
if ttype == 'allowscript':
-return 'all' in bots or calledModuleName() in bots
+return 'all' in bots or pywikibot.calledModuleName()
in bots
if ttype == 'denyscript':
-return not ('all' in bots or calledModuleName() in
bots)
+return not ('all' in bots or
pywikibot.calledModuleName() in bots)
# no restricting template found
return True
--
To view, visit https://gerrit.wikimedia.org/r/134052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b8bc9f25dda5725fa4d25d59d3e39f98f8fc084
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Ladsgroup ladsgr...@gmail.com
Gerrit-Reviewer: Merlijn van Deen valhall...@arctus.nl
Gerrit-Reviewer: Xqt i...@gno.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] Make helppage link relative - change (mediawiki...ConfirmAccount)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134063
Change subject: Make helppage link relative
..
Make helppage link relative
Spotted by Wmat
https://www.mediawiki.org/wiki/Thread:Extension_talk:ConfirmAccount/BUG:_Link_to_mediawiki.org_help_pages_is_internal_but_should_be_external_%282%29
Change-Id: I7f905557acbb3ae985b596fd8107945c0fbf6463
---
M i18n/confirmaccount/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ConfirmAccount
refs/changes/63/134063/1
diff --git a/i18n/confirmaccount/en.json b/i18n/confirmaccount/en.json
index 95803dd..cd093da 100644
--- a/i18n/confirmaccount/en.json
+++ b/i18n/confirmaccount/en.json
@@ -72,7 +72,7 @@
confirmaccount-rej: Account request rejected successfully.,
confirmaccount-viewing: (currently {{GENDER:$1|being}} viewed by
[[User:$1|$1]]),
confirmaccount-summary: Creating user page for new user.,
-confirmaccount-welc: '''Welcome to ''{{SITENAME}}''!'''\nWe hope you
will contribute much and well.\nYou will probably want to read the
[[{{MediaWiki:Helppage}}|help pages]].\nAgain, welcome and have fun!,
+confirmaccount-welc: '''Welcome to ''{{SITENAME}}''!'''\nWe hope you
will contribute much and well.\nYou will probably want to read the
[{{MediaWiki:Helppage}} help pages].\nAgain, welcome and have fun!,
confirmaccount-wsum: Welcome!,
confirmaccount-email-subj: {{SITENAME}} account request,
confirmaccount-email-body: Your request for an account has been
approved on {{SITENAME}}.\n\nAccount name: $1\n\nPassword: $2\n\nFor security
reasons you will need to change your password on first login.\nTo login, please
go to {{fullurl:Special:UserLogin}}.,
--
To view, visit https://gerrit.wikimedia.org/r/134063
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f905557acbb3ae985b596fd8107945c0fbf6463
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ConfirmAccount
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] Add iOS hover bug fix - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Add iOS hover bug fix
..
Add iOS hover bug fix
So hacky! :-)
Bug: 64669
Change-Id: I16a0bdbf76556c1f85993ff37f3661617956443e
---
M javascripts/common/mainmenu.js
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
JGonera: Looks good to me, approved
jenkins-bot: Verified
Objections:
Jdlrobson: There's a problem with this change, please improve
diff --git a/javascripts/common/mainmenu.js b/javascripts/common/mainmenu.js
index 90b4894..d6cea87 100644
--- a/javascripts/common/mainmenu.js
+++ b/javascripts/common/mainmenu.js
@@ -40,7 +40,10 @@
}
ev.preventDefault();
ev.stopPropagation();
- } );
+ // Hack: See bug 64669 iOS has a hover bug
+ // Adding an empty touchend event seems to fix this
+ // FIXME: Remove when using tapEvent in stable
+ } ).on( 'touchend', function() {} );
// close navigation if content tapped
$( '#mw-mf-page-center' ).on( tapEvent, function(ev) {
--
To view, visit https://gerrit.wikimedia.org/r/131089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16a0bdbf76556c1f85993ff37f3661617956443e
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
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] dns recursors: add ferm rules - change (operations/puppet)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: dns recursors: add ferm rules
..
dns recursors: add ferm rules
Change-Id: Ib0cb968f8987ad2cfb2976c7478abfe75ecc2142
---
M manifests/role/dns.pp
1 file changed, 11 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index b9986a7..fcc529a 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -59,4 +59,15 @@
}
::dns::recursor::monitor { [ $::ipaddress, $::ipaddress6_eth0 ]: }
+
+ferm::service { 'udp_dns_rec':
+proto = 'udp',
+port = '53',
+}
+
+ferm::service { 'tcp_dns_rec':
+proto = 'tcp',
+port = '53',
+}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/133513
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0cb968f8987ad2cfb2976c7478abfe75ecc2142
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya mata...@foss.co.il
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@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] Record sampling factor in EventLogging calls - change (mediawiki...MultimediaViewer)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134064
Change subject: Record sampling factor in EventLogging calls
..
Record sampling factor in EventLogging calls
Change-Id: I3966bf5dfe9ed607bda8e87f3b1924de37716dcf
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/619
---
M MultimediaViewer.php
M MultimediaViewerHooks.php
M resources/mmv/mmv.DurationLogger.js
M resources/mmv/mmv.logger.js
M tests/qunit/mmv/mmv.logger.test.js
5 files changed, 8 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/64/134064/1
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index c131328..289d5fa 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -844,7 +844,7 @@
$wgResourceModules['schema.MediaViewer'] = array(
'class' = 'ResourceLoaderSchemaModule',
'schema' = 'MediaViewer',
- 'revision' = 8245578,
+ 'revision' = 8572637,
);
$wgResourceModules['schema.MultimediaViewerNetworkPerformance']
= array(
@@ -856,7 +856,7 @@
$wgResourceModules['schema.MultimediaViewerDuration'] = array(
'class' = 'ResourceLoaderSchemaModule',
'schema' = 'MultimediaViewerDuration',
- 'revision' = 8318615,
+ 'revision' = 8572641,
);
$wgResourceModules['mmv.logger']['dependencies'][] =
'ext.eventLogging';
diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index 4540615..4dd7038 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -156,6 +156,7 @@
'samplingFactor' = $wgMediaViewerSamplingFactor,
);
$vars['wgNetworkPerformanceSamplingFactor'] =
$wgNetworkPerformanceSamplingFactor;
+ $vars['wgMediaViewerSamplingFactor'] =
$wgMediaViewerSamplingFactor;
$vars['wgMediaViewer'] = true;
$vars['wgMediaViewerIsInBeta'] = $wgMediaViewerIsInBeta;
diff --git a/resources/mmv/mmv.DurationLogger.js
b/resources/mmv/mmv.DurationLogger.js
index 0905ad5..c08b948 100644
--- a/resources/mmv/mmv.DurationLogger.js
+++ b/resources/mmv/mmv.DurationLogger.js
@@ -88,7 +88,8 @@
e = {
type : type,
duration : duration,
- loggedIn : !mw.user.isAnon()
+ loggedIn : !mw.user.isAnon(),
+ samplingFactor : mw.config.get(
'wgMediaViewerSamplingFactor' )
};
message = type + ': ' + duration + 'ms';
diff --git a/resources/mmv/mmv.logger.js b/resources/mmv/mmv.logger.js
index 2f12138..a96b84c 100644
--- a/resources/mmv/mmv.logger.js
+++ b/resources/mmv/mmv.logger.js
@@ -77,8 +77,8 @@
if ( mw.eventLog !skipEventLog this.isInSample() ) {
return mw.eventLog.logEvent( 'MediaViewer', {
- version: '1.1',
- action: action
+ action : action,
+ samplingFactor : mw.config.get(
'wgMediaViewerSamplingFactor' )
} );
}
diff --git a/tests/qunit/mmv/mmv.logger.test.js
b/tests/qunit/mmv/mmv.logger.test.js
index ed505b2..d30cbb4 100755
--- a/tests/qunit/mmv/mmv.logger.test.js
+++ b/tests/qunit/mmv/mmv.logger.test.js
@@ -1,7 +1,7 @@
( function ( mw ) {
QUnit.module( 'mmv.logger', QUnit.newMwEnvironment() );
- QUnit.test( 'log()', 14, function ( assert ) {
+ QUnit.test( 'log()', 11, function ( assert ) {
var oldMwLog = mw.log,
oldEventLog = mw.eventLog,
oldLogActions = mw.mmv.logger.logActions,
@@ -20,7 +20,6 @@
mw.eventLog = {
logEvent : function ( name, event ) {
logEventCalled = true;
- assert.strictEqual( event.version, '1.1', 'Correct
version' );
assert.strictEqual( name, 'MediaViewer', 'Event name is
correct' );
} };
--
To view, visit https://gerrit.wikimedia.org/r/134064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3966bf5dfe9ed607bda8e87f3b1924de37716dcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Take sampling factor into account - change (analytics/multimedia)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134065
Change subject: Take sampling factor into account
..
Take sampling factor into account
Change-Id: I3808cc07c44f1f0d4f886bebbc65e213bd0d1315
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/619
---
M actions/template.sql
1 file changed, 23 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/multimedia
refs/changes/65/134065/1
diff --git a/actions/template.sql b/actions/template.sql
index 49eb727..5e0d918 100644
--- a/actions/template.sql
+++ b/actions/template.sql
@@ -1,30 +1,33 @@
-- Get statistics, per day, for various actions in Media Viewer.
SELECT CONCAT(SUBSTRING(timestamp, 1, 4), '-', SUBSTRING(timestamp, 5, 2),
'-', SUBSTRING(timestamp, 7, 2)) AS datestring,
- SUM(CASE WHEN event_action IN ('thumbnail-link-click', 'thumbnail')
THEN 1 ELSE 0 END) AS 'thumbnail',
- SUM(CASE WHEN event_action IN ('enlarge-link-click', 'enlarge') THEN 1
ELSE 0 END) AS 'enlarge',
- SUM(CASE WHEN event_action IN ('fullscreen-link-click', 'fullscreen')
THEN 1 ELSE 0 END) AS 'fullscreen',
- SUM(CASE WHEN event_action IN ('defullscreen-link-click',
'defullscreen') THEN 1 ELSE 0 END) AS 'defullscreen',
- SUM(CASE WHEN event_action IN ('close-link-click', 'close') THEN 1 ELSE
0 END) AS 'close',
- SUM(CASE WHEN event_action IN ('site-link-click',
'file-description-page') THEN 1 ELSE 0 END) AS 'file-description-page',
- SUM(CASE WHEN event_action IN ('use-this-file-link-click',
'use-this-file-open') THEN 1 ELSE 0 END) AS 'use-this-file-open',
- SUM(CASE WHEN event_action = 'image-view' THEN 1 ELSE 0 END) AS
'image-view',
- SUM(CASE WHEN event_action = 'metadata-open' THEN 1 ELSE 0 END) AS
'metadata-open',
- SUM(CASE WHEN event_action = 'metadata-close' THEN 1 ELSE 0 END) AS
'metadata-close',
- SUM(CASE WHEN event_action = 'next-image' THEN 1 ELSE 0 END) AS
'next-image',
- SUM(CASE WHEN event_action = 'prev-image' THEN 1 ELSE 0 END) AS
'prev-image',
- SUM(CASE WHEN event_action = 'terms-open' THEN 1 ELSE 0 END) AS
'terms-open',
- SUM(CASE WHEN event_action = 'license-page' THEN 1 ELSE 0 END) AS
'license-page',
- SUM(CASE WHEN event_action = 'author-page' THEN 1 ELSE 0 END) AS
'author-page',
- SUM(CASE WHEN event_action = 'source-page' THEN 1 ELSE 0 END) AS
'source-page',
- SUM(CASE WHEN event_action = 'hash-load' THEN 1 ELSE 0 END) AS
'hash-load',
- SUM(CASE WHEN event_action = 'history-navigation' THEN 1 ELSE 0 END) AS
'history-navigation'
+ SUM(CASE WHEN event_action IN ('thumbnail-link-click', 'thumbnail')
THEN event_samplingFactor ELSE 0 END) AS 'thumbnail',
+ SUM(CASE WHEN event_action IN ('enlarge-link-click', 'enlarge') THEN
event_samplingFactor ELSE 0 END) AS 'enlarge',
+ SUM(CASE WHEN event_action IN ('fullscreen-link-click', 'fullscreen')
THEN event_samplingFactor ELSE 0 END) AS 'fullscreen',
+ SUM(CASE WHEN event_action IN ('defullscreen-link-click',
'defullscreen') THEN event_samplingFactor ELSE 0 END) AS 'defullscreen',
+ SUM(CASE WHEN event_action IN ('close-link-click', 'close') THEN
event_samplingFactor ELSE 0 END) AS 'close',
+ SUM(CASE WHEN event_action IN ('site-link-click',
'file-description-page') THEN event_samplingFactor ELSE 0 END) AS
'file-description-page',
+ SUM(CASE WHEN event_action IN ('use-this-file-link-click',
'use-this-file-open') THEN event_samplingFactor ELSE 0 END) AS
'use-this-file-open',
+ SUM(CASE WHEN event_action = 'image-view' THEN event_samplingFactor
ELSE 0 END) AS 'image-view',
+ SUM(CASE WHEN event_action = 'metadata-open' THEN event_samplingFactor
ELSE 0 END) AS 'metadata-open',
+ SUM(CASE WHEN event_action = 'metadata-close' THEN event_samplingFactor
ELSE 0 END) AS 'metadata-close',
+ SUM(CASE WHEN event_action = 'next-image' THEN event_samplingFactor
ELSE 0 END) AS 'next-image',
+ SUM(CASE WHEN event_action = 'prev-image' THEN event_samplingFactor
ELSE 0 END) AS 'prev-image',
+ SUM(CASE WHEN event_action = 'terms-open' THEN event_samplingFactor
ELSE 0 END) AS 'terms-open',
+ SUM(CASE WHEN event_action = 'license-page' THEN event_samplingFactor
ELSE 0 END) AS 'license-page',
+ SUM(CASE WHEN event_action = 'author-page' THEN event_samplingFactor
ELSE 0 END) AS 'author-page',
+ SUM(CASE WHEN event_action = 'source-page' THEN event_samplingFactor
ELSE 0 END) AS 'source-page',
+ SUM(CASE WHEN event_action = 'hash-load' THEN event_samplingFactor ELSE
0 END) AS 'hash-load',
+ SUM(CASE WHEN event_action = 'history-navigation' THEN
event_samplingFactor ELSE 0 END) AS 'history-navigation'
FROM (
- SELECT timestamp, event_action FROM MediaViewer_7670440
+ SELECT timestamp,
[MediaWiki-commits] [Gerrit] opportunity to reuse Title::getEditURL() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: opportunity to reuse Title::getEditURL() .. opportunity to reuse Title::getEditURL() This will be helpful if we want to make changes to the edit URL in the future. Change-Id: I6e877d23b041a2bd1672ae804e06bf6a52e16c9f --- M includes/OutputPage.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Bartosz Dziewoński: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 72869e4..0f3612a 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -3269,13 +3269,13 @@ 'rel' = 'alternate', 'type' = 'application/x-wiki', 'title' = $msg, - 'href' = $this-getTitle()-getLocalURL( 'action=edit' ) + 'href' = $this-getTitle()-getEditURL(), ) ); // Alternate edit link $tags['alternative-edit'] = Html::element( 'link', array( 'rel' = 'edit', 'title' = $msg, - 'href' = $this-getTitle()-getLocalURL( 'action=edit' ) + 'href' = $this-getTitle()-getEditURL(), ) ); } } -- To view, visit https://gerrit.wikimedia.org/r/134045 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6e877d23b041a2bd1672ae804e06bf6a52e16c9f Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Adamw awi...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com Gerrit-Reviewer: Hoo man h...@online.de Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.tipsy: Merge some upstream changes - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.tipsy: Merge some upstream changes
..
jquery.tipsy: Merge some upstream changes
https://github.com/jaz303/tipsy/tree/2d916c6
4b3e29f: Remove superfluous slash
23994f5: tipsy object proxy method tolerates null object
2d916c6: Always ensure native tooltip is restored
Change-Id: Id87ba461265730a56a3212c003b8321bd53a6096
---
M resources/src/jquery.tipsy/jquery.tipsy.js
1 file changed, 15 insertions(+), 10 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/jquery.tipsy/jquery.tipsy.js
b/resources/src/jquery.tipsy/jquery.tipsy.js
index f920e8b..985cd83 100644
--- a/resources/src/jquery.tipsy/jquery.tipsy.js
+++ b/resources/src/jquery.tipsy/jquery.tipsy.js
@@ -12,17 +12,11 @@
return (typeof thing == 'function') ? (thing.call(ctx)) : thing;
}
-function fixTitle($ele) {
-if ($ele.attr('title') || typeof($ele.attr('original-title')) !=
'string') {
-$ele.attr('original-title', $ele.attr('title') ||
'').removeAttr('title');
-}
-}
-
function Tipsy(element, options) {
this.$element = $(element);
this.options = options;
this.enabled = true;
-fixTitle(this.$element);
+this.fixTitle();
}
Tipsy.prototype = {
@@ -104,9 +98,17 @@
}
},
+
+fixTitle: function() {
+var $e = this.$element;
+if ($e.attr('title') || typeof($e.attr('original-title')) !=
'string') {
+$e.attr('original-title', $e.attr('title') ||
'').removeAttr('title');
+}
+},
+
getTitle: function() {
var title, $e = this.$element, o = this.options;
-fixTitle($e);
+this.fixTitle();
if (typeof o.title == 'string') {
title = $e.attr(o.title == 'title' ? 'original-title' :
o.title);
} else if (typeof o.title == 'function') {
@@ -118,7 +120,7 @@
tip: function() {
if (!this.$tip) {
-this.$tip = $('div class=tipsy/div').html('div
class=tipsy-arrow/divdiv class=tipsy-inner//div');
+this.$tip = $('div class=tipsy/div').html('div
class=tipsy-arrow/divdiv class=tipsy-inner/div');
}
return this.$tip;
},
@@ -141,7 +143,9 @@
if (options === true) {
return this.data('tipsy');
} else if (typeof options == 'string') {
-return this.data('tipsy')[options]();
+var tipsy = this.data('tipsy');
+if (tipsy) tipsy[options]();
+return this;
}
options = $.extend({}, $.fn.tipsy.defaults, options);
@@ -161,6 +165,7 @@
if (options.delayIn == 0) {
tipsy.show();
} else {
+tipsy.fixTitle();
setTimeout(function() { if (tipsy.hoverState == 'in')
tipsy.show(); }, options.delayIn);
}
};
--
To view, visit https://gerrit.wikimedia.org/r/133973
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id87ba461265730a56a3212c003b8321bd53a6096
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@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] jquery.tipsy: Add viewable region bounds checking - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.tipsy: Add viewable region bounds checking
..
jquery.tipsy: Add viewable region bounds checking
Merge of upstream: 5a8253f
https://github.com/jaz303/tipsy/commit/5a8253f
Bug: 44382
Change-Id: I984a99a18efbb9722e820e5e5828bc6289a9a673
---
M resources/src/jquery.tipsy/jquery.tipsy.js
1 file changed, 31 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/jquery.tipsy/jquery.tipsy.js
b/resources/src/jquery.tipsy/jquery.tipsy.js
index 985cd83..58a99a5 100644
--- a/resources/src/jquery.tipsy/jquery.tipsy.js
+++ b/resources/src/jquery.tipsy/jquery.tipsy.js
@@ -225,4 +225,35 @@
return $(this).offset().left ($(document).scrollLeft() +
$(window).width() / 2) ? 'e' : 'w';
};
+/**
+ * yields a closure of the supplied parameters, producing a function that
takes
+ * no arguments and is suitable for use as an autogravity function like so:
+ *
+ * @param margin (int) - distance from the viewable region edge that an
+ *element should be before setting its tooltip's gravity to be away
+ *from that edge.
+ * @param prefer (string, e.g. 'n', 'sw', 'w') - the direction to prefer
+ *if there are no viewable region edges effecting the tooltip's
+ *gravity. It will try to vary from this minimally, for example,
+ *if 'sw' is preferred and an element is near the right viewable
+ *region edge, but not the top edge, it will set the gravity for
+ *that element's tooltip to be 'se', preserving the southern
+ *component.
+ */
+ $.fn.tipsy.autoBounds = function(margin, prefer) {
+return function() {
+var dir = {ns: prefer[0], ew: (prefer.length 1 ? prefer[1] :
false)},
+boundTop = $(document).scrollTop() + margin,
+boundLeft = $(document).scrollLeft() + margin,
+$this = $(this);
+
+if ($this.offset().top boundTop) dir.ns = 'n';
+if ($this.offset().left boundLeft) dir.ew = 'w';
+if ($(window).width() + $(document).scrollLeft() -
$this.offset().left margin) dir.ew = 'e';
+if ($(window).height() + $(document).scrollTop() -
$this.offset().top margin) dir.ns = 's';
+
+return dir.ns + (dir.ew ? dir.ew : '');
+}
+};
+
})(jQuery);
--
To view, visit https://gerrit.wikimedia.org/r/133975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I984a99a18efbb9722e820e5e5828bc6289a9a673
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Danny B. dann...@email.cz
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
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] User::pingLimiter() profiles per action as well - change (mediawiki/core)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134067 Change subject: User::pingLimiter() profiles per action as well .. User::pingLimiter() profiles per action as well We had an outage beginning of may that involved rate limiting of the 'renderfile-nonstandard' action. This makes User::pingLimiter() to record a per action profiling point in addition to the generic one, that would let us finely graph actions being throttled. Ref: https://wikitech.wikimedia.org/wiki/Incident_documentation/20140503-Thumbnails#What_can_be_improved Bug: 65477 Change-Id: Iac7930e85f7d9101663656ccb2bccdbebf908693 --- M RELEASE-NOTES-1.24 M includes/User.php 2 files changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/67/134067/1 diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index bb8dd22..195ecef 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -60,6 +60,8 @@ * The deprecated function mw.util.toggleToc was removed. * The Special:Search hooks SpecialSearchGo and SpecialSearchResultsAppend were removed as they were unused. +* (bug 65477) User::pingLimiter() now has an additional profile point varying + by action being used. * mediawiki.util.$content no longer supports old versions of the Vector, Monobook, Modern and CologneBlue skins that don't yet implement the mw-body and/or mw-body-primary class name in their html. diff --git a/includes/User.php b/includes/User.php index 6578341..941a405 100644 --- a/includes/User.php +++ b/includes/User.php @@ -1672,6 +1672,9 @@ * Primitive rate limits: enforce maximum actions per time period * to put a brake on flooding. * +* The method generates both a generic profiling point and a per action one +* (suffix being -$action. +* * @note When using a shared cache like memcached, IP-address * last-hit counters will be shared across wikis. * @@ -1698,6 +1701,7 @@ global $wgMemc; wfProfileIn( __METHOD__ ); + wfProfileIn( __METHOD__ . '-' . $action ); $limits = $wgRateLimits[$action]; $keys = array(); @@ -1776,6 +1780,7 @@ } } + wfProfileOut( __METHOD__ . '-' . $action ); wfProfileOut( __METHOD__ ); return $triggered; } -- To view, visit https://gerrit.wikimedia.org/r/134067 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac7930e85f7d9101663656ccb2bccdbebf908693 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Phantom optimisations, episode II - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134069
Change subject: Phantom optimisations, episode II
..
Phantom optimisations, episode II
Defer the building of phantoms until the first mouseenter event.
This should completely eliminate the load time problems with
complex pages on mobile.
Change-Id: I728a0f966de42e1b0cb0796effb95acff2196e50
---
M modules/ve/ce/styles/nodes/ve.ce.GeneratedContentNode.css
M modules/ve/ce/ve.ce.ProtectedNode.js
2 files changed, 41 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/69/134069/1
diff --git a/modules/ve/ce/styles/nodes/ve.ce.GeneratedContentNode.css
b/modules/ve/ce/styles/nodes/ve.ce.GeneratedContentNode.css
index ff2e482..549b484 100644
--- a/modules/ve/ce/styles/nodes/ve.ce.GeneratedContentNode.css
+++ b/modules/ve/ce/styles/nodes/ve.ce.GeneratedContentNode.css
@@ -11,7 +11,7 @@
}
/* Allow GeneratedContentNode content to be interacted with */
-.ve-ce-generatedContentNode .ve-ce-protectedNode-shield {
+.ve-ce-generatedContentNode * {
pointer-events: all;
}
diff --git a/modules/ve/ce/ve.ce.ProtectedNode.js
b/modules/ve/ce/ve.ce.ProtectedNode.js
index 4651352..3a80bb6 100644
--- a/modules/ve/ce/ve.ce.ProtectedNode.js
+++ b/modules/ve/ce/ve.ce.ProtectedNode.js
@@ -20,6 +20,7 @@
this.$shields = this.$( [] );
this.$phantomable = $phantomable || this.$element;
this.isSetup = false;
+ this.isShielded = false;
// Events
this.connect( this, {
@@ -66,23 +67,35 @@
* @method
*/
ve.ce.ProtectedNode.prototype.onProtectedSetup = function () {
- var $shield,
- node = this;
-
// Exit if already setup or not unattached
if ( this.isSetup || !this.root ) {
return;
}
- // Events
- this.$element.on( 'mouseenter.ve-ce-protectedNode', ve.bind(
this.onProtectedMouseEnter, this ) );
- this.getRoot().getSurface().getSurface()
- .connect( this, { 'position': 'positionPhantoms' } );
-
// DOM changes
this.$element
.addClass( 've-ce-protectedNode' )
.prop( 'contentEditable', 'false' );
+
+ // Events
+ this.$element.on( {
+ 'mouseenter.ve-ce-protectedNode': ve.bind(
this.onProtectedMouseEnter, this ),
+ 'mousedown.ve-ce-protectedNode': ve.bind(
this.onProtectedMouseDown, this )
+ } );
+};
+
+/**
+ * Attach phantoms to the node.
+ *
+ * @method
+ */
+ve.ce.ProtectedNode.prototype.attachPhantoms = function () {
+ var $shield,
+ node = this;
+
+ // Events
+ this.getRoot().getSurface().getSurface()
+ .connect( this, { 'position': 'positionPhantoms' } );
// Shields
this.$element.add( this.$element.find( '*' ) ).each( function () {
@@ -111,7 +124,7 @@
}
} );
- this.isSetup = true;
+ this.isShielded = true;
};
/**
@@ -145,6 +158,7 @@
.removeProp( 'contentEditable' );
this.isSetup = false;
+ this.isShielded = false;
};
/**
@@ -173,11 +187,24 @@
* Handle mouse enter events.
*
* @method
+ * @param {jQuery.Event} e Mouse enter event
*/
ve.ce.ProtectedNode.prototype.onProtectedMouseEnter = function () {
if ( !this.root.getSurface().dragging
!this.root.getSurface().resizing ) {
this.createPhantoms();
}
+};
+
+/**
+ * Handle mouse down events.
+ *
+ * @method
+ * @param {jQuery.Event} e Mouse enter event
+ */
+ve.ce.ProtectedNode.prototype.onProtectedMouseDown = function ( e ) {
+ // Abort mousedown events otherwise the surface will go into
+ // dragging mode on touch devices
+ e.stopPropagation();
};
/**
@@ -226,6 +253,10 @@
var surface = this.root.getSurface(),
node = this;
+ if ( !this.isShielded ) {
+ this.attachPhantoms();
+ }
+
this.$phantomable.find( '.ve-ce-protectedNode-shield:visible' ).each(
ve.bind( function () {
this.$phantoms = this.$phantoms.add(
--
To view, visit https://gerrit.wikimedia.org/r/134069
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I728a0f966de42e1b0cb0796effb95acff2196e50
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134068
Change subject: Implemented changes for translatewiki
..
Implemented changes for translatewiki
Change-Id: I7cec46852a4779b246d49796feb4d21b8f62008b
---
A Avatars/i18n/de-formal.json
A Avatars/i18n/de.json
A Avatars/i18n/en.json
A Avatars/i18n/qqq.json
M Avatars/languages/Avatars.i18n.php
5 files changed, 114 insertions(+), 58 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/68/134068/1
diff --git a/Avatars/i18n/de-formal.json b/Avatars/i18n/de-formal.json
new file mode 100644
index 000..2823208
--- /dev/null
+++ b/Avatars/i18n/de-formal.json
@@ -0,0 +1,9 @@
+{
+@metadata: {
+authors: [
+Marc Reymann reym...@hallowelt.biz,
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-avatars-warning-text: Sie haben bereits ein Bild in Ihren
Einstellungen hinterlegt. Wenn Sie Avatare benutzen, wird diese Einstellung
zurückgesetzt. Möchten Sie fortfahren?
+}
diff --git a/Avatars/i18n/de.json b/Avatars/i18n/de.json
new file mode 100644
index 000..23d8a8a
--- /dev/null
+++ b/Avatars/i18n/de.json
@@ -0,0 +1,25 @@
+{
+@metadata: {
+authors: [
+Marc Reymann reym...@hallowelt.biz,
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+prefs-avatars: Benutzerbilder,
+bs-avatars-desc: Stellt individuelle und generische Benutzerbilder
bereit.,
+bs-avatars-pref-generator: Generator:,
+bs-avatars-pref-defaultsize: Standardgröße in Pixel:,
+bs-avatars-upload-complete: Das Bild wurde erfolgreich hochgeladen.,
+bs-avatars-generate-complete: Es wurde ein neuer Avatar generiert.,
+bs-avatars-upload-title: Profilbild ändern,
+bs-avatars-upload-label: Bild,
+bs-avatars-generate-new-label: Neuen Avatar generieren,
+bs-avatars-warning-title: Warnung,
+bs-avatars-warning-text: Du hast bereits ein Bild in deinen
Einstellungen hinterlegt. Wenn du Avatare benutzen, wird diese Einstellung
zurückgesetzt. Möchtest du fortfahren?,
+bs-avatars-userimage-title: Wiki-Bild oder Bild-URL,
+bs-avatars-userimage-help: Z.B. Picture.jpg oder
http://localhost/Picture.gif;,
+bs-avatars-set-userimage-failed: Keine gültige URL oder Wiki-Bild.,
+bs-avatars-set-userimage-saved: Benutzerbild wurde gespeichert.,
+bs-avatars-file-upload-fieldset-title: Bild hochladen,
+bs-avatars-auto-generate-fieldset-title: Avatar automatisch generieren
+}
diff --git a/Avatars/i18n/en.json b/Avatars/i18n/en.json
new file mode 100644
index 000..cdd5d76
--- /dev/null
+++ b/Avatars/i18n/en.json
@@ -0,0 +1,25 @@
+{
+@metadata: {
+authors: [
+Marc Reymann reym...@hallowelt.biz,
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+prefs-avatars: Avatars,
+bs-avatars-desc: Provides generic and individual user pictures.,
+bs-avatars-pref-generator: Generator:,
+bs-avatars-pref-defaultsize: Default size in pixel:,
+bs-avatars-upload-complete: The picture was uploaded successfully.,
+bs-avatars-generate-complete: A new avatar was generated.,
+bs-avatars-upload-title: Change profile picture,
+bs-avatars-upload-label: Picture,
+bs-avatars-generate-new-label: Generate new avatar,
+bs-avatars-warning-title: Warning,
+bs-avatars-warning-text: You have set a user picture in your
preferences. Using avatars will clear this setting. Do you want to proceed?,
+bs-avatars-userimage-title: Picture from wiki or picture URL,
+bs-avatars-userimage-help: e. g. Picture.jpg or
http://localhost/Picture.gif;,
+bs-avatars-set-userimage-failed: Not a valid URL or picture from wiki.,
+bs-avatars-set-userimage-saved: User picture successfully saved.,
+bs-avatars-file-upload-fieldset-title: Picture upload,
+bs-avatars-auto-generate-fieldset-title: Auto generate avatar
+}
diff --git a/Avatars/i18n/qqq.json b/Avatars/i18n/qqq.json
new file mode 100644
index 000..54968c0
--- /dev/null
+++ b/Avatars/i18n/qqq.json
@@ -0,0 +1,24 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+prefs-avatars: Used in [[Special:Wiki_Adminmode=Preferences]],
headline for avatars section in preferences.\\n{{Identical|Avatars}},
+bs-avatars-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]],
description of avatars extension.,
+bs-avatars-pref-generator: Option in
[[Special:Wiki_Adminmode=Preferences]], label for avatar generator:,
+bs-avatars-pref-defaultsize: Option in
[[Special:Wiki_Adminmode=Preferences]], label for default size of avatar in
pixel:,
+bs-avatars-upload-complete: Text for the picture was uploaded
successfully.,
+bs-avatars-generate-complete: Text for a new avatar was generated.,
+bs-avatars-upload-title: Window title for
[MediaWiki-commits] [Gerrit] vector: Suppress watch star focus outline when animating it - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134070
Change subject: vector: Suppress watch star focus outline when animating it
..
vector: Suppress watch star focus outline when animating it
It looks really funny, but that's not the effect we're aiming for.
The star is not supposed to look clickable during the rotation
animation anyway.
Bug: 65434
Change-Id: I3a7c91f5b7df0d70abd532cc234e8aa1bac9e129
(cherry picked from commit b3456db703ef66f3df5608fc8f2301b9273d2a9e)
---
M skins/vector/components/watchstar.less
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/134070/1
diff --git a/skins/vector/components/watchstar.less
b/skins/vector/components/watchstar.less
index 2c38516..1a6d1fc 100644
--- a/skins/vector/components/watchstar.less
+++ b/skins/vector/components/watchstar.less
@@ -34,6 +34,8 @@
#ca-watch.icon a.loading {
.background-image-svg('images/watch-icon-loading.svg',
'images/watch-icon-loading.png');
.rotation(700ms);
+ /* Suppress the hilarious rotating focus outline on Firefox */
+ outline: none;
background-position: 50% 60%;
-webkit-transform-origin: 50% 57%;
transform-origin: 50% 57%;
--
To view, visit https://gerrit.wikimedia.org/r/134070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3a7c91f5b7df0d70abd532cc234e8aa1bac9e129
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
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] mediawiki.user: Use mw.log.deprecate to track user() and ano... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.user: Use mw.log.deprecate to track user() and
anonymous()
..
mediawiki.user: Use mw.log.deprecate to track user() and anonymous()
Follows-up I5970be9e859358 which deprecated these orignally.
Also remove obsolete tests now that they're linked by reference.
Change-Id: I559efa8a61de9f7b600c7b74edd5a56fb0a33b00
---
M resources/src/mediawiki/mediawiki.user.js
M tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
2 files changed, 15 insertions(+), 21 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.user.js
b/resources/src/mediawiki/mediawiki.user.js
index 0cf897a..fd9690b 100644
--- a/resources/src/mediawiki/mediawiki.user.js
+++ b/resources/src/mediawiki/mediawiki.user.js
@@ -89,14 +89,6 @@
},
/**
-* @inheritdoc #getName
-* @deprecated since 1.20 Use #getName instead
-*/
- name: function () {
- return user.getName();
- },
-
- /**
* Get date user registered, if available
*
* @return {Date|boolean|null} Date user registered, or false
for anonymous users, or
@@ -122,14 +114,6 @@
*/
isAnon: function () {
return user.getName() === null;
- },
-
- /**
-* @inheritdoc #isAnon
-* @deprecated since 1.20 Use #isAnon instead
-*/
- anonymous: function () {
- return user.isAnon();
},
/**
@@ -258,4 +242,18 @@
}
};
+ /**
+* @method name
+* @inheritdoc #getName
+* @deprecated since 1.20 Use #getName instead
+*/
+ mw.log.deprecate( user, 'name', user.getName );
+
+ /**
+* @method anonymous
+* @inheritdoc #isAnon
+* @deprecated since 1.20 Use #isAnon instead
+*/
+ mw.log.deprecate( user, 'anonymous', user.isAnon );
+
}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
index 0bfd501..91321a2 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
@@ -9,16 +9,14 @@
assert.ok( mw.user.options instanceof mw.Map, 'options instance
of mw.Map' );
} );
- QUnit.test( 'user status', 11, function ( assert ) {
+ QUnit.test( 'user status', 7, function ( assert ) {
// Forge an anonymous user
mw.config.set( 'wgUserName', null );
delete mw.config.values.wgUserId;
assert.strictEqual( mw.user.getName(), null, 'user.getName()
returns null when anonymous' );
- assert.strictEqual( mw.user.name(), null, 'user.name()
compatibility' );
assert.assertTrue( mw.user.isAnon(), 'user.isAnon() returns
true when anonymous' );
- assert.assertTrue( mw.user.anonymous(), 'user.anonymous()
compatibility' );
assert.strictEqual( mw.user.getId(), 0, 'user.getId() returns 0
when anonymous' );
// Not part of startUp module
@@ -26,9 +24,7 @@
mw.config.set( 'wgUserId', 123 );
assert.equal( mw.user.getName(), 'John', 'user.getName()
returns username when logged-in' );
- assert.equal( mw.user.name(), 'John', 'user.name()
compatibility' );
assert.assertFalse( mw.user.isAnon(), 'user.isAnon() returns
false when logged-in' );
- assert.assertFalse( mw.user.anonymous(), 'user.anonymous()
compatibility' );
assert.strictEqual( mw.user.getId(), 123, 'user.getId() returns
correct ID when logged-in' );
assert.equal( mw.user.id(), 'John', 'user.id Returns username
when logged-in' );
--
To view, visit https://gerrit.wikimedia.org/r/133874
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I559efa8a61de9f7b600c7b74edd5a56fb0a33b00
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
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] vector: Suppress watch star focus outline when animating it - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: vector: Suppress watch star focus outline when animating it
..
vector: Suppress watch star focus outline when animating it
It looks really funny, but that's not the effect we're aiming for.
The star is not supposed to look clickable during the rotation
animation anyway.
Bug: 65434
Change-Id: I3a7c91f5b7df0d70abd532cc234e8aa1bac9e129
(cherry picked from commit b3456db703ef66f3df5608fc8f2301b9273d2a9e)
---
M skins/vector/components/watchstar.less
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/skins/vector/components/watchstar.less
b/skins/vector/components/watchstar.less
index 2c38516..1a6d1fc 100644
--- a/skins/vector/components/watchstar.less
+++ b/skins/vector/components/watchstar.less
@@ -34,6 +34,8 @@
#ca-watch.icon a.loading {
.background-image-svg('images/watch-icon-loading.svg',
'images/watch-icon-loading.png');
.rotation(700ms);
+ /* Suppress the hilarious rotating focus outline on Firefox */
+ outline: none;
background-position: 50% 60%;
-webkit-transform-origin: 50% 57%;
transform-origin: 50% 57%;
--
To view, visit https://gerrit.wikimedia.org/r/134070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a7c91f5b7df0d70abd532cc234e8aa1bac9e129
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Waldir wal...@email.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] Avoid connection tracking for DNS recursors - change (operations/puppet)
Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134071
Change subject: Avoid connection tracking for DNS recursors
..
Avoid connection tracking for DNS recursors
Connection tracking for DNS recursors could fill up the connection
tracking tables causing unwanted packetloss. Avoid tracking DNS protocol
on DNS recursor, thus avoiding a potential issue
Change-Id: Iaa490bc97cee9e3d8a3fa9682fbfb5f6fec66045
---
M manifests/role/dns.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/134071/1
diff --git a/manifests/role/dns.pp b/manifests/role/dns.pp
index fcc529a..9ff709e 100644
--- a/manifests/role/dns.pp
+++ b/manifests/role/dns.pp
@@ -70,4 +70,13 @@
port = '53',
}
+ferm::rule { 'skip_dns_conntrack-out':
+desc = 'Skip DNS outgoing connection tracking',
+rule = 'proto udp sport 53 NOTRACK',
+}
+
+ferm::rule { 'skip_dns_conntrack-in':
+desc = 'Skip DNS incoming connection tracking',
+rule = 'proto udp dport 53 NOTRACK',
+}
}
--
To view, visit https://gerrit.wikimedia.org/r/134071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa490bc97cee9e3d8a3fa9682fbfb5f6fec66045
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris akosia...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134072
Change subject: Implemented changes for translatewiki
..
Implemented changes for translatewiki
Change-Id: Ib96f3810d3cd57cd0c9b8e63c69585204d0bf0f4
---
A Blog/i18n/de.json
A Blog/i18n/en.json
A Blog/i18n/qqq.json
M Blog/languages/Blog.i18n.php
4 files changed, 117 insertions(+), 76 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/72/134072/1
diff --git a/Blog/i18n/de.json b/Blog/i18n/de.json
new file mode 100644
index 000..029349f
--- /dev/null
+++ b/Blog/i18n/de.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz\r
+]
+},
+bs-blog-desc: Seiten werden in chronologischer Reihenfolge als
Blog-Einträge dargestellt.,
+bs-blog-no-entries: Es sind keine Blog-Einträge vorhanden.,
+bs-blog-comments: Kommentare,
+bs-blog-read-more: Weiterlesen,
+bs-blog-trackback: Trackback,
+bs-blog-permalink: Permalink,
+bs-blog-show-all: Alle Beiträge anzeigen,
+bs-blog-form-inline-text: Titel...,
+bs-blog-form-title-text: Neuen Blogeintrag verfassen,
+bs-blog-form-button-text: Erstellen,
+bs-blog-blog: Blog,
+prefs-blog: Blog,
+bs-blog-pref-moreinnewwindow: Bei Klick auf weiterlesen ein neues
Fenster öffnen,
+bs-blog-pref-newentryfieldposition: Position des Formulars für neue
Einträge:,
+bs-blog-pref-showall: Link alle anzeigen darstellen,
+bs-blog-pref-showinfo: Informationen über den Blogeintrag anzeigen,
+bs-blog-pref-showlimit: Anzahl der dargestellten Blogeinträge:,
+bs-blog-pref-shownewentryfield: Formular für neue Einträge anzeigen,
+bs-blog-pref-showpermalink: Link Permalink anzeigen,
+bs-blog-pref-sortby: Sortierung:,
+bs-blog-pref-imagerendermode: Bilder anzeigen als:,
+bs-blog-pref-maxentrycharacters: Anzahl darzustellender Wörter:,
+bs-blog-tag-blog-desc: Zeigt Blog-Einträge auf jeder beliebigen Seite
an.
+}
diff --git a/Blog/i18n/en.json b/Blog/i18n/en.json
new file mode 100644
index 000..fb6f37c
--- /dev/null
+++ b/Blog/i18n/en.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz\r
+]
+},
+bs-blog-desc: Display a blog style list of pages.,
+bs-blog-no-entries: There are no blog entries.,
+bs-blog-comments: Comments,
+bs-blog-read-more: Read more,
+bs-blog-trackback: Trackback,
+bs-blog-permalink: Permalink,
+bs-blog-show-all: Show all entries,
+bs-blog-form-inline-text: Title...,
+bs-blog-form-title-text: Create new blog entry,
+bs-blog-form-button-text: Create,
+bs-blog-blog: Blog,
+prefs-blog: Blog,
+bs-blog-pref-moreinnewwindow: Open new window for read more,
+bs-blog-pref-newentryfieldposition: Position for the new blog entry
form:,
+bs-blog-pref-showall: Show all entries link,
+bs-blog-pref-showinfo: Show information about the entry,
+bs-blog-pref-showlimit: Number of displayed entries:,
+bs-blog-pref-shownewentryfield: Show new blog entry form,
+bs-blog-pref-showpermalink: Show permalink link,
+bs-blog-pref-sortby: Sort by:,
+bs-blog-pref-imagerendermode: Display pictures as:,
+bs-blog-pref-maxentrycharacters: Number of displayed words:,
+bs-blog-tag-blog-desc: Display blog entries on every page.
+}
diff --git a/Blog/i18n/qqq.json b/Blog/i18n/qqq.json
new file mode 100644
index 000..53a70fa
--- /dev/null
+++ b/Blog/i18n/qqq.json
@@ -0,0 +1,30 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz\r
+]
+},
+bs-blog-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]],
description of blog extension.,
+bs-blog-no-entries: Text for there are no blog entries.,
+bs-blog-comments: Anchor title for comments,
+bs-blog-read-more: Anchor title for read more,
+bs-blog-trackback: Anchor title for trackback,
+bs-blog-permalink: Anchor title for permalink,
+bs-blog-show-all: Anchor title for show all entries,
+bs-blog-form-inline-text: input field default text for title...,
+bs-blog-form-title-text: Headline for create new blog entry,
+bs-blog-form-button-text: Button label for create,
+bs-blog-blog: Text for blog,
+prefs-blog: Used in [[Special:Wiki_Adminmode=Preferences]], headline
for blog section in preferences. \\n {{Identical|Blog}},
+bs-blog-pref-moreinnewwindow: Option in
[[Special:Wiki_Adminmode=Preferences]], checkbox label for open new window for
read more,
+bs-blog-pref-newentryfieldposition: Option in
[[Special:Wiki_Adminmode=Preferences]], label for position for the new blog
entry form:,
+bs-blog-pref-showall: Option in
[[Special:Wiki_Adminmode=Preferences]], checkbox label for show all entries
link,
+bs-blog-pref-showinfo:
[MediaWiki-commits] [Gerrit] mediawiki.api: Do not cache errors in getToken() - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.api: Do not cache errors in getToken()
..
mediawiki.api: Do not cache errors in getToken()
Bug: 65268
Change-Id: I8d0e509b735dcf6a55ded29f0eb272bc1fdc2bc7
---
M resources/src/mediawiki.api/mediawiki.api.js
M tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
2 files changed, 50 insertions(+), 13 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.api/mediawiki.api.js
b/resources/src/mediawiki.api/mediawiki.api.js
index 6444d93f..5f0b004 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -303,7 +303,11 @@
d.reject(
'token-missing', data );
}
} )
- .fail( d.reject );
+ .fail( function ( code, result ) {
+ // Delete promise. Do not cache
errors.
+ delete deferredGroup[ type +
'Token' ];
+ d.reject( code, result );
+ } );
// Attach abort handler
d.abort = apiPromise.abort;
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
index 05eb6b9..83f5dd5 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
@@ -99,7 +99,7 @@
this.server.respond();
} );
- QUnit.test( 'getToken( cached )', function ( assert ) {
+ QUnit.test( 'getToken( pre-populated )', function ( assert ) {
QUnit.expect( 2 );
var api = new mw.Api();
@@ -117,29 +117,62 @@
assert.equal( this.server.requests.length, 0, 'Requests made' );
} );
- QUnit.test( 'getToken( uncached )', function ( assert ) {
- QUnit.expect( 2 );
+ QUnit.test( 'getToken()', function ( assert ) {
+ QUnit.expect( 5 );
- var api = new mw.Api();
+ var test = this,
+ api = new mw.Api();
// Get a token of a type that isn't prepopulated by user.tokens.
// Could use block or delete here, but those could in theory
// be added to user.tokens, use a fake one instead.
api.getToken( 'testaction' )
.done( function ( token ) {
- assert.ok( token.length, 'Got a token' );
+ assert.ok( token.length, 'Got testaction token'
);
} )
.fail( function ( err ) {
- assert.equal( '', err, 'API error' );
+ assert.equal( err, '', 'API error' );
+ } );
+ api.getToken( 'testaction' )
+ .done( function ( token ) {
+ assert.ok( token.length, 'Got testaction token
(cached)' );
+ } )
+ .fail( function ( err ) {
+ assert.equal( err, '', 'API error' );
} );
- assert.equal( this.server.requests.length, 1, 'Requests made' );
+ // Don't cache error (bug 65268)
+ api.getToken( 'testaction2' )
+ .fail( function ( err ) {
+ assert.equal( err, 'bite-me', 'Expected error'
);
+ } )
+ .always( function () {
+ // Make this request after the first one has
finished.
+ // If we make it simultaneously we still want
it to share
+ // the cache, but as soon as it is fulfilled as
error we
+ // reject it so that the next one tries fresh.
+ api.getToken( 'testaction2' )
+ .done( function ( token ) {
+ assert.ok( token.length, 'Got
testaction2 token (error was not be cached)' );
+ } )
+ .fail( function ( err ) {
+ assert.equal( err, '', 'API
error' );
+ } );
-
[MediaWiki-commits] [Gerrit] mediawiki.api: Use then() in getToken instead of manual Defe... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.api: Use then() in getToken instead of manual
Deferred wrapping
..
mediawiki.api: Use then() in getToken instead of manual Deferred wrapping
* Use then() instead of done()/fail() with a manually created
Deferred as wrapper. This also makes the passing on of the
error more explicit.
* Store promises with an abort handler instead of Deferreds, so
that we don't need to call d.promise( { abort: d.abort } )
again on each return to re-attach the abort, simply do it right
the first time. We don't need to store the Deferred's handlers
since only the closure of the caller needs access to
resolve/reject it. The cached one only needs to be a promise.
* Rename relevant variables to avoid further confusion.
Change-Id: If8995ede271746580c3f2eb0b4a6ecd79e90c7d5
---
M resources/src/mediawiki.api/mediawiki.api.js
1 file changed, 27 insertions(+), 27 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Nikerabbit: Looks good to me, but someone else must approve
TheDJ: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.api/mediawiki.api.js
b/resources/src/mediawiki.api/mediawiki.api.js
index 5f0b004..dbedb32 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -22,15 +22,15 @@
}
},
// Keyed by ajax url and symbolic name for the individual
request
- deferreds = {};
+ promises = {};
- // Pre-populate with fake ajax deferreds to save http requests for
tokens
+ // Pre-populate with fake ajax promises to save http requests for tokens
// we already have on the page via the user.tokens module (bug 34733).
- deferreds[ defaultOptions.ajax.url ] = {};
+ promises[ defaultOptions.ajax.url ] = {};
$.each( mw.user.tokens.get(), function ( key, value ) {
// This requires #getToken to use the same key as user.tokens.
// Format: token-type + Token (eg. editToken, patrolToken,
watchToken).
- deferreds[ defaultOptions.ajax.url ][ key ] = $.Deferred()
+ promises[ defaultOptions.ajax.url ][ key ] = $.Deferred()
.resolve( value )
.promise( { abort: function () {} } );
} );
@@ -259,7 +259,7 @@
function ( code ) {
if ( code === 'badtoken' ) {
// Clear from cache
- deferreds[
api.defaults.ajax.url ][ tokenType + 'Token' ] =
+ promises[
api.defaults.ajax.url ][ tokenType + 'Token' ] =
params.token =
undefined;
// Try again, once
@@ -287,39 +287,39 @@
*/
getToken: function ( type ) {
var apiPromise,
- deferredGroup = deferreds[
this.defaults.ajax.url ],
- d = deferredGroup deferredGroup[ type +
'Token' ];
+ promiseGroup = promises[ this.defaults.ajax.url
],
+ d = promiseGroup promiseGroup[ type +
'Token' ];
if ( !d ) {
- d = $.Deferred();
+ apiPromise = this.get( { action: 'tokens',
type: type } );
- apiPromise = this.get( { action: 'tokens',
type: type } )
- .done( function ( data ) {
+ d = apiPromise
+ .then( function ( data ) {
// If token type is not
available for this user,
- // key '...token' is missing or
can contain Boolean false
+ // key '...token' is either
missing or set to boolean false
if ( data.tokens
data.tokens[type + 'token'] ) {
- d.resolve(
data.tokens[type + 'token'] );
- } else {
- d.reject(
'token-missing', data );
+ return data.tokens[type
+ 'token'];
}
+
+ return $.Deferred().reject(
'token-missing', data );
+
[MediaWiki-commits] [Gerrit] Fix form cache purging - change (mediawiki...SemanticForms)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix form cache purging
..
Fix form cache purging
Because we were checking the wrong variable, cached forms were not
purged on edit. Follow-up to Iec9cdb1b8390
Change-Id: I0113f407819581a4716d3b9efb20631cf6997a36
---
M includes/SF_FormUtils.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yaron Koren: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SF_FormUtils.php b/includes/SF_FormUtils.php
index 51824dd..1815d67 100644
--- a/includes/SF_FormUtils.php
+++ b/includes/SF_FormUtils.php
@@ -521,7 +521,7 @@
// get references to stored datasets
$listOfFormKeys = $cache-get( $cacheKeyForList );
- if ( !is_array( $cacheKeyForList ) ) {
+ if ( !is_array( $listOfFormKeys ) ) {
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/133690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0113f407819581a4716d3b9efb20631cf6997a36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@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 underline hovercard text when user preference is 'Always' - change (mediawiki...Popups)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't underline hovercard text when user preference is 'Always'
..
Don't underline hovercard text when user preference is 'Always'
The setting is called 'underline' and defaults to 'Skin or
browser default' (= 2). If set to 'Always' (= 1), which is what
I personally like and do, ;-) all text in hovercards is
underlined (and the underlines disappear if you hover the
hovercard, which is a bit tricky but possible).
This simple fix removes the dependency from the default style
(which only shows underlines on hover). I think this is the most
straightforward solution.
Change-Id: Ide54ffd1949a50184d8d2a680bf1a0d35e24d563
---
M resources/ext.popups.core.less
1 file changed, 1 insertion(+), 4 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.popups.core.less b/resources/ext.popups.core.less
index 8b41f43..edc2762 100644
--- a/resources/ext.popups.core.less
+++ b/resources/ext.popups.core.less
@@ -41,10 +41,7 @@
margin-top: -9px;
padding-top: 9px;
color: #000;
-
- :hover {
- text-decoration: none;
- }
+ text-decoration: none;
div {
padding: 0;
--
To view, visit https://gerrit.wikimedia.org/r/132944
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ide54ffd1949a50184d8d2a680bf1a0d35e24d563
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Prtksxna psax...@wikimedia.org
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] Max title length - change (mediawiki...GWToolset)
Dan-nl has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134073
Change subject: Max title length
..
Max title length
* adjusted i18n messages
* adjusted the Config:$title_max_length to 240
* changed the title logic: no longer truncate the title; issue an exception
when the title is too long
* changed the key gwtoolset-title-identifier to gwtoolset-title for
clarity within the metadata mapping form and in the code
Bug: 65323
Change-Id: I92dfe622e40bf9873e0b0c615a0d0ad8a9daf3e0
---
M i18n/en.json
M i18n/qqq.json
M includes/Config.php
M includes/Handlers/Forms/MetadataMappingHandler.php
M includes/Handlers/UploadHandler.php
M includes/Handlers/Xml/XmlDetectHandler.php
M includes/Handlers/Xml/XmlMappingHandler.php
M includes/Models/MediawikiTemplate.php
8 files changed, 62 insertions(+), 72 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset
refs/changes/73/134073/1
diff --git a/i18n/en.json b/i18n/en.json
index 3a6258b..9491bdc 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -147,8 +147,7 @@
gwtoolset-maps-to: Maps to,
gwtoolset-mapping-media-file-url-extension-bad: The file extension
could not be determined from the file URL: $1.,
gwtoolset-mapping-media-file-url-bad: The media file URL could not
be evaluated. The URL delivers the content in a way that is not yet handled by
this extension or there was an HTTP request issue. URL given was \$1\. HTTP
request error \$2\.,
- gwtoolset-mapping-no-title: The metadata mapping contains no title,
which is needed in order to create the page.,
- gwtoolset-mapping-no-title-identifier: The metadata mapping contains
no title identifier, which is used to create a unique page title. Make sure you
map a metadata field to the MediaWiki template parameter title identifier.,
+ gwtoolset-mapping-no-gwtoolset-title: The metadata mapping contains
no gwtoolset title, which is needed in order to create the page.,
gwtoolset-metadata-field: Metadata field,
gwtoolset-metadata-file: Metadata file,
gwtoolset-metadata-mapping-legend: Map your metadata,
@@ -201,5 +200,8 @@
gwtoolset-verify-php-version: The $1 extension requires PHP =
5.3.3.,
gwtoolset-verify-uploads-enabled: The $1 extension requires that
file uploads are enabled.\n\nPlease make sure that
code$wgEnableUploads/code is set to codetrue/code in
codeLocalSettings.php/code.,
gwtoolset-verify-xmlreader: The $1 extension requires that PHP
[http://www.php.net/manual/en/xmlreader.setup.php XMLReader] be installed.,
- gwtoolset-wiki-checks-not-passed: Wiki checks did not pass
+ gwtoolset-wiki-checks-not-passed: Wiki checks did not pass,
+ gwtoolset-title-too-long: The evaluated title is too long; a title
can be up to a maximum of 240 bytes in length. This title evaluates to
{{PLURAL:$1|byte|bytes}} in length.\n\n$2.,
+ gwtoolset-title-label: GWToolset title,
+ gwtoolset-url-to-the-media-file-label: URL to the media file
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 0794712..acce229 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -198,5 +198,8 @@
gwtoolset-verify-php-version: Message that appears when the PHP
version is less than version 5.3.3. Parameters:\n* $1 - \GWToolset\
(untranslatable),
gwtoolset-verify-uploads-enabled: Message that appears when the wiki
does not allow file uploads. Parameters:\n* $1 - \GWToolset\
(untranslatable),
gwtoolset-verify-xmlreader: Message that appears when PHP XMLReader
is not available. Parameters:\n* $1 - \GWToolset\ (untranslatable),
- gwtoolset-wiki-checks-not-passed: Heading used when a wiki
requirement is not met.
+ gwtoolset-wiki-checks-not-passed: Heading used when a wiki
requirement is not met.,
+ gwtoolset-title-too-long: Message that appears when an evaluated
title for an item is greater than 240 bytes. Parameters:\n* $1 is the length in
bytes for this item's title.\n* $2 is the evaluated title.,
+ gwtoolset-title-label: Label used in the metadata mapping section of
Step 2: Metadata mapping.,
+ gwtoolset-url-to-the-media-file-label: Label used in the metadata
mapping section of Step 2: Metadata mapping. The translation should not be
longer than 21 characters; if it is, please leave it in English.
}
diff --git a/includes/Config.php b/includes/Config.php
index a354690..57d175d 100644
--- a/includes/Config.php
+++ b/includes/Config.php
@@ -218,7 +218,7 @@
* title maximum length in bytes
* @see https://commons.wikimedia.org/wiki/Commons:File_naming
*/
- public static $title_max_length = 207;
+ public static $title_max_length = 240;
/**
* @var {string}
diff --git a/includes/Handlers/Forms/MetadataMappingHandler.php
b/includes/Handlers/Forms/MetadataMappingHandler.php
index a9dbe98..9c8840c
[MediaWiki-commits] [Gerrit] Dict dictionary protocol backend - change (mediawiki...cxserver)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134074
Change subject: Dict dictionary protocol backend
..
Dict dictionary protocol backend
* Implements a dict protocol client and a dictionary registry
* Exposes a REST api dictionary/:word/:from/:to
Example: http://localhost:8000/dictionary/pen/en/de
Result:
{
definitions: [
{
def: pen /pen/\r\n (Schreib-) Feder; Füller; Griffel m; Stift m,
db: {
name: fd,
desc: English-German FreeDict Dictionary ver. 0.3.5
}
}
],
suggestions: []
}
Change-Id: I138b5d457ce46c5bfe4e760d95f29c3adf25abfd
---
M ContentTranslationService.js
A dictionary/dict/Dict.js
A dictionary/dict/DictClient.js
A dictionary/dict/DictRegistry.json
A dictionary/dict/Readme.md
5 files changed, 856 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver
refs/changes/74/134074/1
diff --git a/ContentTranslationService.js b/ContentTranslationService.js
index 3789500..a36d5e9 100644
--- a/ContentTranslationService.js
+++ b/ContentTranslationService.js
@@ -69,6 +69,17 @@
} );
} );
+app.get( '/dictionary/:word/:from/:to', function ( req, res ) {
+ var sourceLanguage = req.params.from,
+ word = req.params.word,
+ targetLanguage = req.params.to,
+ dictClient = require( __dirname + '/dictionary/dict/Dict.js' );
+
+ dictClient.getDefinition( word, sourceLanguage, targetLanguage ).then(
function ( data ) {
+ res.send( data );
+ } );
+} );
+
app.get( '/version', function ( req, res ) {
var version = {
name: pkg.name,
diff --git a/dictionary/dict/Dict.js b/dictionary/dict/Dict.js
new file mode 100644
index 000..5c8aef0
--- /dev/null
+++ b/dictionary/dict/Dict.js
@@ -0,0 +1,29 @@
+var dictClient = require( __dirname + '/DictClient.js' ),
+ dictRegistry = require( __dirname + '/DictRegistry.json' ),
+ Q = require( 'q' );
+
+function findDatabase( source, target ) {
+ var dictionaries = dictRegistry[ source ] dictRegistry[ source ][
target ];
+ if ( !dictionaries ) {
+ return null;
+ }
+ return Object.keys( dictionaries );
+}
+
+function getDefinition( word, from, to ) {
+ var deferred = Q.defer();
+ dictClient.lookup( word, {
+ db: findDatabase( from, to ),
+ action: 'def',
+ suggestions: true,
+ error: function ( responseCode, message ) {
+ deferred.reject( responseCode + ': ' + message );
+ },
+ success: function ( data ) {
+ deferred.resolve( data );
+ }
+ } );
+ return deferred.promise;
+}
+
+module.exports.getDefinition = getDefinition;
diff --git a/dictionary/dict/DictClient.js b/dictionary/dict/DictClient.js
new file mode 100644
index 000..2701af6
--- /dev/null
+++ b/dictionary/dict/DictClient.js
@@ -0,0 +1,484 @@
+/**
+ * Dict dictionary protocol client
+ * Credits:
+ *Dict client implmentation borrowed from:
https://github.com/ptrm/dict.json
+ *Copyright (c) 2010 Piotrek Marciniak piot...@ptrm.eu, MIT Style License
+ *
+ *@author Santhosh Thottingal santhosh.thottin...@gmail.com
+ *@license MIT
+ */
+
+var sys = require( 'sys' ),
+ net = require( 'net' ),
+ logLevel = {
+ silent: 0,
+ standard: 1,
+ diagnostic: 2,
+ verbose: 3
+ },
+ config = {
+ logging: logLevel.silent,
+ dictd: {
+ port: '2628',
+ host: '127.0.0.1',
+ timeout: 700
+ },
+ db: '!' // First match
+ };
+
+function firstObj( list ) {
+ var obj = null,
+ idx;
+
+ if ( typeof list !== 'object' ) {
+ return null;
+ }
+ for ( idx in list ) {
+ obj = list[ idx ];
+ break;
+ }
+
+ return obj;
+}
+
+function log( msg, level ) {
+ if ( !level ) {
+ level = logLevel.standard;
+ }
+ if ( level = config.logging ) {
+ sys.log( msg );
+ }
+}
+
+function parseWords( words ) {
+ var i, word, db, nDb, dbIdx,
+ res = {},
+ count = 0;
+
+ for ( i in words ) {
+ if ( typeof words[ i ].word !== 'string' ) {
+ continue;
+ }
+ word = words[ i ].word.replace( /[\r\n]/g, ''
).trim().toLowerCase();
+
+ db = [];
+ if ( words[ i ].db ) {
+ if ( typeof words[ i ].db !== 'object' ) {
+ words[ i ].db = new Array( words[ i ].db );
+ }
+ for ( dbIdx in words[
[MediaWiki-commits] [Gerrit] Added .gitignore and package.json to node.js app - change (mediawiki...cite-from-id)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134075
Change subject: Added .gitignore and package.json to node.js app
..
Added .gitignore and package.json to node.js app
Empty node.js app created.
Change-Id: I7faf2e4cefcc54d8fa6c85a58ecf269f76f0db1b
---
A .gitignore
A package.json
2 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cite-from-id
refs/changes/75/134075/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..247c919
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+.DS_Store
+*.log
+
+node_modules
diff --git a/package.json b/package.json
new file mode 100644
index 000..fe502ec
--- /dev/null
+++ b/package.json
@@ -0,0 +1,15 @@
+{
+ name : cite-from-id,
+ description : Converts identifiers such as URL or DOI into
citations,
+ version : 0.0.0,
+ dependencies : {
+ async : latest,
+ cheerio : latest,
+ express : latest,
+ request : latest
+ },
+ repository: {
+ type: git,
+ url:
https://gerrit.wikimedia.org/r/p/mediawiki/services/cite-from-id;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/134075
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7faf2e4cefcc54d8fa6c85a58ecf269f76f0db1b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cite-from-id
Gerrit-Branch: master
Gerrit-Owner: Mvolz marielle.v...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set explicit text-align on pt-flyout - change (mediawiki...VectorBeta)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134076
Change subject: Set explicit text-align on pt-flyout
..
Set explicit text-align on pt-flyout
This fixes an RTL rendering problem on Firefox.
Bug: 65476
Change-Id: I50133c61a50fbcb12d5399d056ae5a83869ee9fd
---
M resources/compactPersonalBar/compactPersonalBar.less
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta
refs/changes/76/134076/1
diff --git a/resources/compactPersonalBar/compactPersonalBar.less
b/resources/compactPersonalBar/compactPersonalBar.less
index 99ce906..bb3bfda 100644
--- a/resources/compactPersonalBar/compactPersonalBar.less
+++ b/resources/compactPersonalBar/compactPersonalBar.less
@@ -25,6 +25,11 @@
#pt-flyout {
// prevent bar elements from jumping when flyout expanded
max-height: 2.2em;
+
+ // Set correct alignment in Firefox in RTL wikis.
+ // This shouldn't be needed, but Firefox has a bug with this.
+ // See https://bugzilla.wikimedia.org/show_bug.cgi?id=65476
+ text-align: left;
}
#pt-flyout div {
--
To view, visit https://gerrit.wikimedia.org/r/134076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I50133c61a50fbcb12d5399d056ae5a83869ee9fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
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] .gitignore package.json added to empty node app - change (mediawiki...cite-from-id)
Mvolz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134077
Change subject: .gitignore package.json added to empty node app
..
.gitignore package.json added to empty node app
Change-Id: I6e72826da61a7dd4d8f65b2ff3d7540dbc3d6677
---
A .gitignore
A package.json
2 files changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cite-from-id
refs/changes/77/134077/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..247c919
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+.DS_Store
+*.log
+
+node_modules
diff --git a/package.json b/package.json
new file mode 100644
index 000..fe502ec
--- /dev/null
+++ b/package.json
@@ -0,0 +1,15 @@
+{
+ name : cite-from-id,
+ description : Converts identifiers such as URL or DOI into
citations,
+ version : 0.0.0,
+ dependencies : {
+ async : latest,
+ cheerio : latest,
+ express : latest,
+ request : latest
+ },
+ repository: {
+ type: git,
+ url:
https://gerrit.wikimedia.org/r/p/mediawiki/services/cite-from-id;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/134077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6e72826da61a7dd4d8f65b2ff3d7540dbc3d6677
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cite-from-id
Gerrit-Branch: master
Gerrit-Owner: Mvolz marielle.v...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add title tests - change (mediawiki...GWToolset)
Dan-nl has uploaded a new change for review. https://gerrit.wikimedia.org/r/134078 Change subject: Add title tests .. Add title tests Change-Id: I1d1858f652142e3a741bd7cec7ab9227a00b1b7c --- A tests/filebackend/gwtoolset-test-files/GWToolset/template_Artwork.xml A tests/filebackend/gwtoolset-test-files/GWToolset/title-has-special-characters.xml A tests/filebackend/gwtoolset-test-files/GWToolset/title-length-okay.xml A tests/filebackend/gwtoolset-test-files/GWToolset/title-length-too-long.xml A tests/phpunit/TitleTest.php 5 files changed, 19,072 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GWToolset refs/changes/78/134078/1 -- To view, visit https://gerrit.wikimedia.org/r/134078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1d1858f652142e3a741bd7cec7ab9227a00b1b7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GWToolset Gerrit-Branch: master Gerrit-Owner: Dan-nl d_ent...@yahoo.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correctly parse 'redirect' XML tag during Special:Import. - change (mediawiki/core)
Nik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134079
Change subject: Correctly parse 'redirect' XML tag during Special:Import.
..
Correctly parse 'redirect' XML tag during Special:Import.
Fixes bug 65481
Change-Id: Id9b3b7878b2e7b6fc7a06b163e5bac60e700490e
---
M includes/Import.php
1 file changed, 22 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/79/134079/1
diff --git a/includes/Import.php b/includes/Import.php
index 59fa583..2f32363 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -388,6 +388,15 @@
}
/**
+* Retrieves the contents of the named attribute of the current element.
+* @param string $attr the name of the attribute
+* @return string the value of the attribute or an empty string if it
is not set in the current element.
+*/
+ public function nodeAttribute( $attr ) {
+ return $this-reader-getAttribute( $attr );
+ }
+
+ /**
* Shouldn't something like this be built-in to XMLReader?
* Fetches text contents of the current element, assuming
* no sub-elements or such scary things.
@@ -612,17 +621,21 @@
$pageInfo ) ) ) {
// Do nothing
} elseif ( in_array( $tag, $normalFields ) ) {
- $pageInfo[$tag] = $this-nodeContents();
- if ( $tag == 'title' ) {
- $title = $this-processTitle(
$pageInfo['title'] );
+ if ( $tag == 'redirect' ) {
+ $pageInfo[$tag] = $this-nodeAttribute(
'title' );
+ } else {
+ $pageInfo[$tag] = $this-nodeContents();
+ if ( $tag == 'title' ) {
+ $title = $this-processTitle(
$pageInfo['title'] );
- if ( !$title ) {
- $badTitle = true;
- $skip = true;
+ if ( !$title ) {
+ $badTitle = true;
+ $skip = true;
+ }
+
+ $this-pageCallback( $title );
+ list( $pageInfo['_title'],
$origTitle ) = $title;
}
-
- $this-pageCallback( $title );
- list( $pageInfo['_title'], $origTitle )
= $title;
}
} elseif ( $tag == 'revision' ) {
$this-handleRevision( $pageInfo );
--
To view, visit https://gerrit.wikimedia.org/r/134079
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9b3b7878b2e7b6fc7a06b163e5bac60e700490e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nik sebastian.brueck...@student.hpi.uni-potsdam.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Change preference name for enabling MediaViewer - change (mediawiki...MultimediaViewer)
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/134080 Change subject: Change preference name for enabling MediaViewer .. Change preference name for enabling MediaViewer Should simply say 'Enable Media Viewer' instead of puzzling our users with 'Enable new media viewing experience'. Requested on Commons, Mingle card #622. Change-Id: Ibe6c11a9fe4b3fd64de65ae50055e3fc377c3ae9 --- M i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer refs/changes/80/134080/1 diff --git a/i18n/en.json b/i18n/en.json index 5dd10c7..7a803ff 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -8,7 +8,7 @@ multimediaviewer-desc-nil: No description available., multimediaviewer-pref: Media Viewer, multimediaviewer-pref-desc: Improve your multimedia viewing experience with this new tool. It displays images in larger size on pages that have thumbnails. Images are shown in a nicer fullscreen interface overlay, and can also be viewed in full-size., -multimediaviewer-optin-pref: Enable new media viewing experience, +multimediaviewer-optin-pref: Enable [https://www.mediawiki.org/wiki/Special:MyLanguage:Multimedia/About_Media_Viewer MediaViewer], multimediaviewer-file-page: Go to corresponding file page, multimediaviewer-repository: Learn more on $1, multimediaviewer-repository-local: Learn more, -- To view, visit https://gerrit.wikimedia.org/r/134080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe6c11a9fe4b3fd64de65ae50055e3fc377c3ae9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MultimediaViewer Gerrit-Branch: master Gerrit-Owner: Odder twkozlow...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Small formatting improvements - change (mediawiki...HeaderTabs)
Yaron Koren has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134081
Change subject: Small formatting improvements
..
Small formatting improvements
Change-Id: I6b10b6ce969948a6850f1658233adf7efba3b3ae
---
M HeaderTabs_body.php
1 file changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HeaderTabs
refs/changes/81/134081/1
diff --git a/HeaderTabs_body.php b/HeaderTabs_body.php
index 130c7f8..5394f8e 100644
--- a/HeaderTabs_body.php
+++ b/HeaderTabs_body.php
@@ -97,7 +97,7 @@
$partslimit = $htRenderSingleTab ? 2 : 4;
wfDebugLog('headertabs', __METHOD__.': parts (limit
'.$partslimit.'): '.count($parts));
- if ($above !== '') {
+ if ( $above !== '' ) {
wfDebugLog('headertabs', __METHOD__.': we have text
above our tabs');
}
@@ -127,7 +127,7 @@
}
}
}
- } elseif( count( $tocmatches ) 0 $tocmatches[0][1] === 0 )
{
+ } elseif ( count( $tocmatches ) 0 $tocmatches[0][1] === 0
) {
// add back a default-pos toc
$above = $toc . $above;
}
@@ -141,7 +141,7 @@
preg_match( $tabpatternmatch, $parts[$i * 2], $matches
);
// if this is a default tab, don't increment our
section number
- if ($s !== 0 || $i !== 0 || $htDefaultFirstTab ===
FALSE || $matches[3] !== $htDefaultFirstTab) {
+ if ( $s !== 0 || $i !== 0 || $htDefaultFirstTab ===
FALSE || $matches[3] !== $htDefaultFirstTab ) {
++$s;
}
@@ -165,7 +165,7 @@
$subpatternsplit =
'/(h[2-6].+?span[^]+class=mw-headline[^]+id=[^]+[^]*\s*.*?\s*\/span.*?\/h[2-6])/';
$subpatternmatch =
'/h([2-6]).+?span[^]+class=mw-headline[^]+id=([^]+)[^]*\s*(.*?)\s*\/span.*?\/h[2-6]/';
$subparts = preg_split( $subpatternsplit, $content, -1,
PREG_SPLIT_DELIM_CAPTURE );
- if ((count($subparts) % 2) !== 0) {
+ if ( ( count( $subparts ) % 2 ) !== 0 ) {
// don't need anything above first header
array_shift( $subparts );
}
@@ -228,7 +228,7 @@
//! @todo see if we can't add the SMW factbox stuff back in
(2011-12-12, ofb)
- wfDebugLog('headertabs', __METHOD__.': generated
'.count($tabs).' tabs');
+ wfDebugLog( 'headertabs', __METHOD__ . ': generated ' . count(
$tabs ) . ' tabs' );
$tabhtml = 'div id=headertabs';
if (!empty($htStyle) $htStyle !== 'jquery') {
@@ -307,7 +307,7 @@
public static function renderSwitchTabLink( $parser, $tabName,
$linkText, $anotherTarget = '' ) {
// The cache unfortunately needs to be disabled for the
- // Javascript for such links to work.
+ // JavaScript for such links to work.
$parser-disableCache();
$tabTitle = Title::newFromText( $tabName );
@@ -320,7 +320,7 @@
$output = 'a href=' . $targetURL . '#tab=' . $tabKey
. '' . $sanitizedLinkText . '/a';
} else {
- $output = 'a href=#tab='.$tabKey.'
class=tabLink'.$sanitizedLinkText.'/a';
+ $output = 'a href=#tab=' . $tabKey . '
class=tabLink' . $sanitizedLinkText . '/a';
}
return $parser-insertStripItem( $output, $parser-mStripState
);
--
To view, visit https://gerrit.wikimedia.org/r/134081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b10b6ce969948a6850f1658233adf7efba3b3ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HeaderTabs
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Small formatting improvements - change (mediawiki...HeaderTabs)
Yaron Koren has submitted this change and it was merged.
Change subject: Small formatting improvements
..
Small formatting improvements
Change-Id: I6b10b6ce969948a6850f1658233adf7efba3b3ae
---
M HeaderTabs_body.php
1 file changed, 7 insertions(+), 7 deletions(-)
Approvals:
Yaron Koren: Verified; Looks good to me, approved
diff --git a/HeaderTabs_body.php b/HeaderTabs_body.php
index 130c7f8..5394f8e 100644
--- a/HeaderTabs_body.php
+++ b/HeaderTabs_body.php
@@ -97,7 +97,7 @@
$partslimit = $htRenderSingleTab ? 2 : 4;
wfDebugLog('headertabs', __METHOD__.': parts (limit
'.$partslimit.'): '.count($parts));
- if ($above !== '') {
+ if ( $above !== '' ) {
wfDebugLog('headertabs', __METHOD__.': we have text
above our tabs');
}
@@ -127,7 +127,7 @@
}
}
}
- } elseif( count( $tocmatches ) 0 $tocmatches[0][1] === 0 )
{
+ } elseif ( count( $tocmatches ) 0 $tocmatches[0][1] === 0
) {
// add back a default-pos toc
$above = $toc . $above;
}
@@ -141,7 +141,7 @@
preg_match( $tabpatternmatch, $parts[$i * 2], $matches
);
// if this is a default tab, don't increment our
section number
- if ($s !== 0 || $i !== 0 || $htDefaultFirstTab ===
FALSE || $matches[3] !== $htDefaultFirstTab) {
+ if ( $s !== 0 || $i !== 0 || $htDefaultFirstTab ===
FALSE || $matches[3] !== $htDefaultFirstTab ) {
++$s;
}
@@ -165,7 +165,7 @@
$subpatternsplit =
'/(h[2-6].+?span[^]+class=mw-headline[^]+id=[^]+[^]*\s*.*?\s*\/span.*?\/h[2-6])/';
$subpatternmatch =
'/h([2-6]).+?span[^]+class=mw-headline[^]+id=([^]+)[^]*\s*(.*?)\s*\/span.*?\/h[2-6]/';
$subparts = preg_split( $subpatternsplit, $content, -1,
PREG_SPLIT_DELIM_CAPTURE );
- if ((count($subparts) % 2) !== 0) {
+ if ( ( count( $subparts ) % 2 ) !== 0 ) {
// don't need anything above first header
array_shift( $subparts );
}
@@ -228,7 +228,7 @@
//! @todo see if we can't add the SMW factbox stuff back in
(2011-12-12, ofb)
- wfDebugLog('headertabs', __METHOD__.': generated
'.count($tabs).' tabs');
+ wfDebugLog( 'headertabs', __METHOD__ . ': generated ' . count(
$tabs ) . ' tabs' );
$tabhtml = 'div id=headertabs';
if (!empty($htStyle) $htStyle !== 'jquery') {
@@ -307,7 +307,7 @@
public static function renderSwitchTabLink( $parser, $tabName,
$linkText, $anotherTarget = '' ) {
// The cache unfortunately needs to be disabled for the
- // Javascript for such links to work.
+ // JavaScript for such links to work.
$parser-disableCache();
$tabTitle = Title::newFromText( $tabName );
@@ -320,7 +320,7 @@
$output = 'a href=' . $targetURL . '#tab=' . $tabKey
. '' . $sanitizedLinkText . '/a';
} else {
- $output = 'a href=#tab='.$tabKey.'
class=tabLink'.$sanitizedLinkText.'/a';
+ $output = 'a href=#tab=' . $tabKey . '
class=tabLink' . $sanitizedLinkText . '/a';
}
return $parser-insertStripItem( $output, $parser-mStripState
);
--
To view, visit https://gerrit.wikimedia.org/r/134081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6b10b6ce969948a6850f1658233adf7efba3b3ae
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HeaderTabs
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren yaro...@gmail.com
Gerrit-Reviewer: Yaron Koren yaro...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 1.0 - change (mediawiki...HeaderTabs)
Yaron Koren has uploaded a new change for review. https://gerrit.wikimedia.org/r/134082 Change subject: Version 1.0 .. Version 1.0 Change-Id: I1a07388f0e82e896a5265d1cb11cc51e694125ac --- M HeaderTabs.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HeaderTabs refs/changes/82/134082/1 diff --git a/HeaderTabs.php b/HeaderTabs.php index a6ae347..e1f5449 100644 --- a/HeaderTabs.php +++ b/HeaderTabs.php @@ -18,7 +18,7 @@ 'path' = __FILE__, 'name' = 'Header Tabs', 'descriptionmsg' = 'headertabs-desc', - 'version' = '0.10.0', + 'version' = '1.0', 'author' = array( '[http://www.sergeychernyshev.com Sergey Chernyshev]', 'Yaron Koren', '[http://olivierbeaton.com Olivier Finlay Beaton]' ), 'url' = 'https://www.mediawiki.org/wiki/Extension:Header_Tabs' ); -- To view, visit https://gerrit.wikimedia.org/r/134082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1a07388f0e82e896a5265d1cb11cc51e694125ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HeaderTabs Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Version 1.0 - change (mediawiki...HeaderTabs)
Yaron Koren has submitted this change and it was merged. Change subject: Version 1.0 .. Version 1.0 Change-Id: I1a07388f0e82e896a5265d1cb11cc51e694125ac --- M HeaderTabs.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Yaron Koren: Verified; Looks good to me, approved diff --git a/HeaderTabs.php b/HeaderTabs.php index a6ae347..e1f5449 100644 --- a/HeaderTabs.php +++ b/HeaderTabs.php @@ -18,7 +18,7 @@ 'path' = __FILE__, 'name' = 'Header Tabs', 'descriptionmsg' = 'headertabs-desc', - 'version' = '0.10.0', + 'version' = '1.0', 'author' = array( '[http://www.sergeychernyshev.com Sergey Chernyshev]', 'Yaron Koren', '[http://olivierbeaton.com Olivier Finlay Beaton]' ), 'url' = 'https://www.mediawiki.org/wiki/Extension:Header_Tabs' ); -- To view, visit https://gerrit.wikimedia.org/r/134082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1a07388f0e82e896a5265d1cb11cc51e694125ac Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/HeaderTabs Gerrit-Branch: master Gerrit-Owner: Yaron Koren yaro...@gmail.com Gerrit-Reviewer: Yaron Koren yaro...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Keep only a limited number of WebViews in memory. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134083
Change subject: Keep only a limited number of WebViews in memory.
..
Keep only a limited number of WebViews in memory.
(scroll position to be implemented in next patch)
Bug: 64450
Change-Id: I768e2dcae18924d78253fad66bfaa83b8447d94a
---
M wikipedia/res/layout/activity_main.xml
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
3 files changed, 175 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/83/134083/1
diff --git a/wikipedia/res/layout/activity_main.xml
b/wikipedia/res/layout/activity_main.xml
index 7a767b2..53faa33 100644
--- a/wikipedia/res/layout/activity_main.xml
+++ b/wikipedia/res/layout/activity_main.xml
@@ -7,11 +7,11 @@
android:saveEnabled=false
android:layout_height=match_parent
!-- The main content view --
-FrameLayout
-android:id=@+id/content_frame
+ViewAnimator
+android:id=@+id/content_animator
android:layout_width=match_parent
android:layout_height=match_parent
-/FrameLayout
+/ViewAnimator
!-- The navigation drawer --
!-- Don't set marginTop here, it somehow also affects marginBottom.
wtf?! --
fragment android:layout_width=288dp
android:layout_height=match_parent
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index b8e7bda..418da5a 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -1,14 +1,18 @@
package org.wikipedia.page;
-import android.app.*;
+import android.app.AlertDialog;
import android.content.*;
import android.net.*;
import android.os.*;
import android.preference.*;
-import android.support.v4.widget.*;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.*;
import android.util.*;
import android.view.*;
+import android.view.animation.Animation;
+import android.widget.FrameLayout;
+import android.widget.ViewAnimator;
import com.squareup.otto.*;
import de.keyboardsurfer.android.widget.crouton.*;
import org.wikipedia.*;
@@ -21,6 +25,8 @@
import org.wikipedia.settings.*;
import org.wikipedia.staticdata.*;
+import java.util.*;
+
public class PageActivity extends ActionBarActivity {
public static final String ACTION_PAGE_FOR_TITLE =
org.wikipedia.page_for_title;
public static final String EXTRA_PAGETITLE = org.wikipedia.pagetitle;
@@ -28,13 +34,46 @@
private static final String ZERO_ON_NOTICE_PRESENTED =
org.wikipedia.zero.zeroOnNoticePresented;
private static final String ZERO_OFF_NOTICE_PRESENTED =
org.wikipedia.zero.zeroOffNoticePresented;
+/**
+ * Maximum number of WebViews that may be on top of each other at any
given time.
+ */
+private static final int MAX_WEBVIEW_COUNT = 4;
+
private Bus bus;
private WikipediaApp app;
private SearchArticlesFragment searchAriclesFragment;
private DrawerLayout drawerLayout;
+/**
+ * Container that will hold our WebViews, and animate between them.
+ */
+private ViewAnimator pageAnimator;
+
private PageViewFragment curPageFragment;
+
+/**
+ * Resource ID, to be incremented and assigned to each new dynamically
generated
+ * fragment container, since it seems that a fragment can only be added
to an id,
+ * and not a dynamic View.
+ */
+private int fragmentViewId = 0;
+
+/**
+ * Back-stack of lightweight history items that will be used for
recreating PageViewFragments.
+ */
+private StackBackStackItem pageBackStack;
+
+private class BackStackItem {
+public final PageTitle title;
+public final HistoryEntry historyEntry;
+public final int scrollPosition;
+public BackStackItem(PageTitle title, HistoryEntry historyEntry, int
scrollPosition) {
+this.title = title;
+this.historyEntry = historyEntry;
+this.scrollPosition = scrollPosition;
+}
+}
private boolean pausedStateOfZero;
private String pausedXcsOfZero;
@@ -69,6 +108,9 @@
searchAriclesFragment.setDrawerLayout(drawerLayout);
+pageAnimator = (ViewAnimator) findViewById(R.id.content_animator);
+pageBackStack = new StackBackStackItem();
+
if (savedInstanceState == null) {
// Don't do this if we are just rotating the phone
Intent intent = getIntent();
@@ -101,17 +143,61 @@
Utils.visitInExternalBrowser(this,
Uri.parse(title.getMobileUri()));
return;
}
-
[MediaWiki-commits] [Gerrit] .gitignore package.json added to empty node app - change (mediawiki...cite-from-id)
Mvolz has submitted this change and it was merged.
Change subject: .gitignore package.json added to empty node app
..
.gitignore package.json added to empty node app
Change-Id: I6e72826da61a7dd4d8f65b2ff3d7540dbc3d6677
---
A .gitignore
A package.json
2 files changed, 20 insertions(+), 0 deletions(-)
Approvals:
Mvolz: Verified; Looks good to me, approved
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..247c919
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*~
+.DS_Store
+*.log
+
+node_modules
diff --git a/package.json b/package.json
new file mode 100644
index 000..fe502ec
--- /dev/null
+++ b/package.json
@@ -0,0 +1,15 @@
+{
+ name : cite-from-id,
+ description : Converts identifiers such as URL or DOI into
citations,
+ version : 0.0.0,
+ dependencies : {
+ async : latest,
+ cheerio : latest,
+ express : latest,
+ request : latest
+ },
+ repository: {
+ type: git,
+ url:
https://gerrit.wikimedia.org/r/p/mediawiki/services/cite-from-id;
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/134077
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6e72826da61a7dd4d8f65b2ff3d7540dbc3d6677
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cite-from-id
Gerrit-Branch: master
Gerrit-Owner: Mvolz marielle.v...@gmail.com
Gerrit-Reviewer: Mvolz marielle.v...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make History list searchable - change (apps...wikipedia)
Dbrant has submitted this change and it was merged.
Change subject: Make History list searchable
..
Make History list searchable
Change-Id: I78063d4b3531511c754936fa8f2d4b73423b7893
---
M wikipedia/AndroidManifest.xml
M wikipedia/res/layout/activity_history.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values/strings.xml
M wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
5 files changed, 77 insertions(+), 22 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git a/wikipedia/AndroidManifest.xml b/wikipedia/AndroidManifest.xml
index 749126d..55584f6 100644
--- a/wikipedia/AndroidManifest.xml
+++ b/wikipedia/AndroidManifest.xml
@@ -39,6 +39,7 @@
android:name=.history.HistoryActivity
android:label=@string/history_activity_title
android:configChanges=orientation|keyboardHidden|keyboard|screenSize
+android:windowSoftInputMode=stateHidden|adjustResize
/activity
diff --git a/wikipedia/res/layout/activity_history.xml
b/wikipedia/res/layout/activity_history.xml
index 9604e4d..443d249 100644
--- a/wikipedia/res/layout/activity_history.xml
+++ b/wikipedia/res/layout/activity_history.xml
@@ -10,10 +10,26 @@
android:gravity=center
android:text=@string/history_empty_message
/
-ListView
-android:id=@+id/history_entry_list
-android:layout_width=match_parent
-android:layout_height=match_parent
-/
+LinearLayout
+android:orientation=vertical
+android:layout_width=match_parent
+android:layout_height=wrap_content
+
+org.wikipedia.styledviews.StyledEditText
+android:layout_width=match_parent
+android:layout_height=48dp
+android:id=@+id/history_search_list
+android:hint=@string/history_search_list_hint
+android:imeOptions=actionDone
+android:singleLine=true
+android:layout_marginLeft=8dp
+android:layout_marginRight=8dp
+/
+ListView
+android:id=@+id/history_entry_list
+android:layout_width=match_parent
+android:layout_height=match_parent
+/
+/LinearLayout
/FrameLayout
\ No newline at end of file
diff --git a/wikipedia/res/values-qq/strings.xml
b/wikipedia/res/values-qq/strings.xml
index be50778..cdba333 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -126,4 +126,6 @@
string name=edit_save_action_ip_descriptionDescription for action that
takes user to login screen so they can login before saving an edit/string
string name=preference_title_eventlogging_opt_inTitle of preference that
when checked enables data collection of user behavior./string
string name=preference_summary_eventlogging_opt_inDescription of
preference that when checked enables data collection of user behavior./string
+ string name=history_search_list_hintHint for textbox that searches list
of items in browsing history as user typesj/string
+ string name=history_search_empty_messageMessage shown when no history
itmes were found that match the user\'s query. %s is replaced with the query
string./string
/resources
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index cf3a5e2..2805956 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -133,4 +133,6 @@
string name=preference_title_eventlogging_opt_inSend usage
reports/string
string name=preference_summary_eventlogging_opt_inAllow Wikimedia to
collect information about how you use the app to make the app better/string
string name=editing_error_spamblacklistLinks from blocked domains (%s)
detected. Please remove them and try again./string
+string name=history_search_list_hintSearch/string
+string name=history_search_empty_messageNo pages found matching
\'%s\'/string
/resources
diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
b/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
index 310b288..c4c1806 100644
--- a/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryActivity.java
@@ -10,6 +10,8 @@
import android.support.v4.content.Loader;
import android.support.v4.widget.CursorAdapter;
import android.support.v7.app.*;
+import android.text.Editable;
+import android.text.TextWatcher;
import android.view.*;
import android.widget.*;
import com.squareup.picasso.*;
@@ -22,8 +24,9 @@
public class HistoryActivity extends ActionBarActivity implements
LoaderManager.LoaderCallbacksCursor {
private ListView historyEntryList;
-private View historyEmptyMessage;
+private TextView
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134084
Change subject: Implemented changes for translatewiki
..
Implemented changes for translatewiki
Change-Id: Ib54ff8d59befe9c72fc256aa31bcc0d5d6d94e6c
---
A Dashboards/i18n/de.json
A Dashboards/i18n/en.json
A Dashboards/i18n/qqq.json
M Dashboards/languages/Dashboards.i18n.php
4 files changed, 82 insertions(+), 43 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/84/134084/1
diff --git a/Dashboards/i18n/de.json b/Dashboards/i18n/de.json
new file mode 100644
index 000..f03c4be
--- /dev/null
+++ b/Dashboards/i18n/de.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-dashboards-desc: Stellt Dashboards für Benutzer und Administratoren
zur Verfügung.,
+bs-specialadmindashboard-label: Dashboard,
+bs-dashboards-addportlet: Portlet hinzufügen,
+bs-dashboards-portlets: Portlets,
+prefs-dashboards: Dashboards,
+bs-dashboards-pref-userdashboardonlogo: Logo der Website verlinkt auf
das Benutzerdashboard,
+admindashboard: Admin-Dashboard,
+userdashboard: Benutzer-Dashboard,
+bs-dashboard-userportlet-calendar-title: Kalender,
+bs-dashboard-userportlet-calendar-description: Kalender
+}
diff --git a/Dashboards/i18n/en.json b/Dashboards/i18n/en.json
new file mode 100644
index 000..be492d5
--- /dev/null
+++ b/Dashboards/i18n/en.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-dashboards-desc: Provides dashboards for normal users and admins.,
+bs-specialadmindashboard-label: Dashboard,
+bs-dashboards-addportlet: Add portlet,
+bs-dashboards-portlets: Portlets,
+prefs-dashboards: Dashboards,
+bs-dashboards-pref-userdashboardonlogo: Site logo links to user
dashboard,
+admindashboard: Admin dashboard,
+userdashboard: User dashboard,
+bs-dashboard-userportlet-calendar-title: Calendar,
+bs-dashboard-userportlet-calendar-description: Calendar
+}
diff --git a/Dashboards/i18n/qqq.json b/Dashboards/i18n/qqq.json
new file mode 100644
index 000..2bb838b
--- /dev/null
+++ b/Dashboards/i18n/qqq.json
@@ -0,0 +1,17 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-dashboards-desc: Used in [[Special:Wiki_Adminmode=ExtensionInfo]],
description of dashboards extension.,
+bs-specialadmindashboard-label: Anchor text in admin tab for
dashboard\\n {{Identical|Dashboard}},
+bs-dashboards-addportlet: Winodw title for add portlet,
+bs-dashboards-portlets: Window title for portlets,
+prefs-dashboards: Used in [[Special:Wiki_Adminmode=Preferences]],
headline of dashboards section.\\n {{Identical|Dashboard}},
+bs-dashboards-pref-userdashboardonlogo: Option in
[[Special:Wiki_Adminmode=Preferences]], checkbox label for site logo links to
user dashboard,
+admindashboard: Specialpage title for admin dashboard\\n
{{Identical|aAdmin dashboard}},
+userdashboard: Specialpage title for user dashboard\\n {{Identical|User
dashboard}},
+bs-dashboard-userportlet-calendar-title: Portlet title for calendar,
+bs-dashboard-userportlet-calendar-description: portlet description for
calendar
+}
diff --git a/Dashboards/languages/Dashboards.i18n.php
b/Dashboards/languages/Dashboards.i18n.php
index 03d1520..87bf724 100644
--- a/Dashboards/languages/Dashboards.i18n.php
+++ b/Dashboards/languages/Dashboards.i18n.php
@@ -1,47 +1,35 @@
?php
-
+/**
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
+ *
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
+ *
+ * This shim maintains compatibility back to MediaWiki 1.17.
+ */
$messages = array();
+if ( !function_exists( 'wfJsonI18nShimb08be1a5a7cfdc8d' ) ) {
+ function wfJsonI18nShimb08be1a5a7cfdc8d( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) .
/../i18n/$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+
[MediaWiki-commits] [Gerrit] Added title to Save Edit menu item. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134086
Change subject: Added title to Save Edit menu item.
..
Added title to Save Edit menu item.
Bug: 65463
Change-Id: Ia2ec1ee4ab4a93e93cf50d90163b0feeaa9f7f5b
---
M wikipedia/res/menu/menu_edit_section.xml
M wikipedia/res/values-qq/strings.xml
M wikipedia/res/values/strings.xml
3 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/86/134086/1
diff --git a/wikipedia/res/menu/menu_edit_section.xml
b/wikipedia/res/menu/menu_edit_section.xml
index 0ac2ec4..66c661e 100644
--- a/wikipedia/res/menu/menu_edit_section.xml
+++ b/wikipedia/res/menu/menu_edit_section.xml
@@ -6,6 +6,7 @@
android:id=@+id/menu_save_section
android:enabled=false
android:icon=@android:drawable/ic_menu_save
+android:title=@string/menu_save_changes
app:showAsAction=always /
/menu
\ No newline at end of file
diff --git a/wikipedia/res/values-qq/strings.xml
b/wikipedia/res/values-qq/strings.xml
index cdba333..0337c22 100644
--- a/wikipedia/res/values-qq/strings.xml
+++ b/wikipedia/res/values-qq/strings.xml
@@ -59,6 +59,7 @@
string name=langlinks_activity_titleMenu item that shows user list of
languages the current article is available in.
{{Identical|Otherlanguages}}/string
string name=editsection_activity_titleTitle for screen where user is
editing a single section/string
+ string name=menu_save_changesMenu item text for saving edits./string
string name=edit_section_error_retryText for button that retries page
loading when tapped.
{{Identical|Retry}}/string
string name=dialog_saving_in_progressText for progress dialog shown when
an edit save is in progress.
diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml
index 2805956..44f7a38 100644
--- a/wikipedia/res/values/strings.xml
+++ b/wikipedia/res/values/strings.xml
@@ -47,6 +47,7 @@
string name=settings_activity_titleSettings/string
string name=langlinks_activity_titleOther languages/string
string name=editsection_activity_titleEdit Section/string
+string name=menu_save_changesSave changes/string
string name=edit_section_error_retryRetry/string
string name=dialog_saving_in_progressSaving.../string
string name=edit_saved_successfullyEdit saved!/string
--
To view, visit https://gerrit.wikimedia.org/r/134086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2ec1ee4ab4a93e93cf50d90163b0feeaa9f7f5b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implemented changes for translatewiki - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134087
Change subject: Implemented changes for translatewiki
..
Implemented changes for translatewiki
Change-Id: Idee19ee240226004ef0b960f46d2ec7d1100cb79
---
A ExtendedEditBar/i18n/de.json
A ExtendedEditBar/i18n/en.json
A ExtendedEditBar/i18n/qqq.json
M ExtendedEditBar/languages/ExtendedEditBar.i18n.php
4 files changed, 108 insertions(+), 64 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/87/134087/1
diff --git a/ExtendedEditBar/i18n/de.json b/ExtendedEditBar/i18n/de.json
new file mode 100644
index 000..6c12ce9
--- /dev/null
+++ b/ExtendedEditBar/i18n/de.json
@@ -0,0 +1,27 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extendededitbar-desc: Stellt zusätzliche Funktionen im
WikiCode-Editor zur Verfügung.,
+bs-extendededitbar-redirecttip: Umleiten,
+bs-extendededitbar-redirectsample: Ziel eingeben,
+bs-extendededitbar-striketip: Durchstreichen,
+bs-extendededitbar-strikesample: Durchgestrichener Text,
+bs-extendededitbar-entertip: Zeilenumbruch,
+bs-extendededitbar-uppertip: Hochgestellt,
+bs-extendededitbar-uppersample: Hochgestellter Text,
+bs-extendededitbar-lowertip: Tiefgestellt,
+bs-extendededitbar-lowersample: Tiefgestellter Text,
+bs-extendededitbar-smalltip: Klein,
+bs-extendededitbar-smallsample: Kleiner Text,
+bs-extendededitbar-commenttip: Versteckter Kommentar,
+bs-extendededitbar-commentsample: Kommentar,
+bs-extendededitbar-gallerytip: Bildergalerie,
+bs-extendededitbar-gallerysample:
Image:Bild1.jpg|Überschrift1\\nImage:Bild2.jpg|Überschrift2,
+bs-extendededitbar-quotetip: Zitat einfügen,
+bs-extendededitbar-quotesample: Zitat,
+bs-extendededitbar-tabletip: Tabelle einfügen,
+bs-extendededitbar-tablesample: ! Überschrift 1\n! Überschrift 2\n!
Überschrift 3\n|-\n| Zeile 1, Zelle 1\n| Zeile 1, Zelle 2\n| Zeile 1, Zelle
3\n|-\n| Zeile 2, Zelle 1\n| Zeile 2, Zelle 2\n| Zeile 2, Zelle 3
+}
diff --git a/ExtendedEditBar/i18n/en.json b/ExtendedEditBar/i18n/en.json
new file mode 100644
index 000..7bd0e6e
--- /dev/null
+++ b/ExtendedEditBar/i18n/en.json
@@ -0,0 +1,27 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extendededitbar-desc: Provides additional buttons to the wiki edit
field.,
+bs-extendededitbar-redirecttip: Redirect,
+bs-extendededitbar-redirectsample: Insert text,
+bs-extendededitbar-striketip: Strike,
+bs-extendededitbar-strikesample: Strike-through text,
+bs-extendededitbar-entertip: Line break,
+bs-extendededitbar-uppertip: Superscript,
+bs-extendededitbar-uppersample: Superscript text,
+bs-extendededitbar-lowertip: Subscript,
+bs-extendededitbar-lowersample: Subscript text,
+bs-extendededitbar-smalltip: Small,
+bs-extendededitbar-smallsample: Small text,
+bs-extendededitbar-commenttip: Insert hidden comment,
+bs-extendededitbar-commentsample: Comment,
+bs-extendededitbar-gallerytip: Insert a picture gallery,
+bs-extendededitbar-gallerysample:
Image:Example.jpg|Caption1\\nImage:Example.jpg|Caption2,
+bs-extendededitbar-quotetip: Insert a block of quoted text,
+bs-extendededitbar-quotesample: Block quote,
+bs-extendededitbar-tabletip: Insert a table,
+bs-extendededitbar-tablesample: ! header 1\n! header 2\n! header
3\n|-\n| row 1, cell 1\n| row 1, cell 2\n| row 1, cell 3\n|-\n| row 2, cell
1\n| row 2, cell 2\n| row 2, cell 3
+}
diff --git a/ExtendedEditBar/i18n/qqq.json b/ExtendedEditBar/i18n/qqq.json
new file mode 100644
index 000..43c21e2
--- /dev/null
+++ b/ExtendedEditBar/i18n/qqq.json
@@ -0,0 +1,27 @@
+{
+@metadata: {
+authors: [
+Stephan Muggli mug...@hallowelt.biz
+]
+},
+bs-extendededitbar-desc: Used in
[[Special:Wiki_Adminmode=ExtensionInfo]], description of extended edit bar
extension.,
+bs-extendededitbar-redirecttip: Text for redirect,
+bs-extendededitbar-redirectsample: Text for insert text,
+bs-extendededitbar-striketip: Text for strike,
+bs-extendededitbar-strikesample: Text for strike-through text,
+bs-extendededitbar-entertip: Text for line break,
+bs-extendededitbar-uppertip: Text for superscript,
+bs-extendededitbar-uppersample: Text for superscript text,
+bs-extendededitbar-lowertip: Text for subscript,
+bs-extendededitbar-lowersample: Text for subscript text,
+bs-extendededitbar-smalltip: Text for small,
+bs-extendededitbar-smallsample: Text for small text,
+bs-extendededitbar-commenttip: Text for insert hidden comment,
+bs-extendededitbar-commentsample: Text for comment,
+bs-extendededitbar-gallerytip: Text for insert a picture gallery,
+
[MediaWiki-commits] [Gerrit] Fix: Use LaTeX comments in relevance section - change (mediawiki...MathSearch)
Physikerwelt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134088
Change subject: Fix: Use LaTeX comments in relevance section
..
Fix: Use LaTeX comments in relevance section
Not all macros work well in the relevance section.
Therefore, we use comments in that section for now.
Change-Id: I0126e51cf1186e0b404399cf54a3fc8e25c6d856
---
M MathQueryObject.php
1 file changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MathSearch
refs/changes/88/134088/1
diff --git a/MathQueryObject.php b/MathQueryObject.php
index 79938e3..d05b2bc 100644
--- a/MathQueryObject.php
+++ b/MathQueryObject.php
@@ -60,22 +60,22 @@
public function exportTexDocument(){
$texInput = htmlspecialchars( $this-getUserInputTex());
+ $texInputComment = preg_replace(/[\n\r]/,\n%,$texInput);
$title = Title::newFromId( $this-getPageID() );
$absUrl =
$title-getFullURL(array(oldid=$title-getLatestRevID())).#math{$this-getAnchorID()};
return TeX
\begin{topic}{{$this-getPageTitle()}-{$this-getAnchorID()}}
\begin{fquery}\${$this-getTeXQuery()}\$\end{fquery}
-\begin{private}
-\begin{relevance}
- find result similar to
- a href=$absUrl
- $texInput
- /a
-\end{relevance}
-\examplehit{{$absUrl}}
-\contributor{Moritz Schubotz}
-\end{private}
+ \begin{private}
+ \begin{relevance}
+ find result similar to Formula {$this-getAnchorID()}
on page {$this-getPageTitle()}:
+ %\href{{$absUrl}}{\${$texInputComment}\$}
+ \end{relevance}
+ \examplehit{{$absUrl}}
+ \contributor{Moritz Schubotz}
+ \end{private}
\end{topic}
+
TeX;
}
--
To view, visit https://gerrit.wikimedia.org/r/134088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0126e51cf1186e0b404399cf54a3fc8e25c6d856
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
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] Fix: Use LaTeX comments in relevance section - change (mediawiki...MathSearch)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix: Use LaTeX comments in relevance section
..
Fix: Use LaTeX comments in relevance section
Not all macros work well in the relevance section.
Therefore, we use comments in that section for now.
Change-Id: I0126e51cf1186e0b404399cf54a3fc8e25c6d856
---
M MathQueryObject.php
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Physikerwelt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MathQueryObject.php b/MathQueryObject.php
index 79938e3..d05b2bc 100644
--- a/MathQueryObject.php
+++ b/MathQueryObject.php
@@ -60,22 +60,22 @@
public function exportTexDocument(){
$texInput = htmlspecialchars( $this-getUserInputTex());
+ $texInputComment = preg_replace(/[\n\r]/,\n%,$texInput);
$title = Title::newFromId( $this-getPageID() );
$absUrl =
$title-getFullURL(array(oldid=$title-getLatestRevID())).#math{$this-getAnchorID()};
return TeX
\begin{topic}{{$this-getPageTitle()}-{$this-getAnchorID()}}
\begin{fquery}\${$this-getTeXQuery()}\$\end{fquery}
-\begin{private}
-\begin{relevance}
- find result similar to
- a href=$absUrl
- $texInput
- /a
-\end{relevance}
-\examplehit{{$absUrl}}
-\contributor{Moritz Schubotz}
-\end{private}
+ \begin{private}
+ \begin{relevance}
+ find result similar to Formula {$this-getAnchorID()}
on page {$this-getPageTitle()}:
+ %\href{{$absUrl}}{\${$texInputComment}\$}
+ \end{relevance}
+ \examplehit{{$absUrl}}
+ \contributor{Moritz Schubotz}
+ \end{private}
\end{topic}
+
TeX;
}
--
To view, visit https://gerrit.wikimedia.org/r/134088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0126e51cf1186e0b404399cf54a3fc8e25c6d856
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MathSearch
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
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] (bug 61939) Topic-titles not displaying in some topics (disa... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134089
Change subject: (bug 61939) Topic-titles not displaying in some topics
(disappearing?)
..
(bug 61939) Topic-titles not displaying in some topics (disappearing?)
This will make sure results where content failed to be retrieved from
externalstore are filtered out.
Other than just displaying data that failed to load properly, this
data would also be cached. We don't want that ;)
Bug: 61939
Change-Id: Idbd223f1be72f8d207d707d9807e732a8c7b971a
---
M includes/Data/DbStorage.php
M includes/Data/ObjectStorage.php
M includes/Data/RevisionStorage.php
M includes/Data/TopicHistoryStorage.php
4 files changed, 41 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/89/134089/1
diff --git a/includes/Data/DbStorage.php b/includes/Data/DbStorage.php
index 913d279..20cc64e 100644
--- a/includes/Data/DbStorage.php
+++ b/includes/Data/DbStorage.php
@@ -164,4 +164,11 @@
// Everything passes
return true;
}
+
+ /**
+* {@inheritDoc}
+*/
+ public function validate( array $row ) {
+ return true;
+ }
}
diff --git a/includes/Data/ObjectStorage.php b/includes/Data/ObjectStorage.php
index 4601b77..079c757 100644
--- a/includes/Data/ObjectStorage.php
+++ b/includes/Data/ObjectStorage.php
@@ -58,4 +58,16 @@
* @return boolean true when the row is successfully removed
*/
function remove( array $row );
+
+ /**
+* Returns a boolean true/false to indicate if the result of a
particular
+* query is valid can be cached.
+* In some cases, the retrieved data should not be cached. E.g.
revisions
+* with external content: revision data may be loaded, but the content
could
+* not be fetched from external storage. That shouldn't persist in
cache.
+*
+* @param array $row
+* @return bool
+*/
+ function validate( array $row );
}
diff --git a/includes/Data/RevisionStorage.php
b/includes/Data/RevisionStorage.php
index 2d6b7c6..4de5b12 100644
--- a/includes/Data/RevisionStorage.php
+++ b/includes/Data/RevisionStorage.php
@@ -155,6 +155,13 @@
} else {
$res = $this-findMultiInternal( $queries, $options );
}
+
+ // Merge data from external store get rid of failures
+ $res = self::mergeExternalContent( $res );
+ foreach ( $res as $i = $result ) {
+ $res[$i] = array_filter( $result, array( $this,
'validate' ) );
+ }
+
// Fetches content for all revisions flagged 'external'
return self::mergeExternalContent( $res );
}
@@ -472,6 +479,17 @@
return array( 'rev_id' );
}
+ /**
+* When retrieving revisions from DB, self::mergeExternalContent will be
+* called to fetch the content. This could fail, resulting in the
content
+* being a 'false' value.
+*
+* {@inheritDoc}
+*/
+ public function validate( array $row ) {
+ return $row['rev_content'] !== false;
+ }
+
public function getIterator() {
throw new DataModelException( __CLASS__ . '::' . __METHOD__ . '
is not implemented', 'process-data' );
}
diff --git a/includes/Data/TopicHistoryStorage.php
b/includes/Data/TopicHistoryStorage.php
index b91a68e..0324543 100644
--- a/includes/Data/TopicHistoryStorage.php
+++ b/includes/Data/TopicHistoryStorage.php
@@ -62,6 +62,10 @@
throw new DataModelException( __CLASS__ . ' does not support
remove action', 'process-data' );
}
+ public function validate( array $row ) {
+ return true;
+ }
+
public function getIterator() {
throw new DataModelException( 'Not Implemented', 'process-data'
);
}
--
To view, visit https://gerrit.wikimedia.org/r/134089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idbd223f1be72f8d207d707d9807e732a8c7b971a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] compare-puppet-catalogs: new puppet catalog diff - change (operations/software)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134090
Change subject: compare-puppet-catalogs: new puppet catalog diff
..
compare-puppet-catalogs: new puppet catalog diff
As puppet catalog diff tool has been updated and completely changed its
output format, a corresponding change in our catalog comparator was
needed as well.
Now we get a (cleaner) json file as output and use it to compute and
build differences on the go; this makes also easier to give a somewhat
terser html output (dividing diff by resource).
Change-Id: Ia12d8fccb9054c095919dcd36b411855962181d3
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M compare-puppet-catalogs/provision.sh
M compare-puppet-catalogs/puppet_compare/generator.py
M compare-puppet-catalogs/puppet_compare/parser.py
M compare-puppet-catalogs/puppet_compare/templates/htmldiff.jinja2
A compare-puppet-catalogs/puppet_compare/tests/fixtures/diff.json
A compare-puppet-catalogs/puppet_compare/tests/test_parser.py
M compare-puppet-catalogs/puppet_compare/threads.py
M compare-puppet-catalogs/shell/compile
M compare-puppet-catalogs/shell/differ
9 files changed, 183 insertions(+), 121 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software
refs/changes/90/134090/1
diff --git a/compare-puppet-catalogs/provision.sh
b/compare-puppet-catalogs/provision.sh
index 6e436e3..028c450 100755
--- a/compare-puppet-catalogs/provision.sh
+++ b/compare-puppet-catalogs/provision.sh
@@ -18,10 +18,6 @@
/vagrant/shell/installer ${puppet}
done
-# Install puppet catalog diff Face, under puppet 3
-pushd /vagrant/shell/env_puppet_3
-bundle exec puppet module install ripienaar-catalog_diff
-popd
pip install simplediff jinja2 requests
@@ -45,3 +41,7 @@
exit
fi;
/vagrant/shell/helper install
+# Install puppet catalog diff Face, under puppet 3
+pushd /vagrant/shell/env_puppet_3
+bundle exec puppet module install zack-catalog_diff
--modulepath=/vagrant/external/puppet/modules/
+popd
diff --git a/compare-puppet-catalogs/puppet_compare/generator.py
b/compare-puppet-catalogs/puppet_compare/generator.py
index 43db10d..5d491e5 100644
--- a/compare-puppet-catalogs/puppet_compare/generator.py
+++ b/compare-puppet-catalogs/puppet_compare/generator.py
@@ -46,7 +46,7 @@
def diff_save(fname, diff):
with open(fname + '.formatted', 'w') as f:
-for (resource_diff, content_diff) in diff:
+for (_, resource_diff, content_diff) in diff:
f.write(-- \n\n)
f.write(resource_diff)
if content_diff != '':
@@ -111,9 +111,9 @@
with open(os.path.join(self.html_dir, 'index.html'), 'w') as f:
f.write(t.render(nodes=self.nodelist))
-def _write_node_page(self, nodename, txt, is_error=False, is_ok=False):
+def _write_node_page(self, nodename, diffs, is_error=False, is_ok=False):
template = 'htmldiff.jinja2'
-output = None
+output = []
html = os.path.join(self.html_dir, nodename + '.html')
if is_error:
@@ -121,7 +121,9 @@
elif is_ok:
template = 'node_ok.jinja2'
else:
-output = diff2html.parse_input(txt, html, True)
+for name, res, content in diffs:
+txt = %s\n%s % (res, content)
+output.append((name,diff2html.parse_input(txt, html, True)))
t = env.get_template(template)
change = self.change and self.change or 'production'
@@ -164,7 +166,7 @@
return
filename = self.node_diff(node)
-p = parser.DiffParser(filename)
+p = parser.DiffParser(filename,node)
diff = p.run()
# If compilation is successful and no diffs, go on.
@@ -178,8 +180,8 @@
self.nodelist['DIFF'].add(node)
diff_save(filename, diff)
# Also save the html rendering
-text_diff = \n.join([a + b for (a, b) in diff])
-self._write_node_page(node, text_diff)
+#text_diff = \n.join([a + b for (_, a, b) in diff])
+self._write_node_page(node, diff)
def _run_node(self, node):
for (puppet_version, branch) in self.compile_versions:
diff --git a/compare-puppet-catalogs/puppet_compare/parser.py
b/compare-puppet-catalogs/puppet_compare/parser.py
index 1a3f50e..9147f12 100644
--- a/compare-puppet-catalogs/puppet_compare/parser.py
+++ b/compare-puppet-catalogs/puppet_compare/parser.py
@@ -1,8 +1,9 @@
import os
import subprocess
-import shlex
+import json
from tempfile import NamedTemporaryFile
import logging
+import re
log = logging.getLogger('puppet_compare')
@@ -11,120 +12,68 @@
class DiffParser(object):
-OLD_RESOURCE = 'Old Resource:'
-NEW_RESOURCE = 'New Resource:'
-DIFF_BEGIN = 'Content diff:'
-DIFF_END =
''
-IN_OLD_RESOURCE =
[MediaWiki-commits] [Gerrit] Jobs for Petition, OggHandler and CommonMessages - change (integration/jenkins-job-builder-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134091 Change subject: Jobs for Petition, OggHandler and CommonMessages .. Jobs for Petition, OggHandler and CommonMessages Bug: 64952 Bug: 64953 Bug: 64990 Change-Id: I118b364f267f729b8f2e99cd3dbd3330bbce6a60 --- M mediawiki-extensions.yaml 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/jenkins-job-builder-config refs/changes/91/134091/1 diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 554b42c..4b0378b 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -337,6 +337,7 @@ - CodeEditor - CodeReview - Collection + - CommonMessages - CommonsMetadata - CommunityApplications - CommunityHiring @@ -441,6 +442,7 @@ - OATHAuth - OAuth - Offline + - OggHandler - OpenBadges - OpenID - OpenSearchXml @@ -453,6 +455,7 @@ - Parsoid - Persona - PdfHandler + - Petition - PHPExcel - PhpTags - PhpTagsFunctions -- To view, visit https://gerrit.wikimedia.org/r/134091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I118b364f267f729b8f2e99cd3dbd3330bbce6a60 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jobs for Petition, OggHandler and CommonMessages - change (integration/jenkins-job-builder-config)
jenkins-bot has submitted this change and it was merged. Change subject: Jobs for Petition, OggHandler and CommonMessages .. Jobs for Petition, OggHandler and CommonMessages Bug: 64952 Bug: 64953 Bug: 64990 Change-Id: I118b364f267f729b8f2e99cd3dbd3330bbce6a60 --- M mediawiki-extensions.yaml 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/mediawiki-extensions.yaml b/mediawiki-extensions.yaml index 554b42c..4b0378b 100644 --- a/mediawiki-extensions.yaml +++ b/mediawiki-extensions.yaml @@ -337,6 +337,7 @@ - CodeEditor - CodeReview - Collection + - CommonMessages - CommonsMetadata - CommunityApplications - CommunityHiring @@ -441,6 +442,7 @@ - OATHAuth - OAuth - Offline + - OggHandler - OpenBadges - OpenID - OpenSearchXml @@ -453,6 +455,7 @@ - Parsoid - Persona - PdfHandler + - Petition - PHPExcel - PhpTags - PhpTagsFunctions -- To view, visit https://gerrit.wikimedia.org/r/134091 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I118b364f267f729b8f2e99cd3dbd3330bbce6a60 Gerrit-PatchSet: 1 Gerrit-Project: integration/jenkins-job-builder-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jobs for Petition, OggHandler and CommonMessages - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134092 Change subject: Jobs for Petition, OggHandler and CommonMessages .. Jobs for Petition, OggHandler and CommonMessages Bug: 64952 Bug: 64953 Bug: 64990 Change-Id: I118b364f267f729b8f2e99cd3dbd3330bbce6a60 --- M layout.yaml 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/92/134092/1 diff --git a/layout.yaml b/layout.yaml index d3463b9..5d06c85 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1779,6 +1779,11 @@ - name: extension-checks extname: ContributionScores + - name: mediawiki/extensions/CommonMessages +template: + - name: extension-unittests +extname: CommonMessages + - name: mediawiki/extensions/CommunityApplications template: - name: extension-checks @@ -2390,6 +2395,11 @@ - mwext-Offline-pep8 - mwext-Offline-pyflakes + - name: mediawiki/extensions/OggHandler +template: + - name: extension-unittests +extname: OggHandler + - name: mediawiki/extensions/OpenID template: - name: extension-checks @@ -2437,6 +2447,11 @@ - name: extension-checks extname: ParserHooks + - name: mediawiki/extensions/Petition +template: + - name: extension-unittests +extname: Petition + - name: mediawiki/services/cxserver check-voter: - cxserver-jslint -- To view, visit https://gerrit.wikimedia.org/r/134092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I118b364f267f729b8f2e99cd3dbd3330bbce6a60 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jobs for Petition, OggHandler and CommonMessages - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Jobs for Petition, OggHandler and CommonMessages .. Jobs for Petition, OggHandler and CommonMessages Bug: 64952 Bug: 64953 Bug: 64990 Change-Id: I118b364f267f729b8f2e99cd3dbd3330bbce6a60 --- M layout.yaml 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index d3463b9..5d06c85 100644 --- a/layout.yaml +++ b/layout.yaml @@ -1779,6 +1779,11 @@ - name: extension-checks extname: ContributionScores + - name: mediawiki/extensions/CommonMessages +template: + - name: extension-unittests +extname: CommonMessages + - name: mediawiki/extensions/CommunityApplications template: - name: extension-checks @@ -2390,6 +2395,11 @@ - mwext-Offline-pep8 - mwext-Offline-pyflakes + - name: mediawiki/extensions/OggHandler +template: + - name: extension-unittests +extname: OggHandler + - name: mediawiki/extensions/OpenID template: - name: extension-checks @@ -2437,6 +2447,11 @@ - name: extension-checks extname: ParserHooks + - name: mediawiki/extensions/Petition +template: + - name: extension-unittests +extname: Petition + - name: mediawiki/services/cxserver check-voter: - cxserver-jslint -- To view, visit https://gerrit.wikimedia.org/r/134092 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I118b364f267f729b8f2e99cd3dbd3330bbce6a60 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...Petition)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134094 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Bug: 64952 Change-Id: I2c2af248180813d5ba8fd01a6a9161293d8c090d --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Petition refs/changes/94/134094/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/134094 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2c2af248180813d5ba8fd01a6a9161293d8c090d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Petition Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...CommonMessages)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134093 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Bug: 64953 Change-Id: I332c61aa03dcf8abfe8e1700716dfc385b530a36 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CommonMessages refs/changes/93/134093/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/134093 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I332c61aa03dcf8abfe8e1700716dfc385b530a36 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CommonMessages Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Jenkins job validation (DO NOT SUBMIT) - change (mediawiki...OggHandler)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134095 Change subject: Jenkins job validation (DO NOT SUBMIT) .. Jenkins job validation (DO NOT SUBMIT) Bug: 64990 Change-Id: I6f18d33625fecbc1ca72f1bc8c7484c00f632420 --- A JENKINS A jenkins-testfile.py A jenkins.erb A jenkins.js A jenkins.php A jenkins.pp A jenkins.rb 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OggHandler refs/changes/95/134095/1 diff --git a/JENKINS b/JENKINS new file mode 100644 index 000..e69de29 --- /dev/null +++ b/JENKINS diff --git a/jenkins-testfile.py b/jenkins-testfile.py new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins-testfile.py diff --git a/jenkins.erb b/jenkins.erb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.erb diff --git a/jenkins.js b/jenkins.js new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.js diff --git a/jenkins.php b/jenkins.php new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.php diff --git a/jenkins.pp b/jenkins.pp new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.pp diff --git a/jenkins.rb b/jenkins.rb new file mode 100644 index 000..e69de29 --- /dev/null +++ b/jenkins.rb -- To view, visit https://gerrit.wikimedia.org/r/134095 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6f18d33625fecbc1ca72f1bc8c7484c00f632420 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OggHandler Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cirrus as default for zh_yuewiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Cirrus as default for zh_yuewiki .. Cirrus as default for zh_yuewiki Change-Id: I1fa3e8d1804c6f4d1c20f621d607750ba3270d01 --- M cirrus.dblist 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Chad: Looks good to me, but someone else must approve Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/cirrus.dblist b/cirrus.dblist index c30564a..3f0f4c1 100644 --- a/cirrus.dblist +++ b/cirrus.dblist @@ -595,6 +595,7 @@ zh_min_nanwikiquote zh_min_nanwikisource zh_min_nanwiktionary +zh_yuewiki zhwikibooks zhwikinews zhwikiquote -- To view, visit https://gerrit.wikimedia.org/r/133840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1fa3e8d1804c6f4d1c20f621d607750ba3270d01 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@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] compare-puppet-catalogs: new puppet catalog diff - change (operations/software)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: compare-puppet-catalogs: new puppet catalog diff
..
compare-puppet-catalogs: new puppet catalog diff
As puppet catalog diff tool has been updated and completely changed its
output format, a corresponding change in our catalog comparator was
needed as well.
Now we get a (cleaner) json file as output and use it to compute and
build differences on the go; this makes also easier to give a somewhat
terser html output (dividing diff by resource).
Change-Id: Ia12d8fccb9054c095919dcd36b411855962181d3
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M compare-puppet-catalogs/provision.sh
M compare-puppet-catalogs/puppet_compare/generator.py
M compare-puppet-catalogs/puppet_compare/parser.py
M compare-puppet-catalogs/puppet_compare/templates/htmldiff.jinja2
A compare-puppet-catalogs/puppet_compare/tests/fixtures/diff.json
A compare-puppet-catalogs/puppet_compare/tests/test_parser.py
M compare-puppet-catalogs/puppet_compare/threads.py
M compare-puppet-catalogs/shell/compile
M compare-puppet-catalogs/shell/differ
9 files changed, 181 insertions(+), 122 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/compare-puppet-catalogs/provision.sh
b/compare-puppet-catalogs/provision.sh
index 6e436e3..028c450 100755
--- a/compare-puppet-catalogs/provision.sh
+++ b/compare-puppet-catalogs/provision.sh
@@ -18,10 +18,6 @@
/vagrant/shell/installer ${puppet}
done
-# Install puppet catalog diff Face, under puppet 3
-pushd /vagrant/shell/env_puppet_3
-bundle exec puppet module install ripienaar-catalog_diff
-popd
pip install simplediff jinja2 requests
@@ -45,3 +41,7 @@
exit
fi;
/vagrant/shell/helper install
+# Install puppet catalog diff Face, under puppet 3
+pushd /vagrant/shell/env_puppet_3
+bundle exec puppet module install zack-catalog_diff
--modulepath=/vagrant/external/puppet/modules/
+popd
diff --git a/compare-puppet-catalogs/puppet_compare/generator.py
b/compare-puppet-catalogs/puppet_compare/generator.py
index 43db10d..94ff3e1 100644
--- a/compare-puppet-catalogs/puppet_compare/generator.py
+++ b/compare-puppet-catalogs/puppet_compare/generator.py
@@ -46,7 +46,7 @@
def diff_save(fname, diff):
with open(fname + '.formatted', 'w') as f:
-for (resource_diff, content_diff) in diff:
+for (_, resource_diff, content_diff) in diff:
f.write(-- \n\n)
f.write(resource_diff)
if content_diff != '':
@@ -111,9 +111,9 @@
with open(os.path.join(self.html_dir, 'index.html'), 'w') as f:
f.write(t.render(nodes=self.nodelist))
-def _write_node_page(self, nodename, txt, is_error=False, is_ok=False):
+def _write_node_page(self, nodename, diffs, is_error=False, is_ok=False):
template = 'htmldiff.jinja2'
-output = None
+output = []
html = os.path.join(self.html_dir, nodename + '.html')
if is_error:
@@ -121,7 +121,9 @@
elif is_ok:
template = 'node_ok.jinja2'
else:
-output = diff2html.parse_input(txt, html, True)
+for name, res, content in diffs:
+txt = %s\n%s % (res, content)
+output.append((name, diff2html.parse_input(txt, html, True)))
t = env.get_template(template)
change = self.change and self.change or 'production'
@@ -164,7 +166,7 @@
return
filename = self.node_diff(node)
-p = parser.DiffParser(filename)
+p = parser.DiffParser(filename, node)
diff = p.run()
# If compilation is successful and no diffs, go on.
@@ -178,8 +180,7 @@
self.nodelist['DIFF'].add(node)
diff_save(filename, diff)
# Also save the html rendering
-text_diff = \n.join([a + b for (a, b) in diff])
-self._write_node_page(node, text_diff)
+self._write_node_page(node, diff)
def _run_node(self, node):
for (puppet_version, branch) in self.compile_versions:
diff --git a/compare-puppet-catalogs/puppet_compare/parser.py
b/compare-puppet-catalogs/puppet_compare/parser.py
index 1a3f50e..28a67be 100644
--- a/compare-puppet-catalogs/puppet_compare/parser.py
+++ b/compare-puppet-catalogs/puppet_compare/parser.py
@@ -1,130 +1,77 @@
import os
import subprocess
-import shlex
+import json
from tempfile import NamedTemporaryFile
import logging
+import re
log = logging.getLogger('puppet_compare')
+
def contains(haystack, needle):
return (haystack.find(needle) = 0)
class DiffParser(object):
-OLD_RESOURCE = 'Old Resource:'
-NEW_RESOURCE = 'New Resource:'
-DIFF_BEGIN = 'Content diff:'
-DIFF_END =
''
-IN_OLD_RESOURCE = 'resource.old'
-IN_NEW_RESOURCE =
[MediaWiki-commits] [Gerrit] mwext-OggHandler-jslint non voting - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134096 Change subject: mwext-OggHandler-jslint non voting .. mwext-OggHandler-jslint non voting The extension does not pass jshint, so make the job non voting. Bug: 64990 Bug: 65487 Change-Id: Iec0ebf4cfe1d98b243a965ae1701269962fb3e33 --- M layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/96/134096/1 diff --git a/layout.yaml b/layout.yaml index 5d06c85..561424d 100644 --- a/layout.yaml +++ b/layout.yaml @@ -422,6 +422,8 @@ voting: false - name: mwext-OATHAuth-jslint # bug 61617 voting: false + - name: mwext-OggHandler-jslint # bug 65487 +voting: false - name: mwext-PageTriage-jslint # bug 61618 voting: false - name: mwext-Quiz-jslint # bug 61620 -- To view, visit https://gerrit.wikimedia.org/r/134096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec0ebf4cfe1d98b243a965ae1701269962fb3e33 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mwext-OggHandler-jslint non voting - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: mwext-OggHandler-jslint non voting .. mwext-OggHandler-jslint non voting The extension does not pass jshint, so make the job non voting. Bug: 64990 Bug: 65487 Change-Id: Iec0ebf4cfe1d98b243a965ae1701269962fb3e33 --- M layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 5d06c85..561424d 100644 --- a/layout.yaml +++ b/layout.yaml @@ -422,6 +422,8 @@ voting: false - name: mwext-OATHAuth-jslint # bug 61617 voting: false + - name: mwext-OggHandler-jslint # bug 65487 +voting: false - name: mwext-PageTriage-jslint # bug 61618 voting: false - name: mwext-Quiz-jslint # bug 61620 -- To view, visit https://gerrit.wikimedia.org/r/134096 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iec0ebf4cfe1d98b243a965ae1701269962fb3e33 Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Petition extension is incompatible with sqlite - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134097 Change subject: Petition extension is incompatible with sqlite .. Petition extension is incompatible with sqlite Bug: 64952 Bug: 65488 Change-Id: I3cb0b1ed650ea3de85dd3eac2f6a213f9940808c --- M layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/97/134097/1 diff --git a/layout.yaml b/layout.yaml index 561424d..fed0e31 100644 --- a/layout.yaml +++ b/layout.yaml @@ -813,6 +813,8 @@ # Extensions for which tests are non-functional or absent: - name: ^mwext-EtherEditor-testextensions.* voting: false + - name: ^mwext-Petition-testextensions.* # bug 65488 +voting: false # Being worked on with Nik - name: mwext-browsertests-CirrusSearch-phantomjs -- To view, visit https://gerrit.wikimedia.org/r/134097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3cb0b1ed650ea3de85dd3eac2f6a213f9940808c Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Petition extension is incompatible with sqlite - change (integration/zuul-config)
jenkins-bot has submitted this change and it was merged. Change subject: Petition extension is incompatible with sqlite .. Petition extension is incompatible with sqlite Bug: 64952 Bug: 65488 Change-Id: I3cb0b1ed650ea3de85dd3eac2f6a213f9940808c --- M layout.yaml 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/layout.yaml b/layout.yaml index 561424d..fed0e31 100644 --- a/layout.yaml +++ b/layout.yaml @@ -813,6 +813,8 @@ # Extensions for which tests are non-functional or absent: - name: ^mwext-EtherEditor-testextensions.* voting: false + - name: ^mwext-Petition-testextensions.* # bug 65488 +voting: false # Being worked on with Nik - name: mwext-browsertests-CirrusSearch-phantomjs -- To view, visit https://gerrit.wikimedia.org/r/134097 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3cb0b1ed650ea3de85dd3eac2f6a213f9940808c Gerrit-PatchSet: 1 Gerrit-Project: integration/zuul-config Gerrit-Branch: master Gerrit-Owner: Hashar has...@free.fr Gerrit-Reviewer: Hashar has...@free.fr 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 url parameters to suppress text and didyoumean - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add url parameters to suppress text and didyoumean .. Add url parameters to suppress text and didyoumean Change-Id: Ied1faec2c80203b5714d4f70b1b64ee51aada4b5 --- M extensions/CirrusSearch 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/CirrusSearch b/extensions/CirrusSearch index 6e64af4..4e32252 16 --- a/extensions/CirrusSearch +++ b/extensions/CirrusSearch -Subproject commit 6e64af4b1a14ad8a78ade9c9a604d0e05c1d72a4 +Subproject commit 4e322520faf0a3185cd86d7df9a87b890d204a0e -- To view, visit https://gerrit.wikimedia.org/r/133746 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ied1faec2c80203b5714d4f70b1b64ee51aada4b5 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf5 Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@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] Report pipeline name in build status message - change (integration/zuul-config)
Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/134098 Change subject: Report pipeline name in build status message .. Report pipeline name in build status message Slightly enhance the success and failures messages reported by the pipelines. Bug: 50327 Change-Id: Ib9170f54d0591bee6082e8b1b9136c446c620869 --- M layout.yaml 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/zuul-config refs/changes/98/134098/1 diff --git a/layout.yaml b/layout.yaml index fed0e31..1643a12 100644 --- a/layout.yaml +++ b/layout.yaml @@ -38,13 +38,13 @@ # This email_filter and the one for 'test' can be removed once we have fixed bug 45499. email_filter: - ^(?!(.*?@wikimedia\.org|.*?@wikimedia\.de|l10n-bot@translatewiki\.net|anomie\.wikipedia@gmail\.com|amir\.aharoni@mail\.huji\.ac\.il|hashar@free\.fr|jeroendedauw@gmail\.com|maxsem\.wiki@gmail\.com|mtraceur@member\.fsf\.org|niklas\.laxstrom@gmail\.com|santhosh\.thottingal@gmail\.com|s\.mazeland@xs4all\.nl|stefan\.petrea@gmail\.com|stefan@garage-coding\.com|roan\.kattouw@gmail\.com|krinklemail@gmail\.com|trevorparscal@gmail\.com|inez@wikia-inc\.com|orbit@framezero\.com|david@sheetmusic\.org\.uk|git@samsmith\.io|glaser@hallowelt\.biz|aude\.wiki@gmail\.com|bawolff\+wn@gmail\.com|bryan\.tongminh@gmail\.com|dereckson@espace-win\.org|hartman\.wiki@gmail\.com|hoo@online\.de|codereview@emsenhuber\.ch|daniel@nadir-seen-fire\.com|jamesin\.hongkong\.1@gmail\.com|krenair@gmail\.com|liangent@gmail\.com|mah@everybody\.org|matma\.rex@gmail\.com|raimond\.spekking@gmail\.com|robinp\.1273@gmail\.com|tim@tim-landscheidt\.de|tylerromeo@gmail\.com|umherirrender_de\.wp@web\.de|yuriastrakhan@gmail\.com|yaron57@gmail\.com|markus@semantic-mediawiki\.org|s7eph4n@gmail\.org|wiki@physikerwelt\.de|addshorewiki@gmail\.com|pragun06@gmail\.com|nilesh@nileshc\.com|benestar\.wikimedia@googlemail\.com|mlazowik@gmail\.com|pleasestand@live\.com|legoktm\.wikipedia@gmail\.com|moriel@gmail\.com|d_entous@yahoo\.com|kartik\.mistry@gmail\.com|drenfro@vistaprint\.com|matanya\.moses@gmail\.com|matanya@foss\.co\.il|andrew\.green\.df@gmail\.com|thomaspt@hotmail\.fr|twkozlowski@gmail\.com|yuvipanda@gmail\.com|aarcos\.wiki@gmail\.com|saper@saper\.info|christian@quelltextlich\.at|maria\.pacana@gmail\.com|bebirchall@gmail\.com|shahyar@gmail\.com|federicoleva@tiscali\.it|jack@countervandalism\.net|at\.light@live\.com\.au|jackmcbarn@gmail\.com|platonides@gmail\.com|jarry1250@gmail\.com|admin@alphacorp\.tk|01tonythomas@gmail\.com|benapetr@gmail\.com|pastakhov@yandex\.ru|hardikjuneja\.hj@gmail\.com|siebrand@kitano\.nl|wctaiwan@gmail\.com|ladsgroup@gmail\.com|info@gno\.de|valhallasw@arctus\.nl)).*$ -success-message: 'Build succeeded.' +success-message: 'Basic checks succeeded. Approved users can trigger tests by commenting recheck.' success: # Only V+1 as these are not elaborate tests. This prevents a change from # being merged (requires V+2) before elaborate tests, which vote V+2, have run. gerrit: verified: 1 -failure-message: 'Build failed.' +failure-message: 'Basic checks failed. Please amend your patchset.' failure: gerrit: verified: -1 @@ -62,11 +62,11 @@ - ^(?!l10n-bot@translatewiki\.net).*$ - event: comment-added comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$ -success-message: 'Build succeeded.' +success-message: 'Basic checks succeeded. Since this repository lacks tests, please carefully review code before approving.' success: gerrit: verified: 1 -failure-message: 'Build failed.' +failure-message: 'Basic checks failed. Either fix your patchset or comment recheck to retrigger the checks.' failure: gerrit: verified: -1 @@ -80,11 +80,11 @@ - event: patchset-created - event: comment-added comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$ -success-message: 'Build succeeded.' +success-message: 'Basic checks succeeded. Since this repository lacks tests, please carefully review code before approving.' success: gerrit: verified: 2 -failure-message: 'Build failed.' +failure-message: 'Basic checks failed.' failure: gerrit: verified: -1 @@ -210,11 +210,11 @@ comment_filter: (?im)^Patch Set \d+:\n\n\s*recheck\.?\s*$ email_filter: *email_whitelist -success-message: 'Build succeeded.' +success-message: 'Test jobs succeeded.' success: gerrit: verified: 2 -failure-message: 'Build failed.' +failure-message: 'Test jobs failed.' failure: gerrit: verified: -1 @@ -238,13 +238,13 @@ start: gerrit: verified: 0 -success-message: 'Build succeeded.' +success-message: 'Gating jobs
[MediaWiki-commits] [Gerrit] Improve appearance of RTL languages in app language selection. - change (apps...wikipedia)
Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/134099 Change subject: Improve appearance of RTL languages in app language selection. .. Improve appearance of RTL languages in app language selection. Change-Id: Ifc8886747802b8bc4f0b061f66931629ba662da4 --- M wikipedia/res/layout-v17/simple_list_item_activated_2.xml M wikipedia/res/layout/simple_list_item_activated_2.xml 2 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/99/134099/1 diff --git a/wikipedia/res/layout-v17/simple_list_item_activated_2.xml b/wikipedia/res/layout-v17/simple_list_item_activated_2.xml index d7d64d5..9455ea5 100644 --- a/wikipedia/res/layout-v17/simple_list_item_activated_2.xml +++ b/wikipedia/res/layout-v17/simple_list_item_activated_2.xml @@ -25,7 +25,7 @@ TextView android:id=@android:id/text1 - android:layout_width=match_parent + android:layout_width=wrap_content android:layout_height=wrap_content android:layout_marginStart=?android:attr/listPreferredItemPaddingStart android:layout_marginTop=6dip @@ -33,7 +33,7 @@ / TextView android:id=@android:id/text2 - android:layout_width=match_parent + android:layout_width=wrap_content android:layout_height=wrap_content android:layout_below=@android:id/text1 android:layout_alignStart=@android:id/text1 diff --git a/wikipedia/res/layout/simple_list_item_activated_2.xml b/wikipedia/res/layout/simple_list_item_activated_2.xml index d8c805c..6bea482 100644 --- a/wikipedia/res/layout/simple_list_item_activated_2.xml +++ b/wikipedia/res/layout/simple_list_item_activated_2.xml @@ -25,7 +25,7 @@ TextView android:id=@android:id/text1 - android:layout_width=match_parent + android:layout_width=wrap_content android:layout_height=wrap_content android:layout_marginStart=6dip android:layout_marginTop=6dip @@ -33,7 +33,7 @@ / TextView android:id=@android:id/text2 - android:layout_width=match_parent + android:layout_width=wrap_content android:layout_height=wrap_content android:layout_below=@android:id/text1 android:layout_alignStart=@android:id/text1 -- To view, visit https://gerrit.wikimedia.org/r/134099 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifc8886747802b8bc4f0b061f66931629ba662da4 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant dbr...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add url parameters to suppress text and didyoumean - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add url parameters to suppress text and didyoumean .. Add url parameters to suppress text and didyoumean Change-Id: Ib5ca5b2d8c6b40b5d87381ff3a2981dfc2e45d1e --- M extensions/CirrusSearch 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/CirrusSearch b/extensions/CirrusSearch index 0dd3cc3..7b3eec5 16 --- a/extensions/CirrusSearch +++ b/extensions/CirrusSearch -Subproject commit 0dd3cc37a0dd19e5d8f90203f2ccf8a3ee8e89a7 +Subproject commit 7b3eec536384288e79f16ad13502ec39a0665e6e -- To view, visit https://gerrit.wikimedia.org/r/133743 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5ca5b2d8c6b40b5d87381ff3a2981dfc2e45d1e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.24wmf4 Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@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] mediawiki.page.watch.ajax: Disable watch link while waiting ... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.page.watch.ajax: Disable watch link while waiting for
API response
..
mediawiki.page.watch.ajax: Disable watch link while waiting for API response
Previously clicking the watch link several times in a row would fire
several requests to the API, and the final result would depend on the
order in which they arrived. Let's not allow that.
This also removes the special-case for the 'loading' class, it is now
always added or removed.
Change-Id: Ib91ec8505d04945dc77e48ab70b5c94e3da47d9c
---
M resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
M skins/vector/components/watchstar.less
2 files changed, 10 insertions(+), 7 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Bartosz Dziewoński: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
b/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
index 3b0aeee..15e9aba 100644
--- a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -57,13 +57,10 @@
$li.prop( 'id', 'ca-' + action );
}
- // Special case for vector icon
- if ( $li.hasClass( 'icon' ) ) {
- if ( state === 'loading' ) {
- $link.addClass( 'loading' );
- } else {
- $link.removeClass( 'loading' );
- }
+ if ( state === 'loading' ) {
+ $link.addClass( 'loading' );
+ } else {
+ $link.removeClass( 'loading' );
}
}
@@ -133,6 +130,10 @@
$link = $( this );
+ if ( $link.hasClass( 'loading' ) ) {
+ return;
+ }
+
updateWatchLink( $link, action, 'loading' );
api = new mw.Api();
diff --git a/skins/vector/components/watchstar.less
b/skins/vector/components/watchstar.less
index 1a6d1fc..a389ed6 100644
--- a/skins/vector/components/watchstar.less
+++ b/skins/vector/components/watchstar.less
@@ -36,6 +36,8 @@
.rotation(700ms);
/* Suppress the hilarious rotating focus outline on Firefox */
outline: none;
+ cursor: default;
+ pointer-events: none;
background-position: 50% 60%;
-webkit-transform-origin: 50% 57%;
transform-origin: 50% 57%;
--
To view, visit https://gerrit.wikimedia.org/r/133895
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib91ec8505d04945dc77e48ab70b5c94e3da47d9c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Jack Phoenix j...@countervandalism.net
Gerrit-Reviewer: Krinkle krinklem...@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 OOjs UI to v0.1.0-pre (d4086ff6e6) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update OOjs UI to v0.1.0-pre (d4086ff6e6) .. Update OOjs UI to v0.1.0-pre (d4086ff6e6) New changes: a635ace build: Update jscs config fd23e56 Localisation updates from https://translatewiki.net. f5e6413 PanelLayout: Remove call to getDir() Change-Id: I19fe3aa6c9909ab2d970b87a5ec21a019d8bb241 (cherry picked from commit df481042203cbee6ba2a246419f9f1e53b4b9c53) --- M resources/lib/oojs-ui/i18n/cs.json M resources/lib/oojs-ui/i18n/fr.json M resources/lib/oojs-ui/i18n/he.json M resources/lib/oojs-ui/i18n/it.json M resources/lib/oojs-ui/i18n/ja.json M resources/lib/oojs-ui/i18n/lb.json M resources/lib/oojs-ui/i18n/mk.json M resources/lib/oojs-ui/i18n/ms.json M resources/lib/oojs-ui/i18n/pl.json M resources/lib/oojs-ui/i18n/pt.json M resources/lib/oojs-ui/i18n/qqq.json M resources/lib/oojs-ui/i18n/ru.json M resources/lib/oojs-ui/i18n/sv.json M resources/lib/oojs-ui/i18n/zh-hans.json M resources/lib/oojs-ui/i18n/zh-hant.json A resources/lib/oojs-ui/oojs-ui.css M resources/lib/oojs-ui/oojs-ui.js M resources/lib/oojs-ui/oojs-ui.svg.css 18 files changed, 1,253 insertions(+), 28 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/lib/oojs-ui/i18n/cs.json b/resources/lib/oojs-ui/i18n/cs.json index 9c69f49..ca6d5b4 100644 --- a/resources/lib/oojs-ui/i18n/cs.json +++ b/resources/lib/oojs-ui/i18n/cs.json @@ -17,5 +17,9 @@ ooui-outline-control-move-down: Přesunout položku dolů, ooui-outline-control-move-up: Přesunout položku nahoru, ooui-outline-control-remove: Odstranit položku, - ooui-toolbar-more: Další + ooui-toolbar-more: Další, + ooui-dialog-confirm-title: Potvrzení, + ooui-dialog-confirm-default-prompt: Opravdu?, + ooui-dialog-confirm-default-ok: OK, + ooui-dialog-confirm-default-cancel: Storno } diff --git a/resources/lib/oojs-ui/i18n/fr.json b/resources/lib/oojs-ui/i18n/fr.json index cc77b90..6b8871a 100644 --- a/resources/lib/oojs-ui/i18n/fr.json +++ b/resources/lib/oojs-ui/i18n/fr.json @@ -32,5 +32,9 @@ ooui-outline-control-move-down: Faire descendre l’élément, ooui-outline-control-move-up: Faire monter l’élément, ooui-outline-control-remove: Supprimer l’élément, - ooui-toolbar-more: Plus + ooui-toolbar-more: Plus, + ooui-dialog-confirm-title: Confirmer, + ooui-dialog-confirm-default-prompt: Êtes-vous sûr ?, + ooui-dialog-confirm-default-ok: OK, + ooui-dialog-confirm-default-cancel: Annuler } diff --git a/resources/lib/oojs-ui/i18n/he.json b/resources/lib/oojs-ui/i18n/he.json index 403b200..26660f9 100644 --- a/resources/lib/oojs-ui/i18n/he.json +++ b/resources/lib/oojs-ui/i18n/he.json @@ -19,5 +19,9 @@ ooui-outline-control-move-down: להזיז את הפריט מטה, ooui-outline-control-move-up: להזיז את הפריט מעלה, ooui-outline-control-remove: להסיר את הפריט, - ooui-toolbar-more: עוד + ooui-toolbar-more: עוד, + ooui-dialog-confirm-title: אישור, + ooui-dialog-confirm-default-prompt: באמת?, + ooui-dialog-confirm-default-ok: אישור, + ooui-dialog-confirm-default-cancel: ביטול } diff --git a/resources/lib/oojs-ui/i18n/it.json b/resources/lib/oojs-ui/i18n/it.json index ec9bd5e..162fa8c 100644 --- a/resources/lib/oojs-ui/i18n/it.json +++ b/resources/lib/oojs-ui/i18n/it.json @@ -11,12 +11,17 @@ Gianfranco, Minerva Titani, Raoli, - Una giornata uggiosa '94 + Una giornata uggiosa '94, + Ontsed ] }, ooui-dialog-action-close: Chiudi, ooui-outline-control-move-down: Sposta in basso, ooui-outline-control-move-up: Sposta in alto, ooui-outline-control-remove: Rimuovi elemento, - ooui-toolbar-more: Altro + ooui-toolbar-more: Altro, + ooui-dialog-confirm-title: Conferma, + ooui-dialog-confirm-default-prompt: Sei sicuro?, + ooui-dialog-confirm-default-ok: OK, + ooui-dialog-confirm-default-cancel: Annulla } diff --git a/resources/lib/oojs-ui/i18n/ja.json b/resources/lib/oojs-ui/i18n/ja.json index aabe553..70c1e07 100644 --- a/resources/lib/oojs-ui/i18n/ja.json +++ b/resources/lib/oojs-ui/i18n/ja.json @@ -11,5 +11,9 @@ ooui-outline-control-move-down: 項目を下に移動させる, ooui-outline-control-move-up: 項目を上に移動させる, ooui-outline-control-remove: 項目を除去, - ooui-toolbar-more: その他 + ooui-toolbar-more: その他, + ooui-dialog-confirm-title: 確認, + ooui-dialog-confirm-default-prompt: 本当によろしいですか?, + ooui-dialog-confirm-default-ok: OK, + ooui-dialog-confirm-default-cancel: キャンセル } diff --git a/resources/lib/oojs-ui/i18n/lb.json b/resources/lib/oojs-ui/i18n/lb.json index 54c9245..e2e12ab
[MediaWiki-commits] [Gerrit] diamond to remaining lvs servers - change (operations/puppet)
Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134100
Change subject: diamond to remaining lvs servers
..
diamond to remaining lvs servers
Change-Id: I7ed376f296aa7fcf32a94ee701c592db19b381b1
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/00/134100/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 762ca82..6c37a1c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1577,6 +1577,7 @@
#}
$cluster = 'lvs'
include role::lvs::balancer
+include role::diamond
interface::add_ip6_mapped { 'main':
interface = 'eth0',
@@ -1616,6 +1617,7 @@
}
include role::lvs::balancer
+include role::diamond
interface::add_ip6_mapped { 'main':
interface = 'eth0',
--
To view, visit https://gerrit.wikimedia.org/r/134100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ed376f296aa7fcf32a94ee701c592db19b381b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] diamond to remaining lvs servers - change (operations/puppet)
Rush has submitted this change and it was merged.
Change subject: diamond to remaining lvs servers
..
diamond to remaining lvs servers
Change-Id: I7ed376f296aa7fcf32a94ee701c592db19b381b1
---
M manifests/site.pp
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 762ca82..6c37a1c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1577,6 +1577,7 @@
#}
$cluster = 'lvs'
include role::lvs::balancer
+include role::diamond
interface::add_ip6_mapped { 'main':
interface = 'eth0',
@@ -1616,6 +1617,7 @@
}
include role::lvs::balancer
+include role::diamond
interface::add_ip6_mapped { 'main':
interface = 'eth0',
--
To view, visit https://gerrit.wikimedia.org/r/134100
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ed376f296aa7fcf32a94ee701c592db19b381b1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
Gerrit-Reviewer: Rush r...@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] Adding a border to the bottom of the chat-topic - change (mediawiki...MediaWikiChat)
UltrasonicNXT has submitted this change and it was merged.
Change subject: Adding a border to the bottom of the chat-topic
..
Adding a border to the bottom of the chat-topic
This aesthetic change makes the chat topic and the chat table have a division
between each other so that they don't feel like one thing. Also in this change
are some CSS cleanup per https://www.mediawiki.org/wiki/CC/CSS though these
changes in no way change the functionality or appearance of the extension.
Change-Id: Ibc98b2436ed37c91f9199cfe4ce321a12ef6c76e
---
M MediaWikiChat.css
1 file changed, 38 insertions(+), 2 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.css b/MediaWikiChat.css
index d46d794..2759c39 100644
--- a/MediaWikiChat.css
+++ b/MediaWikiChat.css
@@ -2,24 +2,29 @@
position: relative;
width: 100%;
}
+
#mwchat-main {
width: 67%;
}
+
#mwchat-content {
height: 450px;
overflow-y: scroll;
resize: vertical;
}
+
#mwchat-table {
width: 100%;
table-layout: fixed;
resize: none;
}
+
.mwchat-useritem-content {
height: 200px;
overflow-y: scroll;
border-left: 1px #eee solid; /* only left, bottom is input, right
scrollbar, and top header */
}
+
#mwchat-users {
width: 33%;
position: absolute;
@@ -29,6 +34,7 @@
overflow-y: auto;
overflow-x: hidden;
}
+
#mwchat-me {
width: 33%;
position: absolute;
@@ -36,16 +42,20 @@
top: 450px;
padding-left: 10px;
}
+
#mwchat-type input, .mwchat-useritem input {
width: 100%;
}
+
.mwchat-useritem input {
margin-top: 0;
width: 99%; /* keeps input in line, otherwise it sticks out */
}
+
.mwchat-item-messagecell {
width: 77%;
}
+
.mwchat-item-timestamp-container {
float: right;
margin-left: 6px;
@@ -53,10 +63,12 @@
position: relative;
text-align: right;
}
+
.mwchat-item-timestamp {
color: #CCC;
text-transform: lowercase;
}
+
.mwchat-item-timestamp.real {
width: 8em;
position: absolute;
@@ -66,6 +78,7 @@
padding-bottom: 5px;
white-space: nowrap;
}
+
.mwchat-item-user {
margin: 5px;
width: 20%;
@@ -74,9 +87,11 @@
text-align: right;
vertical-align: top;
}
+
.mwchat-useritem-content .mwchat-item-user {
width: 90px;
}
+
.mwchat-useritem {
/*padding: 3px 0 3px 3px;*/
padding: 3px;
@@ -85,60 +100,81 @@
-webkit-transition: background-color 0.5s;
position: relative;
}
-.mwchat-useritem[data-read=true], .mwchat-useritem[data-read=true]
.mwchat-useritem-header, .mwchat-item-message[data-read=true] {
+
+.mwchat-useritem[data-read=true],
+.mwchat-useritem[data-read=true] .mwchat-useritem-header,
+.mwchat-item-message[data-read=true] {
background-color: #FDD !important;
}
+
.mwchat-item-message {
transition: background-color 0.5s;
-webkit-transition: background-color 0.5s;
}
+
.mwchat-useritem-header {
background-color: #eee;
cursor: pointer;
padding: 2px;
}
+
.mwchat-item-avatar {
width: 26px;
vertical-align: top;
}
+
.mwchat-item-avatar img {
margin-left: 5px;
margin-right: 5px;
}
+
.mwchat-item-message * {
display: inline;
}
+
.mwchat-useritem-header-links {
top: 5px;
right: 5px;
position: absolute;
}
+
.mwchat-useritem-blocklink, .mwchat-useritem-kicklink {
color: #000 !important;
}
+
.mwchat-message.system .mwchat-item-message {
word-break: break-all;
color: #888;
}
+
.mwchat-message.system td {
padding-left: 3em;
}
+
.mwchat-useritem-window .mwchat-avatar {
margin-right: 2px;
}
+
.mwchat-useritem img {
margin-left: 3px;
margin-right: 2px;
}
+
#mwchat-no-other-users {
padding: 1em;
}
+
#mwchat-topic {
text-align: center;
+ border-bottom: 1px solid #aaa;
+ padding-bottom: .5em;
+ margin-bottom: .5em;
}
+
#mwchat-options {
margin-top: 10px;
}
+
#mwchat-type {
position: relative;
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/132496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibc98b2436ed37c91f9199cfe4ce321a12ef6c76e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: GeorgeBarnick george.barn...@brickcraft.me
Gerrit-Reviewer: UltrasonicNXT adamr_car...@btinternet.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] removing automatic cleanup logic. - change (operations/puppet)
Rush has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134101
Change subject: removing automatic cleanup logic.
..
removing automatic cleanup logic.
For initial rollout we need to audit the systems in groups
and probably individually before enabling this. I am removing
it all cleanly in one commit leaving the script for manual
investigations for revert.
Change-Id: Idc077904212c3d917de984c88f2d1106fb27d54d
---
M modules/admin/manifests/init.pp
1 file changed, 0 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/134101/1
diff --git a/modules/admin/manifests/init.pp b/modules/admin/manifests/init.pp
index fa2cb0f..fb9159b 100644
--- a/modules/admin/manifests/init.pp
+++ b/modules/admin/manifests/init.pp
@@ -30,7 +30,6 @@
ensure = file,
mode = '0555',
source = 'puppet:///modules/admin/enforce-users-groups.sh',
-before = Exec['enforce-users-groups-cleanup'],
}
file { '/etc/sudoers':
@@ -52,14 +51,5 @@
admin::groupmembers { $all_groups:
phash = $data,
-before = Exec['enforce-users-groups-cleanup'],
-}
-
-#declarative gotcha: non-defined users can get left behind
-#here we cleanup anyone not in a supplementary group above a certain UID
-exec { 'enforce-users-groups-cleanup':
-command = '/usr/local/sbin/enforce-users-groups',
-unless= '/usr/local/sbin/enforce-users-groups dryrun',
-logoutput = true,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/134101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc077904212c3d917de984c88f2d1106fb27d54d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush r...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] admin module for user/group/permissions cleanup - change (operations/puppet)
Rush has submitted this change and it was merged.
Change subject: admin module for user/group/permissions cleanup
..
admin module for user/group/permissions cleanup
Users/groups/perms are meant to be defined in yaml.
Applied like:
yaml:
groups:
test1:
gid: 1
members: [foo]
test2:
gid: 2
members: []
users:
foo:
uid: 1
...
.pp
node /foo/ {
#groups create their users (can overlap) and permissions
#as well as system groups and handling user membership
class { 'admin': groups = ['test', 'test2'], }
}
More info see: admin/README
Change-Id: I6982bfced50a22faac37246dff4d52ff163a34ed
---
R files/sudo/sudoers.labs
M manifests/sudo.pp
A modules/admin/README
A modules/admin/data/.gitignore
A modules/admin/files/enforce-users-groups.sh
A modules/admin/files/home/skel/.gitignore
C modules/admin/files/sudoers
A modules/admin/lib/puppet/parser/functions/unique_users.rb
A modules/admin/manifests/group.pp
A modules/admin/manifests/groupmembers.pp
A modules/admin/manifests/hashgroup.pp
A modules/admin/manifests/hashuser.pp
A modules/admin/manifests/init.pp
A modules/admin/manifests/sudo.pp
A modules/admin/manifests/user.pp
A modules/admin/templates/sudoers.erb
16 files changed, 696 insertions(+), 24 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
Faidon Liambotis: Looks good to me, approved
diff --git a/files/sudo/sudoers.default b/files/sudo/sudoers.labs
similarity index 90%
rename from files/sudo/sudoers.default
rename to files/sudo/sudoers.labs
index 44db26b..cf4447c 100644
--- a/files/sudo/sudoers.default
+++ b/files/sudo/sudoers.labs
@@ -5,7 +5,7 @@
# See the man page for details on how to write a sudoers file.
#
-Defaults env_reset
+Defaultsenv_reset
# Host alias specification
@@ -14,7 +14,7 @@
# Cmnd alias specification
# User privilege specification
-root ALL=(ALL) ALL
+rootALL=(ALL) ALL
# Allow members of group sudo to execute any command after they have
# provided their password
diff --git a/manifests/sudo.pp b/manifests/sudo.pp
index e5b0b6f..92c371d 100644
--- a/manifests/sudo.pp
+++ b/manifests/sudo.pp
@@ -26,28 +26,23 @@
class sudo::labs_project {
- if $realm == labs {
- include sudo::default
+if $realm == labs {
- # Was handled via sudo ldap, now handled via puppet
- sudo_group { ops: privileges = ['ALL=(ALL) NOPASSWD: ALL'] }
- # Old way of handling this.
- sudo_group { $instanceproject: ensure = absent }
- # Another old way, before per-project sudo
- sudo_group { $projectgroup: ensure = absent }
- }
+#labs specific sudo default
+file { /etc/sudoers:
+owner = root,
+group = root,
+mode = 0440,
+source = puppet:///files/sudo/sudoers.labs;
+}
-}
-
-class sudo::default {
-
- file { /etc/sudoers:
- owner = root,
- group = root,
- mode = 0440,
- source = puppet:///files/sudo/sudoers.default;
- }
-
+# Was handled via sudo ldap, now handled via puppet
+sudo_group { ops: privileges = ['ALL=(ALL) NOPASSWD: ALL'] }
+# Old way of handling this.
+sudo_group { $instanceproject: ensure = absent }
+# Another old way, before per-project sudo
+sudo_group { $projectgroup: ensure = absent }
+}
}
class sudo::appserver {
diff --git a/modules/admin/README b/modules/admin/README
new file mode 100644
index 000..6a5f5b1
--- /dev/null
+++ b/modules/admin/README
@@ -0,0 +1,190 @@
+This module is meant to manage all users, groups, and permissions (sudo).
+
+All managed resources should be defined in yaml.
+
+see: admin/data/data.yaml
+
+-- Examples --
+
+Adding a group:
+
+groups:
+ mygroup:
+ensure: present
+gid: 551
+members: [foo, bar]
+
+Managing members for a default system group:
+
+- For groups without a set GID we do not attempt creation
+
+groups:
+ adm:
+members: [foo, bar]
+
+Removing a member from a group:
+
+- Removing 'bar' user from mygroup means removal from members array
+
+groups:
+ mygroup:
+ensure: present
+gid: 551
+members: [foo, bar] - members: [foo]
+
+Removing a group:
+
+- absenting a group will remove it where it was applied
+
+groups:
+ mygroup:
+foo:
+ ensure: absent
+ gid: 679
+ members: []
+
+Adding user 'foo':
+
+- Since assignment is group centric this user won't be created anywhere yet
+
+users:
+foo:
+ uid: 1146
+ gid: 500
+ realname: Foo Bar
+ ssh_keys: [ssh-rsa mykeyhash foobar@mac]
+
+Adding user 'foo' to adm:
+
+groups:
+adm:
+members: [foo]
+
+Removing user foo:
+
+- absented
[MediaWiki-commits] [Gerrit] Revert Set $wgCategoryCollation to 'uca-cs' on cswiki - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/134102 Change subject: Revert Set $wgCategoryCollation to 'uca-cs' on cswiki .. Revert Set $wgCategoryCollation to 'uca-cs' on cswiki We can't run the update collation script in production on wikis of any size right now without scheduling with ops. Reverting for now and rescheduling. This reverts commit 29a6fba29dd44b4d6c4bf48a32355a63274ef5a4. Change-Id: I08f10a79f95e080c2a9f92f8c8f3e6b5a10a1518 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/02/134102/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2aac65e..1077c97 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10963,7 +10963,6 @@ 'bewiki' = 'uca-be', // bug 46004 'bewikisource' = 'uca-be', // bug 46004 'ckbwiki' = 'xx-uca-ckb', // bug 55630 - 'cswiki' = 'uca-cs', // bug 64885 'cywiki' = 'uca-cy', // bug 59800 'cywikibooks' = 'uca-cy', // bug 59800 'cywikiquote' = 'uca-cy', // bug 59800 -- To view, visit https://gerrit.wikimedia.org/r/134102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08f10a79f95e080c2a9f92f8c8f3e6b5a10a1518 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Set $wgCategoryCollation to 'uca-cs' on cswiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Revert Set $wgCategoryCollation to 'uca-cs' on cswiki .. Revert Set $wgCategoryCollation to 'uca-cs' on cswiki We can't run the update collation script in production on wikis of any size right now without scheduling with ops. Reverting for now and rescheduling. This reverts commit 29a6fba29dd44b4d6c4bf48a32355a63274ef5a4. Change-Id: I08f10a79f95e080c2a9f92f8c8f3e6b5a10a1518 --- M wmf-config/InitialiseSettings.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 0431045..ef48a09 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10974,7 +10974,6 @@ 'bewiki' = 'uca-be', // bug 46004 'bewikisource' = 'uca-be', // bug 46004 'ckbwiki' = 'xx-uca-ckb', // bug 55630 - 'cswiki' = 'uca-cs', // bug 64885 'cywiki' = 'uca-cy', // bug 59800 'cywikibooks' = 'uca-cy', // bug 59800 'cywikiquote' = 'uca-cy', // bug 59800 -- To view, visit https://gerrit.wikimedia.org/r/134102 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I08f10a79f95e080c2a9f92f8c8f3e6b5a10a1518 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Odder twkozlow...@gmail.com Gerrit-Reviewer: Reedy re...@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] Revert Revert Set $wgCategoryCollation to 'uca-cs' on cswi... - change (operations/mediawiki-config)
Manybubbles has uploaded a new change for review. https://gerrit.wikimedia.org/r/134103 Change subject: Revert Revert Set $wgCategoryCollation to 'uca-cs' on cswiki .. Revert Revert Set $wgCategoryCollation to 'uca-cs' on cswiki We'll redo this with support from ops/springle. This reverts commit 8f90a3629ff6b00b76deef712fb1d9e2974a1472. Change-Id: Ied90a6f21c7f0bab5b217bec0f282e7934cce5ab --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/03/134103/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ef48a09..0431045 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10974,6 +10974,7 @@ 'bewiki' = 'uca-be', // bug 46004 'bewikisource' = 'uca-be', // bug 46004 'ckbwiki' = 'xx-uca-ckb', // bug 55630 + 'cswiki' = 'uca-cs', // bug 64885 'cywiki' = 'uca-cy', // bug 59800 'cywikibooks' = 'uca-cy', // bug 59800 'cywikiquote' = 'uca-cy', // bug 59800 -- To view, visit https://gerrit.wikimedia.org/r/134103 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied90a6f21c7f0bab5b217bec0f282e7934cce5ab Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Manybubbles never...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set $wgCategoryCollation to 'uca-cs' on cswiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Set $wgCategoryCollation to 'uca-cs' on cswiki .. Set $wgCategoryCollation to 'uca-cs' on cswiki Doing just that; will need a shell user to rebuild category sort keys for the setting to work. Bug: 64885 Change-Id: If6992ff516818fc267c2d9baf9212315b69f6d1b --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Manybubbles: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 1077c97..2aac65e 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10963,6 +10963,7 @@ 'bewiki' = 'uca-be', // bug 46004 'bewikisource' = 'uca-be', // bug 46004 'ckbwiki' = 'xx-uca-ckb', // bug 55630 + 'cswiki' = 'uca-cs', // bug 64885 'cywiki' = 'uca-cy', // bug 59800 'cywikibooks' = 'uca-cy', // bug 59800 'cywikiquote' = 'uca-cy', // bug 59800 -- To view, visit https://gerrit.wikimedia.org/r/132975 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If6992ff516818fc267c2d9baf9212315b69f6d1b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder twkozlow...@gmail.com Gerrit-Reviewer: Anomie bjor...@wikimedia.org Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com Gerrit-Reviewer: Manybubbles never...@wikimedia.org Gerrit-Reviewer: Reedy re...@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] Make tooltip details compatible with jquery 1.9 - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134104
Change subject: Make tooltip details compatible with jquery 1.9
..
Make tooltip details compatible with jquery 1.9
.after no longer works for disconnected dom nodes,
as we were doing for tooltip details.
http://jquery.com/upgrade-guide/1.9/#after-before-and-replacewith-with-disconnected-nodes
instead, wrap the tooltip in a div and append the
tooltip elements to the div.
Change-Id: I8ec8f524612d5443f1652a8ebd0ad6d0a894eb2c
---
M lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/04/134104/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
index 1fe5564..d6fe8c4 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js
@@ -282,10 +282,13 @@
* @TODO: Error tooltip should be a separate tooltip derivative.
*/
_buildErrorTooltip: function() {
- var $mainMessage = ( $( 'div/', {
- 'class': 'wb-error ' + this.widgetBaseClass + '-error',
+ var $message = $( 'div/', {
+ 'class': 'wb-error ' + this.widgetBaseClass + '-error'
+ } );
+
+ var $mainMessage = $( 'div/', {
text: this.options.content.message
- } ) );
+ } ).appendTo( $message );
// Append detailed error message if given; hide it behind
toggle:
if( this.options.content.detailedMessage ) {
@@ -302,10 +305,10 @@
.text( mw.msg( 'wikibase-tooltip-error-details'
) )
.toggler( { $subject: $detailedMessage } );
- $mainMessage = $mainMessage.after( $toggler ).after(
$detailedMessage );
+ $detailedMessage.appendTo( $toggler.appendTo( $message
) );
}
- return $mainMessage;
+ return $message;
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/134104
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ec8f524612d5443f1652a8ebd0ad6d0a894eb2c
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] Fix Special:WikiSets ro view - change (mediawiki...CentralAuth)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134105
Change subject: Fix Special:WikiSets ro view
..
Fix Special:WikiSets ro view
Don't use round on the number of elements to display per
column as that might cut of a few...
Bug: 64642
Change-Id: I12b4bb8beee98ffd1739e4227864626c18d676ff
---
M specials/SpecialWikiSets.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/05/134105/1
diff --git a/specials/SpecialWikiSets.php b/specials/SpecialWikiSets.php
index 9fabf6a..1bcf454 100644
--- a/specials/SpecialWikiSets.php
+++ b/specials/SpecialWikiSets.php
@@ -232,7 +232,7 @@
$count = count( $list );
# If there are less items than columns, limit the number of
columns
$columns = $count $columns ? $count : $columns;
- $itemsPerCol = round( $count / $columns );
+ $itemsPerCol = ceil( $count / $columns );
$i = 0;
$splitLists = array();
while( $i $columns ) {
--
To view, visit https://gerrit.wikimedia.org/r/134105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12b4bb8beee98ffd1739e4227864626c18d676ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: 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] demos: Add sample dialog with GridLayout - change (oojs/ui)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134106
Change subject: demos: Add sample dialog with GridLayout
..
demos: Add sample dialog with GridLayout
Change-Id: I90abc21e2a90f15ad6adbf2ca31b5bd3ce74ba45
---
M demos/dialogs.js
1 file changed, 45 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/06/134106/1
diff --git a/demos/dialogs.js b/demos/dialogs.js
index 202e32f..581bee4 100644
--- a/demos/dialogs.js
+++ b/demos/dialogs.js
@@ -5,25 +5,25 @@
$demo = $( '.oo-ui-demo' ),
dialogs = [
{
- 'name': 'Small dialog',
+ 'name': 'Simple dialog (small)',
'config': {
'size': 'small'
}
},
{
- 'name': 'Medium dialog',
+ 'name': 'Simple dialog (medium)',
'config': {
'size': 'medium'
}
},
{
- 'name': 'Large dialog',
+ 'name': 'Simple dialog (large)',
'config': {
'size': 'large'
}
},
{
- 'name': 'Medium footless dialog',
+ 'name': 'Simple dialog (medium, footless)',
'config': {
'size': 'medium',
'footless': true
@@ -37,21 +37,55 @@
'okLabel': 'Custom ok text',
'cancelLabel': 'Custom cancel text'
}
- }
+ },
+ {
+ 'name': 'Grid dialog (medium)',
+ 'dialogClass': GridDialog,
+ 'config': {
+ 'size': 'medium'
+ }
+ },
];
- function SampleDialog( config ) {
+ function SimpleDialog( config ) {
config = $.extend( { 'title': 'Title' }, config );
- SampleDialog.super.call( this, config );
+ SimpleDialog.super.call( this, config );
}
- OO.inheritClass( SampleDialog, OO.ui.Dialog );
+ OO.inheritClass( SimpleDialog, OO.ui.Dialog );
- SampleDialog.prototype.initialize = function () {
- SampleDialog.super.prototype.initialize.apply( this, arguments
);
+ SimpleDialog.prototype.initialize = function () {
+ SimpleDialog.super.prototype.initialize.apply( this, arguments
);
this.$body.html( 'pDialog content/p' );
this.$foot.html( 'Footer' );
+ };
+
+ function GridDialog( config ) {
+ config = $.extend( { 'title': 'Grid dialog' }, config );
+ GridDialog.super.call( this, config );
+ }
+
+ OO.inheritClass( GridDialog, OO.ui.Dialog );
+
+ GridDialog.prototype.initialize = function () {
+ GridDialog.super.prototype.initialize.apply( this, arguments );
+
+ this.panels = new OO.ui.StackLayout( { '$': this.$ } );
+ this.$body.append( this.panels.$element );
+
+ this.bookletLayout = new OO.ui.BookletLayout( { '$': this.$,
'outlined': true } );
+
+
+ this.fooBarPage = new OO.ui.PageLayout(
+ 'fooBar',
+ { '$': this.$ }
+ );
+
+ this.panels.addItems( [ this.bookletLayout ] );
+ this.bookletLayout.addPages( [
+ this.fooBarPage
+ ] );
};
function openDialog( DialogClass, config, data ) {
@@ -65,7 +99,7 @@
openButton = new OO.ui.ButtonWidget( { 'label': 'Open' } );
openButton.on( 'click', OO.ui.bind(
openDialog, this,
- dialogs[i].dialogClass || SampleDialog,
+ dialogs[i].dialogClass || SimpleDialog,
dialogs[i].config,
dialogs[i].data
) );
--
To view, visit https://gerrit.wikimedia.org/r/134106
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I90abc21e2a90f15ad6adbf2ca31b5bd3ce74ba45
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch:
[MediaWiki-commits] [Gerrit] Collation: Remove deprecated findLowerBound() - change (mediawiki/core)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134107
Change subject: Collation: Remove deprecated findLowerBound()
..
Collation: Remove deprecated findLowerBound()
It was just a wrapper for ArrayUtils::findLowerBound(), it's not used
in core and it shouldn't be used anywhere outside of core (but I
haven't checked).
Change-Id: I53b0aca6bb642bdf6c972098170579fa13746554
---
M includes/Collation.php
1 file changed, 0 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/134107/1
diff --git a/includes/Collation.php b/includes/Collation.php
index 4e0c6a4..71adb09 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -523,28 +523,6 @@
return count( $this-firstLetterData['chars'] );
}
- /**
-* Do a binary search, and return the index of the largest item that
sorts
-* less than or equal to the target value.
-*
-* @deprecated since 1.23; use ArrayUtils::findLowerBound() instead
-*
-* @param array $valueCallback A function to call to get the value with
-* a given array index.
-* @param int $valueCount The number of items accessible via
$valueCallback,
-* indexed from 0 to $valueCount - 1
-* @param array $comparisonCallback A callback to compare two values,
returning
-* -1, 0 or 1 in the style of strcmp().
-* @param string $target The target value to find.
-*
-* @return int|bool The item index of the lower bound, or false if the
target value
-* sorts before all items.
-*/
- function findLowerBound( $valueCallback, $valueCount,
$comparisonCallback, $target ) {
- wfDeprecated( __METHOD__, '1.23' );
- return ArrayUtils::findLowerBound( $valueCallback, $valueCount,
$comparisonCallback, $target );
- }
-
static function isCjk( $codepoint ) {
foreach ( self::$cjkBlocks as $block ) {
if ( $codepoint = $block[0] $codepoint = $block[1]
) {
--
To view, visit https://gerrit.wikimedia.org/r/134107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I53b0aca6bb642bdf6c972098170579fa13746554
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Upgrade jQuery from 1.8.2 to 1.11.1 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged. Change subject: Upgrade jQuery from 1.8.2 to 1.11.1 .. Upgrade jQuery from 1.8.2 to 1.11.1 Code: https://code.jquery.com/jquery-1.11.1.js Release notes: http://blog.jquery.com/2013/01/15/jquery-1-9-final http://blog.jquery.com/2013/02/04/jquery-1-9-1-released/ http://blog.jquery.com/2013/05/24/jquery-1-10-0 http://blog.jquery.com/2013/05/30/jquery-1-10-1 http://blog.jquery.com/2013/07/03/jquery-1-10-2 http://blog.jquery.com/2014/01/24/jquery-1-11 http://blog.jquery.com/2014/05/01/jquery-1-11-1 Change-Id: Iabd31f88774956b2b367026d2e26040b159c6d2a --- M lib/jquery.js 1 file changed, 8,316 insertions(+), 7,448 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified -- To view, visit https://gerrit.wikimedia.org/r/133768 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iabd31f88774956b2b367026d2e26040b159c6d2a Gerrit-PatchSet: 2 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Krinkle krinklem...@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] Initialise save panel on 'ready' so focus works - change (mediawiki...VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134108
Change subject: Initialise save panel on 'ready' so focus works
..
Initialise save panel on 'ready' so focus works
Bug: 65222
Change-Id: I18a0191a3013332621e44455ea59d5f8d683117e
---
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/08/134108/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 514ac07..92deb80 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -29,6 +29,9 @@
this.restoring = false;
this.messages = {};
this.setupDeferred = $.Deferred();
+
+ // Events
+ this.connect( this, { 'ready': 'onReady' } );
};
/* Inheritance */
@@ -424,7 +427,12 @@
ve.ui.MWSaveDialog.prototype.setup = function () {
// Old messages should not persist after panel changes
this.clearAllMessages();
+};
+/**
+ * Handle window ready events
+ */
+ve.ui.MWSaveDialog.prototype.onReady = function () {
this.swapPanel( 'save' );
};
--
To view, visit https://gerrit.wikimedia.org/r/134108
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18a0191a3013332621e44455ea59d5f8d683117e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 63789) anonymous users don't see any replies to a hidde... - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134109
Change subject: (bug 63789) anonymous users don't see any replies to a hidden
comment
..
(bug 63789) anonymous users don't see any replies to a hidden comment
Now everyone (incl anonymous users) can see hidden posts.
Bug: 63789
Change-Id: I30166220c936be2bcf4996fbb8504d80779c4397
---
M FlowActions.php
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/09/134109/1
diff --git a/FlowActions.php b/FlowActions.php
index 3a80218..cd10ad5 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -467,10 +467,7 @@
'rc_insert' = false, // won't even be called, actually; only
for writes
'permissions' = array(
PostRevision::MODERATED_NONE = '',
- PostRevision::MODERATED_HIDDEN = function(
AbstractRevision $post, RevisionActionPermissions $permissions ) {
- // visible for logged in users (or anyone with
hide/close permission)
- return $permissions-getUser()-isLoggedIn() ?
'' : array( 'flow-hide' );
- },
+ PostRevision::MODERATED_HIDDEN = '', // visible for
everyone (but will initially be collapsed)
PostRevision::MODERATED_CLOSED = '',
PostRevision::MODERATED_DELETED = array(
'flow-delete', 'flow-suppress' ),
PostRevision::MODERATED_SUPPRESSED = 'flow-suppress',
--
To view, visit https://gerrit.wikimedia.org/r/134109
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30166220c936be2bcf4996fbb8504d80779c4397
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] GridLayout: Don't call getDir() during initialize - change (oojs/ui)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134110
Change subject: [WIP] GridLayout: Don't call getDir() during initialize
..
[WIP] GridLayout: Don't call getDir() during initialize
GridLayout is used by various dialogs in VisualEditor (such as
MWMediaEditDialog, MWTemplateDialog, and MWMetaDialog). These
dialogs use iframes, and we can only do meaningful style
computation when the iframe is visible (e.g. after the dialog
has been opened or during its creation when we allow it to be
rendered briefly).
The Dialog#initialize method is not as such time, so when these
dialogs construct GridLayout (via BookletLayout), getDir() is
pointless.
And yes, this means that essentially RTL is not supported during
creation of widgets, but that was already the case in Firefox
it just wasn't throwing exceptions before (and yielding empty
string or 'ltr').
Bug: 65373
Change-Id: I9aa398d56ded6b58fc23a8c2139d9610e09f4a52
---
M src/layouts/GridLayout.js
1 file changed, 11 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/10/134110/1
diff --git a/src/layouts/GridLayout.js b/src/layouts/GridLayout.js
index 11cd95c..4be6e7f 100644
--- a/src/layouts/GridLayout.js
+++ b/src/layouts/GridLayout.js
@@ -31,14 +31,14 @@
this.$element.append( panels[i].$element );
}
if ( config.widths || config.heights ) {
- this.layout( config.widths || [1], config.heights || [1] );
+ this.layout( config.widths || [1], config.heights || [1],
'headless' );
} else {
// Arrange in columns by default
widths = [];
for ( i = 0, len = this.panels.length; i len; i++ ) {
widths[i] = 1;
}
- this.layout( widths, [1] );
+ this.layout( widths, [1], 'headless' );
}
};
@@ -67,10 +67,14 @@
*
* @param {number[]} widths Widths of columns as ratios
* @param {number[]} heights Heights of rows as ratios
+ * @param {string} [mode=visible] One of visible or headless.
+ * Pass headless if this is an update at a time when the containing
+ * document is not yet or no longer visible and able to make useful
+ * style computations (bug 65373).
* @fires layout
* @throws {Error} If grid is not large enough to fit all panels
*/
-OO.ui.GridLayout.prototype.layout = function ( widths, heights ) {
+OO.ui.GridLayout.prototype.layout = function ( widths, heights, mode ) {
var x, y,
xd = 0,
yd = 0,
@@ -99,16 +103,17 @@
this.heights[y] = heights[y] / yd;
}
// Synchronize view
- this.update();
+ this.update( mode );
this.emit( 'layout' );
};
/**
* Update panel positions and sizes.
*
+ * @param {string} [mode=visible] One of visible or headless.
* @fires update
*/
-OO.ui.GridLayout.prototype.update = function () {
+OO.ui.GridLayout.prototype.update = function ( mode ) {
var x, y, panel,
i = 0,
left = 0,
@@ -130,7 +135,7 @@
'top': Math.round( top * 100 ) + '%'
};
// If RTL, reverse:
- if ( OO.ui.Element.getDir( this.$.context ) === 'rtl' )
{
+ if ( mode !== 'headless' OO.ui.Element.getDir(
this.$.context ) === 'rtl' ) {
dimensions.right = Math.round( left * 100 ) +
'%';
} else {
dimensions.left = Math.round( left * 100 ) +
'%';
--
To view, visit https://gerrit.wikimedia.org/r/134110
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9aa398d56ded6b58fc23a8c2139d9610e09f4a52
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] TemplateHandler: Detect simple URL template params and proce... - change (mediawiki...parsoid)
Marcoil has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134111
Change subject: TemplateHandler: Detect simple URL template params and process
them directly into HTML
..
TemplateHandler: Detect simple URL template params and process
them directly into HTML
Change-Id: I2c96cb0f78ecb40d013705d904b03ceec30e484d
---
M lib/ext.core.TemplateHandler.js
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/11/134111/1
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index a685d4a..5957ebf 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -797,6 +797,11 @@
(paramTokens.constructor === String ||
isSimpleParam(paramTokens))) {
param.html = param.wt;
+ } else if
(param.wt.match(/^https?:\/\/[^[\]{}\s]*$/)) {
+ // If the param is just a simple URL,
we can process it to
+ // HTML directly without going through
a sub-pipeline.
+ param.html = a rel='mw:ExtLink'
href=' + param.wt +
+ ' + param.wt + /a;
} else {
// Prepare the data needed to parse to
HTML
params.push({
--
To view, visit https://gerrit.wikimedia.org/r/134111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c96cb0f78ecb40d013705d904b03ceec30e484d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Marcoil marc...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use only px in the stylesheet - change (mediawiki...Popups)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134112
Change subject: Use only px in the stylesheet
..
Use only px in the stylesheet
Instead of the current incomprehensible mixture of em's and px's.
This will help resolve other positioning bugs with relative ease.
Change-Id: I9d7659736489c461ab8c0f4aa660a3ce2846bd5d
---
M resources/ext.popups.core.less
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/12/134112/1
diff --git a/resources/ext.popups.core.less b/resources/ext.popups.core.less
index 8b41f43..7b87650 100644
--- a/resources/ext.popups.core.less
+++ b/resources/ext.popups.core.less
@@ -80,7 +80,7 @@
div.mwe-popups-timestamp-older,
div.mwe-popups-timestamp-recent {
padding: 16px;
margin: 0;
- font-size: 0.85em;
+ font-size: 13px;
position: absolute;
bottom: 0;
/* @noflip */
@@ -122,8 +122,8 @@
.mwe-popups-extract {
max-height: 125px;
overflow: hidden;
- margin-bottom: 3.84em;
- padding-bottom: 1.28em;
+ margin-bottom: 57px;
+ padding-bottom: 19px;
}
div.mwe-popups-timestamp-older, div.mwe-popups-timestamp-recent
{
--
To view, visit https://gerrit.wikimedia.org/r/134112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9d7659736489c461ab8c0f4aa660a3ce2846bd5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reduce space between extract and timestamp - change (mediawiki...Popups)
Prtksxna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134113
Change subject: Reduce space between extract and timestamp
..
Reduce space between extract and timestamp
Bug: 65154
Change-Id: I9e114c820944aa54bfa3fd4afe9ba93c1024d28d
---
M resources/ext.popups.core.less
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/13/134113/1
diff --git a/resources/ext.popups.core.less b/resources/ext.popups.core.less
index 7b87650..4aac817 100644
--- a/resources/ext.popups.core.less
+++ b/resources/ext.popups.core.less
@@ -122,8 +122,8 @@
.mwe-popups-extract {
max-height: 125px;
overflow: hidden;
- margin-bottom: 57px;
- padding-bottom: 19px;
+ margin-bottom: 47px;
+ padding-bottom: 0;
}
div.mwe-popups-timestamp-older, div.mwe-popups-timestamp-recent
{
--
To view, visit https://gerrit.wikimedia.org/r/134113
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e114c820944aa54bfa3fd4afe9ba93c1024d28d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Converted $.each() to plain for() loop in GuidGenerator - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134114
Change subject: Converted $.each() to plain for() loop in GuidGenerator
..
Converted $.each() to plain for() loop in GuidGenerator
$.each() on strings fails in jQuery 1.9.
Change-Id: I71a7a0d6a861da3a262c8b0485ad7c2e6bf857b7
(cherry picked from commit 6ab0fc3b55ad70a341f34a98cd3d6d1fd0a37461)
---
M lib/resources/wikibase.utilities/wikibase.utilities.GuidGenerator.js
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/14/134114/1
diff --git
a/lib/resources/wikibase.utilities/wikibase.utilities.GuidGenerator.js
b/lib/resources/wikibase.utilities/wikibase.utilities.GuidGenerator.js
index fd1bdde..a4b5fec 100644
--- a/lib/resources/wikibase.utilities/wikibase.utilities.GuidGenerator.js
+++ b/lib/resources/wikibase.utilities/wikibase.utilities.GuidGenerator.js
@@ -50,10 +50,12 @@
template = 'xx-x-x-x-xxx',
guid = '';
- $.each( template, function( i, character ) {
+ for( var i = 0; i template.length; i++ ) {
+ var character = template.charAt( i );
+
if ( character === '-' ) {
guid += '-';
- return true;
+ continue;
}
var hex;
@@ -70,8 +72,7 @@
}
guid += hex;
-
- } );
+ }
return guid;
}
--
To view, visit https://gerrit.wikimedia.org/r/134114
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71a7a0d6a861da3a262c8b0485ad7c2e6bf857b7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.24-wmf4
Gerrit-Owner: Aude aude.w...@gmail.com
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Instrument the SignupExpCTAButtonClick schema - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Instrument the SignupExpCTAButtonClick schema
..
Instrument the SignupExpCTAButtonClick schema
Also fix a bug in #handleNoThanksForVisualEditor where a second
SignupExpPageLinkClick event would be logged without the user
clicking Edit or Edit source.
Change-Id: I6a2b1fdfde1034daa5ee99e136a054a6af329422
(cherry picked from commit c099f868bc7cea83150a1a206efdc901df8ac7f2)
---
M GettingStarted.php
M resources/ext.gettingstarted.anonymousEditorAcquisition.js
M resources/tours/anonymouseditoracquisitionpostedit.js
M resources/tours/anonymouseditoracquisitionpreedit.js
M resources/tours/anonymouseditoracquisitionpreeditve.js
5 files changed, 147 insertions(+), 26 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GettingStarted.php b/GettingStarted.php
index 166de2c..9bc9e3b 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -294,6 +294,7 @@
'mediawiki.Uri',
'ext.gettingstarted.user',
'schema.SignupExpPageLinkClick',
+ 'schema.SignupExpCTAButtonClick',
'ext.guidedTour.lib',
'jquery.jStorage',
),
@@ -320,6 +321,12 @@
'revision' = 8101716
);
+$wgResourceModules[ 'schema.SignupExpCTAButtonClick' ] = array(
+ 'class'= 'ResourceLoaderSchemaModule',
+ 'schema' = 'SignupExpCTAButtonClick',
+ 'revision' = 8102619
+);
+
$wgResourceModules[ 'ext.gettingstarted.assignToken' ] = array(
'scripts' = 'ext.gettingstarted.assignToken.js',
'dependencies' = array(
diff --git a/resources/ext.gettingstarted.anonymousEditorAcquisition.js
b/resources/ext.gettingstarted.anonymousEditorAcquisition.js
index c95dec2..72e47d8 100644
--- a/resources/ext.gettingstarted.anonymousEditorAcquisition.js
+++ b/resources/ext.gettingstarted.anonymousEditorAcquisition.js
@@ -6,7 +6,7 @@
user = mw.gettingStarted.user,
token = user.getToken(),
bucket = user.getBucket(),
- LOG_LINK_CLICK_DELAY = 500, // (ms)
+ LOG_EVENT_TIMEOUT = 500, // (ms)
tourToSelectorMapping = {
'anonymouseditoracquisitionpreedit': [ '#ca-edit',
'.mw-editsection a:not( .mw-editsection-visualeditor )' ],
'anonymouseditoracquisitionpreeditve': [ '#ca-ve-edit',
'.mw-editsection-visualeditor ' ]
@@ -17,7 +17,22 @@
isViewPage = (
mw.config.get( 'wgIsArticle' )
!( 'diff' in currentUri.query )
- );
+ ),
+ namespace = mw.config.get( 'wgNamespaceNumber' ),
+ self,
+ isLinkClickLoggingDisabled = false;
+
+ // NOTE (phuedx, 2014/05/07): This function provides a consistent,
internal API for logging
+ // events.
+ //
+ // Ideally the EventLogging API should provide an equivalent of
`logEventOrTimeout`.
+ // However, there are currently concerns about the approach [0].
+ //
+ // [0] https://bugzilla.wikimedia.org/show_bug.cgi?id=52287
+ function logEvent( schemaName, eventInstance ) {
+ return mw.eventLog.logEvent( schemaName, eventInstance );
+ }
+
/**
* Registers a click listener on links corresponding to one or more
selectors.
@@ -26,8 +41,7 @@
* If `shouldDelay` is false, it will allow the normal link navigation
to work.
*
* If `shouldDelay` is true, it will prevent normal navigation and wait
for logging. When
-* logging completes, or after a LOG_LINK_CLICK_DELAY-millisecond
timeout, it will navigate
-* then.
+* logging completes, or after a 500 millisecond timeout, it will
navigate then.
*
* @private
*
@@ -45,27 +59,57 @@
}
$( selectors ).click( function ( event ) {
- var logEventPromise, dfd;
+ var schemaName, eventInstance;
- logEventPromise = mw.eventLog.logEvent(
'SignupExpPageLinkClick', {
+ if ( isLinkClickLoggingDisabled ) {
+ return;
+ }
+
+ schemaName = 'SignupExpPageLinkClick';
+ eventInstance = {
token: token,
bucket: bucket,
link: link,
- namespace: mw.config.get( 'wgNamespaceNumber' )
- } );
+ namespace: namespace
+ };
if ( shouldDelay ) {
event.preventDefault();
- dfd =
[MediaWiki-commits] [Gerrit] Use article instead of page only on Wikipedia - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Use article instead of page only on Wikipedia
..
Use article instead of page only on Wikipedia
* Revert to using page by default
* Use the MessageCache::get hook to rewrite the keys for a subset of
GettingStarted messages so that the resulting message uses article
instead of page
* Only register the MessageCache::get hook on Wikipedia
Change-Id: I3ea11c0b584039bed051fe9bdd2a18e3d1ef6210
(cherry picked from commit b575348acec113a40f8a99f9c1364bed88e98291)
---
M GettingStarted.php
M Hooks.php
M i18n/en.json
M i18n/qqq.json
4 files changed, 95 insertions(+), 19 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GettingStarted.php b/GettingStarted.php
index 9bc9e3b..318cb6d 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -349,4 +349,12 @@
// Extension:CentralAuth's hook
$wgHooks[ 'CentralAuthPostLoginRedirect' ][] =
'GettingStarted\Hooks::onCentralAuthPostLoginRedirect';
$wgHooks[ 'ResourceLoaderTestModules' ][] =
'GettingStarted\Hooks::onResourceLoaderTestModules';
-$wgHooks[ 'PageContentSaveComplete' ][] =
'GettingStarted\Hooks::onPageContentSaveComplete';
\ No newline at end of file
+$wgHooks[ 'PageContentSaveComplete' ][] =
'GettingStarted\Hooks::onPageContentSaveComplete';
+
+list( $site, $lang ) = $wgConf-siteFromDB( $wgDBname );
+
+// Known Issue: Wikimedia Commons is considered Wikipedia, which may need to
be fixed
+// if GettingStarted is ever deployed there.
+if ( $site === 'wikipedia' ) {
+ $wgHooks[ 'MessageCache::get' ][] =
'GettingStarted\Hooks::onMessageCacheGet';
+}
diff --git a/Hooks.php b/Hooks.php
index 672c45c..1a5aecc 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -461,4 +461,40 @@
\EventLogging::logEvent( 'TrackedPageContentSaveComplete',
7872558, $event );
return true;
}
+
+ /**
+* If the site is a Wikipedia, this is called to specify that
Wikipedia-specific
+* versions will be used for certain keys.
+*
+* It modifies the passed-in i18n key if it is one of those listed.
+*
+* @param string $lckey Lower-case i18n key, before substitution
+*
+* @return bool Always true
+*/
+ public static function onMessageCacheGet( $lckey ) {
+
+ if ( in_array( $lckey, array(
+ gettingstarted-task-toolbar-try-another-text,
+ gettingstarted-task-toolbar-no-suggested-page,
+ gettingstarted-task-copyedit-toolbar-description,
+
gettingstarted-task-copyedit-toolbar-try-another-title,
+ gettingstarted-task-clarify-toolbar-description,
+ gettingstarted-task-clarify-toolbar-try-another-title,
+ gettingstarted-task-addlinks-toolbar-description,
+
gettingstarted-task-addlinks-toolbar-try-another-title,
+
guidedtour-tour-gettingstartedtasktoolbarintro-description,
+
guidedtour-tour-gettingstartedtasktoolbar-ambox-description,
+
guidedtour-tour-gettingstartedtasktoolbar-edit-article-title,
+
guidedtour-tour-gettingstartedtasktoolbar-edit-article-description,
+
guidedtour-tour-gettingstartedtasktoolbarve-click-save-description,
+
guidedtour-tour-gettingstarted-click-preview-description,
+ gettingstarted-cta-edit-page,
+ gettingstarted-cta-fix-pages,
+ ) ) ) {
+ $lckey = {$lckey}-wikipedia;
+ }
+
+ return true;
+ }
}
diff --git a/i18n/en.json b/i18n/en.json
index 7aa0a6d..2602e19 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,35 +11,35 @@
tag-gettingstarted_edit-description: Edit made via the
[[{{MediaWiki:gettingstarted-project-link}}|GettingStarted]] system, which
suggests easy tasks to editors and shows them how to complete them.,
gettingstarted-task-toolbar-editing-help-text: Show me how,
gettingstarted-task-toolbar-editing-help-title: Show a guide on how to
edit,
-gettingstarted-task-toolbar-try-another-text: Try another article ►,
+gettingstarted-task-toolbar-try-another-text: Try another page ►,
gettingstarted-task-toolbar-close-title: Close this toolbar,
-gettingstarted-task-toolbar-no-suggested-page: Sorry. We couldn't find
more articles to be improved at the moment. Try again in a moment or search for
your own topics of interest.,
-gettingstarted-task-copyedit-toolbar-description: This article may have
spelling or grammar errors you can fix.,
-gettingstarted-task-copyedit-toolbar-try-another-title: Go to a random
article you can improve by copyediting,
-
[MediaWiki-commits] [Gerrit] Only show anonymous editor acquisition once to the user. - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Only show anonymous editor acquisition once to the user.
..
Only show anonymous editor acquisition once to the user.
Change-Id: If07df9436e4de1990942223a6d8764f6e16b4f20
(cherry picked from commit 3dcd7c7cfac83291e24e7f974bb8a08a55a737f3)
---
M GettingStarted.php
M resources/ext.gettingstarted.anonymousEditorAcquisition.js
2 files changed, 7 insertions(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GettingStarted.php b/GettingStarted.php
index 005de1f..166de2c 100644
--- a/GettingStarted.php
+++ b/GettingStarted.php
@@ -295,6 +295,7 @@
'ext.gettingstarted.user',
'schema.SignupExpPageLinkClick',
'ext.guidedTour.lib',
+ 'jquery.jStorage',
),
'messages' = array(
'guidedtour-tour-anonymouseditoracquisitionpostedit-title',
diff --git a/resources/ext.gettingstarted.anonymousEditorAcquisition.js
b/resources/ext.gettingstarted.anonymousEditorAcquisition.js
index 9c070e2..c95dec2 100644
--- a/resources/ext.gettingstarted.anonymousEditorAcquisition.js
+++ b/resources/ext.gettingstarted.anonymousEditorAcquisition.js
@@ -170,7 +170,6 @@
$( function () {
var isPreEdit = bucket === 'pre-edit';
-
// In the pre-edit variant, clicking edit or edit source
// shows a guider so don't follow the link after the
// SignupExpPageLinkClick event has been logged.
@@ -179,6 +178,12 @@
logLinkClick( '#pt-createaccount', 'create account' );
+ // Only init if user has not seen CTA.
+ if ( $.jStorage.get( 'hasShownAnonymousEditorAcquisitionCTA' )
) {
+ return;
+ }
+ $.jStorage.set( 'hasShownAnonymousEditorAcquisitionCTA', true );
+
if ( isPreEdit ) {
initPreEditVariant();
} else if ( bucket === 'post-edit' ) {
--
To view, visit https://gerrit.wikimedia.org/r/133607
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If07df9436e4de1990942223a6d8764f6e16b4f20
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: wmf/1.24wmf4
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@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 type hint in ApiClientInfo + fix test - change (mediawiki...Wikibase)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134115
Change subject: Add type hint in ApiClientInfo + fix test
..
Add type hint in ApiClientInfo + fix test
For compatibility with Ie6bf191 in core, though this
change also works ok with earlier versions of MediaWiki core.
Bug: 65440
Change-Id: Icd9627bc6fec90216d91949492db74b547eba83e
(cherry picked from commit 355c5cf33f2973a320f998ca3d0dcfa0499cded6)
---
M client/includes/api/ApiClientInfo.php
M client/tests/phpunit/includes/api/ApiClientInfoTest.php
2 files changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/15/134115/1
diff --git a/client/includes/api/ApiClientInfo.php
b/client/includes/api/ApiClientInfo.php
index b677080..48f1f8c 100644
--- a/client/includes/api/ApiClientInfo.php
+++ b/client/includes/api/ApiClientInfo.php
@@ -3,6 +3,7 @@
namespace Wikibase;
use ApiBase;
+use ApiQuery;
use Wikibase\Client\WikibaseClient;
/**
@@ -25,11 +26,11 @@
/**
* @since 0.4
*
-* @param ApiBase $api
+* @param ApiQuery $apiQuery
* @param string $moduleName
*/
- public function __construct( $api, $moduleName ) {
- parent::__construct( $api, $moduleName, 'wb' );
+ public function __construct( ApiQuery $apiQuery, $moduleName ) {
+ parent::__construct( $apiQuery, $moduleName, 'wb' );
// @todo inject this instead of using singleton here
$this-settings =
WikibaseClient::getDefaultInstance()-getSettings();
diff --git a/client/tests/phpunit/includes/api/ApiClientInfoTest.php
b/client/tests/phpunit/includes/api/ApiClientInfoTest.php
index 1536c75..3dd37bf 100644
--- a/client/tests/phpunit/includes/api/ApiClientInfoTest.php
+++ b/client/tests/phpunit/includes/api/ApiClientInfoTest.php
@@ -2,6 +2,7 @@
namespace Wikibase\Test;
+use ApiQuery;
use Wikibase\SettingsArray;
use Wikibase\ApiClientInfo;
@@ -36,8 +37,9 @@
$context = $this-apiContext-newTestContext( $request, $user );
$apiMain = new \ApiMain( $context, true );
+ $apiQuery = new ApiQuery( $apiMain, 'wikibase' );
- $apiModule = new ApiClientInfo( $apiMain, 'query' );
+ $apiModule = new ApiClientInfo( $apiQuery, 'query' );
$apiModule-setSettings( $settings );
return $apiModule;
--
To view, visit https://gerrit.wikimedia.org/r/134115
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd9627bc6fec90216d91949492db74b547eba83e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: mw1.24-wmf4
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] Localisation updates from https://translatewiki.net. - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Localisation updates from https://translatewiki.net.
..
Localisation updates from https://translatewiki.net.
Change-Id: I8b50d36aeca138671f45ab06ead9f22f984d7271
(cherry picked from commit 9629ebb6e62abacc8597010a703f8a2515f73900)
---
M i18n/ast.json
M i18n/he.json
M i18n/it.json
3 files changed, 167 insertions(+), 140 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/ast.json b/i18n/ast.json
index dd5622d..afa9cd3 100644
--- a/i18n/ast.json
+++ b/i18n/ast.json
@@ -1,45 +1,45 @@
{
-@metadata: {
-authors: [
-Xuacu
-]
-},
-gettingstarted: Primeros pasos,
-gettingstarted-desc: Ayuda a los nuevos usuarios a facese editores,
-gettingstarted-project-link: {{ns:Project}}:PrimerosPasos,
-tag-gettingstarted_edit: vía suxerencies d'edición de
[[{{MediaWiki:gettingstarted-project-link}}|Primeros pasos]],
-tag-gettingstarted_edit-description: Edición fecha col sistema
[[{{MediaWiki:gettingstarted-project-link}}|GettingStarted]], que suxer xeres
fáciles a los editores y amuesa cómo completales.,
-gettingstarted-task-toolbar-editing-help-text: Amosame cómo,
-gettingstarted-task-toolbar-editing-help-title: Ver una guía de cómo
editar,
-gettingstarted-task-toolbar-try-another-text: Probar con otra páxina ►,
-gettingstarted-task-toolbar-close-title: Zarrar esta barra de
ferramientes,
-gettingstarted-task-toolbar-no-suggested-page: Disculpes. Nun pudimos
atopar más páxines qu'ameyorar nesti momentu. Vuelva a intentalo nunos momentos
o busque los temes que-y interesen.,
-gettingstarted-task-copyedit-toolbar-description: Esta páxina pue tener
errores ortográficos o gramaticales que pue iguar.,
-gettingstarted-task-copyedit-toolbar-try-another-title: Dir a una
páxina al debalu que pue ameyorar copiando y editando,
-gettingstarted-task-clarify-toolbar-description: Esta páxina pue ser
confusu o imprecisu. Busque maneres de facela más clara.,
-gettingstarted-task-clarify-toolbar-try-another-title: Dir a una páxina
al debalu que pue aclarar,
-gettingstarted-task-addlinks-toolbar-description: Esta páxina pue
necesitar más enllaces. Busque términos que tengan una páxina en {{SITENAME}}.,
-gettingstarted-task-addlinks-toolbar-try-another-title: Dir a una
páxina al debalu a la que pue amesta-y enllaces,
-guidedtour-tour-gettingstartedtasktoolbarintro-title: Como principiar,
-guidedtour-tour-gettingstartedtasktoolbarintro-description: Namái
principie a revisar la páxina y mire cómo ameyorala. Si se siente ablucáu, nun
se preocupe. ¡Nun necesita ser un espertu nesti asuntu! Si necesita ayuda o
quier probar con otra páxina, use los enllaces de la barra superior.,
-guidedtour-tour-gettingstartedtasktoolbar-ambox-title: Ideas sobre qué
facer,
-guidedtour-tour-gettingstartedtasktoolbar-ambox-description: Estos
carteles identifiquen problemes con esta páxina. Nun necesita arreglalos toos,
namái faiga les coses coles que s'afaye meyor.,
-guidedtour-tour-gettingstartedtasktoolbar-edit-article-title: Calque
{{int:vector-view-edit}},
-guidedtour-tour-gettingstartedtasktoolbar-edit-article-description: Pue
editar l'artículu enteru calcando equí.,
-guidedtour-tour-gettingstartedtasktoolbar-edit-section-title: Editar
una seición,
-guidedtour-tour-gettingstartedtasktoolbar-edit-section-description: Si
quier editar una seición específica, pue calcar nel enllaz azul
'{{int:editsection}}' del principiu de cada seición.,
-guidedtour-tour-gettingstartedtasktoolbarve-click-save-title: ¡Pue
editar!,
-guidedtour-tour-gettingstartedtasktoolbarve-click-save-description:
Agora pue editar la páxina. En acabando, faiga click en
\{{int:visualeditor-toolbar-savedialog}}\ pa revisar y guardar los cambios.,
-guidedtour-tour-gettingstarted-click-preview-title: Vista previa
(opcional),
-guidedtour-tour-gettingstarted-click-preview-description: Si calca
\{{int:showpreview}}\ podrá comprobar como se verá la páxina colos cambios.
Pero nun escaeza guardala.,
-guidedtour-tour-gettingstarted-click-save-title: ¡Yá casi acabó!,
-guidedtour-tour-gettingstarted-click-save-description: Calque
\{{int:savearticle}}\ y los cambios sedrán visibles.,
-gettingstarted-cta-close: Zarrar,
-gettingstarted-cta-heading: Ayude a {{SITENAME}},
-gettingstarted-cta-text: Pue collaborar con {{SITENAME}} de diferentes
maneres,
-gettingstarted-cta-edit-page: Editar esta páxina,
-gettingstarted-cta-edit-page-sub: Vamos indica-y cómo,
-gettingstarted-cta-fix-pages: Atopar páxines que necesiten igües
cencielles,
-gettingstarted-cta-fix-pages-sub: Vamos indica-y cómo editar,
-gettingstarted-cta-leave: Non gracies, seique más sero
+ @metadata: {
+ authors: [
+
[MediaWiki-commits] [Gerrit] Show anonymous acquisition experiment once regardless of pag... - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Show anonymous acquisition experiment once regardless of page
load.
..
Show anonymous acquisition experiment once regardless of page load.
Change-Id: I0300c7f27a599343bd75495a59b93e0d3cf607ba
(cherry picked from commit e4c79ddb9f3cc940dd4e86c5a72db10bfc4cdc95)
---
M resources/ext.gettingstarted.anonymousEditorAcquisition.js
1 file changed, 20 insertions(+), 13 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.gettingstarted.anonymousEditorAcquisition.js
b/resources/ext.gettingstarted.anonymousEditorAcquisition.js
index 72e47d8..d2b5878 100644
--- a/resources/ext.gettingstarted.anonymousEditorAcquisition.js
+++ b/resources/ext.gettingstarted.anonymousEditorAcquisition.js
@@ -7,6 +7,7 @@
token = user.getToken(),
bucket = user.getBucket(),
LOG_EVENT_TIMEOUT = 500, // (ms)
+ CTA_FLAG_KEY = 'hasShownAnonymousEditorAcquisitionCTA',
tourToSelectorMapping = {
'anonymouseditoracquisitionpreedit': [ '#ca-edit',
'.mw-editsection a:not( .mw-editsection-visualeditor )' ],
'anonymouseditoracquisitionpreeditve': [ '#ca-ve-edit',
'.mw-editsection-visualeditor ' ]
@@ -140,15 +141,25 @@
unregisterPreEditVariant();
mw.libs.guiders.reposition();
- gt.launchTour( tour );
+ launchTour( tour );
} );
} );
}
function initPostEditVariant() {
mw.hook( 'postEdit' ).add( function () {
- gt.launchTour( 'anonymouseditoracquisitionpostedit' );
+ launchTour( 'anonymouseditoracquisitionpostedit' );
} );
+ }
+
+ // Wrapper for launching the experiment tour
+ function launchTour( tourName ) {
+ // Abort if flag is set
+ if ( $.jStorage.get( CTA_FLAG_KEY ) ) {
+ return;
+ }
+ $.jStorage.set( CTA_FLAG_KEY, true );
+ gt.launchTour( tourName );
}
mw.gettingStarted = mw.gettingStarted || {};
@@ -279,19 +290,15 @@
// SignupExpPageLinkClick event has been logged.
logLinkClick( [ '#ca-edit', '#ca-ve-edit' ], 'edit page',
!isPreEdit );
logLinkClick( '.mw-editsection a', 'edit section', !isPreEdit );
-
logLinkClick( '#pt-createaccount', 'create account' );
- // Only init if user has not seen CTA.
- if ( $.jStorage.get( 'hasShownAnonymousEditorAcquisitionCTA' )
) {
- return;
- }
- $.jStorage.set( 'hasShownAnonymousEditorAcquisitionCTA', true );
-
- if ( isPreEdit ) {
- initPreEditVariant();
- } else if ( bucket === 'post-edit' ) {
- initPostEditVariant();
+ // Init if flag is not set
+ if ( $.jStorage.get( CTA_FLAG_KEY ) === null ) {
+ if ( isPreEdit ) {
+ initPreEditVariant();
+ } else if ( bucket === 'post-edit' ) {
+ initPostEditVariant();
+ }
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/133611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0300c7f27a599343bd75495a59b93e0d3cf607ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: wmf/1.24wmf4
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@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] Fix when course status goes from current to passed - change (mediawiki...EducationProgram)
Ragesoss has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134116
Change subject: Fix when course status goes from current to passed
..
Fix when course status goes from current to passed
Make courses end, and switch to 'passed' status, at the end
rather than the beginning of the day.
bug: 47361
Change-Id: I836d39d34849f932f0fa13f98ac27f4f44e823bd
---
M includes/rows/Course.php
M includes/tables/Courses.php
2 files changed, 15 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram
refs/changes/16/134116/1
diff --git a/includes/rows/Course.php b/includes/rows/Course.php
index 66053a9..2d65ef6 100644
--- a/includes/rows/Course.php
+++ b/includes/rows/Course.php
@@ -512,7 +512,8 @@
* @return string
*/
public function getStatus() {
- if ( $this-getDaysLeft() = 0 ) {
+ // Wait until the end of the last day to declare a course
'passed'.
+ if ( $this-getDaysLeft() = -1 ) {
$status = 'passed';
}
elseif ( $this-getDaysPassed() = 0 ) {
diff --git a/includes/tables/Courses.php b/includes/tables/Courses.php
index be97f27..2294817 100644
--- a/includes/tables/Courses.php
+++ b/includes/tables/Courses.php
@@ -150,10 +150,14 @@
public function hasActiveTitle( $courseTitle ) {
$now = wfGetDB( DB_SLAVE )-addQuotes( wfTimestampNow() );
+ // Course start and end dates are stored as the begin of the
day in UTC.
+ // To make sure courses end at the end of that day, compare the
end time
+ // with the current timestamp minus one day.
+ $oneDayAgo = wfGetDB( DB_SLAVE )-addQuotes( wfTimestamp(
TS_MW, strtotime( -1 day ) ) );
return $this-has( array(
'title' = $courseTitle,
- 'end = ' . $now,
+ 'end = ' . $oneDayAgo,
'start = ' . $now,
) );
}
@@ -207,6 +211,8 @@
/**
* Get the conditions that will select courses with the provided state.
+* Courses begin at the 00:00:00 UTC of their start date, and end at
+* 24:00:00 UTC of their end date.
*
* @since 0.1
*
@@ -217,16 +223,20 @@
*/
public static function getStatusConds( $state, $prefix = false ) {
$now = wfGetDB( DB_SLAVE )-addQuotes( wfTimestampNow() );
+ // Course start and end dates are stored as the begin of the
day in UTC.
+ // To make sure courses end at the end of that day, compare the
end time
+ // with the current timestamp minus one day.
+ $oneDayAgo = wfGetDB( DB_SLAVE )-addQuotes( wfTimestamp(
TS_MW, strtotime( -1 day ) ) );
$conditions = array();
switch ( $state ) {
case 'current':
- $conditions[] = 'end = ' . $now;
+ $conditions[] = 'end = ' . $oneDayAgo;
$conditions[] = 'start = ' . $now;
break;
case 'passed':
- $conditions[] = 'end ' . $now;
+ $conditions[] = 'end ' . $oneDayAgo;
break;
case 'planned':
$conditions[] = 'start ' . $now;
--
To view, visit https://gerrit.wikimedia.org/r/134116
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I836d39d34849f932f0fa13f98ac27f4f44e823bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Ragesoss rages...@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] Move dblists to their own folder - change (operations/mediawiki-config)
Reedy has uploaded a new change for review. https://gerrit.wikimedia.org/r/134117 Change subject: Move dblists to their own folder .. Move dblists to their own folder Change-Id: I5ab7a4690c6be2efe48a150554f7b52b40379741 --- R dblist/all-labs.dblist R dblist/all.dblist R dblist/cirrus.dblist R dblist/closed.dblist R dblist/deleted.dblist R dblist/echowikis.dblist R dblist/fishbowl.dblist R dblist/flaggedrevs.dblist R dblist/gettingstarted-with-category-suggestions.dblist R dblist/group0.dblist R dblist/large.dblist R dblist/mediaviewer.dblist R dblist/medium.dblist R dblist/private.dblist R dblist/s1.dblist R dblist/s2.dblist R dblist/s3.dblist R dblist/s4.dblist R dblist/s5.dblist R dblist/s6.dblist R dblist/s7.dblist R dblist/small.dblist R dblist/special.dblist R dblist/visualeditor-default.dblist R dblist/visualeditor.dblist R dblist/wikibooks.dblist R dblist/wikidata.dblist R dblist/wikidataclient.dblist R dblist/wikimania.dblist R dblist/wikimedia.dblist R dblist/wikinews.dblist R dblist/wikipedia.dblist R dblist/wikiquote.dblist R dblist/wikisource.dblist R dblist/wikiversity.dblist R dblist/wikivoyage.dblist R dblist/wiktionary.dblist M docroot/noc/conf/all-labs.dblist M docroot/noc/conf/all.dblist M docroot/noc/conf/cirrus.dblist M docroot/noc/conf/closed.dblist M docroot/noc/conf/deleted.dblist M docroot/noc/conf/echowikis.dblist M docroot/noc/conf/fishbowl.dblist M docroot/noc/conf/flaggedrevs.dblist M docroot/noc/conf/group0.dblist M docroot/noc/conf/large.dblist M docroot/noc/conf/mediaviewer.dblist M docroot/noc/conf/medium.dblist M docroot/noc/conf/private.dblist M docroot/noc/conf/s1.dblist M docroot/noc/conf/s2.dblist M docroot/noc/conf/s3.dblist M docroot/noc/conf/s4.dblist M docroot/noc/conf/s5.dblist M docroot/noc/conf/s6.dblist M docroot/noc/conf/s7.dblist M docroot/noc/conf/small.dblist M docroot/noc/conf/special.dblist M docroot/noc/conf/visualeditor-default.dblist M docroot/noc/conf/visualeditor.dblist M docroot/noc/conf/wikibooks.dblist M docroot/noc/conf/wikidata.dblist M docroot/noc/conf/wikidataclient.dblist M docroot/noc/conf/wikimania.dblist M docroot/noc/conf/wikimedia.dblist M docroot/noc/conf/wikinews.dblist M docroot/noc/conf/wikipedia.dblist M docroot/noc/conf/wikiquote.dblist M docroot/noc/conf/wikisource.dblist M docroot/noc/conf/wikiversity.dblist M docroot/noc/conf/wikivoyage.dblist M docroot/noc/conf/wiktionary.dblist M docroot/noc/createTxtFileSymlinks.sh M multiversion/refreshWikiversionsCDB M multiversion/updateWikiversions.php M wmf-config/CommonSettings.php M wmf-config/Wikibase.php M wmf-config/wgConf.php 79 files changed, 58 insertions(+), 53 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/17/134117/1 diff --git a/all-labs.dblist b/dblist/all-labs.dblist similarity index 100% rename from all-labs.dblist rename to dblist/all-labs.dblist diff --git a/all.dblist b/dblist/all.dblist similarity index 100% rename from all.dblist rename to dblist/all.dblist diff --git a/cirrus.dblist b/dblist/cirrus.dblist similarity index 100% rename from cirrus.dblist rename to dblist/cirrus.dblist diff --git a/closed.dblist b/dblist/closed.dblist similarity index 100% rename from closed.dblist rename to dblist/closed.dblist diff --git a/deleted.dblist b/dblist/deleted.dblist similarity index 100% rename from deleted.dblist rename to dblist/deleted.dblist diff --git a/echowikis.dblist b/dblist/echowikis.dblist similarity index 100% rename from echowikis.dblist rename to dblist/echowikis.dblist diff --git a/fishbowl.dblist b/dblist/fishbowl.dblist similarity index 100% rename from fishbowl.dblist rename to dblist/fishbowl.dblist diff --git a/flaggedrevs.dblist b/dblist/flaggedrevs.dblist similarity index 100% rename from flaggedrevs.dblist rename to dblist/flaggedrevs.dblist diff --git a/gettingstarted-with-category-suggestions.dblist b/dblist/gettingstarted-with-category-suggestions.dblist similarity index 100% rename from gettingstarted-with-category-suggestions.dblist rename to dblist/gettingstarted-with-category-suggestions.dblist diff --git a/group0.dblist b/dblist/group0.dblist similarity index 100% rename from group0.dblist rename to dblist/group0.dblist diff --git a/large.dblist b/dblist/large.dblist similarity index 100% rename from large.dblist rename to dblist/large.dblist diff --git a/mediaviewer.dblist b/dblist/mediaviewer.dblist similarity index 100% rename from mediaviewer.dblist rename to dblist/mediaviewer.dblist diff --git a/medium.dblist b/dblist/medium.dblist similarity index 100% rename from medium.dblist rename to dblist/medium.dblist diff --git a/private.dblist b/dblist/private.dblist similarity index 100% rename from private.dblist rename to dblist/private.dblist diff --git a/s1.dblist b/dblist/s1.dblist similarity index 100% rename from s1.dblist rename to dblist/s1.dblist diff --git a/s2.dblist b/dblist/s2.dblist similarity index
[MediaWiki-commits] [Gerrit] Fix Special:WikiSets ro view - change (mediawiki...CentralAuth)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix Special:WikiSets ro view
..
Fix Special:WikiSets ro view
Don't use round on the number of elements to display per
column as that might cut of a few...
Bug: 64642
Change-Id: I12b4bb8beee98ffd1739e4227864626c18d676ff
---
M specials/SpecialWikiSets.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/SpecialWikiSets.php b/specials/SpecialWikiSets.php
index 9fabf6a..1bcf454 100644
--- a/specials/SpecialWikiSets.php
+++ b/specials/SpecialWikiSets.php
@@ -232,7 +232,7 @@
$count = count( $list );
# If there are less items than columns, limit the number of
columns
$columns = $count $columns ? $count : $columns;
- $itemsPerCol = round( $count / $columns );
+ $itemsPerCol = ceil( $count / $columns );
$i = 0;
$splitLists = array();
while( $i $columns ) {
--
To view, visit https://gerrit.wikimedia.org/r/134105
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12b4bb8beee98ffd1739e4227864626c18d676ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Hoo man h...@online.de
Gerrit-Reviewer: CSteipp cste...@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] Simplify wmf-config listings in createTxtFileSymlinks.sh - change (operations/mediawiki-config)
Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/134118
Change subject: Simplify wmf-config listings in createTxtFileSymlinks.sh
..
Simplify wmf-config listings in createTxtFileSymlinks.sh
Change-Id: I21f9be264f0edffa776168894c846e7a69d6a59f
---
M docroot/noc/createTxtFileSymlinks.sh
1 file changed, 40 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/18/134118/1
diff --git a/docroot/noc/createTxtFileSymlinks.sh
b/docroot/noc/createTxtFileSymlinks.sh
index 1c37453..fb35a34 100755
--- a/docroot/noc/createTxtFileSymlinks.sh
+++ b/docroot/noc/createTxtFileSymlinks.sh
@@ -3,45 +3,45 @@
# Create .txt symlink from mediawiki-config
mwconfig_files_txt=(
- wmf-config/CommonSettings-labs.php
- wmf-config/CommonSettings.php
- wmf-config/InitialiseSettings-labs.php
- wmf-config/InitialiseSettings.php
- wmf-config/PoolCounterSettings-eqiad.php
- wmf-config/StartProfiler.php
- wmf-config/abusefilter.php
- wmf-config/CirrusSearch-common.php
- wmf-config/CirrusSearch-labs.php
- wmf-config/db-eqiad.php
- wmf-config/db-labs.php
- wmf-config/db-secondary.php
- wmf-config/ext-labs.php
- wmf-config/ext-production.php
- wmf-config/filebackend-labs.php
- wmf-config/filebackend.php
- wmf-config/flaggedrevs.php
- wmf-config/jobqueue-eqiad.php
- wmf-config/liquidthreads.php
- wmf-config/logging-labs.php
- wmf-config/lucene-common.php
- wmf-config/lucene-production.php
- wmf-config/mc.php
- wmf-config/mc-labs.php
- wmf-config/missing.php
- wmf-config/mobile-labs.php
- wmf-config/mobile.php
- wmf-config/proofreadpage.php
- wmf-config/throttle.php
- wmf-config/wgConf.php
- wmf-config/wgConfVHosts.php
- wmf-config/wgConfVHosts-labs.php
- wmf-config/squid.php
- wmf-config/squid-labs.php
- wmf-config/session.php
- wmf-config/session-labs.php
- wmf-config/twemproxy-eqiad.yaml
- wmf-config/twemproxy-labs.yaml
- wmf-config/Wikibase.php
+ CommonSettings-labs.php
+ CommonSettings.php
+ InitialiseSettings-labs.php
+ InitialiseSettings.php
+ PoolCounterSettings-eqiad.php
+ StartProfiler.php
+ abusefilter.php
+ CirrusSearch-common.php
+ CirrusSearch-labs.php
+ db-eqiad.php
+ db-labs.php
+ db-secondary.php
+ ext-labs.php
+ ext-production.php
+ filebackend-labs.php
+ filebackend.php
+ flaggedrevs.php
+ jobqueue-eqiad.php
+ liquidthreads.php
+ logging-labs.php
+ lucene-common.php
+ lucene-production.php
+ mc.php
+ mc-labs.php
+ missing.php
+ mobile-labs.php
+ mobile.php
+ proofreadpage.php
+ throttle.php
+ wgConf.php
+ wgConfVHosts.php
+ wgConfVHosts-labs.php
+ squid.php
+ squid-labs.php
+ session.php
+ session-labs.php
+ twemproxy-eqiad.yaml
+ twemproxy-labs.yaml
+ Wikibase.php
)
# Create non-txt symlink from mediawiki-config
@@ -122,7 +122,7 @@
for i in ${mwconfig_files_txt[@]}
do
- ln -s ../../../$i ./$(basename $i).txt
+ ln -s ../../../wmf-config/$i ./$(basename $i).txt
done
for i in ${mwconfig_files[@]}
--
To view, visit https://gerrit.wikimedia.org/r/134118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21f9be264f0edffa776168894c846e7a69d6a59f
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add linebreaks to anonymouseditoracquisitionpostedit-descrip... - change (mediawiki...GettingStarted)
jenkins-bot has submitted this change and it was merged.
Change subject: Add linebreaks to anonymouseditoracquisitionpostedit-description
..
Add linebreaks to anonymouseditoracquisitionpostedit-description
This message has a lot of HTML. Adding linebreaks will make it
easier for translators to handle.
Change-Id: Id60fbc156d6cb0817da85930abe2214bd480089f
(cherry picked from commit 8cd2966c4afadd391d2a9c429f244947e47b3759)
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 2602e19..1e84d3e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -47,7 +47,7 @@
guidedtour-tour-anonymouseditoracquisitionpreedit-sign-up: Sign up and
edit,
guidedtour-tour-anonymouseditoracquisitionpreedit-continue: No thanks,
guidedtour-tour-anonymouseditoracquisitionpostedit-title: Join
{{SITENAME}},
-guidedtour-tour-anonymouseditoracquisitionpostedit-description: Create
an account to edit and you can: ulliTrack your contributions/liliFollow
updates to your favorite pages/liliConnect with other Wikipedia
editors/liliGet early access to new features/li/ul,
+guidedtour-tour-anonymouseditoracquisitionpostedit-description: Create
an account to edit and you can:\nul\nliTrack your
contributions/li\nliFollow updates to your favorite pages/li\nliConnect
with other Wikipedia editors/li\nliGet early access to new
features/li\n/ul,
guidedtour-tour-anonymouseditoracquisitionpostedit-continue: Create my
account,
gettingstarted-task-toolbar-try-another-text-wikipedia: Try another
article ►,
gettingstarted-task-toolbar-no-suggested-page-wikipedia: Sorry. We
couldn't find more articles to be improved at the moment. Try again in a moment
or search for your own topics of interest.,
--
To view, visit https://gerrit.wikimedia.org/r/133613
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id60fbc156d6cb0817da85930abe2214bd480089f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
Gerrit-Branch: wmf/1.24wmf4
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: Swalling swall...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
