[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceMultiUpload[REL1_27]: Initial commit
Robert Vogel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340474 ) Change subject: Initial commit .. Initial commit Change-Id: I8ef21f8c147acf38c9b88e198ffcb5bdd165d227 --- M .gitreview A BlueSpiceMultiUpload.class.php A README.md A extension.json A i18n/de.json A i18n/en.json A i18n/qqq.json A includes/BlueSpiceMultiUploadHooks.php A resources/BS/action/APIUpload.js A resources/BS/dialog/MultiUpload.js A resources/BS/form/UploadDetailsFieldSet.js A resources/ext.bluespice.extjs.upload.js A resources/ext.bluespice.multiUpload.js A resources/ext.bluespice.upload.js A resources/ext.bluespice.uploader.bootstrap.js A resources/lib/plupload/Moxie.swf A resources/lib/plupload/Moxie.xap A resources/lib/plupload/moxie.js A resources/lib/plupload/plupload.dev.js 19 files changed, 13,643 insertions(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/340474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ef21f8c147acf38c9b88e198ffcb5bdd165d227 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceMultiUpload Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceMultiUpload[REL1_27]: Initial commit
Robert Vogel has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340474 ) Change subject: Initial commit .. Initial commit Change-Id: I8ef21f8c147acf38c9b88e198ffcb5bdd165d227 --- M .gitreview A BlueSpiceMultiUpload.class.php A README.md A extension.json A i18n/de.json A i18n/en.json A i18n/qqq.json A includes/BlueSpiceMultiUploadHooks.php A resources/BS/action/APIUpload.js A resources/BS/dialog/MultiUpload.js A resources/BS/form/UploadDetailsFieldSet.js A resources/ext.bluespice.extjs.upload.js A resources/ext.bluespice.multiUpload.js A resources/ext.bluespice.upload.js A resources/ext.bluespice.uploader.bootstrap.js A resources/lib/plupload/Moxie.swf A resources/lib/plupload/Moxie.xap A resources/lib/plupload/moxie.js A resources/lib/plupload/plupload.dev.js 19 files changed, 13,643 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceMultiUpload refs/changes/74/340474/1 -- To view, visit https://gerrit.wikimedia.org/r/340474 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8ef21f8c147acf38c9b88e198ffcb5bdd165d227 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceMultiUpload Gerrit-Branch: REL1_27 Gerrit-Owner: Robert Vogel ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceMultiUpload[master]: Initial commit
Robert Vogel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/336974 ) Change subject: Initial commit .. Initial commit Change-Id: I8ef21f8c147acf38c9b88e198ffcb5bdd165d227 --- A BlueSpiceMultiUpload.class.php A README.md A extension.json A i18n/de.json A i18n/en.json A i18n/qqq.json A includes/BlueSpiceMultiUploadHooks.php A resources/BS/action/APIUpload.js A resources/BS/dialog/MultiUpload.js A resources/BS/form/UploadDetailsFieldSet.js A resources/ext.bluespice.extjs.upload.js A resources/ext.bluespice.multiUpload.js A resources/ext.bluespice.upload.js A resources/ext.bluespice.uploader.bootstrap.js A resources/lib/plupload/Moxie.swf A resources/lib/plupload/Moxie.xap A resources/lib/plupload/moxie.js A resources/lib/plupload/plupload.dev.js 18 files changed, 13,642 insertions(+), 0 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/336974 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8ef21f8c147acf38c9b88e198ffcb5bdd165d227 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/BlueSpiceMultiUpload Gerrit-Branch: master Gerrit-Owner: Robert Vogel Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: Robert Vogel Gerrit-Reviewer: Siebrand ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: ShoutBox: css fix to show delete-button background image wit...
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340473 )
Change subject: ShoutBox: css fix to show delete-button background image
without cut
..
ShoutBox: css fix to show delete-button background image without cut
Change-Id: I70916616917283bca5e1776e9f19b1a5449b28a1
---
M ShoutBox/resources/bluespice.shoutBox.css
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/73/340473/1
diff --git a/ShoutBox/resources/bluespice.shoutBox.css
b/ShoutBox/resources/bluespice.shoutBox.css
index 9dd363d..6dc9879 100644
--- a/ShoutBox/resources/bluespice.shoutBox.css
+++ b/ShoutBox/resources/bluespice.shoutBox.css
@@ -84,7 +84,7 @@
}
.bs-sb-archive{
- width: 14px;
+ width: 15px;
height: 14px;
float:left;
/*@embed*/
@@ -130,4 +130,4 @@
#bs-sb-content .bs-sb-listitem{
width: 100%;
display: inline-block;
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/340473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70916616917283bca5e1776e9f19b1a5449b28a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Dvogel hallowelt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: ShoutBox: css fix to show delete-button background image wit...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340471 )
Change subject: ShoutBox: css fix to show delete-button background image
without cut
..
ShoutBox: css fix to show delete-button background image without cut
Change-Id: I70916616917283bca5e1776e9f19b1a5449b28a1
---
M ShoutBox/resources/bluespice.shoutBox.css
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ShoutBox/resources/bluespice.shoutBox.css
b/ShoutBox/resources/bluespice.shoutBox.css
index 9dd363d..6dc9879 100644
--- a/ShoutBox/resources/bluespice.shoutBox.css
+++ b/ShoutBox/resources/bluespice.shoutBox.css
@@ -84,7 +84,7 @@
}
.bs-sb-archive{
- width: 14px;
+ width: 15px;
height: 14px;
float:left;
/*@embed*/
@@ -130,4 +130,4 @@
#bs-sb-content .bs-sb-listitem{
width: 100%;
display: inline-block;
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/340471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70916616917283bca5e1776e9f19b1a5449b28a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: ShoutBox: css fix to show delete-button background image wit...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340473 )
Change subject: ShoutBox: css fix to show delete-button background image
without cut
..
ShoutBox: css fix to show delete-button background image without cut
Change-Id: I70916616917283bca5e1776e9f19b1a5449b28a1
---
M ShoutBox/resources/bluespice.shoutBox.css
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ShoutBox/resources/bluespice.shoutBox.css
b/ShoutBox/resources/bluespice.shoutBox.css
index 9dd363d..6dc9879 100644
--- a/ShoutBox/resources/bluespice.shoutBox.css
+++ b/ShoutBox/resources/bluespice.shoutBox.css
@@ -84,7 +84,7 @@
}
.bs-sb-archive{
- width: 14px;
+ width: 15px;
height: 14px;
float:left;
/*@embed*/
@@ -130,4 +130,4 @@
#bs-sb-content .bs-sb-listitem{
width: 100%;
display: inline-block;
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/340473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70916616917283bca5e1776e9f19b1a5449b28a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Test disable super_detect_noop script
EBernhardson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340472 ) Change subject: Test disable super_detect_noop script .. Test disable super_detect_noop script The upgrade to elasticsearch 5 will require us to turn this off for about a week. Do a test deployment before the upgrade so we know there wont be unrelated problems with increase update rates when that happens. Change-Id: I5541bcc58f3e18ffc2e180e82ee2d59426f31656 --- M wmf-config/CirrusSearch-common.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/72/340472/1 diff --git a/wmf-config/CirrusSearch-common.php b/wmf-config/CirrusSearch-common.php index 681743c..c59071c 100644 --- a/wmf-config/CirrusSearch-common.php +++ b/wmf-config/CirrusSearch-common.php @@ -131,7 +131,7 @@ 'build', 'use', ], - 'super_detect_noop' => true, + //'super_detect_noop' => true, 'id_hash_mod_filter' => true, 'documentVersion' => true, ]; -- To view, visit https://gerrit.wikimedia.org/r/340472 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5541bcc58f3e18ffc2e180e82ee2d59426f31656 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: EBernhardson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: ShoutBox: css fix to show delete-button background image wit...
Dvogel hallowelt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340471 )
Change subject: ShoutBox: css fix to show delete-button background image
without cut
..
ShoutBox: css fix to show delete-button background image without cut
Change-Id: I70916616917283bca5e1776e9f19b1a5449b28a1
---
M ShoutBox/resources/bluespice.shoutBox.css
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/71/340471/1
diff --git a/ShoutBox/resources/bluespice.shoutBox.css
b/ShoutBox/resources/bluespice.shoutBox.css
index 9dd363d..6dc9879 100644
--- a/ShoutBox/resources/bluespice.shoutBox.css
+++ b/ShoutBox/resources/bluespice.shoutBox.css
@@ -84,7 +84,7 @@
}
.bs-sb-archive{
- width: 14px;
+ width: 15px;
height: 14px;
float:left;
/*@embed*/
@@ -130,4 +130,4 @@
#bs-sb-content .bs-sb-listitem{
width: 100%;
display: inline-block;
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/340471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70916616917283bca5e1776e9f19b1a5449b28a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Dvogel hallowelt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Re-adding style change to ext.CollaborationKit.hub.styles.less
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340442 )
Change subject: Re-adding style change to ext.CollaborationKit.hub.styles.less
..
Re-adding style change to ext.CollaborationKit.hub.styles.less
This change was approved in an earlier commit but accidentally taken
out. I am re-adding it.
Change-Id: I238341f6d506b3c20862033ed05c263c33536875
---
M modules/ext.CollaborationKit.hub.styles.less
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/modules/ext.CollaborationKit.hub.styles.less
b/modules/ext.CollaborationKit.hub.styles.less
index 8f5c16e..9ac5995 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -62,9 +62,13 @@
h2 {
display: inline;
margin: 0;
- padding: 0 0 .25em;
+ padding: 0;
border-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/340442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I238341f6d506b3c20862033ed05c263c33536875
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: 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/core[master]: Follow-up a57b64436cf2: Correct @deprecated version
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340469 ) Change subject: Follow-up a57b64436cf2: Correct @deprecated version .. Follow-up a57b64436cf2: Correct @deprecated version Change-Id: Ia16907a8fcb500c8dd261dd4309a892824d80595 --- M includes/compat/Timestamp.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/compat/Timestamp.php b/includes/compat/Timestamp.php index 805e61e..bd25432 100644 --- a/includes/compat/Timestamp.php +++ b/includes/compat/Timestamp.php @@ -12,7 +12,7 @@ // complain about class_alias() not being in the target class file. /** - * @deprecated since 1.28 + * @deprecated since 1.29 * @since 1.20 */ class_alias( Wikimedia\Timestamp\TimestampException::class, 'Timestamp' . 'Exception' ); -- To view, visit https://gerrit.wikimedia.org/r/340469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia16907a8fcb500c8dd261dd4309a892824d80595 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Use wikimedia/timestamp
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/313683 )
Change subject: Use wikimedia/timestamp
..
Use wikimedia/timestamp
Bug: T100924
Depends-On: I0a067367cda6885fa45631ed7c18799d653dc9bf
Change-Id: I69ba64e364df8af089c1c918cdf32f99454e693a
---
M RELEASE-NOTES-1.29
M autoload.php
M composer.json
M includes/Defines.php
M includes/MWTimestamp.php
M includes/MergeHistory.php
M includes/api/ApiMain.php
A includes/compat/Timestamp.php
M includes/libs/filebackend/FSFileBackend.php
M includes/libs/filebackend/FileBackendStore.php
M includes/libs/filebackend/HTTPFileStreamer.php
M includes/libs/rdbms/database/Database.php
M includes/libs/rdbms/database/DatabasePostgres.php
D includes/libs/time/ConvertibleTimestamp.php
D includes/libs/time/TimestampException.php
D includes/libs/time/defines.php
M includes/libs/xmp/XMPValidate.php
M includes/media/FormatMetadata.php
M includes/pager/ReverseChronologicalPager.php
M includes/utils/AutoloadGenerator.php
D tests/phpunit/includes/libs/time/ConvertibleTimestampTest.php
21 files changed, 44 insertions(+), 476 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index a1ce9d9..9f2c850 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -58,6 +58,7 @@
=== External library changes in 1.29 ===
Upgraded external libraries
+* Added wikimedia/timestamp v1.0.0.
* Updated QUnit from v1.22.0 to v1.23.1.
* Updated cssjanus from v1.1.2 to 1.1.3.
* Updated psr/log from v1.0.0 to v1.0.2.
diff --git a/autoload.php b/autoload.php
index aa4e544..e5879d9 100644
--- a/autoload.php
+++ b/autoload.php
@@ -289,7 +289,6 @@
'ConvertLinks' => __DIR__ . '/maintenance/convertLinks.php',
'ConvertUserOptions' => __DIR__ . '/maintenance/convertUserOptions.php',
'ConverterRule' => __DIR__ . '/languages/ConverterRule.php',
- 'ConvertibleTimestamp' => __DIR__ .
'/includes/libs/time/ConvertibleTimestamp.php',
'Cookie' => __DIR__ . '/includes/libs/Cookie.php',
'CookieJar' => __DIR__ . '/includes/libs/CookieJar.php',
'CopyFileBackend' => __DIR__ . '/maintenance/copyFileBackend.php',
@@ -1438,7 +1437,6 @@
'ThumbnailRenderJob' => __DIR__ .
'/includes/jobqueue/jobs/ThumbnailRenderJob.php',
'TidyUpBug37714' => __DIR__ . '/maintenance/tidyUpBug37714.php',
'TiffHandler' => __DIR__ . '/includes/media/Tiff.php',
- 'TimestampException' => __DIR__ .
'/includes/libs/time/TimestampException.php',
'Timing' => __DIR__ . '/includes/libs/Timing.php',
'Title' => __DIR__ . '/includes/Title.php',
'TitleArray' => __DIR__ . '/includes/TitleArray.php',
diff --git a/composer.json b/composer.json
index bc0ce17..fe68a61 100644
--- a/composer.json
+++ b/composer.json
@@ -41,6 +41,7 @@
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/utfnormal": "1.1.0",
+ "wikimedia/timestamp": "1.0.0",
"wikimedia/wait-condition-loop": "1.0.1",
"wikimedia/wrappedstring": "2.2.0",
"zordius/lightncandy": "0.23"
@@ -75,7 +76,10 @@
"autoload": {
"psr-0": {
"ComposerHookHandler": "includes/composer"
- }
+ },
+ "files": [
+ "includes/compat/Timestamp.php"
+ ]
},
"autoload-dev": {
"files": [
diff --git a/includes/Defines.php b/includes/Defines.php
index 35c2a2d..bd92ff0 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -21,7 +21,6 @@
*/
require_once __DIR__ . '/libs/mime/defines.php';
-require_once __DIR__ . '/libs/time/defines.php';
require_once __DIR__ . '/libs/rdbms/defines.php';
require_once __DIR__ . '/compat/normal/UtfNormalDefines.php';
diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index c1e5cc4..7f3649e 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -21,6 +21,7 @@
* @since 1.20
* @author Tyler Romeo, 2012
*/
+use Wikimedia\Timestamp\ConvertibleTimestamp;
/**
* Library for creating and parsing MW-style timestamps. Based on the JS
diff --git a/includes/MergeHistory.php b/includes/MergeHistory.php
index e57f880..8cf3af1 100644
--- a/includes/MergeHistory.php
+++ b/includes/MergeHistory.php
@@ -24,6 +24,7 @@
*
* @file
*/
+use Wikimedia\Timestamp\TimestampException;
/**
* Handles the backend logic of merging the histories of two
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 6d76f8c..604fdf9 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -26,6 +26,7 @@
*/
use MediaWiki\Logger\LoggerFactory;
+use Wikimedia\Timestamp\TimestampException;
/**
* This is the main API class, used f
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Add wikimedia/timestamp 1.0.0
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/313682 )
Change subject: Add wikimedia/timestamp 1.0.0
..
Add wikimedia/timestamp 1.0.0
Bug: T100924
Change-Id: I0a067367cda6885fa45631ed7c18799d653dc9bf
---
M composer.json
M composer.lock
M composer/autoload_classmap.php
M composer/autoload_files.php
M composer/autoload_static.php
M composer/installed.json
A wikimedia/timestamp/COPYING
A wikimedia/timestamp/README.md
A wikimedia/timestamp/src/ConvertibleTimestamp.php
A wikimedia/timestamp/src/TimestampException.php
A wikimedia/timestamp/src/defines.php
11 files changed, 849 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index 0f7aff0..6492b5d 100644
--- a/composer.json
+++ b/composer.json
@@ -48,6 +48,7 @@
"wikimedia/running-stat": "1.1.0",
"wikimedia/scoped-callback": "1.0.0",
"wikimedia/textcat": "1.2.0",
+ "wikimedia/timestamp": "1.0.0",
"wikimedia/utfnormal": "1.1.0",
"wikimedia/wait-condition-loop": "1.0.1",
"wikimedia/wrappedstring": "2.2.0",
diff --git a/composer.lock b/composer.lock
index 5810e35..1bd2950 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"content-hash": "19ab65e155b0c9981150fcd971b437c7",
+"content-hash": "6e6efa02e9989ec950e3970b20d4b0b9",
"packages": [
{
"name": "composer/semver",
@@ -1892,6 +1892,51 @@
"time": "2017-01-23T16:52:10+00:00"
},
{
+"name": "wikimedia/timestamp",
+"version": "v1.0.0",
+"source": {
+"type": "git",
+"url": "https://github.com/wikimedia/Timestamp.git";,
+"reference": "880660a2fbc6e577d381225812c255008d58e0cc"
+},
+"dist": {
+"type": "zip",
+"url":
"https://api.github.com/repos/wikimedia/Timestamp/zipball/880660a2fbc6e577d381225812c255008d58e0cc";,
+"reference": "880660a2fbc6e577d381225812c255008d58e0cc",
+"shasum": ""
+},
+"require": {
+"php": ">=5.5.9"
+},
+"require-dev": {
+"jakub-onderka/php-parallel-lint": "0.9.2",
+"mediawiki/mediawiki-codesniffer": "0.7.2",
+"phpunit/phpunit": "4.8.24"
+},
+"type": "library",
+"autoload": {
+"classmap": [
+"src/"
+],
+"files": [
+"src/defines.php"
+]
+},
+"notification-url": "https://packagist.org/downloads/";,
+"license": [
+"GPL-2.0+"
+],
+"authors": [
+{
+"name": "Tyler Romeo",
+"email": "tylerro...@gmail.com"
+}
+],
+"description": "Creation, parsing, and conversion of timestamps",
+"homepage": "https://www.mediawiki.org/wiki/Timestamp";,
+"time": "2016-09-30T10:00:56+00:00"
+},
+{
"name": "wikimedia/utfnormal",
"version": "v1.1.0",
"source": {
diff --git a/composer/autoload_classmap.php b/composer/autoload_classmap.php
index fd2845f..1fcdf85 100644
--- a/composer/autoload_classmap.php
+++ b/composer/autoload_classmap.php
@@ -717,6 +717,8 @@
'Wikimedia\\Composer\\Merge\\StabilityFlags' => $vendorDir .
'/wikimedia/composer-merge-plugin/src/Merge/StabilityFlags.php',
'Wikimedia\\PhpSessionSerializer' => $vendorDir .
'/wikimedia/php-session-serializer/src/Wikimedia/PhpSessionSerializer.php',
'Wikimedia\\ScopedCallback' => $vendorDir .
'/wikimedia/scoped-callback/src/ScopedCallback.php',
+'Wikimedia\\Timestamp\\ConvertibleTimestamp' => $vendorDir .
'/wikimedia/timestamp/src/ConvertibleTimestamp.php',
+'Wikimedia\\Timestamp\\TimestampException' => $vendorDir .
'/wikimedia/timestamp/src/TimestampException.php',
'Wikimedia\\WaitConditionLoop' => $vendorDir .
'/wikimedia/wait-condition-loop/src/WaitConditionLoop.php',
'WrappedString\\WrappedString' => $vendorDir .
'/wikimedia/wrappedstring/src/WrappedString.php',
'WrappedString\\WrappedStringList' => $vendorDir .
'/wikimedia/wrappedstring/src/WrappedStringList.php',
diff --git a/composer/autoload_files.php b/composer/autoload_files.php
index 591d238..4532cea 100644
--- a/composer/autoload_files.php
+++ b/composer/autoload_files.php
@@ -9,4 +9,5 @@
'a24b5daa493ecb5e767c7d1592a8da36' => $vendorDi
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Follow-up a57b64436cf2: Correct @deprecated version
Krinkle has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340469 ) Change subject: Follow-up a57b64436cf2: Correct @deprecated version .. Follow-up a57b64436cf2: Correct @deprecated version Change-Id: Ia16907a8fcb500c8dd261dd4309a892824d80595 --- M includes/compat/Timestamp.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/69/340469/1 diff --git a/includes/compat/Timestamp.php b/includes/compat/Timestamp.php index 805e61e..bd25432 100644 --- a/includes/compat/Timestamp.php +++ b/includes/compat/Timestamp.php @@ -12,7 +12,7 @@ // complain about class_alias() not being in the target class file. /** - * @deprecated since 1.28 + * @deprecated since 1.29 * @since 1.20 */ class_alias( Wikimedia\Timestamp\TimestampException::class, 'Timestamp' . 'Exception' ); -- To view, visit https://gerrit.wikimedia.org/r/340469 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia16907a8fcb500c8dd261dd4309a892824d80595 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Krinkle ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Plug LanguageChangeOpDeserializer to LexemeChangeOpDeserializer
Ladsgroup has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340470 )
Change subject: Plug LanguageChangeOpDeserializer to LexemeChangeOpDeserializer
..
Plug LanguageChangeOpDeserializer to LexemeChangeOpDeserializer
Bug: T155701
Change-Id: I5dd5224416c3c0050e3b081e7d6521ce06f57840
---
M WikibaseLexeme.entitytypes.php
M src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php
M
tests/phpunit/mediawiki/ChangeOp/Deserialization/LexemeChangeOpDeserializerTest.php
3 files changed, 66 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme
refs/changes/70/340470/1
diff --git a/WikibaseLexeme.entitytypes.php b/WikibaseLexeme.entitytypes.php
index 7566b13..df83315 100644
--- a/WikibaseLexeme.entitytypes.php
+++ b/WikibaseLexeme.entitytypes.php
@@ -11,8 +11,11 @@
* @license GPL-2.0+
* @author Amir Sarabadani
*/
+
+use ValueValidators\StringValidator;
use Wikibase\DataModel\Entity\EntityId;
use Wikibase\Lexeme\ChangeOp\Deserialization\LemmaChangeOpDeserializer;
+use Wikibase\Lexeme\ChangeOp\Deserialization\LanguageChangeOpDeserializer;
use Wikibase\Lexeme\Validators\LexemeValidatorFactory;
use Wikibase\Repo\ChangeOp\Deserialization\TermChangeOpSerializationValidator;
use Wikibase\Repo\MediaWikiLanguageDirectionalityLookup;
@@ -131,6 +134,14 @@
$wikibaseRepo->getTermValidatorFactory()
),
$wikibaseRepo->getStringNormalizer()
+ ),
+ new LanguageChangeOpDeserializer(
+ new LexemeValidatorFactory(
+ 1000, // TODO: move to setting,
at least change to some reasonable hard-coded value
+
$wikibaseRepo->getTermValidatorFactory()
+ ),
+ $wikibaseRepo->getStringNormalizer(),
+ new StringValidator()
)
);
},
diff --git a/src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php
b/src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php
index 833fdea..46dc63d 100644
--- a/src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php
+++ b/src/ChangeOp/Deserialization/LexemeChangeOpDeserializer.php
@@ -19,8 +19,17 @@
*/
private $lemmaChangeOpDeserializer;
- public function __construct( LemmaChangeOpDeserializer
$lemmaChangeOpDeserializer ) {
+ /**
+* @var LanguageChangeOpDeserializer
+*/
+ private $languageChangeOpDeserializer;
+
+ public function __construct(
+ LemmaChangeOpDeserializer $lemmaChangeOpDeserializer,
+ LanguageChangeOpDeserializer $languageChangeOpDeserializer
+ ) {
$this->lemmaChangeOpDeserializer = $lemmaChangeOpDeserializer;
+ $this->languageChangeOpDeserializer =
$languageChangeOpDeserializer;
}
/**
@@ -36,6 +45,10 @@
$changeOps->add(
$this->lemmaChangeOpDeserializer->createEntityChangeOp( $changeRequest ) );
}
+ if ( array_key_exists( 'language', $changeRequest ) ) {
+ $changeOps->add(
$this->languageChangeOpDeserializer->createEntityChangeOp( $changeRequest ) );
+ }
+
return $changeOps;
}
diff --git
a/tests/phpunit/mediawiki/ChangeOp/Deserialization/LexemeChangeOpDeserializerTest.php
b/tests/phpunit/mediawiki/ChangeOp/Deserialization/LexemeChangeOpDeserializerTest.php
index e939578..010fb04 100644
---
a/tests/phpunit/mediawiki/ChangeOp/Deserialization/LexemeChangeOpDeserializerTest.php
+++
b/tests/phpunit/mediawiki/ChangeOp/Deserialization/LexemeChangeOpDeserializerTest.php
@@ -3,6 +3,7 @@
namespace Wikibase\Lexeme\Tests\ChangeOp\Deserialization;
use Wikibase\ChangeOp\ChangeOp;
+use Wikibase\Lexeme\ChangeOp\Deserialization\LanguageChangeOpDeserializer;
use Wikibase\Lexeme\ChangeOp\Deserialization\LemmaChangeOpDeserializer;
use Wikibase\Lexeme\ChangeOp\Deserialization\LexemeChangeOpDeserializer;
@@ -24,8 +25,20 @@
->getMock();
}
+ /**
+* @return LanguageChangeOpDeserializer
+*/
+ private function getLanguageChangeOpDeserializer() {
+ return $this->getMockBuilder(
LanguageChangeOpDeserializer::class )
+ ->disableOriginalConstructor()
+ ->getMock();
+ }
+
public function testCreateEntityChangeOpReturnsChangeOpInstance() {
- $deserializer = new LexemeChangeOpDeserializer(
$this->getLemmaChangeOpDeserializer() );
+ $des
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: api.php: Fully spell out "constructor"
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340468 )
Change subject: api.php: Fully spell out "constructor"
..
api.php: Fully spell out "constructor"
There's no real reason to abbreviate it.
Change-Id: Ib85d5e420bfdc1eca4d83265e2d9c3f719d7fa2b
---
M api.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api.php b/api.php
index 6e75fb7..a6ce3b2 100644
--- a/api.php
+++ b/api.php
@@ -63,7 +63,7 @@
try {
/* Construct an ApiMain with the arguments passed via the URL. What we
get back
* is some form of an ApiMain, possibly even one that produces an error
message,
-* but we don't care here, as that is handled by the ctor.
+* but we don't care here, as that is handled by the constructor.
*/
$processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI
);
--
To view, visit https://gerrit.wikimedia.org/r/340468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib85d5e420bfdc1eca4d83265e2d9c3f719d7fa2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Krinkle
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...TheWikipediaLibrary[master]: Remove executable flag
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340463 ) Change subject: Remove executable flag .. Remove executable flag It was set on most (but not all) files in this repo. Change-Id: I7bdbd905bb5fbc33e79f22380dd04cb3036e1c3d --- M Hooks.php M composer.json M extension.json M i18n/en.json M i18n/qqq.json 5 files changed, 0 insertions(+), 0 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/Hooks.php b/Hooks.php old mode 100755 new mode 100644 diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 diff --git a/extension.json b/extension.json old mode 100755 new mode 100644 diff --git a/i18n/en.json b/i18n/en.json old mode 100755 new mode 100644 diff --git a/i18n/qqq.json b/i18n/qqq.json old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/340463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7bdbd905bb5fbc33e79f22380dd04cb3036e1c3d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/TheWikipediaLibrary Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Catrope Gerrit-Reviewer: Kmuthu Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Siebrand Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: api.php: Fully spell out "constructor"
Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340468 )
Change subject: api.php: Fully spell out "constructor"
..
api.php: Fully spell out "constructor"
There's no real reason to abbreviate it.
Change-Id: Ib85d5e420bfdc1eca4d83265e2d9c3f719d7fa2b
---
M api.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/68/340468/1
diff --git a/api.php b/api.php
index 6e75fb7..a6ce3b2 100644
--- a/api.php
+++ b/api.php
@@ -63,7 +63,7 @@
try {
/* Construct an ApiMain with the arguments passed via the URL. What we
get back
* is some form of an ApiMain, possibly even one that produces an error
message,
-* but we don't care here, as that is handled by the ctor.
+* but we don't care here, as that is handled by the constructor.
*/
$processor = new ApiMain( RequestContext::getMain(), $wgEnableWriteAPI
);
--
To view, visit https://gerrit.wikimedia.org/r/340468
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib85d5e420bfdc1eca4d83265e2d9c3f719d7fa2b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TheWikipediaLibrary[master]: Fix extension.json validation error
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340466 ) Change subject: Fix extension.json validation error .. Fix extension.json validation error Change-Id: I4f5149dc52a6a2ca57e55c7d69a35724f6f495ea --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/extension.json b/extension.json index 4f03f9d..154b07f 100755 --- a/extension.json +++ b/extension.json @@ -4,7 +4,7 @@ "author": [ "Kavitha Muthu" ], - "url": "", + "url": "https://www.mediawiki.org/wiki/Extension:TheWikipediaLibrary";, "namemsg": "theWikipediaLibrary", "descriptionmsg": "theWikipediaLibrary-desc", "license-name": "MIT", -- To view, visit https://gerrit.wikimedia.org/r/340466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f5149dc52a6a2ca57e55c7d69a35724f6f495ea Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TheWikipediaLibrary Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Legoktm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: PopupElement: Set $floatableContainer to this.$element by de...
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340467 )
Change subject: PopupElement: Set $floatableContainer to this.$element by
default
..
PopupElement: Set $floatableContainer to this.$element by default
Change-Id: I6a765914febecf01ccc42e4a767c0d5335b9db7c
---
M src/mixins/PopupElement.js
M src/widgets/CapsuleMultiselectWidget.js
M src/widgets/PopupButtonWidget.js
3 files changed, 9 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/67/340467/1
diff --git a/src/mixins/PopupElement.js b/src/mixins/PopupElement.js
index 8846452..f038d51 100644
--- a/src/mixins/PopupElement.js
+++ b/src/mixins/PopupElement.js
@@ -18,9 +18,14 @@
// Properties
this.popup = new OO.ui.PopupWidget( $.extend(
- { autoClose: true },
+ {
+ autoClose: true,
+ $floatableContainer: this.$element
+ },
config.popup,
- { $autoCloseIgnore: this.$element.add( config.popup &&
config.popup.$autoCloseIgnore ) }
+ {
+ $autoCloseIgnore: this.$element.add( config.popup &&
config.popup.$autoCloseIgnore )
+ }
) );
};
diff --git a/src/widgets/CapsuleMultiselectWidget.js
b/src/widgets/CapsuleMultiselectWidget.js
index c0d32e3..77cb2d4 100644
--- a/src/widgets/CapsuleMultiselectWidget.js
+++ b/src/widgets/CapsuleMultiselectWidget.js
@@ -92,11 +92,7 @@
align: 'forwards',
anchor: false
} );
- OO.ui.mixin.PopupElement.call( this, $.extend( true, {},
config, {
- popup: {
- $floatableContainer: this.$element
- }
- } ) );
+ OO.ui.mixin.PopupElement.call( this, config );
$tabFocus = $( '' );
OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config,
{ $tabIndexed: $tabFocus } ) );
} else {
diff --git a/src/widgets/PopupButtonWidget.js b/src/widgets/PopupButtonWidget.js
index a272a1b..8f9c7f3 100644
--- a/src/widgets/PopupButtonWidget.js
+++ b/src/widgets/PopupButtonWidget.js
@@ -31,11 +31,7 @@
OO.ui.PopupButtonWidget.parent.call( this, config );
// Mixin constructors
- OO.ui.mixin.PopupElement.call( this, $.extend( true, {}, config, {
- popup: {
- $floatableContainer: this.$element
- }
- } ) );
+ OO.ui.mixin.PopupElement.call( this, config );
// Properties
this.$overlay = config.$overlay || this.$element;
--
To view, visit https://gerrit.wikimedia.org/r/340467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a765914febecf01ccc42e4a767c0d5335b9db7c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TheWikipediaLibrary[master]: Fix extension.json validation error
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340466 ) Change subject: Fix extension.json validation error .. Fix extension.json validation error Change-Id: I4f5149dc52a6a2ca57e55c7d69a35724f6f495ea --- M extension.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TheWikipediaLibrary refs/changes/66/340466/1 diff --git a/extension.json b/extension.json index 4f03f9d..154b07f 100755 --- a/extension.json +++ b/extension.json @@ -4,7 +4,7 @@ "author": [ "Kavitha Muthu" ], - "url": "", + "url": "https://www.mediawiki.org/wiki/Extension:TheWikipediaLibrary";, "namemsg": "theWikipediaLibrary", "descriptionmsg": "theWikipediaLibrary-desc", "license-name": "MIT", -- To view, visit https://gerrit.wikimedia.org/r/340466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4f5149dc52a6a2ca57e55c7d69a35724f6f495ea Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TheWikipediaLibrary Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Make TheWikipediaLibrary depend on Echo
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340465 ) Change subject: Make TheWikipediaLibrary depend on Echo .. Make TheWikipediaLibrary depend on Echo Its unit tests fail with a missing class error from Echo right now. Change-Id: I55284dcf6e3ea89234ef080cac0c7214c1d5dc66 --- M zuul/parameter_functions.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py index a3bef7f..f53a2c6 100644 --- a/zuul/parameter_functions.py +++ b/zuul/parameter_functions.py @@ -204,6 +204,7 @@ 'Spreadsheet': ['PHPExcel'], 'SyntaxHighlight_GeSHi': ['VisualEditor'], 'TitleBlacklist': ['AntiSpoof'], +'TheWikipediaLibrary': ['Echo'], 'Translate': ['UniversalLanguageSelector', 'EventLogging', 'cldr'], 'TranslateSvg': ['Translate'], 'TranslationNotifications': ['Translate'], -- To view, visit https://gerrit.wikimedia.org/r/340465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I55284dcf6e3ea89234ef080cac0c7214c1d5dc66 Gerrit-PatchSet: 2 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Catrope Gerrit-Reviewer: Hashar Gerrit-Reviewer: Krinkle Gerrit-Reviewer: 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] integration/config[master]: Add TheWikipediaLibrary extension
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340465 ) Change subject: Add TheWikipediaLibrary extension .. Add TheWikipediaLibrary extension Change-Id: I55284dcf6e3ea89234ef080cac0c7214c1d5dc66 --- M zuul/layout.yaml 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/65/340465/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index cc89d89..135e742 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -8435,6 +8435,12 @@ check: - jsonlint + - name: mediawiki/extensions/TheWikipediaLibrary +template: + - name: extension-unittests-generic +check: + - jsonlint + - name: mediawiki/extensions/TimedMediaHandler template: - name: composer-test -- To view, visit https://gerrit.wikimedia.org/r/340465 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I55284dcf6e3ea89234ef080cac0c7214c1d5dc66 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TheWikipediaLibrary[master]: Clean up SVG file
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340464 ) Change subject: Clean up SVG file .. Clean up SVG file svgo --pretty --disable=removeXMLProcInst twl-eligible.svg Change-Id: Idfb4a9a263af32950f7ca0c74be6fdab8faf09eb --- M modules/icons/twl-eligible.svg 1 file changed, 2 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TheWikipediaLibrary refs/changes/64/340464/1 diff --git a/modules/icons/twl-eligible.svg b/modules/icons/twl-eligible.svg index cd0f6e5..e4a3f98 100644 --- a/modules/icons/twl-eligible.svg +++ b/modules/icons/twl-eligible.svg @@ -1,12 +1,4 @@ -http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";> - -book-green -Created with Sketch. - - - - - - +http://www.w3.org/2000/svg";> + -- To view, visit https://gerrit.wikimedia.org/r/340464 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idfb4a9a263af32950f7ca0c74be6fdab8faf09eb Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TheWikipediaLibrary Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TheWikipediaLibrary[master]: Remove executable flag
Catrope has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340463 ) Change subject: Remove executable flag .. Remove executable flag It was set on most (but not all) files in this repo. Change-Id: I7bdbd905bb5fbc33e79f22380dd04cb3036e1c3d --- M Hooks.php M composer.json M extension.json M i18n/en.json M i18n/qqq.json 5 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TheWikipediaLibrary refs/changes/63/340463/1 diff --git a/Hooks.php b/Hooks.php old mode 100755 new mode 100644 diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 diff --git a/extension.json b/extension.json old mode 100755 new mode 100644 diff --git a/i18n/en.json b/i18n/en.json old mode 100755 new mode 100644 diff --git a/i18n/qqq.json b/i18n/qqq.json old mode 100755 new mode 100644 -- To view, visit https://gerrit.wikimedia.org/r/340463 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bdbd905bb5fbc33e79f22380dd04cb3036e1c3d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/TheWikipediaLibrary Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: Make standalone puppetmasters optionally use PuppetDB
Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340461 )
Change subject: puppet: Make standalone puppetmasters optionally use PuppetDB
..
puppet: Make standalone puppetmasters optionally use PuppetDB
Bug: T153577
Change-Id: If0f20722a163c9edbf6ab656b66da20b0fc9757b
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 22 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/340461/1
diff --git a/modules/role/manifests/puppetmaster/standalone.pp
b/modules/role/manifests/puppetmaster/standalone.pp
index 8fd8516..6c6049c 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -33,6 +33,8 @@
# Hostname for the puppetmaster. Defaults to fqdn. Is used for SSL
# certificates, virtualhost routing, etc
#
+# [*use_puppetdb*]
+# Set to true to use PuppetDB. Defaults to false.
# filtertags: labs-common
class role::puppetmaster::standalone(
$autosign = false,
@@ -42,6 +44,7 @@
$extra_auth_rules = '',
$server_name = $::fqdn,
$use_enc = true,
+$use_puppetdb = false,
) {
if ! $use_enc {
fail('Ldap puppet node definitions are no longer supported. The
$use_enc param must be true.')
@@ -68,11 +71,21 @@
group => 'root',
}
-$config = {
+$base_config = {
'node_terminus' => 'exec',
'external_nodes'=> '/usr/local/bin/puppet-enc',
'thin_storeconfigs' => false,
'autosign' => $autosign,
+}
+$puppetdb_config = {
+'storeconfigs' => true,
+'storeconfigs_backend' => 'puppetdb',
+}
+
+if $use_puppetdb {
+$config = merge($base_config, $puppetdb_config)
+} else {
+$config = $base_config
}
class { '::puppetmaster':
@@ -84,6 +97,14 @@
config => $config,
}
+if $use_puppetdb {
+$puppetdb_host = hiera('puppetmaster::config::puppetdb_host')
+
+class { 'puppetmaster::puppetdb::client':
+host => $puppetdb_host,
+}
+}
+
# Update git checkout
class { 'puppetmaster::gitsync':
run_every_minutes => $git_sync_minutes,
--
To view, visit https://gerrit.wikimedia.org/r/340461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0f20722a163c9edbf6ab656b66da20b0fc9757b
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] operations/puppet[production]: puppetdb: Set defaults for replication in Labs
Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340460 )
Change subject: puppetdb: Set defaults for replication in Labs
..
puppetdb: Set defaults for replication in Labs
This change configures the PuppetDB master to have no slaves by
default.
Change-Id: I17d90a939b3bccbb082e6fe3ae4ac02a61d4d7eb
---
M hieradata/labs.yaml
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/340460/1
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index dd1d41e..1105d53 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -38,6 +38,8 @@
"%{hiera('puppetmaster')}":
- { worker: "%{hiera('puppetmaster')}", loadfactor: 10 }
role::puppetmaster::puppetdb::shared_buffers: 128MB
+puppetmaster::puppetdb::master: "%{::fqdn}"
+puppetmaster::puppetdb::slaves: []
# Default to Dummy authenticator in JupyterHubs in labs
jupyterhub::authenticator: dummy
--
To view, visit https://gerrit.wikimedia.org/r/340460
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17d90a939b3bccbb082e6fe3ae4ac02a61d4d7eb
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] operations/puppet[production]: puppetdb: Allow to use Apache as frontend
Tim Landscheidt has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340462 )
Change subject: puppetdb: Allow to use Apache as frontend
..
puppetdb: Allow to use Apache as frontend
Bug: T154105
Change-Id: I7a0605d03d6307d50ce27840515121c14d4f5b14
---
M modules/puppetmaster/manifests/puppetdb.pp
A modules/puppetmaster/templates/apache-puppetdb.conf.erb
2 files changed, 60 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/340462/1
diff --git a/modules/puppetmaster/manifests/puppetdb.pp
b/modules/puppetmaster/manifests/puppetdb.pp
index de2b5cb..697d4bf 100644
--- a/modules/puppetmaster/manifests/puppetdb.pp
+++ b/modules/puppetmaster/manifests/puppetdb.pp
@@ -1,29 +1,54 @@
# Class puppetmaster::puppetdb
#
# Sets up a puppetdb instance and the corresponding database server.
-class puppetmaster::puppetdb($master, $port=443, $jetty_port=8080) {
+class puppetmaster::puppetdb($master, $port=443, $jetty_port=8080,
$webfrontend='nginx') {
requires_os('Debian >= jessie')
$puppetdb_pass = hiera('puppetdb::password::rw')
## TLS Termination
-# Set up nginx as a reverse-proxy
-::base::expose_puppet_certs { '/etc/nginx':
-ensure => present,
-provide_private => true,
-require => Class['nginx'],
-}
+case $webfrontend {
+'apache': {
+# Set up Apache as a reverse-proxy.
+include ::apache::mod::headers
+include ::apache::mod::proxy
+include ::apache::mod::proxy_http
+include ::apache::mod::ssl
-$ssl_settings = ssl_ciphersuite('nginx', 'mid')
-include ::sslcert::dhparam
-::nginx::site { 'puppetdb':
-ensure => present,
-content => template('puppetmaster/nginx-puppetdb.conf.erb'),
-require => Class['::sslcert::dhparam'],
-}
+$ssl_settings = ssl_ciphersuite('apache', 'mid', true)
+include ::sslcert::dhparam
+::apache::site { 'puppetdb':
+ensure => present,
+content => template('puppetmaster/apache-puppetdb.conf.erb'),
+require => Class['::sslcert::dhparam'],
+}
-diamond::collector::nginx{ $::fqdn:
-port => 10080,
+}
+
+'nginx': {
+# Set up nginx as a reverse-proxy.
+::base::expose_puppet_certs { '/etc/nginx':
+ensure => present,
+provide_private => true,
+require => Class['nginx'],
+}
+
+$ssl_settings = ssl_ciphersuite('nginx', 'mid')
+include ::sslcert::dhparam
+::nginx::site { 'puppetdb':
+ensure => present,
+content => template('puppetmaster/nginx-puppetdb.conf.erb'),
+require => Class['::sslcert::dhparam'],
+}
+
+diamond::collector::nginx{ $::fqdn:
+port => 10080,
+}
+}
+
+default: {
+fail("Unknown webfrontend '${webfrontend}'")
+}
}
## PuppetDB installation
diff --git a/modules/puppetmaster/templates/apache-puppetdb.conf.erb
b/modules/puppetmaster/templates/apache-puppetdb.conf.erb
new file mode 100644
index 000..da94b31
--- /dev/null
+++ b/modules/puppetmaster/templates/apache-puppetdb.conf.erb
@@ -0,0 +1,19 @@
+# This file is managed by Puppet!
+
+>
+ServerName <%= @fqdn %>
+
+SSLEngine on
+<%= @ssl_settings.join("\n") %>
+SSLCertificateFile /var/lib/puppet/ssl/certs/<%= @fqdn %>.pem
+SSLCertificateKeyFile /var/lib/puppet/ssl/private_keys/<%= @fqdn %>.pem
+SSLCACertificateFile/var/lib/puppet/ssl/certs/ca.pem
+SSLCertificateChainFile /var/lib/puppet/ssl/certs/ca.pem
+
+DocumentRoot /dev/null
+
+RequestHeader set X-Real-IP %{REMOTE_ADDR}s
+ProxyPass / http://localhost:<%= @jetty_port %>/
+
+CustomLog /var/log/apache2/puppetdb.log wmf
+
--
To view, visit https://gerrit.wikimedia.org/r/340462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a0605d03d6307d50ce27840515121c14d4f5b14
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] wikimedia...crm[master]: Rerun the geocoding.
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340459 )
Change subject: Rerun the geocoding.
..
Rerun the geocoding.
The only thing that seems odd about the geocoding function is the lack of
brackets in the
for for < 210 * . Perhaps it was in the running. Re-trying this on staging.
Bug: T158271
Change-Id: I1f1ea9870d5f9ff8da0283557e80481291c68fa7
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/59/340459/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index f200874..4680be0 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2399,7 +2399,7 @@
");
$batch = 10;
- for($startId = 0; $startId < 210 * $batch; $startId += $batch) {
+ for($startId = 0; $startId < 2100; $startId += $batch) {
$endId = $startId + $batch;
CRM_Core_DAO::executeQuery("
UPDATE civicrm_address a
@@ -2533,3 +2533,12 @@
AND next_sched_contribution_date IN ('2017-03-28', '2017-03-27')
");
}
+
+/**
+ * Re-run geocoding update, many not updated.
+ *
+ * Bug T158271.
+ */
+function wmf_civicrm_update_7470() {
+ wmf_civicrm_update_7320();
+}
--
To view, visit https://gerrit.wikimedia.org/r/340459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f1ea9870d5f9ff8da0283557e80481291c68fa7
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: icons: Fix vertical alignment of 'journal'
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340458 )
Change subject: icons: Fix vertical alignment of 'journal'
..
icons: Fix vertical alignment of 'journal'
Fixing vertical alignment of 'journal'. Also introducing it to Apex.
Change-Id: I299e73cf81c1ffbf2083bf2049d21ffb44a1d6bf
---
M src/themes/apex/icons-content.json
A src/themes/apex/images/icons/journal-ltr.svg
A src/themes/apex/images/icons/journal-rtl.svg
M src/themes/mediawiki/images/icons/journal-ltr.svg
M src/themes/mediawiki/images/icons/journal-rtl.svg
5 files changed, 16 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/themes/apex/icons-content.json
b/src/themes/apex/icons-content.json
index 394ec85..0cd901f 100644
--- a/src/themes/apex/icons-content.json
+++ b/src/themes/apex/icons-content.json
@@ -10,6 +10,10 @@
"ltr": "images/icons/articleRedirect-ltr.svg",
"rtl": "images/icons/articleRedirect-rtl.svg"
} },
+ "journal": { "file": {
+ "ltr": "images/icons/journal-ltr.svg",
+ "rtl": "images/icons/journal-rtl.svg"
+ } },
"upload": { "file": {
"ltr": "images/icons/upload-ltr.svg",
"rtl": "images/icons/upload-rtl.svg"
diff --git a/src/themes/apex/images/icons/journal-ltr.svg
b/src/themes/apex/images/icons/journal-ltr.svg
new file mode 100644
index 000..8a83e41
--- /dev/null
+++ b/src/themes/apex/images/icons/journal-ltr.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
diff --git a/src/themes/apex/images/icons/journal-rtl.svg
b/src/themes/apex/images/icons/journal-rtl.svg
new file mode 100644
index 000..2a07a44
--- /dev/null
+++ b/src/themes/apex/images/icons/journal-rtl.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
diff --git a/src/themes/mediawiki/images/icons/journal-ltr.svg
b/src/themes/mediawiki/images/icons/journal-ltr.svg
index c9fa553..8a83e41 100644
--- a/src/themes/mediawiki/images/icons/journal-ltr.svg
+++ b/src/themes/mediawiki/images/icons/journal-ltr.svg
@@ -1,4 +1,4 @@
-
+
http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
-
+
diff --git a/src/themes/mediawiki/images/icons/journal-rtl.svg
b/src/themes/mediawiki/images/icons/journal-rtl.svg
index 84da9fa..2a07a44 100644
--- a/src/themes/mediawiki/images/icons/journal-rtl.svg
+++ b/src/themes/mediawiki/images/icons/journal-rtl.svg
@@ -1,4 +1,4 @@
-
+
http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
-
+
--
To view, visit https://gerrit.wikimedia.org/r/340458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I299e73cf81c1ffbf2083bf2049d21ffb44a1d6bf
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: icons: Fix vertical alignment of 'journal'
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340458 )
Change subject: icons: Fix vertical alignment of 'journal'
..
icons: Fix vertical alignment of 'journal'
Fixing vertical alignment of 'journal'. Also introducing it to Apex.
Change-Id: I299e73cf81c1ffbf2083bf2049d21ffb44a1d6bf
---
M src/themes/apex/icons-content.json
A src/themes/apex/images/icons/journal-ltr.svg
A src/themes/apex/images/icons/journal-rtl.svg
M src/themes/mediawiki/images/icons/journal-ltr.svg
M src/themes/mediawiki/images/icons/journal-rtl.svg
5 files changed, 16 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/58/340458/1
diff --git a/src/themes/apex/icons-content.json
b/src/themes/apex/icons-content.json
index 394ec85..0cd901f 100644
--- a/src/themes/apex/icons-content.json
+++ b/src/themes/apex/icons-content.json
@@ -10,6 +10,10 @@
"ltr": "images/icons/articleRedirect-ltr.svg",
"rtl": "images/icons/articleRedirect-rtl.svg"
} },
+ "journal": { "file": {
+ "ltr": "images/icons/journal-ltr.svg",
+ "rtl": "images/icons/journal-rtl.svg"
+ } },
"upload": { "file": {
"ltr": "images/icons/upload-ltr.svg",
"rtl": "images/icons/upload-rtl.svg"
diff --git a/src/themes/apex/images/icons/journal-ltr.svg
b/src/themes/apex/images/icons/journal-ltr.svg
new file mode 100644
index 000..8a83e41
--- /dev/null
+++ b/src/themes/apex/images/icons/journal-ltr.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
diff --git a/src/themes/apex/images/icons/journal-rtl.svg
b/src/themes/apex/images/icons/journal-rtl.svg
new file mode 100644
index 000..2a07a44
--- /dev/null
+++ b/src/themes/apex/images/icons/journal-rtl.svg
@@ -0,0 +1,4 @@
+
+http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
+
+
diff --git a/src/themes/mediawiki/images/icons/journal-ltr.svg
b/src/themes/mediawiki/images/icons/journal-ltr.svg
index c9fa553..8a83e41 100644
--- a/src/themes/mediawiki/images/icons/journal-ltr.svg
+++ b/src/themes/mediawiki/images/icons/journal-ltr.svg
@@ -1,4 +1,4 @@
-
+
http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
-
+
diff --git a/src/themes/mediawiki/images/icons/journal-rtl.svg
b/src/themes/mediawiki/images/icons/journal-rtl.svg
index 84da9fa..2a07a44 100644
--- a/src/themes/mediawiki/images/icons/journal-rtl.svg
+++ b/src/themes/mediawiki/images/icons/journal-rtl.svg
@@ -1,4 +1,4 @@
-
+
http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24
24">
-
+
--
To view, visit https://gerrit.wikimedia.org/r/340458
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I299e73cf81c1ffbf2083bf2049d21ffb44a1d6bf
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/dns[master]: geo config structure changes for discovery
BBlack has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340154 )
Change subject: geo config structure changes for discovery
..
geo config structure changes for discovery
This goes with the puppet change:
I062f3583e3d2e6bd96d6f5cc991d04ec55c1e8e2
Bug: T156100
Change-Id: I1fe3ddb9e51fa77843f1ca3ad1d14345a2bd5d3d
---
D config-geo
A config-geo-test
A geo-maps
A geo-resources
4 files changed, 276 insertions(+), 272 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/config-geo b/config-geo
deleted file mode 100644
index 35ae83a..000
--- a/config-geo
+++ /dev/null
@@ -1,272 +0,0 @@
-plugins => { geoip => {
-maps => {
-generic-map => {
-geoip2_db => /usr/share/GeoIP/GeoIP2-City.mmdb
-datacenters => [eqiad codfw esams ulsfo]
-map => {
-# use ISO 3166-2 official names
-AF => [esams, eqiad, codfw, ulsfo],
-AS => {
-default => [ulsfo, codfw, eqiad, esams],
-AE => [esams, eqiad, codfw, ulsfo], # United Arab Emirates
-AF => [esams, eqiad, codfw, ulsfo], # Afghanistan
-AM => [esams, eqiad, codfw, ulsfo], # Armenia
-AP => [ulsfo, codfw, eqiad, esams], # Asia-Pacific region
(misc)
-AZ => [esams, eqiad, codfw, ulsfo], # Azerbaijan
-BD => [ulsfo, codfw, eqiad, esams], # Bangladesh
-BH => [esams, eqiad, codfw, ulsfo], # Bahrain
-BN => [ulsfo, codfw, eqiad, esams], # Brunei Darussalam
-BT => [ulsfo, codfw, eqiad, esams], # Bhutan
-CC => [ulsfo, codfw, eqiad, esams], # Cocos (Keeling)
Islands
-CN => [ulsfo, codfw, eqiad, esams], # China
-CX => [ulsfo, codfw, eqiad, esams], # Christmas Island
-CY => [esams, eqiad, codfw, ulsfo], # Cyprus
-GE => [esams, eqiad, codfw, ulsfo], # Georgia
-HK => [ulsfo, codfw, eqiad, esams], # Hong Kong
-ID => [ulsfo, codfw, eqiad, esams], # Indonesia
-IL => [esams, eqiad, codfw, ulsfo], # Israel
-IN => [esams, eqiad, codfw, ulsfo], # India
-IO => [esams, eqiad, codfw, ulsfo], # British Indian Ocean
Territory
-IQ => [esams, eqiad, codfw, ulsfo], # Iraq
-IR => [esams, eqiad, codfw, ulsfo], # Iran (Islamic
Republic of)
-JO => [esams, eqiad, codfw, ulsfo], # Jordan
-JP => [ulsfo, codfw, eqiad, esams], # Japan
-KG => [esams, eqiad, codfw, ulsfo], # Kyrgyzstan
-KH => [ulsfo, codfw, eqiad, esams], # Cambodia
-KP => [ulsfo, codfw, eqiad, esams], # Korea, Democratic
People's Republic of
-KR => [ulsfo, codfw, eqiad, esams], # Korea, Republic of
-KW => [esams, eqiad, codfw, ulsfo], # Kuwait
-KZ => [esams, eqiad, codfw, ulsfo], # Kazakhstan
-LA => [ulsfo, codfw, eqiad, esams], # Lao People's
Democratic Republic
-LB => [esams, eqiad, codfw, ulsfo], # Lebanon
-LK => [esams, eqiad, codfw, ulsfo], # Sri Lanka
-MM => [ulsfo, codfw, eqiad, esams], # Myanmar
-MN => [ulsfo, codfw, eqiad, esams], # Mongolia
-MO => [ulsfo, codfw, eqiad, esams], # Macao
-MV => [ulsfo, codfw, eqiad, esams], # Maldives
-MY => [ulsfo, codfw, eqiad, esams], # Malaysia
-NP => [ulsfo, codfw, eqiad, esams], # Nepal
-OM => [esams, eqiad, codfw, ulsfo], # Oman
-PH => [ulsfo, codfw, eqiad, esams], # Philippines
-PK => [esams, eqiad, codfw, ulsfo], # Pakistan
-PS => [esams, eqiad, codfw, ulsfo], # Palestine, State of
-QA => [esams, eqiad, codfw, ulsfo], # Qatar
-SA => [esams, eqiad, codfw, ulsfo], # Saudi Arabia
-SG => [ulsfo, codfw, eqiad, esams], # Singapore
-SY => [esams, eqiad, codfw, ulsfo], # Syrian Arab Republic
-TH => [ulsfo, codfw, eqiad, esams], # Thailand
-TJ => [esams, eqiad, codfw, ulsfo], # Tajikistan
-TL => [ulsfo, codfw, eqiad, esams], # Timor-Leste
-TM => [esams, eqiad, codfw, ulsfo], # Turkmenistan
-TW => [ulsfo, codfw, eqiad, esams], # Taiwan, Province of
China
-UZ => [esams, eqiad, codfw, ulsfo], # Uzbekistan
-VN => [ulsfo, codfw, eqiad, esams], # Viet Nam
-YE => [esams, eqiad, codfw, ulsfo], # Yemen
-
[MediaWiki-commits] [Gerrit] operations/puppet[production]: authdns: re-structure prep for discovery
BBlack has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340156 ) Change subject: authdns: re-structure prep for discovery .. authdns: re-structure prep for discovery This must be deployed in sync with the same structure change in the DNS repo. Bug: T156100 Change-Id: I062f3583e3d2e6bd96d6f5cc991d04ec55c1e8e2 --- M modules/authdns/files/authdns-lint M modules/authdns/files/authdns-local-update M modules/authdns/templates/config.erb 3 files changed, 69 insertions(+), 29 deletions(-) Approvals: BBlack: Verified; Looks good to me, approved diff --git a/modules/authdns/files/authdns-lint b/modules/authdns/files/authdns-lint index 314607b..878f25a 100644 --- a/modules/authdns/files/authdns-lint +++ b/modules/authdns/files/authdns-lint @@ -38,14 +38,22 @@ if [ ! -e "$WORKINGDIR/templates" ]; then die "templates not found, system misconfigured?" fi -if [ ! -e "$WORKINGDIR/config-geo" ]; then -die "config-geo not found, system misconfigured?" +if [ ! -e "$WORKINGDIR/config-geo-test" ]; then +die "config-geo-test not found, system misconfigured?" +fi +if [ ! -e "$WORKINGDIR/geo-maps" ]; then +die "geo-maps not found, system misconfigured?" +fi +if [ ! -e "$WORKINGDIR/geo-resources" ]; then +die "geo-resources not found, system misconfigured?" fi echo "Generating zonefiles from zone templates" authdns-gen-zones $WORKINGDIR/templates $TESTDIR/etc/zones echo "Generating gdnsd config" -cp -f $WORKINGDIR/config-geo $TESTDIR/etc/config +cp -f $WORKINGDIR/config-geo-test $TESTDIR/etc/config +cp -f $WORKINGDIR/geo-maps $TESTDIR/etc/geo-maps +cp -f $WORKINGDIR/geo-resources $TESTDIR/etc/geo-resources gdnsd -sSc $TESTDIR/etc checkconf diff --git a/modules/authdns/files/authdns-local-update b/modules/authdns/files/authdns-local-update index 2319a8e..2c281a3 100644 --- a/modules/authdns/files/authdns-local-update +++ b/modules/authdns/files/authdns-local-update @@ -69,8 +69,14 @@ if [ ! -e "$WORKINGDIR/templates" ]; then die "templates not found, system misconfigured?" fi -if [ ! -e "$WORKINGDIR/config-geo" ]; then -die "config-geo not found, system misconfigured?" +if [ ! -e "$WORKINGDIR/config-geo-test" ]; then +die "config-geo-test not found, system misconfigured?" +fi +if [ ! -e "$WORKINGDIR/geo-maps" ]; then +die "geo-maps not found, system misconfigured?" +fi +if [ ! -e "$WORKINGDIR/geo-resources" ]; then +die "geo-resources not found, system misconfigured?" fi if [ ! -e "$WORKINGDIR/admin_state" ]; then die "admin_state not found, system misconfigured?" @@ -84,19 +90,31 @@ die "less than 10 zones, something's probably wrong, aborting"; fi -echo "Copy config-geo" -cp -f /etc/gdnsd/config-geo /etc/gdnsd/config-geo~ 2>/dev/null || true -cp -f $WORKINGDIR/config-geo /etc/gdnsd/ +echo "Copy config-geo bits" +cp -f /etc/gdnsd/config-geo-test /etc/gdnsd/config-geo-test~ 2>/dev/null || true +cp -f /etc/gdnsd/geo-maps /etc/gdnsd/geo-maps~ 2>/dev/null || true +cp -f /etc/gdnsd/geo-resources /etc/gdnsd/geo-resources~ 2>/dev/null || true +cp -f $WORKINGDIR/config-geo-test /etc/gdnsd/ +cp -f $WORKINGDIR/geo-maps /etc/gdnsd/geo-maps +cp -f $WORKINGDIR/geo-resources /etc/gdnsd/geo-resources # initial run, before gdnsd was installed if ! which gdnsd > /dev/null || [ "$SKIP_RELOAD" = "true" ]; then -rm -f /etc/gdnsd/config-geo~ +rm -f /etc/gdnsd/config-geo-test~ +rm -f /etc/gdnsd/geo-maps~ +rm -f /etc/gdnsd/geo-resources~ exit 0 fi if ! gdnsd checkconf >/dev/null; then -if [ -f /etc/gdnsd/config-geo~ ]; then -mv /etc/gdnsd/config-geo~ /etc/gdnsd/config-geo +if [ -f /etc/gdnsd/config-geo-test~ ]; then +mv /etc/gdnsd/config-geo-test~ /etc/gdnsd/config-geo-test +fi +if [ -f /etc/gdnsd/geo-maps~ ]; then +mv /etc/gdnsd/geo-maps~ /etc/gdnsd/geo-maps +fi +if [ -f /etc/gdnsd/geo-resources~ ]; then +mv /etc/gdnsd/geo-resources~ /etc/gdnsd/geo-resources fi die "gdnsd checkconf failed, aborting" fi @@ -107,12 +125,18 @@ ### reload -if ! cmp --quiet /etc/gdnsd/config-geo~ /etc/gdnsd/config-geo; then -rm -f /etc/gdnsd/config-geo~ +if ( ! cmp --quiet /etc/gdnsd/config-geo-test~ /etc/gdnsd/config-geo-test ) \ + || ( ! cmp --quiet /etc/gdnsd/geo-maps~ /etc/gdnsd/geo-maps ) \ + || ( ! cmp --quiet /etc/gdnsd/geo-resources~ /etc/gdnsd/geo-resources ); then +rm -f /etc/gdnsd/config-geo-test~ +rm -f /etc/gdnsd/geo-maps~ +rm -f /etc/gdnsd/geo-resources~ echo "Restarting to update zones & config" service gdnsd restart >/dev/null else -rm -f /etc/gdnsd/config-geo~ +rm -f /etc/gdnsd/config-geo-test~ +rm -f /etc/gdnsd/geo-maps~ +rm -f /etc/gdnsd/geo-resources~ echo "Reloading zones" gdnsd reload-zones fi diff --git a/modules/authdns/templates/config.erb b/modules/authdns/templates/config.erb index 737e01f..eaf6221 100644 --- a/
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Drop everything after pipe in regression test script lines
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340456 )
Change subject: Drop everything after pipe in regression test script lines
..
Drop everything after pipe in regression test script lines
* Makes it easier to just copy/paste from the rt screen.
Change-Id: Ib890a6e5fb2cd8ae722c545e7a7c2816577ac822
---
M tools/regression-testing.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/regression-testing.js b/tools/regression-testing.js
index d280098..ab2e21c 100755
--- a/tools/regression-testing.js
+++ b/tools/regression-testing.js
@@ -99,7 +99,7 @@
var ind = l.indexOf(':');
return {
prefix: l.substr(0, ind),
- title: l.substr(ind + 1),
+ title: l.substr(ind + 1).replace(/ \|.*$/, ''),
};
});
return checkout(argv.o);
--
To view, visit https://gerrit.wikimedia.org/r/340456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib890a6e5fb2cd8ae722c545e7a7c2816577ac822
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
Gerrit-Reviewer: C. Scott Ananian
Gerrit-Reviewer: Subramanya Sastry
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]: Drop everything after pipe in regression test script lines
Arlolra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340456 )
Change subject: Drop everything after pipe in regression test script lines
..
Drop everything after pipe in regression test script lines
* Makes it easier to just copy/paste from the rt screen.
Change-Id: Ib890a6e5fb2cd8ae722c545e7a7c2816577ac822
---
M tools/regression-testing.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/56/340456/1
diff --git a/tools/regression-testing.js b/tools/regression-testing.js
index d280098..ab2e21c 100755
--- a/tools/regression-testing.js
+++ b/tools/regression-testing.js
@@ -99,7 +99,7 @@
var ind = l.indexOf(':');
return {
prefix: l.substr(0, ind),
- title: l.substr(ind + 1),
+ title: l.substr(ind + 1).replace(/ \|.*$/, ''),
};
});
return checkout(argv.o);
--
To view, visit https://gerrit.wikimedia.org/r/340456
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib890a6e5fb2cd8ae722c545e7a7c2816577ac822
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Adjust contribution date on 4 recurring contributions to get...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340457 )
Change subject: Adjust contribution date on 4 recurring contributions to get
past blockage.
..
Adjust contribution date on 4 recurring contributions to get past blockage.
Bug: T159298
Change-Id: I6cd52e38bbbc4cc08f575216f4177391c429908c
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/57/340457/1
diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index f3205cf..f200874 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -2516,3 +2516,20 @@
$tables = array('civicrm_activity' => array('activity_date_time'));
CRM_Core_BAO_SchemaHandler::createIndexes($tables);
}
+
+/**
+ * Adjust contribution date on 4 recurring contributions to get past blockage.
+ *
+ * https://phabricator.wikimedia.org/T159298#3063457
+ *
+ * T159298
+ */
+function wmf_civicrm_update_7465() {
+ civicrm_initialize();
+ CRM_Core_DAO::executeQuery("
+UPDATE civicrm_contribution_recur
+SET next_sched_contribution_date = '2017-04-01'
+WHERE id IN (163431,163364,59477,59458)
+AND next_sched_contribution_date IN ('2017-03-28', '2017-03-27')
+ ");
+}
--
To view, visit https://gerrit.wikimedia.org/r/340457
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cd52e38bbbc4cc08f575216f4177391c429908c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Flow on 'Viquiprojecte Discussió' on cawiki
Mattflaschen has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340455 ) Change subject: Enable Flow on 'Viquiprojecte Discussió' on cawiki .. Enable Flow on 'Viquiprojecte Discussió' on cawiki Matt Flaschen needs to run a script before this is deployed. Bug: T159047 Change-Id: Ic06ee16dcdcd4da535ff5d31616caa7a4ea7214b --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/55/340455/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 05264b9..2b0d0f2 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16393,6 +16393,7 @@ ], 'cawiki' => [ NS_PROJECT_TALK, // T99117 + 103, // Viquiprojecte Discussió, T159047 ], 'kabwiki' => [ NS_USER_TALK, // T140588 -- To view, visit https://gerrit.wikimedia.org/r/340455 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic06ee16dcdcd4da535ff5d31616caa7a4ea7214b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Mattflaschen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [WIP] Position anchor relative to popup, not popup relative ...
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340454 )
Change subject: [WIP] Position anchor relative to popup, not popup relative to
anchor
..
[WIP] Position anchor relative to popup, not popup relative to anchor
TODO: Clean up code
TODO: Rewrite code to be less layout-thrashy
TODO: Write commit message
Bug: T73644
Change-Id: I37f06ae7b81dc79dc3f8507299ca6fbb1b0e3c45
---
M demos/pages/widgets.js
M src/themes/mediawiki/widgets.less
M src/widgets/PopupWidget.js
3 files changed, 91 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/54/340454/1
diff --git a/demos/pages/widgets.js b/demos/pages/widgets.js
index 8622790..2ab15a7 100644
--- a/demos/pages/widgets.js
+++ b/demos/pages/widgets.js
@@ -1672,7 +1672,8 @@
$content: $( ''
).text( loremIpsum ),
padded: true,
align: 'force-left'
- }
+ },
+ $overlay: $( 'body' )
} ),
{
label: 'PopupButtonWidget
(frameless, with popup head, align: force-left)\u200E',
@@ -1737,6 +1738,23 @@
popup: {
head: true,
label: 'More
information',
+ $content: $( ''
).text( loremIpsum ),
+ padded: true,
+ align: 'center'
+ }
+ } ),
+ {
+ label: 'PopupButtonWidget
(frameless, with popup head align: center)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.PopupButtonWidget( {
+ icon: 'info',
+ framed: false,
+ popup: {
+ head: true,
+ label: 'More
information',
$content: $( '' +
loremIpsum + 'Item oneItem twoItem
threeItem fourEven more text here which might well be
clipped off the visible area.' ),
$footer: $( 'And
maybe a footer whilst we\'re at it?' ),
padded: true,
@@ -1759,7 +1777,37 @@
}
} ),
{
- label: 'PopupButtonWidget
(framed, no popup head)\u200E',
+ label: 'PopupButtonWidget
(framed, no popup head, align: forwards)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.PopupButtonWidget( {
+ icon: 'menu',
+ label: 'Options',
+ popup: {
+ $content: $( ''
).text( loremIpsum ),
+ padded: true,
+ align: 'backwards'
+ }
+ } ),
+ {
+ label: 'PopupButtonWidget
(framed, no popup head, align: backwards)\u200E',
+ align: 'top'
+ }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.PopupButtonWidget( {
+ icon: 'menu',
+ label: 'Options',
+
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Fetch imageinfo for both the file and manualthumb
Arlolra has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340453 )
Change subject: Fetch imageinfo for both the file and manualthumb
..
Fetch imageinfo for both the file and manualthumb
* Somewhat redundant for images, but videos are going to need both.
Change-Id: I1390bc6fb4225e00b35432116ffb8bdc84033808
---
M lib/wt2html/tt/LinkHandler.js
M tests/parserTests.txt
M tests/timedMediaHandlerParserTests-blacklist.js
3 files changed, 91 insertions(+), 75 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/53/340453/1
diff --git a/lib/wt2html/tt/LinkHandler.js b/lib/wt2html/tt/LinkHandler.js
index 274a373..4006b4d 100644
--- a/lib/wt2html/tt/LinkHandler.js
+++ b/lib/wt2html/tt/LinkHandler.js
@@ -15,6 +15,7 @@
var TokenHandler = require('./TokenHandler.js');
var DU = require('../../utils/DOMUtils.js').DOMUtils;
var JSUtils = require('../../utils/jsutils.js').JSUtils;
+var Promise = require('../../utils/promise.js');
// define some constructor shortcuts
var KV = defines.KV;
@@ -1031,73 +1032,72 @@
};
};
+var extractInfo = function(env, o) {
+ var data = o.data;
+ if (env.conf.parsoid.useBatchAPI) {
+ return data.batchResponse;
+ } else {
+ var ns = data.imgns;
+ // `useVideoInfo` is for legacy requests; batching returns
thumbdata.
+ var prop = env.conf.wiki.useVideoInfo ? 'videoinfo' :
'imageinfo';
+ // title is guaranteed to be not null here
+ var image = data.pages[ns + ':' + o.title.getKey()];
+ if (!image || !image[prop] || !image[prop][0] ||
+ // Fallback to adding mw:Error
+ (image.missing !== undefined && image.known ===
undefined)) {
+ return null;
+ } else {
+ return image[prop][0];
+ }
+ }
+};
+
+// Use sane defaults
+var errorInfo = function(opts) {
+ return {
+ url: './Special:FilePath/' +
Util.sanitizeTitleURI(opts.title.v.getKey()),
+ // Preserve width and height from the wikitext options
+ // even if the image is non-existent.
+ width: opts.size.v.width || 220,
+ height: opts.size.v.height || opts.size.v.width || 220,
+ };
+};
+
// Handle a response to an (image|video)info API request.
-WikiLinkHandler.prototype.handleInfo = function(cb, token, title, opts,
optSources, err, data) {
+WikiLinkHandler.prototype.handleInfo = function(cb, token, opts, optSources,
err, resp) {
// FIXME: Not doing this till we fix up wt2html error handling
//
// Bump resource use
// this.manager.env.bumpParserResourceUse('image');
- var info;
+ var info, manualinfo;
var errs = [];
- if (!err && data) {
- if (this.env.conf.parsoid.useBatchAPI) {
- info = data.batchResponse;
- } else {
- var ns = data.imgns;
- // `useVideoInfo` is for legacy requests; batching
returns thumbdata.
- var prop = this.env.conf.wiki.useVideoInfo ?
'videoinfo' : 'imageinfo';
- // title is guaranteed to be not null here
- var image = data.pages[ns + ':' + title.getKey()];
- if (!image || !image[prop] || !image[prop][0] ||
- // Fallback to adding mw:Error
- (image.missing !== undefined &&
image.known === undefined)) {
- info = false;
- } else {
- info = image[prop][0];
+ if (err) {
+ info = errorInfo(opts);
+ errs.push({ key: 'api-error', message: err });
+ } else {
+ info = extractInfo(this.env, resp[0]);
+ if (!info) {
+ info = errorInfo(opts);
+ errs.push({ key: 'missing-image', message: 'This image
does not exist.' });
+ } else if (info.hasOwnProperty('thumberror')) {
+ errs.push({ key: 'thumb-error', message:
info.thumberror });
+ }
+ if (opts.manualthumb !== undefined) {
+ manualinfo = extractInfo(this.env, resp[1]);
+ if (!manualinfo) {
+ manualinfo = errorInfo(opts);
+ errs.push({
+ key: 'missing-thumbnail',
+ message: 'This thumbnail does not
exist.',
+ // Additional error info for clients
that could fix the error.
+ par
[MediaWiki-commits] [Gerrit] mediawiki...PageTriage[master]: Get rid of global state
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340452 )
Change subject: Get rid of global state
..
Get rid of global state
Yeah, Article class is still scary, however at least it passes
proper context around.
Bug: T159299
Change-Id: I0204a9948f5124d7acd2c417db4a1d6b84dce835
---
M PageTriage.hooks.php
1 file changed, 18 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage
refs/changes/52/340452/1
diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index 42cab6d..bddf2d3 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -32,9 +32,8 @@
return true;
}
- global $wgUser;
// New record to pagetriage queue, compile metadata
- if ( self::addToPageTriageQueue( $pageId, $newTitle, $wgUser )
) {
+ if ( self::addToPageTriageQueue( $pageId, $newTitle,
$movePage->getUser() ) ) {
$acp = ArticleCompileProcessor::newFromPageId( [
$pageId ] );
if ( $acp ) {
// safe to use slave db for data compilation
for the
@@ -371,16 +370,20 @@
* @return bool
*/
public static function onArticleViewFooter( $article,
$patrolFooterShown ) {
- global $wgUser, $wgPageTriageMarkPatrolledLinkExpiry, $wgOut,
- $wgPageTriageEnableCurationToolbar, $wgRequest,
$wgPageTriageNamespaces;
+ global $wgPageTriageMarkPatrolledLinkExpiry,
+ $wgPageTriageEnableCurationToolbar,
$wgPageTriageNamespaces;
+
+ $user = $article->getContext()->getUser();
+ $outputPage = $article->getContext()->getOutput();
+ $request = $article->getContext()->getOutput();
// Overwrite the noindex rule defined in Article::view(), this
also affects main namespace
if ( self::shouldShowNoIndex( $article ) ) {
- $wgOut->setRobotPolicy( 'noindex,nofollow' );
+ $outputPage->setRobotPolicy( 'noindex,nofollow' );
}
// Only logged in users can review
- if ( !$wgUser->isLoggedIn() ) {
+ if ( !$user->isLoggedIn() ) {
return true;
}
@@ -395,13 +398,13 @@
}
// Don't do anything if it's coming from Special:NewPages
- if ( $wgRequest->getVal( 'patrolpage' ) ) {
+ if ( $request->getVal( 'patrolpage' ) ) {
return true;
}
// If the user hasn't visited Special:NewPagesFeed lately,
don't do anything
$lastUseExpired = false;
- $lastUse = $wgUser->getOption( 'pagetriage-lastuse' );
+ $lastUse = $user->getOption( 'pagetriage-lastuse' );
if ( $lastUse ) {
$lastUse = wfTimestamp( TS_UNIX, $lastUse );
$now = wfTimestamp( TS_UNIX, wfTimestampNow() );
@@ -416,19 +419,19 @@
// Also, users without the autopatrol right can't review their
own pages
$needsReview = PageTriageUtil::doesPageNeedTriage( $article );
if ( !is_null( $needsReview )
- && !( $wgUser->getId() ==
$article->getOldestRevision()->getUser()
- && !$wgUser->isAllowed( 'autopatrol' )
+ && !( $user->getId() ==
$article->getOldestRevision()->getUser()
+ && !$user->isAllowed( 'autopatrol' )
)
) {
- if ( $wgPageTriageEnableCurationToolbar ||
$wgRequest->getVal( 'curationtoolbar' ) === 'true' ) {
+ if ( $wgPageTriageEnableCurationToolbar ||
$request->getVal( 'curationtoolbar' ) === 'true' ) {
// Load the JavaScript for the curation toolbar
- $wgOut->addModules(
'ext.pageTriage.toolbarStartup' );
+ $outputPage->addModules(
'ext.pageTriage.toolbarStartup' );
// Set the config flags in JavaScript
$globalVars = [
'wgPageTriagelastUseExpired' =>
$lastUseExpired,
'wgPageTriagePagePrefixedText' =>
$article->getTitle()->getPrefixedText()
];
- $wgOut->addJsConfigVars( $globalVars );
+ $outputPage->addJsConfigVars( $globalVars );
} else {
if ( $needsReview ) {
// show 'Mark as reviewed' link
@@ -442,9 +445,
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Add loading animation
Mooeypoo has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340451 )
Change subject: RCFilters: Add loading animation
..
RCFilters: Add loading animation
Change-Id: I09d39a387eb1ed2fe4c1292f0a255d180035baa0
---
M includes/specials/SpecialRecentchanges.php
M resources/Resources.php
A resources/src/mediawiki.rcfilters/images/pending.gif
M resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
6 files changed, 43 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/51/340451/1
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index eb6d939..6914045 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -455,6 +455,17 @@
$panel[] = $form;
$panelString = implode( "\n", $panel );
+ // Insert a placeholder for RCFilters
+ if ( $this->getUser()->getOption( 'rcenhancedfilters' ) ) {
+ $this->getOutput()->addModuleStyles(
'mediawiki.rcfilters.filters.base.styles' );
+ $this->getOutput()->addHTML(
+ Xml::tags(
+ 'div',
+ [ 'class' => 'rcfilters-container' ]
+ )
+ );
+ }
+
$this->getOutput()->addHTML(
Xml::fieldset(
$this->msg( 'recentchanges-legend' )->text(),
diff --git a/resources/Resources.php b/resources/Resources.php
index 2a6562d..5406480 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1751,6 +1751,11 @@
/* MediaWiki Special pages */
+ 'mediawiki.rcfilters.filters.base.styles' => [
+ 'styles' => [
+
'resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less',
+ ],
+ ],
'mediawiki.rcfilters.filters.dm' => [
'scripts' => [
'resources/src/mediawiki.rcfilters/mw.rcfilters.js',
diff --git a/resources/src/mediawiki.rcfilters/images/pending.gif
b/resources/src/mediawiki.rcfilters/images/pending.gif
new file mode 100644
index 000..1194eed
--- /dev/null
+++ b/resources/src/mediawiki.rcfilters/images/pending.gif
Binary files differ
diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
index 33e9f57..6cfeb1a 100644
--- a/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
@@ -23,7 +23,7 @@
// eslint-disable-next-line no-new
new mw.rcfilters.ui.FormWrapperWidget(
- changesListModel, $( '.rcoptions form' ) );
+ changesListModel, $( '.rcoptions' ) );
controller.initialize( {
registration: {
@@ -184,7 +184,7 @@
}
} );
- $( '.rcoptions' ).before( filtersWidget.$element );
+ $( '.rcfilters-container' ).append(
filtersWidget.$element );
$( 'body' ).append( $overlay );
// HACK: Remove old-style filter links for filters
handled by the widget
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
index 8423363..2365f06 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.less
@@ -1,9 +1,24 @@
// Corrections for the standard special page
-.rcoptions {
- border: 0;
- border-bottom: 1px solid #a2a9b1;
+.client-js{
+ .rcoptions {
+ border: 0;
+ border-bottom: 1px solid #a2a9b1;
- legend {
- display: none;
+ legend {
+ display: none;
+ }
+
+ &:not(.mw-rcfilters-ui-ready) {
+ /* @embed */
+ background-image: url( ../images/pending.gif );
+
+ * {
+ visibility: hidden;
+ }
+ }
+ }
+
+ .rcfilters-container {
+ min-height: 100px;
}
}
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.FormWrapperWidget.js
index 2513b07..d089086 100644
--- a/resources/src/mediawiki.rcfilters/ui/mw.
[MediaWiki-commits] [Gerrit] oojs/ui[master]: demo: Make demo consoles LTR, even in the RTL demo
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340449 )
Change subject: demo: Make demo consoles LTR, even in the RTL demo
..
demo: Make demo consoles LTR, even in the RTL demo
Typing code into RTL inputs is no fun, you get stuff like
;( 'widget.popup.setAlignment( 'center
Change-Id: I2b28440af44cffac168944480e70c28095b04e82
---
M demos/styles/demo.css
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index e2a34d7..dd01ba7 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -153,6 +153,8 @@
border: 1px solid transparent;
margin-bottom: -2px;
line-height: 1.4;
+ /* @noflip */
+ direction: ltr;
}
.demo-console-expanded {
@@ -212,6 +214,7 @@
display: none;
}
+/* @noflip */
.demo-console-log {
border: 1px solid #a2a9b1;
border-width: 0 0 1px 0;
@@ -219,6 +222,7 @@
overflow: auto;
}
+/* @noflip */
.demo-console-log-line {
position: relative;
padding-left: 20px;
@@ -229,6 +233,7 @@
color: #54595d;
}
+/* @noflip */
.demo-console-log-line-input::before {
display: block;
position: absolute;
@@ -244,6 +249,7 @@
color: #d33;
}
+/* @noflip */
.demo-console-label {
position: relative;
display: inline-block;
@@ -257,6 +263,7 @@
box-sizing: border-box;
}
+/* @noflip */
.demo-console-label::before {
content: '→';
color: #00f;
--
To view, visit https://gerrit.wikimedia.org/r/340449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b28440af44cffac168944480e70c28095b04e82
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Jforrester
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]: mgmt: script to detect vendor by mgmt ssh banner
Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340450 )
Change subject: mgmt: script to detect vendor by mgmt ssh banner
..
mgmt: script to detect vendor by mgmt ssh banner
Change-Id: Icd340fa0194a85853198afb4526adfcade3d6dc7
---
A modules/mgmt/files/detectvendor
1 file changed, 55 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/50/340450/1
diff --git a/modules/mgmt/files/detectvendor b/modules/mgmt/files/detectvendor
new file mode 100755
index 000..0d6f5ed
--- /dev/null
+++ b/modules/mgmt/files/detectvendor
@@ -0,0 +1,55 @@
+#!/bin/bash
+# try to detect whether a mgmt interface
+# is Dell or HP by looking at the ssh banner
+# Daniel Zahn - Wikimedia Foundation Inc.
+#
+# input: IP address of a management interface
+# output: string "dell" or "hp" or "unknown"
+
+# example IP for each device class:
+# HP: 10.193.3.19
+# Dell: 10.193.2.253
+# Juniper 10.193.0.19
+# PDU:10.193.0.25
+#
+# requires: netcat
+
+
+if [ ! -f /bin/nc ]; then
+echo "I can't find netcat. Please make sure /bin/nc exists."
+exit 2
+fi
+
+mgmtip=$1
+
+if [ -e $1 ]; then
+echo "usage: $0 "
+exit 2
+fi
+
+banner=$(echo "" | /bin/nc $mgmtip 22 | head -n1 | tr -dc '[:alnum:]-_.')
+
+# echo "The banner is: '${banner}'."
+
+case $banner in
+"SSH-2.0-mpSSH_0.2.1")
+vendor="HP"
+;;
+"SSH-2.0-OpenSSH_6.6")
+vendor="Dell"
+;;
+"SSH-2.0-OpenSSH_6.4")
+vendor="Juniper"
+;;
+"SSH-2.0-MocanaSSH")
+vendor="PDU"
+;;
+*)
+vendor="unknown"
+;;
+esac
+
+# echo "The vendor seems to be: '${vendor}'"
+
+echo $vendor
+
--
To view, visit https://gerrit.wikimedia.org/r/340450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd340fa0194a85853198afb4526adfcade3d6dc7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move article edit switching tools to articleTarget module
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340440 ) Change subject: Move article edit switching tools to articleTarget module .. Move article edit switching tools to articleTarget module Change-Id: I7e31475444735d5f25030fa08fc5d2348cb804b2 --- M extension.json 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/extension.json b/extension.json index da28b31..b27a545 100644 --- a/extension.json +++ b/extension.json @@ -508,7 +508,8 @@ "modules/ve-mw/init/ve.init.mw.ArticleTarget.js", "modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js", "modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js", - "modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js" + "modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js", + "modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js" ], "styles": [ "modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css", @@ -1187,7 +1188,6 @@ "modules/ve-mw/ui/elements/ve.ui.MWExpandableErrorElement.js", "modules/ve-mw/ui/elements/ve.ui.MWPreviewElement.js", "modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js", - "modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js", "modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js", "modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js", "modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js", -- To view, visit https://gerrit.wikimedia.org/r/340440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7e31475444735d5f25030fa08fc5d2348cb804b2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: demo: Make demo consoles LTR, even in the RTL demo
Catrope has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340449 )
Change subject: demo: Make demo consoles LTR, even in the RTL demo
..
demo: Make demo consoles LTR, even in the RTL demo
Typing code into RTL inputs is no fun, you get stuff like
;( 'widget.popup.setAlignment( 'center
Change-Id: I2b28440af44cffac168944480e70c28095b04e82
---
M demos/styles/demo.css
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/49/340449/1
diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index e2a34d7..dd01ba7 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -153,6 +153,8 @@
border: 1px solid transparent;
margin-bottom: -2px;
line-height: 1.4;
+ /* @noflip */
+ direction: ltr;
}
.demo-console-expanded {
@@ -212,6 +214,7 @@
display: none;
}
+/* @noflip */
.demo-console-log {
border: 1px solid #a2a9b1;
border-width: 0 0 1px 0;
@@ -219,6 +222,7 @@
overflow: auto;
}
+/* @noflip */
.demo-console-log-line {
position: relative;
padding-left: 20px;
@@ -229,6 +233,7 @@
color: #54595d;
}
+/* @noflip */
.demo-console-log-line-input::before {
display: block;
position: absolute;
@@ -244,6 +249,7 @@
color: #d33;
}
+/* @noflip */
.demo-console-label {
position: relative;
display: inline-block;
@@ -257,6 +263,7 @@
box-sizing: border-box;
}
+/* @noflip */
.demo-console-label::before {
content: '→';
color: #00f;
--
To view, visit https://gerrit.wikimedia.org/r/340449
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b28440af44cffac168944480e70c28095b04e82
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deprecate DonationInterface i18n messages
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340421 )
Change subject: Deprecate DonationInterface i18n messages
..
Deprecate DonationInterface i18n messages
These should already be included in the cache via the extension-list file.
Bug: T159098
Change-Id: I11c0aa4517dc38d1d163d13177c24242e612286b
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 0 insertions(+), 13 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 773c929..bc8c923 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1887,12 +1887,6 @@
require_once( "$wmfConfigDir/liquidthreads.php" );
}
-if ( $wmgDonationInterface ) {
- // Regular DonationInterface should not be enabled on the WMF cluster.
- // So, only load i18n files for DonationInterface -awjrichards 1
November 2011
- require_once(
"$IP/extensions/DonationInterface/donationinterface_langonly.php" );
-}
-
if ( $wmgUseGlobalUsage ) {
wfLoadExtension( 'GlobalUsage' );
$wgGlobalUsageDatabase = 'commonswiki';
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 05264b9..5efa223 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12763,13 +12763,6 @@
'enwikinews' => [ 102 ], // Comments namespace
],
-'wmgDonationInterface' => [
- 'default' => false,
- 'testwiki' => true,
- 'foundationwiki' => true,
- 'donatewiki' => true,
-],
-
'wmgUseGlobalUsage' => [
'default' => true, # Enabled on all PUBLIC wikis
'closed' => false,
--
To view, visit https://gerrit.wikimedia.org/r/340421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11c0aa4517dc38d1d163d13177c24242e612286b
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Awight
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340448 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
2d2ef0a Benevity update, handle situation where the Benevity email might be
work but wmf email is home.
f4d8eeb Broaden the definition of 'employed by' an org to include soft credits.
Change-Id: I1f21d71ff1bb6c5761cc563927af6c9a864e9333
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 0 insertions(+), 455 deletions(-)
Approvals:
jenkins-bot: Verified
Eileen: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 8603410..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<<< HEAD (04b49b Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org'
[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340448 )
Change subject: Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..
Merge branch 'master' of
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
2d2ef0a Benevity update, handle situation where the Benevity email might be
work but wmf email is home.
f4d8eeb Broaden the definition of 'employed by' an org to include soft credits.
Change-Id: I1f21d71ff1bb6c5761cc563927af6c9a864e9333
---
D sites/all/modules/offline2civicrm/tests/BenevityTest.php
1 file changed, 0 insertions(+), 455 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/48/340448/1
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
deleted file mode 100644
index 8603410..000
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ /dev/null
@@ -1,455 +0,0 @@
-<<< HEAD (04b49b Merge branch 'master' of
https://gerrit.wikimedia.org/r/wiki)
-===
-https://phabricator.wikimedia.org/T115044#3012232
- */
-class BenevityTest extends BaseChecksFileTest {
- protected $epochtime;
-
- function setUp() {
-parent::setUp();
-
-$this->epochtime = wmf_common_date_parse_string('2016-09-15');
-$this->setExchangeRates($this->epochtime, array('USD' => 1, 'BTC' => 3));
-$this->gateway = 'benevity';
-civicrm_initialize();
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contribution
- WHERE trxn_id LIKE 'BENEVITY%'
-");
-CRM_Core_DAO::executeQuery("
- DELETE FROM civicrm_contact
- WHERE organization_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy
Inc', 'Uncle Scrooge Inc')
- OR nick_name IN('Donald Duck Inc', 'Mickey Mouse Inc', 'Goofy Inc',
'Uncle Scrooge Inc')
- OR first_name = 'Minnie' AND last_name = 'Mouse'
- OR first_name = 'Pluto'
-");
-$this->ensureAnonymousContactExists();
-\Civi::$statics = array();
-$countries = $this->callAPISuccess('Country', 'get', array());
-$this->callAPISuccess('Setting', 'create', array('countryLimit' =>
array_keys($countries['values'])));
-
- }
-
- /**
- * Make sure we have the anonymous contact - like the live DB.
- */
- protected function ensureAnonymousContactExists() {
-$anonymousParams = array(
- 'first_name' => 'Anonymous',
- 'last_name' => 'Anonymous',
- 'email' => 'fakeem...@wikimedia.org',
- 'contact_type' => 'Individual',
-);
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-if ($contacts['count'] == 0) {
- $this->callAPISuccess('Contact', 'create', $anonymousParams);
-}
-$contacts = $this->callAPISuccess('Contact', 'get', $anonymousParams);
-$this->assertEquals(1, $contacts['count']);
- }
-
- /**
- * Test that all imports fail if the organization has multiple matches.
- */
- function testImportFailOrganizationContactAmbiguous() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that all imports fail if the organization does not pre-exist.
- */
- function testImportFailNoOrganizationContactExists() {
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('0 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the contact if a single match is found.
- */
- function testImportSucceedOrganizationSingleContactExists() {
-$this->callAPISuccess('Contact', 'create', array('organization_name' =>
'Donald Duck Inc', 'contact_type' => 'Organization'));
-$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
-$importer->import();
-$messages = $importer->getMessages();
-$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
- }
-
- /**
- * Test that import passes for the Individual contact if a single match is
found.
- */
- function testImportSucceedIndividualSingleContactExists() {
-$thaMouseMeister = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
-$minnie = $this->callAPISuccess('Contact', 'create', array(
- 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Benevity update, handle situation where the Benevity email m...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340429 )
Change subject: Benevity update, handle situation where the Benevity email
might be work but wmf email is home.
..
Benevity update, handle situation where the Benevity email might be work but
wmf email is home.
Per updated comments: Attempt to check for an employer match on first_name &
last_name only (in case of using home email), If found add the email but do not
overwrite, create relationship.Else create contact, add relationship
https://phabricator.wikimedia.org/T115044#3012232
If the email does not match but there is an employee of the organisation with a
first_name, last_name match we can use that. (small risk of one
org having 2 contacts with the same name both as matching giftees, but would
even hand entering handle that?).
Note our new definition of employee is either having the relationship Or having
a history of matching gifts.
Bug T115044
Change-Id: I3b811ac6c134c56e1346d6e2cfafb3b02c87a243
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
3 files changed, 74 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Awight: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php
b/sites/all/modules/offline2civicrm/BenevityFile.php
index efbd34d..44331d2 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -69,7 +69,11 @@
if ($msg['contact_id'] == $this->getAnonymousContactID()) {
$this->unsetAddressFields($msg);
}
-
+if ($msg['contact_id'] === FALSE) {
+ if (($msg['contact_id'] =
$this->getNameMatchedEmployedIndividualID($msg)) != FALSE) {
+$msg['email_location_type_id'] = 'Work';
+ }
+}
}
/**
@@ -370,4 +374,38 @@
return
\Civi::$statics[__CLASS__]['organization_resolved_name'][$organizationName];
}
+ /**
+ * Get the id of any employee who is a full name match but has a different
email.
+ *
+ * We handle this outside the main getIndividualID because contact's matched
+ * by this method need to have their email preserved.
+ *
+ * @param array $msg
+ *
+ * @return mixed
+ */
+ protected function getNameMatchedEmployedIndividualID($msg) {
+$matches = array();
+if (isset($msg['first_name']) && isset($msg['last_name']) &&
isset($msg['email'])) {
+ $params = array(
+'first_name' => $msg['first_name'],
+'last_name' => $msg['last_name'],
+'contact_type' => 'Individual',
+'return' => 'current_employer',
+'options' => array('limit' => 0),
+ );
+ unset($params['email']);
+ $contacts = civicrm_api3('Contact', 'get', $params);
+ foreach ($contacts['values'] as $contact) {
+if
($this->isContactEmployedByOrganization($msg['matching_organization_name'],
$contact)) {
+ $matches[] = $contact['id'];
+}
+ }
+}
+if (count($matches) === 1) {
+ return reset($matches);
+}
+return FALSE;
+ }
+
}
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index 4d6c18f..bace33f 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -228,6 +228,36 @@
$this->assertEquals(1, $relationships['count']);
}
+ /**
+ * Test that we will accept a name match for employees, even when there is
an email mis-match.
+ *
+ * We have a situation where employees are often in the database with a
different email than in
+ * the Benevity import (e.g a personal email). If there is already a contact
with the same first and
+ * last name and they have been related to the organization (by an employer
relationship or a previous
+ * soft credit) we should accept them.
+ */
+ function testImportSucceedIndividualMatchToEmployerDisregardingEmail() {
+$organization = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
+$betterMinnie = $this->callAPISuccess('Contact', 'create', array(
+ 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'minnie@mouse_home.org', 'employer_id' =>
$organization['id'],
+));
+$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
+
+$contributions = $this->callAPISuccess('Contribution', 'get',
array('contact_id' => $betterMinnie['id']));
+$this->assertEquals(1, $contributions['count']);
+$relationships = $this->callAP
[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Broaden the definition of 'employed by' an org to include so...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340408 )
Change subject: Broaden the definition of 'employed by' an org to include soft
credits.
..
Broaden the definition of 'employed by' an org to include soft credits.
With this change the check as to whether a contact is employed by an
organization includes whether they
have previous soft credits from them. This may be more important initially than
later on
when the employer relationships should exist
Bug: T115044
Change-Id: Icb6a376835674032af7dbd76bd93d4833b203080
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
2 files changed, 48 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Awight: Looks good to me, approved
diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php
b/sites/all/modules/offline2civicrm/BenevityFile.php
index dba8e6f..efbd34d 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -333,6 +333,17 @@
if ($contact['current_employer'] ==
$this->getOrganizationResolvedName($organization_name)) {
return TRUE;
}
+$softCredits = civicrm_api3('ContributionSoft', 'get', array('contact_id'
=> $contact['id'], 'api.Contribution.get' => array('return' => 'contact_id')));
+if ($softCredits['count'] == 0) {
+ return FALSE;
+}
+foreach ($softCredits['values'] as $softCredit) {
+ if ($softCredit['api.Contribution.get']['values'][0]['contact_id'] ==
$this->getOrganizationID($organization_name)) {
+return TRUE;
+ }
+}
+return FALSE;
+
}
/**
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index 10ac016..4d6c18f 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -193,6 +193,43 @@
}
/**
+ * Test that import resolves ambiguous individuals based on previous soft
credit history.
+ *
+ * If an organisation has previously soft credited an individual we consider
that
+ * to be equivalent to an employer relationship having been formed.
+ *
+ * Probably longer term the employment relationships will exist and this
will be redundant.
+ */
+ function testImportSucceedIndividualDismabiguateByPreviousSoftCredit() {
+$organization = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
+$minnie = $this->callAPISuccess('Contact', 'create', array(
+ 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
+));
+$betterMinnie = $this->callAPISuccess('Contact', 'create', array(
+ 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'min...@mouse.org',
+));
+// Create a contribution on the organisation, soft credited to Better
Minnie.
+$this->callAPISuccess('Contribution', 'create', array(
+ 'total_amount' => 4,
+ 'financial_type_id' => 'Donation',
+ 'soft_credit_to' => $betterMinnie['id'],
+ 'contact_id' => $organization['id'],
+));
+$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
+$contributions = $this->callAPISuccess('Contribution', 'get',
array('contact_id' => $minnie['id']));
+$this->assertEquals(0, $contributions['count']);
+
+$contributions = $this->callAPISuccess('Contribution', 'get',
array('contact_id' => $betterMinnie['id']));
+$this->assertEquals(1, $contributions['count']);
+$relationships = $this->callAPISuccess('Relationship', 'get',
array('contact_id_a' => $betterMinnie['id'], 'contact_id_b' =>
$organization['id']));
+$this->assertEquals(1, $relationships['count']);
+ }
+
+
+ /**
* Check that without an email the match is only accepted with an employer
connection.
*/
function testImportSucceedIndividualOneMatchNoEmail() {
--
To view, visit https://gerrit.wikimedia.org/r/340408
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb6a376835674032af7dbd76bd93d4833b203080
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Cdentinger
Gerrit-Reviewer: Ejegg
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]: Add wikimedia-mirror.dh.bytemark.co.uk to dumps::rsync_clients
Reedy has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340447 ) Change subject: Add wikimedia-mirror.dh.bytemark.co.uk to dumps::rsync_clients .. Add wikimedia-mirror.dh.bytemark.co.uk to dumps::rsync_clients Change-Id: I66285b812c69146ae7ebefd529ca942fcf493a22 --- M hieradata/role/common/dumps/server.yaml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/47/340447/1 diff --git a/hieradata/role/common/dumps/server.yaml b/hieradata/role/common/dumps/server.yaml index 741520b..976ce0e 100644 --- a/hieradata/role/common/dumps/server.yaml +++ b/hieradata/role/common/dumps/server.yaml @@ -20,6 +20,7 @@ - wmrsync.crc.nd.edu - wikimedia.iconic.vi - poincare.acc.umu.se + - wikimedia-mirror.dh.bytemark.co.uk dumps::rsync_clients_ipv6: - odysseus.ip6.fi.muni.cz - poincare.acc.umu.se -- To view, visit https://gerrit.wikimedia.org/r/340447 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I66285b812c69146ae7ebefd529ca942fcf493a22 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Reedy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Pass $overlay to FieldsetLayout and FieldLayout in various p...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338041 )
Change subject: Pass $overlay to FieldsetLayout and FieldLayout in various
places
..
Pass $overlay to FieldsetLayout and FieldLayout in various places
We now use dialog's overlay in every case where we have a FieldsetLayout
or a FieldLayout with a help popup inside a dialog.
Bug: T100571
Change-Id: I8bd0ed430637feca63ec0f13cb7e1e1c659391a5
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
5 files changed, 19 insertions(+), 6 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 00d460d..ce26902 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -244,6 +244,7 @@
importRules: this.constructor.static.getImportRules()
} );
this.captionFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-content-section' ),
help: ve.msg( 'visualeditor-dialog-media-content-section-help'
),
icon: 'parameter',
@@ -253,6 +254,7 @@
// Alt text
altTextFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-alttext-section' ),
help: ve.msg( 'visualeditor-dialog-media-alttext-section-help'
),
icon: 'parameter'
@@ -273,12 +275,14 @@
this.positionCheckbox = new OO.ui.CheckboxInputWidget();
positionField = new OO.ui.FieldLayout( this.positionCheckbox, {
+ $overlay: this.$overlay,
align: 'inline',
label: ve.msg( 'visualeditor-dialog-media-position-checkbox' ),
help: ve.msg(
'visualeditor-dialog-media-position-checkbox-help' )
} );
positionFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-position-section' ),
help: ve.msg( 'visualeditor-dialog-media-position-section-help'
),
icon: 'parameter'
@@ -292,6 +296,7 @@
// Type
this.typeFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-type-section' ),
help: ve.msg( 'visualeditor-dialog-media-type-section-help' ),
icon: 'parameter'
@@ -337,6 +342,7 @@
// Size
this.sizeFieldset = new OO.ui.FieldsetLayout( {
+ $overlay: this.$overlay,
label: ve.msg( 'visualeditor-dialog-media-size-section' ),
icon: 'parameter',
help: ve.msg( 'visualeditor-dialog-media-size-section-help' )
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
index fd204d4..a0520d2 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMetaDialog.js
@@ -64,11 +64,8 @@
this.panels = new OO.ui.StackLayout();
this.bookletLayout = new OO.ui.BookletLayout( { outlined: true } );
this.categoriesPage = new ve.ui.MWCategoriesPage( 'categories', {
$overlay: this.$overlay } );
- this.settingsPage = new ve.ui.MWSettingsPage(
- 'settings',
- { $overlay: this.$overlay }
- );
- this.advancedSettingsPage = new ve.ui.MWAdvancedSettingsPage(
'advancedSettings' );
+ this.settingsPage = new ve.ui.MWSettingsPage( 'settings', { $overlay:
this.$overlay } );
+ this.advancedSettingsPage = new ve.ui.MWAdvancedSettingsPage(
'advancedSettings', { $overlay: this.$overlay } );
this.languagesPage = new ve.ui.MWLanguagesPage( 'languages' );
this.templatesUsedPage = new ve.ui.MWTemplatesUsedPage( 'templatesUsed'
);
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index 0e13cd4..ef8aeac 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -14,8 +14,9 @@
* @constructor
* @param {string} name Unique symbolic name of page
* @param {Object} [config] Configuration options
+ * @cfg {jQuery} [$overlay] Overlay to render dropdowns in
*/
-ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage() {
+ve.ui.MWAdvancedSettingsPage = function VeUiMWAdvancedSettingsPage( name,
config ) {
var advanc
[MediaWiki-commits] [Gerrit] oojs/ui[master]: styles: Replace stylelint block with inline comments everywhere
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340444 )
Change subject: styles: Replace stylelint block with inline comments everywhere
..
styles: Replace stylelint block with inline comments everywhere
Replacing stylelint block `/**/` with inline `//` comments
everywhere to prevent them in built files.
Change-Id: Iab4230ca386e634c308bad8989a15d42050d2ec0
---
M src/styles/Element.less
M src/styles/common.less
M src/styles/layouts/MenuLayout.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
5 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/styles/Element.less b/src/styles/Element.less
index 837d7b0..1e7362f 100644
--- a/src/styles/Element.less
+++ b/src/styles/Element.less
@@ -2,7 +2,7 @@
.oo-ui-element {
&-hidden {
- display: none !important; /* stylelint-disable-line
declaration-no-important */
+ display: none !important; // stylelint-disable-line
declaration-no-important
}
.theme-oo-ui-element();
diff --git a/src/styles/common.less b/src/styles/common.less
index 7c8d5b4..f1d43bf 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -112,7 +112,7 @@
}
}
-/* stylelint-disable selector-no-vendor-prefix, at-rule-no-unknown */
+// stylelint-disable selector-no-vendor-prefix, at-rule-no-unknown
.oo-ui-placeholder( @rules ) {
// WebKit, Blink, Edge
&::-webkit-input-placeholder {
@@ -135,4 +135,4 @@
@rules();
}
}
-/* stylelint-enable selector-no-vendor-prefix, at-rule-no-unknown */
+// stylelint-enable selector-no-vendor-prefix, at-rule-no-unknown
diff --git a/src/styles/layouts/MenuLayout.less
b/src/styles/layouts/MenuLayout.less
index 045d3b6..6199f50 100644
--- a/src/styles/layouts/MenuLayout.less
+++ b/src/styles/layouts/MenuLayout.less
@@ -27,8 +27,7 @@
bottom: 18em;
}
- /* stylelint-disable declaration-no-important */
-
+ // stylelint-disable declaration-no-important
&.oo-ui-menuLayout-hideMenu {
> .oo-ui-menuLayout-menu {
width: 0 !important;
@@ -105,8 +104,7 @@
}
}
}
-
- /* stylelint-enable declaration-no-important */
+ // stylelint-enable declaration-no-important
.theme-oo-ui-menuLayout();
}
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 1e21f57..690b104 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -1098,10 +1098,10 @@
.apex-placeholder () {
// Normalize placeholder styling, see T139034
- /* stylelint-disable indentation */
+ // stylelint-disable indentation
.oo-ui-placeholder( {
color: @color-placeholder;
opacity: 1;
} );
- /* stylelint-enable indentation */
+ // stylelint-enable indentation
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 5cbe09b..aaae4a6 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1754,10 +1754,10 @@
.mw-placeholder () {
// Normalize placeholder styling, see T139034
- /* stylelint-disable indentation */
+ // stylelint-disable indentation
.oo-ui-placeholder( {
color: @color-placeholder;
opacity: 1;
} );
- /* stylelint-enable indentation */
+ // stylelint-enable indentation
}
--
To view, visit https://gerrit.wikimedia.org/r/340444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iab4230ca386e634c308bad8989a15d42050d2ec0
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Jforrester
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...VisualEditor[master]: Update VE core submodule to master (15f36bc75)
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340446 ) Change subject: Update VE core submodule to master (15f36bc75) .. Update VE core submodule to master (15f36bc75) New changes: 7da907be0 Highlight comment changes in visual diff and fix whitespace 77accf6f6 Have toolbar append toolbarDialogs container 6985593cd Localisation updates from https://translatewiki.net. 9140a5991 DiffElement: Avoid modifying class attributes on DM HTML cdcbbdde3 Remove used 'header' params from toolbar config 15f36bc75 Update OOjs UI to v0.19.4 Bug: T149821 Bug: T158895 Change-Id: I5bfc595b6b43173e76fc8cd45e47fb21d5ccaea7 --- M lib/ve 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/46/340446/1 diff --git a/lib/ve b/lib/ve index 813c586..15f36bc 16 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit 813c586a64ff8f4ac82a0af751b8c4fd8aa6f3bb +Subproject commit 15f36bc75657e05e7359333ece389f8428c634a2 -- To view, visit https://gerrit.wikimedia.org/r/340446 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bfc595b6b43173e76fc8cd45e47fb21d5ccaea7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester ___ 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
jenkins-bot has submitted this change and it was merged. (
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, 268 insertions(+), 12 deletions(-)
Approvals:
Divec: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, approved
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..c77b66a 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 ], this.lang, { sensitivity: sensitivity } ) === 0 ) {
+
[MediaWiki-commits] [Gerrit] operations/puppet[production]: nova: fullstack test give 480s before failing on creation
Rush has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340445 )
Change subject: nova: fullstack test give 480s before failing on creation
..
nova: fullstack test give 480s before failing on creation
We are leaking instances at current thresholds which pile up
and violate max_pool. We need to track down why they are taking
so long infrequently but for now increase so we can get some
decent heuristics.
Change-Id: I1c9291b85ca263cd0720f38f8478c39feef38b28
---
M modules/openstack/manifests/nova/fullstack.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/openstack/manifests/nova/fullstack.pp
b/modules/openstack/manifests/nova/fullstack.pp
index d59aa32..e13c454 100644
--- a/modules/openstack/manifests/nova/fullstack.pp
+++ b/modules/openstack/manifests/nova/fullstack.pp
@@ -8,7 +8,7 @@
$password,
$interval = 300,
$max_pool = 3,
-$creation_timeout = 240,
+$creation_timeout = 480,
$ssh_timeout = 240,
) {
--
To view, visit https://gerrit.wikimedia.org/r/340445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c9291b85ca263cd0720f38f8478c39feef38b28
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Rush
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]: nova: fullstack test give 480s before failing on creation
Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340445 )
Change subject: nova: fullstack test give 480s before failing on creation
..
nova: fullstack test give 480s before failing on creation
We are leaking instances at current thresholds which pile up
and violate max_pool. We need to track down why they are taking
so long infrequently but for now increase so we can get some
decent heuristics.
Change-Id: I1c9291b85ca263cd0720f38f8478c39feef38b28
---
M modules/openstack/manifests/nova/fullstack.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/45/340445/1
diff --git a/modules/openstack/manifests/nova/fullstack.pp
b/modules/openstack/manifests/nova/fullstack.pp
index d59aa32..e13c454 100644
--- a/modules/openstack/manifests/nova/fullstack.pp
+++ b/modules/openstack/manifests/nova/fullstack.pp
@@ -8,7 +8,7 @@
$password,
$interval = 300,
$max_pool = 3,
-$creation_timeout = 240,
+$creation_timeout = 480,
$ssh_timeout = 240,
) {
--
To view, visit https://gerrit.wikimedia.org/r/340445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c9291b85ca263cd0720f38f8478c39feef38b28
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: styles: Replace stylelint block with inline comments everywhere
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340444 )
Change subject: styles: Replace stylelint block with inline comments everywhere
..
styles: Replace stylelint block with inline comments everywhere
Replacing stylelint block `/**/` with inline `//` comments
everywhere to prevent them in built files.
Change-Id: Iab4230ca386e634c308bad8989a15d42050d2ec0
---
M src/styles/Element.less
M src/styles/common.less
M src/styles/layouts/MenuLayout.less
M src/themes/apex/widgets.less
M src/themes/mediawiki/widgets.less
5 files changed, 9 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/44/340444/1
diff --git a/src/styles/Element.less b/src/styles/Element.less
index 837d7b0..1e7362f 100644
--- a/src/styles/Element.less
+++ b/src/styles/Element.less
@@ -2,7 +2,7 @@
.oo-ui-element {
&-hidden {
- display: none !important; /* stylelint-disable-line
declaration-no-important */
+ display: none !important; // stylelint-disable-line
declaration-no-important
}
.theme-oo-ui-element();
diff --git a/src/styles/common.less b/src/styles/common.less
index 7c8d5b4..f1d43bf 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -112,7 +112,7 @@
}
}
-/* stylelint-disable selector-no-vendor-prefix, at-rule-no-unknown */
+// stylelint-disable selector-no-vendor-prefix, at-rule-no-unknown
.oo-ui-placeholder( @rules ) {
// WebKit, Blink, Edge
&::-webkit-input-placeholder {
@@ -135,4 +135,4 @@
@rules();
}
}
-/* stylelint-enable selector-no-vendor-prefix, at-rule-no-unknown */
+// stylelint-enable selector-no-vendor-prefix, at-rule-no-unknown
diff --git a/src/styles/layouts/MenuLayout.less
b/src/styles/layouts/MenuLayout.less
index 045d3b6..6199f50 100644
--- a/src/styles/layouts/MenuLayout.less
+++ b/src/styles/layouts/MenuLayout.less
@@ -27,8 +27,7 @@
bottom: 18em;
}
- /* stylelint-disable declaration-no-important */
-
+ // stylelint-disable declaration-no-important
&.oo-ui-menuLayout-hideMenu {
> .oo-ui-menuLayout-menu {
width: 0 !important;
@@ -105,8 +104,7 @@
}
}
}
-
- /* stylelint-enable declaration-no-important */
+ // stylelint-enable declaration-no-important
.theme-oo-ui-menuLayout();
}
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 1e21f57..690b104 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -1098,10 +1098,10 @@
.apex-placeholder () {
// Normalize placeholder styling, see T139034
- /* stylelint-disable indentation */
+ // stylelint-disable indentation
.oo-ui-placeholder( {
color: @color-placeholder;
opacity: 1;
} );
- /* stylelint-enable indentation */
+ // stylelint-enable indentation
}
diff --git a/src/themes/mediawiki/widgets.less
b/src/themes/mediawiki/widgets.less
index 5cbe09b..aaae4a6 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -1754,10 +1754,10 @@
.mw-placeholder () {
// Normalize placeholder styling, see T139034
- /* stylelint-disable indentation */
+ // stylelint-disable indentation
.oo-ui-placeholder( {
color: @color-placeholder;
opacity: 1;
} );
- /* stylelint-enable indentation */
+ // stylelint-enable indentation
}
--
To view, visit https://gerrit.wikimedia.org/r/340444
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab4230ca386e634c308bad8989a15d42050d2ec0
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.19.4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340443 ) Change subject: Update OOjs UI to v0.19.4 .. Update OOjs UI to v0.19.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.4 Change-Id: Ifa1c6cb355a0c4f5073c93e37939cfc2f6653c81 --- M composer.json M resources/lib/oojs-ui/i18n/bqi.json M resources/lib/oojs-ui/i18n/br.json M resources/lib/oojs-ui/i18n/mg.json M resources/lib/oojs-ui/i18n/nn.json M resources/lib/oojs-ui/i18n/pnb.json M resources/lib/oojs-ui/i18n/yi.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json M resources/lib/oojs-ui/themes/apex/icons-interactions.json M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg A resources/lib/oojs-ui/themes/apex/images/icons/diacritic.png A resources/lib/oojs-ui/themes/apex/images/icons/diacritic.svg A resources/lib/oojs-ui/themes/apex/images/icons/feedback-ltr-invert.png A resources/lib/oojs-ui/themes/apex/images/icons/feedback-ltr-invert.svg A resources/lib/oojs-ui/themes/apex/images/icons/feedback-ltr.png A resources/lib/oojs-ui/themes/apex/images/icons/feedback-ltr.svg A resources/lib/oojs-ui/themes/apex/images/icons/feedback-rtl-invert.png A resources/lib/oojs-ui/themes/apex/images/icons/feedback-rtl-invert.svg A resources/lib/oojs-ui/themes/apex/images/icons/feedback-rtl.png A resources/lib/oojs-ui/themes/apex/images/icons/feedback-rtl.svg M resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json M resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-progressive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic-invert.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic-invert.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic-progressive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr-invert.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr-invert.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr-progressive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl-invert.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl-invert.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl-progressive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl.svg 57 files changed, 764 insertions(+), 274 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/composer.json b/composer.json index 3520dc3..bc0ce17 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ext-xml": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.19.2", + "oojs/oojs-ui": "0.19.4", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.2", diff --git a/resources/lib/oojs-ui/i18n/bqi.json b/resources/lib/oojs-ui/i18n/bqi.json index 8b85a20..a84374a 100644 --- a/resources/lib/oojs-ui/i18n/bqi.json +++ b/resources/lib/oojs-ui/i18n/bqi.json @@ -12,5 +12,6 @@ "ooui-dialog-process-retry": "ز نۉ تلاش کونين", "ooui-dialog-process-continue": "ديندا گرهڌن", "ooui-selectfile-button-select": "گولإڤورچين کردن جانیا", - "ooui-selectfile-placeholder": "هيژ جانيایي گولإ ڤورچين نڤابيڌإ"
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.19.4
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340441 )
Change subject: Update OOjs UI to v0.19.4
..
Update OOjs UI to v0.19.4
Release notes:
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.4
Change-Id: Ifa1c6cb355a0c4f5073c93e37939cfc2f6653c81
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/.stylelintrc
M oojs/oojs-ui/AUTHORS.txt
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
A oojs/oojs-ui/demos/.eslintrc.json
A oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.css
A oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.js
A oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.php
A oojs/oojs-ui/demos/classes/CapsuleNumberPopupMultiselectWidget.js
A oojs/oojs-ui/demos/classes/DraggableGroupWidget.js
A oojs/oojs-ui/demos/classes/DraggableHandledItemWidget.js
A oojs/oojs-ui/demos/classes/DraggableItemWidget.js
A oojs/oojs-ui/demos/classes/NumberLookupTextInputWidget.js
A oojs/oojs-ui/demos/classes/UnsupportedSelectFileWidget.js
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/demos.php
M oojs/oojs-ui/demos/index.html
M oojs/oojs-ui/demos/infusion.js
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/demos/pages/icons.js
M oojs/oojs-ui/demos/pages/toolbars.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/pages/widgets.php
M oojs/oojs-ui/demos/styles/demo.css
M oojs/oojs-ui/i18n/bqi.json
M oojs/oojs-ui/i18n/br.json
M oojs/oojs-ui/i18n/mg.json
M oojs/oojs-ui/i18n/nn.json
M oojs/oojs-ui/i18n/pnb.json
M oojs/oojs-ui/i18n/yi.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/widgets/DropdownInputWidget.php
35 files changed, 990 insertions(+), 541 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/composer.json b/composer.json
index 2cf56a3..0f7aff0 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
- "oojs/oojs-ui": "0.19.2",
+ "oojs/oojs-ui": "0.19.4",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 1d492dc..5810e35 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"content-hash": "dd9306b01156c58697c2bf5c524741d5",
+"content-hash": "19ab65e155b0c9981150fcd971b437c7",
"packages": [
{
"name": "composer/semver",
@@ -465,16 +465,16 @@
},
{
"name": "oojs/oojs-ui",
-"version": "v0.19.2",
+"version": "v0.19.4",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107"
+"reference": "1807bca77ed4b0691e3ec4ef151f5c4bbbf1be1b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107";,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107",
+"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/1807bca77ed4b0691e3ec4ef151f5c4bbbf1be1b";,
+"reference": "1807bca77ed4b0691e3ec4ef151f5c4bbbf1be1b",
"shasum": ""
},
"require": {
@@ -540,7 +540,7 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-"time": "2017-02-14T22:27:07+00:00"
+"time": "2017-02-28T22:56:52+00:00"
},
{
"name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index da0ba3f..f221408 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1858,87 +1858,6 @@
]
},
{
-"name": "oojs/oojs-ui",
-"version": "v0.19.2",
-"version_normalized": "0.19.2.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107"
-},
-"dist": {
-"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107";,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Update OOjs UI to v0.19.4
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340443 ) Change subject: Update OOjs UI to v0.19.4 .. Update OOjs UI to v0.19.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.4 Change-Id: Ifa1c6cb355a0c4f5073c93e37939cfc2f6653c81 --- M composer.json M resources/lib/oojs-ui/i18n/bqi.json M resources/lib/oojs-ui/i18n/br.json M resources/lib/oojs-ui/i18n/mg.json M resources/lib/oojs-ui/i18n/nn.json M resources/lib/oojs-ui/i18n/pnb.json M resources/lib/oojs-ui/i18n/yi.json M resources/lib/oojs-ui/oojs-ui-apex.js M resources/lib/oojs-ui/oojs-ui-core-apex.css M resources/lib/oojs-ui/oojs-ui-core-mediawiki.css M resources/lib/oojs-ui/oojs-ui-core.js M resources/lib/oojs-ui/oojs-ui-mediawiki.js M resources/lib/oojs-ui/oojs-ui-toolbars-apex.css M resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M resources/lib/oojs-ui/oojs-ui-toolbars.js M resources/lib/oojs-ui/oojs-ui-widgets-apex.css M resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css M resources/lib/oojs-ui/oojs-ui-widgets.js M resources/lib/oojs-ui/oojs-ui-windows-apex.css M resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css M resources/lib/oojs-ui/oojs-ui-windows.js M resources/lib/oojs-ui/themes/apex/icons-editing-advanced.json M resources/lib/oojs-ui/themes/apex/icons-interactions.json M resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg A resources/lib/oojs-ui/themes/apex/images/icons/diacritic.png A resources/lib/oojs-ui/themes/apex/images/icons/diacritic.svg A resources/lib/oojs-ui/themes/apex/images/icons/feedback-ltr-invert.png A resources/lib/oojs-ui/themes/apex/images/icons/feedback-ltr-invert.svg A resources/lib/oojs-ui/themes/apex/images/icons/feedback-ltr.png A resources/lib/oojs-ui/themes/apex/images/icons/feedback-ltr.svg A resources/lib/oojs-ui/themes/apex/images/icons/feedback-rtl-invert.png A resources/lib/oojs-ui/themes/apex/images/icons/feedback-rtl-invert.svg A resources/lib/oojs-ui/themes/apex/images/icons/feedback-rtl.png A resources/lib/oojs-ui/themes/apex/images/icons/feedback-rtl.svg M resources/lib/oojs-ui/themes/mediawiki/icons-editing-advanced.json M resources/lib/oojs-ui/themes/mediawiki/icons-interactions.json M resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-progressive.svg M resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic-invert.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic-invert.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic-progressive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/diacritic.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr-invert.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr-invert.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr-progressive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-ltr.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl-invert.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl-invert.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl-progressive.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl-progressive.svg A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl.png A resources/lib/oojs-ui/themes/mediawiki/images/icons/feedback-rtl.svg 57 files changed, 764 insertions(+), 274 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/43/340443/1 diff --git a/composer.json b/composer.json index 3520dc3..bc0ce17 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "ext-xml": "*", "liuggio/statsd-php-client": "1.0.18", "mediawiki/at-ease": "1.1.0", - "oojs/oojs-ui": "0.19.2", + "oojs/oojs-ui": "0.19.4", "oyejorge/less.php": "1.7.0.10", "php": ">=5.5.9", "psr/log": "1.0.2", diff --git a/resources/lib/oojs-ui/i18n/bqi.json b/resources/lib/oojs-ui/i18n/bqi.json index 8b85a20..a84374a 100644 --- a/resources/lib/oojs-ui/i18n/bqi.json +++ b/resources/lib/oojs-ui/i18n/bqi.json @@ -12,5 +12,6 @@ "ooui-dialog-process-retry": "ز نۉ تلاش کونين", "ooui-dialog-process-continue": "ديندا گرهڌن", "ooui-selectfile-button-select": "گولإڤورچين کردن جانیا", - "ooui-selectfile-placeholder": "هيژ جانيایي گولإ ڤورچين نڤابيڌإ" +
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Fix qunit tests for async handling
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340288 )
Change subject: Fix qunit tests for async handling
..
Fix qunit tests for async handling
Follow-up I40064eedc70844
Bug: T158942
Change-Id: I1e7dcd6ef6dd7efe19257a5fb9d232918a273fd6
---
M tests/qunit/ext.translate.special.pagemigration.test.js
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/qunit/ext.translate.special.pagemigration.test.js
b/tests/qunit/ext.translate.special.pagemigration.test.js
index 1b248a6..d8f1055 100644
--- a/tests/qunit/ext.translate.special.pagemigration.test.js
+++ b/tests/qunit/ext.translate.special.pagemigration.test.js
@@ -14,12 +14,14 @@
} ) );
QUnit.test( '-- Source units', function ( assert ) {
- var data = '{ "query": { "messagecollection": [ { "key":
"key_",' +
+ var done, data = '{ "query": { "messagecollection": [ { "key":
"key_",' +
' "definition": "definition_", "title": "title_" }, {
"key": "key_1",' +
' "definition": "definition_1", "title": "title_1" } ]
} }';
+ done = assert.async();
mw.translate.getSourceUnits( 'Help:Special pages' ).done(
function ( sourceUnits ) {
assert.strictEqual( 1, sourceUnits.length, 'Source
units retrieved' );
+ done();
} );
this.server.respond( function ( request ) {
@@ -28,10 +30,12 @@
} );
QUnit.test( '-- Page does not exist', function ( assert ) {
- var data = '{ "query": { "pages": { "-1": { "missing": "" } } }
}';
+ var done, data = '{ "query": { "pages": { "-1": { "missing": ""
} } } }';
+ done = assert.async();
mw.translate.getFuzzyTimestamp( 'ugagagagagaga/uga' ).fail(
function ( timestamp ) {
assert.strictEqual( undefined, timestamp, 'Page does
not exist' );
+ done();
} );
this.server.respond( function ( request ) {
@@ -40,11 +44,13 @@
} );
QUnit.test( '-- Fuzzy timestamp', function ( assert ) {
- var data = '{ "query": { "pages": { "19563": {"revisions": ' +
+ var done, data = '{ "query": { "pages": { "19563":
{"revisions": ' +
'[ {"timestamp": "2014-02-18T20:59:58Z" }, {
"timestamp": "t2" } ] } } } }';
+ done = assert.async();
mw.translate.getFuzzyTimestamp( 'Help:Special pages/fr' ).done(
function ( timestamp ) {
assert.strictEqual( '2014-02-18T20:59:57.000Z',
timestamp, 'Fuzzy timestamp retrieved' );
+ done();
} );
this.server.respond( function ( request ) {
@@ -53,12 +59,14 @@
} );
QUnit.test( '-- Split translation page', function ( assert ) {
- var data = '{ "query": { "pages": { "19563": { "revisions": ' +
+ var done, data = '{ "query": { "pages": { "19563": {
"revisions": ' +
'[ { "*": "unit1\\n\\nunit2\\n\\nunit3" } ] } } } }';
+ done = assert.async();
mw.translate.splitTranslationPage( '2014-02-18T20:59:57.000Z',
'Help:Special pages/fr' )
.done( function ( translationUnits ) {
assert.strictEqual( 3, translationUnits.length,
'Translation page split into units' );
+ done();
} );
this.server.respond( function ( request ) {
--
To view, visit https://gerrit.wikimedia.org/r/340288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e7dcd6ef6dd7efe19257a5fb9d232918a273fd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: KartikMistry
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Nikerabbit
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Re-adding style change to ext.CollaborationKit.hub.styles.less
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340442 )
Change subject: Re-adding style change to ext.CollaborationKit.hub.styles.less
..
Re-adding style change to ext.CollaborationKit.hub.styles.less
This change was approved in an earlier commit but accidentally taken
out. I am re-adding it.
Change-Id: I238341f6d506b3c20862033ed05c263c33536875
---
M modules/ext.CollaborationKit.hub.styles.less
1 file changed, 5 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/42/340442/1
diff --git a/modules/ext.CollaborationKit.hub.styles.less
b/modules/ext.CollaborationKit.hub.styles.less
index 8f5c16e..9ac5995 100644
--- a/modules/ext.CollaborationKit.hub.styles.less
+++ b/modules/ext.CollaborationKit.hub.styles.less
@@ -62,9 +62,13 @@
h2 {
display: inline;
margin: 0;
- padding: 0 0 .25em;
+ padding: 0;
border-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/340442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I238341f6d506b3c20862033ed05c263c33536875
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/vendor[master]: Update OOjs UI to v0.19.4
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340441 )
Change subject: Update OOjs UI to v0.19.4
..
Update OOjs UI to v0.19.4
Release notes:
https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.4
Change-Id: Ifa1c6cb355a0c4f5073c93e37939cfc2f6653c81
---
M composer.json
M composer.lock
M composer/installed.json
M oojs/oojs-ui/.stylelintrc
M oojs/oojs-ui/AUTHORS.txt
M oojs/oojs-ui/History.md
M oojs/oojs-ui/README.md
A oojs/oojs-ui/demos/.eslintrc.json
A oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.css
A oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.js
A oojs/oojs-ui/demos/classes/ButtonStyleShowcaseWidget.php
A oojs/oojs-ui/demos/classes/CapsuleNumberPopupMultiselectWidget.js
A oojs/oojs-ui/demos/classes/DraggableGroupWidget.js
A oojs/oojs-ui/demos/classes/DraggableHandledItemWidget.js
A oojs/oojs-ui/demos/classes/DraggableItemWidget.js
A oojs/oojs-ui/demos/classes/NumberLookupTextInputWidget.js
A oojs/oojs-ui/demos/classes/UnsupportedSelectFileWidget.js
M oojs/oojs-ui/demos/demo.js
M oojs/oojs-ui/demos/demos.php
M oojs/oojs-ui/demos/index.html
M oojs/oojs-ui/demos/infusion.js
M oojs/oojs-ui/demos/pages/dialogs.js
M oojs/oojs-ui/demos/pages/icons.js
M oojs/oojs-ui/demos/pages/toolbars.js
M oojs/oojs-ui/demos/pages/widgets.js
M oojs/oojs-ui/demos/pages/widgets.php
M oojs/oojs-ui/demos/styles/demo.css
M oojs/oojs-ui/i18n/bqi.json
M oojs/oojs-ui/i18n/br.json
M oojs/oojs-ui/i18n/mg.json
M oojs/oojs-ui/i18n/nn.json
M oojs/oojs-ui/i18n/pnb.json
M oojs/oojs-ui/i18n/yi.json
M oojs/oojs-ui/package.json
M oojs/oojs-ui/php/widgets/DropdownInputWidget.php
35 files changed, 990 insertions(+), 541 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor
refs/changes/41/340441/1
diff --git a/composer.json b/composer.json
index 2cf56a3..0f7aff0 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"mediawiki/at-ease": "1.1.0",
"monolog/monolog": "1.18.2",
"nmred/kafka-php": "0.1.5",
- "oojs/oojs-ui": "0.19.2",
+ "oojs/oojs-ui": "0.19.4",
"oyejorge/less.php": "1.7.0.10",
"pear/console_getopt": "1.4.1",
"pear/mail": "1.3.0",
diff --git a/composer.lock b/composer.lock
index 1d492dc..5810e35 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
-"content-hash": "dd9306b01156c58697c2bf5c524741d5",
+"content-hash": "19ab65e155b0c9981150fcd971b437c7",
"packages": [
{
"name": "composer/semver",
@@ -465,16 +465,16 @@
},
{
"name": "oojs/oojs-ui",
-"version": "v0.19.2",
+"version": "v0.19.4",
"source": {
"type": "git",
"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107"
+"reference": "1807bca77ed4b0691e3ec4ef151f5c4bbbf1be1b"
},
"dist": {
"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107";,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107",
+"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/1807bca77ed4b0691e3ec4ef151f5c4bbbf1be1b";,
+"reference": "1807bca77ed4b0691e3ec4ef151f5c4bbbf1be1b",
"shasum": ""
},
"require": {
@@ -540,7 +540,7 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
-"time": "2017-02-14T22:27:07+00:00"
+"time": "2017-02-28T22:56:52+00:00"
},
{
"name": "oyejorge/less.php",
diff --git a/composer/installed.json b/composer/installed.json
index da0ba3f..f221408 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1858,87 +1858,6 @@
]
},
{
-"name": "oojs/oojs-ui",
-"version": "v0.19.2",
-"version_normalized": "0.19.2.0",
-"source": {
-"type": "git",
-"url": "https://github.com/wikimedia/oojs-ui.git";,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107"
-},
-"dist": {
-"type": "zip",
-"url":
"https://api.github.com/repos/wikimedia/oojs-ui/zipball/58fb445bc1f2323548b736b84af8409a13499107";,
-"reference": "58fb445bc1f2323548b736b84af8409a13499107",
-"shasum": ""
-},
-"require": {
-"mediawiki/at-ease": "1.1.0",
-
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Move article edit switching tools to articleTarget module
Esanders has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340440 ) Change subject: Move article edit switching tools to articleTarget module .. Move article edit switching tools to articleTarget module Change-Id: I7e31475444735d5f25030fa08fc5d2348cb804b2 --- M extension.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/40/340440/1 diff --git a/extension.json b/extension.json index da28b31..b27a545 100644 --- a/extension.json +++ b/extension.json @@ -508,7 +508,8 @@ "modules/ve-mw/init/ve.init.mw.ArticleTarget.js", "modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js", "modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js", - "modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js" + "modules/ve-mw/ui/actions/ve.ui.MWSaveDialogAction.js", + "modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js" ], "styles": [ "modules/ve-mw/init/styles/ve.init.mw.ArticleTarget.css", @@ -1187,7 +1188,6 @@ "modules/ve-mw/ui/elements/ve.ui.MWExpandableErrorElement.js", "modules/ve-mw/ui/elements/ve.ui.MWPreviewElement.js", "modules/ve-mw/ui/tools/ve.ui.MWPopupTool.js", - "modules/ve-mw/ui/tools/ve.ui.MWEditModeTool.js", "modules/ve-mw/ui/inspectors/ve.ui.MWExtensionInspector.js", "modules/ve-mw/ui/inspectors/ve.ui.MWLiveExtensionInspector.js", "modules/ve-mw/ui/actions/ve.ui.MWLinkAction.js", -- To view, visit https://gerrit.wikimedia.org/r/340440 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7e31475444735d5f25030fa08fc5d2348cb804b2 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]: Update OOjs UI to v0.19.4
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340438 ) Change subject: Update OOjs UI to v0.19.4 .. Update OOjs UI to v0.19.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.4 Change-Id: Ifa1c6cb355a0c4f5073c93e37939cfc2f6653c81 --- M lib/oojs-ui/i18n/bqi.json M lib/oojs-ui/i18n/br.json M lib/oojs-ui/i18n/mg.json M lib/oojs-ui/i18n/nn.json M lib/oojs-ui/i18n/pnb.json M lib/oojs-ui/i18n/yi.json M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-mediawiki.css M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-windows-apex.css M lib/oojs-ui/oojs-ui-windows-apex.rtl.css M lib/oojs-ui/oojs-ui-windows-mediawiki.css M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-windows.js M lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg A lib/oojs-ui/themes/apex/images/icons/diacritic.png A lib/oojs-ui/themes/apex/images/icons/diacritic.svg A lib/oojs-ui/themes/apex/images/icons/feedback-ltr-invert.png A lib/oojs-ui/themes/apex/images/icons/feedback-ltr-invert.svg A lib/oojs-ui/themes/apex/images/icons/feedback-ltr.png A lib/oojs-ui/themes/apex/images/icons/feedback-ltr.svg A lib/oojs-ui/themes/apex/images/icons/feedback-rtl-invert.png A lib/oojs-ui/themes/apex/images/icons/feedback-rtl-invert.svg A lib/oojs-ui/themes/apex/images/icons/feedback-rtl.png A lib/oojs-ui/
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Adding 'use strict' statements to JavaScript files
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340439 )
Change subject: Adding 'use strict' statements to JavaScript files
..
Adding 'use strict' statements to JavaScript files
Change-Id: Ib7a89ce2d770554cd6c7063535262f7f0fb0b738
---
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, 9 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/39/340439/1
diff --git a/modules/ext.CollaborationKit.hubtheme.js
b/modules/ext.CollaborationKit.hubtheme.js
index de88c43..4ede07e 100644
--- a/modules/ext.CollaborationKit.hubtheme.js
+++ b/modules/ext.CollaborationKit.hubtheme.js
@@ -1,4 +1,6 @@
( function ( $, mw, OO ) {
+ 'use strict';
+
var getColourBlock, getThumbnail, ImageProcessDialog,
ColourProcessDialog, openColourBrowser, openImageBrowser, setupPage;
/**
diff --git a/modules/ext.CollaborationKit.iconbrowser.js
b/modules/ext.CollaborationKit.iconbrowser.js
index f8c3112..3495a34 100644
--- a/modules/ext.CollaborationKit.iconbrowser.js
+++ b/modules/ext.CollaborationKit.iconbrowser.js
@@ -1,4 +1,6 @@
( function ( $, mw, OO ) {
+ 'use strict';
+
var ProcessDialog, openItUp, setupPage;
/**
diff --git a/modules/ext.CollaborationKit.list.edit.js
b/modules/ext.CollaborationKit.list.edit.js
index 510c9b1..916e3d9 100644
--- a/modules/ext.CollaborationKit.list.edit.js
+++ b/modules/ext.CollaborationKit.list.edit.js
@@ -1,4 +1,6 @@
( function ( $, mw ) {
+ 'use strict';
+
var deleteItem, getCurrentJson, saveJson, reorderList, getListOfTitles,
getColId;
/**
diff --git a/modules/ext.CollaborationKit.list.members.js
b/modules/ext.CollaborationKit.list.members.js
index 728217f..1649d1d 100644
--- a/modules/ext.CollaborationKit.list.members.js
+++ b/modules/ext.CollaborationKit.list.members.js
@@ -1,4 +1,5 @@
( function ( $, mw, OO ) {
+ 'use strict';
var addSelf, curUserIsInList, LE;
diff --git a/modules/ext.CollaborationKit.list.ui.js
b/modules/ext.CollaborationKit.list.ui.js
index a792af1..71cfaa0 100644
--- a/modules/ext.CollaborationKit.list.ui.js
+++ b/modules/ext.CollaborationKit.list.ui.js
@@ -1,4 +1,6 @@
( function ( $, mw, OO ) {
+ 'use strict';
+
var addItem, modifyItem, modifyExistingItem, LE;
LE = require( 'ext.CollaborationKit.list.edit' );
--
To view, visit https://gerrit.wikimedia.org/r/340439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7a89ce2d770554cd6c7063535262f7f0fb0b738
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Update OOjs UI to v0.19.4
VolkerE has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340438 ) Change subject: Update OOjs UI to v0.19.4 .. Update OOjs UI to v0.19.4 Release notes: https://phabricator.wikimedia.org/diffusion/GOJU/browse/master/History.md;v0.19.4 Change-Id: Ifa1c6cb355a0c4f5073c93e37939cfc2f6653c81 --- M lib/oojs-ui/i18n/bqi.json M lib/oojs-ui/i18n/br.json M lib/oojs-ui/i18n/mg.json M lib/oojs-ui/i18n/nn.json M lib/oojs-ui/i18n/pnb.json M lib/oojs-ui/i18n/yi.json M lib/oojs-ui/oojs-ui-apex-icons-alerts.css M lib/oojs-ui/oojs-ui-apex-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-content.css M lib/oojs-ui/oojs-ui-apex-icons-content.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-apex-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.css M lib/oojs-ui/oojs-ui-apex-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.css M lib/oojs-ui/oojs-ui-apex-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.css M lib/oojs-ui/oojs-ui-apex-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.css M lib/oojs-ui/oojs-ui-apex-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-media.css M lib/oojs-ui/oojs-ui-apex-icons-media.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.css M lib/oojs-ui/oojs-ui-apex-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-apex-icons-movement.css M lib/oojs-ui/oojs-ui-apex-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-apex.css M lib/oojs-ui/oojs-ui-apex.js M lib/oojs-ui/oojs-ui-apex.rtl.css M lib/oojs-ui/oojs-ui-core-apex.css M lib/oojs-ui/oojs-ui-core-apex.rtl.css M lib/oojs-ui/oojs-ui-core-mediawiki.css M lib/oojs-ui/oojs-ui-core-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-core.js M lib/oojs-ui/oojs-ui-images-apex.css M lib/oojs-ui/oojs-ui-images-apex.rtl.css M lib/oojs-ui/oojs-ui-images-mediawiki.css M lib/oojs-ui/oojs-ui-images-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.css M lib/oojs-ui/oojs-ui-mediawiki-icons-accessibility.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.css M lib/oojs-ui/oojs-ui-mediawiki-icons-alerts.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.css M lib/oojs-ui/oojs-ui-mediawiki-icons-content.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-advanced.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-core.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-list.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.css M lib/oojs-ui/oojs-ui-mediawiki-icons-editing-styling.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.css M lib/oojs-ui/oojs-ui-mediawiki-icons-interactions.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.css M lib/oojs-ui/oojs-ui-mediawiki-icons-layout.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.css M lib/oojs-ui/oojs-ui-mediawiki-icons-location.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.css M lib/oojs-ui/oojs-ui-mediawiki-icons-media.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.css M lib/oojs-ui/oojs-ui-mediawiki-icons-moderation.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.css M lib/oojs-ui/oojs-ui-mediawiki-icons-movement.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.css M lib/oojs-ui/oojs-ui-mediawiki-icons-user.rtl.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.css M lib/oojs-ui/oojs-ui-mediawiki-icons-wikimedia.rtl.css M lib/oojs-ui/oojs-ui-mediawiki.css M lib/oojs-ui/oojs-ui-mediawiki.js M lib/oojs-ui/oojs-ui-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars-apex.css M lib/oojs-ui/oojs-ui-toolbars-apex.rtl.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.css M lib/oojs-ui/oojs-ui-toolbars-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-toolbars.js M lib/oojs-ui/oojs-ui-widgets-apex.css M lib/oojs-ui/oojs-ui-widgets-apex.rtl.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.css M lib/oojs-ui/oojs-ui-widgets-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-widgets.js M lib/oojs-ui/oojs-ui-windows-apex.css M lib/oojs-ui/oojs-ui-windows-apex.rtl.css M lib/oojs-ui/oojs-ui-windows-mediawiki.css M lib/oojs-ui/oojs-ui-windows-mediawiki.rtl.css M lib/oojs-ui/oojs-ui-windows.js M lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg A lib/oojs-ui/themes/apex/images/icons/diacritic.png A lib/oojs-ui/themes/apex/images/icons/diacritic.svg A lib/oojs-ui/themes/apex/images/icons/feedback-ltr-invert.png A lib/oojs-ui/themes/apex/images/icons/feedback-ltr-invert.svg A lib/oojs-ui/themes/apex/images/icons/feedback-ltr.png A lib/oojs-ui/themes/apex/images/icons/feedback-ltr.svg A lib/oojs-ui/themes/apex/images/icons/feedback-rtl-invert.png A lib/oojs-ui/themes/apex/images/icons/feedback-rtl-invert.svg A lib/oojs-ui/themes/apex/images/icons/feedback-rtl.png A lib/oojs-ui/themes/apex/
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Removing unimplemented/commented-out code
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340437 )
Change subject: Removing unimplemented/commented-out code
..
Removing unimplemented/commented-out code
They will possibly be implemented at a later date but in the meantime
it is not necessary to keep them in the master branch.
Change-Id: Iaacf5ea405119d03146a6712fc7d91b1eea4f9d9
---
D includes/ApiEditCollaborationHub.php
M includes/content/CollaborationHubContentHandler.php
D includes/content/CollaborationHubDiffEngine.php
M includes/content/CollaborationListContentHandler.php
4 files changed, 0 insertions(+), 66 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/37/340437/1
diff --git a/includes/ApiEditCollaborationHub.php
b/includes/ApiEditCollaborationHub.php
deleted file mode 100644
index 5fddd6d..000
--- a/includes/ApiEditCollaborationHub.php
+++ /dev/null
@@ -1,14 +0,0 @@
-extractRequestParams();
- }
-
- // TODO Implement this
-}
diff --git a/includes/content/CollaborationHubContentHandler.php
b/includes/content/CollaborationHubContentHandler.php
index 29a9181..144ea14 100644
--- a/includes/content/CollaborationHubContentHandler.php
+++ b/includes/content/CollaborationHubContentHandler.php
@@ -91,13 +91,6 @@
}
/**
-* @return string
-*/
- /*protected function getDiffEngineClass() {
- return 'CollaborationHubDiffEngine';
- }*/
-
- /**
* @return bool
*/
public function isParserCacheSupported() {
diff --git a/includes/content/CollaborationHubDiffEngine.php
b/includes/content/CollaborationHubDiffEngine.php
deleted file mode 100644
index 2ef7055..000
--- a/includes/content/CollaborationHubDiffEngine.php
+++ /dev/null
@@ -1,32 +0,0 @@
-https://gerrit.wikimedia.org/r/340437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaacf5ea405119d03146a6712fc7d91b1eea4f9d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use more specific event name for switching editor from the t...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340430 )
Change subject: Use more specific event name for switching editor from the
toolbar
..
Use more specific event name for switching editor from the toolbar
As we are in the global toolbar event namespace, 'switch' could
mean anything.
Change-Id: I66751faa249710af634ed0fd0c2f2a0bcd872db3
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/ve.init.MWEditModeTool.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index db8e562..ff49d26 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -970,7 +970,7 @@
classes: [
've-init-mw-editSwitch' ]
} );
- switchToolbar.on( 'switch',
function ( mode ) {
+ switchToolbar.on(
'switchEditor', function ( mode ) {
if ( mode === 'visual'
) {
init.activateVe( 'visual' );
}
diff --git a/modules/ve-mw/init/ve.init.MWEditModeTool.js
b/modules/ve-mw/init/ve.init.MWEditModeTool.js
index 4977719..f33f019 100644
--- a/modules/ve-mw/init/ve.init.MWEditModeTool.js
+++ b/modules/ve-mw/init/ve.init.MWEditModeTool.js
@@ -49,7 +49,7 @@
* @abstract
*/
mw.libs.ve.MWEditModeTool.prototype.switch = function () {
- this.toolbar.emit( 'switch', this.constructor.static.editMode );
+ this.toolbar.emit( 'switchEditor', this.constructor.static.editMode );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/340430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I66751faa249710af634ed0fd0c2f2a0bcd872db3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [3D] Add CI
Jforrester has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340436 ) Change subject: [3D] Add CI .. [3D] Add CI Bug: T159243 Change-Id: Ic621d2b38541c0511e9e001eab80bc3dca08ad92 --- M zuul/layout.yaml 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/36/340436/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index cc89d89..f2e1b94 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2603,6 +2603,13 @@ MediaWiki extensions ## + - name: mediawiki/extensions/3D +template: + - name: composer-test + - name: npm +check: + - jsonlint + - name: mediawiki/extensions/AbuseFilter template: - name: composer-test -- To view, visit https://gerrit.wikimedia.org/r/340436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic621d2b38541c0511e9e001eab80bc3dca08ad92 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Gerrit: Report repo in comment on merged patches too
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340435 ) Change subject: Gerrit: Report repo in comment on merged patches too .. Gerrit: Report repo in comment on merged patches too We already do it for open patches, lets extend this to merged patches. Change-Id: I099c9f76335e6b82aa9c2a9443006ee14d7d9768 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/35/340435/1 -- To view, visit https://gerrit.wikimedia.org/r/340435 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I099c9f76335e6b82aa9c2a9443006ee14d7d9768 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.19.4
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340426 )
Change subject: Tag v0.19.4
..
Tag v0.19.4
Change-Id: I57578052168671b120b6109e37dbe42738853647
---
M History.md
M package.json
2 files changed, 32 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/History.md b/History.md
index 3443cf6..5e9e086 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,35 @@
# OOjs UI Release History
+## v0.19.4 / 2017-02-28
+### Features
+* Add `OO.ui.Element.static.getScrollLeft` (Bartosz Dziewoński)
+* FloatableElement: Support positioning relative to all edges (Roan Kattouw)
+
+### Styles
+* MediaWiki theme: Align DraggableElement focus with standard appearance
(Volker E)
+* MediaWiki theme: Align appearance of PHP DropdownInputWidget to JS (Volker E)
+* MediaWiki theme: Fix TextInputWidget inline label misalignment (Volker E)
+* MediaWiki theme: Fix ToolGroupTool's label alignment (Volker E)
+* MediaWiki theme: Fix button layout in ButtonGroup-/SelectWidgets in IE 9
(Volker E)
+* MediaWiki theme: Fix styling for FieldLayout inside HorizontalLayout
(Bartosz Dziewoński)
+* styles: Improve vertical alignment of elements' & widgets' icons (Ed
Sanders/Volker E)
+* icons: Add 'feedback' icon, in interactions pack (Roan Kattouw)
+* icons: Add 'searchDiacritic' icon, in editing-advanced pack (Ed Sanders)
+
+### Code
+* Make generic placeholder pseudo-class browser-prefix mixin (Ed Sanders)
+* BookletLayout: When continuous, properly make the inner PageLayouts
non-scrollable (Bartosz Dziewoński)
+* Element: Fix `scrollLeft()` for body/html/window (Roan Kattouw)
+* OutlineOptionWidget: Remove unused and misplaced values (Volker E)
+* PopupWidget: Remove `left: 0;` breaking floatable popups (Roan Kattouw)
+* MediaWiki theme: Remove obsolete ComboBoxInputWidget selectors (Volker E)
+* README: Encourage direct release in the instructions (James D. Forrester)
+* build: Test the 'minify' task in CI (James D. Forrester)
+* demos: Add 'label' to ToolGroupTool example (Bartosz Dziewoński)
+* demos: Extract ButtonStyleShowcaseWidget from the demo code (Bartosz
Dziewoński)
+* demos: Extract CapsuleNumberPopupMultiselectWidget from the demo code
(Bartosz Dziewoński)
+* demos: Extract remaining widgets from widgets.js (Bartosz Dziewoński)
+
+
## v0.19.3 / 2017-02-21
### Features
* FieldLayout, FieldsetLayout: Add support for `$overlay` for help popups
(Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 309e992..9175004 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.19.3",
+ "version": "0.19.4",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/340426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57578052168671b120b6109e37dbe42738853647
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
Gerrit-Reviewer: Jforrester
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]: Removing commented out functions from SpecialCreateCollabora...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340427 )
Change subject: Removing commented out functions from
SpecialCreateCollaborationHub
..
Removing commented out functions from SpecialCreateCollaborationHub
Implementation of the import-related features is long-deferred,
and we do not quite know what the UI for it will be, so removing
it in the meantime.
Change-Id: I6d25553a42bc5235e00a626581be90c0b4586f67
---
M includes/SpecialCreateCollaborationHub.php
1 file changed, 0 insertions(+), 48 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/SpecialCreateCollaborationHub.php
b/includes/SpecialCreateCollaborationHub.php
index 73a534c..4790a68 100644
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -91,27 +91,6 @@
'default' => 'lightgrey'
];
- /* Comment this out until it's actually implemented (T135408)
- // Content source options
- $fields['content_source'] = [
- 'type' => 'select',
- 'options' => $this->getOptions( [
- 'collaborationkit-createhub-new' => 'new',
- 'collaborationkit-createhub-import' => 'import',
- 'collaborationkit-createhub-clone' => 'clone',
- ] ),
- 'default' => 'new', // might want to change default to
clone from the default? (TODO add a canned default as example and stuff:
T136470)
- 'label-message' => 'collaborationkit-createhub-content',
- 'cssclass' => 'mw-ck-source-options-input'
- ];
- $fields['source'] = [
- 'type' => 'text',
- 'label-message' => 'collaborationkit-createhub-source',
- 'hide-if' => [ '===', 'wpcontent_source', 'new' ],
- 'cssclass' => 'mw-ck-source-input'
- ];
- */
-
$fields['introduction'] = [
'type' => 'textarea',
'rows' => 5,
@@ -159,33 +138,6 @@
) {
return Status::newFatal(
'collaborationkit-createhub-nopermission' );
}
-
- /* Comment this out until it's actually implemented (T135408)
- // ACTUAL STUFF HERE
- if ( $data['content_source'] !== 'new' ) { // Importing from
wikitext
- $source = Title::newFromText( $data['source'] );
- if ( !$source ) {
- return Status::newFatal(
'collaborationkit-createhub-invalidsource' );
- }
-
- if ( $data['content_source'] === 'clone' ) {
- // Copy another hub
- // Just copy some of the bits...
-
- // TODO prefill the actual content
- } elseif ( $data['content_source'] === 'import' ) {
- // Do some magic based on the source:
- // If wikiproject x project: get module list,
recreate modules
- // If regular page: pull headers
-
- // TODO prefill the actual content
- }
- // Render preview?
- } else {
-
- // ...?
- }
- */
$title = Title::newFromText( $pagename );
if ( !$title ) {
--
To view, visit https://gerrit.wikimedia.org/r/340427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d25553a42bc5235e00a626581be90c0b4586f67
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
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...VisualEditor[master]: Use pencil icon for editor switcher dropdown
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340428 )
Change subject: Use pencil icon for editor switcher dropdown
..
Use pencil icon for editor switcher dropdown
Pencil is the icon we use for 'edit' elsewhere in the UI.
Use the eye icon for the VE tool to specify 'visual'.
Bug: T116417
Change-Id: I12b6bab2a52758685abde04579b274a32d651174
---
M extension.json
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
M modules/ve-mw/init/ve.init.MWEditModeTool.js
5 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/extension.json b/extension.json
index fd96bb5..da28b31 100644
--- a/extension.json
+++ b/extension.json
@@ -1126,7 +1126,8 @@
"oojs",
"oojs-ui",
"oojs-ui.styles.icons-editing-core",
- "oojs-ui.styles.icons-editing-advanced"
+ "oojs-ui.styles.icons-editing-advanced",
+ "oojs-ui.styles.icons-alerts"
],
"messages": [
"visualeditor-editingtabdialog-body",
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index a52d16c..db8e562 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -978,7 +978,7 @@
switchToolbar.setup( [ {
type: 'list',
- icon: 'wikiText',
+ icon: 'edit',
title: mw.msg(
'visualeditor-mweditmode-tooltip' ),
include: [
'editModeVisual', 'editModeSource' ]
} ] );
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index c045256..e3bcdff 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -114,7 +114,7 @@
},
{
type: 'list',
- icon: 'wikiText',
+ icon: 'edit',
title: ve.msg( 'visualeditor-mweditmode-tooltip' ),
include: [ 'editModeVisual', 'editModeSource' ]
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
index 705e843..ad4e380 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
@@ -155,7 +155,7 @@
{ include: [ 'back' ] },
{
type: 'list',
- icon: 'wikiText',
+ icon: 'edit',
title: ve.msg( 'visualeditor-mweditmode-tooltip' ),
include: [ surface.getMode() === 'visual' ?
'editModeSource' : 'editModeVisual' ]
}
diff --git a/modules/ve-mw/init/ve.init.MWEditModeTool.js
b/modules/ve-mw/init/ve.init.MWEditModeTool.js
index 78db212..4977719 100644
--- a/modules/ve-mw/init/ve.init.MWEditModeTool.js
+++ b/modules/ve-mw/init/ve.init.MWEditModeTool.js
@@ -139,7 +139,7 @@
OO.inheritClass( mw.libs.ve.MWEditModeVisualTool, mw.libs.ve.MWEditModeTool );
mw.libs.ve.MWEditModeVisualTool.static.editMode = 'visual';
mw.libs.ve.MWEditModeVisualTool.static.name = 'editModeVisual';
-mw.libs.ve.MWEditModeVisualTool.static.icon = 'edit';
+mw.libs.ve.MWEditModeVisualTool.static.icon = 'eye';
mw.libs.ve.MWEditModeVisualTool.static.title =
OO.ui.deferMsg( 'visualeditor-mweditmodeve-tool' );
mw.libs.ve.MWEditModeVisualTool.static.unavailableTooltip =
--
To view, visit https://gerrit.wikimedia.org/r/340428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12b6bab2a52758685abde04579b274a32d651174
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[save-cache]: WIP: rework into pagedataclient and update calls in sync ser...
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340434 )
Change subject: WIP: rework into pagedataclient and update calls in sync service
..
WIP: rework into pagedataclient and update calls in sync service
Change-Id: Ib10672fefe7b4c2984ad75668ed322fe369d9435
---
D
app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
M app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
M app/src/main/java/org/wikipedia/dataclient/okhttp/cache/SaveHeader.java
D app/src/main/java/org/wikipedia/dataclient/page/PageCombo.java
M app/src/main/java/org/wikipedia/dataclient/page/PageService.java
D app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageCombo.java
M app/src/main/java/org/wikipedia/dataclient/restbase/page/RbPageService.java
M app/src/main/java/org/wikipedia/page/PageDataClient.java
M app/src/main/java/org/wikipedia/savedpages/SavedPageSyncService.java
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
10 files changed, 168 insertions(+), 345 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/34/340434/1
diff --git
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
deleted file mode 100644
index 2abaf41..000
---
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwMobileViewPageCombo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.wikipedia.dataclient.mwapi.page;
-
-import org.wikipedia.dataclient.page.PageCombo;
-
-/**
- * Combines MwMobileViewPageLead and MwMobileViewPageRemaining Gson POJOs for
mobileview API.
- * In mobileview API the implementation is basically the same as
MwMobileViewPageLead.
- * The class name "Page" was already used, and is very entrenched in this code
base.
- */
-public class MwMobileViewPageCombo extends MwMobileViewPageLead implements
PageCombo {
-}
diff --git
a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
index ed53bde..2e438e0 100644
--- a/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
+++ b/app/src/main/java/org/wikipedia/dataclient/mwapi/page/MwPageService.java
@@ -1,23 +1,21 @@
package org.wikipedia.dataclient.mwapi.page;
+import android.support.annotation.NonNull;
+
import org.wikipedia.Constants;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.dataclient.ServiceError;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.dataclient.page.PageLead;
-import org.wikipedia.dataclient.page.PageRemaining;
+import org.wikipedia.dataclient.okhttp.cache.SaveHeader;
import org.wikipedia.dataclient.page.PageService;
import org.wikipedia.dataclient.page.PageSummary;
import org.wikipedia.dataclient.retrofit.RetrofitException;
-import org.wikipedia.settings.RbSwitch;
import org.wikipedia.zero.WikipediaZeroHandler;
-
-import java.io.IOException;
import retrofit2.Call;
import retrofit2.Callback;
import retrofit2.Response;
import retrofit2.http.GET;
+import retrofit2.http.Header;
import retrofit2.http.Headers;
import retrofit2.http.Query;
@@ -34,7 +32,7 @@
}
@Override
-public void pageSummary(String title, final PageSummary.Callback cb) {
+public void pageSummary(String title, @NonNull final PageSummary.Callback
cb) {
Call call = service.pageSummary(title);
call.enqueue(new Callback() {
/**
@@ -64,59 +62,18 @@
});
}
-@Override
-public void pageLead(String title, int leadImageThumbWidth, boolean
noImages,
- final PageLead.Callback cb) {
-Call call = service.pageLead(title,
leadImageThumbWidth, optional(noImages));
-call.enqueue(new Callback() {
-@Override
-public void onResponse(Call call,
Response response) {
-if (response.isSuccessful()) {
-responseHeaderHandler.onHeaderCheck(response);
-cb.success(response.body());
-} else {
-cb.failure(RetrofitException.httpError(response));
-}
-}
-
-@Override
-public void onFailure(Call call, Throwable
t) {
-cb.failure(t);
-}
-});
+@SuppressWarnings("unchecked")
+@Override @NonNull public Call pageLead(String title,
+ int
leadImageThumbWidth,
+ boolean
noImages, boolean save) {
+return service.pageLead(save, title, leadImageThumbWidth,
optional(noImages));
}
-@Override
-public void pageRemaining(String title, boolean noImages, final
PageRemaining.Callback
[MediaWiki-commits] [Gerrit] apps...wikipedia[save-cache]: WIP: ripout some saved page loading logic
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340432 )
Change subject: WIP: ripout some saved page loading logic
..
WIP: ripout some saved page loading logic
Change-Id: I51c1bd5cc6c90be5aa58ab230fdd1633eb03ddda
---
M app/src/main/assets/bundle.js
M app/src/main/java/org/wikipedia/page/PageDataClient.java
M app/src/main/java/org/wikipedia/page/linkpreview/LinkPreviewDialog.java
D app/src/main/java/org/wikipedia/savedpages/LoadSavedPageTask.java
M www/js/sections.js
5 files changed, 11 insertions(+), 113 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/32/340432/1
diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index b68585f..5852dda 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -587,8 +587,7 @@
}
document.getElementById( "loading_sections").className = "";
bridge.sendMessage( "pageLoadComplete", {
- "sequence": payload.sequence,
- "savedPage": payload.savedPage });
+ "sequence": payload.sequence });
} else {
var contentWrapper = document.getElementById( "content" );
elementsForSection(payload.section).forEach(function (element) {
@@ -603,7 +602,7 @@
if ( typeof payload.fragment === "string" && payload.fragment.length >
0 && payload.section.anchor === payload.fragment) {
scrollToSection( payload.fragment );
}
-bridge.sendMessage( "requestSection", { "sequence": payload.sequence,
"savedPage": payload.savedPage, "index": payload.section.id + 1 });
+bridge.sendMessage( "requestSection", { "sequence": payload.sequence,
"index": payload.section.id + 1 });
}
});
diff --git a/app/src/main/java/org/wikipedia/page/PageDataClient.java
b/app/src/main/java/org/wikipedia/page/PageDataClient.java
index aba12b5..96454e1 100644
--- a/app/src/main/java/org/wikipedia/page/PageDataClient.java
+++ b/app/src/main/java/org/wikipedia/page/PageDataClient.java
@@ -33,7 +33,6 @@
import org.wikipedia.page.leadimages.LeadImagesHandler;
import org.wikipedia.pageimages.PageImage;
import org.wikipedia.pageimages.PageImagesTask;
-import org.wikipedia.savedpages.LoadSavedPageTask;
import org.wikipedia.util.DeviceUtil;
import org.wikipedia.util.DimenUtil;
import org.wikipedia.util.L10nUtil;
@@ -66,8 +65,6 @@
private interface ErrorCallback {
void call(@Nullable Throwable error);
}
-
-private static final String BRIDGE_PAYLOAD_SAVED_PAGE = "savedPage";
private static final int STATE_NO_FETCH = 1;
private static final int STATE_INITIAL_FETCH = 2;
@@ -284,31 +281,6 @@
}
}
-private void loadSavedPage(final ErrorCallback errorCallback) {
-new LoadSavedPageTask(model.getTitle(), sequenceNumber.get()) {
-@Override
-public void onFinish(Page result) {
-if (!fragment.isAdded() ||
!sequenceNumber.inSync(getSequence())) {
-return;
-}
-model.setPage(result);
-editHandler.setPage(model.getPage());
-layoutLeadImage(new Runnable() {
-@Override
-public void run() {
-displayNonLeadSectionForSavedPage(1);
-setState(STATE_COMPLETE_FETCH);
-}
-});
-}
-
-@Override
-public void onCatch(Throwable caught) {
-errorCallback.call(caught);
-}
-}.execute();
-}
-
private void setUpBridgeListeners() {
bridge.addListener("onBeginNewPage", new SynchronousBridgeListener() {
@Override
@@ -325,8 +297,7 @@
@Override
public void onMessage(JSONObject payload) {
try {
-displayNonLeadSection(payload.getInt("index"),
-payload.optBoolean(BRIDGE_PAYLOAD_SAVED_PAGE,
false));
+displayNonLeadSection(payload.getInt("index"));
} catch (JSONException e) {
L.logRemoteErrorIfProd(e);
}
@@ -379,7 +350,7 @@
layoutLeadImage(new Runnable() {
@Override
public void run() {
-displayNonLeadSectionForUnsavedPage(1);
+displayNonLeadSection(1);
}
});
break;
@@ -413,11 +384,7 @@
loadFromNetwork(new ErrorCallback() {
@Override public void call(final Throwable networkError) {
-loadSavedPage(new ErrorCallback() {
-@Override public void call(Throwable savedError) {
-fragment.onPageLoadError(networkError);
-}
-
[MediaWiki-commits] [Gerrit] apps...wikipedia[save-cache]: Hygiene: remove duplicate method in WidgetProviderFeaturedPage
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340433 )
Change subject: Hygiene: remove duplicate method in WidgetProviderFeaturedPage
..
Hygiene: remove duplicate method in WidgetProviderFeaturedPage
Bug: T156917
Change-Id: Ifd56396118d2103635a58ed81bee622cc3e6c9ef
---
M app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
1 file changed, 1 insertion(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/33/340433/1
diff --git
a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
index f991505..7ca5dc6 100644
--- a/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
+++ b/app/src/main/java/org/wikipedia/widgets/WidgetProviderFeaturedPage.java
@@ -6,7 +6,6 @@
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
-import android.content.res.Resources;
import android.text.Spanned;
import android.text.TextUtils;
import android.text.style.URLSpan;
@@ -76,7 +75,7 @@
MainPageNameData.valueFor(app.getAppOrSystemLanguageCode()),
app.getWikiSite());
-getApiService(title).pageLead(title.getPrefixedText(),
calculateLeadImageWidth(),
+getApiService(title).pageLead(title.getPrefixedText(),
DimenUtil.calculateLeadImageWidth(),
!app.isImageDownloadEnabled(), new PageLead.Callback() {
@Override
public void success(PageLead pageLead) {
@@ -119,11 +118,6 @@
}
}
return titleText;
-}
-
-private int calculateLeadImageWidth() {
-Resources res = WikipediaApp.getInstance().getResources();
-return (int) (res.getDimension(R.dimen.leadImageWidth) /
DimenUtil.getDensityScalar());
}
private PageService getApiService(PageTitle title) {
--
To view, visit https://gerrit.wikimedia.org/r/340433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifd56396118d2103635a58ed81bee622cc3e6c9ef
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: save-cache
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Make Parser not depend on $wgTitle
MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340431 )
Change subject: Make Parser not depend on $wgTitle
..
Make Parser not depend on $wgTitle
In two cases, the title is needed more like a dummy, just provide
main page title instead, following established tradition. In another
case, a title parameter is optional. Make it use RequestContext for now
and log the callers (there shouldn't be any).
Bug: T159284
Change-Id: I67449da4d1a921cbdf6508a2bb568fe211716f3a
---
M RELEASE-NOTES-1.29
M includes/parser/Parser.php
2 files changed, 7 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/31/340431/1
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index a1ce9d9..d1ef100 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -241,6 +241,7 @@
* User::comparePasswords() (deprecated in 1.24) was removed.
* ArchivedFile::getUserText() (deprecated in 1.23) was removed.
* HTMLFileCache::newFromTitle() (deprecated in 1.24) was removed.
+* Calling Parser::transformMsg() without setting $title to a valid Title
object is deprecated.
== Compatibility ==
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 9a9b9d8..3dfd165 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4627,9 +4627,8 @@
*/
public function cleanSig( $text, $parsing = false ) {
if ( !$parsing ) {
- global $wgTitle;
$magicScopeVariable = $this->lock();
- $this->startParse( $wgTitle, new ParserOptions,
self::OT_PREPROCESS, true );
+ $this->startParse( Title::newMainPage(), new
ParserOptions, self::OT_PREPROCESS, true );
}
# Option to disable this feature
@@ -4704,7 +4703,7 @@
*
* @param string $text The text to preprocess
* @param ParserOptions $options Options
-* @param Title|null $title Title object or null to use $wgTitle
+* @param Title|null $title Title object or null to use $wgTitle
(deprecated)
* @return string
*/
public function transformMsg( $text, $options, $title = null ) {
@@ -4717,8 +4716,8 @@
$executing = true;
if ( !$title ) {
- global $wgTitle;
- $title = $wgTitle;
+ $title = RequestContext::getMain()->getTitle();
+ wfDeprecated( __METHOD__ . ' with $text = null', '1.29'
);
}
$text = $this->preprocess( $text, $title, $options );
@@ -5504,10 +5503,9 @@
* for "replace", the whole page with the section replaced.
*/
private function extractSections( $text, $sectionId, $mode, $newText =
'' ) {
- global $wgTitle; # not generally used but removes an ugly
failure mode
-
$magicScopeVariable = $this->lock();
- $this->startParse( $wgTitle, new ParserOptions, self::OT_PLAIN,
true );
+ $title = Title::newMainPage(); # not generally used but removes
an ugly failure mode
+ $this->startParse( $title, new ParserOptions, self::OT_PLAIN,
true );
$outText = '';
$frame = $this->getPreprocessor()->newFrame();
--
To view, visit https://gerrit.wikimedia.org/r/340431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67449da4d1a921cbdf6508a2bb568fe211716f3a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use more specific event name for switching editor from the t...
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340430 )
Change subject: Use more specific event name for switching editor from the
toolbar
..
Use more specific event name for switching editor from the toolbar
As we are in the global toolbar event namespace, 'switch' could
mean anything.
Change-Id: I66751faa249710af634ed0fd0c2f2a0bcd872db3
---
M modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
M modules/ve-mw/init/ve.init.MWEditModeTool.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/30/340430/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index db8e562..ff49d26 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -970,7 +970,7 @@
classes: [
've-init-mw-editSwitch' ]
} );
- switchToolbar.on( 'switch',
function ( mode ) {
+ switchToolbar.on(
'switchEditor', function ( mode ) {
if ( mode === 'visual'
) {
init.activateVe( 'visual' );
}
diff --git a/modules/ve-mw/init/ve.init.MWEditModeTool.js
b/modules/ve-mw/init/ve.init.MWEditModeTool.js
index 4977719..f33f019 100644
--- a/modules/ve-mw/init/ve.init.MWEditModeTool.js
+++ b/modules/ve-mw/init/ve.init.MWEditModeTool.js
@@ -49,7 +49,7 @@
* @abstract
*/
mw.libs.ve.MWEditModeTool.prototype.switch = function () {
- this.toolbar.emit( 'switch', this.constructor.static.editMode );
+ this.toolbar.emit( 'switchEditor', this.constructor.static.editMode );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/340430
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I66751faa249710af634ed0fd0c2f2a0bcd872db3
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] wikimedia...crm[master]: Benevity update, handle situation where the Benevity email m...
Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340429 )
Change subject: Benevity update, handle situation where the Benevity email
might be work but wmf email is home.
..
Benevity update, handle situation where the Benevity email might be work but
wmf email is home.
Per updated comments: Attempt to check for an employer match on first_name &
last_name only (in case of using home email), If found add the email but do not
overwrite, create relationship.Else create contact, add relationship
https://phabricator.wikimedia.org/T115044#3012232
If the email does not match but there is an employee of the organisation with a
first_name, last_name match we can use that. (small risk of one
org having 2 contacts with the same name both as matching giftees, but would
even hand entering handle that?).
Note our new definition of employee is either having the relationship Or having
a history of matching gifts.
Bug T115044
Change-Id: I3b811ac6c134c56e1346d6e2cfafb3b02c87a243
---
M sites/all/modules/offline2civicrm/BenevityFile.php
M sites/all/modules/offline2civicrm/tests/BenevityTest.php
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
3 files changed, 74 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/29/340429/1
diff --git a/sites/all/modules/offline2civicrm/BenevityFile.php
b/sites/all/modules/offline2civicrm/BenevityFile.php
index efbd34d..44331d2 100644
--- a/sites/all/modules/offline2civicrm/BenevityFile.php
+++ b/sites/all/modules/offline2civicrm/BenevityFile.php
@@ -69,7 +69,11 @@
if ($msg['contact_id'] == $this->getAnonymousContactID()) {
$this->unsetAddressFields($msg);
}
-
+if ($msg['contact_id'] === FALSE) {
+ if (($msg['contact_id'] =
$this->getNameMatchedEmployedIndividualID($msg)) != FALSE) {
+$msg['email_location_type_id'] = 'Work';
+ }
+}
}
/**
@@ -370,4 +374,38 @@
return
\Civi::$statics[__CLASS__]['organization_resolved_name'][$organizationName];
}
+ /**
+ * Get the id of any employee who is a full name match but has a different
email.
+ *
+ * We handle this outside the main getIndividualID because contact's matched
+ * by this method need to have their email preserved.
+ *
+ * @param array $msg
+ *
+ * @return mixed
+ */
+ protected function getNameMatchedEmployedIndividualID($msg) {
+$matches = array();
+if (isset($msg['first_name']) && isset($msg['last_name']) &&
isset($msg['email'])) {
+ $params = array(
+'first_name' => $msg['first_name'],
+'last_name' => $msg['last_name'],
+'contact_type' => 'Individual',
+'return' => 'current_employer',
+'options' => array('limit' => 0),
+ );
+ unset($params['email']);
+ $contacts = civicrm_api3('Contact', 'get', $params);
+ foreach ($contacts['values'] as $contact) {
+if
($this->isContactEmployedByOrganization($msg['matching_organization_name'],
$contact)) {
+ $matches[] = $contact['id'];
+}
+ }
+}
+if (count($matches) === 1) {
+ return reset($matches);
+}
+return FALSE;
+ }
+
}
diff --git a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
index 4d6c18f..bace33f 100644
--- a/sites/all/modules/offline2civicrm/tests/BenevityTest.php
+++ b/sites/all/modules/offline2civicrm/tests/BenevityTest.php
@@ -228,6 +228,36 @@
$this->assertEquals(1, $relationships['count']);
}
+ /**
+ * Test that we will accept a name match for employees, even when there is
an email mis-match.
+ *
+ * We have a situation where employees are often in the database with a
different email than in
+ * the Benevity import (e.g a personal email). If there is already a contact
with the same first and
+ * last name and they have been related to the organization (by an employer
relationship or a previous
+ * soft credit) we should accept them.
+ */
+ function testImportSucceedIndividualMatchToEmployerDisregardingEmail() {
+$organization = $this->callAPISuccess('Contact', 'create',
array('organization_name' => 'Mickey Mouse Inc', 'contact_type' =>
'Organization'));
+$betterMinnie = $this->callAPISuccess('Contact', 'create', array(
+ 'first_name' => 'Minnie', 'last_name' => 'Mouse', 'contact_type' =>
'Individual', 'email' => 'minnie@mouse_home.org', 'employer_id' =>
$organization['id'],
+));
+$importer = new BenevityFile( __DIR__ . "/data/benevity.csv" );
+$importer->import();
+$messages = $importer->getMessages();
+$this->assertEquals('1 out of 4 rows were imported.', $messages['Result']);
+
+$contributions = $this->callAPISuccess('Contribution', 'get',
array('contact_id' => $betterMinnie['id']));
+$this->assertEquals(1, $contributions['count']);
+$relationships = $th
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Use pencil icon for editor switcher dropdown
Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340428 )
Change subject: Use pencil icon for editor switcher dropdown
..
Use pencil icon for editor switcher dropdown
Pencil is the icon we use for 'edit' elsewhere in the UI.
Use the eye icon for the VE tool to specify 'visual'.
Bug: T116417
Change-Id: I12b6bab2a52758685abde04579b274a32d651174
---
M extension.json
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
M modules/ve-mw/init/ve.init.MWEditModeTool.js
5 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/28/340428/1
diff --git a/extension.json b/extension.json
index fd96bb5..da28b31 100644
--- a/extension.json
+++ b/extension.json
@@ -1126,7 +1126,8 @@
"oojs",
"oojs-ui",
"oojs-ui.styles.icons-editing-core",
- "oojs-ui.styles.icons-editing-advanced"
+ "oojs-ui.styles.icons-editing-advanced",
+ "oojs-ui.styles.icons-alerts"
],
"messages": [
"visualeditor-editingtabdialog-body",
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
index a52d16c..db8e562 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
@@ -978,7 +978,7 @@
switchToolbar.setup( [ {
type: 'list',
- icon: 'wikiText',
+ icon: 'edit',
title: mw.msg(
'visualeditor-mweditmode-tooltip' ),
include: [
'editModeVisual', 'editModeSource' ]
} ] );
diff --git a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
index c045256..e3bcdff 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
@@ -114,7 +114,7 @@
},
{
type: 'list',
- icon: 'wikiText',
+ icon: 'edit',
title: ve.msg( 'visualeditor-mweditmode-tooltip' ),
include: [ 'editModeVisual', 'editModeSource' ]
}
diff --git a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
index 705e843..ad4e380 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.MobileArticleTarget.js
@@ -155,7 +155,7 @@
{ include: [ 'back' ] },
{
type: 'list',
- icon: 'wikiText',
+ icon: 'edit',
title: ve.msg( 'visualeditor-mweditmode-tooltip' ),
include: [ surface.getMode() === 'visual' ?
'editModeSource' : 'editModeVisual' ]
}
diff --git a/modules/ve-mw/init/ve.init.MWEditModeTool.js
b/modules/ve-mw/init/ve.init.MWEditModeTool.js
index 78db212..4977719 100644
--- a/modules/ve-mw/init/ve.init.MWEditModeTool.js
+++ b/modules/ve-mw/init/ve.init.MWEditModeTool.js
@@ -139,7 +139,7 @@
OO.inheritClass( mw.libs.ve.MWEditModeVisualTool, mw.libs.ve.MWEditModeTool );
mw.libs.ve.MWEditModeVisualTool.static.editMode = 'visual';
mw.libs.ve.MWEditModeVisualTool.static.name = 'editModeVisual';
-mw.libs.ve.MWEditModeVisualTool.static.icon = 'edit';
+mw.libs.ve.MWEditModeVisualTool.static.icon = 'eye';
mw.libs.ve.MWEditModeVisualTool.static.title =
OO.ui.deferMsg( 'visualeditor-mweditmodeve-tool' );
mw.libs.ve.MWEditModeVisualTool.static.unavailableTooltip =
--
To view, visit https://gerrit.wikimedia.org/r/340428
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12b6bab2a52758685abde04579b274a32d651174
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] mediawiki...CollaborationKit[master]: Removing commented out functions from SpecialCreateCollabora...
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340427 )
Change subject: Removing commented out functions from
SpecialCreateCollaborationHub
..
Removing commented out functions from SpecialCreateCollaborationHub
Implementation of the import-related features is long-deferred,
and we do not quite know what the UI for it will be, so removing
it in the meantime.
Change-Id: I6d25553a42bc5235e00a626581be90c0b4586f67
---
M includes/SpecialCreateCollaborationHub.php
1 file changed, 0 insertions(+), 48 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/27/340427/1
diff --git a/includes/SpecialCreateCollaborationHub.php
b/includes/SpecialCreateCollaborationHub.php
index 73a534c..4790a68 100644
--- a/includes/SpecialCreateCollaborationHub.php
+++ b/includes/SpecialCreateCollaborationHub.php
@@ -91,27 +91,6 @@
'default' => 'lightgrey'
];
- /* Comment this out until it's actually implemented (T135408)
- // Content source options
- $fields['content_source'] = [
- 'type' => 'select',
- 'options' => $this->getOptions( [
- 'collaborationkit-createhub-new' => 'new',
- 'collaborationkit-createhub-import' => 'import',
- 'collaborationkit-createhub-clone' => 'clone',
- ] ),
- 'default' => 'new', // might want to change default to
clone from the default? (TODO add a canned default as example and stuff:
T136470)
- 'label-message' => 'collaborationkit-createhub-content',
- 'cssclass' => 'mw-ck-source-options-input'
- ];
- $fields['source'] = [
- 'type' => 'text',
- 'label-message' => 'collaborationkit-createhub-source',
- 'hide-if' => [ '===', 'wpcontent_source', 'new' ],
- 'cssclass' => 'mw-ck-source-input'
- ];
- */
-
$fields['introduction'] = [
'type' => 'textarea',
'rows' => 5,
@@ -159,33 +138,6 @@
) {
return Status::newFatal(
'collaborationkit-createhub-nopermission' );
}
-
- /* Comment this out until it's actually implemented (T135408)
- // ACTUAL STUFF HERE
- if ( $data['content_source'] !== 'new' ) { // Importing from
wikitext
- $source = Title::newFromText( $data['source'] );
- if ( !$source ) {
- return Status::newFatal(
'collaborationkit-createhub-invalidsource' );
- }
-
- if ( $data['content_source'] === 'clone' ) {
- // Copy another hub
- // Just copy some of the bits...
-
- // TODO prefill the actual content
- } elseif ( $data['content_source'] === 'import' ) {
- // Do some magic based on the source:
- // If wikiproject x project: get module list,
recreate modules
- // If regular page: pull headers
-
- // TODO prefill the actual content
- }
- // Render preview?
- } else {
-
- // ...?
- }
- */
$title = Title::newFromText( $pagename );
if ( !$title ) {
--
To view, visit https://gerrit.wikimedia.org/r/340427
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d25553a42bc5235e00a626581be90c0b4586f67
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Removing duplicate implementations of escape/unescapeForHuma...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340425 )
Change subject: Removing duplicate implementations of
escape/unescapeForHumanEditable functions
..
Removing duplicate implementations of escape/unescapeForHumanEditable functions
Change-Id: I03a667fedc638647e5bf2c814d6220c7bb899869
---
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationListContent.php
2 files changed, 14 insertions(+), 53 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 1fb55df..c64666d 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -824,12 +824,12 @@
$out = '';
foreach ( $this->content as $item ) {
- $out .= $this->escapeForHumanEditable( $item['title'] );
+ $out .= self::escapeForHumanEditable( $item['title'] );
if ( isset ( $item['image'] ) ) {
- $out .= '|image=' .
$this->escapeForHumanEditable( $item['image'] );
+ $out .= '|image=' .
self::escapeForHumanEditable( $item['image'] );
}
if ( isset( $item['displayTitle'] ) ) {
- $out .= '|display_title=' .
$this->escapeForHumanEditable( $item['displayTitle'] );
+ $out .= '|display_title=' .
self::escapeForHumanEditable( $item['displayTitle'] );
}
if ( substr( $out, -1 ) === '|' ) {
$out = substr( $out, 0, strlen( $out ) - 1 );
@@ -848,7 +848,7 @@
* @todo Unclear if this is best approach. Alternative might be
* to use
Or an obscure unicode character like ␊ (U+240A).
*/
- private function escapeForHumanEditable( $text ) {
+ public static function escapeForHumanEditable( $text ) {
if ( strpos( $text, '{{!}}' ) !== false ) {
// Maybe we should use \| too, but that's not MW like.
throw new MWContentSerializationException( "{{!}} in
content" );
@@ -871,7 +871,7 @@
* @param string $text
* @return string Unescaped text
*/
- private static function unescapeForHumanEditable( $text ) {
+ public static function unescapeForHumanEditable( $text ) {
$text = strtr( $text, [
'n'=> "\\n",
'\n' => "\n",
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index a3fb1bf..e3f86e7 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -656,19 +656,19 @@
// Use two to separate columns
$out .= self::HUMAN_COLUMN_SPLIT;
if ( isset( $column->label ) ) {
- $out .= $this->escapeForHumanEditable(
$column->label );
+ $out .=
CollaborationHubContent::escapeForHumanEditable( $column->label );
} else {
$out .= 'column';
}
if ( isset( $column->notes ) ) {
- $out .= '|notes=' .
$this->escapeForHumanEditable( $column->notes );
+ $out .= '|notes=' .
CollaborationHubContent::escapeForHumanEditable( $column->notes );
}
$out .= self::HUMAN_COLUMN_SPLIT2;
foreach ( $column->items as $item ) {
- $out .= $this->escapeForHumanEditable(
$item->title );
+ $out .=
CollaborationHubContent::escapeForHumanEditable( $item->title );
if ( isset ( $item->notes ) ) {
- $out .= '|' .
$this->escapeForHumanEditable( $item->notes );
+ $out .= '|' .
CollaborationHubContent::escapeForHumanEditable( $item->notes );
} else {
$out .= '|';
}
@@ -676,19 +676,19 @@
if ( $item->link === false ) {
$out .= '|nolink';
} else {
- $out .= "|link=" .
$this->escapeForHumanEditable( $item->link );
+ $out .= "|link=" .
CollaborationHubContent::escapeForHumanEditable( $item->li
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Cleanup of CollaborationListContent.php
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340423 )
Change subject: Cleanup of CollaborationListContent.php
..
Cleanup of CollaborationListContent.php
Change-Id: I078470d8eeffb33a5b57cfab8dcbc523fe919c5d
---
M includes/content/CollaborationListContent.php
1 file changed, 2 insertions(+), 5 deletions(-)
Approvals:
Brian Wolff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index ea33144..a3fb1bf 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -25,7 +25,7 @@
const HUMAN_DESC_SPLIT = "\n---\n";
// Splitter denoting the beginning of a list column
const HUMAN_COLUMN_SPLIT = "\n-~-~-\n";
- // Splitter denoting the beginning og the list itself within the column
+ // Splitter denoting the beginning of the list itself within the column
const HUMAN_COLUMN_SPLIT2 = "\n-\n";
/** @var $decoded boolean Have we decoded the data yet */
@@ -108,10 +108,7 @@
// Special handling for DISPLAYMODE
if ( $name == 'DISPLAYMODE' ) {
- if ( $value == 'members' || $value == 'normal' ||
$value == 'error' ) {
- return true;
- }
- return false;
+ return ( $value == 'members' || $value == 'normal' ||
$value == 'error' );
}
// Force intrepretation as boolean for certain options
--
To view, visit https://gerrit.wikimedia.org/r/340423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I078470d8eeffb33a5b57cfab8dcbc523fe919c5d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
Gerrit-Reviewer: Brian Wolff
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Tag v0.19.4
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340426 )
Change subject: Tag v0.19.4
..
Tag v0.19.4
Change-Id: I57578052168671b120b6109e37dbe42738853647
---
M History.md
M package.json
2 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/26/340426/1
diff --git a/History.md b/History.md
index 3443cf6..5e9e086 100644
--- a/History.md
+++ b/History.md
@@ -1,4 +1,35 @@
# OOjs UI Release History
+## v0.19.4 / 2017-02-28
+### Features
+* Add `OO.ui.Element.static.getScrollLeft` (Bartosz Dziewoński)
+* FloatableElement: Support positioning relative to all edges (Roan Kattouw)
+
+### Styles
+* MediaWiki theme: Align DraggableElement focus with standard appearance
(Volker E)
+* MediaWiki theme: Align appearance of PHP DropdownInputWidget to JS (Volker E)
+* MediaWiki theme: Fix TextInputWidget inline label misalignment (Volker E)
+* MediaWiki theme: Fix ToolGroupTool's label alignment (Volker E)
+* MediaWiki theme: Fix button layout in ButtonGroup-/SelectWidgets in IE 9
(Volker E)
+* MediaWiki theme: Fix styling for FieldLayout inside HorizontalLayout
(Bartosz Dziewoński)
+* styles: Improve vertical alignment of elements' & widgets' icons (Ed
Sanders/Volker E)
+* icons: Add 'feedback' icon, in interactions pack (Roan Kattouw)
+* icons: Add 'searchDiacritic' icon, in editing-advanced pack (Ed Sanders)
+
+### Code
+* Make generic placeholder pseudo-class browser-prefix mixin (Ed Sanders)
+* BookletLayout: When continuous, properly make the inner PageLayouts
non-scrollable (Bartosz Dziewoński)
+* Element: Fix `scrollLeft()` for body/html/window (Roan Kattouw)
+* OutlineOptionWidget: Remove unused and misplaced values (Volker E)
+* PopupWidget: Remove `left: 0;` breaking floatable popups (Roan Kattouw)
+* MediaWiki theme: Remove obsolete ComboBoxInputWidget selectors (Volker E)
+* README: Encourage direct release in the instructions (James D. Forrester)
+* build: Test the 'minify' task in CI (James D. Forrester)
+* demos: Add 'label' to ToolGroupTool example (Bartosz Dziewoński)
+* demos: Extract ButtonStyleShowcaseWidget from the demo code (Bartosz
Dziewoński)
+* demos: Extract CapsuleNumberPopupMultiselectWidget from the demo code
(Bartosz Dziewoński)
+* demos: Extract remaining widgets from widgets.js (Bartosz Dziewoński)
+
+
## v0.19.3 / 2017-02-21
### Features
* FieldLayout, FieldsetLayout: Add support for `$overlay` for help popups
(Bartosz Dziewoński)
diff --git a/package.json b/package.json
index 309e992..9175004 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.19.3",
+ "version": "0.19.4",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/340426
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I57578052168671b120b6109e37dbe42738853647
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Removing duplicate implementations of escape/unescapeForHuma...
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340425 )
Change subject: Removing duplicate implementations of
escape/unescapeForHumanEditable functions
..
Removing duplicate implementations of escape/unescapeForHumanEditable functions
Change-Id: I03a667fedc638647e5bf2c814d6220c7bb899869
---
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationListContent.php
2 files changed, 14 insertions(+), 53 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/25/340425/1
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index 1fb55df..c64666d 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -824,12 +824,12 @@
$out = '';
foreach ( $this->content as $item ) {
- $out .= $this->escapeForHumanEditable( $item['title'] );
+ $out .= self::escapeForHumanEditable( $item['title'] );
if ( isset ( $item['image'] ) ) {
- $out .= '|image=' .
$this->escapeForHumanEditable( $item['image'] );
+ $out .= '|image=' .
self::escapeForHumanEditable( $item['image'] );
}
if ( isset( $item['displayTitle'] ) ) {
- $out .= '|display_title=' .
$this->escapeForHumanEditable( $item['displayTitle'] );
+ $out .= '|display_title=' .
self::escapeForHumanEditable( $item['displayTitle'] );
}
if ( substr( $out, -1 ) === '|' ) {
$out = substr( $out, 0, strlen( $out ) - 1 );
@@ -848,7 +848,7 @@
* @todo Unclear if this is best approach. Alternative might be
* to use
Or an obscure unicode character like ␊ (U+240A).
*/
- private function escapeForHumanEditable( $text ) {
+ public static function escapeForHumanEditable( $text ) {
if ( strpos( $text, '{{!}}' ) !== false ) {
// Maybe we should use \| too, but that's not MW like.
throw new MWContentSerializationException( "{{!}} in
content" );
@@ -871,7 +871,7 @@
* @param string $text
* @return string Unescaped text
*/
- private static function unescapeForHumanEditable( $text ) {
+ public static function unescapeForHumanEditable( $text ) {
$text = strtr( $text, [
'n'=> "\\n",
'\n' => "\n",
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index a3fb1bf..e3f86e7 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -656,19 +656,19 @@
// Use two to separate columns
$out .= self::HUMAN_COLUMN_SPLIT;
if ( isset( $column->label ) ) {
- $out .= $this->escapeForHumanEditable(
$column->label );
+ $out .=
CollaborationHubContent::escapeForHumanEditable( $column->label );
} else {
$out .= 'column';
}
if ( isset( $column->notes ) ) {
- $out .= '|notes=' .
$this->escapeForHumanEditable( $column->notes );
+ $out .= '|notes=' .
CollaborationHubContent::escapeForHumanEditable( $column->notes );
}
$out .= self::HUMAN_COLUMN_SPLIT2;
foreach ( $column->items as $item ) {
- $out .= $this->escapeForHumanEditable(
$item->title );
+ $out .=
CollaborationHubContent::escapeForHumanEditable( $item->title );
if ( isset ( $item->notes ) ) {
- $out .= '|' .
$this->escapeForHumanEditable( $item->notes );
+ $out .= '|' .
CollaborationHubContent::escapeForHumanEditable( $item->notes );
} else {
$out .= '|';
}
@@ -676,19 +676,19 @@
if ( $item->link === false ) {
$out .= '|nolink';
} else {
- $out .= "|link=" .
$this->escapeForHumanEditable( $item->link );
+ $out .= "|link=" .
CollaborationHubContent::escapeForHumanEd
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Remove deprecated langonly file for loading i18n messages on...
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340422 ) Change subject: Remove deprecated langonly file for loading i18n messages on donatewiki .. Remove deprecated langonly file for loading i18n messages on donatewiki Bug: T159098 Change-Id: Iadf47fda486bfa6cbd1b35c836b34d3f8adc1d96 --- D donationinterface_langonly.php 1 file changed, 0 insertions(+), 39 deletions(-) Approvals: Cdentinger: Looks good to me, approved jenkins-bot: Verified diff --git a/donationinterface_langonly.php b/donationinterface_langonly.php deleted file mode 100644 index c57dca0..000 --- a/donationinterface_langonly.php +++ /dev/null @@ -1,39 +0,0 @@ - 'Donation Interface - Language Only', - 'author' => array( 'Katie Horn', 'Ryan Kaldari' , 'Arthur Richards', 'Matt Walker', 'Adam Wight', 'Peter Gehres', 'Jeremy Postlethwaite' ), - 'version' => '2.0.0', - 'descriptionmsg' => 'donate_interface-langonly-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:DonationInterface', -); - -// Load the interface messages that are shared across all gateways -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/gateway_common/i18n/interface'; -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/gateway_common/i18n/countries'; -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/gateway_common/i18n/us-states'; -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/gateway_common/i18n/canada-provinces'; - -// GlobalCollect-specific messaging -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/globalcollect_gateway/i18n'; -$wgExtensionMessagesFiles['GlobalCollectGatewayAlias'] = __DIR__ . '/globalcollect_gateway/globalcollect_gateway.alias.php'; -- To view, visit https://gerrit.wikimedia.org/r/340422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iadf47fda486bfa6cbd1b35c836b34d3f8adc1d96 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Awight Gerrit-Reviewer: AndyRussG Gerrit-Reviewer: Awight Gerrit-Reviewer: Cdentinger Gerrit-Reviewer: Ejegg Gerrit-Reviewer: Ssmith Gerrit-Reviewer: XenoRyet 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]: Phabricator: Start and stop phd by force
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340424 ) Change subject: Phabricator: Start and stop phd by force .. Phabricator: Start and stop phd by force Here https://github.com/wikimedia/puppet/blob/production/modules/phabricator/manifests/init.pp#L279 We start phd by force. It will only work in trusty there so lets do the same in debian jessie for cossitency and to prevent it from failing if we are doing it by force. Also stop phd by force to prevent it from erroring out in case it can't stop phd normally. Change-Id: I1af6fd09259e58ddbd25d620441754d51898fa28 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/24/340424/1 -- To view, visit https://gerrit.wikimedia.org/r/340424 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1af6fd09259e58ddbd25d620441754d51898fa28 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Phabricator: Fix phd not starting up after reboot if it was ...
Dzahn has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340242 ) Change subject: Phabricator: Fix phd not starting up after reboot if it was previously stopped .. Phabricator: Fix phd not starting up after reboot if it was previously stopped If you did systemctl stop phd before reboot, phd would not start after reboot. Also if phd mundanely stopped and you did a reboot thinking that fixed it well it still won't start. This fixes it. The reason why we do =- is because it tells it to ignore any errors that accur during the running command. Bug: T158434 Change-Id: Id4d863934eb6e2406e7e056431f71ccfb589b87d --- M modules/phabricator/templates/initscripts/phd.systemd.erb 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Paladox: Looks good to me, but someone else must approve jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/phabricator/templates/initscripts/phd.systemd.erb b/modules/phabricator/templates/initscripts/phd.systemd.erb index d4140ae..269d8bf 100644 --- a/modules/phabricator/templates/initscripts/phd.systemd.erb +++ b/modules/phabricator/templates/initscripts/phd.systemd.erb @@ -8,7 +8,8 @@ User=phd Group=phd Environment="PHABRICATOR_ENV=phd" - +ExecStartPre=-/usr/bin/mkdir /var/run/phd +ExecStartPre=/usr/bin/chown -R phd:phd /var/run/phd/ ExecStart=/srv/phab/phabricator/bin/phd start ExecStop=/srv/phab/phabricator/bin/phd stop RemainAfterExit=yes -- To view, visit https://gerrit.wikimedia.org/r/340242 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id4d863934eb6e2406e7e056431f71ccfb589b87d Gerrit-PatchSet: 8 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Paladox Gerrit-Reviewer: 20after4 Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: 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]: Centering non-square images
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338528 )
Change subject: Centering non-square images
..
Centering non-square images
Also updating API docs
Bug: T158284
Change-Id: If2d6c00789e562a1e0db36728f364cb4d82897bb
---
M includes/content/CollaborationKitImage.php
M includes/content/CollaborationListContent.php
M modules/ext.CollaborationKit.hub.subpage.styles.less
3 files changed, 75 insertions(+), 32 deletions(-)
Approvals:
jenkins-bot: Verified
Isarra: Looks good to me, approved
diff --git a/includes/content/CollaborationKitImage.php
b/includes/content/CollaborationKitImage.php
index b2936d7..471c95f 100644
--- a/includes/content/CollaborationKitImage.php
+++ b/includes/content/CollaborationKitImage.php
@@ -26,6 +26,8 @@
* @param string $options['fallback'] If the specified image is null or
doesn't exist. Valid
* options are none', a valid icon ID, or an arbitrary string to
use a seed. (Note: if you
* specify a label, then that will serve as the fallback.)
+* @param bool $options['optimizeForSquare'] Fetch an image such that
it's ideal for shoving
+* into a square frame. Default is false. Images with labels
always get optimzed for squares.
* @return string HTML elements or wikitext, depending on
$options['renderAsWikitext']
*/
public static function makeImage( $image, $width, $options = [] ) {
@@ -38,6 +40,7 @@
$colour = isset( $options['colour'] ) ? $options['colour'] : '';
$css = isset( $options['css'] ) ? $options['css'] : '';
$renderAsWikitext = isset( $options['renderAsWikitext'] ) ?
$options['renderAsWikitext'] : false;
+ $optimizeForSquare = isset( $options['optimizeForSquare'] ) ?
$options['optimizeForSquare'] : false;
$label = isset( $options['label'] ) ? $options['label'] : '';
if ( !isset( $options['fallback'] ) ) {
@@ -48,25 +51,37 @@
}
}
+ // If image doesn't exist or is an icon, this will return false.
+ $imageObj = wfFindFile( $image );
+
// Use fallback icon or random icon if stated image doesn't
exist
- if ( $image === null || $image == '' || ( !wfFindFile( $image )
&& !in_array( $image, $cannedIcons ) ) ) {
+ if ( $image === null || $image == '' || ( $imageObj === false
&& !in_array( $image, $cannedIcons ) ) ) {
if ( $options['fallback'] == 'none' ) {
return '';
} elseif ( in_array( $options['fallback'], $cannedIcons
) ) {
$image = $options['fallback'];
} else {
- $image = $cannedIcons[hexdec( sha1(
$options['fallback'] )[0] ) % 27];
+ $image = $cannedIcons[hexdec( sha1(
$options['fallback'] )[0] ) % count( $cannedIcons )];
}
}
$imageCode = '';
// Are we loading an image file or constructing a div based on
an icon class?
- if ( wfFindFile( $image ) ) {
- $imageCode = self::makeImageFromFile( $image, $classes,
$width, $link,
- $renderAsWikitext, $label );
+ if ( $imageObj !== false ) {
+ $squareAdjustmentAxis = null;
+ if ( $optimizeForSquare || $label != '' ) {
+ $fullHeight = $imageObj->getHeight();
+ $fullWidth = $imageObj->getWidth();
+ $ratio = $fullWidth / $fullHeight; // get
ratio of width to height
+ if ( $ratio > 1 ) {
+ $squareAdjustmentAxis = 'x';
+ } elseif ( $ratio < 1 ) { // If image is a
perfect square (ratio == 1) nothing needs to be done
+ $squareAdjustmentAxis = 'y';
+ }
+ }
+ $imageCode = self::makeImageFromFile( $imageObj,
$width, $link, $renderAsWikitext, $label, $squareAdjustmentAxis );
} elseif ( in_array( $image, $cannedIcons ) ) {
- $imageCode = self::makeImageFromIcon( $image, $classes,
$width, $colour,
- $link, $renderAsWikitext, $label );
+ $imageCode = self::makeImageFromIcon( $image, $width,
$colour, $link, $renderAsWikitext, $label );
}
// Finishing up
@@ -76,26 +91,30 @@
}
/**
-* @param $image string
-* @param $classes
-* @param $width
-* @param $link
-* @par
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Cleanup of CollaborationListContent.php
Harej has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340423 )
Change subject: Cleanup of CollaborationListContent.php
..
Cleanup of CollaborationListContent.php
Change-Id: I078470d8eeffb33a5b57cfab8dcbc523fe919c5d
---
M includes/content/CollaborationListContent.php
1 file changed, 2 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/23/340423/1
diff --git a/includes/content/CollaborationListContent.php
b/includes/content/CollaborationListContent.php
index aa0ecc1..e8a47f7 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -25,7 +25,7 @@
const HUMAN_DESC_SPLIT = "\n---\n";
// Splitter denoting the beginning of a list column
const HUMAN_COLUMN_SPLIT = "\n-~-~-\n";
- // Splitter denoting the beginning og the list itself within the column
+ // Splitter denoting the beginning of the list itself within the column
const HUMAN_COLUMN_SPLIT2 = "\n-\n";
/** @var $decoded boolean Have we decoded the data yet */
@@ -108,10 +108,7 @@
// Special handling for DISPLAYMODE
if ( $name == 'DISPLAYMODE' ) {
- if ( $value == 'members' || $value == 'normal' ||
$value == 'error' ) {
- return true;
- }
- return false;
+ return ( $value == 'members' || $value == 'normal' ||
$value == 'error' );
}
// Force intrepretation as boolean for certain options
--
To view, visit https://gerrit.wikimedia.org/r/340423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I078470d8eeffb33a5b57cfab8dcbc523fe919c5d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Harej
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...DonationInterface[master]: Remove deprecated langonly file for loading i18n messages on...
Awight has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/340422 ) Change subject: Remove deprecated langonly file for loading i18n messages on donatewiki .. Remove deprecated langonly file for loading i18n messages on donatewiki Bug: T159098 Change-Id: Iadf47fda486bfa6cbd1b35c836b34d3f8adc1d96 --- D donationinterface_langonly.php 1 file changed, 0 insertions(+), 39 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/22/340422/1 diff --git a/donationinterface_langonly.php b/donationinterface_langonly.php deleted file mode 100644 index c57dca0..000 --- a/donationinterface_langonly.php +++ /dev/null @@ -1,39 +0,0 @@ - 'Donation Interface - Language Only', - 'author' => array( 'Katie Horn', 'Ryan Kaldari' , 'Arthur Richards', 'Matt Walker', 'Adam Wight', 'Peter Gehres', 'Jeremy Postlethwaite' ), - 'version' => '2.0.0', - 'descriptionmsg' => 'donate_interface-langonly-desc', - 'url' => 'https://www.mediawiki.org/wiki/Extension:DonationInterface', -); - -// Load the interface messages that are shared across all gateways -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/gateway_common/i18n/interface'; -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/gateway_common/i18n/countries'; -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/gateway_common/i18n/us-states'; -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/gateway_common/i18n/canada-provinces'; - -// GlobalCollect-specific messaging -$wgMessagesDirs['DonationInterface'][] = __DIR__ . '/globalcollect_gateway/i18n'; -$wgExtensionMessagesFiles['GlobalCollectGatewayAlias'] = __DIR__ . '/globalcollect_gateway/globalcollect_gateway.alias.php'; -- To view, visit https://gerrit.wikimedia.org/r/340422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iadf47fda486bfa6cbd1b35c836b34d3f8adc1d96 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Awight ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Kill unused variable $context
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340418 )
Change subject: Kill unused variable $context
..
Kill unused variable $context
Change-Id: I37e712ccaaf4aee6244863c1463a2eba5e398520
---
M includes/content/CollaborationHubContent.php
1 file changed, 0 insertions(+), 4 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index bf3f983..1fb55df 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -928,10 +928,6 @@
$itemRes[$key] = $value;
break;
default:
- $context = wfEscapeWikiText(
substr( $part, 30 ) );
- if ( strlen( $context ) === 30
) {
- $context .= '...';
- }
throw new
MWContentSerializationException(
'Unrecognized option
for list item:' .
wfEscapeWikiText( $key )
--
To view, visit https://gerrit.wikimedia.org/r/340418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37e712ccaaf4aee6244863c1463a2eba5e398520
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
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]: Kill unused cur variable
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340419 )
Change subject: Kill unused cur variable
..
Kill unused cur variable
Change-Id: I65cb4dfc126f32b001803fb0f470ac487596a13b
---
M modules/ext.CollaborationKit.list.edit.js
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
Harej: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.CollaborationKit.list.edit.js
b/modules/ext.CollaborationKit.list.edit.js
index 65eb8a5..510c9b1 100644
--- a/modules/ext.CollaborationKit.list.edit.js
+++ b/modules/ext.CollaborationKit.list.edit.js
@@ -24,8 +24,7 @@
* @param {jQuery} $item
*/
deleteItem = function ( $item ) {
- var cur,
- spinner,
+ var spinner,
title = $item.data( 'collabkit-item-title' ),
colId = getColId( $item );
@@ -42,7 +41,7 @@
.empty()
.append( spinner );
- cur = getCurrentJson( mw.config.get( 'wgArticleId' ), function
( res ) {
+ getCurrentJson( mw.config.get( 'wgArticleId' ), function ( res
) {
var newItems = [];
$.each( res.content.columns[ colId ].items, function (
index ) {
if ( this.title === title ) {
--
To view, visit https://gerrit.wikimedia.org/r/340419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65cb4dfc126f32b001803fb0f470ac487596a13b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
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] operations/mediawiki-config[master]: Deprecate DonationInterface i18n messages
Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340421 )
Change subject: Deprecate DonationInterface i18n messages
..
Deprecate DonationInterface i18n messages
These should already be included in the cache via the extension-list file.
Bug: T159098
Change-Id: I11c0aa4517dc38d1d163d13177c24242e612286b
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/21/340421/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 773c929..bc8c923 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1887,12 +1887,6 @@
require_once( "$wmfConfigDir/liquidthreads.php" );
}
-if ( $wmgDonationInterface ) {
- // Regular DonationInterface should not be enabled on the WMF cluster.
- // So, only load i18n files for DonationInterface -awjrichards 1
November 2011
- require_once(
"$IP/extensions/DonationInterface/donationinterface_langonly.php" );
-}
-
if ( $wmgUseGlobalUsage ) {
wfLoadExtension( 'GlobalUsage' );
$wgGlobalUsageDatabase = 'commonswiki';
--
To view, visit https://gerrit.wikimedia.org/r/340421
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11c0aa4517dc38d1d163d13177c24242e612286b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Awight
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...VisualEditor[master]: Allow the signature button to work in NWE as well as VE
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/340374 ) Change subject: Allow the signature button to work in NWE as well as VE .. Allow the signature button to work in NWE as well as VE Previously we were only letting the button work in VE-enabled namespaces, which means that on namespaces where you can use NWE but not VE (oh, you know, most of them) the signature button was always disabled, which was somewhat discombobulating. Bug: T159211 Change-Id: I4b3a7e14df78a45a6e3afa49718c0329ca55 --- M VisualEditor.hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Esanders: Looks good to me, approved jenkins-bot: Verified diff --git a/VisualEditor.hooks.php b/VisualEditor.hooks.php index f5e082a..e46e5e4 100644 --- a/VisualEditor.hooks.php +++ b/VisualEditor.hooks.php @@ -701,7 +701,7 @@ 'namespaces' => $availableNamespaces, 'contentModels' => $availableContentModels, 'signatureNamespaces' => array_values( - array_filter( $availableNamespaces, 'MWNamespace::wantSignatures' ) + array_filter( MWNamespace::getValidNamespaces(), 'MWNamespace::wantSignatures' ) ), 'pluginModules' => array_merge( ExtensionRegistry::getInstance()->getAttribute( 'VisualEditorPluginModules' ), -- To view, visit https://gerrit.wikimedia.org/r/340374 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4b3a7e14df78a45a6e3afa49718c0329ca55 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Bartosz Dziewoński Gerrit-Reviewer: Esanders 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]: interface: add rspec boilerplate
Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340420 )
Change subject: interface: add rspec boilerplate
..
interface: add rspec boilerplate
Change-Id: I4af0566bb42b645e2eb508b3c0c80b1e6b09a42f
---
A modules/interface/.fixtures.yml
A modules/interface/.rspec
A modules/interface/Rakefile
A modules/interface/spec/.gitignore
A modules/interface/spec/spec_helper.rb
5 files changed, 18 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/340420/1
diff --git a/modules/interface/.fixtures.yml b/modules/interface/.fixtures.yml
new file mode 100644
index 000..17676a6
--- /dev/null
+++ b/modules/interface/.fixtures.yml
@@ -0,0 +1,5 @@
+fixtures:
+symlinks:
+interface: "#{source_dir}"
+stdlib: "../../../../stdlib"
+wmflib: "../../../../wmflib"
diff --git a/modules/interface/.rspec b/modules/interface/.rspec
new file mode 100644
index 000..f449dae
--- /dev/null
+++ b/modules/interface/.rspec
@@ -0,0 +1,2 @@
+--format doc
+--color
diff --git a/modules/interface/Rakefile b/modules/interface/Rakefile
new file mode 100644
index 000..cd3d379
--- /dev/null
+++ b/modules/interface/Rakefile
@@ -0,0 +1 @@
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/modules/interface/spec/.gitignore
b/modules/interface/spec/.gitignore
new file mode 100644
index 000..76163ab
--- /dev/null
+++ b/modules/interface/spec/.gitignore
@@ -0,0 +1 @@
+/fixtures
diff --git a/modules/interface/spec/spec_helper.rb
b/modules/interface/spec/spec_helper.rb
new file mode 100644
index 000..421fd71
--- /dev/null
+++ b/modules/interface/spec/spec_helper.rb
@@ -0,0 +1,9 @@
+require 'rspec-puppet'
+require 'puppetlabs_spec_helper/module_spec_helper'
+
+fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
+
+RSpec.configure do |c|
+ c.module_path = File.join(fixture_path, 'modules')
+ c.manifest_dir = File.join(fixture_path, 'manifests')
+end
--
To view, visit https://gerrit.wikimedia.org/r/340420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4af0566bb42b645e2eb508b3c0c80b1e6b09a42f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Kill unused cur variable
Brian Wolff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340419 )
Change subject: Kill unused cur variable
..
Kill unused cur variable
Change-Id: I65cb4dfc126f32b001803fb0f470ac487596a13b
---
M modules/ext.CollaborationKit.list.edit.js
1 file changed, 2 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/19/340419/1
diff --git a/modules/ext.CollaborationKit.list.edit.js
b/modules/ext.CollaborationKit.list.edit.js
index 65eb8a5..510c9b1 100644
--- a/modules/ext.CollaborationKit.list.edit.js
+++ b/modules/ext.CollaborationKit.list.edit.js
@@ -24,8 +24,7 @@
* @param {jQuery} $item
*/
deleteItem = function ( $item ) {
- var cur,
- spinner,
+ var spinner,
title = $item.data( 'collabkit-item-title' ),
colId = getColId( $item );
@@ -42,7 +41,7 @@
.empty()
.append( spinner );
- cur = getCurrentJson( mw.config.get( 'wgArticleId' ), function
( res ) {
+ getCurrentJson( mw.config.get( 'wgArticleId' ), function ( res
) {
var newItems = [];
$.each( res.content.columns[ colId ].items, function (
index ) {
if ( this.title === title ) {
--
To view, visit https://gerrit.wikimedia.org/r/340419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I65cb4dfc126f32b001803fb0f470ac487596a13b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Kill unused variable $context
Brian Wolff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340418 )
Change subject: Kill unused variable $context
..
Kill unused variable $context
Change-Id: I37e712ccaaf4aee6244863c1463a2eba5e398520
---
M includes/content/CollaborationHubContent.php
1 file changed, 0 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit
refs/changes/18/340418/1
diff --git a/includes/content/CollaborationHubContent.php
b/includes/content/CollaborationHubContent.php
index bf3f983..1fb55df 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -928,10 +928,6 @@
$itemRes[$key] = $value;
break;
default:
- $context = wfEscapeWikiText(
substr( $part, 30 ) );
- if ( strlen( $context ) === 30
) {
- $context .= '...';
- }
throw new
MWContentSerializationException(
'Unrecognized option
for list item:' .
wfEscapeWikiText( $key )
--
To view, visit https://gerrit.wikimedia.org/r/340418
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37e712ccaaf4aee6244863c1463a2eba5e398520
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.user: Move JS session token from cookie to session...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340236 )
Change subject: mediawiki.user: Move JS session token from cookie to
sessionStorage
..
mediawiki.user: Move JS session token from cookie to sessionStorage
The old cookies will become unused and expiry automatically.
Also add basic unit tests.
Bug: T110353
Change-Id: I6fa98ae797481dfaef95ab1ea996ebf057f8d55d
---
M resources/src/mediawiki/mediawiki.user.js
M tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
2 files changed, 13 insertions(+), 6 deletions(-)
Approvals:
Fomafix: Looks good to me, but someone else must approve
jenkins-bot: Verified
Nuria: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
diff --git a/resources/src/mediawiki/mediawiki.user.js
b/resources/src/mediawiki/mediawiki.user.js
index c4c91f9..d1fa84a 100644
--- a/resources/src/mediawiki/mediawiki.user.js
+++ b/resources/src/mediawiki/mediawiki.user.js
@@ -118,18 +118,18 @@
},
/**
-* Get an automatically generated random ID (stored in a
session cookie)
+* Get an automatically generated random ID (persisted in
sessionStorage)
*
-* This ID is ephemeral for everyone, staying in their browser
only until they close
-* their browser.
+* This ID is ephemeral for everyone, staying in their browser
only until they
+* close their browsing session.
*
* @return {string} Random session ID
*/
sessionId: function () {
- var sessionId = mw.cookie.get( 'mwuser-sessionId' );
- if ( sessionId === null ) {
+ var sessionId = mw.storage.session.get(
'mwuser-sessionId' );
+ if ( !sessionId ) {
sessionId = mw.user.generateRandomSessionId();
- mw.cookie.set( 'mwuser-sessionId', sessionId, {
expires: null } );
+ mw.storage.session.set( 'mwuser-sessionId',
sessionId );
}
return sessionId;
},
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
index 7f6efa0..bc12642 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
@@ -95,6 +95,13 @@
result2 = mw.user.generateRandomSessionId();
assert.notEqual( result, result2, 'different when called
multiple times' );
+ } );
+ QUnit.test( 'sessionId', function ( assert ) {
+ var result = mw.user.sessionId(),
+ result2 = mw.user.sessionId();
+ assert.equal( typeof result, 'string', 'type' );
+ assert.equal( $.trim( result ), result, 'no leading or trailing
whitespace' );
+ assert.equal( result2, result, 'retained' );
} );
}( mediaWiki, jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/340236
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6fa98ae797481dfaef95ab1ea996ebf057f8d55d
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Awight
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Gilles
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Nuria
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
