[MediaWiki-commits] [Gerrit] translatewiki[master]: Add the IA Upload tool
Samwilson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340084 )
Change subject: Add the IA Upload tool
..
Add the IA Upload tool
This adds translation configuration for the IA Upload tool that
uploads DjVu files from the Internet Archive to Commons.
Bug: T158522
Change-Id: Ib314efc90ca5cdadfc89f9d7de01547102602c22
---
M TranslateSettings.php
M bin/EXTERNAL-PROJECTS
M bin/REPONG-PROJECTS
A groups/Wikimedia/ia-upload.yaml
M repoconfig.commit.json
M repoconfig.json
6 files changed, 38 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/84/340084/1
diff --git a/TranslateSettings.php b/TranslateSettings.php
index f9bf344..3680f65 100644
--- a/TranslateSettings.php
+++ b/TranslateSettings.php
@@ -242,6 +242,7 @@
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/crosswatch.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/GapFinder.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/jquery.uls.yaml";
+$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/ia-upload.yaml";
$wgTranslateGroupAliases['out-jquery-uls'] = 'jquery-uls';
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/Pageviews.yaml";
$wgTranslateGroupFiles[] = "$GROUPS/Wikimedia/video2commons.yaml";
diff --git a/bin/EXTERNAL-PROJECTS b/bin/EXTERNAL-PROJECTS
index 4bdd657..633d1df 100644
--- a/bin/EXTERNAL-PROJECTS
+++ b/bin/EXTERNAL-PROJECTS
@@ -14,6 +14,7 @@
gapfinder
hivejs
huggle
+ia-upload
ihris
inaturalist
int-dcatap
diff --git a/bin/REPONG-PROJECTS b/bin/REPONG-PROJECTS
index 06a7adc..f9e7458 100644
--- a/bin/REPONG-PROJECTS
+++ b/bin/REPONG-PROJECTS
@@ -13,6 +13,7 @@
gapfinder
hivejs
huggle
+ia-upload
inaturalist
intuition
int-dcatap
diff --git a/groups/Wikimedia/ia-upload.yaml b/groups/Wikimedia/ia-upload.yaml
new file mode 100644
index 000..c90c513
--- /dev/null
+++ b/groups/Wikimedia/ia-upload.yaml
@@ -0,0 +1,17 @@
+---
+BASIC:
+ id: ia-upload
+ label: ia-upload
+ description: "{{Special:MyLanguage/Translations:Group
descriptions/ia-upload/en}}"
+ class: FileBasedMessageGroup
+ namespace: NS_WIKIMEDIA
+
+MANGLER:
+ class: StringMatcher
+ prefix: gapfinder-
+ patterns:
+- "*"
+
+FILES:
+ class: JsonFFS
+ sourcePattern: "%GROUPROOT%/ia-upload/i18n/%CODE%.json"
diff --git a/repoconfig.commit.json b/repoconfig.commit.json
index 5c32b98..222ed96 100644
--- a/repoconfig.commit.json
+++ b/repoconfig.commit.json
@@ -70,6 +70,15 @@
}
}
},
+ "ia-upload": {
+ "group": "ia-upload",
+ "repos": {
+ "ia-upload": {
+ "type": "github",
+ "url":
"g...@github.com:wikisource/ia-upload.git"
+ }
+ }
+ },
"intuition": {
"group": "tsint-*",
"export-threshold": 1,
diff --git a/repoconfig.json b/repoconfig.json
index 58c4add..a4f0ae0 100644
--- a/repoconfig.json
+++ b/repoconfig.json
@@ -70,6 +70,15 @@
}
}
},
+ "ia-upload": {
+ "group": "ia-upload",
+ "repos": {
+ "ia-upload": {
+ "type": "github",
+ "url":
"g...@github.com:wikisource/ia-upload.git"
+ }
+ }
+ },
"intuition": {
"group": "tsint-*",
"export-threshold": 1,
--
To view, visit https://gerrit.wikimedia.org/r/340084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib314efc90ca5cdadfc89f9d7de01547102602c22
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Samwilson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtendedSearch[master]: Fixed path to PHPUnit tests
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340085 )
Change subject: Fixed path to PHPUnit tests
..
Fixed path to PHPUnit tests
Change-Id: Ia23f3f6bda3c15efa059c8d3adc4b32bc11a4788
---
M src/Setup.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtendedSearch
refs/changes/85/340085/1
diff --git a/src/Setup.php b/src/Setup.php
index f004685..fb47834 100644
--- a/src/Setup.php
+++ b/src/Setup.php
@@ -66,7 +66,7 @@
* @return boolean
*/
public static function onUnitTestsList( &$paths ) {
- $paths[] = __DIR__ . '/tests/phpunit/';
+ $paths[] = dirname( __DIR__ ) . '/tests/phpunit/';
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/340085
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia23f3f6bda3c15efa059c8d3adc4b32bc11a4788
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::configcluster: replicate all of eqiad's etcd cluster t...
Giuseppe Lavagetto has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340083 ) Change subject: role::configcluster: replicate all of eqiad's etcd cluster to codfw .. role::configcluster: replicate all of eqiad's etcd cluster to codfw Change-Id: I1dcc40c70786d799df8a5de7634f16b8071e064e Note: this is just temporary while we rephase the prefixes everywhere. --- M hieradata/role/codfw/configcluster.yaml 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/83/340083/1 diff --git a/hieradata/role/codfw/configcluster.yaml b/hieradata/role/codfw/configcluster.yaml index fec770c..21cc5a3 100644 --- a/hieradata/role/codfw/configcluster.yaml +++ b/hieradata/role/codfw/configcluster.yaml @@ -3,11 +3,11 @@ value: standard profile::etcd::replication::origin: cluster_name: eqiad.wmnet - path: /conftool + path: / servers: - conf1001.eqiad.wmnet - conf1002.eqiad.wmnet - conf1003.eqiad.wmnet -profile::etcd::replication::destination_path: /eqiad.wmnet/conftool +profile::etcd::replication::destination_path: /eqiad.wmnet # only conf2002 is active profile::etcd::replication::active: false -- To view, visit https://gerrit.wikimedia.org/r/340083 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1dcc40c70786d799df8a5de7634f16b8071e064e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_private_data_report: Ignore wmf_checksums
Marostegui has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340082 ) Change subject: check_private_data_report: Ignore wmf_checksums .. check_private_data_report: Ignore wmf_checksums This table needs to be ignored on the report Change-Id: Ibb053700a1daf3eb60f54e08a1c2cd68d4445641 --- M modules/role/files/mariadb/check_private_data_report 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/role/files/mariadb/check_private_data_report b/modules/role/files/mariadb/check_private_data_report index fa232f6..5a5fc40 100755 --- a/modules/role/files/mariadb/check_private_data_report +++ b/modules/role/files/mariadb/check_private_data_report @@ -20,7 +20,7 @@ echo "Start time: $(date)" > "$REPORT_PATH" $PRIVATE_DATA >> "$REPORT_PATH" 2>&1 -DATA=$(/bin/egrep -v "^--|^Start time" -c "$REPORT_PATH") +DATA=$(/bin/egrep -v "^--|^Start time|wmf_checksums" -c "$REPORT_PATH") if [ "$DATA" -gt "0" ] then -- To view, visit https://gerrit.wikimedia.org/r/340082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibb053700a1daf3eb60f54e08a1c2cd68d4445641 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: check_private_data_report: Ignore wmf_checksums
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340082 ) Change subject: check_private_data_report: Ignore wmf_checksums .. check_private_data_report: Ignore wmf_checksums This table needs to be ignored on the report Change-Id: Ibb053700a1daf3eb60f54e08a1c2cd68d4445641 --- M modules/role/files/mariadb/check_private_data_report 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/82/340082/1 diff --git a/modules/role/files/mariadb/check_private_data_report b/modules/role/files/mariadb/check_private_data_report index fa232f6..5a5fc40 100755 --- a/modules/role/files/mariadb/check_private_data_report +++ b/modules/role/files/mariadb/check_private_data_report @@ -20,7 +20,7 @@ echo "Start time: $(date)" > "$REPORT_PATH" $PRIVATE_DATA >> "$REPORT_PATH" 2>&1 -DATA=$(/bin/egrep -v "^--|^Start time" -c "$REPORT_PATH") +DATA=$(/bin/egrep -v "^--|^Start time|wmf_checksums" -c "$REPORT_PATH") if [ "$DATA" -gt "0" ] then -- To view, visit https://gerrit.wikimedia.org/r/340082 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibb053700a1daf3eb60f54e08a1c2cd68d4445641 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove absense check from data_test.yaml
Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339606 )
Change subject: Remove absense check from data_test.yaml
..
Remove absense check from data_test.yaml
The cross verification script added in cd2557fbc50ebe79f78b54e2980490c65cf5f749
validates more account features. Remove the absense check from this script
since otherwise new features like the tracking of absent users with LDAP-only
access need to be covered twice. Also, the check never really worked anyway;
the cross-verification script found several absent users which were not
correctly
tracked.
The GID check can be kept since it prevents malformed group changes when adding
a new group.
Change-Id: I9168c5ab07a4b288ce89c9f31d697435b476bae2
---
M modules/admin/data/data_test.py
1 file changed, 0 insertions(+), 40 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
Rush: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/admin/data/data_test.py b/modules/admin/data/data_test.py
index e7f9488..d5476ca 100644
--- a/modules/admin/data/data_test.py
+++ b/modules/admin/data/data_test.py
@@ -4,56 +4,16 @@
# Tests to perform basic validation on data.yaml
from collections import Counter
-import itertools
import os
import unittest
import yaml
class DataTest(unittest.TestCase):
-def flatten(self, lists):
-"""flattens nested arrays"""
-return list(itertools.chain.from_iterable(lists))
-
-def all_assigned_users(self, admins):
-"""unique assigned users
-:param admins: hash from valid data.yaml
-:returns: list
-"""
-nested_users_list = map(
-lambda u: u['members'], admins['groups'].values()
-)
-return list(set(self.flatten(nested_users_list)))
-
def testDataDotYaml(self):
with open(os.path.join(os.path.dirname(__file__), 'data.yaml')) as f:
admins = yaml.safe_load(f)
-
-all_users = list(admins['users'])
-absented_group_members = admins['groups']['absent']['members']
-absented_users = [k for k, v in admins['users'].iteritems()
- if v.get('ensure', '') == 'absent']
-absented_users = [x for x in absented_users if x not in
- absented_group_members]
-grouped_users = self.all_assigned_users(admins)
-
-# ensure all assigned users exist
-non_existent_users = [u for u in grouped_users if u not in all_users]
-self.assertEqual(
-[],
-non_existent_users,
-'Users assigned that do not exist: %r' % non_existent_users
-)
-
-# ensure absented users are not assigned
-assigned_absented = set(grouped_users).intersection(
-set(absented_users))
-self.assertEqual(
-set(),
-assigned_absented,
-'Users absent but not in "absent" group: %r' % assigned_absented,
-)
# ensure no two groups uses the same gid
gids = filter(None, [
--
To view, visit https://gerrit.wikimedia.org/r/339606
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9168c5ab07a4b288ce89c9f31d697435b476bae2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Chasemp
Gerrit-Reviewer: Filippo Giunchedi
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Muehlenhoff
Gerrit-Reviewer: Rush
Gerrit-Reviewer: Volans
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...WikibaseLexeme[master]: [Outline proposal] Add LexemeRdfBuilder and LexemeRdfBuilder...
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340081 )
Change subject: [Outline proposal] Add LexemeRdfBuilder and
LexemeRdfBuilderFactory
..
[Outline proposal] Add LexemeRdfBuilder and LexemeRdfBuilderFactory
Bug: T157791
Change-Id: I0f68662d5d075955b9e8d2406f4e43f51cb0a261
---
A src/Rdf/LexemeRdfBuilder.php
A src/Rdf/LexemeRdfBuilderFactory.php
A src/Rdf/YesItsPossibleRdfBuilder.php
3 files changed, 140 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/81/340081/1
diff --git a/src/Rdf/LexemeRdfBuilder.php b/src/Rdf/LexemeRdfBuilder.php
new file mode 100644
index 000..630cb00
--- /dev/null
+++ b/src/Rdf/LexemeRdfBuilder.php
@@ -0,0 +1,47 @@
+
+ */
+class LexemeRdfBuilder implements EntityRdfBuilder {
+
+ /**
+* @var EntityRdfBuilder[]
+*/
+ private $builders;
+
+ /**
+* LexemeRdfBuilder constructor.
+* @param EntityRdfBuilder[] $builders
+*/
+ public function __construct( array $builders ) {
+ Assert::parameterElementType( EntityRdfBuilder::class,
$builders, '$builders' );
+
+ $this->builders = $builders;
+ }
+
+ /**
+* Adds specific entity
+*
+* @param EntityDocument $entity
+*/
+ public function addEntity(
+ EntityDocument $entity
+ ) {
+ Assert::parameterType( Lexeme::class, $entity, '$entity' );
+ foreach ( $this->builders as $builder ) {
+ $builder->addEntity( $entity );
+ }
+ }
+
+}
diff --git a/src/Rdf/LexemeRdfBuilderFactory.php
b/src/Rdf/LexemeRdfBuilderFactory.php
new file mode 100644
index 000..eb2ae3b
--- /dev/null
+++ b/src/Rdf/LexemeRdfBuilderFactory.php
@@ -0,0 +1,32 @@
+
+ */
+class LexemeRdfBuilderFactory {
+
+ /**
+* @param RdfWriter $writer
+* @param RdfVocabulary $vocabulary
+* @param int $flavorFlags
+* @return LexemeRdfBuilder
+*/
+ public function getBuilder(
+ RdfWriter $writer,
+ RdfVocabulary $vocabulary,
+ $flavorFlags
+ ) {
+ return new LexemeRdfBuilder(
+ [ new YesItsPossibleRdfBuilder( $vocabulary, $writer,
$flavorFlags ) ]
+ );
+ }
+
+}
diff --git a/src/Rdf/YesItsPossibleRdfBuilder.php
b/src/Rdf/YesItsPossibleRdfBuilder.php
new file mode 100644
index 000..a47bb6d
--- /dev/null
+++ b/src/Rdf/YesItsPossibleRdfBuilder.php
@@ -0,0 +1,61 @@
+
+ */
+class YesItsPossibleRdfBuilder implements EntityRdfBuilder {
+
+ /**
+* @var RdfVocabulary
+*/
+ private $vocabulary;
+
+ /**
+* @var RdfWriter
+*/
+ private $writer;
+
+ /**
+* @var int
+*/
+ private $flavor;
+
+ /**
+* @param RdfVocabulary $vocabulary
+* @param RdfWriter $writer
+* @param $flavor
+*/
+ public function __construct(
+ RdfVocabulary $vocabulary,
+ RdfWriter $writer,
+ $flavor
+ ) {
+ $this->vocabulary = $vocabulary;
+ $this->writer = $writer;
+ $this->produceWhat = $flavor;
+ }
+
+ /**
+* Add an entity to the RDF graph, including all supported structural
components
+* of the entity.
+*
+* @param EntityDocument $entity the entity to output.
+*/
+ public function addEntity( EntityDocument $entity ) {
+ $entityLName = $this->vocabulary->getEntityLName(
$entity->getId() );
+
+ $this->writer->about( RdfVocabulary::NS_ENTITY, $entityLName )
+ ->say( 'rdfs', 'label' )->text( 'Yes, It is possible
now!' );
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/340081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f68662d5d075955b9e8d2406f4e43f51cb0a261
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: conftool-data: convert to new format
Giuseppe Lavagetto has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339672 ) Change subject: conftool-data: convert to new format .. conftool-data: convert to new format Change-Id: Iff8acc338127a1d62f411985658473c1724e5352 --- A conftool-data/node/codfw.yaml A conftool-data/node/eqiad.yaml A conftool-data/node/esams.yaml A conftool-data/node/ulsfo.yaml A conftool-data/service/cache.yaml A conftool-data/service/mediawiki.yaml A conftool-data/service/misc.yaml A conftool-data/service/services.yaml 8 files changed, 1,127 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Verified; Looks good to me, approved diff --git a/conftool-data/node/codfw.yaml b/conftool-data/node/codfw.yaml new file mode 100644 index 000..44e6d22 --- /dev/null +++ b/conftool-data/node/codfw.yaml @@ -0,0 +1,306 @@ +codfw: + appserver: +mw2090.codfw.wmnet: [apache2,nginx] +mw2091.codfw.wmnet: [apache2,nginx] +mw2092.codfw.wmnet: [apache2,nginx] +mw2093.codfw.wmnet: [apache2,nginx] +mw2094.codfw.wmnet: [apache2,nginx] +mw2095.codfw.wmnet: [apache2,nginx] +mw2096.codfw.wmnet: [apache2,nginx] +mw2097.codfw.wmnet: [apache2,nginx] +mw2098.codfw.wmnet: [apache2,nginx] +mw2100.codfw.wmnet: [apache2,nginx] +mw2101.codfw.wmnet: [apache2,nginx] +mw2102.codfw.wmnet: [apache2,nginx] +mw2103.codfw.wmnet: [apache2,nginx] +mw2104.codfw.wmnet: [apache2,nginx] +mw2105.codfw.wmnet: [apache2,nginx] +mw2106.codfw.wmnet: [apache2,nginx] +mw2107.codfw.wmnet: [apache2,nginx] +mw2108.codfw.wmnet: [apache2,nginx] +mw2109.codfw.wmnet: [apache2,nginx] +mw2110.codfw.wmnet: [apache2,nginx] +mw2111.codfw.wmnet: [apache2,nginx] +mw2112.codfw.wmnet: [apache2,nginx] +mw2113.codfw.wmnet: [apache2,nginx] +mw2114.codfw.wmnet: [apache2,nginx] +mw2115.codfw.wmnet: [apache2,nginx] +mw2116.codfw.wmnet: [apache2,nginx] +mw2117.codfw.wmnet: [apache2,nginx] +mw2163.codfw.wmnet: [apache2,nginx] +mw2164.codfw.wmnet: [apache2,nginx] +mw2165.codfw.wmnet: [apache2,nginx] +mw2166.codfw.wmnet: [apache2,nginx] +mw2167.codfw.wmnet: [apache2,nginx] +mw2168.codfw.wmnet: [apache2,nginx] +mw2169.codfw.wmnet: [apache2,nginx] +mw2170.codfw.wmnet: [apache2,nginx] +mw2171.codfw.wmnet: [apache2,nginx] +mw2172.codfw.wmnet: [apache2,nginx] +mw2173.codfw.wmnet: [apache2,nginx] +mw2174.codfw.wmnet: [apache2,nginx] +mw2175.codfw.wmnet: [apache2,nginx] +mw2176.codfw.wmnet: [apache2,nginx] +mw2177.codfw.wmnet: [apache2,nginx] +mw2178.codfw.wmnet: [apache2,nginx] +mw2179.codfw.wmnet: [apache2,nginx] +mw2180.codfw.wmnet: [apache2,nginx] +mw2181.codfw.wmnet: [apache2,nginx] +mw2182.codfw.wmnet: [apache2,nginx] +mw2183.codfw.wmnet: [apache2,nginx] +mw2184.codfw.wmnet: [apache2,nginx] +mw2185.codfw.wmnet: [apache2,nginx] +mw2186.codfw.wmnet: [apache2,nginx] +mw2187.codfw.wmnet: [apache2,nginx] +mw2188.codfw.wmnet: [apache2,nginx] +mw2189.codfw.wmnet: [apache2,nginx] +mw2190.codfw.wmnet: [apache2,nginx] +mw2191.codfw.wmnet: [apache2,nginx] +mw2192.codfw.wmnet: [apache2,nginx] +mw2193.codfw.wmnet: [apache2,nginx] +mw2194.codfw.wmnet: [apache2,nginx] +mw2195.codfw.wmnet: [apache2,nginx] +mw2196.codfw.wmnet: [apache2,nginx] +mw2197.codfw.wmnet: [apache2,nginx] +mw2198.codfw.wmnet: [apache2,nginx] +mw2199.codfw.wmnet: [apache2,nginx] +mw2224.codfw.wmnet: [apache2,nginx] +mw2225.codfw.wmnet: [apache2,nginx] +mw2226.codfw.wmnet: [apache2,nginx] +mw2227.codfw.wmnet: [apache2,nginx] +mw2228.codfw.wmnet: [apache2,nginx] +mw2229.codfw.wmnet: [apache2,nginx] +mw2230.codfw.wmnet: [apache2,nginx] +mw2231.codfw.wmnet: [apache2,nginx] +mw2232.codfw.wmnet: [apache2,nginx] +mw2233.codfw.wmnet: [apache2,nginx] +mw2234.codfw.wmnet: [apache2,nginx] +mw2235.codfw.wmnet: [apache2,nginx] +mw2236.codfw.wmnet: [apache2,nginx] +mw2237.codfw.wmnet: [apache2,nginx] +mw2238.codfw.wmnet: [apache2,nginx] +mw2239.codfw.wmnet: [apache2,nginx] +mw2240.codfw.wmnet: [apache2,nginx] +mw2241.codfw.wmnet: [apache2,nginx] +mw2242.codfw.wmnet: [apache2,nginx] + api_appserver: +mw2120.codfw.wmnet: [apache2,nginx] +mw2121.codfw.wmnet: [apache2,nginx] +mw2122.codfw.wmnet: [apache2,nginx] +mw2123.codfw.wmnet: [apache2,nginx] +mw2124.codfw.wmnet: [apache2,nginx] +mw2125.codfw.wmnet: [apache2,nginx] +mw2126.codfw.wmnet: [apache2,nginx] +mw2127.codfw.wmnet: [apache2,nginx] +mw2128.codfw.wmnet: [apache2,nginx] +mw2129.codfw.wmnet: [apache2,nginx] +mw2130.codfw.wmnet: [apache2,nginx] +mw2131.codfw.wmnet: [apache2,nginx] +mw2132.codfw.wmnet: [apache2,nginx] +mw2133.codfw.wmnet: [apache2,nginx] +mw2134.codfw.wmnet: [apache2,nginx] +mw2135.codfw.wmnet:
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2034
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340080 ) Change subject: db-codfw.php: Depool db2034 .. db-codfw.php: Depool db2034 db2034 needs an alter table. Bug: T132416 Change-Id: I951a9698a2dc9b4b993a2d6ad226ced4e4a7ff4d --- M wmf-config/db-codfw.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index da44f55..9fa032f 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -94,7 +94,7 @@ 'sectionLoads' => [ 's1' => [ 'db2016' => 0, # B6 2.9TB 96GB, master - 'db2034' => 50, # A5 2.9TB 160GB, rc, log +# 'db2034' => 50, # A5 2.9TB 160GB, rc, log #T132416 'db2042' => 50, # C6 2.9TB 160GB, rc, log 'db2048' => 400, # C6 2.9TB 160GB, 'db2055' => 50, # D6 3.3TB 160GB, dump (inactive), vslow @@ -218,23 +218,23 @@ 'groupLoadsBySection' => [ 's1' => [ 'watchlist' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'recentchanges' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'recentchangeslinked' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'contributions' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'logpager' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'dump' => [ -- To view, visit https://gerrit.wikimedia.org/r/340080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I951a9698a2dc9b4b993a2d6ad226ced4e4a7ff4d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Depool db2034
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340080 ) Change subject: db-codfw.php: Depool db2034 .. db-codfw.php: Depool db2034 db2034 needs an alter table. Bug: T132416 Change-Id: I951a9698a2dc9b4b993a2d6ad226ced4e4a7ff4d --- M wmf-config/db-codfw.php 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/80/340080/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index da44f55..9fa032f 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -94,7 +94,7 @@ 'sectionLoads' => [ 's1' => [ 'db2016' => 0, # B6 2.9TB 96GB, master - 'db2034' => 50, # A5 2.9TB 160GB, rc, log +# 'db2034' => 50, # A5 2.9TB 160GB, rc, log #T132416 'db2042' => 50, # C6 2.9TB 160GB, rc, log 'db2048' => 400, # C6 2.9TB 160GB, 'db2055' => 50, # D6 3.3TB 160GB, dump (inactive), vslow @@ -218,23 +218,23 @@ 'groupLoadsBySection' => [ 's1' => [ 'watchlist' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'recentchanges' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'recentchangeslinked' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'contributions' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'logpager' => [ - 'db2034' => 1, +# 'db2034' => 1, 'db2042' => 1, ], 'dump' => [ -- To view, visit https://gerrit.wikimedia.org/r/340080 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I951a9698a2dc9b4b993a2d6ad226ced4e4a7ff4d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...translators[master]: Updating zotero repository from github to gerrit
Mine0901 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340079 ) Change subject: Updating zotero repository from github to gerrit .. Updating zotero repository from github to gerrit Change-Id: I5584f9efeb91cc1bc7e242d226b1afd07f5674cb --- A .ci/.gitignore A .ci/README.md A .ci/checkDeletedTxt.sh A .ci/checkTranslator.sh A .ci/helper.sh A .ci/jshintrc A .ci/package.json A .travis.yml M ACM Digital Library.js M ACS Publications.js M AIP.js M AMS MathSciNet.js M APN.ru.js M APS-Physics.js M APS.js M ARTFL Encyclopedie.js M ARTstor.js M ASCO Meeting Library.js M Ab Imperio.js A Access Medicine.js M Airiti.js M Alexander Street Press.js M AllAfrica.js M AlterNet.js M Aluka.js M Amazon.js M American Prospect.js M Annual Reviews.js M Atlanta Journal Constitution.js M Atypon Journals.js M AustLII and NZLII.js M Australian Dictionary of Biography.js M BAILII.js M BBC.js M BOCC.js M BOFiP-Impots.js M Bezneng Gajit.js M BibTeX.js M BioMed Central.js M Boston Review.js M Business Standard.js M CCfr (BnF).js M CNKI.js M CanLII.js M Christian Science Monitor.js A Citavi 5 XML.js M CiteSeer.js M CiteULike.js A Clinical Key.js M Code4Lib Journal.js M Copernicus.js M CrossRef.js M Cyberpresse.js M DAI-Zenon.js M DBLP Computer Science Bibliography.js M DEPATISnet.js M DOI.js M DPLA.js M DTU Orbit.js M DeGruyter.js M Defense Technical Information Center.js M Delpher.js M Demographic Research.js M Der Freitag.js M Deutsche Nationalbibliothek.js M Die Zeit.js M DigiZeitschriften.js M Digital Medievalist.js M Douban.js M DrugBank.ca.js M EPA National Library Catalog.js M ERIC.js M ESpacenet.js M Edinburgh University Press Journals.js M Electronic Colloquium on Computational Complexity.js M Elsevier Health Journals.js M Embedded Metadata.js M Encyclopedia of Chicago.js M Engineering Village.js M Epicurious.js M EurasiaNet.js M Eurogamer.js D European Educational Research Journal.js M FAZ.NET.js M Fachportal Padagogik.js M Factiva.js A Fairfax Australia.js M Figshare.js M Financial Times.js M Flickr.js M Foreign Affairs.js M Foreign Policy.js M Frontiers.js M Galegroup.js M Gallica.js M Game Studies.js M Gasyrlar Awazy.js M Gmail.js D Google Blogs.js M Google Books.js M Google Patents.js M Google Play.js M HAL Archives Ouvertes.js M HCSP.js M HLAS (historical).js M Haaretz.js M Handelszeitung.js M Harpers.js M Hathi Trust.js M HeinOnline.js M HighWire 2.0.js M Hoovers.js M Huff Post.js D Hurricane Digital Memory Bank.js D IASSIST Quarterly.js M IBISWorld.js M IEEE Computer Society.js M IEEE Xplore.js D ILO Labordoc.js M IMDb.js M INSPIRE.js A ISTC.js M In These Times.js M Informationssystem Medienpaedagogik.js M Insignia OPAC.js M Institute of Physics.js M Intellixir.js M Internet Archive.js M Isidore.js M JRC Publications Repository.js M JSTOR.js M Jahrbuch.js M Japan Times Online.js M Journal of Electronic Publishing.js M Journal of Extension.js M Juricaf.js M Juris.js M Kommersant.js M LA Times.js M La Croix.js M Lagen.nu.js D Landes Publishers.js M Le Devoir.js M Le Figaro.js D Le Monde Diplomatique_de.js A Le monde diplomatique.js M Legifrance.js M Library Catalog (Aleph).js M Library Catalog (Amicus).js M Library Catalog (BiblioCommons).js M Library Catalog (DRA).js M Library Catalog (Dynix).js M Library Catalog (GEAC).js M Library Catalog (InnoPAC).js M Library Catalog (PICA).js M Library Catalog (SIRSI eLibrary).js M Library Catalog (SIRSI).js M Library Catalog (TLCYouSeeMore).js M Library Catalog (VTLS).js M LiveJournal.js M London Review of Books.js M Lulu.js M MARC.js M MARCXML.js M MDPI Journals.js M Mailman.js M Mainichi Daily News.js M Matbugat.ru.js M Max Planck Institute for the History of Science Virtual Laboratory Library.js M Medium.js M MetaLib.js M MetaPress.js M Microbiology Society Journals.js D Microsoft Academic Search.js A Microsoft Academic.js M Musee du Louvre.js M NASA ADS.js M NCBI Nucleotide.js M NYTimes.com.js M NZZ.ch.js M Nagoya University OPAC.js M National Archives of the United States.js M National Bureau of Economic Research.js M National Gallery of Art - USA.js M National Library of Australia (new catalog).js M National Library of Australia - Australian Newspapers.js M National Library of Belarus.js M National Library of Norway.js M Nature Publishing Group.js M Neural Information Processing Systems.js D Newsnet.js A NewsnetTamedia.js M Nuclear Receptor Signaling.js M OCLC WorldCat FirstSearch.js M OECD.js M ORCID.js M OSTI Energy Citations.js M OZON.ru.js M OhioLINK.js M Old Bailey Online.js M Open Journal Systems.js M Open WorldCat.js M OpenEdition Books.js M Optical Society of America.js M Ovid.js M Oxford English Dictionary.js M Oxford University Press.js M Pleade.js M ProQuest PolicyFile.js M ProQuest.js M PubMed Central.js M Pubget.js M Publications du Quebec.js M R-Packages.js M RIS.js M RePEc - Econpapers.js M RePEc - IDEAS.js M Regeringskansliet.js M Rock, Paper, Shotgun.js M Roll Call.js
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2070
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340078 ) Change subject: db-codfw.php: Repool db2070 .. db-codfw.php: Repool db2070 db2070 finished its ALTER table Bug: T132416 Change-Id: I2911b6420b92f1f5b0e9b94654a5922bc50a7938 --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Marostegui: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index c877a54..da44f55 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -100,7 +100,7 @@ 'db2055' => 50, # D6 3.3TB 160GB, dump (inactive), vslow 'db2062' => 100, # B5 3.3TB 160GB, api 'db2069' => 100, # D6 3.3TB 160GB, api -# 'db2070' => 400, # C5 3.3TB 160GB + 'db2070' => 400, # C5 3.3TB 160GB ], 's2' => [ 'db2017' => 0, # B6 2.9TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/340078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2911b6420b92f1f5b0e9b94654a5922bc50a7938 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Marostegui Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-codfw.php: Repool db2070
Marostegui has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340078 ) Change subject: db-codfw.php: Repool db2070 .. db-codfw.php: Repool db2070 db2070 finished its ALTER table Bug: T132416 Change-Id: I2911b6420b92f1f5b0e9b94654a5922bc50a7938 --- M wmf-config/db-codfw.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/78/340078/1 diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php index c877a54..da44f55 100644 --- a/wmf-config/db-codfw.php +++ b/wmf-config/db-codfw.php @@ -100,7 +100,7 @@ 'db2055' => 50, # D6 3.3TB 160GB, dump (inactive), vslow 'db2062' => 100, # B5 3.3TB 160GB, api 'db2069' => 100, # D6 3.3TB 160GB, api -# 'db2070' => 400, # C5 3.3TB 160GB + 'db2070' => 400, # C5 3.3TB 160GB ], 's2' => [ 'db2017' => 0, # B6 2.9TB 96GB, master -- To view, visit https://gerrit.wikimedia.org/r/340078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2911b6420b92f1f5b0e9b94654a5922bc50a7938 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Marostegui ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: WbQuantity.fromWikibase: Fix typo in docstring
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339950 )
Change subject: WbQuantity.fromWikibase: Fix typo in docstring
..
WbQuantity.fromWikibase: Fix typo in docstring
WbQuanity -> WbQuantity
Change-Id: Id4303731c4dfb0c90a0b78c812a30aa20b3f6652
---
M pywikibot/__init__.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index f9782ce..279be25 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -720,13 +720,13 @@
@classmethod
def fromWikibase(cls, wb, site=None):
"""
-Create a WbQuanity from the JSON data given by the Wikibase API.
+Create a WbQuantity from the JSON data given by the Wikibase API.
@param wb: Wikibase JSON
@type wb: dict
@param site: The Wikibase site
@type site: pywikibot.site.DataSite
-@rtype: pywikibot.WbQuanity
+@rtype: pywikibot.WbQuantity
"""
amount = cls._todecimal(wb['amount'])
upperBound = cls._todecimal(wb.get('upperBound'))
--
To view, visit https://gerrit.wikimedia.org/r/339950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4303731c4dfb0c90a0b78c812a30aa20b3f6652
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Magul
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: proofreadpage.py: purge is skipped if redlinks are present
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339954 )
Change subject: proofreadpage.py: purge is skipped if redlinks are present
..
proofreadpage.py: purge is skipped if redlinks are present
Purge action is skipped when redlinks are present in the page list.
Postpone the search of redlinks after the purge action check.
Change-Id: I42d72fc721c90fca362e6d2b46f17488ef6782f4
---
M pywikibot/proofreadpage.py
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index a3dd4d4..84460db 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -544,14 +544,16 @@
self._parsed_text = self._get_parsed_page()
self._soup = BeautifulSoup(self._parsed_text, 'html.parser')
-attrs = {'class': re.compile('prp-pagequality|new')}
+# Do not search for "new" here, to avoid to skip purging if links
+# to non-existing pages are present.
+attrs = {'class': re.compile('prp-pagequality')}
# Search for attribute "prp-pagequality" in tags:
# Existing pages:
# m
#class="quality1 prp-pagequality-1"
-# or
+#
# Non-existing pages:
# https://gerrit.wikimedia.org/r/339954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42d72fc721c90fca362e6d2b46f17488ef6782f4
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Magul
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Revert "Set minimum requirement of websocket-client"
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339807 ) Change subject: Revert "Set minimum requirement of websocket-client" .. Revert "Set minimum requirement of websocket-client" Pywikibot does not depend on a particular version of websocket-client; in fact it does not even interact directly with its API. Stating a requirement on a particular version because some bug was fixed there has the disadvantage that it disallows previous versions to be used where the bug did not occur (< 0.27.0), and it also prevents backporting fixes (0.27.1 or 0.27.0~local_patch). This change reverts commit b96e7f57905751c08a0b5c5197d47dff3bcfe182. Change-Id: Ie2ba76cf0280dc095539c6b2648adc5e67085782 --- M requirements.txt M setup.py 2 files changed, 1 insertion(+), 5 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/requirements.txt b/requirements.txt index 83761b3..5c5183f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,9 +56,6 @@ google >= 1.7 socketIO-client<0.6.1 -# websocket-client>=0.33 is required by socketIO-client (T114913) -websocket-client>=0.33 - # scripts/script_wui.py: crontab diff --git a/setup.py b/setup.py index a1323c5..2ba209d 100644 --- a/setup.py +++ b/setup.py @@ -61,8 +61,7 @@ 'mwparserfromhell': ['mwparserfromhell>=0.3.3'], 'Tkinter': ['Pillow'], # 0.6.1 supports socket.io 1.0, but WMF is using 0.9 (T91393 and T85716) -# websocket-client>=0.33 is required by socketIO-client (T114913) -'rcstream': ['socketIO-client<0.6.1', 'websocket-client>=0.33'], +'rcstream': ['socketIO-client<0.6.1'], 'security': ['requests[security]', 'pycparser!=2.14'], 'mwoauth': ['mwoauth>=0.2.4'], 'html': ['BeautifulSoup4'], -- To view, visit https://gerrit.wikimedia.org/r/339807 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie2ba76cf0280dc095539c6b2648adc5e67085782 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Anoopchandu18 Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Magul Gerrit-Reviewer: Tim Landscheidt Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: WIP: Bug fixes in Async Token Transform Manager
Subramanya Sastry has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340066 )
Change subject: WIP: Bug fixes in Async Token Transform Manager
..
WIP: Bug fixes in Async Token Transform Manager
* Token chunk ranks were not being propagated properly on some
async code paths.
* TODO: Investigate test failures and fix.
Change-Id: Ic3a0379d287b9abb2de4917966472cc70c842687
---
M lib/wt2html/TokenTransformManager.js
M tests/parserTests-blacklist.js
2 files changed, 8 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/66/340066/1
diff --git a/lib/wt2html/TokenTransformManager.js
b/lib/wt2html/TokenTransformManager.js
index 2ccd12b..3c61c30 100644
--- a/lib/wt2html/TokenTransformManager.js
+++ b/lib/wt2html/TokenTransformManager.js
@@ -665,11 +665,12 @@
if (!resTokens.rank || resTokens.rank <
this.phaseEndRank) {
// There might still be
something to do for these
// tokens. Prepare them for the
workStack.
+ var oldRank = resTokens.rank;
resTokens = resTokens.slice();
// Don't apply earlier
transforms to results of a
// transformer to avoid loops
and keep the
// execution model sane.
- resTokens.rank = resTokens.rank
|| transformer.rank;
+ resTokens.rank = oldRank ||
transformer.rank;
// resTokens.rank = Math.max(
resTokens.rank || 0, transformer.rank );
if (res.async) {
resTokens.inAsyncMode =
true;
@@ -763,13 +764,14 @@
this.env.log('debug', 'maybeSyncReturn transforming', s.c, ret);
if (ret.tokens && ret.tokens.length > 0) {
if (s.res.tokens) {
- var oldRank = s.res.tokens.rank;
+ var newRank = ret.tokens.rank;
s.res.tokens = JSUtils.pushArray(s.res.tokens,
ret.tokens);
- if (oldRank && ret.tokens.rank) {
+ if (newRank) {
+ var oldRank = s.res.tokens.rank;
// Conservatively set the overall rank
to the minimum.
// This assumes that multi-pass
expansion for some tokens
// is safe. We might want to revisit
that later.
- s.res.tokens.rank = Math.min(oldRank,
ret.tokens.rank);
+ s.res.tokens.rank = Math.min(oldRank ||
newRank, newRank);
}
} else {
s.res = ret;
diff --git a/tests/parserTests-blacklist.js b/tests/parserTests-blacklist.js
index 93087ee..083233c 100644
--- a/tests/parserTests-blacklist.js
+++ b/tests/parserTests-blacklist.js
@@ -38,6 +38,7 @@
// ### DO NOT REMOVE THIS LINE ### (start of automatically-generated section)
// Blacklist for wt2html
+add("wt2html", "CircularRef", "[1]\n↑ ");
add("wt2html", "Extra newlines between heading and content are swallowed",
"b\n\n\n\na");
add("wt2html", "Non-word characters don't terminate tag names (T19663, T42670,
T54022)", "a\n\n
doesn't terminate \n\n doesn't terminate
\n\n doesn't
terminate \n\n
doesn't terminate \n\n");
add("wt2html", "Non-word characters don't terminate tag names + tidy",
"a\n\n doesn't
terminate \n\n
doesn't terminate \n\n doesn't terminate
\n\n doesn't
terminate \n\n");
@@ -359,6 +360,7 @@
// Blacklist for html2html
+add("html2html", "CircularRef", "[1]\n↑ ");
add("html2html", "Extra newlines followed by heading", "a\n\n\n\n b \n[/index.php?title=A&action=edit&redlink=1
a]\n\n\n\n b \n");
add("html2html", "Extra newlines between heading and content are swallowed",
" b \n[/index.php?title=A&action=edit&redlink=1
a]\n");
add("html2html", "Italics and possessives (1)", "obtained by [/index.php?title=Lunar_Prospector&action=edit&redlink=1
Lunar Prospector]'s gamma-ray spectrometer\n");
--
To view, visit https://gerrit.wikimedia.org/r/340066
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3a0379d287b9abb2de4917966472cc70c
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix @covers for FileBackend
Tim Starling has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340065 )
Change subject: Fix @covers for FileBackend
..
Fix @covers for FileBackend
It's up to the developer to choose the level of granularity they are
aspiring for in their test coverage. But that granularity level should be
reflected in @covers. When you have hundreds of lines of code testing a
single-line function (FileBackend::doOperation), that's a good hint that
something went wrong.
FileBackendTest is 2700 lines of code and appears to be aiming to test
the whole filebackend module. So I adjusted @covers to reflect that.
Change-Id: Iacd8cf475d1761c3b32c739983343619a9509d6b
---
M tests/phpunit/includes/filebackend/FileBackendTest.php
M tests/phpunit/includes/filebackend/SwiftFileBackendTest.php
2 files changed, 43 insertions(+), 56 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/65/340065/1
diff --git a/tests/phpunit/includes/filebackend/FileBackendTest.php
b/tests/phpunit/includes/filebackend/FileBackendTest.php
index c3d31d1..0a55760 100644
--- a/tests/phpunit/includes/filebackend/FileBackendTest.php
+++ b/tests/phpunit/includes/filebackend/FileBackendTest.php
@@ -4,6 +4,44 @@
* @group FileRepo
* @group FileBackend
* @group medium
+ *
+ * @covers FileBackend
+ *
+ * @covers CopyFileOp
+ * @covers CreateFileOp
+ * @covers DeleteFileOp
+ * @covers DescribeFileOp
+ * @covers FSFile
+ * @covers FSFileBackend
+ * @covers FSFileBackendDirList
+ * @covers FSFileBackendFileList
+ * @covers FSFileBackendList
+ * @covers FSFileOpHandle
+ * @covers FileBackendDBRepoWrapper
+ * @covers FileBackendError
+ * @covers FileBackendGroup
+ * @covers FileBackendMultiWrite
+ * @covers FileBackendStore
+ * @covers FileBackendStoreOpHandle
+ * @covers FileBackendStoreShardDirIterator
+ * @covers FileBackendStoreShardFileIterator
+ * @covers FileBackendStoreShardListIterator
+ * @covers FileJournal
+ * @covers FileOp
+ * @covers FileOpBatch
+ * @covers HTTPFileStreamer
+ * @covers LockManagerGroup
+ * @covers MemoryFileBackend
+ * @covers MoveFileOp
+ * @covers MySqlLockManager
+ * @covers NullFileJournal
+ * @covers NullFileOp
+ * @covers StoreFileOp
+ * @covers TempFSFile
+ *
+ * @covers FSLockManager
+ * @covers LockManager
+ * @covers NullLockManager
*/
class FileBackendTest extends MediaWikiTestCase {
@@ -89,7 +127,6 @@
/**
* @dataProvider provider_testIsStoragePath
-* @covers FileBackend::isStoragePath
*/
public function testIsStoragePath( $path, $isStorePath ) {
$this->assertEquals( $isStorePath, FileBackend::isStoragePath(
$path ),
@@ -114,7 +151,6 @@
/**
* @dataProvider provider_testSplitStoragePath
-* @covers FileBackend::splitStoragePath
*/
public function testSplitStoragePath( $path, $res ) {
$this->assertEquals( $res, FileBackend::splitStoragePath( $path
),
@@ -139,7 +175,6 @@
/**
* @dataProvider provider_normalizeStoragePath
-* @covers FileBackend::normalizeStoragePath
*/
public function testNormalizeStoragePath( $path, $res ) {
$this->assertEquals( $res, FileBackend::normalizeStoragePath(
$path ),
@@ -169,7 +204,6 @@
/**
* @dataProvider provider_testParentStoragePath
-* @covers FileBackend::parentStoragePath
*/
public function testParentStoragePath( $path, $res ) {
$this->assertEquals( $res, FileBackend::parentStoragePath(
$path ),
@@ -191,7 +225,6 @@
/**
* @dataProvider provider_testExtensionFromPath
-* @covers FileBackend::extensionFromPath
*/
public function testExtensionFromPath( $path, $res ) {
$this->assertEquals( $res, FileBackend::extensionFromPath(
$path ),
@@ -224,9 +257,6 @@
$this->tearDownFiles();
}
- /**
-* @covers FileBackend::doOperation
-*/
private function doTestStore( $op ) {
$backendName = $this->backendClass();
@@ -286,7 +316,6 @@
/**
* @dataProvider provider_testCopy
-* @covers FileBackend::doOperation
*/
public function testCopy( $op ) {
$this->backend = $this->singleBackend;
@@ -407,7 +436,6 @@
/**
* @dataProvider provider_testMove
-* @covers FileBackend::doOperation
*/
public function testMove( $op ) {
$this->backend = $this->singleBackend;
@@ -529,7 +557,6 @@
/**
* @dataProvider provider_testDelete
-* @covers FileBackend::doOperation
*/
public function testDelete( $op, $withSource, $okStatus ) {
$this->backend = $this->singleBackend;
@@ -621,7 +648,6 @@
/**
* @dataProvider provider_testDescribe
-* @c
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: Remove requirement on python3-ldap3
Hello Andrew Bogott,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/340064
to review the following change.
Change subject: puppet: Remove requirement on python3-ldap3
..
puppet: Remove requirement on python3-ldap3
Since c658ac3d3795d3186cce7f43ddd3a3cd0603e3a4,
modules/role/files/labs/puppet-enc.py no longer queries the LDAP
server and thus does not use ldap3 any longer. This change removes
the now obsolete requirement in the manifests.
Change-Id: I25e783fe6b4c59d04e024620bebd179ee8767a71
---
M modules/puppet/manifests/self/config.pp
M modules/role/manifests/puppetmaster/standalone.pp
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/340064/1
diff --git a/modules/puppet/manifests/self/config.pp
b/modules/puppet/manifests/self/config.pp
index 84e6f13..2f35c23 100644
--- a/modules/puppet/manifests/self/config.pp
+++ b/modules/puppet/manifests/self/config.pp
@@ -28,7 +28,7 @@
fail('Ldap puppet node definitions are no longer supported. The
$use_enc param must be true.')
}
-require_package('python3-yaml', 'python3-ldap3')
+require_package('python3-yaml')
include ::ldap::yamlcreds
diff --git a/modules/role/manifests/puppetmaster/standalone.pp
b/modules/role/manifests/puppetmaster/standalone.pp
index 8fd8516..58d1fe4 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -48,7 +48,7 @@
}
# Setup ENC
-require_package('python3-yaml', 'python3-ldap3')
+require_package('python3-yaml')
include ldap::yamlcreds
--
To view, visit https://gerrit.wikimedia.org/r/340064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I25e783fe6b4c59d04e024620bebd179ee8767a71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
Gerrit-Reviewer: Andrew Bogott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add surnames_redirects script
MarcAbonce has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340063 )
Change subject: Add surnames_redirects script
..
Add surnames_redirects script
Creates redirects based on name order.
For example Einstein, Albert to Albert Einstein or vice versa.
Addresses T57010
Change-Id: If23b11e5e1a93bc5c1d1fc60dd5038d27eb27e84
---
A scripts/surnames_redirects.py
1 file changed, 125 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/63/340063/1
diff --git a/scripts/surnames_redirects.py b/scripts/surnames_redirects.py
new file mode 100755
index 000..24215f0
--- /dev/null
+++ b/scripts/surnames_redirects.py
@@ -0,0 +1,125 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+"""
+Bot to create redirects based on name order.
+
+By default it creates a "Surnames, Given Names" redirect
+version of a given page where title is 2 or 3 titlecased words.
+
+Command-line arguments:
+
+¶ms;
+
+-surnames_lastCreates a "Given Names Surnames" redirect version of a
+ given page where title is "Surnames, Given Names".
+
+Example: "python surnames_redirects.py -start:B"
+"""
+#
+# (C) Pywikibot team, 2017
+#
+# Distributed under the terms of the MIT license.
+#
+from __future__ import unicode_literals
+
+from difflib import SequenceMatcher
+
+import pywikibot
+from pywikibot import i18n, pagegenerators
+from pywikibot.bot import FollowRedirectPageBot, ExistingPageBot
+
+docuReplacements = {
+'¶ms;': pagegenerators.parameterHelp
+}
+
+
+class SurnamesBot(FollowRedirectPageBot, ExistingPageBot):
+
+"""Surnames Bot."""
+
+def __init__(self, generator, **kwargs):
+"""Constructor.
+
+Parameters:
+@param generator: The page generator that determines on which
pages to work.
+@kwarg surnames-last: Redirect "Surnames, Given Names" to "Given
Names Surnames".
+"""
+self.availableOptions.update({
+'surnames_last': False,
+})
+
+super(SurnamesBot, self).__init__(generator=generator, **kwargs)
+
+def treat_page(self):
+"""Surnames redirects of the current page."""
+if self.current_page.isRedirectPage():
+return
+
+page_t = self.current_page.title()
+site = self.current_page.site
+
+possible_redirects = []
+if self.getOption('surnames_last'):
+name_parts = page_t.split(', ')
+if len(name_parts) == 2 and len(page_t.split(' ')) <= 3:
+possible_redirects.append(name_parts[1] + ' ' + name_parts[0])
+else:
+name_parts = page_t.split()
+if len(name_parts) == 2 and page_t == page_t.title():
+possible_redirects.append(name_parts[1] + ', ' + name_parts[0])
+elif len(name_parts) == 3:
+"""page title should be titlecased or at least close to
titlecased"""
+if len(SequenceMatcher(None, page_t,
page_t.title()).get_matching_blocks()) <= 3:
+possible_redirects.append(name_parts[1] + ' ' +
name_parts[2] + ', ' + name_parts[0])
+possible_redirects.append(name_parts[2] + ', ' +
name_parts[0] + ' ' + name_parts[1])
+
+for possible_name in possible_redirects:
+page_cap = pywikibot.Page(site, possible_name)
+if page_cap.exists():
+pywikibot.output(u'%s already exists, skipping...\n'
+ % page_cap.title(asLink=True))
+else:
+pywikibot.output(u'%s doesn\'t exist'
+ % page_cap.title(asLink=True))
+choice = pywikibot.input_choice(
+u'Do you want to create a redirect?',
+[('Yes', 'y'), ('No', 'n')], 'n')
+if choice == 'y':
+comment = i18n.twtranslate(
+site,
+'capitalize_redirects-create-redirect',
+{'to': page_t})
+page_cap.set_redirect_target(self.current_page,
create=True,
+ summary=comment)
+
+
+def main(*args):
+"""
+Process command line arguments and invoke bot.
+
+If args is an empty list, sys.argv is used.
+
+@param args: command line arguments
+@type args: list of unicode
+"""
+options = {}
+
+local_args = pywikibot.handle_args(args)
+genFactory = pagegenerators.GeneratorFactory()
+
+for arg in local_args:
+if arg == '-surnames_last':
+options['surnames_last'] = True
+else:
+genFactory.handleArg(arg)
+
+gen = genFactory.getCombinedGenerator()
+if gen:
+preloadingGen = pagegenerators.PreloadingGenerator(gen)
+bot = SurnamesBot(preloadingGen, **options)
+bot.run()
+else:
+pywikibo
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix @covers for (non-integration) parser tests
Tim Starling has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340062 )
Change subject: Fix @covers for (non-integration) parser tests
..
Fix @covers for (non-integration) parser tests
You have to allow tests to cover private Parser methods that they
execute. Private methods will never have separate tests.
Change-Id: Ic842e2be4675f505dc26d1d3e1dd9000401df46c
---
M tests/phpunit/includes/parser/ParserMethodsTest.php
M tests/phpunit/includes/parser/ParserPreloadTest.php
M tests/phpunit/includes/parser/TagHooksTest.php
3 files changed, 50 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/62/340062/1
diff --git a/tests/phpunit/includes/parser/ParserMethodsTest.php
b/tests/phpunit/includes/parser/ParserMethodsTest.php
index 5e00384..ae58d1c 100644
--- a/tests/phpunit/includes/parser/ParserMethodsTest.php
+++ b/tests/phpunit/includes/parser/ParserMethodsTest.php
@@ -2,8 +2,8 @@
/**
* @group Database
+ * @covers Parser
*/
-
class ParserMethodsTest extends MediaWikiLangTestCase {
public static function providePreSaveTransform() {
@@ -19,7 +19,6 @@
/**
* @dataProvider providePreSaveTransform
-* @covers Parser::preSaveTransform
*/
public function testPreSaveTransform( $text, $expected ) {
global $wgParser;
@@ -63,7 +62,6 @@
/**
* @dataProvider provideStripOuterParagraph
-* @covers Parser::stripOuterParagraph
*/
public function testStripOuterParagraph( $text, $expected ) {
$this->assertEquals( $expected, Parser::stripOuterParagraph(
$text ) );
@@ -73,7 +71,6 @@
* @expectedException MWException
* @expectedExceptionMessage Parser state cleared while parsing.
* Did you call Parser::parse recursively?
-* @covers Parser::lock
*/
public function testRecursiveParse() {
global $wgParser;
@@ -90,9 +87,6 @@
return 'bar';
}
- /**
-* @covers Parser::callParserFunction
-*/
public function testCallParserFunction() {
global $wgParser;
@@ -111,7 +105,7 @@
}
/**
-* @covers Parser::parse
+* @covers Parser
* @covers ParserOutput::getSections
*/
public function testGetSections() {
@@ -155,8 +149,6 @@
/**
* @dataProvider provideNormalizeLinkUrl
-* @covers Parser::normalizeLinkUrl
-* @covers Parser::normalizeUrlComponent
*/
public function testNormalizeLinkUrl( $explanation, $url, $expected ) {
$this->assertEquals( $expected, Parser::normalizeLinkUrl( $url
), $explanation );
diff --git a/tests/phpunit/includes/parser/ParserPreloadTest.php
b/tests/phpunit/includes/parser/ParserPreloadTest.php
index 414ab8f..7707395 100644
--- a/tests/phpunit/includes/parser/ParserPreloadTest.php
+++ b/tests/phpunit/includes/parser/ParserPreloadTest.php
@@ -2,6 +2,30 @@
/**
* Basic tests for Parser::getPreloadText
* @author Antoine Musso
+ *
+ * @covers Parser
+ * @covers StripState
+ *
+ * @covers Preprocessor_DOM
+ * @covers PPDStack
+ * @covers PPDStackElement
+ * @covers PPDPart
+ * @covers PPFrame_DOM
+ * @covers PPTemplateFrame_DOM
+ * @covers PPCustomFrame_DOM
+ * @covers PPNode_DOM
+ *
+ * @covers Preprocessor_Hash
+ * @covers PPDStack_Hash
+ * @covers PPDStackElement_Hash
+ * @covers PPDPart_Hash
+ * @covers PPFrame_Hash
+ * @covers PPTemplateFrame_Hash
+ * @covers PPCustomFrame_Hash
+ * @covers PPNode_Hash_Tree
+ * @covers PPNode_Hash_Text
+ * @covers PPNode_Hash_Array
+ * @covers PPNode_Hash_Attr
*/
class ParserPreloadTest extends MediaWikiTestCase {
/**
@@ -37,16 +61,10 @@
unset( $this->title );
}
- /**
-* @covers Parser::getPreloadText
-*/
public function testPreloadSimpleText() {
$this->assertPreloaded( 'simple', 'simple' );
}
- /**
-* @covers Parser::getPreloadText
-*/
public function testPreloadedPreIsUnstripped() {
$this->assertPreloaded(
'monospaced',
@@ -55,9 +73,6 @@
);
}
- /**
-* @covers Parser::getPreloadText
-*/
public function testPreloadedNowikiIsUnstripped() {
$this->assertPreloaded(
'[[Dummy title]]',
diff --git a/tests/phpunit/includes/parser/TagHooksTest.php
b/tests/phpunit/includes/parser/TagHooksTest.php
index 2a4a4ec..12936ee 100644
--- a/tests/phpunit/includes/parser/TagHooksTest.php
+++ b/tests/phpunit/includes/parser/TagHooksTest.php
@@ -3,6 +3,30 @@
/**
* @group Database
* @group Parser
+ *
+ * @covers Parser
+ * @covers StripState
+ *
+ * @covers Preprocessor_DOM
+ * @covers PPDStack
+ * @covers PPDStac
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Fix @covers for BalancerTest
Tim Starling has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340061 )
Change subject: Fix @covers for BalancerTest
..
Fix @covers for BalancerTest
This test is intended to cover the whole file, not just one method.
Change-Id: Ice800ce467e030e8264db96e19feadf9b68afb9a
---
M tests/phpunit/includes/tidy/BalancerTest.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/61/340061/1
diff --git a/tests/phpunit/includes/tidy/BalancerTest.php
b/tests/phpunit/includes/tidy/BalancerTest.php
index d93181c..8a4f662 100644
--- a/tests/phpunit/includes/tidy/BalancerTest.php
+++ b/tests/phpunit/includes/tidy/BalancerTest.php
@@ -13,7 +13,12 @@
}
/**
-* @covers MediaWiki\Tidy\Balancer::balance
+* @covers MediaWiki\Tidy\Balancer
+* @covers MediaWiki\Tidy\BalanceSets
+* @covers MediaWiki\Tidy\BalanceElement
+* @covers MediaWiki\Tidy\BalanceStack
+* @covers MediaWiki\Tidy\BalanceMarker
+* @covers MediaWiki\Tidy\BalanceActiveFormattingElements
* @dataProvider provideBalancerTests
*/
public function testBalancer( $description, $input, $expected, $useTidy
) {
--
To view, visit https://gerrit.wikimedia.org/r/340061
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice800ce467e030e8264db96e19feadf9b68afb9a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Tim Starling
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WebStart.php: Update the file's doc comment
PleaseStand has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340060 ) Change subject: WebStart.php: Update the file's doc comment .. WebStart.php: Update the file's doc comment The doc comment did not reflect the removal of MW_NO_SETUP in edc9edbc769b570c, or the fact that Setup.php no longer loads AutoLoader.php or GlobalFunctions.php. Change-Id: I19a12fd83e369828b9e08176ddf3bfca16aae465 --- M includes/WebStart.php 1 file changed, 4 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/60/340060/1 diff --git a/includes/WebStart.php b/includes/WebStart.php index 861e532..2f0db39 100644 --- a/includes/WebStart.php +++ b/includes/WebStart.php @@ -1,12 +1,11 @@ https://gerrit.wikimedia.org/r/340060 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19a12fd83e369828b9e08176ddf3bfca16aae465 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: PleaseStand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Fix test for enabled PHP module mcrypt
Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340059 )
Change subject: Tools: Fix test for enabled PHP module mcrypt
..
Tools: Fix test for enabled PHP module mcrypt
The current test erroneously assumes that the PHP SAPIs are always
called "apache2" and "cli". This change amends the test to check the
actually installed PHP SAPIs.
Bug: T159022
Change-Id: I6a3dabcc6ea325eeb5d9a37054bacb819c5d6994
---
M modules/toollabs/manifests/exec_environ.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/340059/1
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index ebd3bfb..7bacac6 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -400,7 +400,7 @@
# Enable PHP mcrypt module (T97857).
exec { 'tools_enable_php_mcrypt_module':
command => '/usr/sbin/php5enmod mcrypt',
-unless => '/usr/sbin/php5query -s apache2 -m mcrypt &&
/usr/sbin/php5query -s cli -m mcrypt',
+unless => '/usr/bin/php5query -S | /usr/bin/xargs -rI {}
/usr/sbin/php5query -s {} -m mcrypt',
require => Package['php5-cli', 'php5-mcrypt'],
}
} elsif $::lsbdistcodename == 'jessie' {
--
To view, visit https://gerrit.wikimedia.org/r/340059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a3dabcc6ea325eeb5d9a37054bacb819c5d6994
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Changed Italian "Form" namespace from "Modulo" to "Maschera"
Yaron Koren has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340057 ) Change subject: Changed Italian "Form" namespace from "Modulo" to "Maschera" .. Changed Italian "Form" namespace from "Modulo" to "Maschera" ...to avoid conflict with "Modulo" used for the Scribunto "Module" namespace. Change-Id: I2837a2272b128e3e7a141d48ad308d7ea34c78ec --- M languages/PF_Namespaces.php 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: Yaron Koren: Looks good to me, approved jenkins-bot: Verified diff --git a/languages/PF_Namespaces.php b/languages/PF_Namespaces.php index c8a1b51..b38537b 100644 --- a/languages/PF_Namespaces.php +++ b/languages/PF_Namespaces.php @@ -97,11 +97,15 @@ ); /** - * @author Melos + * @author Michele.Fella + * We can't use "Modulo" here because it's used already for + * the Scribunto "Module" namespace. + * "Maschera" is an alternate term, short for "Maschera di + * inserimento". */ $namespaceNames['it'] = array( - PF_NS_FORM => 'Modulo', - PF_NS_FORM_TALK => 'Discussione_modulo' + PF_NS_FORM => 'Maschera', + PF_NS_FORM_TALK => 'Discussione_maschera' ); /** -- To view, visit https://gerrit.wikimedia.org/r/340057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2837a2272b128e3e7a141d48ad308d7ea34c78ec Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Yaron Koren Gerrit-Reviewer: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Tools: Unpuppetize sql
Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340058 )
Change subject: Tools: Unpuppetize sql
..
Tools: Unpuppetize sql
sql is now deployed as part of misctools.
Change-Id: I98ac8d4952a6cdbadfba8af42c91a41f585645be
---
D modules/toollabs/files/sql
M modules/toollabs/manifests/exec_environ.pp
2 files changed, 0 insertions(+), 128 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/340058/1
diff --git a/modules/toollabs/files/sql b/modules/toollabs/files/sql
deleted file mode 100755
index 65f5314..000
--- a/modules/toollabs/files/sql
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/bash
-
-# this tool allow you to connect quickly to sql database
-# it should work for all newbies
-
-verbose=0
-
-function Log {
-if [ $verbose -eq 1 ];then
- echo "$1"
-fi
-}
-
-if [ $# -lt 1 ];then
-echo "Usage: \"sql [-vh]\" type sql --help for
more help"
-exit 0
-fi
-
-if [ "$1" = "-h" ] || [ "$1" == "--help" ];then
-echo "Usage: sql [_p] [-vh] [command(s)]"
- echo
- echo "This tool allows you to easily open a connection to sql database
without having to provide the credentials or a database host server"
- echo "Example: sql frwiki_p"
- echo
- echo "Parameters:"
- echo " -v: verbose - produce various information about the resolution
of db"
- echo
- echo "Report bugs to phabricator: https://phabricator.wikimedia.org";
- exit 0
-fi
-
-for i
-do
- if [ "$i" = "-v" ] || [ "$i" = "--verbose" ]
- then
- verbose=1
- fi
-done
-
-if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ]
-then
- Log "WARNING: There is no configuration file for mysql to use, you will
probably be unable to access the database"
-fi
-
-param=""
-# check if the user has a replica file
-if [ -f ~/replica.my.cnf ];then
-param=" --defaults-file=~/replica.my.cnf"
-else
-if [ ! -f ~/.my.cnf ];then
-param=" -p"
-fi
-fi
-
-server="enwiki.labsdb"
-db="enwiki_p"
-
-case "$1" in
-"en" | "enwiki" | "enwiki_p")
-server="enwiki.labsdb"
-db="enwiki_p"
-;;
-"de" | "dewiki" | "dewiki_p")
-server="dewiki.labsdb"
-db="dewiki_p"
-;;
-"fr" | "frwiki" | "frwiki_p")
-server="frwiki.labsdb"
-db="frwiki_p"
-;;
-"cs" | "cswiki" | "cswiki_p")
-server="cswiki.labsdb"
-db="cswiki_p"
-;;
-"commons" | "commonswiki" | "commonswiki_p")
-server="commonswiki.labsdb"
-db="commonswiki_p"
-;;
-"wikidata" | "wikidatawiki" | "wikidatawiki_p")
-server="wikidatawiki.labsdb"
-db="wikidatawiki_p"
-;;
-"meta" | "meta_p")
-# Not to confuse with metawiki[_p]
-#
https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Metadata_database
-server="s7.labsdb"
-db="meta_p"
-;;
-"local")
-server=tools-db
-db=""
-if [ -f ~/.my.cnf ];then
- param=""
-fi
- ;;
- *)
- # we don't know what the database is so we check if it exist first
- Log "This database name is not known by sql script, fallback to dblist
resolution"
- db="${1%_p}_p"
- server="${db%_p}.labsdb"
- if getent hosts -- "$server" > /dev/null
- then
- Log "Resolved to $server $db"
- else
- echo "Could not find requested database"
-if [ "$db" != "$1" ]; then
-echo 'Make sure to ask for a db in format of _p'
-fi
- exit 1
- fi
- ;;
-esac
-
-shift
-Log "Connecting to $server"
-if [ $# -lt 1 ]; then
- exec mysql $param -h $server $db "$@"
-else
- echo "$@" | mysql $param -h $server $db
-fi
diff --git a/modules/toollabs/manifests/exec_environ.pp
b/modules/toollabs/manifests/exec_environ.pp
index ebd3bfb..a4d68bf 100644
--- a/modules/toollabs/manifests/exec_environ.pp
+++ b/modules/toollabs/manifests/exec_environ.pp
@@ -429,14 +429,6 @@
ensure => latest,
}
-file { '/usr/bin/sql':
-ensure => file,
-owner => 'root',
-group => 'root',
-mode => '0755',
-source => 'puppet:///modules/toollabs/sql',
-}
-
sysctl::parameters { 'tool labs':
values => {
'vm.overcommit_memory' => 2,
--
To view, visit https://gerrit.wikimedia.org/r/340058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I98ac8d4952a6cdbadfba8af42c91a41f585645be
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Tim Landscheidt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Changed Italian "Form" namespace from "Modulo" to "Maschera"
Yaron Koren has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340057 ) Change subject: Changed Italian "Form" namespace from "Modulo" to "Maschera" .. Changed Italian "Form" namespace from "Modulo" to "Maschera" ...to avoid conflict with "Modulo" used for the Scribunto "Module" namespace. Change-Id: I2837a2272b128e3e7a141d48ad308d7ea34c78ec --- M languages/PF_Namespaces.php 1 file changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/57/340057/2 diff --git a/languages/PF_Namespaces.php b/languages/PF_Namespaces.php index c8a1b51..b38537b 100644 --- a/languages/PF_Namespaces.php +++ b/languages/PF_Namespaces.php @@ -97,11 +97,15 @@ ); /** - * @author Melos + * @author Michele.Fella + * We can't use "Modulo" here because it's used already for + * the Scribunto "Module" namespace. + * "Maschera" is an alternate term, short for "Maschera di + * inserimento". */ $namespaceNames['it'] = array( - PF_NS_FORM => 'Modulo', - PF_NS_FORM_TALK => 'Discussione_modulo' + PF_NS_FORM => 'Maschera', + PF_NS_FORM_TALK => 'Discussione_maschera' ); /** -- To view, visit https://gerrit.wikimedia.org/r/340057 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2837a2272b128e3e7a141d48ad308d7ea34c78ec Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Yaron Koren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ShoutWikiAds[master]: Organized CSS for each skin into their own folders
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339965 )
Change subject: Organized CSS for each skin into their own folders
..
Organized CSS for each skin into their own folders
Change-Id: Ie52c0388cf6e99964b79a7e44a3c68a7723dbe6b
---
R css/aurora/aurora-leaderboard-ad.css
R css/aurora/aurora-skyscraper-ad.css
R css/cologneblue/cologneblue-leaderboard-ad.css
R css/home/home-leaderboard-bottom-ad.css
R css/home/home-skyscraper-ad.css
R css/metrolook/metrolook-button-ad.css
R css/metrolook/metrolook-leaderboard-ad.css
R css/metrolook/metrolook-wide-skyscraper-ad.less
R css/modern/modern-button-ad.css
R css/modern/modern-leaderboard-ad.css
R css/monaco/monaco-ads.css
R css/monobook/monobook-button-ad.css
R css/monobook/monobook-skyscraper-ad.css
R css/quartz/quartz-square-ad.css
R css/refreshed/refreshed-button-ad.css
R css/refreshed/refreshed.css
R css/truglass/truglass-leaderboard-ad.css
R css/vector/vector-button-ad.css
R css/vector/vector-skyscraper-ad.css
M extension.json
20 files changed, 20 insertions(+), 20 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/css/aurora-leaderboard-ad.css
b/css/aurora/aurora-leaderboard-ad.css
similarity index 100%
rename from css/aurora-leaderboard-ad.css
rename to css/aurora/aurora-leaderboard-ad.css
diff --git a/css/aurora-skyscraper-ad.css b/css/aurora/aurora-skyscraper-ad.css
similarity index 100%
rename from css/aurora-skyscraper-ad.css
rename to css/aurora/aurora-skyscraper-ad.css
diff --git a/css/cologneblue-leaderboard-ad.css
b/css/cologneblue/cologneblue-leaderboard-ad.css
similarity index 100%
rename from css/cologneblue-leaderboard-ad.css
rename to css/cologneblue/cologneblue-leaderboard-ad.css
diff --git a/css/home-leaderboard-bottom-ad.css
b/css/home/home-leaderboard-bottom-ad.css
similarity index 100%
rename from css/home-leaderboard-bottom-ad.css
rename to css/home/home-leaderboard-bottom-ad.css
diff --git a/css/home-skyscraper-ad.css b/css/home/home-skyscraper-ad.css
similarity index 100%
rename from css/home-skyscraper-ad.css
rename to css/home/home-skyscraper-ad.css
diff --git a/css/metrolook-button-ad.css b/css/metrolook/metrolook-button-ad.css
similarity index 100%
rename from css/metrolook-button-ad.css
rename to css/metrolook/metrolook-button-ad.css
diff --git a/css/metrolook-leaderboard-ad.css
b/css/metrolook/metrolook-leaderboard-ad.css
similarity index 100%
rename from css/metrolook-leaderboard-ad.css
rename to css/metrolook/metrolook-leaderboard-ad.css
diff --git a/css/metrolook-wide-skyscraper-ad.less
b/css/metrolook/metrolook-wide-skyscraper-ad.less
similarity index 100%
rename from css/metrolook-wide-skyscraper-ad.less
rename to css/metrolook/metrolook-wide-skyscraper-ad.less
diff --git a/css/modern-button-ad.css b/css/modern/modern-button-ad.css
similarity index 100%
rename from css/modern-button-ad.css
rename to css/modern/modern-button-ad.css
diff --git a/css/modern-leaderboard-ad.css
b/css/modern/modern-leaderboard-ad.css
similarity index 100%
rename from css/modern-leaderboard-ad.css
rename to css/modern/modern-leaderboard-ad.css
diff --git a/css/monaco-ads.css b/css/monaco/monaco-ads.css
similarity index 100%
rename from css/monaco-ads.css
rename to css/monaco/monaco-ads.css
diff --git a/css/monobook-button-ad.css b/css/monobook/monobook-button-ad.css
similarity index 100%
rename from css/monobook-button-ad.css
rename to css/monobook/monobook-button-ad.css
diff --git a/css/monobook-skyscraper-ad.css
b/css/monobook/monobook-skyscraper-ad.css
similarity index 100%
rename from css/monobook-skyscraper-ad.css
rename to css/monobook/monobook-skyscraper-ad.css
diff --git a/css/quartz-square-ad.css b/css/quartz/quartz-square-ad.css
similarity index 100%
rename from css/quartz-square-ad.css
rename to css/quartz/quartz-square-ad.css
diff --git a/css/refreshed-button-ad.css b/css/refreshed/refreshed-button-ad.css
similarity index 100%
rename from css/refreshed-button-ad.css
rename to css/refreshed/refreshed-button-ad.css
diff --git a/css/refreshed.css b/css/refreshed/refreshed.css
similarity index 100%
rename from css/refreshed.css
rename to css/refreshed/refreshed.css
diff --git a/css/truglass-leaderboard-ad.css
b/css/truglass/truglass-leaderboard-ad.css
similarity index 100%
rename from css/truglass-leaderboard-ad.css
rename to css/truglass/truglass-leaderboard-ad.css
diff --git a/css/vector-button-ad.css b/css/vector/vector-button-ad.css
similarity index 100%
rename from css/vector-button-ad.css
rename to css/vector/vector-button-ad.css
diff --git a/css/vector-skyscraper-ad.css b/css/vector/vector-skyscraper-ad.css
similarity index 100%
rename from css/vector-skyscraper-ad.css
rename to css/vector/vector-skyscraper-ad.css
diff --git a/extension.json b/extension.json
index c14e3ee..2757474 100644
--- a/extension.json
+++ b/extension.json
@@ -1,6 +1,6 @@
{
"n
[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Remove unused clearfix CSS module from Special:UploadAvatar
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339929 ) Change subject: Remove unused clearfix CSS module from Special:UploadAvatar .. Remove unused clearfix CSS module from Special:UploadAvatar Bug: T156561 Change-Id: I912ff3d5db40ce808fface4298d8b603bc5b --- M UserProfile/SpecialUploadAvatar.php 1 file changed, 1 insertion(+), 4 deletions(-) Approvals: SamanthaNguyen: Looks good to me, approved jenkins-bot: Verified diff --git a/UserProfile/SpecialUploadAvatar.php b/UserProfile/SpecialUploadAvatar.php index fa0f9ad..01c83df 100644 --- a/UserProfile/SpecialUploadAvatar.php +++ b/UserProfile/SpecialUploadAvatar.php @@ -46,10 +46,7 @@ $out = $this->getOutput(); // Add CSS - $out->addModuleStyles( array( - 'ext.socialprofile.clearfix', - 'ext.socialprofile.userprofile.css' - ) ); + $out->addModuleStyles( 'ext.socialprofile.userprofile.css' ); // Let the parent class do most of the heavy lifting. parent::execute( $params ); -- To view, visit https://gerrit.wikimedia.org/r/339929 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I912ff3d5db40ce808fface4298d8b603bc5b Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/SocialProfile Gerrit-Branch: master Gerrit-Owner: Jack Phoenix Gerrit-Reviewer: Lewis Cawte Gerrit-Reviewer: SamanthaNguyen 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...Gamepress[master]: Separate preferences CSS into it's own module and file
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340047 )
Change subject: Separate preferences CSS into it's own module and file
..
Separate preferences CSS into it's own module and file
Change-Id: Ibe6218d6e44280913f2062d48a718c99b5caf83e
---
A resources/css/special.preferences.css
M resources/css/style.css
M skin.json
3 files changed, 96 insertions(+), 92 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/css/special.preferences.css
b/resources/css/special.preferences.css
new file mode 100644
index 000..d379bd4
--- /dev/null
+++ b/resources/css/special.preferences.css
@@ -0,0 +1,90 @@
+/** Delicious copypasta from Monobook's main.css */
+/* js pref toc */
+#preftoc {
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ clear: both;
+}
+#preftoc li {
+ /*background-color: #f0f0f0;*/
+ color: #000;
+}
+#preftoc li {
+ margin: 1px -2px 1px 2px;
+ float: left;
+ padding: 2px 0 3px 0;
+ border: 1px solid #fff;
+ border-right-color: #716f64;
+ border-bottom: 0;
+ position: relative;
+ white-space: nowrap;
+ list-style-type: none;
+ list-style-image: none;
+ z-index: 3;
+}
+#preftoc li.selected {
+ font-weight: bold;
+ background-color: transparent;
+ border: 1px solid #aaa;
+ border-bottom: none;
+ cursor: default;
+ top: 1px;
+ padding-top: 2px;
+ margin-right: -3px;
+}
+#preftoc > li.selected {
+ top: 2px;
+}
+#preftoc a,
+#preftoc a:active {
+ display: block;
+ /*color: #FFF;*/
+ padding: 0 .7em;
+ position: relative;
+ text-decoration: none;
+}
+#preftoc li.selected a {
+ cursor: default;
+ text-decoration: none;
+}
+#preftoc a:visited {
+ color: #808080; /* Gray -- beats the default blue... */
+}
+#preferences {
+ margin: 0;
+ border: 1px solid #aaa;
+ clear: both;
+ padding: 1.5em;
+ background-color: transparent;
+}
+.prefsection {
+ border: none;
+ padding: 0;
+ margin: 0;
+}
+
+.prefsection legend {
+ font-weight: bold;
+}
+.prefsection table, .prefsection legend {
+ background-color: transparent;
+}
+.mainLegend {
+ display: none;
+}
+td.htmlform-tip {
+ font-size: x-small;
+ padding: .2em 2em;
+ color: #666;
+}
+
+.preferences-login {
+ clear: both;
+ margin-bottom: 1.5em;
+}
+
+.prefcache {
+ font-size: 90%;
+ margin-top: 2em;
+}
diff --git a/resources/css/style.css b/resources/css/style.css
index 4dcf1b5..e786dfa 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -922,97 +922,6 @@
text-shadow: none;
}
-/** Delicious copypasta from Monobook's main.css */
-/* js pref toc */
-#preftoc {
- margin: 0;
- padding: 0;
- width: 100%;
- clear: both;
-}
-#preftoc li {
- /*background-color: #f0f0f0;*/
- color: #000;
-}
-#preftoc li {
- margin: 1px -2px 1px 2px;
- float: left;
- padding: 2px 0 3px 0;
- border: 1px solid #fff;
- border-right-color: #716f64;
- border-bottom: 0;
- position: relative;
- white-space: nowrap;
- list-style-type: none;
- list-style-image: none;
- z-index: 3;
-}
-#preftoc li.selected {
- font-weight: bold;
- background-color: transparent;
- border: 1px solid #aaa;
- border-bottom: none;
- cursor: default;
- top: 1px;
- padding-top: 2px;
- margin-right: -3px;
-}
-#preftoc > li.selected {
- top: 2px;
-}
-#preftoc a,
-#preftoc a:active {
- display: block;
- /*color: #FFF;*/
- padding: 0 .7em;
- position: relative;
- text-decoration: none;
-}
-#preftoc li.selected a {
- cursor: default;
- text-decoration: none;
-}
-#preftoc a:visited {
- color: #808080; /* Gray -- beats the default blue... */
-}
-#preferences {
- margin: 0;
- border: 1px solid #aaa;
- clear: both;
- padding: 1.5em;
- background-color: transparent;
-}
-.prefsection {
- border: none;
- padding: 0;
- margin: 0;
-}
-
-.prefsection legend {
- font-weight: bold;
-}
-.prefsection table, .prefsection legend {
- background-color: transparent;
-}
-.mainLegend {
- display: none;
-}
-td.htmlform-tip {
- font-size: x-small;
- padding: .2em 2em;
- color: #666;
-}
-
-.preferences-login {
- clear: both;
- margin-bottom: 1.5em;
-}
-
-.prefcache {
- font-size: 90%;
- margin-top: 2em;
-}
-
/* noarticletext */
div.noarticletext {
border: 1px solid #ccc;
diff --git a/skin.json b/skin.json
index 8eb4eed..c5d0205 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
{
"name": "Gamepress",
- "version": "1.
[MediaWiki-commits] [Gerrit] labs/toollabs[ubuntu/precise]: Cut release 1.19~precise+1
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340056 ) Change subject: Cut release 1.19~precise+1 .. Cut release 1.19~precise+1 Change-Id: I9355fee3b252e45834589dc196dee691a32ff407 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tim Landscheidt: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 781345a..cd131c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -toollabs (1.19~precise+1~dev) precise; urgency=medium +toollabs (1.19~precise+1) precise; urgency=medium * Remove toolwatcher * Do not hardcore database hosts in list-user-databases -- To view, visit https://gerrit.wikimedia.org/r/340056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9355fee3b252e45834589dc196dee691a32ff407 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: ubuntu/precise Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Coren Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Tim Landscheidt Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/toollabs[master]: Cut release 1.19
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340055 ) Change subject: Cut release 1.19 .. Cut release 1.19 Change-Id: I0e4c678e79981810e765293630d8978a68e58e15 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tim Landscheidt: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 0a35cde..0d8b543 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -toollabs (1.19~dev) trusty; urgency=medium +toollabs (1.19) trusty; urgency=medium * Remove toolwatcher * Do not hardcore database hosts in list-user-databases -- To view, visit https://gerrit.wikimedia.org/r/340055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e4c678e79981810e765293630d8978a68e58e15 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Coren Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Tim Landscheidt Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/toollabs[master]: Cut release 1.19
Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340055 ) Change subject: Cut release 1.19 .. Cut release 1.19 Change-Id: I0e4c678e79981810e765293630d8978a68e58e15 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/55/340055/1 diff --git a/debian/changelog b/debian/changelog index 0a35cde..0d8b543 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -toollabs (1.19~dev) trusty; urgency=medium +toollabs (1.19) trusty; urgency=medium * Remove toolwatcher * Do not hardcore database hosts in list-user-databases -- To view, visit https://gerrit.wikimedia.org/r/340055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0e4c678e79981810e765293630d8978a68e58e15 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/toollabs[ubuntu/precise]: Cut release 1.19~precise+1
Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340056 ) Change subject: Cut release 1.19~precise+1 .. Cut release 1.19~precise+1 Change-Id: I9355fee3b252e45834589dc196dee691a32ff407 --- M debian/changelog 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/56/340056/1 diff --git a/debian/changelog b/debian/changelog index 781345a..cd131c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -toollabs (1.19~precise+1~dev) precise; urgency=medium +toollabs (1.19~precise+1) precise; urgency=medium * Remove toolwatcher * Do not hardcore database hosts in list-user-databases -- To view, visit https://gerrit.wikimedia.org/r/340056 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9355fee3b252e45834589dc196dee691a32ff407 Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: ubuntu/precise Gerrit-Owner: Tim Landscheidt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: h4 messages not escaped in NewsletterDiffEngine
D3r1ck01 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340054 ) Change subject: h4 messages not escaped in NewsletterDiffEngine .. h4 messages not escaped in NewsletterDiffEngine * In the NewsletterDiffEngine.php, the h4 messages where not escaped due to the use of text() and no escape by default. Bug: T159075 Change-Id: Ibaae7d77f9f5871c3c4a3b4eb0de02272cae194a --- M includes/content/NewsletterDiffEngine.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/54/340054/1 diff --git a/includes/content/NewsletterDiffEngine.php b/includes/content/NewsletterDiffEngine.php index ddad524..bc202e8 100644 --- a/includes/content/NewsletterDiffEngine.php +++ b/includes/content/NewsletterDiffEngine.php @@ -19,7 +19,7 @@ $output .= Html::openElement( 'td', [ 'colspan' => 4, 'id' => 'mw-newsletter-diffdescheader' ] ); $output .= Html::element( 'h4', [], - $this->msg( 'newsletter-diff-descheader' )->text() ); + $this->msg( 'newsletter-diff-descheader' )->escaped() ); $output .= Html::closeElement( 'td' ); $output .= Html::closeElement( 'tr' ); $output .= $descDiff; @@ -36,7 +36,7 @@ $output .= Html::openElement( 'td', [ 'colspan' => 4, 'id' => 'mw-newsletter-diffmainpageheader' ] ); $output .= Html::element( 'h4', [], - $this->msg( 'newsletter-diff-mainpageheader' )->text() ); + $this->msg( 'newsletter-diff-mainpageheader' )->escaped() ); $output .= Html::closeElement( 'td' ); $output .= Html::closeElement( 'tr' ); $output .= $mainPageDiff; @@ -53,7 +53,7 @@ $output .= Html::openElement( 'td', [ 'colspan' => 4, 'id' => 'mw-newsletter-diffpublishersheader' ] ); $output .= Html::element( 'h4', [], - $this->msg( 'newsletter-diff-publishersheader' )->text() ); + $this->msg( 'newsletter-diff-publishersheader' )->escaped() ); $output .= Html::closeElement( 'td' ); $output .= Html::closeElement( 'tr' ); $output .= $publishersDiff; -- To view, visit https://gerrit.wikimedia.org/r/340054 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibaae7d77f9f5871c3c4a3b4eb0de02272cae194a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: D3r1ck01 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Gamepress[master]: Separate preferences CSS into it's own module and file
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340047 )
Change subject: Separate preferences CSS into it's own module and file
..
Separate preferences CSS into it's own module and file
Change-Id: Ibe6218d6e44280913f2062d48a718c99b5caf83e
---
A resources/css/special.preferences.css
M resources/css/style.css
M skin.json
3 files changed, 96 insertions(+), 92 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Gamepress
refs/changes/47/340047/1
diff --git a/resources/css/special.preferences.css
b/resources/css/special.preferences.css
new file mode 100644
index 000..d379bd4
--- /dev/null
+++ b/resources/css/special.preferences.css
@@ -0,0 +1,90 @@
+/** Delicious copypasta from Monobook's main.css */
+/* js pref toc */
+#preftoc {
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ clear: both;
+}
+#preftoc li {
+ /*background-color: #f0f0f0;*/
+ color: #000;
+}
+#preftoc li {
+ margin: 1px -2px 1px 2px;
+ float: left;
+ padding: 2px 0 3px 0;
+ border: 1px solid #fff;
+ border-right-color: #716f64;
+ border-bottom: 0;
+ position: relative;
+ white-space: nowrap;
+ list-style-type: none;
+ list-style-image: none;
+ z-index: 3;
+}
+#preftoc li.selected {
+ font-weight: bold;
+ background-color: transparent;
+ border: 1px solid #aaa;
+ border-bottom: none;
+ cursor: default;
+ top: 1px;
+ padding-top: 2px;
+ margin-right: -3px;
+}
+#preftoc > li.selected {
+ top: 2px;
+}
+#preftoc a,
+#preftoc a:active {
+ display: block;
+ /*color: #FFF;*/
+ padding: 0 .7em;
+ position: relative;
+ text-decoration: none;
+}
+#preftoc li.selected a {
+ cursor: default;
+ text-decoration: none;
+}
+#preftoc a:visited {
+ color: #808080; /* Gray -- beats the default blue... */
+}
+#preferences {
+ margin: 0;
+ border: 1px solid #aaa;
+ clear: both;
+ padding: 1.5em;
+ background-color: transparent;
+}
+.prefsection {
+ border: none;
+ padding: 0;
+ margin: 0;
+}
+
+.prefsection legend {
+ font-weight: bold;
+}
+.prefsection table, .prefsection legend {
+ background-color: transparent;
+}
+.mainLegend {
+ display: none;
+}
+td.htmlform-tip {
+ font-size: x-small;
+ padding: .2em 2em;
+ color: #666;
+}
+
+.preferences-login {
+ clear: both;
+ margin-bottom: 1.5em;
+}
+
+.prefcache {
+ font-size: 90%;
+ margin-top: 2em;
+}
diff --git a/resources/css/style.css b/resources/css/style.css
index 4dcf1b5..e786dfa 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -922,97 +922,6 @@
text-shadow: none;
}
-/** Delicious copypasta from Monobook's main.css */
-/* js pref toc */
-#preftoc {
- margin: 0;
- padding: 0;
- width: 100%;
- clear: both;
-}
-#preftoc li {
- /*background-color: #f0f0f0;*/
- color: #000;
-}
-#preftoc li {
- margin: 1px -2px 1px 2px;
- float: left;
- padding: 2px 0 3px 0;
- border: 1px solid #fff;
- border-right-color: #716f64;
- border-bottom: 0;
- position: relative;
- white-space: nowrap;
- list-style-type: none;
- list-style-image: none;
- z-index: 3;
-}
-#preftoc li.selected {
- font-weight: bold;
- background-color: transparent;
- border: 1px solid #aaa;
- border-bottom: none;
- cursor: default;
- top: 1px;
- padding-top: 2px;
- margin-right: -3px;
-}
-#preftoc > li.selected {
- top: 2px;
-}
-#preftoc a,
-#preftoc a:active {
- display: block;
- /*color: #FFF;*/
- padding: 0 .7em;
- position: relative;
- text-decoration: none;
-}
-#preftoc li.selected a {
- cursor: default;
- text-decoration: none;
-}
-#preftoc a:visited {
- color: #808080; /* Gray -- beats the default blue... */
-}
-#preferences {
- margin: 0;
- border: 1px solid #aaa;
- clear: both;
- padding: 1.5em;
- background-color: transparent;
-}
-.prefsection {
- border: none;
- padding: 0;
- margin: 0;
-}
-
-.prefsection legend {
- font-weight: bold;
-}
-.prefsection table, .prefsection legend {
- background-color: transparent;
-}
-.mainLegend {
- display: none;
-}
-td.htmlform-tip {
- font-size: x-small;
- padding: .2em 2em;
- color: #666;
-}
-
-.preferences-login {
- clear: both;
- margin-bottom: 1.5em;
-}
-
-.prefcache {
- font-size: 90%;
- margin-top: 2em;
-}
-
/* noarticletext */
div.noarticletext {
border: 1px solid #ccc;
diff --git a/skin.json b/skin.json
index 8eb4eed..c5d0205 100644
--- a/skin.json
+++ b/skin.json
@@ -1,6 +1,6 @@
{
"name": "Gamepress",
- "v
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Split TestWikibaseTypes into one class per type
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339499 )
Change subject: Split TestWikibaseTypes into one class per type
..
Split TestWikibaseTypes into one class per type
Also add additional tests for Coordinate and WbTime.
Change-Id: I8ab1b45bb14996b0e11f667c8763de7e06ac288d
---
M tests/wikibase_tests.py
1 file changed, 159 insertions(+), 100 deletions(-)
Approvals:
Mpaa: Looks good to me, approved
Dalba: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py
index 74fceb2..d652467 100644
--- a/tests/wikibase_tests.py
+++ b/tests/wikibase_tests.py
@@ -139,14 +139,14 @@
ItemPage(self.get_repo(), 'q5296'))
-class TestWikibaseTypes(WikidataTestCase):
+class TestWikibaseCoordinate(WikidataTestCase):
-"""Test Wikibase data types."""
+"""Test Wikibase Coordinate data type."""
dry = True
def test_Coordinate_dim(self):
-"""Test Coordinate."""
+"""Test Coordinate dimension."""
repo = self.get_repo()
x = pywikibot.Coordinate(site=repo, lat=12.0, lon=13.0, precision=5.0)
self.assertEqual(x.precisionToDim(), 544434)
@@ -158,13 +158,64 @@
with self.assertRaises(ValueError):
z.precisionToDim()
-def test_WbTime(self):
-"""Test WbTime."""
+def test_Coordinate_entity_globe(self):
+"""Test setting Coordinate globe from entity."""
+repo = self.get_repo()
+coord = pywikibot.Coordinate(
+site=repo, lat=12.0, lon=13.0, precision=0,
+entity='http://www.wikidata.org/entity/Q123')
+self.assertEqual(coord.toWikibase(),
+ {'latitude': 12.0, 'longitude': 13.0,
+ 'altitude': None, 'precision': 0,
+ 'globe': 'http://www.wikidata.org/entity/Q123'})
+
+
+class TestWbTime(WikidataTestCase):
+
+"""Test Wikibase WbTime data type."""
+
+dry = True
+
+def test_WbTime_toTimestr(self):
+"""Test WbTime conversion to UTC date/time string."""
repo = self.get_repo()
t = pywikibot.WbTime(site=repo, year=2010, hour=12, minute=43)
self.assertEqual(t.toTimestr(), '+0002010-01-01T12:43:00Z')
-self.assertRaises(ValueError, pywikibot.WbTime, site=repo,
precision=15)
-self.assertRaises(ValueError, pywikibot.WbTime, site=repo,
precision='invalid_precision')
+t = pywikibot.WbTime(site=repo, year=-2010, hour=12, minute=43)
+self.assertEqual(t.toTimestr(), '-0002010-01-01T12:43:00Z')
+
+def test_WbTime_fromTimestr(self):
+"""Test WbTime creation from UTC date/time string."""
+repo = self.get_repo()
+t = pywikibot.WbTime.fromTimestr('+0002010-01-01T12:43:00Z',
+ site=repo)
+self.assertEqual(t, pywikibot.WbTime(site=repo, year=2010, hour=12,
+ minute=43, precision=14))
+
+def test_WbTime_zero_month(self):
+"""Test WbTime creation from date/time string with zero month."""
+# ensures we support formats in T123888 / T107870
+repo = self.get_repo()
+t = pywikibot.WbTime.fromTimestr('+0002010-00-00T12:43:00Z',
+ site=repo)
+self.assertEqual(t, pywikibot.WbTime(site=repo, year=2010, month=0,
+ day=0, hour=12, minute=43,
+ precision=14))
+
+def test_WbTime_errors(self):
+"""Test WbTime precision errors."""
+repo = self.get_repo()
+self.assertRaises(ValueError, pywikibot.WbTime, site=repo,
+ precision=15)
+self.assertRaises(ValueError, pywikibot.WbTime, site=repo,
+ precision='invalid_precision')
+
+
+class TestWbQuantity(WikidataTestCase):
+
+"""Test Wikibase WbQuantity data type."""
+
+dry = True
def test_WbQuantity_integer(self):
"""Test WbQuantity for integer value."""
@@ -214,8 +265,8 @@
'upperBound': '+0.044405586', 'unit': '1', }
self.assertEqual(q.toWikibase(), q_dict)
-def test_WbQuantity_formatting(self):
-"""Test other WbQuantity methods."""
+def test_WbQuantity_formatting_bound(self):
+"""Test WbQuantity formatting with bounds."""
q = pywikibot.WbQuantity(amount='0.044405586', error='0')
self.assertEqual("%s" % q,
'{\n'
@@ -271,6 +322,105 @@
'upperBound': '+1235',
'unit': 'http://www.wikidata.org/entity/Q712226', })
+
+class TestWbQuantityNonDry(WikidataTestCase):
+
+"""
+Test Wikibase WbQuantity data type (non-dry).
+
+These can be moved to
[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: Add also support for ecdsa ssh keys
Platonides has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340032 )
Change subject: Add also support for ecdsa ssh keys
..
Add also support for ecdsa ssh keys
Related task: T159070
Change-Id: I7da680ed0126fac7cef6740c947c2868efe4
---
M special/SpecialNovaKey.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/32/340032/1
diff --git a/special/SpecialNovaKey.php b/special/SpecialNovaKey.php
index 60bebb0..d115f4a 100644
--- a/special/SpecialNovaKey.php
+++ b/special/SpecialNovaKey.php
@@ -278,7 +278,7 @@
$key = trim( $formData['key'] ); # Because people copy paste it
with an accidental newline
$returnto = Title::newFromText( $formData['returnto'] );
- if ( !preg_match( '/(^| )ssh-(rsa|dss|ed25519) /', $key ) ) {
+ if ( !preg_match( '/(^|
)(ssh-(rsa|dss|ed25519)|ecdsa-sha2-nistp256) /', $key ) ) {
# This doesn't look like openssh format, it's probably a
# Windows user providing it in PuTTY format.
$key = self::opensshFormatKey( $key );
--
To view, visit https://gerrit.wikimedia.org/r/340032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7da680ed0126fac7cef6740c947c2868efe4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Platonides
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: Remove support for ssh-dsa ssh keys
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340026 ) Change subject: Remove support for ssh-dsa ssh keys .. Remove support for ssh-dsa ssh keys They are insecure and are disabled in openssh 7.0+ Users should be using rsa or ed25519 ssh keys. Bug: T159070 Change-Id: I8b411e4f7cf92980511c19dd6b9b41d889f2b016 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager refs/changes/26/340026/1 -- To view, visit https://gerrit.wikimedia.org/r/340026 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8b411e4f7cf92980511c19dd6b9b41d889f2b016 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenStackManager Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: Add support for ED25519 ssh key
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339957 )
Change subject: Add support for ED25519 ssh key
..
Add support for ED25519 ssh key
Bug: T159070
Change-Id: I3b70ae49893e5532505175e6a53b40f27d944f65
---
M special/SpecialNovaKey.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Platonides: Looks good to me, approved
jenkins-bot: Verified
diff --git a/special/SpecialNovaKey.php b/special/SpecialNovaKey.php
index 5db3fdc..60bebb0 100644
--- a/special/SpecialNovaKey.php
+++ b/special/SpecialNovaKey.php
@@ -278,7 +278,7 @@
$key = trim( $formData['key'] ); # Because people copy paste it
with an accidental newline
$returnto = Title::newFromText( $formData['returnto'] );
- if ( !preg_match( '/(^| )ssh-(rsa|dss) /', $key ) ) {
+ if ( !preg_match( '/(^| )ssh-(rsa|dss|ed25519) /', $key ) ) {
# This doesn't look like openssh format, it's probably a
# Windows user providing it in PuTTY format.
$key = self::opensshFormatKey( $key );
--
To view, visit https://gerrit.wikimedia.org/r/339957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3b70ae49893e5532505175e6a53b40f27d944f65
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Chasemp
Gerrit-Reviewer: Dzahn
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Platonides
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: Volans
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/toollabs[ubuntu/precise]: Add man page for sql
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340010 ) Change subject: Add man page for sql .. Add man page for sql Change-Id: I198b5ad25eaf8bdf99f8056b18e7dea7fa4530de --- M configure.ac M debian/changelog M debian/misctools.manpages M misctools/Makefile.am A misctools/sql.1.in 5 files changed, 49 insertions(+), 2 deletions(-) Approvals: Tim Landscheidt: Looks good to me, approved jenkins-bot: Verified diff --git a/configure.ac b/configure.ac index 1cc660e..5a3b7d5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ misctools/Makefile misctools/become.1 misctools/list-user-databases.1 + misctools/sql.1 src/Makefile src/take.1 tests/Makefile]) diff --git a/debian/changelog b/debian/changelog index 79d7aaa..781345a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ * Set target distribution to Ubuntu Trusty * Set target distribution for branch ubuntu/precise to Ubuntu Precise * Import sql from operations/puppet + * Add man page for sql - -- Tim Landscheidt Sun, 26 Feb 2017 21:27:04 + + -- Tim Landscheidt Sun, 26 Feb 2017 21:34:29 + toollabs (1.18) unstable; urgency=medium diff --git a/debian/misctools.manpages b/debian/misctools.manpages index 52c8ebc..7e2f080 100644 --- a/debian/misctools.manpages +++ b/debian/misctools.manpages @@ -1,3 +1,4 @@ debian/tmp/usr/share/man/man1/become.1 debian/tmp/usr/share/man/man1/list-user-databases.1 +debian/tmp/usr/share/man/man1/sql.1 debian/tmp/usr/share/man/man1/take.1 diff --git a/misctools/Makefile.am b/misctools/Makefile.am index 1d9c38a..b715aa9 100644 --- a/misctools/Makefile.am +++ b/misctools/Makefile.am @@ -1,2 +1,2 @@ -man_MANS = become.1 list-user-databases.1 +man_MANS = become.1 list-user-databases.1 sql.1 bin_SCRIPTS = become list-user-databases setup-tomcat sql diff --git a/misctools/sql.1.in b/misctools/sql.1.in new file mode 100644 index 000..a52ff42 --- /dev/null +++ b/misctools/sql.1.in @@ -0,0 +1,44 @@ +.TH SQL 1 @TOOLLABS_RELEASEDATE@ @PACKAGE_VERSION@ "Wikimedia Labs Tools misctools" +.SH NAME +sql \- connect to database or execute SQL command +.SH SYNOPSIS +.B sql +.I database + +.B sql +.I database +.I statement +.SH DESCRIPTION +.B sql +connects to the named +.I database +with +.BR mysql ; +if an SQL statement is given, it is executed, otherwise an interactive +session is started. + +There are three categories of databases that can be specified by +.IR database : +.IR enwiki_p , +etc. refers to the database for the English Wikipedia, etc. on the +replica servers. +.I local +only works in the form +.B sql local +and connects to the +.I tools-db +server. +.IR meta_p , +not to be confused with +.IR metawiki_p , +refers to the database that contains meta information about Wikimedia wikis (cf. +.RB < https://wikitech.wikimedia.org/wiki/Help:Tool_Labs/Database#Metadata_database >). +.SH EXIT STATUS +.B sql +returns the exit status of the spawned +.B mysql +command. +.SH AUTHORS +Petr Bena +.SH SEE ALSO +.BR mysql (1) -- To view, visit https://gerrit.wikimedia.org/r/340010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I198b5ad25eaf8bdf99f8056b18e7dea7fa4530de Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: ubuntu/precise Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Tim Landscheidt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/toollabs[ubuntu/precise]: Import sql from operations/puppet
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340009 )
Change subject: Import sql from operations/puppet
..
Import sql from operations/puppet
As this change introduces a difference in the binary packages, it adds
the suffix "~precise+1" to the upstream version.
Change-Id: I159b49371a995ca32e1d37bc69d17308d10d8164
---
M debian/changelog
M debian/control
M debian/misctools.install
M misctools/Makefile.am
A misctools/sql
5 files changed, 126 insertions(+), 4 deletions(-)
Approvals:
Tim Landscheidt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 379ff65..79d7aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-toollabs (1.19~dev) precise; urgency=medium
+toollabs (1.19~precise+1~dev) precise; urgency=medium
* Remove toolwatcher
* Do not hardcore database hosts in list-user-databases
* State dependency on python
* Set target distribution to Ubuntu Trusty
* Set target distribution for branch ubuntu/precise to Ubuntu Precise
+ * Import sql from operations/puppet
- -- Tim Landscheidt Sun, 26 Feb 2017 02:49:21 +
+ -- Tim Landscheidt Sun, 26 Feb 2017 21:27:04 +
toollabs (1.18) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ee2e5c8..fa8b889 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@
Package: misctools
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
- python, python-mysql.connector
+ mysql-client-core-5.5, python, python-mysql.connector
Description: Miscellaneous Labs-specific tools
Miscellaneous Labs-specific Tools used on Tool Labs
diff --git a/debian/misctools.install b/debian/misctools.install
index 8480b2b..924a3f9 100644
--- a/debian/misctools.install
+++ b/debian/misctools.install
@@ -1,4 +1,5 @@
usr/bin/become
usr/bin/list-user-databases
+usr/bin/sql
usr/bin/take
usr/bin/setup-tomcat
diff --git a/misctools/Makefile.am b/misctools/Makefile.am
index 4d2ee2b..1d9c38a 100644
--- a/misctools/Makefile.am
+++ b/misctools/Makefile.am
@@ -1,2 +1,2 @@
man_MANS = become.1 list-user-databases.1
-bin_SCRIPTS = become list-user-databases setup-tomcat
+bin_SCRIPTS = become list-user-databases setup-tomcat sql
diff --git a/misctools/sql b/misctools/sql
new file mode 100755
index 000..65f5314
--- /dev/null
+++ b/misctools/sql
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# this tool allow you to connect quickly to sql database
+# it should work for all newbies
+
+verbose=0
+
+function Log {
+if [ $verbose -eq 1 ];then
+ echo "$1"
+fi
+}
+
+if [ $# -lt 1 ];then
+echo "Usage: \"sql [-vh]\" type sql --help for
more help"
+exit 0
+fi
+
+if [ "$1" = "-h" ] || [ "$1" == "--help" ];then
+echo "Usage: sql [_p] [-vh] [command(s)]"
+ echo
+ echo "This tool allows you to easily open a connection to sql database
without having to provide the credentials or a database host server"
+ echo "Example: sql frwiki_p"
+ echo
+ echo "Parameters:"
+ echo " -v: verbose - produce various information about the resolution
of db"
+ echo
+ echo "Report bugs to phabricator: https://phabricator.wikimedia.org";
+ exit 0
+fi
+
+for i
+do
+ if [ "$i" = "-v" ] || [ "$i" = "--verbose" ]
+ then
+ verbose=1
+ fi
+done
+
+if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ]
+then
+ Log "WARNING: There is no configuration file for mysql to use, you will
probably be unable to access the database"
+fi
+
+param=""
+# check if the user has a replica file
+if [ -f ~/replica.my.cnf ];then
+param=" --defaults-file=~/replica.my.cnf"
+else
+if [ ! -f ~/.my.cnf ];then
+param=" -p"
+fi
+fi
+
+server="enwiki.labsdb"
+db="enwiki_p"
+
+case "$1" in
+"en" | "enwiki" | "enwiki_p")
+server="enwiki.labsdb"
+db="enwiki_p"
+;;
+"de" | "dewiki" | "dewiki_p")
+server="dewiki.labsdb"
+db="dewiki_p"
+;;
+"fr" | "frwiki" | "frwiki_p")
+server="frwiki.labsdb"
+db="frwiki_p"
+;;
+"cs" | "cswiki" | "cswiki_p")
+server="cswiki.labsdb"
+db="cswiki_p"
+;;
+"commons" | "commonswiki" | "commonswiki_p")
+server="commonswiki.labsdb"
+db="commonswiki_p"
+;;
+"wikidata" | "wikidatawiki" | "wikidatawiki_p")
+server="wikidatawiki.labsdb"
+db="wikidatawiki_p"
+;;
+"meta" | "meta_p")
+# Not to confuse with metawiki[_p]
+#
https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Metadata_database
+server="s7.labsdb"
+db="meta_p"
+;;
+"local")
+server=tools-db
+db=""
+if [ -f ~/.my.cnf ];then
+ param=""
+fi
+ ;;
+ *)
+ # we don't know what the database is so we check if it exist first
+ Log "This data
[MediaWiki-commits] [Gerrit] labs/toollabs[ubuntu/precise]: Add man page for sql
Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340010 ) Change subject: Add man page for sql .. Add man page for sql Change-Id: I198b5ad25eaf8bdf99f8056b18e7dea7fa4530de --- M configure.ac M debian/changelog M debian/misctools.manpages M misctools/Makefile.am A misctools/sql.1.in 5 files changed, 49 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs refs/changes/10/340010/1 diff --git a/configure.ac b/configure.ac index 1cc660e..5a3b7d5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ misctools/Makefile misctools/become.1 misctools/list-user-databases.1 + misctools/sql.1 src/Makefile src/take.1 tests/Makefile]) diff --git a/debian/changelog b/debian/changelog index 79d7aaa..781345a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,9 @@ * Set target distribution to Ubuntu Trusty * Set target distribution for branch ubuntu/precise to Ubuntu Precise * Import sql from operations/puppet + * Add man page for sql - -- Tim Landscheidt Sun, 26 Feb 2017 21:27:04 + + -- Tim Landscheidt Sun, 26 Feb 2017 21:34:29 + toollabs (1.18) unstable; urgency=medium diff --git a/debian/misctools.manpages b/debian/misctools.manpages index 52c8ebc..7e2f080 100644 --- a/debian/misctools.manpages +++ b/debian/misctools.manpages @@ -1,3 +1,4 @@ debian/tmp/usr/share/man/man1/become.1 debian/tmp/usr/share/man/man1/list-user-databases.1 +debian/tmp/usr/share/man/man1/sql.1 debian/tmp/usr/share/man/man1/take.1 diff --git a/misctools/Makefile.am b/misctools/Makefile.am index 1d9c38a..b715aa9 100644 --- a/misctools/Makefile.am +++ b/misctools/Makefile.am @@ -1,2 +1,2 @@ -man_MANS = become.1 list-user-databases.1 +man_MANS = become.1 list-user-databases.1 sql.1 bin_SCRIPTS = become list-user-databases setup-tomcat sql diff --git a/misctools/sql.1.in b/misctools/sql.1.in new file mode 100644 index 000..a52ff42 --- /dev/null +++ b/misctools/sql.1.in @@ -0,0 +1,44 @@ +.TH SQL 1 @TOOLLABS_RELEASEDATE@ @PACKAGE_VERSION@ "Wikimedia Labs Tools misctools" +.SH NAME +sql \- connect to database or execute SQL command +.SH SYNOPSIS +.B sql +.I database + +.B sql +.I database +.I statement +.SH DESCRIPTION +.B sql +connects to the named +.I database +with +.BR mysql ; +if an SQL statement is given, it is executed, otherwise an interactive +session is started. + +There are three categories of databases that can be specified by +.IR database : +.IR enwiki_p , +etc. refers to the database for the English Wikipedia, etc. on the +replica servers. +.I local +only works in the form +.B sql local +and connects to the +.I tools-db +server. +.IR meta_p , +not to be confused with +.IR metawiki_p , +refers to the database that contains meta information about Wikimedia wikis (cf. +.RB < https://wikitech.wikimedia.org/wiki/Help:Tool_Labs/Database#Metadata_database >). +.SH EXIT STATUS +.B sql +returns the exit status of the spawned +.B mysql +command. +.SH AUTHORS +Petr Bena +.SH SEE ALSO +.BR mysql (1) -- To view, visit https://gerrit.wikimedia.org/r/340010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I198b5ad25eaf8bdf99f8056b18e7dea7fa4530de Gerrit-PatchSet: 1 Gerrit-Project: labs/toollabs Gerrit-Branch: ubuntu/precise Gerrit-Owner: Tim Landscheidt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/toollabs[ubuntu/precise]: Import sql from operations/puppet
Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340009 )
Change subject: Import sql from operations/puppet
..
Import sql from operations/puppet
As this change introduces a difference in the binary packages, it adds
the suffix "~precise+1" to the upstream version.
Change-Id: I159b49371a995ca32e1d37bc69d17308d10d8164
---
M debian/changelog
M debian/control
M debian/misctools.install
M misctools/Makefile.am
A misctools/sql
5 files changed, 126 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/toollabs
refs/changes/09/340009/1
diff --git a/debian/changelog b/debian/changelog
index 379ff65..79d7aaa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-toollabs (1.19~dev) precise; urgency=medium
+toollabs (1.19~precise+1~dev) precise; urgency=medium
* Remove toolwatcher
* Do not hardcore database hosts in list-user-databases
* State dependency on python
* Set target distribution to Ubuntu Trusty
* Set target distribution for branch ubuntu/precise to Ubuntu Precise
+ * Import sql from operations/puppet
- -- Tim Landscheidt Sun, 26 Feb 2017 02:49:21 +
+ -- Tim Landscheidt Sun, 26 Feb 2017 21:27:04 +
toollabs (1.18) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ee2e5c8..fa8b889 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@
Package: misctools
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
- python, python-mysql.connector
+ mysql-client-core-5.5, python, python-mysql.connector
Description: Miscellaneous Labs-specific tools
Miscellaneous Labs-specific Tools used on Tool Labs
diff --git a/debian/misctools.install b/debian/misctools.install
index 8480b2b..924a3f9 100644
--- a/debian/misctools.install
+++ b/debian/misctools.install
@@ -1,4 +1,5 @@
usr/bin/become
usr/bin/list-user-databases
+usr/bin/sql
usr/bin/take
usr/bin/setup-tomcat
diff --git a/misctools/Makefile.am b/misctools/Makefile.am
index 4d2ee2b..1d9c38a 100644
--- a/misctools/Makefile.am
+++ b/misctools/Makefile.am
@@ -1,2 +1,2 @@
man_MANS = become.1 list-user-databases.1
-bin_SCRIPTS = become list-user-databases setup-tomcat
+bin_SCRIPTS = become list-user-databases setup-tomcat sql
diff --git a/misctools/sql b/misctools/sql
new file mode 100755
index 000..65f5314
--- /dev/null
+++ b/misctools/sql
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# this tool allow you to connect quickly to sql database
+# it should work for all newbies
+
+verbose=0
+
+function Log {
+if [ $verbose -eq 1 ];then
+ echo "$1"
+fi
+}
+
+if [ $# -lt 1 ];then
+echo "Usage: \"sql [-vh]\" type sql --help for
more help"
+exit 0
+fi
+
+if [ "$1" = "-h" ] || [ "$1" == "--help" ];then
+echo "Usage: sql [_p] [-vh] [command(s)]"
+ echo
+ echo "This tool allows you to easily open a connection to sql database
without having to provide the credentials or a database host server"
+ echo "Example: sql frwiki_p"
+ echo
+ echo "Parameters:"
+ echo " -v: verbose - produce various information about the resolution
of db"
+ echo
+ echo "Report bugs to phabricator: https://phabricator.wikimedia.org";
+ exit 0
+fi
+
+for i
+do
+ if [ "$i" = "-v" ] || [ "$i" = "--verbose" ]
+ then
+ verbose=1
+ fi
+done
+
+if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ]
+then
+ Log "WARNING: There is no configuration file for mysql to use, you will
probably be unable to access the database"
+fi
+
+param=""
+# check if the user has a replica file
+if [ -f ~/replica.my.cnf ];then
+param=" --defaults-file=~/replica.my.cnf"
+else
+if [ ! -f ~/.my.cnf ];then
+param=" -p"
+fi
+fi
+
+server="enwiki.labsdb"
+db="enwiki_p"
+
+case "$1" in
+"en" | "enwiki" | "enwiki_p")
+server="enwiki.labsdb"
+db="enwiki_p"
+;;
+"de" | "dewiki" | "dewiki_p")
+server="dewiki.labsdb"
+db="dewiki_p"
+;;
+"fr" | "frwiki" | "frwiki_p")
+server="frwiki.labsdb"
+db="frwiki_p"
+;;
+"cs" | "cswiki" | "cswiki_p")
+server="cswiki.labsdb"
+db="cswiki_p"
+;;
+"commons" | "commonswiki" | "commonswiki_p")
+server="commonswiki.labsdb"
+db="commonswiki_p"
+;;
+"wikidata" | "wikidatawiki" | "wikidatawiki_p")
+server="wikidatawiki.labsdb"
+db="wikidatawiki_p"
+;;
+"meta" | "meta_p")
+# Not to confuse with metawiki[_p]
+#
https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Metadata_database
+server="s7.labsdb"
+db="meta_p"
+;;
+"local")
+server=tools-db
+db=""
+if [ -f ~/.my.cnf ];then
+ param=""
+fi
+ ;;
+ *)
+ # we don't know what the database is so we check if it exist first
+ Log "This databa
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Make GerritBot report author of patch and the upload...
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339980 ) Change subject: Gerrit: Make GerritBot report author of patch and the uploader of patch .. Gerrit: Make GerritBot report author of patch and the uploader of patch Change-Id: I033fea83c1be36c2425fc6fa3962d5a7523712ba --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/80/339980/1 -- To view, visit https://gerrit.wikimedia.org/r/339980 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I033fea83c1be36c2425fc6fa3962d5a7523712ba Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox 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...CollaborationKit[master]: Remove unused variables. var-ify various declarations
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339966 )
Change subject: Remove unused variables. var-ify various declarations
..
Remove unused variables. var-ify various declarations
Bug: T159076
Change-Id: I6c27f836b7ec37c225bbab652bf7c445f1b89208
---
M modules/ext.CollaborationKit.hubtheme.js
M modules/ext.CollaborationKit.iconbrowser.js
M modules/ext.CollaborationKit.list.edit.js
M modules/ext.CollaborationKit.list.members.js
M modules/ext.CollaborationKit.list.ui.js
5 files changed, 87 insertions(+), 74 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.CollaborationKit.hubtheme.js
b/modules/ext.CollaborationKit.hubtheme.js
index 7a97260..de88c43 100644
--- a/modules/ext.CollaborationKit.hubtheme.js
+++ b/modules/ext.CollaborationKit.hubtheme.js
@@ -1,5 +1,5 @@
( function ( $, mw, OO ) {
- var getColourBlock, getThumbnail, ImageProcessDialog,
ColourProcessDialog, openColourBrowser;
+ var getColourBlock, getThumbnail, ImageProcessDialog,
ColourProcessDialog, openColourBrowser, openImageBrowser, setupPage;
/**
* Get a colour block for inserting into page
@@ -21,16 +21,14 @@
* @return {jQuery} promise
*/
getThumbnail = function ( filename ) {
- return new mw.Api()
- .get( {
+ return new mw.Api().get( {
action: 'query',
titles: filename,
prop: 'imageinfo',
iiprop: 'url',
formatversion: 2,
iiurlwidth: 150
- }
- );
+ } );
};
/**
@@ -56,7 +54,7 @@
* to initialize widgets, and to set up event handlers.
*/
ColourProcessDialog.prototype.initialize = function () {
- var colourList, radioChoices, className;
+ var colourList, radioChoices, i;
ColourProcessDialog.super.prototype.initialize.apply( this,
arguments );
@@ -90,13 +88,13 @@
*
*/
ColourProcessDialog.prototype.getActionProcess = function ( action ) {
- var dialog, toAppend, openColourBrowser, windowManager,
colourBrowserButton, oldColour;
+ var dialog, oldColour;
oldColour = $( 'div.mw-ck-colour-input select option:selected'
).val();
dialog = this;
if ( action ) {
return new OO.ui.Process( function () {
- var toAppend, $newColour;
+ var toAppend;
toAppend =
dialog.radioSelect.getSelectedItem().getData();
// Generate preview
@@ -136,13 +134,15 @@
* Create and append the window manager.
*/
openColourBrowser = function () {
- windowManager = new OO.ui.WindowManager();
- $( 'body' ).append( windowManager.$element );
+ var processDialog, windowManager;
// Create a new dialog window.
processDialog = new ColourProcessDialog( {
size: 'medium'
} );
+
+ windowManager = new OO.ui.WindowManager();
+ $( 'body' ).append( windowManager.$element );
// Add windows to window manager using the addWindows() method.
windowManager.addWindows( [ processDialog ] );
@@ -174,9 +174,7 @@
* to initialize widgets, and to set up event handlers.
*/
ImageProcessDialog.prototype.initialize = function () {
- var defaultSearchTerm, nsPrefix;
-
- nsPrefix = mw.config.get( 'wgFormattedNamespaces' )[ 6 ] + ':';
+ var defaultSearchTerm, wpTitle, wpDisplay, wpCollabHub;
ImageProcessDialog.super.prototype.initialize.apply( this,
arguments );
@@ -188,14 +186,17 @@
if ( mw.config.get( 'wgTitle' ) !== undefined ) {
defaultSearchTerm = mw.config.get( 'wgTitle' );
}
- if ( $( 'input[name=wptitle]' ).val() !== '' && $(
'input[name=wptitle]' ).val() !== undefined ) {
- defaultSearchTerm = $( 'input[name=wptitle]' ).val();
+ wpTitle = $( 'input[name=wptitle]' ).val();
+ if ( wpTitle !== '' && wpTitle !== undefined ) {
+ defaultSearchTerm = wpTitle;
}
- if ( $( 'input[name=wpdisplay_name]' ).val() !== '' && $(
'input[name=wpdisplay_name]' ).val() !== undefined ) {
- defaultSearchTerm = $( 'input[name=wpdisplay_name]'
).val();
+ wpDisplay = $( 'input[name=wpdisplay_name]' ).val();
+ if ( wpDisplay !== '' &
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: CSS improvements according to PhpStorm
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339964 )
Change subject: CSS improvements according to PhpStorm
..
CSS improvements according to PhpStorm
Bug: T159076
Change-Id: I46ca47bb2ffd3bd2b75d89291727189bdb90
---
M modules/ext.CollaborationKit.edit.styles.less
M modules/ext.CollaborationKit.hub.styles.less
M modules/ext.CollaborationKit.hubtheme.styles.less
M modules/ext.CollaborationKit.list.styles.less
M tests/phpunit/CollaborationKitImageTest.php
5 files changed, 14 insertions(+), 24 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.CollaborationKit.edit.styles.less
b/modules/ext.CollaborationKit.edit.styles.less
index d72365d..92cd6bb 100644
--- a/modules/ext.CollaborationKit.edit.styles.less
+++ b/modules/ext.CollaborationKit.edit.styles.less
@@ -23,10 +23,9 @@
.ck-customeditor-borders( @color ) {
.mw-collabkit-modifiededitform {
padding: 1.5em 1em;
- border-left: solid 1px fadeout( @color, 85% );
- border-right: solid 1px fadeout( @color, 85% );
- border-top: solid 3px @color;
- border-bottom: solid 4px @color;
+ border: 1px solid;
+ border-top-width: 3px;
+ border-bottom-width: 4px;
background-color: fadeout( @color, 95% );
}
}
diff --git a/modules/ext.CollaborationKit.hub.styles.less
b/modules/ext.CollaborationKit.hub.styles.less
index 468deb6..8f5c16e 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -61,16 +61,9 @@
h2 {
display: inline;
- padding: 0;
margin: 0;
- border-bottom-style: none;
- border-top-style: none;
- border-left-style: none;
- border-right-style: none;
- }
-
- .mw-ck-hub-section-main {
- padding-top: .25em;
+ padding: 0 0 .25em;
+ border-style: none;
}
}
.mw-ck-hub-section-buttons {
@@ -109,8 +102,7 @@
width: 25%;
h3 {
- margin: 0;
- margin-bottom: .5em;
+ margin: 0 0 .5em;
padding: 0;
text-align: center;
}
diff --git a/modules/ext.CollaborationKit.hubtheme.styles.less
b/modules/ext.CollaborationKit.hubtheme.styles.less
index bb67d05..0eb8905 100644
--- a/modules/ext.CollaborationKit.hubtheme.styles.less
+++ b/modules/ext.CollaborationKit.hubtheme.styles.less
@@ -93,9 +93,9 @@
border: 2px solid #2a4b8d;
width: 146px;
height: 26px;
- -webkit-box-shadow: 0 0 5px 0px rgba(42,75,141,1);
- -moz-box-shadow: 0 0 5px 0px rgba(42,75,141,1);
- box-shadow: 0 0 5px 0px rgba(42,75,141,1);
+ -webkit-box-shadow: 0 0 5px 0 rgba(42,75,141,1);
+ -moz-box-shadow: 0 0 5px 0 rgba(42,75,141,1);
+ box-shadow: 0 0 5px 0 rgba(42,75,141,1);
}
.colourBrowserButton {
diff --git a/modules/ext.CollaborationKit.list.styles.less
b/modules/ext.CollaborationKit.list.styles.less
index a9e22c4..3095849 100644
--- a/modules/ext.CollaborationKit.list.styles.less
+++ b/modules/ext.CollaborationKit.list.styles.less
@@ -20,8 +20,7 @@
height: 64px;
content: '';
background-size: contain;
- background-color: #eee;
- background-position: 50% 50%;
+ background: #eee 50% 50%;
}
.mw-ck-list-container {
height: 64px;
diff --git a/tests/phpunit/CollaborationKitImageTest.php
b/tests/phpunit/CollaborationKitImageTest.php
index b9a2e39..e46f3ce 100644
--- a/tests/phpunit/CollaborationKitImageTest.php
+++ b/tests/phpunit/CollaborationKitImageTest.php
@@ -40,18 +40,18 @@
$expected = [
'',
'',
- '',
+ '',
'',
'',
'',
- '',
+ '',
'WikiWiki',
'[[File:Example.svg|76px]]',
- '[[File:Example.svg|76px]]',
+ '[[File:Example.svg|76px]]',
'',
'https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/Example.svg/76px-Example.svg.png";
width="76" height="76" />',
'https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/Example.svg/76px-Example.svg.png";
width="76" height="76" />',
- 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/Example.svg/76px-Example.svg.png";
width="76" height="76" />',
+ 'https:
[MediaWiki-commits] [Gerrit] labs/toollabs[master]: Add man page for sql
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/268602 ) Change subject: Add man page for sql .. Add man page for sql Change-Id: I198b5ad25eaf8bdf99f8056b18e7dea7fa4530de --- M configure.ac M debian/changelog M debian/misctools.manpages M misctools/Makefile.am A misctools/sql.1.in 5 files changed, 49 insertions(+), 2 deletions(-) Approvals: Tim Landscheidt: Looks good to me, approved jenkins-bot: Verified diff --git a/configure.ac b/configure.ac index 1cc660e..5a3b7d5 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ misctools/Makefile misctools/become.1 misctools/list-user-databases.1 + misctools/sql.1 src/Makefile src/take.1 tests/Makefile]) diff --git a/debian/changelog b/debian/changelog index 8128862..0a35cde 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ * State dependency on python * Set target distribution to Ubuntu Trusty * Import sql from operations/puppet + * Add man page for sql - -- Tim Landscheidt Sun, 26 Feb 2017 20:18:21 + + -- Tim Landscheidt Sun, 26 Feb 2017 20:19:56 + toollabs (1.18) unstable; urgency=medium diff --git a/debian/misctools.manpages b/debian/misctools.manpages index 52c8ebc..7e2f080 100644 --- a/debian/misctools.manpages +++ b/debian/misctools.manpages @@ -1,3 +1,4 @@ debian/tmp/usr/share/man/man1/become.1 debian/tmp/usr/share/man/man1/list-user-databases.1 +debian/tmp/usr/share/man/man1/sql.1 debian/tmp/usr/share/man/man1/take.1 diff --git a/misctools/Makefile.am b/misctools/Makefile.am index 1d9c38a..b715aa9 100644 --- a/misctools/Makefile.am +++ b/misctools/Makefile.am @@ -1,2 +1,2 @@ -man_MANS = become.1 list-user-databases.1 +man_MANS = become.1 list-user-databases.1 sql.1 bin_SCRIPTS = become list-user-databases setup-tomcat sql diff --git a/misctools/sql.1.in b/misctools/sql.1.in new file mode 100644 index 000..a52ff42 --- /dev/null +++ b/misctools/sql.1.in @@ -0,0 +1,44 @@ +.TH SQL 1 @TOOLLABS_RELEASEDATE@ @PACKAGE_VERSION@ "Wikimedia Labs Tools misctools" +.SH NAME +sql \- connect to database or execute SQL command +.SH SYNOPSIS +.B sql +.I database + +.B sql +.I database +.I statement +.SH DESCRIPTION +.B sql +connects to the named +.I database +with +.BR mysql ; +if an SQL statement is given, it is executed, otherwise an interactive +session is started. + +There are three categories of databases that can be specified by +.IR database : +.IR enwiki_p , +etc. refers to the database for the English Wikipedia, etc. on the +replica servers. +.I local +only works in the form +.B sql local +and connects to the +.I tools-db +server. +.IR meta_p , +not to be confused with +.IR metawiki_p , +refers to the database that contains meta information about Wikimedia wikis (cf. +.RB < https://wikitech.wikimedia.org/wiki/Help:Tool_Labs/Database#Metadata_database >). +.SH EXIT STATUS +.B sql +returns the exit status of the spawned +.B mysql +command. +.SH AUTHORS +Petr Bena +.SH SEE ALSO +.BR mysql (1) -- To view, visit https://gerrit.wikimedia.org/r/268602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I198b5ad25eaf8bdf99f8056b18e7dea7fa4530de Gerrit-PatchSet: 6 Gerrit-Project: labs/toollabs Gerrit-Branch: master Gerrit-Owner: Tim Landscheidt Gerrit-Reviewer: Coren Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Petrb Gerrit-Reviewer: Tim Landscheidt Gerrit-Reviewer: Yuvipanda Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] labs/toollabs[master]: Import sql from operations/puppet
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/268563 )
Change subject: Import sql from operations/puppet
..
Import sql from operations/puppet
Change-Id: I159b49371a995ca32e1d37bc69d17308d10d8164
---
M debian/changelog
M debian/control
M debian/misctools.install
M misctools/Makefile.am
A misctools/sql
5 files changed, 125 insertions(+), 3 deletions(-)
Approvals:
Tim Landscheidt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/debian/changelog b/debian/changelog
index 8ed41f5..8128862 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@
* Do not hardcore database hosts in list-user-databases
* State dependency on python
* Set target distribution to Ubuntu Trusty
+ * Import sql from operations/puppet
- -- Tim Landscheidt Sun, 26 Feb 2017 01:38:04 +
+ -- Tim Landscheidt Sun, 26 Feb 2017 20:18:21 +
toollabs (1.18) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ee2e5c8..3c9c82c 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@
Package: misctools
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends},
- python, python-mysql.connector
+ mariadb-client-core-5.5, python, python-mysql.connector
Description: Miscellaneous Labs-specific tools
Miscellaneous Labs-specific Tools used on Tool Labs
diff --git a/debian/misctools.install b/debian/misctools.install
index 8480b2b..924a3f9 100644
--- a/debian/misctools.install
+++ b/debian/misctools.install
@@ -1,4 +1,5 @@
usr/bin/become
usr/bin/list-user-databases
+usr/bin/sql
usr/bin/take
usr/bin/setup-tomcat
diff --git a/misctools/Makefile.am b/misctools/Makefile.am
index 4d2ee2b..1d9c38a 100644
--- a/misctools/Makefile.am
+++ b/misctools/Makefile.am
@@ -1,2 +1,2 @@
man_MANS = become.1 list-user-databases.1
-bin_SCRIPTS = become list-user-databases setup-tomcat
+bin_SCRIPTS = become list-user-databases setup-tomcat sql
diff --git a/misctools/sql b/misctools/sql
new file mode 100755
index 000..65f5314
--- /dev/null
+++ b/misctools/sql
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# this tool allow you to connect quickly to sql database
+# it should work for all newbies
+
+verbose=0
+
+function Log {
+if [ $verbose -eq 1 ];then
+ echo "$1"
+fi
+}
+
+if [ $# -lt 1 ];then
+echo "Usage: \"sql [-vh]\" type sql --help for
more help"
+exit 0
+fi
+
+if [ "$1" = "-h" ] || [ "$1" == "--help" ];then
+echo "Usage: sql [_p] [-vh] [command(s)]"
+ echo
+ echo "This tool allows you to easily open a connection to sql database
without having to provide the credentials or a database host server"
+ echo "Example: sql frwiki_p"
+ echo
+ echo "Parameters:"
+ echo " -v: verbose - produce various information about the resolution
of db"
+ echo
+ echo "Report bugs to phabricator: https://phabricator.wikimedia.org";
+ exit 0
+fi
+
+for i
+do
+ if [ "$i" = "-v" ] || [ "$i" = "--verbose" ]
+ then
+ verbose=1
+ fi
+done
+
+if [ ! -f ~/replica.my.cnf ] && [ ! -f ~/.my.cnf ]
+then
+ Log "WARNING: There is no configuration file for mysql to use, you will
probably be unable to access the database"
+fi
+
+param=""
+# check if the user has a replica file
+if [ -f ~/replica.my.cnf ];then
+param=" --defaults-file=~/replica.my.cnf"
+else
+if [ ! -f ~/.my.cnf ];then
+param=" -p"
+fi
+fi
+
+server="enwiki.labsdb"
+db="enwiki_p"
+
+case "$1" in
+"en" | "enwiki" | "enwiki_p")
+server="enwiki.labsdb"
+db="enwiki_p"
+;;
+"de" | "dewiki" | "dewiki_p")
+server="dewiki.labsdb"
+db="dewiki_p"
+;;
+"fr" | "frwiki" | "frwiki_p")
+server="frwiki.labsdb"
+db="frwiki_p"
+;;
+"cs" | "cswiki" | "cswiki_p")
+server="cswiki.labsdb"
+db="cswiki_p"
+;;
+"commons" | "commonswiki" | "commonswiki_p")
+server="commonswiki.labsdb"
+db="commonswiki_p"
+;;
+"wikidata" | "wikidatawiki" | "wikidatawiki_p")
+server="wikidatawiki.labsdb"
+db="wikidatawiki_p"
+;;
+"meta" | "meta_p")
+# Not to confuse with metawiki[_p]
+#
https://wikitech.wikimedia.org/wiki/Nova_Resource:Tools/Help#Metadata_database
+server="s7.labsdb"
+db="meta_p"
+;;
+"local")
+server=tools-db
+db=""
+if [ -f ~/.my.cnf ];then
+ param=""
+fi
+ ;;
+ *)
+ # we don't know what the database is so we check if it exist first
+ Log "This database name is not known by sql script, fallback to dblist
resolution"
+ db="${1%_p}_p"
+ server="${db%_p}.labsdb"
+ if getent hosts -- "$server" > /dev/null
+ then
+ Log "Resolved to $server $db"
+ else
+ echo "Could not find requested database"
+
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Escaping newsletter-subtitlelinks-foo message
D3r1ck01 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339967 )
Change subject: Escaping newsletter-subtitlelinks-foo message
..
Escaping newsletter-subtitlelinks-foo message
* Escape newsletter-subtitlelinks-foo message when its an
active link.
Bug: T159075
Change-Id: Ia3d7cbb1078781ce44bc1496f362097e260a098b
---
M includes/specials/SpecialNewsletter.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/67/339967/1
diff --git a/includes/specials/SpecialNewsletter.php
b/includes/specials/SpecialNewsletter.php
index 7437662..9e93d99 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -139,7 +139,7 @@
$link = $linkRenderer->makeKnownLink( $title,
$msg, [], ['action'=>'edit'] );
}
if ( $current === $action ) {
- $links[] = Linker::makeSelfLinkObj( $title,
$msg );
+ $links[] = Linker::makeSelfLinkObj( $title,
$msg->escaped() );
} else {
$links[] = $link;
--
To view, visit https://gerrit.wikimedia.org/r/339967
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3d7cbb1078781ce44bc1496f362097e260a098b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Remove unused variables. var-ify various declarations
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339966 )
Change subject: Remove unused variables. var-ify various declarations
..
Remove unused variables. var-ify various declarations
Bug: T159076
Change-Id: I6c27f836b7ec37c225bbab652bf7c445f1b89208
---
M modules/ext.CollaborationKit.hubtheme.js
M modules/ext.CollaborationKit.iconbrowser.js
M modules/ext.CollaborationKit.list.edit.js
M modules/ext.CollaborationKit.list.members.js
M modules/ext.CollaborationKit.list.ui.js
5 files changed, 27 insertions(+), 27 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/66/339966/1
diff --git a/modules/ext.CollaborationKit.hubtheme.js
b/modules/ext.CollaborationKit.hubtheme.js
index 7a97260..63a0d99 100644
--- a/modules/ext.CollaborationKit.hubtheme.js
+++ b/modules/ext.CollaborationKit.hubtheme.js
@@ -56,7 +56,7 @@
* to initialize widgets, and to set up event handlers.
*/
ColourProcessDialog.prototype.initialize = function () {
- var colourList, radioChoices, className;
+ var colourList, radioChoices;
ColourProcessDialog.super.prototype.initialize.apply( this,
arguments );
@@ -65,7 +65,7 @@
colourList = mw.config.get( 'wgCollaborationKitColourList' );
radioChoices = [];
- for ( i = 0; i < colourList.length; i++ ) {
+ for ( var i = 0; i < colourList.length; i++ ) {
radioChoices.push( new OO.ui.RadioOptionWidget( {
label: getColourBlock( colourList[ i ] ),
data: colourList[ i ]
@@ -90,7 +90,7 @@
*
*/
ColourProcessDialog.prototype.getActionProcess = function ( action ) {
- var dialog, toAppend, openColourBrowser, windowManager,
colourBrowserButton, oldColour;
+ var dialog, oldColour;
oldColour = $( 'div.mw-ck-colour-input select option:selected'
).val();
dialog = this;
@@ -136,11 +136,11 @@
* Create and append the window manager.
*/
openColourBrowser = function () {
- windowManager = new OO.ui.WindowManager();
+ var windowManager = new OO.ui.WindowManager();
$( 'body' ).append( windowManager.$element );
// Create a new dialog window.
- processDialog = new ColourProcessDialog( {
+ var processDialog = new ColourProcessDialog( {
size: 'medium'
} );
@@ -208,21 +208,20 @@
*
*/
ImageProcessDialog.prototype.getActionProcess = function ( action ) {
- var dialog, openImageBrowser, windowManager, processDialog,
fileTitle,
- currentImageFilename, currentImage,
hubimageBrowserButton;
+ var dialog, fileTitle;
dialog = this;
if ( action ) {
return new OO.ui.Process( function () {
- fileObj =
dialog.content.getResults().getSelectedItem();
+ var fileObj =
dialog.content.getResults().getSelectedItem();
if ( fileObj === null ) {
return dialog.close();
}
getThumbnail( fileObj.getData().title )
.done( function ( data ) {
- fileUrl = data.query.pages[ 0
].imageinfo[ 0 ].thumburl;
- fileHeight = data.query.pages[
0 ].imageinfo[ 0 ].thumbheight;
- fileTitleObj = new mw.Title(
fileObj.getData().title );
+ var fileUrl = data.query.pages[
0 ].imageinfo[ 0 ].thumburl;
+ var fileHeight =
data.query.pages[ 0 ].imageinfo[ 0 ].thumbheight;
+ var fileTitleObj = new
mw.Title( fileObj.getData().title );
fileTitle = fileTitleObj.title
+ '.' + fileTitleObj.ext;
// Generate preview
@@ -251,11 +250,11 @@
* Create and append the window manager.
*/
openImageBrowser = function () {
- windowManager = new OO.ui.WindowManager();
+ var windowManager = new OO.ui.WindowManager();
$( 'body' ).append( windowManager.$element );
// Create a new dialog window.
- processDialog = new ImageProcessDialog( {
+ var processDialog = new ImageProcessDialog( {
size: 'large'
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Converting $values to HTML entity after truncating
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339963 ) Change subject: Converting $values to HTML entity after truncating .. Converting $values to HTML entity after truncating * On NewsletterTablePager.php line 96, we convert special chars of $value to an HTML entity after truncating to for an entity reference to get cut off in the middle, but nonetheless escaping should always be the last thing you do (as quoted by Brian Wolff). Bug: T159075 Change-Id: Ie1491f10fafeb7eba3073472cd9e2790f35d88b7 --- M includes/specials/pagers/NewsletterTablePager.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Brian Wolff: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/specials/pagers/NewsletterTablePager.php b/includes/specials/pagers/NewsletterTablePager.php index f704b92..12e483c 100644 --- a/includes/specials/pagers/NewsletterTablePager.php +++ b/includes/specials/pagers/NewsletterTablePager.php @@ -93,7 +93,7 @@ return htmlspecialchars( $value ); } case 'nl_desc': - return $wgContLang->truncate( htmlspecialchars( $value ), 644 ); + return htmlspecialchars( $wgContLang->truncate( $value, 644 ) ); case 'subscriber_count': return Html::element( 'span', -- To view, visit https://gerrit.wikimedia.org/r/339963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie1491f10fafeb7eba3073472cd9e2790f35d88b7 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: D3r1ck01 Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com> Gerrit-Reviewer: Addshore Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: D3r1ck01 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...ShoutWikiAds[master]: Organized CSS for each skin into their own folders
SamanthaNguyen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339965 ) Change subject: Organized CSS for each skin into their own folders .. Organized CSS for each skin into their own folders Change-Id: Ie52c0388cf6e99964b79a7e44a3c68a7723dbe6b --- R css/aurora/aurora-leaderboard-ad.css R css/aurora/aurora-skyscraper-ad.css R css/cologneblue/cologneblue-leaderboard-ad.css R css/home/home-leaderboard-bottom-ad.css R css/home/home-skyscraper-ad.css R css/metrolook/metrolook-button-ad.css R css/metrolook/metrolook-leaderboard-ad.css R css/metrolook/metrolook-wide-skyscraper-ad.less R css/modern/modern-button-ad.css R css/modern/modern-leaderboard-ad.css R css/monaco/monaco-ads.css R css/monobook/monobook-button-ad.css R css/monobook/monobook-skyscraper-ad.css R css/quartz/quartz-square-ad.css R css/refreshed/refreshed-button-ad.css R css/refreshed/refreshed.css R css/truglass/truglass-leaderboard-ad.css R css/vector/vector-button-ad.css R css/vector/vector-skyscraper-ad.css M extension.json 20 files changed, 20 insertions(+), 20 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ShoutWikiAds refs/changes/65/339965/1 diff --git a/css/aurora-leaderboard-ad.css b/css/aurora/aurora-leaderboard-ad.css similarity index 100% rename from css/aurora-leaderboard-ad.css rename to css/aurora/aurora-leaderboard-ad.css diff --git a/css/aurora-skyscraper-ad.css b/css/aurora/aurora-skyscraper-ad.css similarity index 100% rename from css/aurora-skyscraper-ad.css rename to css/aurora/aurora-skyscraper-ad.css diff --git a/css/cologneblue-leaderboard-ad.css b/css/cologneblue/cologneblue-leaderboard-ad.css similarity index 100% rename from css/cologneblue-leaderboard-ad.css rename to css/cologneblue/cologneblue-leaderboard-ad.css diff --git a/css/home-leaderboard-bottom-ad.css b/css/home/home-leaderboard-bottom-ad.css similarity index 100% rename from css/home-leaderboard-bottom-ad.css rename to css/home/home-leaderboard-bottom-ad.css diff --git a/css/home-skyscraper-ad.css b/css/home/home-skyscraper-ad.css similarity index 100% rename from css/home-skyscraper-ad.css rename to css/home/home-skyscraper-ad.css diff --git a/css/metrolook-button-ad.css b/css/metrolook/metrolook-button-ad.css similarity index 100% rename from css/metrolook-button-ad.css rename to css/metrolook/metrolook-button-ad.css diff --git a/css/metrolook-leaderboard-ad.css b/css/metrolook/metrolook-leaderboard-ad.css similarity index 100% rename from css/metrolook-leaderboard-ad.css rename to css/metrolook/metrolook-leaderboard-ad.css diff --git a/css/metrolook-wide-skyscraper-ad.less b/css/metrolook/metrolook-wide-skyscraper-ad.less similarity index 100% rename from css/metrolook-wide-skyscraper-ad.less rename to css/metrolook/metrolook-wide-skyscraper-ad.less diff --git a/css/modern-button-ad.css b/css/modern/modern-button-ad.css similarity index 100% rename from css/modern-button-ad.css rename to css/modern/modern-button-ad.css diff --git a/css/modern-leaderboard-ad.css b/css/modern/modern-leaderboard-ad.css similarity index 100% rename from css/modern-leaderboard-ad.css rename to css/modern/modern-leaderboard-ad.css diff --git a/css/monaco-ads.css b/css/monaco/monaco-ads.css similarity index 100% rename from css/monaco-ads.css rename to css/monaco/monaco-ads.css diff --git a/css/monobook-button-ad.css b/css/monobook/monobook-button-ad.css similarity index 100% rename from css/monobook-button-ad.css rename to css/monobook/monobook-button-ad.css diff --git a/css/monobook-skyscraper-ad.css b/css/monobook/monobook-skyscraper-ad.css similarity index 100% rename from css/monobook-skyscraper-ad.css rename to css/monobook/monobook-skyscraper-ad.css diff --git a/css/quartz-square-ad.css b/css/quartz/quartz-square-ad.css similarity index 100% rename from css/quartz-square-ad.css rename to css/quartz/quartz-square-ad.css diff --git a/css/refreshed-button-ad.css b/css/refreshed/refreshed-button-ad.css similarity index 100% rename from css/refreshed-button-ad.css rename to css/refreshed/refreshed-button-ad.css diff --git a/css/refreshed.css b/css/refreshed/refreshed.css similarity index 100% rename from css/refreshed.css rename to css/refreshed/refreshed.css diff --git a/css/truglass-leaderboard-ad.css b/css/truglass/truglass-leaderboard-ad.css similarity index 100% rename from css/truglass-leaderboard-ad.css rename to css/truglass/truglass-leaderboard-ad.css diff --git a/css/vector-button-ad.css b/css/vector/vector-button-ad.css similarity index 100% rename from css/vector-button-ad.css rename to css/vector/vector-button-ad.css diff --git a/css/vector-skyscraper-ad.css b/css/vector/vector-skyscraper-ad.css similarity index 100% rename from css/vector-skyscraper-ad.css rename to css/vector/vector-skyscraper-ad.css diff --git a/extension.json b/extension.json index c14e3ee..bc08620 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: CSS improvements according to PhpStorm
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339964 )
Change subject: CSS improvements according to PhpStorm
..
CSS improvements according to PhpStorm
Bug: T138324
Change-Id: I46ca47bb2ffd3bd2b75d89291727189bdb90
---
M modules/ext.CollaborationKit.edit.styles.less
M modules/ext.CollaborationKit.hub.styles.less
M modules/ext.CollaborationKit.hubtheme.styles.less
M modules/ext.CollaborationKit.list.styles.less
M tests/phpunit/CollaborationKitImageTest.php
5 files changed, 14 insertions(+), 24 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/64/339964/1
diff --git a/modules/ext.CollaborationKit.edit.styles.less
b/modules/ext.CollaborationKit.edit.styles.less
index d72365d..92cd6bb 100644
--- a/modules/ext.CollaborationKit.edit.styles.less
+++ b/modules/ext.CollaborationKit.edit.styles.less
@@ -23,10 +23,9 @@
.ck-customeditor-borders( @color ) {
.mw-collabkit-modifiededitform {
padding: 1.5em 1em;
- border-left: solid 1px fadeout( @color, 85% );
- border-right: solid 1px fadeout( @color, 85% );
- border-top: solid 3px @color;
- border-bottom: solid 4px @color;
+ border: 1px solid;
+ border-top-width: 3px;
+ border-bottom-width: 4px;
background-color: fadeout( @color, 95% );
}
}
diff --git a/modules/ext.CollaborationKit.hub.styles.less
b/modules/ext.CollaborationKit.hub.styles.less
index 468deb6..8f5c16e 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -61,16 +61,9 @@
h2 {
display: inline;
- padding: 0;
margin: 0;
- border-bottom-style: none;
- border-top-style: none;
- border-left-style: none;
- border-right-style: none;
- }
-
- .mw-ck-hub-section-main {
- padding-top: .25em;
+ padding: 0 0 .25em;
+ border-style: none;
}
}
.mw-ck-hub-section-buttons {
@@ -109,8 +102,7 @@
width: 25%;
h3 {
- margin: 0;
- margin-bottom: .5em;
+ margin: 0 0 .5em;
padding: 0;
text-align: center;
}
diff --git a/modules/ext.CollaborationKit.hubtheme.styles.less
b/modules/ext.CollaborationKit.hubtheme.styles.less
index bb67d05..0eb8905 100644
--- a/modules/ext.CollaborationKit.hubtheme.styles.less
+++ b/modules/ext.CollaborationKit.hubtheme.styles.less
@@ -93,9 +93,9 @@
border: 2px solid #2a4b8d;
width: 146px;
height: 26px;
- -webkit-box-shadow: 0 0 5px 0px rgba(42,75,141,1);
- -moz-box-shadow: 0 0 5px 0px rgba(42,75,141,1);
- box-shadow: 0 0 5px 0px rgba(42,75,141,1);
+ -webkit-box-shadow: 0 0 5px 0 rgba(42,75,141,1);
+ -moz-box-shadow: 0 0 5px 0 rgba(42,75,141,1);
+ box-shadow: 0 0 5px 0 rgba(42,75,141,1);
}
.colourBrowserButton {
diff --git a/modules/ext.CollaborationKit.list.styles.less
b/modules/ext.CollaborationKit.list.styles.less
index a9e22c4..3095849 100644
--- a/modules/ext.CollaborationKit.list.styles.less
+++ b/modules/ext.CollaborationKit.list.styles.less
@@ -20,8 +20,7 @@
height: 64px;
content: '';
background-size: contain;
- background-color: #eee;
- background-position: 50% 50%;
+ background: #eee 50% 50%;
}
.mw-ck-list-container {
height: 64px;
diff --git a/tests/phpunit/CollaborationKitImageTest.php
b/tests/phpunit/CollaborationKitImageTest.php
index b9a2e39..e46f3ce 100644
--- a/tests/phpunit/CollaborationKitImageTest.php
+++ b/tests/phpunit/CollaborationKitImageTest.php
@@ -40,18 +40,18 @@
$expected = [
'',
'',
- '',
+ '',
'',
'',
'',
- '',
+ '',
'WikiWiki',
'[[File:Example.svg|76px]]',
- '[[File:Example.svg|76px]]',
+ '[[File:Example.svg|76px]]',
'',
'https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/Example.svg/76px-Example.svg.png";
width="76" height="76" />',
'https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/Example.svg/76px-Example.svg.png";
width="76" height="76" />',
- 'https://upload.wikimedia.org/wikipedia/commons/thumb/8/84/Example.svg/76px-Example.svg.png";
width="76" height="76" />',
+
[MediaWiki-commits] [Gerrit] mediawiki...Newsletter[master]: Converting speicial characters to HTML before truncating
D3r1ck01 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339963 ) Change subject: Converting speicial characters to HTML before truncating .. Converting speicial characters to HTML before truncating * On NewsletterTablePager.php line 96, we concert special chars to HTML before truncating to for an entity reference to get cut off in the middle, but nonetheless escaping should always be the last thing you do (as quoted by Brian Wolff). Change-Id: Ie1491f10fafeb7eba3073472cd9e2790f35d88b7 --- M includes/specials/pagers/NewsletterTablePager.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter refs/changes/63/339963/1 diff --git a/includes/specials/pagers/NewsletterTablePager.php b/includes/specials/pagers/NewsletterTablePager.php index f704b92..bebefa8 100644 --- a/includes/specials/pagers/NewsletterTablePager.php +++ b/includes/specials/pagers/NewsletterTablePager.php @@ -93,7 +93,7 @@ return htmlspecialchars( $value ); } case 'nl_desc': - return $wgContLang->truncate( htmlspecialchars( $value ), 644 ); + return htmlspecialchars( $wgContLang->truncate( $value ), 644 ); case 'subscriber_count': return Html::element( 'span', -- To view, visit https://gerrit.wikimedia.org/r/339963 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie1491f10fafeb7eba3073472cd9e2790f35d88b7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Newsletter Gerrit-Branch: master Gerrit-Owner: D3r1ck01 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Adding hub section main bodies to their own container and se...
Harej has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339813 )
Change subject: Adding hub section main bodies to their own container and
setting padding
..
Adding hub section main bodies to their own container and setting padding
I think having the buttons become in-line with the H2 headers broke
padding. This fixes that by having everything after the top being
in a container div, with padding-top set to 0.25 em.
Change-Id: Id4fc1f85a23993d1ad1955c655dcef9e25195365
---
M includes/content/CollaborationHubContent.php
M modules/ext.CollaborationKit.hub.styles.less
2 files changed, 6 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index aa135bc..bf3f983 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -594,7 +594,7 @@
$text = $contentOutput->getRawText();
}
- $html .= $text;
+ $html .= Html::rawElement( 'div', [ 'class' =>
'mw-ck-hub-section-main' ], $text );
// register as template for stuff
$output->addTemplate( $spTitle,
$spTitle->getArticleID(), $spRev->getId() );
diff --git a/modules/ext.CollaborationKit.hub.styles.less
b/modules/ext.CollaborationKit.hub.styles.less
index b5bcb8b..468deb6 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -61,13 +61,17 @@
h2 {
display: inline;
+ padding: 0;
margin: 0;
- padding: 0 0 .25em;
border-bottom-style: none;
border-top-style: none;
border-left-style: none;
border-right-style: none;
}
+
+ .mw-ck-hub-section-main {
+ padding-top: .25em;
+ }
}
.mw-ck-hub-section-buttons {
display: inline;
--
To view, visit https://gerrit.wikimedia.org/r/339813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4fc1f85a23993d1ad1955c655dcef9e25195365
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
Gerrit-Reviewer: Harej
Gerrit-Reviewer: Isarra
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...CollaborationKit[master]: Define extension.json requirements for MediaWiki and EventLo...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339962 )
Change subject: Define extension.json requirements for MediaWiki and
EventLogging extension
..
Define extension.json requirements for MediaWiki and EventLogging extension
UsageException has been around for ever, but is deprecated. Replacement of
ApiUsageException needs MW >= 1.29
EventLogging used for schema validation
Bug: T159076
Change-Id: I701c329dff2239904a225401dfde2757f095e0b0
---
M extension.json
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 282a35d..f687e74 100644
--- a/extension.json
+++ b/extension.json
@@ -6,6 +6,12 @@
"descriptionmsg": "collaborationkit-desc",
"type": "other",
"license-name": "GPL-2.0+",
+ "requires": {
+ "MediaWiki": ">= 1.29",
+ "extensions": {
+ "EventLogging": "*"
+ }
+ },
"MessagesDirs": {
"CollaborationKit": [
"i18n"
--
To view, visit https://gerrit.wikimedia.org/r/339962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I701c329dff2239904a225401dfde2757f095e0b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Reedy
Gerrit-Reviewer: Harej
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...CollaborationKit[master]: Define extension.json requirements for MediaWiki and EventLo...
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339962 )
Change subject: Define extension.json requirements for MediaWiki and
EventLogging extension
..
Define extension.json requirements for MediaWiki and EventLogging extension
UsageException has been around for ever, but is deprecated. Replacement of
ApiUsageException needs MW >= 1.29
EventLogging used for schema validation
Bug: T159076
Change-Id: I701c329dff2239904a225401dfde2757f095e0b0
---
M extension.json
1 file changed, 6 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/62/339962/1
diff --git a/extension.json b/extension.json
index 282a35d..f687e74 100644
--- a/extension.json
+++ b/extension.json
@@ -6,6 +6,12 @@
"descriptionmsg": "collaborationkit-desc",
"type": "other",
"license-name": "GPL-2.0+",
+ "requires": {
+ "MediaWiki": ">= 1.29",
+ "extensions": {
+ "EventLogging": "*"
+ }
+ },
"MessagesDirs": {
"CollaborationKit": [
"i18n"
--
To view, visit https://gerrit.wikimedia.org/r/339962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I701c329dff2239904a225401dfde2757f095e0b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Reedy
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: More PHP cleanup of CollaborationKit
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339961 )
Change subject: More PHP cleanup of CollaborationKit
..
More PHP cleanup of CollaborationKit
Mostly php docs and type hints this time
Bug: T159076
Change-Id: Ibea48856af3bd0b66d0d69c367681a0025efd17a
---
M CollaborationKit.hooks.php
M includes/CollaborationHubContentEditor.php
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentHandler.php
M includes/content/CollaborationHubTOC.php
M includes/content/CollaborationKitImage.php
M includes/content/CollaborationListContent.php
M includes/content/CollaborationListContentHandler.php
M modules/ext.CollaborationKit.hubtheme.js
M modules/ext.CollaborationKit.list.edit.js
M tests/phpunit/CollaborationHubContentHandlerTest.php
M tests/phpunit/CollaborationHubTOCTest.php
M tests/phpunit/CollaborationListContentHandlerTest.php
13 files changed, 68 insertions(+), 21 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index c36e5c0..4404754 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -103,14 +103,19 @@
$title = $out->getTitle();
$parentHub = CollaborationHubContent::getParentHub( $title );
- if ( $parentHub
- && $out->getProperty( 'CollaborationHubSubpage' ) ===
'in-progress'
- && count( Revision::newFromTitle( $parentHub
)->getContent()->getContent() ) > 0
+ if ( !$parentHub
+ || $out->getProperty( 'CollaborationHubSubpage' ) !==
'in-progress'
) {
+ return true;
+ }
+
+ /** @var CollaborationHubContent $revisionContent */
+ $revisionContent = Revision::newFromTitle( $parentHub
)->getContent();
+ if ( count( $revisionContent->getContent() ) > 0 ) {
$toc = new CollaborationHubTOC();
$out->prependHTML( $toc->renderSubpageToC( $parentHub )
);
- $colour = Revision::newFromTitle( $parentHub
)->getContent()->getThemeColour();
+ $colour = $revisionContent->getThemeColour();
$text = Html::rawElement( 'div', [ 'class' =>
"mw-cklist-square-$colour" ], $text );
$out->addModuleStyles( [
diff --git a/includes/CollaborationHubContentEditor.php
b/includes/CollaborationHubContentEditor.php
index fb7c4a2..b35e132 100644
--- a/includes/CollaborationHubContentEditor.php
+++ b/includes/CollaborationHubContentEditor.php
@@ -141,12 +141,14 @@
*/
protected function showContentForm() {
if ( $this->contentFormat !==
CollaborationHubContentHandler::FORMAT_WIKI ) {
- return parent::showContentForm();
+ parent::showContentForm();
+ return;
}
$parts = explode( CollaborationHubContent::HUMAN_DESC_SPLIT,
$this->textbox1, 6 );
if ( count( $parts ) !== 6 ) {
- return parent::showContentForm();
+ parent::showContentForm();
+ return;
}
$out = RequestContext::getMain()->getOutput();
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 86ae8b2..aa135bc 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -77,6 +77,9 @@
];
}
+ /**
+* @param $text string
+*/
function __construct( $text ) {
parent::__construct( $text, 'CollaborationHubContent' );
}
@@ -544,6 +547,7 @@
if ( isset( $spRev ) ) {
// DO CONTENT FROM PAGE
+ /** @var CollaborationHubContent $spContent */
$spContent = $spRev->getContent();
$spContentModel = $spRev->getContentModel();
@@ -557,6 +561,7 @@
$text .=
$spContent->getParsedIntroduction( $spTitle, $options );
} elseif ( $spContentModel ==
'CollaborationListContent' ) {
// convert to wikitext with maxItems
limit in place
+ /** @var CollaborationListContent
$spContent */
$wikitext =
$spContent->convertToWikitext(
$lang,
[
@@ -697,18 +702,16 @@
* @param string $link Target URL
* @param string $
[MediaWiki-commits] [Gerrit] mediawiki...PageLanguageApi[master]: Add Doxygen param for marking PageLanguageApi class module a...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339960 )
Change subject: Add Doxygen param for marking PageLanguageApi class module as
deprecated
..
Add Doxygen param for marking PageLanguageApi class module as deprecated
Change-Id: Idfaa67c574de2e22f0131cbf6459d1173fb53188
---
M extension.json
M includes/api/PageLanguageApi.php
2 files changed, 11 insertions(+), 10 deletions(-)
Approvals:
Mainframe98: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 571633b..5d46278 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
{
"name": "PageLanguageApi",
"namemsg": "pagelanguageapi-extensionname",
- "version": "1.0.0.0",
+ "version": "1.0.0.1",
"author": "Klaas Skelte van der Werf",
"url": "https://www.mediawiki.org/wiki/Extension:PageLanguageApi";,
"descriptionmsg": "pagelanguageapi-desc",
diff --git a/includes/api/PageLanguageApi.php b/includes/api/PageLanguageApi.php
index 5c6be72..808db68 100644
--- a/includes/api/PageLanguageApi.php
+++ b/includes/api/PageLanguageApi.php
@@ -1,9 +1,4 @@
https://www.mediawiki.org/wiki/API:PageLanguage';
--
To view, visit https://gerrit.wikimedia.org/r/339960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idfaa67c574de2e22f0131cbf6459d1173fb53188
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageLanguageApi
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
Gerrit-Reviewer: Mainframe98
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...CollaborationKit[master]: More PHP cleanup of CollaborationKit
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339961 )
Change subject: More PHP cleanup of CollaborationKit
..
More PHP cleanup of CollaborationKit
Mostly php docs and type hints this time
Bug: T159076
Change-Id: Ibea48856af3bd0b66d0d69c367681a0025efd17a
---
M CollaborationKit.hooks.php
M includes/CollaborationHubContentEditor.php
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentHandler.php
M includes/content/CollaborationHubTOC.php
M includes/content/CollaborationKitImage.php
M includes/content/CollaborationListContent.php
M includes/content/CollaborationListContentHandler.php
M modules/ext.CollaborationKit.hubtheme.js
M modules/ext.CollaborationKit.list.edit.js
M tests/phpunit/CollaborationHubContentHandlerTest.php
M tests/phpunit/CollaborationHubTOCTest.php
M tests/phpunit/CollaborationListContentHandlerTest.php
13 files changed, 68 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/61/339961/1
diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index c36e5c0..4404754 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -103,14 +103,19 @@
$title = $out->getTitle();
$parentHub = CollaborationHubContent::getParentHub( $title );
- if ( $parentHub
- && $out->getProperty( 'CollaborationHubSubpage' ) ===
'in-progress'
- && count( Revision::newFromTitle( $parentHub
)->getContent()->getContent() ) > 0
+ if ( !$parentHub
+ || $out->getProperty( 'CollaborationHubSubpage' ) !==
'in-progress'
) {
+ return true;
+ }
+
+ /** @var CollaborationHubContent $revisionContent */
+ $revisionContent = Revision::newFromTitle( $parentHub
)->getContent();
+ if ( count( $revisionContent->getContent() ) > 0 ) {
$toc = new CollaborationHubTOC();
$out->prependHTML( $toc->renderSubpageToC( $parentHub )
);
- $colour = Revision::newFromTitle( $parentHub
)->getContent()->getThemeColour();
+ $colour = $revisionContent->getThemeColour();
$text = Html::rawElement( 'div', [ 'class' =>
"mw-cklist-square-$colour" ], $text );
$out->addModuleStyles( [
diff --git a/includes/CollaborationHubContentEditor.php
b/includes/CollaborationHubContentEditor.php
index fb7c4a2..b35e132 100644
--- a/includes/CollaborationHubContentEditor.php
+++ b/includes/CollaborationHubContentEditor.php
@@ -141,12 +141,14 @@
*/
protected function showContentForm() {
if ( $this->contentFormat !==
CollaborationHubContentHandler::FORMAT_WIKI ) {
- return parent::showContentForm();
+ parent::showContentForm();
+ return;
}
$parts = explode( CollaborationHubContent::HUMAN_DESC_SPLIT,
$this->textbox1, 6 );
if ( count( $parts ) !== 6 ) {
- return parent::showContentForm();
+ parent::showContentForm();
+ return;
}
$out = RequestContext::getMain()->getOutput();
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 86ae8b2..a2d4bb0 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -77,6 +77,9 @@
];
}
+ /**
+* @param $text string
+*/
function __construct( $text ) {
parent::__construct( $text, 'CollaborationHubContent' );
}
@@ -544,6 +547,7 @@
if ( isset( $spRev ) ) {
// DO CONTENT FROM PAGE
+ /** @var CollaborationHubContent $spContent */
$spContent = $spRev->getContent();
$spContentModel = $spRev->getContentModel();
@@ -557,6 +561,7 @@
$text .=
$spContent->getParsedIntroduction( $spTitle, $options );
} elseif ( $spContentModel ==
'CollaborationListContent' ) {
// convert to wikitext with maxItems
limit in place
+ /** @var CollaborationListContent
$spContent */
$wikitext =
$spContent->convertToWikitext(
$lang,
[
@@ -624,6 +629,7 @@
* @return string html (NOTE THIS IS AN
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Various PHP cleanup of CollaborationKit
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339958 )
Change subject: Various PHP cleanup of CollaborationKit
..
Various PHP cleanup of CollaborationKit
Bug: T159076
Change-Id: Ic9064ba5386b7fc8d2a9f7ff088344e2417e5cc6
---
M CollaborationKit.hooks.php
M includes/CollaborationListContentEditor.php
M includes/SpecialCreateCollaborationHub.php
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentHandler.php
M includes/content/CollaborationKitImage.php
M includes/content/CollaborationListContent.php
M includes/content/CollaborationListContentHandler.php
M tests/phpunit/CollaborationHubContentHandlerTest.php
M tests/phpunit/CollaborationHubContentTest.php
M tests/phpunit/CollaborationHubTOCTest.php
M tests/phpunit/CollaborationKitImageTest.php
M tests/phpunit/CollaborationListContentHandlerTest.php
M tests/phpunit/CollaborationListContentTest.php
14 files changed, 76 insertions(+), 59 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index 0a80756..c36e5c0 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -40,7 +40,7 @@
// Add feature
$links['actions']['addnewfeature'] = [
'class' => '',
- 'href' => SpecialPage::getTitleFor(
'CreateHubFeature' )->getFullUrl( [ 'collaborationhub' => $title->getFullText()
] ),
+ 'href' => SpecialPage::getTitleFor(
'CreateHubFeature' )->getFullURL( [ 'collaborationhub' => $title->getFullText()
] ),
'text' => wfMessage(
'collaborationkit-hub-addpage' )->text()
];
}
@@ -108,7 +108,7 @@
&& count( Revision::newFromTitle( $parentHub
)->getContent()->getContent() ) > 0
) {
$toc = new CollaborationHubTOC();
- $out->prependHtml( $toc->renderSubpageToC( $parentHub )
);
+ $out->prependHTML( $toc->renderSubpageToC( $parentHub )
);
$colour = Revision::newFromTitle( $parentHub
)->getContent()->getThemeColour();
$text = Html::rawElement( 'div', [ 'class' =>
"mw-cklist-square-$colour" ], $text );
diff --git a/includes/CollaborationListContentEditor.php
b/includes/CollaborationListContentEditor.php
index f2a73c3..e2ff679 100644
--- a/includes/CollaborationListContentEditor.php
+++ b/includes/CollaborationListContentEditor.php
@@ -28,12 +28,14 @@
*/
protected function showContentForm() {
if ( $this->contentFormat !==
CollaborationListContentHandler::FORMAT_WIKI ) {
- return parent::showContentForm();
+ parent::showContentForm();
+ return;
}
$parts = explode( CollaborationListContent::HUMAN_DESC_SPLIT,
$this->textbox1, 3 );
if ( count( $parts ) !== 3 ) {
- return parent::showContentForm();
+ parent::showContentForm();
+ return;
}
$out = RequestContext::getMain()->getOutput();
$out->addHTML( Html::hidden( 'wpCollaborationKitOptions',
$parts[1] ) );
diff --git a/includes/SpecialCreateCollaborationHub.php
b/includes/SpecialCreateCollaborationHub.php
index 437b355..73a534c 100644
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -250,7 +250,7 @@
}
// Once all the pages we want to create are created, we send
them to the first one
- $this->getOutput()->redirect( $title->getFullUrl() );
+ $this->getOutput()->redirect( $title->getFullURL() );
return Status::newGood();
}
@@ -260,8 +260,6 @@
/**
* Set the form format to ooui for consistency with the rest of the ck
stuff
-* @param $form HTMLForm
-*
*/
protected function getDisplayFormat() {
return 'ooui';
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 1f0410a..86ae8b2 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -41,6 +41,9 @@
/** @var bool Whether contents have been populated */
protected $decoded = false;
+ /** @var string Error message text */
+ protected $errortext;
+
/**
* 23 preset colours; actual colour values are set in the
extension.json and less modules
*
@@ -98,7 +101,6 @@
[MediaWiki-commits] [Gerrit] mediawiki...PageLanguageApi[master]: Add Doxygen param for marking PageLanguageApi class module a...
SamanthaNguyen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339960 )
Change subject: Add Doxygen param for marking PageLanguageApi class module as
deprecated
..
Add Doxygen param for marking PageLanguageApi class module as deprecated
Change-Id: Idfaa67c574de2e22f0131cbf6459d1173fb53188
---
M extension.json
M includes/api/PageLanguageApi.php
2 files changed, 11 insertions(+), 10 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageLanguageApi
refs/changes/60/339960/1
diff --git a/extension.json b/extension.json
index 571633b..5d46278 100644
--- a/extension.json
+++ b/extension.json
@@ -1,7 +1,7 @@
{
"name": "PageLanguageApi",
"namemsg": "pagelanguageapi-extensionname",
- "version": "1.0.0.0",
+ "version": "1.0.0.1",
"author": "Klaas Skelte van der Werf",
"url": "https://www.mediawiki.org/wiki/Extension:PageLanguageApi";,
"descriptionmsg": "pagelanguageapi-desc",
diff --git a/includes/api/PageLanguageApi.php b/includes/api/PageLanguageApi.php
index 5c6be72..808db68 100644
--- a/includes/api/PageLanguageApi.php
+++ b/includes/api/PageLanguageApi.php
@@ -1,9 +1,4 @@
https://www.mediawiki.org/wiki/API:PageLanguage';
--
To view, visit https://gerrit.wikimedia.org/r/339960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfaa67c574de2e22f0131cbf6459d1173fb53188
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageLanguageApi
Gerrit-Branch: master
Gerrit-Owner: SamanthaNguyen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use list tool group for editor switching
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339959 )
Change subject: Use list tool group for editor switching
..
Use list tool group for editor switching
Bug: T116417
Change-Id: Iadf5a81e2733ab81fe25c686dcd6dad8eac3885c
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css
A modules/ve-mw/init/styles/ve.init.MWVESwitchPopupWidget.css
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
M modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
A modules/ve-mw/init/ve.init.MWEditModeTool.js
A modules/ve-mw/init/ve.init.MWVESwitchPopupWidget.js
M modules/ve-mw/ui/styles/tools/ve.ui.MWPopupTool.css
M modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js
12 files changed, 313 insertions(+), 159 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/59/339959/1
diff --git a/extension.json b/extension.json
index a5132f7..e458f91 100644
--- a/extension.json
+++ b/extension.json
@@ -1116,9 +1116,14 @@
"ext.visualEditor.switching": {
"scripts": [
"modules/ve-mw/init/ve.init.MWVESwitchConfirmDialog.js",
-
"modules/ve-mw/init/ve.init.MWEditingTabDialog.js"
+
"modules/ve-mw/init/ve.init.MWVESwitchPopupWidget.js",
+
"modules/ve-mw/init/ve.init.MWEditingTabDialog.js",
+ "modules/ve-mw/init/ve.init.MWEditModeTool.js"
],
- "styles":
"modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css",
+ "styles": [
+
"modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog.css",
+
"modules/ve-mw/init/styles/ve.init.MWVESwitchPopupWidget.css"
+ ],
"skinStyles": {
"vector": [
"modules/ve-mw/init/styles/ve.init.MWVESwitchConfirmDialog-vector.css"
@@ -1136,6 +1141,8 @@
"visualeditor-editingtabdialog-body",
"visualeditor-editingtabdialog-ok",
"visualeditor-editingtabdialog-title",
+ "visualeditor-mweditmode-tooltip",
+ "visualeditor-mweditmodesource-tool",
"visualeditor-mweditmodesource-warning-cancel",
"visualeditor-mweditmodesource-warning-switch",
"visualeditor-mweditmodesource-warning-switch-discard",
@@ -1260,7 +1267,6 @@
"visualeditor-help-title",
"visualeditor-mweditmodesource-progress",
"visualeditor-mweditmodesource-title",
- "visualeditor-mweditmodesource-tool",
"visualeditor-mweditmodesource-warning",
"visualeditor-mweditmodesource-warning-cancel",
"visualeditor-mweditmodesource-warning-switch",
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 5dfe4c6..9f2025a 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -272,6 +272,7 @@
"visualeditor-mainnamespacepagelink": "Project:Main namespace",
"visualeditor-media-input-placeholder": "Search for media",
"visualeditor-meta-tool": "Options",
+ "visualeditor-mweditmode-tooltip": "Switch editor",
"visualeditor-mweditmodesource-progress": "Switching to source
editing…",
"visualeditor-mweditmodesource-title": "Switch to source editing?",
"visualeditor-mweditmodesource-tool": "Switch to source editing",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 6a138e3..e840a08 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -285,6 +285,7 @@
"visualeditor-mainnamespacepagelink": "Name of a page describing the
main namespace (NS0) in this project.\n{{doc-important|Do not translate
\"Project\"; it is automatically converted to the wiki's project namespace.}}",
"visualeditor-media-input-placeholder": "Place holder text for media
search input",
"visualeditor-meta-tool": "Text of tool in the toolbar the lets users
set categories, language links and other page settings.\n{{Identical|Options}}",
+ "visualeditor-mweditmode-tooltip": "Tooltip text for editor switching
menu.",
"visualeditor-mweditmodesource-progress": "Title of progress bar shown
while switching to source
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Various PHP cleanup of CollaborationKit
Reedy has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339958 )
Change subject: Various PHP cleanup of CollaborationKit
..
Various PHP cleanup of CollaborationKit
Bug: T159076
Change-Id: Ic9064ba5386b7fc8d2a9f7ff088344e2417e5cc6
---
M CollaborationKit.hooks.php
M includes/CollaborationListContentEditor.php
M includes/SpecialCreateCollaborationHub.php
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationHubContentHandler.php
M includes/content/CollaborationKitImage.php
M includes/content/CollaborationListContent.php
M includes/content/CollaborationListContentHandler.php
M tests/phpunit/CollaborationHubContentHandlerTest.php
M tests/phpunit/CollaborationHubContentTest.php
M tests/phpunit/CollaborationHubTOCTest.php
M tests/phpunit/CollaborationKitImageTest.php
M tests/phpunit/CollaborationListContentHandlerTest.php
M tests/phpunit/CollaborationListContentTest.php
14 files changed, 77 insertions(+), 59 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/58/339958/1
diff --git a/CollaborationKit.hooks.php b/CollaborationKit.hooks.php
index 0a80756..c36e5c0 100644
--- a/CollaborationKit.hooks.php
+++ b/CollaborationKit.hooks.php
@@ -40,7 +40,7 @@
// Add feature
$links['actions']['addnewfeature'] = [
'class' => '',
- 'href' => SpecialPage::getTitleFor(
'CreateHubFeature' )->getFullUrl( [ 'collaborationhub' => $title->getFullText()
] ),
+ 'href' => SpecialPage::getTitleFor(
'CreateHubFeature' )->getFullURL( [ 'collaborationhub' => $title->getFullText()
] ),
'text' => wfMessage(
'collaborationkit-hub-addpage' )->text()
];
}
@@ -108,7 +108,7 @@
&& count( Revision::newFromTitle( $parentHub
)->getContent()->getContent() ) > 0
) {
$toc = new CollaborationHubTOC();
- $out->prependHtml( $toc->renderSubpageToC( $parentHub )
);
+ $out->prependHTML( $toc->renderSubpageToC( $parentHub )
);
$colour = Revision::newFromTitle( $parentHub
)->getContent()->getThemeColour();
$text = Html::rawElement( 'div', [ 'class' =>
"mw-cklist-square-$colour" ], $text );
diff --git a/includes/CollaborationListContentEditor.php
b/includes/CollaborationListContentEditor.php
index f2a73c3..e2ff679 100644
--- a/includes/CollaborationListContentEditor.php
+++ b/includes/CollaborationListContentEditor.php
@@ -28,12 +28,14 @@
*/
protected function showContentForm() {
if ( $this->contentFormat !==
CollaborationListContentHandler::FORMAT_WIKI ) {
- return parent::showContentForm();
+ parent::showContentForm();
+ return;
}
$parts = explode( CollaborationListContent::HUMAN_DESC_SPLIT,
$this->textbox1, 3 );
if ( count( $parts ) !== 3 ) {
- return parent::showContentForm();
+ parent::showContentForm();
+ return;
}
$out = RequestContext::getMain()->getOutput();
$out->addHTML( Html::hidden( 'wpCollaborationKitOptions',
$parts[1] ) );
diff --git a/includes/SpecialCreateCollaborationHub.php
b/includes/SpecialCreateCollaborationHub.php
index 437b355..73a534c 100644
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -250,7 +250,7 @@
}
// Once all the pages we want to create are created, we send
them to the first one
- $this->getOutput()->redirect( $title->getFullUrl() );
+ $this->getOutput()->redirect( $title->getFullURL() );
return Status::newGood();
}
@@ -260,8 +260,6 @@
/**
* Set the form format to ooui for consistency with the rest of the ck
stuff
-* @param $form HTMLForm
-*
*/
protected function getDisplayFormat() {
return 'ooui';
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 1f0410a..174afb6 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -41,6 +41,9 @@
/** @var bool Whether contents have been populated */
protected $decoded = false;
+ /** @var string Error message text */
+ protected $errortext;
+
/**
* 23 preset colours; actual colour values are set in the
extension.json and less modules
*
@
[MediaWiki-commits] [Gerrit] mediawiki...OpenStackManager[master]: Add support for ED25519 ssh key
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339957 ) Change subject: Add support for ED25519 ssh key .. Add support for ED25519 ssh key Bug: T159070 Change-Id: I3b70ae49893e5532505175e6a53b40f27d944f65 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager refs/changes/57/339957/1 -- To view, visit https://gerrit.wikimedia.org/r/339957 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b70ae49893e5532505175e6a53b40f27d944f65 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/OpenStackManager Gerrit-Branch: master Gerrit-Owner: Paladox 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...TemplateSandbox[master]: Remove global variable 'mw' from .eslintrc.json
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339824 )
Change subject: Remove global variable 'mw' from .eslintrc.json
..
Remove global variable 'mw' from .eslintrc.json
A global variable 'mw' is not used.
Change-Id: Ice7dbd5a04ae8efa9383bcc1f0046ed776648adf
---
M .eslintrc.json
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Anomie: Looks good to me, approved
diff --git a/.eslintrc.json b/.eslintrc.json
index d3d79a4..9fad52a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -3,8 +3,5 @@
"env": {
"browser": true,
"jquery": true
- },
- "globals": {
- "mw": false
}
}
--
To view, visit https://gerrit.wikimedia.org/r/339824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice7dbd5a04ae8efa9383bcc1f0046ed776648adf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TemplateSandbox
Gerrit-Branch: master
Gerrit-Owner: Fomafix
Gerrit-Reviewer: Anomie
Gerrit-Reviewer: Jackmcbarn
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...ConfirmEdit[master]: Switch file store/delete operations to batch operations
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338169 )
Change subject: Switch file store/delete operations to batch operations
..
Switch file store/delete operations to batch operations
Bug: T157738
Change-Id: Ief109d78788fc9f6346e08661b973d65a035cafe
---
M maintenance/GenerateFancyCaptchas.php
1 file changed, 51 insertions(+), 35 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/GenerateFancyCaptchas.php
b/maintenance/GenerateFancyCaptchas.php
index 43ad72f..9ab972b 100644
--- a/maintenance/GenerateFancyCaptchas.php
+++ b/maintenance/GenerateFancyCaptchas.php
@@ -126,15 +126,15 @@
)
);
- $originalFiles = [];
+ $filesToDelete = [];
if ( $deleteOldCaptchas ) {
- $this->output( "Getting a list of old
captchas..." );
- foreach (
- $backend->getFileList(
- [ 'dir' =>
$backend->getRootStoragePath() . '/captcha-render' ]
- ) as $file
- ) {
- $originalFiles[] = $file;
+ $this->output( "Getting a list of old captchas
to delete..." );
+ $path = $backend->getRootStoragePath() .
'/captcha-render';
+ foreach ( $backend->getFileList( [ 'dir' =>
$path ] ) as $file ) {
+ $filesToDelete[] = [
+ 'op' => 'delete',
+ 'src' => $path . '/' . $file,
+ ];
}
$this->output( " Done.\n" );
}
@@ -151,6 +151,10 @@
);
$captchasGenerated = iterator_count( $iter );
+ $filesToStore = [];
+ /**
+* @var $fileInfo SplFileInfo
+*/
foreach ( $iter as $fileInfo ) {
if ( !$fileInfo->isFile() ) {
continue;
@@ -158,41 +162,53 @@
list( $salt, $hash ) =
$instance->hashFromImageName( $fileInfo->getBasename() );
$dest = $instance->imagePath( $salt, $hash );
$backend->prepare( [ 'dir' => dirname( $dest )
] );
- $status = $backend->quickStore( [
+ $filesToStore[] = [
+ 'op' => 'store',
'src' => $fileInfo->getPathname(),
- 'dst' => $dest
- ] );
- if ( !$status->isOK() ) {
- $this->error( "Could not save file
'{$fileInfo->getPathname()}'.\n" );
- }
+ 'dst' => $dest,
+ ];
}
+
+ $ret = $backend->doQuickOperations( $filesToStore );
+
$storeTime += microtime( true );
- $this->output( " Done.\n" );
- $this->output(
- sprintf(
- "\nCopied %d captchas to storage in
%.1f seconds\n",
- $captchasGenerated,
- $storeTime
- )
- );
-
- if ( $deleteOldCaptchas ) {
- $numOriginalFiles = count( $originalFiles );
- $this->output( "Deleting {$numOriginalFiles}
old captchas...\n" );
- $deleteTime = -microtime( true );
- foreach ( $originalFiles as $file ) {
- $backend->quickDelete( [ 'src' => $file
] );
- }
- $deleteTime += microtime( true );
- $this->output( "Done.\n" );
+ if ( $ret->isOK() ) {
+ $this->output( " Done.\n" );
$this->output(
sprintf(
- "\nDeleted %d old captchas in
%.1f seconds\n",
-
[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Track how many times TwoColConflict is shown.
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339956 ) Change subject: Track how many times TwoColConflict is shown. .. Track how many times TwoColConflict is shown. Bug: T158754 Change-Id: If22663060e87d8da3d1ac6ee61fb491700efb1bd Depends-On: Ia0099540032da2d490b2a8eee82a7ae70eff0f9e --- M includes/TwoColConflictPage.php 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict refs/changes/56/339956/1 diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php index 7853516..9e9082d 100644 --- a/includes/TwoColConflictPage.php +++ b/includes/TwoColConflictPage.php @@ -1,4 +1,5 @@ getStatsdDataFactory(); + $stats->increment( 'TwoColConflict.conflict' ); + } + /** * Replace default header for explaining the conflict screen. * -- To view, visit https://gerrit.wikimedia.org/r/339956 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If22663060e87d8da3d1ac6ee61fb491700efb1bd Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TwoColConflict Gerrit-Branch: master Gerrit-Owner: Addshore ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add maintenance script to add sites to sites table
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/284005 )
Change subject: Add maintenance script to add sites to sites table
..
Add maintenance script to add sites to sites table
Also: Add language code validation to Site::setLanguageCode().
Bug: T132937
Change-Id: I763ec65cb06d5250a3886a66eefdde8701b2299c
---
M autoload.php
M includes/site/Site.php
A maintenance/addSite.php
3 files changed, 95 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, approved
diff --git a/autoload.php b/autoload.php
index 1863577..e56b681 100644
--- a/autoload.php
+++ b/autoload.php
@@ -11,6 +11,7 @@
'ActiveUsersPager' => __DIR__ .
'/includes/specials/pagers/ActiveUsersPager.php',
'ActivityUpdateJob' => __DIR__ .
'/includes/jobqueue/jobs/ActivityUpdateJob.php',
'AddRFCAndPMIDInterwiki' => __DIR__ .
'/maintenance/addRFCandPMIDInterwiki.php',
+ 'AddSite' => __DIR__ . '/maintenance/addSite.php',
'AjaxDispatcher' => __DIR__ . '/includes/AjaxDispatcher.php',
'AjaxResponse' => __DIR__ . '/includes/AjaxResponse.php',
'AllMessagesTablePager' => __DIR__ .
'/includes/specials/pagers/AllMessagesTablePager.php',
diff --git a/includes/site/Site.php b/includes/site/Site.php
index 6a97a50..28f19f9 100644
--- a/includes/site/Site.php
+++ b/includes/site/Site.php
@@ -463,6 +463,9 @@
* @param string $languageCode
*/
public function setLanguageCode( $languageCode ) {
+ if ( !Language::isValidCode( $languageCode ) ) {
+ throw new InvalidArgumentException( "$languageCode is
not a valid language code." );
+ }
$this->languageCode = $languageCode;
}
diff --git a/maintenance/addSite.php b/maintenance/addSite.php
new file mode 100755
index 000..1ebc4f6
--- /dev/null
+++ b/maintenance/addSite.php
@@ -0,0 +1,91 @@
+addDescription( 'Add a site definition into the sites
table.' );
+
+ $this->addArg( 'globalid', 'The global id of the site to add,
e.g. "wikipedia".', true );
+ $this->addArg( 'group', 'In which group this site should be
sorted in.', true );
+ $this->addOption( 'language', 'The language code of the site,
e.g. "de".' );
+ $this->addOption( 'interwiki-id', 'The interwiki ID of the
site.' );
+ $this->addOption( 'navigation-id', 'The navigation ID of the
site.' );
+ $this->addOption( 'pagepath', 'The URL to pages of this site,
e.g.' .
+ ' https://example.com/wiki/\$1.' );
+ $this->addOption( 'filepath', 'The URL to files of this site,
e.g. https://example
+ .com/w/\$1.' );
+
+ parent::__construct();
+ }
+
+ /**
+* Imports the site described by the parameters (see
self::__construct()) passed to this
+* maintenance sccript into the sites table of MediaWiki.
+*/
+ public function execute() {
+ $siteStore = MediaWikiServices::getInstance()->getSiteStore();
+ $siteStore->reset();
+
+ $globalId = $this->getArg( 0 );
+ $group = $this->getArg( 1 );
+ $language = $this->getOption( 'language' );
+ $interwikiId = $this->getOption( 'interwiki-id' );
+ $navigationId = $this->getOption( 'navigation-id' );
+ $pagepath = $this->getOption( 'pagepath' );
+ $filepath = $this->getOption( 'filepath' );
+
+ if ( !is_string( $globalId ) || !is_string( $group ) ) {
+ echo "Arguments globalid and group need to be
strings.\n";
+ return false;
+ }
+
+ if ( $siteStore->getSite( $globalId ) !== null ) {
+ echo "Site with global id $globalId already exists.\n";
+ return false;
+ }
+
+ $site = new MediaWikiSite();
+ $site->setGlobalId( $globalId );
+ $site->setGroup( $group );
+ if ( $language !== null ) {
+ $site->setLanguageCode( $language );
+ }
+ if ( $interwikiId !== null ) {
+ $site->addInterwikiId( $interwikiId );
+ }
+ if ( $navigationId !== null ) {
+ $site->addNavigationId( $navigationId );
+ }
+ if ( $pagepath !== null ) {
+ $site->setPagePath( $pagepath );
+ }
+ if ( $filepath !== null ) {
+ $site->setFilePath( $filepath );
+ }
+
+ $siteStore->saveSites( [ $site ] );
+
+ if ( method_exists( $siteStore, 'reset' ) ) {
+ $siteStore->reset();
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make EditPage::incrementConflictStats protected
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339955 )
Change subject: Make EditPage::incrementConflictStats protected
..
Make EditPage::incrementConflictStats protected
This will be overridden by the TwoColConflict
extension & beta feature...
Bug: T158754
Change-Id: Ia0099540032da2d490b2a8eee82a7ae70eff0f9e
---
M includes/EditPage.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/55/339955/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 34062c0..e9d80f1 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3563,7 +3563,10 @@
}
}
- private function incrementConflictStats() {
+ /**
+* @since 1.29
+*/
+ protected function incrementConflictStats() {
$stats =
MediaWikiServices::getInstance()->getStatsdDataFactory();
$stats->increment( 'edit.failures.conflict' );
// Only include 'standard' namespaces to avoid creating unknown
numbers of statsd metrics
--
To view, visit https://gerrit.wikimedia.org/r/339955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0099540032da2d490b2a8eee82a7ae70eff0f9e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: proofreadpage.py: purge is skipped if redlinks are present
Mpaa has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339954 )
Change subject: proofreadpage.py: purge is skipped if redlinks are present
..
proofreadpage.py: purge is skipped if redlinks are present
Purge action is skipped when redlinks are present in the page list.
Postpone the search of redlinks after the purge action check.
Change-Id: I42d72fc721c90fca362e6d2b46f17488ef6782f4
---
M pywikibot/proofreadpage.py
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/54/339954/1
diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index a3dd4d4..40df9b2 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -544,7 +544,9 @@
self._parsed_text = self._get_parsed_page()
self._soup = BeautifulSoup(self._parsed_text, 'html.parser')
-attrs = {'class': re.compile('prp-pagequality|new')}
+# Do not search for "new" here, to avoid to skip purging if links
+# to non-existing pages are present.
+attrs = {'class': re.compile('prp-pagequality')}
# Search for attribute "prp-pagequality" in tags:
# Existing pages:
@@ -570,6 +572,8 @@
'class="new" in: %s.'
% self)
+# Search for attribute "prp-pagequality" or "new" in tags:
+attrs = {'class': re.compile('prp-pagequality|new')}
page_cnt = 0
for a_tag in self._soup.find_all('a', attrs=attrs):
label = a_tag.text.lstrip('0') # Label is not converted to int.
--
To view, visit https://gerrit.wikimedia.org/r/339954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42d72fc721c90fca362e6d2b46f17488ef6782f4
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Mpaa
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Tweak mw-ui padding to match oo-ui for buttons and text inputs
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339953 )
Change subject: Tweak mw-ui padding to match oo-ui for buttons and text inputs
..
Tweak mw-ui padding to match oo-ui for buttons and text inputs
Change-Id: I594f42d1e13d1c5e9bf44363a137fc2fe9f937e7
---
M resources/src/mediawiki.ui/components/buttons.less
M resources/src/mediawiki.ui/components/inputs.less
2 files changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/53/339953/1
diff --git a/resources/src/mediawiki.ui/components/buttons.less
b/resources/src/mediawiki.ui/components/buttons.less
index 5dc025f..52c797b 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -33,7 +33,8 @@
display: inline-block;
min-width: 4em;
max-width: 28.75em; // equivalent to 460px, @see T95367
- padding: 0.5em 1em;
+ padding: 0.546875em 1em;
+ line-height: 1.286;
margin: 0;
border-radius: @borderRadius;
.box-sizing( border-box );
@@ -210,6 +211,15 @@
}
}
+input.mw-ui-button,
+button.mw-ui-button {
+ // Buttons in Firefox have extra height
+ &::-moz-focus-inner {
+ margin-top: -1px;
+ margin-bottom: -1px;
+ }
+}
+
a.mw-ui-button {
text-decoration: none;
@@ -219,12 +229,6 @@
&:focus {
text-decoration: none;
}
-
- // a-tags behave different to inputs if the line-height attribute is
inherited
- // from another element (e.g. mw-body-content). They appear bigger as
input
- // tags. See Bug T116427. To fix that, apply the correct line-height
(used
- // for inputs) to a-tags, too.
- line-height: normal;
}
// Button groups
diff --git a/resources/src/mediawiki.ui/components/inputs.less
b/resources/src/mediawiki.ui/components/inputs.less
index 21f5254..a9aa046 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -29,12 +29,12 @@
width: 100%;
border: 1px solid @colorFieldBorder;
border-radius: @borderRadius;
- padding: 0.3em 0.3em 0.3em 0.6em;
+ padding: 0.625em 0.546875em 0.546875em;
// necessary for smooth transition
box-shadow: inset 0 0 0 0.1em #fff;
font-family: inherit;
font-size: inherit;
- line-height: inherit;
+ line-height: 1.172em;
vertical-align: middle;
// Normalize & style placeholder text, see T139034
@@ -143,4 +143,5 @@
font-size: 1.75em;
font-weight: bold;
line-height: 1.25em;
+ padding: 0.3673em 0.3265em 0.3265em;
}
--
To view, visit https://gerrit.wikimedia.org/r/339953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I594f42d1e13d1c5e9bf44363a137fc2fe9f937e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ElectronPdfService[master]: Track actions per wiki
Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339952 )
Change subject: Track actions per wiki
..
Track actions per wiki
Bug: T157540
Change-Id: I1b82a285c1e290b13c93d4922a1fcd982b6be0eb
---
M src/specials/SpecialElectronPdf.php
1 file changed, 4 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ElectronPdfService
refs/changes/52/339952/1
diff --git a/src/specials/SpecialElectronPdf.php
b/src/specials/SpecialElectronPdf.php
index 954f228..1e9d773 100644
--- a/src/specials/SpecialElectronPdf.php
+++ b/src/specials/SpecialElectronPdf.php
@@ -42,18 +42,22 @@
$action = $request->getVal( 'action', 'default' );
$stats =
MediaWikiServices::getInstance()->getStatsdDataFactory();
+ $dbName = $this->getConfig()->get( 'DBname' );
switch ( $action ) {
case 'redirect-to-electron':
$stats->increment( 'electronpdf.action.' .
$action );
+ $stats->increment(
'electronpdf.actionsPerWiki.' . $dbName . '.' . $action );
$this->redirectToElectron( $title );
return;
case 'redirect-to-collection':
$stats->increment( 'electronpdf.action.' .
$action );
+ $stats->increment(
'electronpdf.actionsPerWiki.' . $dbName . '.' . $action );
$this->redirectToCollection(
$collectionDownloadUrl );
return;
default:
$stats->increment(
'electronpdf.action.show-selection-screen' );
+ $stats->increment(
'electronpdf.actionsPerWiki.' . $dbName . '.show-selection-screen' );
$this->showRenderModeSelectionPage( $title,
$collectionDownloadUrl );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/339952
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b82a285c1e290b13c93d4922a1fcd982b6be0eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ElectronPdfService
Gerrit-Branch: master
Gerrit-Owner: Addshore
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: After the UploadWizard finishes the user is sent back to ref...
Lucianprj has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339951 )
Change subject: After the UploadWizard finishes the user is sent back to
referrer page.
..
After the UploadWizard finishes the user is sent back to referrer page.
Bug: T48242
Change-Id: Ied5055c7131e4b2ce9fd547b47b9210f46f341cc
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M resources/ui/steps/uw.ui.Thanks.js
M resources/ui/steps/uw.ui.Tutorial.js
M resources/ui/steps/uw.ui.Upload.js
6 files changed, 22 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard
refs/changes/51/339951/1
diff --git a/extension.json b/extension.json
index a1f82bf..86bf1da 100644
--- a/extension.json
+++ b/extension.json
@@ -394,6 +394,7 @@
"mwe-upwiz-next-details",
"mwe-upwiz-previous",
"mwe-upwiz-home",
+ "mwe-upwiz-referrer",
"mwe-upwiz-upload-another",
"mwe-upwiz-tooltip-author",
"mwe-upwiz-tooltip-source",
diff --git a/i18n/en.json b/i18n/en.json
index 8c52a40..670b6b5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -180,6 +180,7 @@
"mwe-upwiz-next-details": "Next",
"mwe-upwiz-previous": "Back",
"mwe-upwiz-home": "Go to wiki home page",
+ "mwe-upwiz-referrer": "Go to referrer",
"mwe-upwiz-upload-another": "Upload more files",
"mwe-upwiz-prevent-close-wait": "Leaving this page may cause you to
lose any changes you have made. Please wait a few seconds.",
"mwe-upwiz-prevent-close": "You have not completed the upload process
yet!",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index dddf81d..000f55f 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -206,6 +206,7 @@
"mwe-upwiz-next-details": "{{Identical|Next}}",
"mwe-upwiz-previous": "Button text for going back to the previous
Upload Wizard stage.\n{{Identical|Back}}",
"mwe-upwiz-home": "[[file:commons-uw-L52S.png|The End of the
\"{{MediaWiki:mwe-upwiz-step-thanks/en}}\" page|thumb|right]]\n\nThis is a
button label, used at the end in the \"{{MediaWiki:mwe-upwiz-step-thanks/en}}\"
page of the [[:mw:Extension:UploadWizard|MediaWiki Upload Wizard]].",
+ "mwe-upwiz-referrer": "[[file:commons-uw-L52S.png|The End of the
\"{{MediaWiki:mwe-upwiz-step-thanks/en}}\" page|thumb|right]]\n\nThis is a
button label, used at the end in the \"{{MediaWiki:mwe-upwiz-step-thanks/en}}\"
page of the [[:mw:Extension:UploadWizard|MediaWiki Upload Wizard]].",
"mwe-upwiz-upload-another": "[[file:commons-uw-L52S.png|The End of the
\"{{MediaWiki:mwe-upwiz-step-thanks/en}}\" page|thumb|right]]\n\nThis is a
button label, used at the end in the \"{{MediaWiki:mwe-upwiz-step-thanks/en}}\"
page of the [[:mw:Extension:UploadWizard|MediaWiki Upload Wizard]].",
"mwe-upwiz-prevent-close-wait": "Used as confirmation message when user
closes window, but there is a background task we are waiting to complete.",
"mwe-upwiz-prevent-close": "Used as confirmation message when closing
window.",
diff --git a/resources/ui/steps/uw.ui.Thanks.js
b/resources/ui/steps/uw.ui.Thanks.js
index 3ae2983..d43a6c1 100644
--- a/resources/ui/steps/uw.ui.Thanks.js
+++ b/resources/ui/steps/uw.ui.Thanks.js
@@ -58,12 +58,20 @@
} else {
$header.html( this.config.display.thanksLabel );
}
-
+ var homeButtonText = "";
+ var homeButtonHref = "";
+ if(uw.ui.Upload.referrer !== undefined && uw.ui.Upload.referrer
!== null){
+ homeButtonText =
mw.message('mwe-upwiz-referrer').text();
+ homeButtonHref = uw.ui.Upload.referrer;
+ }else{
+ homeButtonText = mw.message('mwe-upwiz-home').text();
+ homeButtonHref = mw.config.get( 'wgArticlePath'
).replace( '$1', '' );
+ }
this.homeButton = new OO.ui.ButtonWidget( {
- label: this.getButtonConfig( 'homeButton', 'label' ) ||
mw.message( 'mwe-upwiz-home' ).text(),
- href: this.getButtonConfig( 'homeButton', 'target' ) ||
mw.config.get( 'wgArticlePath' ).replace( '$1', '' )
- } );
+ label: this.getButtonConfig( 'homeButton', 'label' ) ||
homeButtonText,
+ href: this.getButtonConfig( 'homeButton', 'target' ) ||
homeButtonHref
+ } );
this.beginButton = new OO.ui.ButtonWidget( {
label: this.getButtonConfig( 'beginButton', 'label' )
|| mw.message( 'mwe-upwiz-upload-another' ).text(),
flags: [ 'progressive', 'primary' ]
@@ -76,6 +84,7 @@
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: WbQuantity.fromWikibase: Fix typo in docstring
Dalba has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339950 )
Change subject: WbQuantity.fromWikibase: Fix typo in docstring
..
WbQuantity.fromWikibase: Fix typo in docstring
WbQuanity -> WbQuantity
Change-Id: Id4303731c4dfb0c90a0b78c812a30aa20b3f6652
---
M pywikibot/__init__.py
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/50/339950/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index f9782ce..279be25 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -720,13 +720,13 @@
@classmethod
def fromWikibase(cls, wb, site=None):
"""
-Create a WbQuanity from the JSON data given by the Wikibase API.
+Create a WbQuantity from the JSON data given by the Wikibase API.
@param wb: Wikibase JSON
@type wb: dict
@param site: The Wikibase site
@type site: pywikibot.site.DataSite
-@rtype: pywikibot.WbQuanity
+@rtype: pywikibot.WbQuantity
"""
amount = cls._todecimal(wb['amount'])
upperBound = cls._todecimal(wb.get('upperBound'))
--
To view, visit https://gerrit.wikimedia.org/r/339950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4303731c4dfb0c90a0b78c812a30aa20b3f6652
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [Bug]Recognize zero as a valid error bound
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339939 )
Change subject: [Bug]Recognize zero as a valid error bound
..
[Bug]Recognize zero as a valid error bound
Providing zero for either of the bound would trigger the
_require_errors test.
Changing from "if bound" to "if bound is not None" type tests
allows zero to be recognized a a valid bound.
Change-Id: Icf05b0e3fa0d3767ef8577c0a9abc42602f8b4c1
---
M pywikibot/__init__.py
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index b980330..f9782ce 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -731,8 +731,9 @@
amount = cls._todecimal(wb['amount'])
upperBound = cls._todecimal(wb.get('upperBound'))
lowerBound = cls._todecimal(wb.get('lowerBound'))
+bounds_provided = (upperBound is not None and lowerBound is not None)
error = None
-if (upperBound and lowerBound) or cls._require_errors(site):
+if bounds_provided or cls._require_errors(site):
error = (upperBound - amount, amount - lowerBound)
if wb['unit'] == '1':
unit = None
--
To view, visit https://gerrit.wikimedia.org/r/339939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf05b0e3fa0d3767ef8577c0a9abc42602f8b4c1
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil
Gerrit-Reviewer: Dalba
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Magul
Gerrit-Reviewer: Mpaa
Gerrit-Reviewer: Xqt
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Follow-up I3dc3db6db: De-italicise surface placeholder
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339949 )
Change subject: Follow-up I3dc3db6db: De-italicise surface placeholder
..
Follow-up I3dc3db6db: De-italicise surface placeholder
Change-Id: Ic004ff34f494f3e8ad4b002d990cdaaa54ab374c
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
1 file changed, 0 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/49/339949/1
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index 95cb97c..234b30c 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -25,10 +25,6 @@
position: relative;
}
- .ve-ui-surface-placeholder {
- font-style: italic;
- }
-
.ve-ui-overlay {
line-height: normal;
}
--
To view, visit https://gerrit.wikimedia.org/r/339949
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic004ff34f494f3e8ad4b002d990cdaaa54ab374c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove toolbar border (shadow) in monobook as well
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339948 )
Change subject: Remove toolbar border (shadow) in monobook as well
..
Remove toolbar border (shadow) in monobook as well
Change-Id: I9a1ead7ff8d3dd711858bd2c0fefa0ba18ab3cb4
---
M modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/48/339948/1
diff --git a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
index bb200fd..3160a87 100644
--- a/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
+++ b/modules/styles/flow/widgets/editor/mw.flow.ui.editor-monobook.less
@@ -51,6 +51,7 @@
// When we apply a pending texture to the editor, we don't want
the toolbar to display
// in solid white on top of that.
background: transparent;
+ box-shadow: none;
}
.ve-ui-debugBar {
--
To view, visit https://gerrit.wikimedia.org/r/339948
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a1ead7ff8d3dd711858bd2c0fefa0ba18ab3cb4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Fix padding of large inputs
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339947 ) Change subject: Fix padding of large inputs .. Fix padding of large inputs Change-Id: Ic8a7106db39f75d01e723e99bd4e87d63200208b --- M handlebars/flow_newtopic_form.partial.handlebars M modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less M modules/styles/mediawiki.ui/forms.less 3 files changed, 12 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/47/339947/1 diff --git a/handlebars/flow_newtopic_form.partial.handlebars b/handlebars/flow_newtopic_form.partial.handlebars index 8a73bf4..cd3b3e5 100644 --- a/handlebars/flow_newtopic_form.partial.handlebars +++ b/handlebars/flow_newtopic_form.partial.handlebars @@ -17,7 +17,7 @@ /> https://gerrit.wikimedia.org/r/339947 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8a7106db39f75d01e723e99bd4e87d63200208b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: __init__.py:Added extra checking for more descriptive error ...
Honeypot95 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339946 )
Change subject: __init__.py:Added extra checking for more descriptive error
raising
..
__init__.py:Added extra checking for more descriptive error raising
Bug: T151526
Change-Id: Iea120e768289f869fcb1c3afa691271e037621b4
---
M pywikibot/__init__.py
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/46/339946/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index b980330..841f81d 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -497,6 +497,8 @@
if calendarmodel is None:
if site is None:
site = Site().data_repository()
+if site is None:
+raise ValueError('Site has no data repository')
calendarmodel = site.calendarmodel()
self.calendarmodel = calendarmodel
--
To view, visit https://gerrit.wikimedia.org/r/339946
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iea120e768289f869fcb1c3afa691271e037621b4
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Honeypot95
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Don't use for indenting descriptions on Special:ApiSandbox
Kosson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339945 )
Change subject: Don't use for indenting descriptions on Special:ApiSandbox
..
Don't use for indenting descriptions on Special:ApiSandbox
Bug: T146351
Change-Id: I29b4b2a82f190ff0ac6041b1ea712f5f9872ff12
---
M resources/src/mediawiki.special/mediawiki.special.apisandbox.js
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/45/339945/1
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index c989c83..732830a 100644
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -1463,14 +1463,14 @@
that.tokenWidget =
widget;
}
- dl = $( '' );
- dl.append( $( '', {
+ dl = $( '' );
+ dl.append( $( '', {
addClass: 'description',
append: Util.parseHTML(
pi.parameters[ i ].description )
} ) );
if ( pi.parameters[ i ].info &&
pi.parameters[ i ].info.length ) {
for ( j = 0; j <
pi.parameters[ i ].info.length; j++ ) {
- dl.append( $(
'', {
+ dl.append( $(
'', {
addClass: 'info',
append:
Util.parseHTML( pi.parameters[ i ].info[ j ] )
} ) );
--
To view, visit https://gerrit.wikimedia.org/r/339945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29b4b2a82f190ff0ac6041b1ea712f5f9872ff12
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kosson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Add comments and fix formatting
Crisbal has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339943 )
Change subject: Add comments and fix formatting
..
Add comments and fix formatting
Change-Id: I42ce45611db607f7175d059775d18e2c2b65081a
---
M Quiz.class.php
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz
refs/changes/43/339943/1
diff --git a/Quiz.class.php b/Quiz.class.php
index ea3988d..1562fab 100755
--- a/Quiz.class.php
+++ b/Quiz.class.php
@@ -116,19 +116,19 @@
// Ouput the style and the script to the header once for all.
if ( $this->mQuizId == 0 ) {
global $wgOut;
- $wgOut->addModules( 'ext.quiz' );
+ $wgOut->addModules('ext.quiz');
}
// Process the input
- $input = $this->parseQuestions( $this->parseIncludes( $input )
);
+ $input = $this->parseQuestions($this->parseIncludes( $input ));
// Generates the output.
- $templateParser = new TemplateParser( __DIR__ . '/templates' );
+ $templateParser = new TemplateParser(__DIR__ . '/templates');
// Determine the content of the settings table.
- $settings = array_fill( 0, 4, '' );
- if ( !$this->mDisplaySimple ) {
+ $settings = array_fill(0, 4, '' );
+ if (!$this->mDisplaySimple) {
$settings[0] .= '' . wfMessage( 'quiz_addedPoints',
$this->mAddedPoints )->escaped() . '' . "\n";
$settings[0] .= ' ' . "\n";
@@ -288,6 +288,8 @@
$this->mQuestionId,
$this->mParser
);
+
+ // this line is related to
https://www.mediawiki.org/wiki/Extension:QuizTabulate#Hook_installation
Hooks::run( 'QuizQuestionCreated', array( $this, &$question ) );
// gets the question text
--
To view, visit https://gerrit.wikimedia.org/r/339943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I42ce45611db607f7175d059775d18e2c2b65081a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Crisbal
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultimediaViewer[master]: Loops back to the start of images when at the end of collection
Nmoanta has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339942 )
Change subject: Loops back to the start of images when at the end of collection
..
Loops back to the start of images when at the end of collection
Bug: T77877
Change-Id: I5cff46dae0cb933358b35cbc5e9b388f0179573f
---
M resources/mmv/mmv.js
M resources/mmv/mmv.lightboxinterface.js
M resources/mmv/ui/mmv.ui.canvasButtons.js
3 files changed, 16 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/42/339942/1
diff --git a/resources/mmv/mmv.js b/resources/mmv/mmv.js
index f7b2eee..f50d4d9 100644
--- a/resources/mmv/mmv.js
+++ b/resources/mmv/mmv.js
@@ -818,14 +818,19 @@
* @param {number} index
*/
MMVP.loadIndex = function ( index ) {
- var thumb;
+ var thumb, newIndex = index;
- if ( index < this.thumbs.length && index >= 0 ) {
- this.viewLogger.recordViewDuration();
-
- thumb = this.thumbs[ index ];
- this.loadImage( thumb.image, thumb.$thumb.clone()[ 0 ]
);
+ if ( index < 0 ) {
+ newIndex = this.thumbs.length - 1;
}
+ else if ( index >= this.thumbs.length ) {
+ newIndex = 0;
+ }
+
+ this.viewLogger.recordViewDuration();
+
+ thumb = this.thumbs[ newIndex ];
+ this.loadImage( thumb.image, thumb.$thumb.clone()[ 0 ] );
};
/**
diff --git a/resources/mmv/mmv.lightboxinterface.js
b/resources/mmv/mmv.lightboxinterface.js
index 9781a69..185fcef 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -498,7 +498,7 @@
}
this.buttons.setOffset( prevNextTop );
- this.buttons.toggle( showPrevButton, showNextButton );
+ this.buttons.showButtons();
};
mw.mmv.LightboxInterface = LightboxInterface;
diff --git a/resources/mmv/ui/mmv.ui.canvasButtons.js
b/resources/mmv/ui/mmv.ui.canvasButtons.js
index ff6d64d..c525f35 100644
--- a/resources/mmv/ui/mmv.ui.canvasButtons.js
+++ b/resources/mmv/ui/mmv.ui.canvasButtons.js
@@ -134,14 +134,11 @@
};
/**
-* Toggles buttons being disabled or not
-*
-* @param {boolean} showPrevButton
-* @param {boolean} showNextButton
+* Shows buttons being disabled
*/
- CBP.toggle = function ( showPrevButton, showNextButton ) {
- this.$next.toggleClass( 'disabled', !showPrevButton );
- this.$prev.toggleClass( 'disabled', !showNextButton );
+ CBP.showButtons = function() {
+ this.$next.toggleClass( 'disabled', false);
+ this.$prev.toggleClass( 'disabled', false);
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/339942
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5cff46dae0cb933358b35cbc5e9b388f0179573f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Nmoanta
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Generate questions HTML via TemplateParser
Crisbal has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339941 )
Change subject: Generate questions HTML via TemplateParser
..
Generate questions HTML via TemplateParser
This commit will move the generation of the Quiz's questions HTML to
TemplateParser. Some work is still needed
here, especially it would be good to have CSS classes for the table style
instead of inline CSS. I also added
some comments here and there especially for an unknown and undocumented feature.
Still to port to TemplateParser: Settings table, answers.
Bug: T152293
Change-Id: I557803731645f925db43166ae0d90eb1db8bdea8
---
M Quiz.class.php
A templates/Question.mustache
2 files changed, 76 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Quiz
refs/changes/41/339941/1
diff --git a/Quiz.class.php b/Quiz.class.php
index ff2fa0a..ea3988d 100755
--- a/Quiz.class.php
+++ b/Quiz.class.php
@@ -247,6 +247,7 @@
-1,
PREG_SPLIT_NO_EMPTY
);
+
$output = '';
$questionPattern = '`(.*?[^|\}])\}[ \t]*(\n(.*)|$)`s';
foreach ( $unparsedQuestions as $unparsedQuestion ) {
@@ -288,8 +289,18 @@
$this->mParser
);
Hooks::run( 'QuizQuestionCreated', array( $this, &$question ) );
- $buffer = $question->parseHeader( $matches[1] );
- if ( !array_key_exists( 3, $matches ) || trim( $matches[3] ) ==
'' ) {
+
+ // gets the question text
+ $questionText = $question->parseHeader( $matches[1] );
+
+ /*
+ What is this block of code?
+ The only place X !X and /X are spoken about is here
+ https://en.wikiversity.org/wiki/Help:Quiz
+ "A few exotic features are not yet covered, such as
shuffle control using {X} {!X} {/X} tags."
+ These were added in commit fb53a3b0 back in 2007,
without any explanation and/or documentation. The commit message is actually
unrelated.
+ */
+ if ( !array_key_exists(3, $matches ) || trim( $matches[3] ) ==
'' ) {
switch ( $matches[1] ) {
case 'X':
$this->mShuffleDiv++;
@@ -313,62 +324,85 @@
break;
}
}
- $output = '' . "\n";
- $output .= '' . "\n";
- $output .= '' . ++$this->mQuestionId .
'. ' . $buffer;
- $output .= '' . "\n";
- // Store the parsed object into a buffer to determine some
parameters before outputing it.
- $buffer = call_user_func( array(
- $question,
- $question->mType . 'ParseObject'
- ), $matches[3]);
- $output .= 'getState();
- // Determine the side border color, title, score and the total
of the question.
- if ( $lState != '' ) {
+ $templateParser = new TemplateParser( __DIR__ . '/templates' );
+
+ $this->mQuestionId++;
+
+ //this will generate the answers HTML code
+ $answers = call_user_func(
+ array($question, $question->mType . 'ParseObject'),
+ $matches[3]
+ );
+
+ $lState = $question->getState(); // right wrong or unanswered?
+
+ if($lState != '') {
+ // TODO: convert to CSS classes
global $wgContLang;
$border = $wgContLang->isRTL() ? 'border-right' :
'border-left';
- $output .= 'style="' . $border . ':3px solid ' .
self::getColor( $lState ) . '"';
+ $tableStyle = $border . ': 3px solid ' .
self::getColor( $lState ) . ';';
+
+ $tableTitle = "";
+
+ // if the question is of type=simple
if ( $this->mIgnoringCoef ) {
$question->mCoef = 1;
}
-
switch ( $lState ) {
case 'right':
$this->mTotal += $this->mAddedPoints *
$question->mCoef;
$this->mScore += $this->mAddedPoints *
$question->mCoef;
- $output .= 'title="' . wfMessage(
+
+ $tableTitle = wfMessage(
'quiz_points',
- wfMessage( 'quiz_colorRight'
)->text(),
+
[MediaWiki-commits] [Gerrit] mediawiki...Popups[master]: i18n: Fix popups fade on RTL
Ebrahim has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339940 )
Change subject: i18n: Fix popups fade on RTL
..
i18n: Fix popups fade on RTL
Change-Id: I0d50a8b55ebdfb8167e36ba520fd6e7cfd4be717
---
M resources/ext.popups/styles/ext.popups.core.less
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/40/339940/1
diff --git a/resources/ext.popups/styles/ext.popups.core.less
b/resources/ext.popups/styles/ext.popups.core.less
index a370979..534e76f 100644
--- a/resources/ext.popups/styles/ext.popups.core.less
+++ b/resources/ext.popups/styles/ext.popups.core.less
@@ -133,10 +133,12 @@
}
&[dir='ltr']:after {
+ /* @noflip */
right: 0;
}
&[dir='rtl']:after {
+ /* @noflip */
left: 0;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/339940
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d50a8b55ebdfb8167e36ba520fd6e7cfd4be717
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Ebrahim
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [Bug]Recognize zero as a valid error bound
Lokal Profil has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339939 )
Change subject: [Bug]Recognize zero as a valid error bound
..
[Bug]Recognize zero as a valid error bound
Providing zero for either of the bound would trigger the
_require_errors test.
Changing from "if bound" to "if bound is not None" type tests
allows zero to be recognized a a valid bound.
Change-Id: Icf05b0e3fa0d3767ef8577c0a9abc42602f8b4c1
---
M pywikibot/__init__.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/39/339939/1
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index b980330..f9782ce 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -731,8 +731,9 @@
amount = cls._todecimal(wb['amount'])
upperBound = cls._todecimal(wb.get('upperBound'))
lowerBound = cls._todecimal(wb.get('lowerBound'))
+bounds_provided = (upperBound is not None and lowerBound is not None)
error = None
-if (upperBound and lowerBound) or cls._require_errors(site):
+if bounds_provided or cls._require_errors(site):
error = (upperBound - amount, amount - lowerBound)
if wb['unit'] == '1':
unit = None
--
To view, visit https://gerrit.wikimedia.org/r/339939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf05b0e3fa0d3767ef8577c0a9abc42602f8b4c1
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: archivebot.py:Fix string checking in all functions
Honeypot95 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339938 )
Change subject: archivebot.py:Fix string checking in all functions
..
archivebot.py:Fix string checking in all functions
Bug: T157742
Change-Id: Id3a668755ae03cdb444e22eb249201e59e5dac1c
---
M scripts/archivebot.py
1 file changed, 28 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/38/339938/1
diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index e664952..a0275a8 100755
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -168,9 +168,9 @@
Translates a duration written in the shorthand notation (ex. "24h", "7d")
into an expression in the local language of the wiki ("24 hours", "7
days").
"""
-template = site.mediawiki_message(MW_KEYS[string[-1]])
+key, duration = checkstr(string)
+template = site.mediawiki_message(MW_KEYS[key])
if template:
-duration = string[:-1]
# replace plural variants
exp = i18n.translate(site.code, template, {'$1': int(duration)})
return exp.replace('$1', to_local_digits(duration, site.code))
@@ -195,14 +195,8 @@
@return: the corresponding timedelta object
@rtype: datetime.timedelta
"""
-key = string[-1]
-if string.isdigit():
-key = 's'
-duration = string
-issue_deprecation_warning('Time period without qualifier',
- string + key, 1, UserWarning)
-else:
-duration = string[:-1]
+
+key, duration = checkstr(string)
if duration.isdigit():
duration = int(duration)
@@ -225,6 +219,30 @@
else:
return datetime.timedelta(days=days)
+def checkstr(string):
+"""
+Return the key and duration extracted from the string.
+
+@param string: a string defining a time period:
+300s - 300 seconds
+36h - 36 hours
+7d - 7 days
+2w - 2 weeks (14 days)
+1y - 1 year
+@type string: str
+@return: key and duration extracted form the string
+@rtype: (str, str)
+"""
+key = string[-1]
+if string.isdigit():
+key = 's'
+duration = string
+issue_deprecation_warning('Time period without qualifier',
+ string + key, 1, UserWarning)
+else:
+duration = string[:-1]
+return key, duration
+
def str2size(string):
"""
--
To view, visit https://gerrit.wikimedia.org/r/339938
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id3a668755ae03cdb444e22eb249201e59e5dac1c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Honeypot95
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [DeskMessMirrored] Register skin
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339937 ) Change subject: [DeskMessMirrored] Register skin .. [DeskMessMirrored] Register skin Change-Id: I2d386356ff831632c880f13e9addfd145c18d39e --- M groups/MediaWiki/mediawiki-skins.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index 0589ed4..0bf0240 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -23,6 +23,8 @@ Deep Sea +Desk Mess Mirrored + Dusk To Dawn erudite -- To view, visit https://gerrit.wikimedia.org/r/339937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2d386356ff831632c880f13e9addfd145c18d39e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [DeskMessMirrored] Register skin
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339937 ) Change subject: [DeskMessMirrored] Register skin .. [DeskMessMirrored] Register skin Change-Id: I2d386356ff831632c880f13e9addfd145c18d39e --- M groups/MediaWiki/mediawiki-skins.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/37/339937/1 diff --git a/groups/MediaWiki/mediawiki-skins.txt b/groups/MediaWiki/mediawiki-skins.txt index 0589ed4..0bf0240 100644 --- a/groups/MediaWiki/mediawiki-skins.txt +++ b/groups/MediaWiki/mediawiki-skins.txt @@ -23,6 +23,8 @@ Deep Sea +Desk Mess Mirrored + Dusk To Dawn erudite -- To view, visit https://gerrit.wikimedia.org/r/339937 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d386356ff831632c880f13e9addfd145c18d39e Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [WikiShare] Register extension
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339936 ) Change subject: [WikiShare] Register extension .. [WikiShare] Register extension Change-Id: Idb14db1483ef0ab0b7da1be2346a4c2310bf6521 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 7a1c986..8f1a0bc 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2738,7 +2738,7 @@ Wiki Object Model descmsg = wom-desc -# Wiki Share // No message doc +Wiki Share Wiki Text Logged In Out -- To view, visit https://gerrit.wikimedia.org/r/339936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idb14db1483ef0ab0b7da1be2346a4c2310bf6521 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [WikiShare] Register extension
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339936 ) Change subject: [WikiShare] Register extension .. [WikiShare] Register extension Change-Id: Idb14db1483ef0ab0b7da1be2346a4c2310bf6521 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/36/339936/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 7a1c986..8f1a0bc 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -2738,7 +2738,7 @@ Wiki Object Model descmsg = wom-desc -# Wiki Share // No message doc +Wiki Share Wiki Text Logged In Out -- To view, visit https://gerrit.wikimedia.org/r/339936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idb14db1483ef0ab0b7da1be2346a4c2310bf6521 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageLanguageApi[master]: Note about becoming obsolete in 1.29
Mainframe98 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339935 ) Change subject: Note about becoming obsolete in 1.29 .. Note about becoming obsolete in 1.29 Change-Id: Ia2f1d7a1ec3610e460064ad5c8fbf58c0e930407 --- M README 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Mainframe98: Verified; Looks good to me, approved diff --git a/README b/README index 4a9c533..88540e2 100644 --- a/README +++ b/README @@ -1,4 +1,5 @@ == Installation instructions == +Warning: The functionality of this extension is available in MediaWiki Core starting with MediaWiki 1.29, making this extension obsolete. Documentation for the MediaWiki counterpart is available on https://www.mediawiki.org/wiki/API:SetPageLanguage Note: you can also find these on https://www.mediawiki.org/wiki/Extension:PageLanguageApi To use this extension, you need three things: -- To view, visit https://gerrit.wikimedia.org/r/339935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2f1d7a1ec3610e460064ad5c8fbf58c0e930407 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageLanguageApi Gerrit-Branch: master Gerrit-Owner: Mainframe98 Gerrit-Reviewer: Mainframe98 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageLanguageApi[master]: Note about becoming obsolete in 1.29
Mainframe98 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339935 ) Change subject: Note about becoming obsolete in 1.29 .. Note about becoming obsolete in 1.29 Change-Id: Ia2f1d7a1ec3610e460064ad5c8fbf58c0e930407 --- M README 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageLanguageApi refs/changes/35/339935/1 diff --git a/README b/README index 4a9c533..88540e2 100644 --- a/README +++ b/README @@ -1,4 +1,5 @@ == Installation instructions == +Warning: The functionality of this extension is available in MediaWiki Core starting with MediaWiki 1.29, making this extension obsolete. Documentation for the MediaWiki counterpart is available on https://www.mediawiki.org/wiki/API:SetPageLanguage Note: you can also find these on https://www.mediawiki.org/wiki/Extension:PageLanguageApi To use this extension, you need three things: -- To view, visit https://gerrit.wikimedia.org/r/339935 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2f1d7a1ec3610e460064ad5c8fbf58c0e930407 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageLanguageApi Gerrit-Branch: master Gerrit-Owner: Mainframe98 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Bootstrap] Unregister. Read only since ?
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/339934 ) Change subject: [Bootstrap] Unregister. Read only since ? .. [Bootstrap] Unregister. Read only since ? Change-Id: I7ca1500c20db27d89d80f44cabf867413cc9bdf4 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 24e48ed..7a1c986 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -533,7 +533,7 @@ #file = BookManagerv2/includes/i18n/%CODE%.json #id = ext-bookmanagerv2-jsonschema -Bootstrap +# Bootstrap // Read only Bounce Handler -- To view, visit https://gerrit.wikimedia.org/r/339934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7ca1500c20db27d89d80f44cabf867413cc9bdf4 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Bootstrap] Unregister. Read only since ?
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339934 ) Change subject: [Bootstrap] Unregister. Read only since ? .. [Bootstrap] Unregister. Read only since ? Change-Id: I7ca1500c20db27d89d80f44cabf867413cc9bdf4 --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/34/339934/1 diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 24e48ed..7a1c986 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -533,7 +533,7 @@ #file = BookManagerv2/includes/i18n/%CODE%.json #id = ext-bookmanagerv2-jsonschema -Bootstrap +# Bootstrap // Read only Bounce Handler -- To view, visit https://gerrit.wikimedia.org/r/339934 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7ca1500c20db27d89d80f44cabf867413cc9bdf4 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: [PULL THROUGH] Diacritic insensitive search
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/339933 ) Change subject: [PULL THROUGH] Diacritic insensitive search .. [PULL THROUGH] Diacritic insensitive search Bug: T154195 Depends-On: I95eb851c10a44e18382a6a4a0cb22559db6752b7 Change-Id: I6b74fc3dbaa27de67a565a3c2c6bf8a951b24364 --- M VisualEditor.hooks.php M extension.json 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/33/339933/1 diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index f5e082a..8c8febc 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -564,6 +564,7 @@ $preferences['visualeditor-hidesourceswitchpopup'] = $api; $preferences['visualeditor-hidevisualswitchpopup'] = $api; $preferences['visualeditor-hideusered'] = $api; + $preferences['visualeditor-findAndReplace-diacritic'] = $api; $preferences['visualeditor-findAndReplace-findText'] = $api; $preferences['visualeditor-findAndReplace-replaceText'] = $api; $preferences['visualeditor-findAndReplace-regex'] = $api; diff --git a/extension.json b/extension.json index a5132f7..cd8add6 100644 --- a/extension.json +++ b/extension.json @@ -970,6 +970,8 @@ "visualeditor-dialog-table-title", "visualeditor-dimensionswidget-px", "visualeditor-dimensionswidget-times", + "visualeditor-find-and-replace-diacritic", + "visualeditor-find-and-replace-diacritic-unavailable", "visualeditor-find-and-replace-done", "visualeditor-find-and-replace-find-text", "visualeditor-find-and-replace-invalid-regex", -- To view, visit https://gerrit.wikimedia.org/r/339933 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6b74fc3dbaa27de67a565a3c2c6bf8a951b24364 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Diacritic insensitive search in find & replace dialog
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339932 )
Change subject: Diacritic insensitive search in find & replace dialog
..
Diacritic insensitive search in find & replace dialog
Bug: T154195
Depends-On: I92b0acf61738921eb927de75eb63f62b1227c675
Change-Id: I95eb851c10a44e18382a6a4a0cb22559db6752b7
---
M i18n/en.json
M i18n/qqq.json
M src/dm/ve.dm.Document.js
M src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
M src/ve.utils.js
M tests/dm/ve.dm.Document.test.js
6 files changed, 222 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/32/339932/1
diff --git a/i18n/en.json b/i18n/en.json
index 37022fc..f709f40 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -69,6 +69,8 @@
"visualeditor-diff-no-changes": "No changes",
"visualeditor-dimensionswidget-px": "px",
"visualeditor-dimensionswidget-times": "×",
+ "visualeditor-find-and-replace-diacritic": "Diacritic insensitive",
+ "visualeditor-find-and-replace-diacritic-unavailable": "Diacritic
insensitive search not available in this browser",
"visualeditor-find-and-replace-done": "Done",
"visualeditor-find-and-replace-find-text": "Find",
"visualeditor-find-and-replace-invalid-regex": "Invalid regular
expression",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ececfbc..7303ff6 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -77,6 +77,8 @@
"visualeditor-diff-no-changes": "Label displayed in the diff view when
no net changes have been made.",
"visualeditor-dimensionswidget-px": "{{optional}}\nLabel for the
dimensions properties denoting pixel units.",
"visualeditor-dimensionswidget-times": "{{optional}}\nLabel for the
dimensions properties denoting 'by', as in width x height.",
+ "visualeditor-find-and-replace-diacritic": "Label for diacritic
insensitive toggle in find and replace",
+ "visualeditor-find-and-replace-diacritic-unavailable": "Label for
diabled diacritic insensitive toggle in find and replace when not supported by
browser",
"visualeditor-find-and-replace-done": "Label for button to finish using
the find and replace dialog\n{{Identical|Done}}",
"visualeditor-find-and-replace-find-text": "Label for find text in find
and replace\n{{Identical|Find}}",
"visualeditor-find-and-replace-invalid-regex": "Inline error message
shown for an invalid regular expression",
diff --git a/src/dm/ve.dm.Document.js b/src/dm/ve.dm.Document.js
index d48a375..1fe87a9 100644
--- a/src/dm/ve.dm.Document.js
+++ b/src/dm/ve.dm.Document.js
@@ -1471,12 +1471,14 @@
* @param {string|RegExp} query Text to find, string or regex with no flags
* @param {Object} [options] Search options
* @param {boolean} [options.caseSensitiveString] Case sensitive search for a
string query. Ignored by regexes (use 'i' flag).
+ * @param {boolean} [options.diacriticInsensitiveString] Diacritic insensitive
search for a string query. Ignored by regexes.
+ * Only works in browsers which support String.prototype.localeCompare's
options argument.
* @param {boolean} [options.noOverlaps] Avoid overlapping matches
* @param {boolean} [options.wholeWord] Only match whole-word occurrences
* @return {ve.Range[]} List of ranges where the string was found
*/
ve.dm.Document.prototype.findText = function ( query, options ) {
- var i, l, len, match, offset, lines, dataString,
+ var i, j, l, qLen, match, offset, lines, dataString, sensitivity,
ranges = [],
text = this.data.getText(
true,
@@ -1512,15 +1514,32 @@
query.lastIndex = 0;
}
} else {
- if ( !options.caseSensitiveString ) {
- text = text.toLowerCase();
- query = query.toLowerCase();
- }
- len = query.length;
- offset = -1;
- while ( ( offset = text.indexOf( query, offset ) ) !== -1 ) {
- ranges.push( new ve.Range( offset, offset + len ) );
- offset += options.noOverlaps ? len : 1;
+ qLen = query.length;
+ if ( options.diacriticInsensitiveString &&
ve.supportsLocaleCompareOptions ) {
+ sensitivity = options.caseSensitiveString ? 'case' :
'base';
+ // Iterate up to (and including) offset textLength -
queryLength. Beyond that point
+ // there is not enough room for the query to exist
+ for ( offset = 0, l = text.length - qLen; offset <= l;
offset++ ) {
+ j = 0;
+ while ( text[ offset + j ].localeCompare(
query[ j ], undefined, { sensitivity: sensitivity } ) === 0 ) {
+ j+
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Icon for diacritic insensitive search
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/339931 )
Change subject: Icon for diacritic insensitive search
..
Icon for diacritic insensitive search
Bug: T154195
Change-Id: I92b0acf61738921eb927de75eb63f62b1227c675
---
M demos/pages/icons.js
M src/themes/apex/icons-editing-advanced.json
M src/themes/apex/images/icons/case-sensitive.svg
A src/themes/apex/images/icons/diacritic.svg
M src/themes/mediawiki/icons-editing-advanced.json
M src/themes/mediawiki/images/icons/case-sensitive.svg
A src/themes/mediawiki/images/icons/diacritic.svg
7 files changed, 19 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/31/339931/1
diff --git a/demos/pages/icons.js b/demos/pages/icons.js
index d90c4a0..b3d42e7 100644
--- a/demos/pages/icons.js
+++ b/demos/pages/icons.js
@@ -139,6 +139,7 @@
'quotes',
'quotesAdd',
'searchCaseSensitive',
+ 'searchDiacritics',
'searchRegularExpression',
'specialCharacter',
'table',
diff --git a/src/themes/apex/icons-editing-advanced.json
b/src/themes/apex/icons-editing-advanced.json
index ec755a1..ea2e2ec 100644
--- a/src/themes/apex/icons-editing-advanced.json
+++ b/src/themes/apex/icons-editing-advanced.json
@@ -56,6 +56,7 @@
"rtl": "images/icons/articleRedirect-rtl.svg"
} },
"searchCaseSensitive": { "file":
"images/icons/case-sensitive.svg" },
+ "searchDiacritics": { "file": "images/icons/diacritic.svg" },
"searchRegularExpression": { "file":
"images/icons/regular-expression.svg" },
"specialCharacter": { "file":
"images/icons/specialCharacter.svg" },
"table": { "file": "images/icons/table.svg" },
diff --git a/src/themes/apex/images/icons/case-sensitive.svg
b/src/themes/apex/images/icons/case-sensitive.svg
index 46cd9b0..749e38f 100644
--- a/src/themes/apex/images/icons/case-sensitive.svg
+++ b/src/themes/apex/images/icons/case-sensitive.svg
@@ -1,6 +1,6 @@
http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
-
+
diff --git a/src/themes/apex/images/icons/diacritic.svg
b/src/themes/apex/images/icons/diacritic.svg
new file mode 100644
index 000..4565101
--- /dev/null
+++ b/src/themes/apex/images/icons/diacritic.svg
@@ -0,0 +1,7 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
+
+
+
diff --git a/src/themes/mediawiki/icons-editing-advanced.json
b/src/themes/mediawiki/icons-editing-advanced.json
index 21efb82..7cbbced 100644
--- a/src/themes/mediawiki/icons-editing-advanced.json
+++ b/src/themes/mediawiki/icons-editing-advanced.json
@@ -76,6 +76,7 @@
"rtl": "images/icons/articleRedirect-rtl.svg"
} },
"searchCaseSensitive": { "file":
"images/icons/case-sensitive.svg" },
+ "searchDiacritics": { "file": "images/icons/diacritic.svg" },
"searchRegularExpression": { "file":
"images/icons/regular-expression.svg" },
"specialCharacter": { "file":
"images/icons/specialCharacter.svg" },
"table": { "file": "images/icons/table.svg" },
diff --git a/src/themes/mediawiki/images/icons/case-sensitive.svg
b/src/themes/mediawiki/images/icons/case-sensitive.svg
index 46cd9b0..749e38f 100644
--- a/src/themes/mediawiki/images/icons/case-sensitive.svg
+++ b/src/themes/mediawiki/images/icons/case-sensitive.svg
@@ -1,6 +1,6 @@
http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
-
+
diff --git a/src/themes/mediawiki/images/icons/diacritic.svg
b/src/themes/mediawiki/images/icons/diacritic.svg
new file mode 100644
index 000..4565101
--- /dev/null
+++ b/src/themes/mediawiki/images/icons/diacritic.svg
@@ -0,0 +1,7 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
+
+
+
--
To view, visit https://gerrit.wikimedia.org/r/339931
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92b0acf61738921eb927de75eb63f62b1227c675
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Esanders
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Quiz[master]: Generalize quiz selector in JS
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/339826 )
Change subject: Generalize quiz selector in JS
..
Generalize quiz selector in JS
Instead of using the ID "bodyContent" to get the div that is
used to search the quiz instance, it is preferred to use "mw-content-text"
which is skin-indipendent ("bodyContent" is not present in all skins).
Change-Id: I075bfe6801fd2ba9fa5e301818d2b528661fbb3d
---
M modules/ext.quiz.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Mvolz: Looks good to me, approved
diff --git a/modules/ext.quiz.js b/modules/ext.quiz.js
index 54aef43..40165a2 100755
--- a/modules/ext.quiz.js
+++ b/modules/ext.quiz.js
@@ -67,7 +67,7 @@
// Prepare the quiz for "javascriptable" browsers
function prepareQuiz() {
- var bodyContentDiv = document.getElementById( 'bodyContent'
).getElementsByTagName( 'div' );
+ var bodyContentDiv = document.getElementById( 'mw-content-text'
).getElementsByTagName( 'div' );
for( var i = 0; i < bodyContentDiv.length; ++i ) {
if( bodyContentDiv[i].className === 'quiz' ) {
var input =
bodyContentDiv[i].getElementsByTagName( 'input' );
--
To view, visit https://gerrit.wikimedia.org/r/339826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I075bfe6801fd2ba9fa5e301818d2b528661fbb3d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Quiz
Gerrit-Branch: master
Gerrit-Owner: Crisbal
Gerrit-Reviewer: Mvolz
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
