[MediaWiki-commits] [Gerrit] mediawiki...PageAssessments[master]: Fix wrong class name
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404582 )
Change subject: Fix wrong class name
..
Fix wrong class name
Bug: T185037
Change-Id: I0d2c87a418289dce49054ad8ee4c46b51f39bcda
---
M api/ApiQueryProjectPages.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments
refs/changes/82/404582/1
diff --git a/api/ApiQueryProjectPages.php b/api/ApiQueryProjectPages.php
index dc0c4e5..33edf0d 100644
--- a/api/ApiQueryProjectPages.php
+++ b/api/ApiQueryProjectPages.php
@@ -135,7 +135,7 @@
if ( isset( $params['projects'] ) ) {
// Convert the project names into corresponding IDs
foreach ( $params['projects'] as $project ) {
- $id = PageAssessmentsBody::getProjectId(
$project );
+ $id = PageAssessmentsDAO::getProjectId(
$project );
if ( $id ) {
$this->projectIds[] = $id;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/404582
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d2c87a418289dce49054ad8ee4c46b51f39bcda
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageAssessments
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: More modifications to the form
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/397804 )
Change subject: More modifications to the form
..
More modifications to the form
- Replaces one question with another (string change only)
- Adds a text field as a follow-up question to another (validation dependent)
Bug: T181072
Change-Id: I8f143d7324764f047bd0cdd37b1d4e34efe91114
---
A data/db/migrations/20171212-add-scholarship-orgs-field.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/templates/apply.html
M data/templates/review/view.html
M src/Forms/Apply.php
6 files changed, 29 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/04/397804/1
diff --git a/data/db/migrations/20171212-add-scholarship-orgs-field.sql
b/data/db/migrations/20171212-add-scholarship-orgs-field.sql
new file mode 100644
index 000..903a2ea
--- /dev/null
+++ b/data/db/migrations/20171212-add-scholarship-orgs-field.sql
@@ -0,0 +1,2 @@
+-- Add column for scholarship organizations people apply for
+ALTER TABLE scholarships ADD COLUMN scholarorgs VARCHAR(255) DEFAULT NULL
AFTER separatejury;
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 74523d9..2e43ecf 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -17,6 +17,7 @@
, typeENUM('partial', 'full', 'either') DEFAULT NULL
, chapteragreeTINYINT(1) NOT NULL DEFAULT '0'
, separatejuryTINYINT(1) NOT NULL DEFAULT '0'
+ , scholarorgs VARCHAR(255) DEFAULT NULL
, fname VARCHAR(32) DEFAULT NULL
, lname VARCHAR(32) DEFAULT NULL
, email VARCHAR(64) DEFAULT NULL
diff --git a/data/i18n/en.json b/data/i18n/en.json
index 261706d..4dbb8ef 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -31,7 +31,7 @@
"deadline-passed": "Scholarship application deadline was February
20, 23:59 UTC.\nWe will notify applicants in April 2018 about the result
of their application.\nPlease see the scholarships
page on the wiki for more details.",
- "form-intro": "This is the application for sponsorship to attend https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania
2018, the annual international conference centered on Wikimedia projects.
Awardees will receive a scholarship which will cover conference registration
fees, hotel, and roundtrip travel to Wikimania in Cape Town, South Africa, July
18-22, 2018.\nApplications may be submitted in any language, but
every applicant must provide evidence of English language abilities that
are at a level which would enable them to participate in Wikimania, a
conference which is primarily conducted in English. Sufficient English
abilities could be demonstrated in the application itself or
elsewhere.\nThis is not a scholarship for university study. Applications
not obviously related to the conference will be discarded.\nPlease
carefully consider your financial needs before applying for a scholarship to
attend Wikimania. There are limited funds available and many applicants do not
have the financial means to attend Wikimania without this opportunity. Thank
you.\nPlease note that if you need more then 10 minutes to
complete this application, please draft your answers in a text editor,
reload this page and then copy-paste your answers into corresponding fields
before submitting. This application may give an error (\"Missing or invalid
CSRF token\") if it is open for more then 15 minutes before
submitting.\nThe deadline to apply is February 20, 23:59
UTC. ",
+ "form-intro": "This is the application for sponsorship to attend https://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania
2018, the annual international conference centered on Wikimedia projects.
Awardees will receive a scholarship which will cover conference registration
fees, hotel, and roundtrip travel to Wikimania in Cape Town, South Africa, July
18-22, 2018.\nApplications may be submitted in any language, but
every applicant must provide evidence of English language abilities that
are at a level which would enable them to participate in Wikimania, a
conference which is primarily conducted in English. Sufficient English
abilities could be demonstrated in the application itself or
elsewhere.\nPlease carefully consider your financial needs before
applying for a scholarship to attend Wikimania. There are limited funds
available and many applicants do not have the financial means to attend
Wikimania without this opportunity. Thank you.\nPlease note that
if you need more then 10 minutes to complete this application, please
draft your answers in a text editor, reload this page and then
copy-paste your answers into corresponding fields before submitting. This
application may give an error
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Don't break codemirror if wikEdDiff is enabled, only if wikE...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395529 )
Change subject: Don't break codemirror if wikEdDiff is enabled, only if wikEd
is enabled
..
Don't break codemirror if wikEdDiff is enabled, only if wikEd is enabled
Bug: T178348
Change-Id: If579d4da99f364e73dec5a7e6bed87019431386b
---
M resources/ext.CodeMirror.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/29/395529/1
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index c0770e0..03a84f0 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -302,7 +302,7 @@
// If CodeMirror is already loaded or wikEd gadget is
enabled, abort. See T178348.
// FIXME: Would be good to replace the wikEd check with
something more generic.
- if ( codeMirror || window.wikEd !== undefined ) {
+ if ( codeMirror || mw.user.options.get( 'gadget-wikEd'
) > 0 ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/395529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If579d4da99f364e73dec5a7e6bed87019431386b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Update privacy policy for scholarships app
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394563 )
Change subject: Update privacy policy for scholarships app
..
Update privacy policy for scholarships app
Bug: T181072
Change-Id: Ia2ff18ac9bea3730339b847cde531808a943d8db
---
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/privacy.html
3 files changed, 15 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/63/394563/1
diff --git a/data/i18n/en.json b/data/i18n/en.json
index ca33215..261706d 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -169,7 +169,11 @@
"confirm-thanks": "Thanks!",
"confirm-text": "Thank you for submitting your scholarship application
for Wikimania. Please contact wikimania-scholarsh...@wikimedia.org
with any questions.",
- "privacy-page": "All personal information will be held strictly
confidential by the members of the Wikimania Scholarship Committee and the https://wikimediafoundation.org\";>Wikimedia Foundation, in
accordance to the Wikimedia Foundation https://wikimediafoundation.org/wiki/Privacy_policy\";>privacy
policy.",
+ "privacy-page-1": "This statement describes how and when Wikimedia
collects, uses, and shares the information we receive from scholarship
applicants. Purpose of Form Thank you for your interest in Wikimania
2018! This form is used to apply for partial or full scholarships to attend the
conference. What Information We Collect This form collects the
responses you provide to the questions asked; there are two types of answers:
defined responses, and free-form responses.",
+ "privacy-page-2": "Information Sharing and DisclosureThe
information you submit in these applications will be shared only with the
Wikimedia Foundation staff and contractors, as well as the Wikimania
scholarship team members, who need to process this information in order to
administer the scholarship program, with the exceptions listed below.In
the application, you have the option to allow us to share your information with
Wikimedia movement organizations, such as chapters, user groups, and thematic
organizations, that also offer scholarships. If you indicate that we have your
permission to do so, we will share your application information with movement
organizations for whose scholarships you may be eligible.",
+ "privacy-page-3": "We will publish a list of scholarship recipients’
user names on Meta at https://meta.wikimedia.org/wiki/Grants:TPS/Wikimania_scholars\";>https://meta.wikimedia.org/wiki/Grants:TPS/Wikimania_scholars.
Finally, we may disclose any collected information when required by law,
when we have your permission, when needed to protect our rights, privacy,
safety, users, or the general public, and when necessary to enforce our Terms
of Use or any other Wikimedia policy. Important Information",
+ "privacy-page-4": "Wikimedia is a global organization committed to
promoting free and open knowledge. By completing this application, you agree to
the transfer, storage, and use of the collected information to the United
States and other places as may be necessary to carry out the purposes and
objectives discussed above. You also consent to the transfer of information
from the U.S. to other countries, which may have different or less stringent
data protection laws than your country, in order to carry out the
aforementioned purposes and objectives.",
+ "privacy-page-5": "Wikimedia understands the importance of user
privacy. For this reason, we work to protect our users from the unauthorized
disclosure or use of information we maintain. Information submitted via this
form may be kept indefinitely. See our data retention guidelines for more
information. For questions about this application, or to access or change your
answers, contact mailto:eyo...@wikimedia.org\";>eyo...@wikimedia.org.Thanks again
for your feedback!The Wikimedia Foundation Please note that in the
event of any differences in meaning or interpretation between the original
English version of this Privacy Statement and a translation, the original
English version takes precedence.",
"new-account-subject": "New Wikimania Scholarships account",
"new-account-email": "A new Wikimania Scholarships account has been
created for you.\n\nYour login info is:\n\nusername: $1\npassword: $2\n\nYou
may login at: $3\n\nYou may change your password at:
$4\n\nSincerely,\nWikimania Organizing Team",
diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json
index c5e748d..e154e5f 100644
--- a/data/i18n/qqq.json
+++ b/data/i18n/qqq.json
@@ -152,7 +152,11 @@
"form-email-response": "Email body. Parameters:\n* $1 - Applicant given
name\n* $2 - Applicant surname",
"confirm-thanks": "Thank you page heading.\n{{Identical|Thank}}",
"confirm-text": "Thank you page conte
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Updates for the 2018 round of Wikimania
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394295 )
Change subject: Updates for the 2018 round of Wikimania
..
Updates for the 2018 round of Wikimania
Bug: T181072
Change-Id: Ic4b96d2a41a63a9c5c4a4a92d780a08b80738ad4
---
M .gitignore
A data/db/migrations/20171128-update-questions-2018.sql
M data/db/schema.mysql
M data/i18n/en.json
M data/i18n/qqq.json
M data/templates/apply.html
M data/templates/inc/forms.html
M data/templates/review/view.html
M src/Forms/Apply.php
9 files changed, 61 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships
refs/changes/95/394295/1
diff --git a/.gitignore b/.gitignore
index 86b037e..6a2dea7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
.AppleDouble
.LSOverride
Icon
+.idea/
# Thumbnails
._*
diff --git a/data/db/migrations/20171128-update-questions-2018.sql
b/data/db/migrations/20171128-update-questions-2018.sql
new file mode 100644
index 000..2c08b58
--- /dev/null
+++ b/data/db/migrations/20171128-update-questions-2018.sql
@@ -0,0 +1,11 @@
+-- Alter schema for 2018 round questions
+
+-- Drop unused columns
+ALTER TABLE scholarships DROP COLUMN presentation;
+ALTER TABLE scholarships DROP COLUMN presentationTopic;
+
+-- Add new column for scholarship type
+ALTER TABLE scholarships
+ ADD COLUMN separatejury TINYINT(1) NOT NULL DEFAULT '0' AFTER chapteragree,
+ ADD COLUMN missingKnowledge TEXT DEFAULT NULL AFTER collaboration
+ ;
diff --git a/data/db/schema.mysql b/data/db/schema.mysql
index 4ad70a7..74523d9 100644
--- a/data/db/schema.mysql
+++ b/data/db/schema.mysql
@@ -16,6 +16,7 @@
id INT(11) NOT NULL AUTO_INCREMENT
, typeENUM('partial', 'full', 'either') DEFAULT NULL
, chapteragreeTINYINT(1) NOT NULL DEFAULT '0'
+ , separatejuryTINYINT(1) NOT NULL DEFAULT '0'
, fname VARCHAR(32) DEFAULT NULL
, lname VARCHAR(32) DEFAULT NULL
, email VARCHAR(64) DEFAULT NULL
@@ -52,11 +53,10 @@
, contributionTEXT
, experience TEXT
, collaboration TEXT
+ , missingKnowledgeTEXT
, prev_scholarTINYINT(1) DEFAULT NULL
, last_year_scholar TINYINT(1) DEFAULT NULL
, reports TEXT
- , presentationTINYINT(1) DEFAULT NULL
- , presentationTopic TEXT
, willgetvisa TINYINT(1) NOT NULL DEFAULT '0'
, agreestotravelconditionsTINYINT(1) NOT NULL DEFAULT '0'
, grantfortravelonly TINYINT(1) NOT NULL DEFAULT '0'
diff --git a/data/i18n/en.json b/data/i18n/en.json
index befead1..cbe5c7b 100644
--- a/data/i18n/en.json
+++ b/data/i18n/en.json
@@ -7,8 +7,8 @@
]
},
"wikimania": "Wikimania",
- "wikimania-location-year": "Montréal, Canada 2017",
- "header-title": "Wikimania 2017 - Scholarship application",
+ "wikimania-location-year": "Cape Town, South Africa, 2018",
+ "header-title": "Wikimania 2018 - Scholarship application",
"nav-apply": "Apply",
"nav-faq": "FAQ",
@@ -27,16 +27,16 @@
"mock": "This is a mock scholarship application site only, use it just
for testing.",
- "not-open": "The 2017 Wikimania Scholarship process is not yet open.
For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>About
Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships\";>About
Scholarships\n",
+ "not-open": "The 2018 Wikimania Scholarship process is not yet open.
For more information, see:\n\nhttps://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>About
Wikimania\nhttps://wikimania2018.wikimedia.org/wiki/Special:MyLanguage/Scholarships\";>About
Scholarships\n",
- "deadline-passed": "Scholarship application deadline was February
20, 23:59 UTC.\nWe will notify applicants in April 2017 about the result
of their application.\nPlease see the scholarships
page on the wiki for more details.",
+ "deadline-passed": "Scholarship application deadline was February
20, 23:59 UTC.\nWe will notify applicants in April 2018 about the result
of their application.\nPlease see the scholarships
page on the wiki for more details.",
- "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania
2017, the annual international conference centered on Wikimedia projects.
Awardees will receive a scholarship which will cover conference registration
fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada, Aug
9-13, 2017.\nApplications may be submitted in any language, but
every applicant mu
[MediaWiki-commits] [Gerrit] mediawiki...CentralAuth[master]: Turn lowercase initial letter in usernames to uppercase befo...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/392176 )
Change subject: Turn lowercase initial letter in usernames to uppercase before
querying
..
Turn lowercase initial letter in usernames to uppercase before querying
Lowercase usernames and no longer in use.
Bug: T180858
Change-Id: Ia6898dba0dc31345c97da65fe217e9048702bc6b
---
M includes/api/ApiQueryGlobalAllUsers.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/76/392176/1
diff --git a/includes/api/ApiQueryGlobalAllUsers.php
b/includes/api/ApiQueryGlobalAllUsers.php
index 38c4e3d..136e0da 100644
--- a/includes/api/ApiQueryGlobalAllUsers.php
+++ b/includes/api/ApiQueryGlobalAllUsers.php
@@ -51,6 +51,7 @@
* @return string
*/
private function getCanonicalUserName( $name ) {
+ $name = ucfirst( $name );
return str_replace( '_', ' ', $name );
}
--
To view, visit https://gerrit.wikimedia.org/r/392176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6898dba0dc31345c97da65fe217e9048702bc6b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralAuth
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Make textbox height flexible with CodeMirror
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/389646 )
Change subject: Make textbox height flexible with CodeMirror
..
Make textbox height flexible with CodeMirror
Bug: T170906
Bug: T176449 (hopefully)
Change-Id: Ic0ac663c413db5c29ae786d3c17f7396ad620226
---
M resources/ext.CodeMirror.js
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/46/389646/1
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index aedb1b6..7ba66db 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -324,6 +324,13 @@
$codeMirror = $( codeMirror.getWrapperElement() );
+ $codeMirror.resizable({
+ handles: 'se',
+ resize: function(event, ui) {
+ ui.size.width = ui.originalSize.width;
+ }
+ });
+
codeMirror.doc.setSelection(
codeMirror.doc.posFromIndex( selectionEnd ), codeMirror.doc.posFromIndex(
selectionStart ) );
codeMirror.scrollTo( null, scrollTop );
--
To view, visit https://gerrit.wikimedia.org/r/389646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0ac663c413db5c29ae786d3c17f7396ad620226
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Disable spellchecking for Firefox users on non-Mac systems
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/382023 )
Change subject: Disable spellchecking for Firefox users on non-Mac systems
..
Disable spellchecking for Firefox users on non-Mac systems
Bug: T95104
Change-Id: I86dbee82def94a38156f090d519f969f221c72e1
---
M resources/ext.CodeMirror.js
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/23/382023/1
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 7183450..5fa0549 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -1,6 +1,6 @@
( function ( mw, $ ) {
var origTextSelection, useCodeMirror, codeMirror, api,
originHooksTextarea,
- wikiEditorToolbarEnabled;
+ wikiEditorToolbarEnabled, spellcheck = true;
if ( mw.config.get( 'wgCodeEditorCurrentLanguage' ) ) { // If the
CodeEditor is used then just exit;
return;
@@ -16,6 +16,13 @@
wikiEditorToolbarEnabled = !!mw.loader.getState( 'ext.wikiEditor' ) &&
// This can be the string "0" if the user disabled the
preference - Bug T54542#555387
mw.user.options.get( 'usebetatoolbar' ) > 0;
+
+ // Disable spellchecking for Firefox users on non-Mac systems (Bug
T95104)
+ if ( navigator.userAgent.indexOf( "Firefox" ) > -1 &&
+ navigator.userAgent.indexOf( "Mac" ) == -1
+ ) {
+ spellcheck = false;
+ }
// T174055: Do not redefine the browser history navigation keys
(T175378: for PC only)
CodeMirror.keyMap.pcDefault[ 'Alt-Left' ] = false;
@@ -376,8 +383,8 @@
Home: 'goLineLeft',
End: 'goLineRight'
},
- inputStyle: 'contenteditable',
- spellcheck: true,
+ inputStyle: spellcheck ? 'contenteditable' :
'textarea',
+ spellcheck: !!spellcheck,
viewportMargin: Infinity
} );
--
To view, visit https://gerrit.wikimedia.org/r/382023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86dbee82def94a38156f090d519f969f221c72e1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.1]: Revert "RCFilters: Don't apply/clear highlights 66 times"
Hello Jack Phoenix, Catrope, Sbisson, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/381818
to review the following change.
Change subject: Revert "RCFilters: Don't apply/clear highlights 66 times"
..
Revert "RCFilters: Don't apply/clear highlights 66 times"
This reverts commit 9f035c6a426c145794f141e233d584793e8bebf2.
Change-Id: I71330b014809331030d291b54df1799631db3994
---
M resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/18/381818/1
diff --git
a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index fdea5ef..3b882a6 100644
--- a/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@ -1026,14 +1026,12 @@
enable = enable === undefined ? !this.highlightEnabled : enable;
if ( this.highlightEnabled !== enable ) {
- // HACK make sure highlights are disabled globally
while we toggle on the items,
- // otherwise we'll call clearHighlight() and
applyHighlight() many many times
- this.highlightEnabled = false;
+ this.highlightEnabled = enable;
+
this.getItems().forEach( function ( filterItem ) {
filterItem.toggleHighlight(
this.highlightEnabled );
}.bind( this ) );
- this.highlightEnabled = enable;
this.emit( 'highlightChange', this.highlightEnabled );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/381818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I71330b014809331030d291b54df1799631db3994
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.1
Gerrit-Owner: Niharika29
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Sbisson
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...jouncebot[master]: Update a message and add some more humor
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/380437 )
Change subject: Update a message and add some more humor
..
Update a message and add some more humor
Change-Id: Ib663d06f947750a095119219db2372563ace0d20
---
M DefaultConfig.yaml
M jouncebot.py
2 files changed, 14 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bots/jouncebot
refs/changes/37/380437/1
diff --git a/DefaultConfig.yaml b/DefaultConfig.yaml
index 0094c41..21a5af2 100644
--- a/DefaultConfig.yaml
+++ b/DefaultConfig.yaml
@@ -23,11 +23,22 @@
- 'Deploy window {event.window} ({event.url})'
deployer:
- '{deployers}: How many deployers does it take to do {event.window}
deploy? ({event.url}).'
-- '{deployers}: Time to pull up your socks and deploy {event.window}. Get
on with it. ({event.url}).'
+- '{deployers}: Time to snap out of that daydream and deploy
{event.window}. Get on with it. ({event.url}).'
- '{deployers}: Dear deployers, time to do the {event.window} deploy. Dont
look at me like that. You signed up for it. ({event.url}).'
- '{deployers}: It is that lovely time of the day again! You are hereby
commanded to deploy {event.window}. ({event.url}).'
- '{deployers}: (Dis)respected human, time to deploy {event.window}
({event.url}). Please do the needful.'
+- '{deployers}: Your horoscope predicts another unfortunate {event.window}
deploy. May Zuul be (nice) with you. ({event.url}).'
+- '{deployers}: My dear minions, it''s time we take the moon! Just
kidding. Time for {event.window} deploy. ({event.url}).'
+- '{deployers}: I, the Bot under the Fountain, allow thee, The Deployer,
to do {event.window} deploy. ({event.url}).'
+- '{deployers}: That opportune time is upon us again. Time for a
{event.window} deploy. Don''t be afraid. ({event.url}).'
+- '{deployers}: I seem to be stuck in Groundhog week. Sigh. Time for (yet
another) {event.window} deploy. ({event.url}).'
+- '{deployers}: #bothumor Q:How do functions break up? A:They stop calling
each other. Rise for {event.window} deploy. ({event.url}).'
+- '{deployers}: #bothumor Q:Why did functions stop calling each other?
A:They had arguments. Rise for {event.window} . ({event.url}).'
+- '{deployers}: #bothumor When your hammer is PHP, everything starts
looking like a thumb. Rise for {event.window}. ({event.url}).'
+- '{deployers}: #bothumor My software never has bugs. It just develops
random features. Rise for {event.window}. ({event.url}).'
+- '{deployers}: #bothumor I � Unicode. All rise for {event.window} deploy.
({event.url}).'
+
owner:
-- '{owners}: A patch you scheduled for {event.window} is about to be
deployed. Please be around during the process. Note: If you break the wikis,
you will be rewarded with a sticker.'
+- '{owners}: A patch you scheduled for {event.window} is about to be
deployed. Please be around during the process. Note: If you break AND fix the
wikis, you will be rewarded with a sticker.'
debug: false
diff --git a/jouncebot.py b/jouncebot.py
index 0f35456..4a78347 100755
--- a/jouncebot.py
+++ b/jouncebot.py
@@ -216,7 +216,7 @@
else:
self.connection.privmsg(
self.channel,
-'No patches in the queue for this window. Wh!'
+'No GERRIT patches in the queue for this window, AFAICS.
¯\_(ツ)_/¯'
)
def multiline(self, conn, nick, text):
--
To view, visit https://gerrit.wikimedia.org/r/380437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib663d06f947750a095119219db2372563ace0d20
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bots/jouncebot
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SiteMatrix[master]: Add some docs for SiteMatrixApi
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/379832 )
Change subject: Add some docs for SiteMatrixApi
..
Add some docs for SiteMatrixApi
Change-Id: I59ed4a7a95074786df89bf3798acec062aeca35f
---
M SiteMatrixApi.php
1 file changed, 46 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SiteMatrix
refs/changes/32/379832/1
diff --git a/SiteMatrixApi.php b/SiteMatrixApi.php
index 2debcdd..891bc06 100644
--- a/SiteMatrixApi.php
+++ b/SiteMatrixApi.php
@@ -6,19 +6,31 @@
*/
class ApiSiteMatrix extends ApiBase {
+ /**
+* ApiSiteMatrix constructor.
+*
+* @param \ApiMain $main
+* @param string $moduleName
+*/
public function __construct( ApiMain $main, $moduleName ) {
parent::__construct( $main, $moduleName, 'sm' );
}
+ /**
+* Execute API request
+*/
public function execute() {
$result = $this->getResult();
$matrix = new SiteMatrix();
+ // Fetch list of language codes and names
$langNames = Language::fetchLanguageNames();
$matrix_out = [ 'count' => $matrix->getCount() ];
+ // Fetch list of language names in given language, if they exist
$localLanguageNames = Language::fetchLanguageNames(
$this->getLanguage()->getCode() );
+ // Extract request params
$params = $this->extractRequestParams();
$type = array_flip( $params['type'] );
$state = array_flip( $params['state'] );
@@ -37,6 +49,7 @@
$nonglobal = isset( $state['nonglobal'] );
$count = 0;
+ // For smtype=language, fetch info about all language wikis
if ( isset( $type['language'] ) && $continue[0] == 'language' )
{
foreach ( $matrix->getLangList() as $lang ) {
$langhost = str_replace( '_', '-', $lang );
@@ -47,17 +60,21 @@
$this->setContinueEnumParameter(
'continue', "language|$langhost" );
break;
}
+ // Compute the language property values to
return
$language = [
- 'code' => $langhost,
- 'name' => isset( $langNames[$lang] ) ?
$langNames[$lang] : null,
- 'site' => [],
- 'dir' => Language::factory( $langhost
)->getDir()
+ 'code' => $langhost, // Language code
+ 'name' => isset( $langNames[$lang] ) ?
$langNames[$lang] : null, // Language name
+ 'site' => [], // Site(s) info (see
below)
+ 'dir' => Language::factory( $langhost
)->getDir() // Language direction
];
+ // Add language name in local language, if
available
if ( isset( $localLanguageNames[$lang] ) ) {
$language['localname'] =
$localLanguageNames[$lang];
}
+ // Return stuff user asked for
$language = array_intersect_key( $language,
$langProp );
+ // Generate site information
if ( isset( $language['site'] ) ) {
foreach ( $matrix->getSites() as $site
) {
if ( $matrix->exist( $lang,
$site ) ) {
@@ -69,11 +86,12 @@
$url =
$matrix->getCanonicalUrl( $lang, $site );
$site_out = [
- 'url' => $url,
- 'dbname' =>
$matrix->getDBName( $lang, $site ),
- 'code' => $site,
- 'sitename' =>
$matrix->getSitename( $lang, $site ),
+ 'url' => $url,
// Website url
+ 'dbname' =>
$matrix->getDBName( $lang, $site ), // Shortcode for the wiki
+ 'code' =>
$site, // Wiki type (wiktionary, wiki, wikibooks etc.)
+ 'sitename' =>
[MediaWiki-commits] [Gerrit] mediawiki...SiteMatrix[master]: Add language direction to SiteMatrix API output
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/379690 )
Change subject: Add language direction to SiteMatrix API output
..
Add language direction to SiteMatrix API output
This is required for auto-updation of the rtl dblist.
Bug: T172337
Change-Id: I9e4e6426988f7f0375875bfb96948033750dd105
---
M SiteMatrixApi.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SiteMatrix
refs/changes/90/379690/1
diff --git a/SiteMatrixApi.php b/SiteMatrixApi.php
index 8180565..2debcdd 100644
--- a/SiteMatrixApi.php
+++ b/SiteMatrixApi.php
@@ -51,6 +51,7 @@
'code' => $langhost,
'name' => isset( $langNames[$lang] ) ?
$langNames[$lang] : null,
'site' => [],
+ 'dir' => Language::factory( $langhost
)->getDir()
];
if ( isset( $localLanguageNames[$lang] ) ) {
$language['localname'] =
$localLanguageNames[$lang];
@@ -198,9 +199,10 @@
'code',
'name',
'site',
+ 'dir',
'localname',
],
- ApiBase::PARAM_DFLT =>
'code|name|site|localname',
+ ApiBase::PARAM_DFLT =>
'code|name|site|dir|localname',
],
'siteprop' => [
ApiBase::PARAM_ISMULTI => true,
--
To view, visit https://gerrit.wikimedia.org/r/379690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e4e6426988f7f0375875bfb96948033750dd105
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SiteMatrix
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Make LoginNotify email notifications on by default
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378286 )
Change subject: Make LoginNotify email notifications on by default
..
Make LoginNotify email notifications on by default
Bug: T174263
Change-Id: Idd086904a419ac2ba65707b5c90ceae5e79c35ec
---
M extension.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/86/378286/1
diff --git a/extension.json b/extension.json
index 84334b1..90920e8 100644
--- a/extension.json
+++ b/extension.json
@@ -15,9 +15,9 @@
},
"DefaultUserOptions": {
"echo-subscriptions-web-login-fail": true,
- "echo-subscriptions-email-login-fail": false,
+ "echo-subscriptions-email-login-fail": true,
"echo-subscriptions-web-login-success": false,
- "echo-subscriptions-email-login-success": false
+ "echo-subscriptions-email-login-success": true
},
"MessagesDirs": {
"LoginNotify": [
--
To view, visit https://gerrit.wikimedia.org/r/378286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd086904a419ac2ba65707b5c90ceae5e79c35ec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[wmf/1.30.0-wmf.18]: Register Eventlogging schema
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378125 )
Change subject: Register Eventlogging schema
..
Register Eventlogging schema
Bug: T175756
Change-Id: Icf48d609ce7dd6117137a066e87eb08fe8ee981d
(cherry picked from commit dbabca174c5d040d47503877aacc3a3c34a3a92a)
---
M extension.json
M includes/Hooks.php
2 files changed, 26 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow
refs/changes/25/378125/1
diff --git a/extension.json b/extension.json
index 7b53a0e..3448f74 100644
--- a/extension.json
+++ b/extension.json
@@ -12,7 +12,8 @@
"Hooks": {
"CustomEditor":
"ArticleCreationWorkflow\\Hooks::onCustomEditor",
"ShowMissingArticle":
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle",
- "BeforePageDisplay":
"ArticleCreationWorkflow\\Hooks::onBeforePageDisplay"
+ "BeforePageDisplay":
"ArticleCreationWorkflow\\Hooks::onBeforePageDisplay",
+ "EventLoggingRegisterSchemas":
"ArticleCreationWorkflow\\Hooks::onEventLoggingRegisterSchemas"
},
"AutoloadClasses": {
"ArticleCreationWorkflow\\Hooks": "includes/Hooks.php",
@@ -42,6 +43,15 @@
"ArticleCreationLandingPage": {
"description": "The name of the wiki page to which
users should be redirected if intercepted.",
"value": "Project:Article wizard"
+ },
+ "ArticleCreationEventLoggingSchemas": {
+ "value": {
+ "ArticleCreationWorkflow": {
+ "enabled": true,
+ "revision": 17145434
+ }
+ },
+ "merge_strategy": "array_plus_2d"
}
},
"ConfigRegistry": {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 5c92238..22d131f 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -84,4 +84,19 @@
$out->addModules( 'ext.acw.eventlogging' );
}
}
+
+ /**
+* EventLoggingRegisterSchemas hook handler
+* Register our eventlogging schema
+*
+* @param array &$schemas Schemas array for eventlogging
+*/
+ public static function onEventLoggingRegisterSchemas( array &$schemas )
{
+ global $wgArticleCreationEventLoggingSchemas;
+ foreach ( $wgArticleCreationEventLoggingSchemas as $schema =>
$property ) {
+ if ( $property['enabled'] ) {
+ $schemas[$schema] = $property['revision'];
+ }
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/378125
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf48d609ce7dd6117137a066e87eb08fe8ee981d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: wmf/1.30.0-wmf.18
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Turn on native CodeMirror spellcheck feature
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/378076 ) Change subject: Turn on native CodeMirror spellcheck feature .. Turn on native CodeMirror spellcheck feature It's not fullproof. There's bugs where it forgets a string is misspelled after re-rendering. But it's better than nothing. Change-Id: I33718a71ff5734912ac59be2cd9575dd662ec2f7 --- M resources/ext.CodeMirror.js 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/76/378076/1 diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js index 833fe86..42f26ad 100644 --- a/resources/ext.CodeMirror.js +++ b/resources/ext.CodeMirror.js @@ -376,6 +376,8 @@ Home: 'goLineLeft', End: 'goLineRight' }, + inputStyle: "contenteditable", + spellcheck: true, viewportMargin: Infinity } ); -- To view, visit https://gerrit.wikimedia.org/r/378076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33718a71ff5734912ac59be2cd9575dd662ec2f7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia...jouncebot[master]: Make jouncebot evil
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377945 )
Change subject: Make jouncebot evil
..
Make jouncebot evil
Change-Id: I961ec920658c0d435299bc61d9253e498dd6e538
---
M DefaultConfig.yaml
M jouncebot.py
2 files changed, 9 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bots/jouncebot
refs/changes/45/377945/1
diff --git a/DefaultConfig.yaml b/DefaultConfig.yaml
index 43483d2..0094c41 100644
--- a/DefaultConfig.yaml
+++ b/DefaultConfig.yaml
@@ -22,9 +22,12 @@
generic:
- 'Deploy window {event.window} ({event.url})'
deployer:
-- '{deployers}: Dear anthropoid, the time has come. Please deploy
{event.window} ({event.url}).'
-- '{deployers}: Respected human, time to deploy {event.window}
({event.url}). Please do the needful.'
+- '{deployers}: How many deployers does it take to do {event.window}
deploy? ({event.url}).'
+- '{deployers}: Time to pull up your socks and deploy {event.window}. Get
on with it. ({event.url}).'
+- '{deployers}: Dear deployers, time to do the {event.window} deploy. Dont
look at me like that. You signed up for it. ({event.url}).'
+- '{deployers}: It is that lovely time of the day again! You are hereby
commanded to deploy {event.window}. ({event.url}).'
+- '{deployers}: (Dis)respected human, time to deploy {event.window}
({event.url}). Please do the needful.'
owner:
-- '{owners}: A patch you scheduled for {event.window} is about to be
deployed. Please be available during the process.'
+- '{owners}: A patch you scheduled for {event.window} is about to be
deployed. Please be around during the process. Note: If you break the wikis,
you will be rewarded with a sticker.'
debug: false
diff --git a/jouncebot.py b/jouncebot.py
index ec8fb06..0f35456 100755
--- a/jouncebot.py
+++ b/jouncebot.py
@@ -205,11 +205,10 @@
deployers = False
msg = random.choice(self.config['messages']['generic'])
+self.connection.privmsg(
+ self.channel, msg.format(deployers=deployers, event=event)
+)
if len(event.owners) > 0:
-# Don't ping deployers unless there are patches to be deployed
-self.connection.privmsg(
-self.channel, msg.format(deployers=deployers, event=event)
-)
owners = comma_join(event.owners)
msg = random.choice(self.config['messages']['owner'])
self.connection.privmsg(
--
To view, visit https://gerrit.wikimedia.org/r/377945
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I961ec920658c0d435299bc61d9253e498dd6e538
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/bots/jouncebot
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Register Eventlogging schema
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377926 )
Change subject: Register Eventlogging schema
..
Register Eventlogging schema
Bug: T175756
Change-Id: Icf48d609ce7dd6117137a066e87eb08fe8ee981d
---
M extension.json
1 file changed, 3 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow
refs/changes/26/377926/1
diff --git a/extension.json b/extension.json
index 7b53a0e..ac0cd7a 100644
--- a/extension.json
+++ b/extension.json
@@ -34,6 +34,9 @@
]
}
},
+ "EventLoggingSchemas": {
+ "ArticleCreationWorkflow": 17145434
+ },
"config": {
"ArticleCreationWorkflows": {
"description": "Describes conditions when new page
creation should be intercepted. See doc/config.txt for details.",
--
To view, visit https://gerrit.wikimedia.org/r/377926
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf48d609ce7dd6117137a066e87eb08fe8ee981d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Add back eventlogging since we're doing the landing page onc...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/377658 )
Change subject: Add back eventlogging since we're doing the landing page once
more
..
Add back eventlogging since we're doing the landing page once more
Bug: T175613
Change-Id: Ibd9515c68696f53dd1f195bf7579979e0d743f93
---
M extension.json
M includes/Hooks.php
A modules/ext.acw.eventlogging.js
3 files changed, 34 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow
refs/changes/58/377658/1
diff --git a/extension.json b/extension.json
index 77506ea..cd99f50 100644
--- a/extension.json
+++ b/extension.json
@@ -2,7 +2,7 @@
"manifest_version": 2,
"name": "ArticleCreationWorkflow",
"type": "other",
- "author": [ "Max Semenik" ],
+ "author": [ "Max Semenik", "Niharika Kohli" ],
"url":
"https://www.mediawiki.org/wiki/Extension:ArticleCreationWorkflow";,
"descriptionmsg": "acw-desc",
"license-name": "MIT",
@@ -22,6 +22,17 @@
"i18n"
]
},
+ "ResourceFileModulePaths": {
+ "localBasePath": "modules",
+ "remoteExtPath": "ArticleCreationWorkflow/modules"
+ },
+ "ResourceModules": {
+ "ext.acw.eventlogging": {
+ "scripts": [
+ "ext.acw.eventlogging.js"
+ ]
+ }
+ },
"config": {
"ArticleCreationWorkflows": {
"description": "Describes conditions when new page
creation should be intercepted. See doc/config.txt for details.",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 7d0460c..49e9693 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -31,6 +31,7 @@
// If the landing page didn't exist, we wouldn't have
intercepted.
$redirTo = $workflow->getLandingPageTitle();
$output = $article->getContext()->getOutput();
+ $output->addModules( 'ext.acw.eventlogging' );
$output->redirect( $redirTo->getFullURL(
[ 'page' => $title->getPrefixedText(), 'wprov'
=> 'acww1' ]
) );
@@ -62,6 +63,7 @@
// If the landing page didn't exist, we wouldn't have
intercepted.
$redirTo = $workflow->getLandingPageTitle();
$output = $article->getContext()->getOutput();
+ $output->addModules( 'ext.acw.eventlogging' );
$output->redirect( $redirTo->getFullURL(
[ 'page' => $title->getPrefixedText(), 'wprov'
=> 'acww1' ]
) );
diff --git a/modules/ext.acw.eventlogging.js b/modules/ext.acw.eventlogging.js
new file mode 100644
index 000..23e08dd
--- /dev/null
+++ b/modules/ext.acw.eventlogging.js
@@ -0,0 +1,20 @@
+/*
+ Track link clicks on Special:CreatePage
+ */
+
+( function ( $, mw ) {
+
+ function trackData( interactionType, link, sampling ) {
+ mw.track( 'event.ArticleCreationWorkflow', {
+ interactionType: interactionType,
+ link: link,
+ sampling: sampling || 1
+ } );
+ }
+
+ $( 'html' ).on( 'click', '#bodyContent a', function ( event ) {
+ var link = $( this ).attr( 'href' );
+ trackData( 'click', link );
+ } );
+
+} ( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/377658
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd9515c68696f53dd1f195bf7579979e0d743f93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
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 responsive reference columns on Wikitionaries and Wik...
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376573 ) Change subject: Enable responsive reference columns on Wikitionaries and Wikivoyages .. Enable responsive reference columns on Wikitionaries and Wikivoyages Change-Id: I3830ce6d32e176223ebe22244fde574c472b9690 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3a9dd7b..3b26692 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14962,9 +14962,10 @@ 'mswiki' => true, // T165247 'nowiki' => true, // T160362 - 'enwiktionary' => true, // T160933 - - 'wikiquote' => true, // T159895 + // Wiki families + 'wiktionary' => true, // T159895 overall, T160933 for enwikt + 'wikiquote' => true, // T159895 overall + 'wikivoyage' => true, // T159895 overall ], 'wmgUseRSSExtension' => [ -- To view, visit https://gerrit.wikimedia.org/r/376573 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3830ce6d32e176223ebe22244fde574c472b9690 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jforrester Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: Urbanecm 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...ArticleCreationWorkflow[wmf/1.30.0-wmf.17]: Skip the landing page for redlinks completely and take user ...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376638 )
Change subject: Skip the landing page for redlinks completely and take user to
AfC
..
Skip the landing page for redlinks completely and take user to AfC
Bug: T173605
Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
(cherry picked from commit 7e0294e284fc6d9c4a1ca7698c8bad41d0a0fbab)
---
M extension.json
M includes/Hooks.php
2 files changed, 32 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow
refs/changes/38/376638/1
diff --git a/extension.json b/extension.json
index 5ac4979..8309ffa 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,8 @@
"MediaWiki": ">= 1.30.0-alpha"
},
"Hooks": {
- "AlternateEdit":
"ArticleCreationWorkflow\\Hooks::onAlternateEdit"
+ "AlternateEdit":
"ArticleCreationWorkflow\\Hooks::onAlternateEdit",
+ "ShowMissingArticle":
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle"
},
"AutoloadClasses": {
"ArticleCreationWorkflow\\Hooks": "includes/Hooks.php",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 93ca6e8..08e8b2d 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,6 +4,7 @@
use EditPage;
use MediaWiki\MediaWikiServices;
+use Article;
/**
* Hook handlers
@@ -11,7 +12,7 @@
class Hooks {
/**
* AlternateEdit hook handler
-* Redirects users attempting to create pages to Special:CreatePage,
based on configuration
+* Redirects users attempting to create pages to the landing page,
based on configuration
*
* @see https://www.mediawiki.org/wiki/Manual:Hooks/AlternateEdit
*
@@ -38,4 +39,32 @@
return true;
}
+
+ /**
+* ShowMissingArticle hook handler
+* If article doesn't exist, redirect non-autoconfirmed users to AfC
+*
+* @see https://www.mediawiki.org/wiki/Manual:Hooks/ShowMissingArticle
+*
+* @param Article $article Article instance
+* @return bool
+*/
+ public static function onShowMissingArticle( Article $article ) {
+ $config = MediaWikiServices::getInstance()
+ ->getConfigFactory()
+ ->makeConfig( 'ArticleCreationWorkflow' );
+ $workflow = new Workflow( $config );
+ $editPage = new EditPage( $article );
+ if ( $workflow->shouldInterceptEditPage( $editPage ) &&
+ !$editPage->getContext()->getUser()->isAnon()
+ ) {
+ $title = $editPage->getTitle();
+ // If the landing page didn't exist, we wouldn't have
intercepted.
+ $redirTo = $workflow->getLandingPageTitle();
+ $output = $editPage->getContext()->getOutput();
+ $output->redirect( $redirTo->getFullURL(
+ [ 'page' => $title->getPrefixedText(), 'wprov'
=> 'acww1' ]
+ ) );
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/376638
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: wmf/1.30.0-wmf.17
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Skip the landing page for redlinks completely and take user ...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376588 )
Change subject: Skip the landing page for redlinks completely and take user to
AfC
..
Skip the landing page for redlinks completely and take user to AfC
Bug: T173605
Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
---
M extension.json
M includes/Hooks.php
2 files changed, 22 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow
refs/changes/88/376588/1
diff --git a/extension.json b/extension.json
index 5ac4979..8309ffa 100644
--- a/extension.json
+++ b/extension.json
@@ -10,7 +10,8 @@
"MediaWiki": ">= 1.30.0-alpha"
},
"Hooks": {
- "AlternateEdit":
"ArticleCreationWorkflow\\Hooks::onAlternateEdit"
+ "AlternateEdit":
"ArticleCreationWorkflow\\Hooks::onAlternateEdit",
+ "ShowMissingArticle":
"ArticleCreationWorkflow\\Hooks::onShowMissingArticle"
},
"AutoloadClasses": {
"ArticleCreationWorkflow\\Hooks": "includes/Hooks.php",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 93ca6e8..e122efa 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -4,6 +4,7 @@
use EditPage;
use MediaWiki\MediaWikiServices;
+use Article;
/**
* Hook handlers
@@ -38,4 +39,23 @@
return true;
}
+
+ public static function onShowMissingArticle( Article $article ) {
+ $config = MediaWikiServices::getInstance()
+ ->getConfigFactory()
+ ->makeConfig( 'ArticleCreationWorkflow' );
+ $workflow = new Workflow( $config );
+ $editPage = new EditPage( $article );
+ if ( $workflow->shouldInterceptEditPage( $editPage ) ) {
+ $title = $editPage->getTitle();
+ // If the landing page didn't exist, we wouldn't have
intercepted.
+ $redirTo = $workflow->getLandingPageTitle();
+ $output = $editPage->getContext()->getOutput();
+ $output->redirect( $redirTo->getFullURL(
+ [ 'page' => $title->getPrefixedText(), 'wprov'
=> 'acww1' ]
+ ) );
+ return false;
+ }
+ return true;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/376588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fbff4840bf324ee5579d3bd7220212189b45b0f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Configure ACW for Beta cluster
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376431 )
Change subject: Configure ACW for Beta cluster
..
Configure ACW for Beta cluster
Bug: T175054
Change-Id: I398c5c4337121a8e447cb37366aef86732fb5337
---
M wmf-config/CommonSettings-labs.php
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/31/376431/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 6feaf4d..a897376 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -336,6 +336,12 @@
$wgLoginNotifyAttemptsNewIP = 1;
}
+
+if ( $wmgUseArticleCreationWorkflow ) {
+ wfLoadExtension( 'ArticleCreationWorkflow' );
+ $wgArticleCreationWorkflows = [[ 'namespaces' => [0], 'excludeRight' =>
'sysop' ]];
+}
+
$wgStructuredChangeFiltersEnableExperimentalViews = true;
$wgStructuredChangeFiltersEnableLiveUpdate = true;
--
To view, visit https://gerrit.wikimedia.org/r/376431
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I398c5c4337121a8e447cb37366aef86732fb5337
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Use wprov to record number of people redirected
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376086 ) Change subject: Use wprov to record number of people redirected .. Use wprov to record number of people redirected Bug: T175036 Change-Id: Ibc9be76b62d4f079ae5b08983369290270f4d664 --- M includes/Hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow refs/changes/86/376086/1 diff --git a/includes/Hooks.php b/includes/Hooks.php index 38fa739..de4091c 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -29,7 +29,7 @@ // If the landing page didn't exist, we wouldn't have intercepted. $redirTo = $workflow->getLandingPageTitle(); $output = $editPage->getContext()->getOutput(); - $output->redirect( $redirTo->getFullURL( [ 'page' => $title->getPrefixedText() ] ) ); + $output->redirect( $redirTo->getFullURL( [ 'page' => $title->getPrefixedText(), 'wprov' => 'acww1' ] ) ); return false; } -- To view, visit https://gerrit.wikimedia.org/r/376086 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibc9be76b62d4f079ae5b08983369290270f4d664 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Render everything as long as user doesn't start typing/movin...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376081 )
Change subject: Render everything as long as user doesn't start typing/moving
cursor
..
Render everything as long as user doesn't start typing/moving cursor
Bug: T174480
Change-Id: I106b1d0d2a68e8ba2b346fd6aaf06b530d18f8d4
---
M resources/ext.CodeMirror.js
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/81/376081/1
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 072df3c..08dc45b 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -371,8 +371,14 @@
// T174055: Do not redefine the browser
history navigation keys
'Alt-Left': false,
'Alt-Right': false
- }
+ },
+ viewportMargin: Infinity
} );
+
+ codeMirror.on( 'cursorActivity', function ( ) {
+ codeMirror.setOption( 'viewportMargin', '10' );
+ } );
+
$codeMirror = $( codeMirror.getWrapperElement() );
// HACK: font size varies by browser
(chrome/FF/IE)
--
To view, visit https://gerrit.wikimedia.org/r/376081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I106b1d0d2a68e8ba2b346fd6aaf06b530d18f8d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Implement the search add-on for CodeMirror
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/375402 )
Change subject: Implement the search add-on for CodeMirror
..
Implement the search add-on for CodeMirror
Bug: T174480
Change-Id: I2310330ccbc1e882b00da7dbdae845b9f68a3961
---
M CodeMirror.hooks.php
M extension.json
A resources/modules/search/dialog.css
A resources/modules/search/dialog.js
A resources/modules/search/search.js
A resources/modules/search/searchcursor.js
6 files changed, 743 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/02/375402/1
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index ef61fbf..9a5dd75 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -40,6 +40,7 @@
public static function onBeforePageDisplay( OutputPage &$out, Skin
&$skin ) {
if ( self::isCodeMirrorEnabled( $out->getContext() ) ) {
$out->addModules( 'ext.CodeMirror' );
+ $out->addModules( 'ext.CodeMirror.search.addon' );
}
}
diff --git a/extension.json b/extension.json
index 00f95b3..8575b89 100644
--- a/extension.json
+++ b/extension.json
@@ -110,6 +110,19 @@
"ext.CodeMirror.lib"
]
},
+ "ext.CodeMirror.search.addon": {
+ "scripts": [
+ "modules/search/search.js",
+ "modules/search/searchcursor.js",
+ "modules/search/dialog.js"
+ ],
+ "styles": [
+ "modules/search/dialog.css"
+ ],
+ "dependencies": [
+ "ext.CodeMirror.lib"
+ ]
+ },
"ext.CodeMirror.visualEditor.init": {
"scripts": [
"modules/ve-cm/ve.ui.CodeMirror.init.js"
diff --git a/resources/modules/search/dialog.css
b/resources/modules/search/dialog.css
new file mode 100644
index 000..24c2661
--- /dev/null
+++ b/resources/modules/search/dialog.css
@@ -0,0 +1,32 @@
+.CodeMirror-dialog {
+position: absolute;
+left: 0; right: 0;
+background: inherit;
+z-index: 15;
+padding: .1em .8em;
+overflow: hidden;
+color: inherit;
+}
+
+.CodeMirror-dialog-top {
+border-bottom: 1px solid #eee;
+top: 0;
+}
+
+.CodeMirror-dialog-bottom {
+border-top: 1px solid #eee;
+bottom: 0;
+}
+
+.CodeMirror-dialog input {
+border: none;
+outline: none;
+background: transparent;
+width: 20em;
+color: inherit;
+font-family: monospace;
+}
+
+.CodeMirror-dialog button {
+font-size: 70%;
+}
diff --git a/resources/modules/search/dialog.js
b/resources/modules/search/dialog.js
new file mode 100644
index 000..1a558a0
--- /dev/null
+++ b/resources/modules/search/dialog.js
@@ -0,0 +1,157 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+// Open simple dialogs on top of an editor. Relies on dialog.css.
+
+(function(mod) {
+ if (typeof exports == "object" && typeof module == "object") // CommonJS
+ mod(require("../../lib/codemirror"));
+ else if (typeof define == "function" && define.amd) // AMD
+ define(["../../lib/codemirror"], mod);
+ else // Plain browser env
+ mod(CodeMirror);
+})(function(CodeMirror) {
+ function dialogDiv(cm, template, bottom) {
+ var wrap = cm.getWrapperElement();
+ var dialog;
+ dialog = wrap.appendChild(document.createElement("div"));
+ if (bottom)
+ dialog.className = "CodeMirror-dialog
CodeMirror-dialog-bottom";
+ else
+ dialog.className = "CodeMirror-dialog
CodeMirror-dialog-top";
+
+ if (typeof template == "string") {
+ dialog.innerHTML = template;
+ } else { // Assuming it's a detached DOM element.
+ dialog.appendChild(template);
+ }
+ return dialog;
+ }
+
+ function closeNotification(cm, newVal) {
+ if (cm.state.currentNotificationClose)
+ cm.state.currentNotificationClose();
+ cm.state.currentNotificationClose = newVal;
+ }
+
+ CodeMirror.defineExtension("openDialog", function(template, callback,
options) {
+ if (!options) options = {};
+
+ closeNotification(this, null);
+
+ var dialog = dialogDiv(this, template, options.bottom);
+ var closed = false, me = this;
+ function close(newVal) {
+
[MediaWiki-commits] [Gerrit] wikimedia...jouncebot[master]: Avoid pinging deployers unless there are patches to be deployed
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/375046 ) Change subject: Avoid pinging deployers unless there are patches to be deployed .. Avoid pinging deployers unless there are patches to be deployed Change-Id: I3dad472ef35f9895c29a67912d9f5c7eb293e052 --- M jouncebot.py 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bots/jouncebot refs/changes/46/375046/1 diff --git a/jouncebot.py b/jouncebot.py index 46bd3bb..0aa90c9 100755 --- a/jouncebot.py +++ b/jouncebot.py @@ -205,10 +205,11 @@ deployers = False msg = random.choice(self.config['messages']['generic']) -self.connection.privmsg( -self.channel, msg.format(deployers=deployers, event=event)) - if len(event.owners) > 0: +# Don't ping deployers unless there are patches to be deployed +self.connection.privmsg( +self.channel, msg.format(deployers=deployers, event=event) +) owners = comma_join(event.owners) msg = random.choice(self.config['messages']['owner']) self.connection.privmsg( -- To view, visit https://gerrit.wikimedia.org/r/375046 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3dad472ef35f9895c29a67912d9f5c7eb293e052 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/bots/jouncebot Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...ArticleCreationWorkflow[master]: Add eventlogging for link clicks on Special:CreatePage
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374436 )
Change subject: Add eventlogging for link clicks on Special:CreatePage
..
Add eventlogging for link clicks on Special:CreatePage
Bug: T173766
Change-Id: I4a2801f569f0665a71f03ebc5fd5b4f339bfcde4
---
M extension.json
M includes/SpecialCreatePage.php
A modules/acw.eventlogging.js
3 files changed, 34 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleCreationWorkflow
refs/changes/36/374436/1
diff --git a/extension.json b/extension.json
index 9f72e64..fab2759 100644
--- a/extension.json
+++ b/extension.json
@@ -25,6 +25,17 @@
"i18n"
]
},
+ "ResourceFileModulePaths": {
+ "localBasePath": "modules",
+ "remoteExtPath": "ArticleCreationWorkflow/modules"
+ },
+ "ResourceModules": {
+ "ext.acw.eventlogging": {
+ "scripts": [
+ "acw.eventlogging.js"
+ ]
+ }
+ },
"ExtensionMessagesFiles": {
"ArticleCreationWorkflowAliases":
"ArticleCreationWorkflow.alias.php"
},
diff --git a/includes/SpecialCreatePage.php b/includes/SpecialCreatePage.php
index bc48154..5cf8768 100644
--- a/includes/SpecialCreatePage.php
+++ b/includes/SpecialCreatePage.php
@@ -51,6 +51,7 @@
return;
}
+ $this->getOutput()->addModules( 'ext.acw.eventlogging' );
$this->getOutput()->addWikiText( $landingPageMessage->params(
$destTitleText )->text() );
}
}
diff --git a/modules/acw.eventlogging.js b/modules/acw.eventlogging.js
new file mode 100644
index 000..8367417
--- /dev/null
+++ b/modules/acw.eventlogging.js
@@ -0,0 +1,22 @@
+/*
+ Track link clicks on Special:CreatePage
+ */
+
+( function ( $, mw ) {
+
+ function trackData( interactionType, link, sampling ) {
+ mw.loader.using( 'schema.ArticleCreationWorkflow' ).then(
function () {
+ mw.eventLog.logEvent( 'ArticleCreationWorkflow', {
+ interactionType: interactionType,
+ link: link,
+ sampling: sampling ? sampling : false
+ } );
+ } );
+ }
+
+ $( '#bodyContent' ).find( 'a' ).click( function ( event ) {
+ var $link = $( this ).attr( 'href' );
+ trackData( 'click', $link );
+ } );
+
+} ( jQuery, mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/374436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a2801f569f0665a71f03ebc5fd5b4f339bfcde4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleCreationWorkflow
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
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 Popups on en and de wiki for A/B test
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/374390 ) Change subject: Enable Popups on en and de wiki for A/B test .. Enable Popups on en and de wiki for A/B test Bug: T172291 Change-Id: Ic397af69414e29df57932bdd103176c442a9a172 --- M wmf-config/InitialiseSettings.php 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 8aef2c1..680c530 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13558,6 +13558,9 @@ // stage 0 and stage 1 wikis. 'pp_stage0' => true, 'pp_stage1' => true, + // T172291 + 'enwiki' => true, + 'dewiki' => true, ], 'wgPopupsPageBlacklist' => [ -- To view, visit https://gerrit.wikimedia.org/r/374390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic397af69414e29df57932bdd103176c442a9a172 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: Urbanecm 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]: Add missing wg Prefix
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/374378 ) Change subject: Add missing wg Prefix .. Add missing wg Prefix Follow up to: Ia43bd4868e9e3a9fae97088a53a7f56bd1bc0078 Change-Id: I3750e500a251329bc5431c5b1f02c8262c207929 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 97daf7f..8aef2c1 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13593,7 +13593,7 @@ 'default' => 0.01, ], -'PopupsAnonsExperimentalGroupSize' => [ +'wgPopupsAnonsExperimentalGroupSize' => [ // Read: Enable previews for all anonymous users by default, which is the current behaviour on all wikis except enwiki and dewiki per T162672. 'default' => 0, 'enwiki' => 0.006, -- To view, visit https://gerrit.wikimedia.org/r/374378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3750e500a251329bc5431c5b1f02c8262c207929 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jdlrobson Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: Urbanecm 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...CodeMirror[wmf/1.30.0-wmf.15]: Update the CodeMirror icon in NWE to the highlight icon, lik...
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373398 ) Change subject: Update the CodeMirror icon in NWE to the highlight icon, like in the other editors .. Update the CodeMirror icon in NWE to the highlight icon, like in the other editors Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c (cherry picked from commit c6ab876fe7b203b397fe468fa9c82c75f2f51002) --- M resources/modules/ve-cm/ve.ui.CodeMirrorTool.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/98/373398/1 diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js index e7cd52e..31f781d 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js +++ b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js @@ -25,7 +25,7 @@ ve.ui.CodeMirrorTool.static.name = 'codeMirror'; ve.ui.CodeMirrorTool.static.autoAddToCatchall = false; ve.ui.CodeMirrorTool.static.title = OO.ui.deferMsg( 'codemirror-toggle-label' ); -ve.ui.CodeMirrorTool.static.icon = 'code'; +ve.ui.CodeMirrorTool.static.icon = 'highlight'; ve.ui.CodeMirrorTool.static.group = 'codeMirror'; ve.ui.CodeMirrorTool.static.commandName = 'codeMirror'; ve.ui.CodeMirrorTool.static.deactivateOnSelect = false; -- To view, visit https://gerrit.wikimedia.org/r/373398 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: wmf/1.30.0-wmf.15 Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[wmf/1.30.0-wmf.14]: Update the CodeMirror icon in NWE to the highlight icon, lik...
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373397 ) Change subject: Update the CodeMirror icon in NWE to the highlight icon, like in the other editors .. Update the CodeMirror icon in NWE to the highlight icon, like in the other editors Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c (cherry picked from commit c6ab876fe7b203b397fe468fa9c82c75f2f51002) --- M resources/modules/ve-cm/ve.ui.CodeMirrorTool.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/97/373397/1 diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js index e7cd52e..31f781d 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js +++ b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js @@ -25,7 +25,7 @@ ve.ui.CodeMirrorTool.static.name = 'codeMirror'; ve.ui.CodeMirrorTool.static.autoAddToCatchall = false; ve.ui.CodeMirrorTool.static.title = OO.ui.deferMsg( 'codemirror-toggle-label' ); -ve.ui.CodeMirrorTool.static.icon = 'code'; +ve.ui.CodeMirrorTool.static.icon = 'highlight'; ve.ui.CodeMirrorTool.static.group = 'codeMirror'; ve.ui.CodeMirrorTool.static.commandName = 'codeMirror'; ve.ui.CodeMirrorTool.static.deactivateOnSelect = false; -- To view, visit https://gerrit.wikimedia.org/r/373397 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: wmf/1.30.0-wmf.14 Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.14]: Fix typo where IP wasn't retrieved from job
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373388 )
Change subject: Fix typo where IP wasn't retrieved from job
..
Fix typo where IP wasn't retrieved from job
I think this might be causing T173888
(Although I don't really know)
Bug: T173888
Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
(cherry picked from commit 23f4a71831987998f0de95b6de7427ba6c8c129f)
---
M includes/DeferredChecksJob.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/88/373388/1
diff --git a/includes/DeferredChecksJob.php b/includes/DeferredChecksJob.php
index 05096eb..9bfeb42 100644
--- a/includes/DeferredChecksJob.php
+++ b/includes/DeferredChecksJob.php
@@ -40,7 +40,7 @@
. print_r( $this->params['subnet'], true )
);
}
- $subnet = $this->params['resultSoFar'];
+ $subnet = $this->params['subnet'];
if ( !isset( $this->params['resultSoFar'] ) || !is_string(
$this->params['resultSoFar'] ) ) {
throw new Exception( __CLASS__
. " expected to receive a string parameter
'resultSoFar', got "
--
To view, visit https://gerrit.wikimedia.org/r/373388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Niharika29
Gerrit-Reviewer: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[wmf/1.30.0-wmf.15]: Fix typo where IP wasn't retrieved from job
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373387 )
Change subject: Fix typo where IP wasn't retrieved from job
..
Fix typo where IP wasn't retrieved from job
I think this might be causing T173888
(Although I don't really know)
Bug: T173888
Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
(cherry picked from commit 23f4a71831987998f0de95b6de7427ba6c8c129f)
---
M includes/DeferredChecksJob.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/87/373387/1
diff --git a/includes/DeferredChecksJob.php b/includes/DeferredChecksJob.php
index 05096eb..9bfeb42 100644
--- a/includes/DeferredChecksJob.php
+++ b/includes/DeferredChecksJob.php
@@ -40,7 +40,7 @@
. print_r( $this->params['subnet'], true )
);
}
- $subnet = $this->params['resultSoFar'];
+ $subnet = $this->params['subnet'];
if ( !isset( $this->params['resultSoFar'] ) || !is_string(
$this->params['resultSoFar'] ) ) {
throw new Exception( __CLASS__
. " expected to receive a string parameter
'resultSoFar', got "
--
To view, visit https://gerrit.wikimedia.org/r/373387
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d64a8b1c6607cb5b32a25182ec3496477322fdd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.15
Gerrit-Owner: Niharika29
Gerrit-Reviewer: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "pagePreviews: Enable A/B test (BC-only)"
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/373346 ) Change subject: Revert "pagePreviews: Enable A/B test (BC-only)" .. Revert "pagePreviews: Enable A/B test (BC-only)" This reverts commit f3e1e35c56325f2b3e369e2a851759d3dbf0e15f. Change-Id: Ib94f819d7688c82103f9027a0db85d4bc24768d7 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 15 insertions(+), 25 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 1b394c2..c20bd91 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -553,6 +553,19 @@ 'default' => true, ], + // T165018: Make Page Previews (Popups) use RESTBase's page summary endpoint + // and consume the HTML returned. + 'wgPopupsGateway' => [ + 'default' => 'restbaseHTML', + ], + + // To allow us to test EventLogging in the beta cluster we log all events + 'wgPopupsSchemaSamplingRate' => [ + 'default' => 1, + ], + 'wgPopupsStatsvSamplingRate' => [ + 'default' => 1, + ], 'wgEnableRcFiltersBetaFeature' => [ 'default' => true, ], @@ -564,33 +577,10 @@ 'wmgUsePopups' => [ 'default' => true, ], - - '-wmgPopupsBetaFeature' => [ + 'wmgPopupsBetaFeature' => [ 'default' => false, ], - - // T171853: For 25% of anonymous user sessions, Page Previews will be - // enabled by default as well as the instrumentation; for 25%, PP will be - // disabled by default; for 50%, PP will be disabled as will the - // instrumentation. - '-wgPopupsAnonsExperimentalGroupSize' => [ - 'default' => 0.25, - ], - - // T171853: Enable PP EventLogging instrumentation on enwiki only so that we - // can prove the killswitch works. - '-wgPopupsEventLogging' => [ - 'default' => false, - 'enwiki' => true, - ], - - // T165018: Make Page Previews (Popups) use RESTBase's page summary endpoint - // and consume the HTML returned. - '-wgPopupsGateway' => [ - 'default' => 'restbaseHTML', - ], - - '-wgPopupsStatsvSamplingRate' => [ + 'wgPopupsAnonsEnabledSamplingRate' => [ 'default' => 1, ], -- To view, visit https://gerrit.wikimedia.org/r/373346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib94f819d7688c82103f9027a0db85d4bc24768d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jhernandez Gerrit-Reviewer: Niharika29 Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Urbanecm 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]: Revert "pagePreviews: Enable A/B test (BC-only)"
Hello Urbanecm, Florianschmidtwelzow, jenkins-bot, Jhernandez, Phuedx, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/373346 to review the following change. Change subject: Revert "pagePreviews: Enable A/B test (BC-only)" .. Revert "pagePreviews: Enable A/B test (BC-only)" This reverts commit f3e1e35c56325f2b3e369e2a851759d3dbf0e15f. Change-Id: Ib94f819d7688c82103f9027a0db85d4bc24768d7 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 15 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/46/373346/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 1b394c2..c20bd91 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -553,6 +553,19 @@ 'default' => true, ], + // T165018: Make Page Previews (Popups) use RESTBase's page summary endpoint + // and consume the HTML returned. + 'wgPopupsGateway' => [ + 'default' => 'restbaseHTML', + ], + + // To allow us to test EventLogging in the beta cluster we log all events + 'wgPopupsSchemaSamplingRate' => [ + 'default' => 1, + ], + 'wgPopupsStatsvSamplingRate' => [ + 'default' => 1, + ], 'wgEnableRcFiltersBetaFeature' => [ 'default' => true, ], @@ -564,33 +577,10 @@ 'wmgUsePopups' => [ 'default' => true, ], - - '-wmgPopupsBetaFeature' => [ + 'wmgPopupsBetaFeature' => [ 'default' => false, ], - - // T171853: For 25% of anonymous user sessions, Page Previews will be - // enabled by default as well as the instrumentation; for 25%, PP will be - // disabled by default; for 50%, PP will be disabled as will the - // instrumentation. - '-wgPopupsAnonsExperimentalGroupSize' => [ - 'default' => 0.25, - ], - - // T171853: Enable PP EventLogging instrumentation on enwiki only so that we - // can prove the killswitch works. - '-wgPopupsEventLogging' => [ - 'default' => false, - 'enwiki' => true, - ], - - // T165018: Make Page Previews (Popups) use RESTBase's page summary endpoint - // and consume the HTML returned. - '-wgPopupsGateway' => [ - 'default' => 'restbaseHTML', - ], - - '-wgPopupsStatsvSamplingRate' => [ + 'wgPopupsAnonsEnabledSamplingRate' => [ 'default' => 1, ], -- To view, visit https://gerrit.wikimedia.org/r/373346 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib94f819d7688c82103f9027a0db85d4bc24768d7 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jhernandez Gerrit-Reviewer: Phuedx Gerrit-Reviewer: Urbanecm 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...CodeMirror[master]: Update the CodeMirror icon in NWE to the highlight icon, lik...
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373324 ) Change subject: Update the CodeMirror icon in NWE to the highlight icon, like in the other editors .. Update the CodeMirror icon in NWE to the highlight icon, like in the other editors Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c --- M resources/modules/ve-cm/ve.ui.CodeMirrorTool.js 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/24/373324/1 diff --git a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js index e7cd52e..31f781d 100644 --- a/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js +++ b/resources/modules/ve-cm/ve.ui.CodeMirrorTool.js @@ -25,7 +25,7 @@ ve.ui.CodeMirrorTool.static.name = 'codeMirror'; ve.ui.CodeMirrorTool.static.autoAddToCatchall = false; ve.ui.CodeMirrorTool.static.title = OO.ui.deferMsg( 'codemirror-toggle-label' ); -ve.ui.CodeMirrorTool.static.icon = 'code'; +ve.ui.CodeMirrorTool.static.icon = 'highlight'; ve.ui.CodeMirrorTool.static.group = 'codeMirror'; ve.ui.CodeMirrorTool.static.commandName = 'codeMirror'; ve.ui.CodeMirrorTool.static.deactivateOnSelect = false; -- To view, visit https://gerrit.wikimedia.org/r/373324 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92c61c0bb21fc80ee6ab3ffd521d59764e757f7c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Deploy CodeMirror to all non-RTL wikis
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/373144 ) Change subject: Deploy CodeMirror to all non-RTL wikis .. Deploy CodeMirror to all non-RTL wikis Bug: T170966 Change-Id: Ic0fa135d634cd0bf4cdcc8dc87bf6f1825ea5b74 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/44/373144/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 2462d46..93037ca 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19373,9 +19373,8 @@ ], 'wmgUseCodeMirror' => [ - 'default' => false, - 'simplewiki' => true, - 'testwiki' => true, // T169284 + 'default' => true, + 'rtl' => false, // T170001 ], 'wmgUseParserMigration' => [ -- To view, visit https://gerrit.wikimedia.org/r/373144 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic0fa135d634cd0bf4cdcc8dc87bf6f1825ea5b74 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Redo "Enable CodeMirror everywhere but RTL wikis and wikidata"
Hello Florianschmidtwelzow, MaxSem, jenkins-bot, Kaldari, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/373142 to review the following change. Change subject: Redo "Enable CodeMirror everywhere but RTL wikis and wikidata" .. Redo "Enable CodeMirror everywhere but RTL wikis and wikidata" This reverts commit ed93eb4587c992aae8fe91d5a9e091ae46a06fcf. Change-Id: Ib9820dca2887f00d9f110074f9b84204884dfdc9 --- M wmf-config/InitialiseSettings.php 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/42/373142/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fab2d9d..2d9d8e2 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19334,9 +19334,10 @@ ], 'wmgUseCodeMirror' => [ - 'default' => false, - 'simplewiki' => true, - 'testwiki' => true, // T169284 + 'default' => true, + 'rtl' => false, + 'wikidatawiki' => false, // Didn't feel well when this was deployed + 'testwikidatawiki' => false, ], 'wmgUseParserMigration' => [ -- To view, visit https://gerrit.wikimedia.org/r/373142 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9820dca2887f00d9f110074f9b84204884dfdc9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Kaldari Gerrit-Reviewer: MaxSem 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...LoginNotify[wmf/1.30.0-wmf.14]: Fix typo in the notification message
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372902 )
Change subject: Fix typo in the notification message
..
Fix typo in the notification message
Change-Id: I329847d1c08fdd4dadc69ac60b9cbde2db773b3d
(cherry picked from commit 7a85836fb7afd6017d38d83420a13e65525af8e4)
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/02/372902/1
diff --git a/i18n/en.json b/i18n/en.json
index f72b7f1..e236635 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,6 +16,6 @@
"notification-loginnotify-login-success-email-subject": "Login to
{{SITENAME}} as $1 from a computer you have not recently used",
"notification-header-login-success": "Someone (probably
{{GENDER:$1|you}}) recently logged in to your account from a new device. If
this was you, then you can disregard this message. If it wasn't you, then it's
recommended that you change your password, and check your account activity.",
"notification-new-bundled-header-login-fail": "There {{PLURAL:$1|has
been '''a failed attempt'''|have been '''$1 failed attempts'''}} to log in to
your account from a new device since the last time you logged in. If it wasn't
you, please make sure your account has a strong password.",
- "notification-known-header-login-fail": "There have been
{{PLURAL:$1|has been '''a failed attempt'''|have been '''$1 failed
attempts'''}} to log in to your account since the last time you logged in. If
it wasn't you, please make sure your account has a strong password.",
+ "notification-known-header-login-fail": "There {{PLURAL:$1|has been
'''a failed attempt'''|have been '''$1 failed attempts'''}} to log in to your
account since the last time you logged in. If it wasn't you, please make sure
your account has a strong password.",
"notification-new-unbundled-header-login-fail": "There {{PLURAL:$1|has
been '''a failed attempt'''|have been '''multiple failed attempts'''}} to log
in to your account from a new device. Please make sure your account has a
strong password."
}
--
To view, visit https://gerrit.wikimedia.org/r/372902
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I329847d1c08fdd4dadc69ac60b9cbde2db773b3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: wmf/1.30.0-wmf.14
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Fix typo in the notification message
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/372879 )
Change subject: Fix typo in the notification message
..
Fix typo in the notification message
Change-Id: I329847d1c08fdd4dadc69ac60b9cbde2db773b3d
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/79/372879/1
diff --git a/i18n/en.json b/i18n/en.json
index f72b7f1..e236635 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -16,6 +16,6 @@
"notification-loginnotify-login-success-email-subject": "Login to
{{SITENAME}} as $1 from a computer you have not recently used",
"notification-header-login-success": "Someone (probably
{{GENDER:$1|you}}) recently logged in to your account from a new device. If
this was you, then you can disregard this message. If it wasn't you, then it's
recommended that you change your password, and check your account activity.",
"notification-new-bundled-header-login-fail": "There {{PLURAL:$1|has
been '''a failed attempt'''|have been '''$1 failed attempts'''}} to log in to
your account from a new device since the last time you logged in. If it wasn't
you, please make sure your account has a strong password.",
- "notification-known-header-login-fail": "There have been
{{PLURAL:$1|has been '''a failed attempt'''|have been '''$1 failed
attempts'''}} to log in to your account since the last time you logged in. If
it wasn't you, please make sure your account has a strong password.",
+ "notification-known-header-login-fail": "There {{PLURAL:$1|has been
'''a failed attempt'''|have been '''$1 failed attempts'''}} to log in to your
account since the last time you logged in. If it wasn't you, please make sure
your account has a strong password.",
"notification-new-unbundled-header-login-fail": "There {{PLURAL:$1|has
been '''a failed attempt'''|have been '''multiple failed attempts'''}} to log
in to your account from a new device. Please make sure your account has a
strong password."
}
--
To view, visit https://gerrit.wikimedia.org/r/372879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I329847d1c08fdd4dadc69ac60b9cbde2db773b3d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Remove temporary wgStructuredChangeFiltersEnableExpe...
Hello Catrope, Florianschmidtwelzow, jenkins-bot, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/372430 to review the following change. Change subject: Revert "Remove temporary wgStructuredChangeFiltersEnableExperimentalViews setting" .. Revert "Remove temporary wgStructuredChangeFiltersEnableExperimentalViews setting" This reverts commit 590fac6d6a734c76e9a7da16eb1a0d0cd5237c96. Change-Id: I20e6d41a4e32c5fcbad96062e53d370f036db9a2 --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/30/372430/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 42d5224..201ffc1 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19407,6 +19407,11 @@ 'commonswiki' => [ NS_FILE ], ], +// Temporarily enable until 1.30.0-wmf.12 rolls out -RK +'wgStructuredChangeFiltersEnableExperimentalViews' => [ + 'default' => true, +], + 'wmgUseTimeless' => [ 'default' => false, 'testwiki' => true, -- To view, visit https://gerrit.wikimedia.org/r/372430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I20e6d41a4e32c5fcbad96062e53d370f036db9a2 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 Gerrit-Reviewer: Catrope Gerrit-Reviewer: Florianschmidtwelzow 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...PageAssessments[master]: Test patch to check network at Wikimania
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370939 ) Change subject: Test patch to check network at Wikimania .. Test patch to check network at Wikimania Change-Id: I6ae520e01edc7b031457769f22a0011ff36c961d --- M PageAssessmentsBody.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageAssessments refs/changes/39/370939/1 diff --git a/PageAssessmentsBody.php b/PageAssessmentsBody.php index de2c05a..7ae8b85 100644 --- a/PageAssessmentsBody.php +++ b/PageAssessmentsBody.php @@ -1,5 +1,6 @@ https://gerrit.wikimedia.org/r/370939 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ae520e01edc7b031457769f22a0011ff36c961d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageAssessments Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: [WIP] Update CodeMirror icon to new highlighter icon
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368451 )
Change subject: [WIP] Update CodeMirror icon to new highlighter icon
..
[WIP] Update CodeMirror icon to new highlighter icon
Rename a couple of files for consistency and remove old icons
Bug: T164441
Change-Id: Ia7d85326eee79a8d160ee2773f82c4ee9beb24ac
---
M CodeMirror.hooks.php
M resources/ext.CodeMirror.less
A resources/images/.DS_Store
R resources/images/cm-beta-ltr.svg
R resources/images/cm-beta-rtl.svg
A resources/images/cm-highlighter-off.png
A resources/images/cm-highlighter-off.svg
A resources/images/cm-highlighter-on.png
A resources/images/cm-highlighter-on.svg
D resources/images/cm-icon.png
D resources/images/cm-icon.svg
D resources/images/cm-off.png
D resources/images/cm-off.svg
D resources/images/cm-on.png
D resources/images/cm-on.svg
15 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/51/368451/1
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 1bd9c40..3deb062 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -153,8 +153,8 @@
'label-message' => 'codemirror-beta-title',
'desc-message' => 'codemirror-beta-desc',
'screenshot' => [
- 'ltr' => $wgExtensionAssetsPath .
'/CodeMirror/resources/images/codemirror-beta-ltr.svg',
- 'rtl' => $wgExtensionAssetsPath .
'/CodeMirror/resources/images/codemirror-beta-rtl.svg'
+ 'ltr' => $wgExtensionAssetsPath .
'/CodeMirror/resources/images/cm-beta-ltr.svg',
+ 'rtl' => $wgExtensionAssetsPath .
'/CodeMirror/resources/images/cm-beta-rtl.svg'
],
'info-link' =>
'https://meta.wikimedia.org/wiki/' .
'Community_Tech/Wikitext_editor_syntax_highlighting',
diff --git a/resources/ext.CodeMirror.less b/resources/ext.CodeMirror.less
index b8830a5..620a04f 100644
--- a/resources/ext.CodeMirror.less
+++ b/resources/ext.CodeMirror.less
@@ -17,7 +17,7 @@
.mw-editbutton-codemirror-on {
// WikiEditor toolbar
&.tool-button {
- .background-image-svg( 'images/cm-on.svg', 'images/cm-on.png' );
+ .background-image-svg( 'images/cm-highlighter-on.svg',
'images/cm-highlighter-on.png' );
}
// Classic toolbar
&.mw-toolbar-editbutton {
@@ -28,7 +28,7 @@
.mw-editbutton-codemirror-off {
// WikiEditor toolbar
&.tool-button {
- .background-image-svg( 'images/cm-off.svg', 'images/cm-off.png'
);
+ .background-image-svg( 'images/cm-highlighter-off.svg',
'images/cm-highlighter-off.png' );
}
// Classic toolbar
&.mw-toolbar-editbutton {
diff --git a/resources/images/.DS_Store b/resources/images/.DS_Store
new file mode 100644
index 000..5820963
--- /dev/null
+++ b/resources/images/.DS_Store
Binary files differ
diff --git a/resources/images/codemirror-beta-ltr.svg
b/resources/images/cm-beta-ltr.svg
similarity index 100%
rename from resources/images/codemirror-beta-ltr.svg
rename to resources/images/cm-beta-ltr.svg
diff --git a/resources/images/codemirror-beta-rtl.svg
b/resources/images/cm-beta-rtl.svg
similarity index 100%
rename from resources/images/codemirror-beta-rtl.svg
rename to resources/images/cm-beta-rtl.svg
diff --git a/resources/images/cm-highlighter-off.png
b/resources/images/cm-highlighter-off.png
new file mode 100644
index 000..27340fe
--- /dev/null
+++ b/resources/images/cm-highlighter-off.png
Binary files differ
diff --git a/resources/images/cm-highlighter-off.svg
b/resources/images/cm-highlighter-off.svg
new file mode 100644
index 000..c55d5a1
--- /dev/null
+++ b/resources/images/cm-highlighter-off.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 24
24">Highlight
diff --git a/resources/images/cm-highlighter-on.png
b/resources/images/cm-highlighter-on.png
new file mode 100644
index 000..0f62543
--- /dev/null
+++ b/resources/images/cm-highlighter-on.png
Binary files differ
diff --git a/resources/images/cm-highlighter-on.svg
b/resources/images/cm-highlighter-on.svg
new file mode 100644
index 000..d86cbe0
--- /dev/null
+++ b/resources/images/cm-highlighter-on.svg
@@ -0,0 +1 @@
+http://www.w3.org/2000/svg"; viewBox="0 0 24
24">Highlight
diff --git a/resources/images/cm-icon.png b/resources/images/cm-icon.png
deleted file mode 100644
index 3fb98e8..000
--- a/resources/images/cm-icon.png
+++ /dev/null
Binary files differ
diff --git a/resources/images/cm-icon.svg b/resources/images/cm-icon.svg
deleted file mode 100644
index b8f5eb4..000
--- a/resources/images/cm-icon.svg
+++ /de
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.10]: IcuCollation: Fix diacritic characters for Romanian (ro) hea...
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/366296 ) Change subject: IcuCollation: Fix diacritic characters for Romanian (ro) headings .. IcuCollation: Fix diacritic characters for Romanian (ro) headings They should be Ș, Ț (comma-below) and instead they were cedilla-below (Ş, Ţ). Change-Id: I6dc873c3ce93bca3e425439f70d0fb30aecc9533 (cherry picked from commit 486f64f28302ecceed04977180fd21470cb54c81) --- M includes/collation/IcuCollation.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/collation/IcuCollation.php b/includes/collation/IcuCollation.php index e0eb1c1..84f7188 100644 --- a/includes/collation/IcuCollation.php +++ b/includes/collation/IcuCollation.php @@ -196,7 +196,7 @@ 'pl' => [ "Ą", "Ć", "Ę", "Ł", "Ń", "Ó", "Ś", "Ź", "Ż" ], 'pt' => [], 'rm' => [], // not in libicu - 'ro' => [ "Ă", "Â", "Î", "Ş", "Ţ" ], + 'ro' => [ "Ă", "Â", "Î", "Ș", "Ț" ], 'ru' => [], 'rup' => [ "Ă", "Â", "Î", "Ľ", "Ń", "Ş", "Ţ" ], // not in libicu 'sco' => [], -- To view, visit https://gerrit.wikimedia.org/r/366296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dc873c3ce93bca3e425439f70d0fb30aecc9533 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.10 Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Niharika29 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[wmf/1.30.0-wmf.9]: IcuCollation: Fix diacritic characters for Romanian (ro) hea...
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/366295 ) Change subject: IcuCollation: Fix diacritic characters for Romanian (ro) headings .. IcuCollation: Fix diacritic characters for Romanian (ro) headings They should be Ș, Ț (comma-below) and instead they were cedilla-below (Ş, Ţ). Change-Id: I6dc873c3ce93bca3e425439f70d0fb30aecc9533 (cherry picked from commit 486f64f28302ecceed04977180fd21470cb54c81) --- M includes/collation/IcuCollation.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/collation/IcuCollation.php b/includes/collation/IcuCollation.php index e0eb1c1..84f7188 100644 --- a/includes/collation/IcuCollation.php +++ b/includes/collation/IcuCollation.php @@ -196,7 +196,7 @@ 'pl' => [ "Ą", "Ć", "Ę", "Ł", "Ń", "Ó", "Ś", "Ź", "Ż" ], 'pt' => [], 'rm' => [], // not in libicu - 'ro' => [ "Ă", "Â", "Î", "Ş", "Ţ" ], + 'ro' => [ "Ă", "Â", "Î", "Ș", "Ț" ], 'ru' => [], 'rup' => [ "Ă", "Â", "Î", "Ľ", "Ń", "Ş", "Ţ" ], // not in libicu 'sco' => [], -- To view, visit https://gerrit.wikimedia.org/r/366295 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6dc873c3ce93bca3e425439f70d0fb30aecc9533 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.9 Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Niharika29 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...CodeMirror[master]: Make the discussion link point to the meta page for the feat...
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/366034 ) Change subject: Make the discussion link point to the meta page for the feature and update description string .. Make the discussion link point to the meta page for the feature and update description string This is in order to fix the inconsistency where discussion link leads to mediawiki but information page leads to meta. This change has been requested by DannyH. The ticket mentioned below is closed, but feel free to reopen if you want to talk about this change since Danny is not on Gerrit. Bug: T165543 Change-Id: I0b89c65d53694b480cfcb26179c70fffd428bd70 --- M CodeMirror.hooks.php M i18n/en.json 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/34/366034/1 diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php index 1bd9c40..fb490d6 100644 --- a/CodeMirror.hooks.php +++ b/CodeMirror.hooks.php @@ -158,8 +158,8 @@ ], 'info-link' => 'https://meta.wikimedia.org/wiki/' . 'Community_Tech/Wikitext_editor_syntax_highlighting', - 'discussion-link' => 'https://www.mediawiki.org/wiki/' . - 'Extension_talk:CodeMirror' + 'discussion-link' => 'https://meta.wikimedia.org/wiki/' . + 'Talk:Community_Tech/Wikitext_editor_syntax_highlighting' ]; } } diff --git a/i18n/en.json b/i18n/en.json index 020bf82..1fa9e43 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -7,7 +7,7 @@ "codemirror-desc": "Provides syntax highlighting in wikitext editor", "codemirror-toggle-label": "Syntax highlighting", "codemirror-beta-title": "Wikitext syntax highlighting", - "codemirror-beta-desc": "Syntax highlighting makes editing easier by using color and shade to visually separate page text from the code for links, references and templates.", + "codemirror-beta-desc": "Syntax highlighting makes editing easier by using color and shade to visually separate page text from the code for links, references and templates. It works with both standard and new wikitext editors.", "codemirror-popup-syntax": "Syntax", "codemirror-popup-highlighting": "Highlighting", "codemirror-popup-desc": "Syntax highlighting will help you easily distinguish different parts of your edit by color coding them.", -- To view, visit https://gerrit.wikimedia.org/r/366034 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b89c65d53694b480cfcb26179c70fffd428bd70 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Update description strings for notification on Special:Prefe...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/366023 )
Change subject: Update description strings for notification on
Special:Preferences
..
Update description strings for notification on Special:Preferences
Change-Id: Ia601052e2aa5b26330d1a7b7f1cda2c43299984b
---
M i18n/en.json
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/23/366023/1
diff --git a/i18n/en.json b/i18n/en.json
index b3c9b7f..f72b7f1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,11 +6,11 @@
"Niharika"
]
},
- "loginnotify-desc": "Notify users about suspicious logins",
+ "loginnotify-desc": "Notify users about suspicious logins from
unfamiliar devices and/or IP addresses.",
"echo-category-title-login-fail": "Failed login attempts",
- "echo-pref-tooltip-login-fail": "Notify me when there have been
multiple failed attempts to log in to my account.",
- "echo-category-title-login-success": "Login from new computer",
- "echo-pref-tooltip-login-success": "Notify me whenever somebody logs
into my account from a computer I have not used before.",
+ "echo-pref-tooltip-login-fail": "Notify me when there have been failed
attempts to log in to my account.",
+ "echo-category-title-login-success": "Login from an unfamiliar device",
+ "echo-pref-tooltip-login-success": "Notify me whenever somebody logs
into my account from an unfamiliar device and IP address.",
"loginnotify-primary-link": "Help",
"notification-loginnotify-login-fail-email-subject":
"{{PLURAL:$2|Failed attempt|Multiple failed attempts}} to log in to
{{SITENAME}} as $1",
"notification-loginnotify-login-success-email-subject": "Login to
{{SITENAME}} as $1 from a computer you have not recently used",
--
To view, visit https://gerrit.wikimedia.org/r/366023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia601052e2aa5b26330d1a7b7f1cda2c43299984b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
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 CodeMirror on simplewiki for better testing and more ...
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/365884 ) Change subject: Enable CodeMirror on simplewiki for better testing and more exposure .. Enable CodeMirror on simplewiki for better testing and more exposure Change-Id: I4968d343f601fdd732d7686daca76ffed2092165 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/84/365884/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 319216b..361fddf 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19085,6 +19085,7 @@ 'wmgUseCodeMirror' => [ 'default' => false, + 'simplewiki' => true, 'testwiki' => true, // T169284 ], -- To view, visit https://gerrit.wikimedia.org/r/365884 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4968d343f601fdd732d7686daca76ffed2092165 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Fix bundling issues with LoginNotify
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364609 )
Change subject: Fix bundling issues with LoginNotify
..
Fix bundling issues with LoginNotify
Bug: T169833
Change-Id: Ia38fe0c0eca452af1a9be57e4a4382ebdb9b5a6e
---
M includes/PresentationModel.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/09/364609/1
diff --git a/includes/PresentationModel.php b/includes/PresentationModel.php
index 9e88172..b4ce87a 100644
--- a/includes/PresentationModel.php
+++ b/includes/PresentationModel.php
@@ -57,15 +57,20 @@
*/
public function getHeaderMessage() {
switch ( $this->event->getType() ) {
+ // Known IP? Don't bundle because we issue
notifications after every 5 attempts anyway
case 'login-fail-known':
$msg = $this->msg(
'notification-known-header-login-fail' );
$msg->params( $this->event->getExtraParam(
'count', 0 ) );
break;
+ // New IP?
case 'login-fail-new':
+ // If it's a bundle, pass it the bundle count
as param
if ( $this->isBundled() ) {
$msg = $this->msg(
'notification-new-bundled-header-login-fail' );
- $msg->params(
$this->event->getExtraParam( 'count', 0 ) );
+ $msg->params( $this->getBundleCount() );
} else {
+ // If the bundle is read or user goes
to Special:Notifications, show
+ // one notification per attempt
(aligned with how unbundled bundles work)
$msg = $this->msg(
'notification-new-unbundled-header-login-fail' );
$msg->params(
$this->event->getExtraParam( 'count', 0 ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/364609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia38fe0c0eca452af1a9be57e4a4382ebdb9b5a6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.30.0-wmf.7]: Update CodeMirror
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363647 ) Change subject: Update CodeMirror .. Update CodeMirror Change-Id: Ic8827a4ec0fff3ac32227b73af291c75023fb71f --- M extensions/CodeMirror 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Niharika29: Verified; Looks good to me, approved diff --git a/extensions/CodeMirror b/extensions/CodeMirror index e0f3a23..bc96cb8 16 --- a/extensions/CodeMirror +++ b/extensions/CodeMirror @@ -1 +1 @@ -Subproject commit e0f3a237190a00075b17cf3c29398ee5bc92d352 +Subproject commit bc96cb80dbdedbd4b28ad763ec01bd5f559a477b -- To view, visit https://gerrit.wikimedia.org/r/363647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8827a4ec0fff3ac32227b73af291c75023fb71f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.7 Gerrit-Owner: Niharika29 Gerrit-Reviewer: Niharika29 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[wmf/1.30.0-wmf.7]: Update CodeMirror
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363647 ) Change subject: Update CodeMirror .. Update CodeMirror Change-Id: Ic8827a4ec0fff3ac32227b73af291c75023fb71f --- M extensions/CodeMirror 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/47/363647/1 diff --git a/extensions/CodeMirror b/extensions/CodeMirror index e0f3a23..bc96cb8 16 --- a/extensions/CodeMirror +++ b/extensions/CodeMirror @@ -1 +1 @@ -Subproject commit e0f3a237190a00075b17cf3c29398ee5bc92d352 +Subproject commit bc96cb80dbdedbd4b28ad763ec01bd5f559a477b -- To view, visit https://gerrit.wikimedia.org/r/363647 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8827a4ec0fff3ac32227b73af291c75023fb71f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.7 Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: CodeMirror fixes for beta feature deployment
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363511 )
Change subject: CodeMirror fixes for beta feature deployment
..
CodeMirror fixes for beta feature deployment
Change-Id: Ib7c7ebaed4f8b1643bc4de506de8f2b443d33fa3
---
M i18n/en.json
M resources/images/codemirror-beta-LTR.svg
M resources/images/codemirror-beta-RTL.svg
3 files changed, 152 insertions(+), 154 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/11/363511/1
diff --git a/i18n/en.json b/i18n/en.json
index ee0733b..b5585bd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -6,7 +6,7 @@
},
"codemirror-desc": "Provides syntax highlighting in wikitext editor",
"codemirror-toggle-label": "Syntax highlighting",
- "codemirror-beta-title": "Syntax highlighting",
+ "codemirror-beta-title": "Wikitext syntax highlighting",
"codemirror-beta-desc": "Syntax highlighting makes editing easier by
using color and shade to visually separate article text from the code for
links, references and templates.",
"codemirror-popup-syntax": "Syntax",
"codemirror-popup-highlighting": "Highlighting",
diff --git a/resources/images/codemirror-beta-LTR.svg
b/resources/images/codemirror-beta-LTR.svg
index 3a19ef9..36e08df 100644
--- a/resources/images/codemirror-beta-LTR.svg
+++ b/resources/images/codemirror-beta-LTR.svg
@@ -1,99 +1,97 @@
-
-
-http://www.bohemiancoding.com/sketch/ns";
-xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" viewBox="0 0 264 162"
-style="enable-background:new 0 0 264 162;" xml:space="preserve">
+http://www.w3.org/2000/svg"; viewBox="0 0 264 162" width="264"
height="162">
- .st0{fill:#E5E5E5;}
- .st1{fill:#FF;}
- .st2{fill:#3466CC;}
- .st3{opacity:6.00e-02;}
- .st4{fill:#00AF89;}
- .st5{opacity:0.23;fill:#F5A623;}
- .st6{fill:#F5A623;}
- .st7{opacity:7.00e-02;}
-
.st8{opacity:0.25;fill:none;stroke:#FF;stroke-width:0.5;stroke-miterlimit:10;}
+ .st0{fill:#3466CC;}
+ .st1{fill:#E5E5E5;}
+ .st2{fill:#FF;}
+ .st3{opacity:6.00e-02;enable-background:new;}
+ .st4{opacity:7.00e-02;enable-background:new;}
+
.st5{opacity:0.25;fill:none;stroke:#FF;stroke-width:0.5;stroke-miterlimit:10;enable-background:new
;}
+ .st6{fill:#00AF89;}
+ .st7{opacity:0.23;fill:#F5A623;enable-background:new;}
+ .st8{fill:#F5A623;}
-Slice 2
-Created with Sketch.
-
-
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
-
+
-
+
-
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/resources/images/codemirror-beta-RTL.svg
b/resources/images/codemirror-beta-RTL.svg
index ae70a7b..c791296 100644
--- a/resources/images/codemirror-beta-RTL.svg
+++ b/resources/images/codemirror-beta-RTL.svg
@@ -1,98 +1,98 @@
-
-
-http://www.bohemiancoding.com/sketch/ns";
-xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; x="0px" y="0px" viewBox="0 0 264 162"
-style="enable-background:new 0 0 264 162;" xml:space="preserve">
+http://www.w3.org/2000/svg"; viewBox="0 0 264 162" width="264"
height="162">
- .st0{fill:#E5E5E5;}
- .st1{fill:#FF;}
- .st2{fill:#3466CC;}
+ .st0{fill:#3466CC;}
+ .st1{fill:#E5E5E5;}
+ .st2{fill:#FF;}
.st3{opacity:6.00e-02;enable-background:new;}
- .st4{fill:#00AF89;}
- .st5{opacity:0.23;fill:#F5A623;enable-background:new;}
- .st6{fill:#F5A623;}
- .st7{opacity:7.00e-02;enable-background:new;}
-
.st8{opacity:0.25;fill:none;stroke:#FF;stroke-width:0.5;stroke-miterlimit:10;enable-background:new
;}
+ .st4{opacity:7.00e-02;enable-background:new;}
+
.st5{opacity:0.25;fill:none;stroke:#FF;stroke-width:0.5;stroke-miterlimit:10;enable-background:new
;}
+ .st6{fill:#00AF89;}
+ .st7{opacity:0.23;fill:#F5A623;enable-background:n
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add CodeMirror as a beta feature
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363497 ) Change subject: Add CodeMirror as a beta feature .. Add CodeMirror as a beta feature Bug: T169284 Change-Id: Ifed3a79c041d0bba37ebca9a2ef596853034e037 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/97/363497/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index acc4cbd..53c87a3 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -13276,6 +13276,7 @@ 'visualeditor-newwikitext', // [Editing] 2017-11-02 – New wikitext editor 'twocolconflict',// [WMDE TW] 2017-11-12 – New edit conflict view 'rcenhancedfilters', // [Editing] 2017-11-18 - Enhanced recent changes filters + 'codemirror-syntax-highlight', // [Community Tech] 2018-01-05 - Syntax highlighting ], ], -- To view, visit https://gerrit.wikimedia.org/r/363497 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifed3a79c041d0bba37ebca9a2ef596853034e037 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...release[master]: Add codemirror to release/tools
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363496 ) Change subject: Add codemirror to release/tools .. Add codemirror to release/tools Change-Id: I971379bbff2830f281de5c6ba1ebc3af31ebbfad --- M make-wmf-branch/config.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/96/363496/1 diff --git a/make-wmf-branch/config.json b/make-wmf-branch/config.json index 9cdfe0a..ebdbe79 100644 --- a/make-wmf-branch/config.json +++ b/make-wmf-branch/config.json @@ -22,6 +22,7 @@ "CleanChanges", "Cognate", "CodeEditor", + "CodeMirror", "CodeReview", "CollaborationKit", "Collection", -- To view, visit https://gerrit.wikimedia.org/r/363496 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I971379bbff2830f281de5c6ba1ebc3af31ebbfad Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Config changes for deploying CodeMirror on testwiki
Niharika29 has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362327 )
Change subject: Config changes for deploying CodeMirror on testwiki
..
Config changes for deploying CodeMirror on testwiki
Bug: T169284
Change-Id: Id4bdbf17a37aa0190ee13ec694b97fff36f29dfc
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
3 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Niharika29: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2c12b52..6762935 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1941,6 +1941,11 @@
$wgLoginNotifyEnableOnSuccess = false;
}
+if ( $wmgUseCodeMirror ) {
+ wfLoadExtension( 'CodeMirror' );
+ $wgCodeMirrorBetaFeature = true;
+}
+
$wgDefaultUserOptions['thumbsize'] = $wmgThumbsizeIndex;
$wgDefaultUserOptions['showhiddencats'] = $wmgShowHiddenCats;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 22eb40d..acc4cbd 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18938,6 +18938,11 @@
'testwiki' => true,
],
+'wmgUseCodeMirror' => [
+ 'default' => false,
+ 'testwiki' => true, // T169284
+],
+
'wmgUseParserMigration' => [
'default' => true,
],
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 7fe4f24..b2227ce 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -19,6 +19,7 @@
$IP/extensions/cldr/extension.json
$IP/extensions/CleanChanges/extension.json
$IP/extensions/CodeEditor/extension.json
+$IP/extensions/CodeMirror/extension.json
$IP/extensions/CodeReview/extension.json
$IP/extensions/Cognate/extension.json
$IP/extensions/CollaborationKit/extension.json
--
To view, visit https://gerrit.wikimedia.org/r/362327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4bdbf17a37aa0190ee13ec694b97fff36f29dfc
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
Gerrit-Reviewer: MaxSem
Gerrit-Reviewer: Niharika29
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[wmf/1.30.0-wmf.7]: Add CodeMirror submodule
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/363479 ) Change subject: Add CodeMirror submodule .. Add CodeMirror submodule Change-Id: Iac00ac44e5d92dc889667c57051919418c45afc3 --- M .gitmodules A extensions/CodeMirror 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Niharika29: Verified; Looks good to me, approved diff --git a/.gitmodules b/.gitmodules index d1417a7..7023459 100644 --- a/.gitmodules +++ b/.gitmodules @@ -670,3 +670,6 @@ path = vendor url = https://gerrit.wikimedia.org/r/mediawiki/vendor branch = wmf/1.30.0-wmf.7 +[submodule "extensions/CodeMirror"] + path = extensions/CodeMirror + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CodeMirror.git diff --git a/extensions/CodeMirror b/extensions/CodeMirror new file mode 16 index 000..e0f3a23 --- /dev/null +++ b/extensions/CodeMirror @@ -0,0 +1 @@ +Subproject commit e0f3a237190a00075b17cf3c29398ee5bc92d352 -- To view, visit https://gerrit.wikimedia.org/r/363479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac00ac44e5d92dc889667c57051919418c45afc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.7 Gerrit-Owner: Niharika29 Gerrit-Reviewer: Niharika29 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[wmf/1.30.0-wmf.7]: Add CodeMirror submodule
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/363479 ) Change subject: Add CodeMirror submodule .. Add CodeMirror submodule Change-Id: Iac00ac44e5d92dc889667c57051919418c45afc3 --- M .gitmodules A extensions/CodeMirror 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/79/363479/1 diff --git a/.gitmodules b/.gitmodules index d1417a7..7023459 100644 --- a/.gitmodules +++ b/.gitmodules @@ -670,3 +670,6 @@ path = vendor url = https://gerrit.wikimedia.org/r/mediawiki/vendor branch = wmf/1.30.0-wmf.7 +[submodule "extensions/CodeMirror"] + path = extensions/CodeMirror + url = https://gerrit.wikimedia.org/r/p/mediawiki/extensions/CodeMirror.git diff --git a/extensions/CodeMirror b/extensions/CodeMirror new file mode 16 index 000..e0f3a23 --- /dev/null +++ b/extensions/CodeMirror @@ -0,0 +1 @@ +Subproject commit e0f3a237190a00075b17cf3c29398ee5bc92d352 -- To view, visit https://gerrit.wikimedia.org/r/363479 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac00ac44e5d92dc889667c57051919418c45afc3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.30.0-wmf.7 Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add CodeMirror to beta cluster
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363379 )
Change subject: Add CodeMirror to beta cluster
..
Add CodeMirror to beta cluster
Change-Id: Ibe49e55f080a1019ce2843276ff03e7801518398
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/extension-list-labs
3 files changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/79/363379/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 7972232..afccc84 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -335,6 +335,11 @@
$wgLoginNotifyAttemptsNewIP = 1;
}
+if ( $wmgUseCodeMirror ) {
+ wfLoadExtension( 'CodeMirror' );
+ $wgCodeMirrorBetaFeature = true;
+}
+
$wgStructuredChangeFiltersEnableExperimentalViews = true;
$wgMessageCacheType = CACHE_ACCEL;
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index b6cc81a..e0adcfe 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -497,6 +497,10 @@
'nonecho' => false,
],
+ 'wmgUseCodeMirror' => [
+ 'default' => true,
+ ],
+
// Ensure ?action=credits isn't break and allow to work
// to cache this information. See T130820.
'wgMaxCredits' => [
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index 24fbc13..57f3fbd 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -4,4 +4,5 @@
$IP/extensions/PerformanceInspector/extension.json
$IP/extensions/Sentry/extension.json
$IP/extensions/TemplateStyles/extension.json
+$IP/extensions/CodeMirror/extension.json
$IP/skins/Timeless/skin.json
--
To view, visit https://gerrit.wikimedia.org/r/363379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe49e55f080a1019ce2843276ff03e7801518398
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Make sure popup appears for both classic and wikitext editors
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/363090 )
Change subject: Make sure popup appears for both classic and wikitext editors
..
Make sure popup appears for both classic and wikitext editors
Bug: T165003
Change-Id: I4b1c9498df7931643ea3c39d6d2afd9384e47de0
---
M CodeMirror.hooks.php
M extension.json
M resources/ext.CodeMirror.js
3 files changed, 27 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/90/363090/1
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 9c88320..34364fa 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -127,7 +127,6 @@
*/
public static function onBeforePageDisplay( OutputPage &$out, Skin
&$skin ) {
if ( self::isCodeMirrorEnabled( $out->getContext() ) ) {
- $out->enableOOUI();
$out->addModules( 'ext.CodeMirror' );
}
}
diff --git a/extension.json b/extension.json
index e9fd787..bff8255 100644
--- a/extension.json
+++ b/extension.json
@@ -29,7 +29,7 @@
"mediawiki.api",
"mediawiki.api.options",
"user.options",
- "oojs-ui",
+ "oojs-ui-widgets",
"mediawiki.storage"
],
"scripts": [
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index abf6a24..aa823ac 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -412,6 +412,28 @@
popup.toggle( true );
}
+ /**
+* Handle popup. If popup hasn't been shown before, show popup and add
a localStorage entry.
+* check it before showing popup in future.
+*/
+ function handlePopup() {
+ popupStatus = mw.storage.get( 'codemirror-try-popup' );
+ // If popup entry isn't in local storage, lets show them the
popup
+ if ( !popupStatus ) {
+ mw.storage.set( 'codemirror-try-popup', 1 );
+ addPopup();
+ $( '.codemirror-popup-btn-yes' ).click( function () {
+ $( enableCodeMirror );
+ $( setCodeEditorPreference( true ) );
+ $( updateToolbarButton );
+ popup.toggle( false );
+ } );
+ $( '.codemirror-popup-btn-no' ).click( function () {
+ popup.toggle( false );
+ } );
+ }
+ }
+
/* Check if view is in edit mode and that the required modules are
available. Then, customize the toolbar … */
if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !==
-1 ) {
if ( wikiEditorToolbarEnabled ) {
@@ -432,26 +454,13 @@
// We don't know when button will be added,
wait until the document is ready to update it
$( function () {
updateToolbarButton();
- // Is there already a local storage
entry?
- // If so, we already showed them the
popup, don't show again
- popupStatus = mw.storage.get(
'codemirror-try-popup' );
- // If popup entry isn't in local
storage, lets show them the popup
- if ( !popupStatus ) {
- mw.storage.set(
'codemirror-try-popup', 1 );
- addPopup();
- $( '.codemirror-popup-btn-yes'
).click( function () {
- enableCodeMirror();
-
setCodeEditorPreference( true );
- updateToolbarButton();
- popup.toggle( false );
- } );
- $( '.codemirror-popup-btn-no'
).click( function () {
- popup.toggle( false );
- } );
- }
} );
} );
}
+ // Wait for DOM before loading our popup
+ $( function() {
+ handlePopup();
+ } );
}
// enable Code
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Add missing dependency
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/362460 ) Change subject: Add missing dependency .. Add missing dependency Bug: T165003 Change-Id: I77669035aa425230fe254e776fdb9a5cdd4715c7 --- M extension.json 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror refs/changes/60/362460/1 diff --git a/extension.json b/extension.json index db9d5af..e9fd787 100644 --- a/extension.json +++ b/extension.json @@ -29,7 +29,8 @@ "mediawiki.api", "mediawiki.api.options", "user.options", - "oojs-ui" + "oojs-ui", + "mediawiki.storage" ], "scripts": [ "ext.CodeMirror.js" -- To view, visit https://gerrit.wikimedia.org/r/362460 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I77669035aa425230fe254e776fdb9a5cdd4715c7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/CodeMirror Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Fixes for Codemirror popup patch
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362452 )
Change subject: Fixes for Codemirror popup patch
..
Fixes for Codemirror popup patch
Bug: T165003
Change-Id: I52e3cdb3afde242451e9cab68baecc1ab77868dc
---
M resources/ext.CodeMirror.js
1 file changed, 18 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/52/362452/1
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 62b6b5f..56991fe 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -392,11 +392,11 @@
function addPopup() {
this.popuptext = '' +
'{ ' +
- mw.msg( 'codemirror-popup-syntax' ) + ' ' +
- mw.msg( 'codemirror-popup-highlighting' ) + ' }' +
- '' + mw.msg(
'codemirror-popup-desc' ) + '' +
- '' + mw.msg( 'codemirror-popup-btn-yes' ) + '' +
- '' + mw.msg( 'codemirror-popup-btn-no' ) + '' +
+ mw.message( 'codemirror-popup-syntax' ).escaped() +
' ' +
+ mw.message( 'codemirror-popup-highlighting' ).escaped()
+ ' }' +
+ '' + mw.message(
'codemirror-popup-desc' ).escaped() + '' +
+ '' + mw.message( 'codemirror-popup-btn-yes'
).escaped() + '' +
+ '' + mw.message( 'codemirror-popup-btn-no' ).escaped()
+ '' +
'';
popup = new OO.ui.PopupWidget( {
$content: $( this.popuptext ),
@@ -416,9 +416,7 @@
if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !==
-1 ) {
if ( wikiEditorToolbarEnabled ) {
// Add our button
- if ( useCodeMirror ) {
- $( addCodeMirrorToWikiEditor );
- }
+ $( addCodeMirrorToWikiEditor );
} else {
// Load wikiEditor's toolbar and add our button
mw.loader.using( 'mediawiki.toolbar', function () {
@@ -436,24 +434,20 @@
updateToolbarButton();
// Is there already a local storage
entry?
// If so, we already showed them the
popup, don't show again
- popupStatus = localStorage.getItem(
'codemirror-try-popup' );
+ popupStatus = mw.storage.get(
'codemirror-try-popup' );
// If popup entry isn't in local
storage, lets show them the popup
if ( !popupStatus ) {
- try {
- localStorage.setItem(
'codemirror-try-popup', 1 );
- addPopup();
- $(
'.codemirror-popup-btn-yes' ).click( function () {
-
enableCodeMirror();
-
setCodeEditorPreference( true );
-
updateToolbarButton();
- popup.toggle(
false );
- } );
- $(
'.codemirror-popup-btn-no' ).click( function () {
- popup.toggle(
false );
- } );
- } catch ( e ) {
- // No local storage or
local storage full, don't show popup
- }
+ mw.storage.set(
'codemirror-try-popup', 1 );
+ addPopup();
+ $( '.codemirror-popup-btn-yes'
).click( function () {
+ enableCodeMirror();
+
setCodeEditorPreference( true );
+ updateToolbarButton();
+ popup.toggle( false );
+ });
+ $( '.codemirror-popup-btn-no'
).click( function () {
+ popup.toggle( false );
+
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Config changes for deploying CodeMirror on testwiki
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362327 )
Change subject: Config changes for deploying CodeMirror on testwiki
..
Config changes for deploying CodeMirror on testwiki
Bug: T169284
Change-Id: Id4bdbf17a37aa0190ee13ec694b97fff36f29dfc
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/27/362327/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2c12b52..6762935 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1941,6 +1941,11 @@
$wgLoginNotifyEnableOnSuccess = false;
}
+if ( $wmgUseCodeMirror ) {
+ wfLoadExtension( 'CodeMirror' );
+ $wgCodeMirrorBetaFeature = true;
+}
+
$wgDefaultUserOptions['thumbsize'] = $wmgThumbsizeIndex;
$wgDefaultUserOptions['showhiddencats'] = $wmgShowHiddenCats;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 930322d..52d0570 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18918,6 +18918,12 @@
'testwiki' => true,
],
+// Enable CodeMirror on testwiki (T169284)
+'wmgUseCodeMirror' => [
+ 'default' => false,
+ 'testwiki' => true,
+],
+
'wmgUseParserMigration' => [
'default' => true,
],
--
To view, visit https://gerrit.wikimedia.org/r/362327
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4bdbf17a37aa0190ee13ec694b97fff36f29dfc
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Config changes for LoginNotify
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362323 )
Change subject: Config changes for LoginNotify
..
Config changes for LoginNotify
Bug: T107707
Change-Id: I5dd77a0fb6b844ea1a4218900ea4f68be3e9c83c
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/23/362323/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2c12b52..61ddd89 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1938,7 +1938,8 @@
if ( $wmgUseLoginNotify ) {
wfLoadExtension( 'LoginNotify' );
- $wgLoginNotifyEnableOnSuccess = false;
+ $wgNotifyTypeAvailabilityByCategory['login-success']['web'] = false;
+
}
$wgDefaultUserOptions['thumbsize'] = $wmgThumbsizeIndex;
--
To view, visit https://gerrit.wikimedia.org/r/362323
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dd77a0fb6b844ea1a4218900ea4f68be3e9c83c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Allow notification emails for sucessful logins
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362320 )
Change subject: Allow notification emails for sucessful logins
..
Allow notification emails for sucessful logins
Bug: T107707
Change-Id: Iad330f1df4d05e3c17d093e4b6ace8986fb7bfb1
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/20/362320/1
diff --git a/i18n/en.json b/i18n/en.json
index 764c890..01273fb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,7 +15,7 @@
"loginnotify-primary-link": "Help",
"notification-loginnotify-login-fail-email-subject":
"{{PLURAL:$2|Failed attempt|Multiple failed attempts}} to log in to
{{SITENAME}} as $1",
"notification-loginnotify-login-success-email-subject": "Login to
{{SITENAME}} as $1 from a computer you have not recently used",
- "notification-header-login-success": "Someone has successfully logged
into your account from a computer which you have not edited from recently.",
+ "notification-header-login-success": "Someone (probably you) recently
logged in to your account from a new device. If this was you, then you can
disregard this message. If it wasn't you, then it's recommended that you change
your password, and check your account activity.",
"notification-new-bundled-header-login-fail": "There {{PLURAL:$1|has
been '''a failed attempt'''|have been '''$1 failed attempts'''}} to log in to
your account from a new device since the last time you logged in. If it wasn't
you, please make sure your account has a strong password.",
"notification-known-header-login-fail": "There have been
{{PLURAL:$1|has been '''a failed attempt'''|have been '''$1 failed
attempts'''}} to log in to your account since the last time you logged in. If
it wasn't you, please make sure your account has a strong password.",
"notification-new-unbundled-header-login-fail": "There {{PLURAL:$1|has
been '''a failed attempt'''|have been '''multiple failed attempts'''}} to log
in to your account from a new device. Please make sure your account has a
strong password."
--
To view, visit https://gerrit.wikimedia.org/r/362320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad330f1df4d05e3c17d093e4b6ace8986fb7bfb1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Design fixes for Codemirror
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362311 )
Change subject: Design fixes for Codemirror
..
Design fixes for Codemirror
Bug: T165178
Change-Id: If5b7c0807ff6fcdb30e1b8fe935b53ee0ca46a0d
---
M resources/ext.CodeMirror.less
M resources/mode/mediawiki/mediawiki.css
2 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/11/362311/1
diff --git a/resources/ext.CodeMirror.less b/resources/ext.CodeMirror.less
index b8830a5..a83114f 100644
--- a/resources/ext.CodeMirror.less
+++ b/resources/ext.CodeMirror.less
@@ -3,8 +3,14 @@
.CodeMirror {
line-height: 1.5em;
padding: 0.1em;
+
+ &.CodeMirror-wrap {
+ font-size: 12px;
+ line-height: 20px;
+ }
}
+
.mw-codeMirror-classicToolbar {
border: 1px solid #a2a9b1;
}
diff --git a/resources/mode/mediawiki/mediawiki.css
b/resources/mode/mediawiki/mediawiki.css
index abf6f73..1a3d937 100644
--- a/resources/mode/mediawiki/mediawiki.css
+++ b/resources/mode/mediawiki/mediawiki.css
@@ -26,8 +26,8 @@
.cm-mw-template-name { color: #70a; font-weight: bold; }
.cm-mw-template-name-mnemonic { font-weight: normal; }
.cm-mw-template-argument-name { color: #70a; font-weight: bold; }
-.cm-mw-template-delimiter { color: #70a; font-weight: bold; }
-.cm-mw-template-bracket { color: #70a; font-weight: bold; }
+.cm-mw-template-delimiter { color: #803e9d; font-weight: bold; }
+.cm-mw-template-bracket { color: #5b2c6f; font-weight: bold; }
.cm-mw-templatevariable { color: #f50; font-weight: normal; }
.cm-mw-templatevariable-name { color: #f50; font-weight: bold; }
@@ -52,11 +52,11 @@
pre.cm-mw-tag-pre, .cm-mw-tag-pre { background-image: url( img/black4.png ); }
pre.cm-mw-tag-nowiki, .cm-mw-tag-nowiki { background-image: url(
img/black4.png ); }
-.cm-mw-link-pagename { color: #219; font-weight: normal; }
+.cm-mw-link-pagename { color: #36c; font-weight: normal; }
.cm-mw-link-tosection { color: #08f; font-weight: normal; }
.cm-mw-link-bracket { color: #219; font-weight: normal; }
/* .cm-mw-link-text { } */
-.cm-mw-link-delimiter { color: #219; font-weight: normal; }
+.cm-mw-link-delimiter { color: #2a4b8d; font-weight: normal; }
.cm-mw-extlink, .cm-mw-free-extlink { color: #219; font-weight: normal; }
.cm-mw-extlink-protocol, .cm-mw-free-extlink-protocol { color: #219;
font-weight: bold; }
--
To view, visit https://gerrit.wikimedia.org/r/362311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5b7c0807ff6fcdb30e1b8fe935b53ee0ca46a0d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Fix 'Undefined class: LoginNotifyPresentationModel' error
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/361705 ) Change subject: Fix 'Undefined class: LoginNotifyPresentationModel' error .. Fix 'Undefined class: LoginNotifyPresentationModel' error Bug: T168899 Change-Id: Id845fcb5c53a2ac172a86fb4aa1cc8c246c9e19b --- M includes/Hooks.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify refs/changes/05/361705/1 diff --git a/includes/Hooks.php b/includes/Hooks.php index ff83a9d..bb5008b 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -49,7 +49,7 @@ ], 'category' => 'login-fail', 'group' => 'negative', - 'presentation-model' => 'LoginNotifyPresentationModel', + 'presentation-model' => 'LoginNotify\PresentationModel', // fixme, what does this actually do? 'title-message' => 'loginnotify-login-fail', 'title-params' => [], -- To view, visit https://gerrit.wikimedia.org/r/361705 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id845fcb5c53a2ac172a86fb4aa1cc8c246c9e19b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LoginNotify Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Show a popup for first time Codemirror users
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361600 )
Change subject: Show a popup for first time Codemirror users
..
Show a popup for first time Codemirror users
Bug: T165003
Change-Id: I545a57bdb273ab6906711e2d65dc029293ecc02a
---
M CodeMirror.hooks.php
M extension.json
M resources/ext.CodeMirror.js
A resources/modules/popup.css
4 files changed, 104 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/00/361600/1
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 8238fa1..921edf3 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -23,7 +23,6 @@
ExtensionRegistry::getInstance()->isLoaded(
'BetaFeatures' ) &&
BetaFeatures::isFeatureEnabled(
$context->getUser(), 'codemirror-syntax-highlight' );
}
-
return $isEnabled;
}
@@ -124,6 +123,7 @@
*/
public static function onBeforePageDisplay( OutputPage &$out, Skin
&$skin ) {
if ( self::isCodeMirrorEnabled( $out->getContext() ) ) {
+ $out->enableOOUI();
$out->addModules( 'ext.CodeMirror' );
}
}
diff --git a/extension.json b/extension.json
index cc62933..f610a9c 100644
--- a/extension.json
+++ b/extension.json
@@ -28,13 +28,15 @@
"jquery.textSelection",
"mediawiki.api",
"mediawiki.api.options",
- "user.options"
+ "user.options",
+ "oojs-ui"
],
"scripts": [
"ext.CodeMirror.js"
],
"styles": [
- "ext.CodeMirror.less"
+ "ext.CodeMirror.less",
+ "modules/popup.css"
],
"messages": [
"codemirror-toggle-label"
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index 7f766dd..5b4726d 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -9,7 +9,9 @@
// CodeMirror get's disabled.
origTextSelection = $.fn.textSelection;
useCodeMirror = mw.user.options.get( 'usecodemirror' ) > 0;
+
api = new mw.Api();
+ popup = null;
originHooksTextarea = $.valHooks.textarea;
// The WikiEditor extension exists the WikiEditor beta toolbar is used
by the user
wikiEditorToolbarEnabled = !!mw.loader.getState( 'ext.wikiEditor' ) &&
@@ -385,12 +387,41 @@
} );
}
+ /**
+* Add a popup for first time users (T165003)
+*
+* "" + "No, thank you" + ""
+*/
+ function addPopup() {
+ $content = "" +
+ "" + "{ Syntax Highlighting }" + "" +
+ "" + "Syntax highlighting will
help you easily distinguish different parts of your edit by color coding them"
+ "" +
+ "" + "Try it" + "" +
+ "" + "No, thank you" + "" +
+ "";
+ this.popup = new OO.ui.PopupWidget( {
+ $content: $( $content ),
+ containerPadding: 80,
+ $floatableContainer: $( '#mw-editbutton-codemirror' ),
+ padded: false,
+ width: 205
+ } );
+ // Add our popup to the body, it will find its correct position
using $floatableContainer
+ $( 'body' ).append( this.popup.$element );
+
+ // To display the popup, toggle the visibility to 'true'
+ this.popup.toggle( true );
+ }
+
/* Check if view is in edit mode and that the required modules are
available. Then, customize the toolbar … */
if ( $.inArray( mw.config.get( 'wgAction' ), [ 'edit', 'submit' ] ) !==
-1 ) {
if ( wikiEditorToolbarEnabled ) {
- // load wikiEditor's toolbar (if not already) and add
our button
- $( '#wpTextbox1' ).on(
'wikiEditor-toolbar-doneInitialSections', addCodeMirrorToWikiEditor );
+ // Add our button
+ if ( useCodeMirror ) {
+ $( addCodeMirrorToWikiEditor );
+ }
} else {
+ // Load wikiEditor's toolbar and add our button
mw.loader.using( 'mediawiki.toolbar', function () {
// If WikiEditor isn't enabled, add CodeMirror
button to the default
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add wmgBabelMainCategory for many languages
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/358007 ) Change subject: Add wmgBabelMainCategory for many languages .. Add wmgBabelMainCategory for many languages This is supposed to make Babel languages querying possible in as many wikis as possible. To create this list, I took the names of sitelinks of the "User en" category from Wikidata from all the sites, and replaced "en" with "%code%". Previous values were not changed. Change-Id: Ic8283e61be3292143f7fa4c457084b3cd752 --- M wmf-config/InitialiseSettings.php 1 file changed, 329 insertions(+), 0 deletions(-) Approvals: Niharika29: Looks good to me, approved Gergő Tisza: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index ab5f147..e3d84a6 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16057,34 +16057,172 @@ ], 'wmgBabelMainCategory' => [ 'default' => false, + 'abwiki' => 'User %code%', + 'acewiki' => 'User %code%', + 'afwiki' => 'Gebruiker %code%', + 'akwiki' => 'User %code%', + 'alswiki' => 'User %code%', + 'amwiki' => 'User %code%', + 'angwiki' => 'Brūcend %code%', + 'anwiki' => 'Usuario %code%', + 'arcwiki' => 'User %code%', + 'arwiki' => 'مستخدم %code%', + 'arwikinews' => 'مستخدم %code%', + 'arwikiquote' => 'مستخدم %code%', + 'arwikisource' => 'مستخدم %code%', + 'arwikiversity' => 'مستخدم %code%', + 'arzwiki' => 'User %code%', + 'aswiki' => 'User %code%', + 'avwiki' => 'User %code%', + 'aywiki' => 'Aru:%code%', + 'azwiki' => 'İstifadəçi %code%', + 'azwikibooks' => 'İstifadəçi %code%', + 'azwikiquote' => 'İstifadəçi %code%', + 'azwikisource' => 'İstifadəçi %code%', + 'barwiki' => 'User %code%', + 'bat_smgwiki' => 'User %code%', + 'bawiki' => 'User %code%', + 'be_x_oldwiki' => 'Вікіпэдыйцы, якія ведаюць мову %code%', 'betawikiversity' => 'User %code%', // T66168 + 'bewiki' => 'User %code%', + 'bhwiki' => 'User %code%', + 'biwiki' => 'User %code%', + 'bjnwiki' => 'User %code%', + 'bmwiki' => 'User %code%', + 'bowiki' => 'User %code%', + 'bpywiki' => 'আতাকুরা %code%', + 'brwiki' => 'Implijerien %code%', + 'brwikisource' => 'Implijerien %code%', + 'bswiki' => 'Korisnik %code%', + 'bswikinews' => 'User %code%', + 'bugwiki' => 'Pengguna %code%', + 'bxrwiki' => 'User %code%', 'cawiki' => 'Usuaris %code%', + 'cawikinews' => 'Usuaris %code%', 'cawiktionary' => 'Usuaris %code%', // T49287 + 'cbk_zamwiki' => 'User %code%', + 'cdowiki' => 'User %code%', + 'cebwiki' => 'User %code%', + 'cewiki' => 'User %code%', 'checkuserwiki' => 'User %code%', + 'chrwiki' => 'User %code%', + 'chwiki' => 'User %code%', + 'chywiki' => 'User %code%', + 'ckbwiki' => 'User %code%', 'commonswiki' => 'User %code%', + 'cowiki' => 'Utilizatore %code%', + 'crhwiki' => 'User %code%', + 'crwiki' => 'User %code%', + 'csbwiki' => 'Brëkòwnik %code%', + 'cswiki' => 'User %code%', 'cswikiversity' => 'Uživatel %code%', // T15530 + 'cuwiki' => 'User %code%', + 'cvwiki' => 'User %code%', + 'cywiki' => 'Defnyddiwr %code%', + 'dawiki' => 'Brugere %code%', + 'dawikibooks' => 'Brugere %code%', + 'dawikiquote' => 'Brugere %code%', + 'dawikisource' => 'Brugere %code%', + 'dewiki' => 'User %code%', + 'dewikibooks' => 'User %code%', + 'dewikinews' => 'User %code%', + 'dewikiquote' => 'User %code%', + 'dewikisource' => 'User %code%', + 'dewikiversity' => 'User %code%', + 'diqwiki' => 'User %code%', + 'dsbwiki' => 'Wužywaŕ %code%', + 'dvwiki' => 'User %code%', + 'dzwiki' => 'User %code%', + 'eewiki' => 'User %code%', + 'elwiki' => 'Χρήστης %code%', + 'elwikibooks' => 'Χρήστης %code%', + 'elwikiquote' => 'Χρήστης %code%', 'elwikisource' => 'Χρήστης %code%', //T161593 + 'elwikiversity' => 'User %code%', + 'emlwiki' => 'User %code%', 'enwiki' => 'User %code%', 'enwikibooks' => 'User %code%', 'enwikinews' => 'User %code%', 'enwikiquote' => 'User %code%', 'enwikisource' => 'User %code%', 'enwikiversity' => 'User %code%', + 'enwikivoyage' => 'User %code%', 'enwiktionary' => 'User %code%', + 'eowiki' => 'Vikipediisto %code%', + 'eowikibooks' => 'Uzanto %code%', + 'eowikinews' => 'Uzanto %code%', + 'eowikiquote' => 'Vikipediisto %code%', + 'eowikisource' => 'Uzanto %code%', 'eowiktionary' => 'Vikivortaristo %code%', // T63116
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Sort wmgBabelMainCategory alphabetically
Niharika29 has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/358006 ) Change subject: Sort wmgBabelMainCategory alphabetically .. Sort wmgBabelMainCategory alphabetically Change-Id: I2fade873ceaf17370564cade4966d16875b65c93 --- M wmf-config/InitialiseSettings.php 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Niharika29: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 154448d..ab5f147 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16066,11 +16066,11 @@ 'elwikisource' => 'Χρήστης %code%', //T161593 'enwiki' => 'User %code%', 'enwikibooks' => 'User %code%', - 'enwiktionary' => 'User %code%', + 'enwikinews' => 'User %code%', 'enwikiquote' => 'User %code%', 'enwikisource' => 'User %code%', - 'enwikinews' => 'User %code%', 'enwikiversity' => 'User %code%', + 'enwiktionary' => 'User %code%', 'eowiktionary' => 'Vikivortaristo %code%', // T63116 'eswiki' => 'Wikipedia:Wikipedistas con conocimientos de %wikiname%', 'eswikinews' => 'Usuario %code%', @@ -16087,13 +16087,13 @@ 'incubatorwiki' => 'Users:By language:%code%', 'iswiki' => 'Notandi %code%', 'itwiki' => 'Utenti %code%', - 'itwiktionary' => 'Utenti %code%', - 'itwikinews' => 'Utenti %code%', 'itwikibooks' => 'Utenti %code%', + 'itwikinews' => 'Utenti %code%', 'itwikiquote' => 'Utenti %code%', 'itwikisource' => 'Utenti %code%', 'itwikiversity' => 'Utenti %code%', 'itwikivoyage' => 'Utenti %code%', + 'itwiktionary' => 'Utenti %code%', 'jawiki' => 'User %code%', 'lawiki' => 'Usores %code%', 'metawiki' => 'User %code%', @@ -16118,13 +16118,13 @@ 'ukwikinews' => 'User %code%', // T48489 'ukwikisource' => 'Користувачі %code%', // T53608 'wikidata' => 'User %code%', - 'zhwiktionary' => '%wikiname%使用者', 'zhwiki' => '%code%_使用者', 'zhwikibooks' => '%code%_使用者', 'zhwikinews' => '%code%_使用者', 'zhwikiquote' => '%code%_使用者', 'zhwikisource' => '%code%_使用者', 'zhwikivoyage' => '%code%_使用者', // T63819 + 'zhwiktionary' => '%wikiname%使用者', ], 'wmgBabelDefaultLevel' => [ 'default' => 'N', -- To view, visit https://gerrit.wikimedia.org/r/358006 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2fade873ceaf17370564cade4966d16875b65c93 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Amire80 Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Niharika29 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...CodeMirror[master]: Add syntax highlight as a beta feature
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/358494 )
Change subject: Add syntax highlight as a beta feature
..
Add syntax highlight as a beta feature
Bug: T165543
Change-Id: If7eb2dc3f7c00a91e5ca39ae564f63efa07bbead
---
M CodeMirror.hooks.php
M extension.json
M i18n/en.json
3 files changed, 40 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/94/358494/1
diff --git a/CodeMirror.hooks.php b/CodeMirror.hooks.php
index 6bbaa15..e4f83f9 100644
--- a/CodeMirror.hooks.php
+++ b/CodeMirror.hooks.php
@@ -11,17 +11,19 @@
* @return bool
*/
private static function isCodeMirrorEnabled( IContextSource $context ) {
- global $wgCodeMirrorEnableFrontend;
+ global $wgCodeMirrorEnableFrontend, $wgCodeMirrorBetaFeature;
static $isEnabled = null;
// Check, if we already checked, if page action is editing, if
not, do it now
if ( $isEnabled === null ) {
- $isEnabled = $wgCodeMirrorEnableFrontend &&
- in_array(
- Action::getActionName( $context ),
- [ 'edit', 'submit' ]
- );
- }
+ $isEnabled =
+ $wgCodeMirrorEnableFrontend &&
+ in_array( Action::getActionName( $context ), [
'edit', 'submit' ] ) &&
+ $wgCodeMirrorBetaFeature == true &&
+ $wgCodeMirrorEnableFrontend == true &&
+ class_exists( 'BetaFeatures' ) &&
+ BetaFeatures::isFeatureEnabled(
$context->getUser(), 'codemirror-syntax-highlight' );
+ }
return $isEnabled;
}
@@ -144,4 +146,27 @@
];
}
+ /**
+* GetBetaFeaturePreferences hook handler
+*
+* @param User $user
+* @param array $preferences
+*/
+ public function onGetBetaFeaturePreferences( User $user, &$preferences
) {
+ global $wgCodeMirrorEnableFrontend, $wgCodeMirrorBetaFeature;
+ if ( $wgCodeMirrorEnableFrontend == true &&
$wgCodeMirrorBetaFeature == true ) {
+ $imagesDir = '';
+ $preferences['codemirror-syntax-highlight'] = [
+ 'label-message' => 'codemirror-beta-title',
+ 'desc-message' => 'codemirror-beta-desc',
+ 'screenshot' => [
+ 'ltr' => '',
+ 'rtl' => ''
+ ],
+ 'info-link' =>
'https://meta.wikimedia.org/wiki/Community_Tech/Wikitext_editor_syntax_highlighting',
+ 'discussion-link' =>
'https://meta.wikimedia.org/wiki/Talk:Community_Tech/Wikitext_editor_syntax_highlighting'
+ ];
+ }
+ }
+
}
diff --git a/extension.json b/extension.json
index 9575060..cc62933 100644
--- a/extension.json
+++ b/extension.json
@@ -141,6 +141,9 @@
],
"GetPreferences": [
"CodeMirrorHooks::onGetPreferences"
+ ],
+ "GetBetaFeaturePreferences": [
+ "CodeMirrorHooks::onGetBetaFeaturePreferences"
]
},
"VisualEditorPluginModules": [
@@ -148,7 +151,8 @@
"ext.CodeMirror.visualEditor"
],
"config": {
- "CodeMirrorEnableFrontend": true
+ "CodeMirrorEnableFrontend": true,
+ "CodeMirrorBetaFeature": true
},
"CodeMirrorTagModes": {
"pre": "mw-tag-pre",
diff --git a/i18n/en.json b/i18n/en.json
index 4ed7044..9087119 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,5 +5,7 @@
]
},
"codemirror-desc": "Provides syntax highlighting in wikitext editor",
- "codemirror-toggle-label": "Syntax highlighting"
+ "codemirror-toggle-label": "Syntax highlighting",
+ "codemirror-beta-title": "Syntax highlighting",
+ "codemirror-beta-desc": "Syntax highlighting makes editing easier by
using color and shade to visually separate article text from the code for
links, references and templates."
}
--
To view, visit https://gerrit.wikimedia.org/r/358494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7eb2dc3f7c00a91e5ca39ae564f63efa07bbead
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29
__
[MediaWiki-commits] [Gerrit] mediawiki...BlockAndNuke[master]: Increase the number of bytes read from the whitelist
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/356362 ) Change subject: Increase the number of bytes read from the whitelist .. Increase the number of bytes read from the whitelist Bug reported at https://www.mediawiki.org/w/index.php?title=Topic:S27v0luobpyhyjl9&topic_showPostId=trjfnwig076af8hp#flow-post-trjfnwig076af8hp Change-Id: Id4599b81ddc12de5bb6d548a840a33b2161d72a0 --- M BanPests.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlockAndNuke refs/changes/62/356362/1 diff --git a/BanPests.php b/BanPests.php index 92193a0..1f9bba1 100644 --- a/BanPests.php +++ b/BanPests.php @@ -15,7 +15,7 @@ } $fh = fopen( $wgBaNwhitelist, 'r' ); - $file = fread( $fh, 200 ); + $file = fread( $fh, 8192 ); fclose( $fh ); return preg_split( '/\r\n|\r|\n/', $file ); } -- To view, visit https://gerrit.wikimedia.org/r/356362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id4599b81ddc12de5bb6d548a840a33b2161d72a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlockAndNuke Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Show total number of autoblocks on top of Special:AutoblockList
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/355805 )
Change subject: Show total number of autoblocks on top of Special:AutoblockList
..
Show total number of autoblocks on top of Special:AutoblockList
Bug: T163172
Change-Id: I51b1b7675c2f4ed68ccb725230ffecf3583cf65f
---
M includes/specials/SpecialAutoblockList.php
M includes/specials/pagers/BlockListPager.php
M languages/i18n/en.json
M languages/i18n/qqq.json
4 files changed, 39 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/05/355805/1
diff --git a/includes/specials/SpecialAutoblockList.php
b/includes/specials/SpecialAutoblockList.php
index dcb2444..72ab117 100644
--- a/includes/specials/SpecialAutoblockList.php
+++ b/includes/specials/SpecialAutoblockList.php
@@ -78,6 +78,7 @@
->prepareForm()
->displayForm( false );
+ $this->showTotal( $pager );
$this->showList( $pager );
}
@@ -98,6 +99,20 @@
}
/**
+* Show total number of autoblocks on top of the table
+*
+* @param BlockListPager $pager The BlockListPager instance for this
page
+*/
+ protected function showTotal( BlockListPager $pager ) {
+ $out = $this->getOutput();
+ $out->addHTML(
+ Html::element( 'h5', [],
+ $this->msg( 'autoblocklist-total-autoblocks',
$pager->getTotalAutoblocks() )->parse() )
+ . "\n"
+ );
+ }
+
+ /**
* Show the list of blocked accounts matching the actual filter.
* @param BlockListPager $pager The BlockListPager instance for this
page
*/
diff --git a/includes/specials/pagers/BlockListPager.php
b/includes/specials/pagers/BlockListPager.php
index 9a447ef..8ae07d8 100644
--- a/includes/specials/pagers/BlockListPager.php
+++ b/includes/specials/pagers/BlockListPager.php
@@ -246,6 +246,28 @@
return $info;
}
+ /**
+* Get total number of autoblocks at any given time
+*
+* @return int Total number of unexpired active autoblocks
+*/
+ function getTotalAutoblocks() {
+ $dbr = $this->getDatabase();
+ $res = $dbr->select( 'ipblocks',
+ [ 'COUNT(*) AS totalautoblocks' ],
+ [
+ 'ipb_auto' => '1',
+ 'ipb_expiry >= ' . $dbr->addQuotes(
$dbr->timestamp() ),
+ ]
+ );
+ foreach ( $res as $row ) {
+ if ( $row->totalautoblocks ) {
+ return $row->totalautoblocks; // Total number
of autoblocks
+ }
+ }
+ return 0; // We found nothing
+ }
+
protected function getTableClass() {
return parent::getTableClass() . ' mw-blocklist';
}
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index cc60432..a0efd05 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -2497,6 +2497,7 @@
"autoblocklist-submit": "Search",
"autoblocklist-legend": "List autoblocks",
"autoblocklist-localblocks": "Local {{PLURAL:$1|autoblock|autoblocks}}",
+ "autoblocklist-total-autoblocks": "Total number of autoblocks: $1",
"autoblocklist-empty": "The autoblock list is empty.",
"autoblocklist-otherblocks": "Other {{PLURAL:$1|autoblock|autoblocks}}",
"ipblocklist": "Blocked users",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 694ef74..7b7f27f 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2686,6 +2686,7 @@
"autoblocklist-legend": "Used as legend of the form in
[[Special:AutoblockList]].\n\nSee also:\n* {{msg-mw|Autoblocklist-legend}}\n*
{{msg-mw|Autoblocklist-submit}}",
"autoblocklist-localblocks": "[[File:Special AutoBlockList
new.png|thumb|Example]]\nUsed on [[Special:AutoblockList]] as header when
global autoblocks exists too.",
"autoblocklist-empty": "Used in [[Special:AutoblockList]].",
+ "autoblocklist-total-autoblocks": "Shows the total number of active
autoblocks on [[Special:AutoblockList]]. Parameters:\n* $1 - number of
autoblocks",
"autoblocklist-otherblocks": "[[File:Special AutoBlockList
new.png|thumb|Example]]\nUsed on [[Special:AutoblockList]] as header for other
blocks, i.e. from GlobalBlocking or TorBlocks.\n\nParameters:\n* $1 - number of
blocks",
"ipblocklist": "Title of [[Special:Ipblocklist]].",
"ipblocklist-legend": "Used as legend of the form in
[[Special:BlockList]].\n\nSee also:\n* {{msg-mw|Ipblocklist-legend}}\n*
{{msg-mw|Ipblocklist-submit}}",
--
To view, visit https://gerrit
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add loginnotify to extension-list for prod deployment
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/353352 ) Change subject: Add loginnotify to extension-list for prod deployment .. Add loginnotify to extension-list for prod deployment Change-Id: I5df79981b4ca95545c3dd496357f9dba35ca15cd --- M wmf-config/extension-list M wmf-config/extension-list-labs 2 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/52/353352/1 diff --git a/wmf-config/extension-list b/wmf-config/extension-list index 094ee17..b0d30ce 100644 --- a/wmf-config/extension-list +++ b/wmf-config/extension-list @@ -152,6 +152,7 @@ $IP/extensions/XAnalytics/extension.json $IP/extensions/ZeroBanner/extension.json $IP/extensions/ZeroPortal/extension.json +$IP/extensions/LoginNotify/extension.json $IP/skins/CologneBlue/skin.json $IP/skins/Modern/skin.json $IP/skins/MonoBook/skin.json diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs index da80b86..2c02676 100644 --- a/wmf-config/extension-list-labs +++ b/wmf-config/extension-list-labs @@ -7,4 +7,3 @@ $IP/extensions/PerformanceInspector/extension.json $IP/extensions/Sentry/extension.json $IP/skins/Timeless/skin.json -$IP/extensions/LoginNotify/extension.json -- To view, visit https://gerrit.wikimedia.org/r/353352 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5df79981b4ca95545c3dd496357f9dba35ca15cd Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ 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 LoginNotify on testwiki
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/351195 )
Change subject: Enable LoginNotify on testwiki
..
Enable LoginNotify on testwiki
Change-Id: I050df526976acd9f1c073c80e6dd0caf2ba29f35
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/95/351195/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 2794a57..b94d99a 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1915,6 +1915,11 @@
$wgDefaultUserOptions['uselivepreview'] = 1;
}
+if ( $wmgUseLoginNotify ) {
+ wfLoadExtension( 'LoginNotify' );
+ $wgLoginNotifyEnableOnSuccess = false;
+}
+
$wgDefaultUserOptions['thumbsize'] = $wmgThumbsizeIndex;
$wgDefaultUserOptions['showhiddencats'] = $wmgShowHiddenCats;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 775e521..5e081b9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18549,6 +18549,12 @@
'foundationwiki' => true,
],
+// Enable LoginNotify on testwiki
+'wmgUseLoginNotify' => [
+ 'default' => false,
+ 'testwiki' => true,
+],
+
'wmgUseParserMigration' => [
'default' => true,
],
--
To view, visit https://gerrit.wikimedia.org/r/351195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I050df526976acd9f1c073c80e6dd0caf2ba29f35
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Fix broken LoginNotify emails
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350889 )
Change subject: Fix broken LoginNotify emails
..
Fix broken LoginNotify emails
Bug: T163742
Change-Id: I26b7c65c798cee376ba4c750851e7e7669d96e01
---
M LoginNotifyPresentationModel.php
M i18n/en.json
M i18n/qqq.json
3 files changed, 26 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/89/350889/1
diff --git a/LoginNotifyPresentationModel.php b/LoginNotifyPresentationModel.php
index f3ec6e7..e061d50 100644
--- a/LoginNotifyPresentationModel.php
+++ b/LoginNotifyPresentationModel.php
@@ -17,11 +17,33 @@
*/
public function getPrimaryLink() {
return [
- 'url' =>
'https://mediawiki.org/wiki/Help:Login_notifications'
+ 'url' =>
'https://mediawiki.org/wiki/Help:Login_notifications',
+ 'label' => $this->msg( 'loginnotify-primary-link'
)->text()
];
}
/**
+* Define the email subject string
+*
+* @return string Message string for email subject
+*/
+ public function getSubjectMessage() {
+ switch ( $this->event->getType() ) {
+ case 'login-fail-known':
+ case 'login-fail-new':
+ $msg = $this->msg(
'notification-loginnotify-login-fail-email-subject' );
+ $msg->params( $this->getUser()->getName() );
+ $msg->params( $this->event->getExtraParam(
'count', 0 ) );
+ break;
+ default:
+ $msg = $this->msg(
'notification-loginnotify-login-success-email-subject' );
+ $msg->params( $this->getUser()->getName() );
+ break;
+ }
+ return $msg;
+ }
+
+ /**
* Include the number of attempts in the message if needed
*
* @return Message
diff --git a/i18n/en.json b/i18n/en.json
index b150f98..2507524 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -12,11 +12,12 @@
"echo-category-title-login-success": "Login from new computer",
"echo-pref-tooltip-login-success": "Notify me whenever somebody logs
into my account from a computer I have not used before.",
"loginnotify-login-fail": "There have been several failed attempts to
log in to your account",
+ "loginnotify-primary-link": "Help information",
"notification-loginnotify-login-fail-email-subject":
"{{PLURAL:$2|Failed attempt|Multiple failed attempts}} to log in to
{{SITENAME}} as $1",
"notification-loginnotify-login-success-email-subject": "Login to
{{SITENAME}} as $1 from a computer you have not recently used",
- "notification-header-login-success": "Someone has successfully logged
into your account from a computer which you have not edited from recently.",
"notification-loginnotify-login-fail-new-emailbatch": "There
{{PLURAL:$2|has been a failed attempt|have been $2 failed attempts}} to log in
to your account '$1' on {{SITENAME}}. If it wasn't you, please make sure your
account has a strong password.",
"notification-loginnotify-login-fail-known-emailbatch": "There
{{PLURAL:$2|has been a failed attempt|have been $2 failed attempts}} to log in
to your account, '$1' on {{SITENAME}}. If it wasn't you, please make sure your
account has a strong password.",
+ "notification-header-login-success": "Someone has successfully logged
into your account from a computer which you have not edited from recently.",
"notification-loginnotify-login-success-emailbatch": "Someone has
successfully logged into your account '$1' on {{SITENAME}} from a computer
which you have not edited from recently.",
"notification-new-bundled-header-login-fail": "There {{PLURAL:$1|has
been '''a failed attempt'''|have been '''$1 failed attempts'''}} to log in to
your account from a new device since the last time you logged in. If it wasn't
you, please make sure your account has a strong password.",
"notification-known-header-login-fail": "There have been
{{PLURAL:$1|has been '''a failed attempt'''|have been '''$1 failed
attempts'''}} to log in to your account since the last time you logged in. If
it wasn't you, please make sure your account has a strong password.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9a749c5..6dfbb32 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -11,6 +11,7 @@
"echo-category-title-login-success": "Label for 2 checkboxes in the
Notifications section of [[Special:Preferences]]. The checkbox controls if the
user receives notification on someone logging in to this account from a
computer that has not previously been
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Add a primary link to the notification
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350750 )
Change subject: Add a primary link to the notification
..
Add a primary link to the notification
Bug: T163856
Change-Id: Ie8d51b4f0aecb857e8ab95ed15c4d776da7e495f
---
M LoginNotifyPresentationModel.php
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/50/350750/1
diff --git a/LoginNotifyPresentationModel.php b/LoginNotifyPresentationModel.php
index 17fe07f..f3ec6e7 100644
--- a/LoginNotifyPresentationModel.php
+++ b/LoginNotifyPresentationModel.php
@@ -11,12 +11,14 @@
}
/**
-* Nothing really to link to
+* Link to help page on mediawiki
*
-* @return boolean false to disable link
+* @return array url to link to
*/
public function getPrimaryLink() {
- return false;
+ return [
+ 'url' =>
'https://mediawiki.org/wiki/Help:Login_notifications'
+ ];
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/350750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8d51b4f0aecb857e8ab95ed15c4d776da7e495f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Update documentation for "LoginNotifyEnableForPriv"
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/350665 ) Change subject: Update documentation for "LoginNotifyEnableForPriv" .. Update documentation for "LoginNotifyEnableForPriv" Bug:T160094 Change-Id: I96ac5961ce220640b4a8028f270964f5e5f1527b --- M README.md M extension.json 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify refs/changes/65/350665/1 diff --git a/README.md b/README.md index c7576a6..3a1f36c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ "LoginNotifyCheckKnownIPs": true, "@doc": "Whether to trigger a notification after successful logins from unknown IPs.", "LoginNotifyEnableOnSuccess": true, - "@doc": "Enable notification for users with certain rights. To disable set to false", + "@doc": "Set different default notification preferences for different user groups", "LoginNotifyEnableForPriv": [ "editinterface", "userrights" ], "@doc": "Override this to use a different secret than $wgSecretKey", "LoginNotifySecretKey": null, diff --git a/extension.json b/extension.json index 421454f..a3fa8ab 100644 --- a/extension.json +++ b/extension.json @@ -68,7 +68,7 @@ "LoginNotifyCheckKnownIPs": true, "@docLoginNotifyEnableOnSuccess": "Whether to trigger a notification after successful logins from unknown IPs.", "LoginNotifyEnableOnSuccess": true, - "@docLoginNotifyEnableForPriv": "Enable notification for users with certain rights. To disable set to false", + "@docLoginNotifyEnableForPriv": "Set different default notification preferences for different user groups", "LoginNotifyEnableForPriv": [ "editinterface", "userrights" ], "@docLoginNotifySecretKey": "Override this to use a different secret than $wgSecretKey", "LoginNotifySecretKey": null, -- To view, visit https://gerrit.wikimedia.org/r/350665 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I96ac5961ce220640b4a8028f270964f5e5f1527b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LoginNotify Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Turn off LoginNotify notifications for succesful logins
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/350270 ) Change subject: Turn off LoginNotify notifications for succesful logins .. Turn off LoginNotify notifications for succesful logins Bug: T163816 Change-Id: I1af217f5bfcd140c26948ede249ef8979dd16432 --- M wmf-config/CommonSettings-labs.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/70/350270/1 diff --git a/wmf-config/CommonSettings-labs.php b/wmf-config/CommonSettings-labs.php index cbe787f..107c736 100644 --- a/wmf-config/CommonSettings-labs.php +++ b/wmf-config/CommonSettings-labs.php @@ -343,6 +343,7 @@ wfLoadExtension( 'LoginNotify' ); $wgLoginNotifyAttemptsKnownIP = 10; $wgLoginNotifyAttemptsNewIP = 1; + $wgLoginNotifyEnableOnSuccess = false; } $wgMessageCacheType = CACHE_ACCEL; -- To view, visit https://gerrit.wikimedia.org/r/350270 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1af217f5bfcd140c26948ede249ef8979dd16432 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Change default configs for LoginNotify production
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350089 )
Change subject: Change default configs for LoginNotify production
..
Change default configs for LoginNotify production
Bug: T160094
Change-Id: Ibb19e2569d3b3f86dfdeffb3f803cae677e7ee59
---
M extension.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/89/350089/1
diff --git a/extension.json b/extension.json
index 305da8a..421454f 100644
--- a/extension.json
+++ b/extension.json
@@ -57,11 +57,11 @@
},
"config": {
"@docLoginNotifyAttemptsKnownIP": "The number of failed login
attempts to permit from a known IP before a notification is triggered.",
- "LoginNotifyAttemptsKnownIP": 10,
+ "LoginNotifyAttemptsKnownIP": 5,
"@docLoginNotifyExpiryKnownIP": "The time-to-live of the count
of failed login attempts from a known IP (from the time of the first failed
attempt).",
"LoginNotifyExpiryKnownIP": 604800,
"@docLoginNotifyAttemptsNewIP": "The number of failed login
attempts to permit from a new IP before a notification is triggered.",
- "LoginNotifyAttemptsNewIP": 3,
+ "LoginNotifyAttemptsNewIP": 1,
"@docLoginNotifyExpiryNewIP": "The time-to-live of the count of
failed login attempts from a new IP (from the time of the first failed
attempt).",
"LoginNotifyExpiryNewIP": 1209600,
"@docLoginNotifyCheckKnownIPs": "Whether to trigger a
notification after failed logins from known IPs.",
--
To view, visit https://gerrit.wikimedia.org/r/350089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb19e2569d3b3f86dfdeffb3f803cae677e7ee59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Change wording to distinguish between new and known devices
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/349264 )
Change subject: Change wording to distinguish between new and known devices
..
Change wording to distinguish between new and known devices
No change of wording for known devices
Bug: T158878
Change-Id: Ie0997123020f9c0e3190fc016e9a4990523d146f
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/64/349264/1
diff --git a/i18n/en.json b/i18n/en.json
index bc9d9f6..db43c73 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -18,6 +18,8 @@
"notification-loginnotify-login-fail-new-emailbatch": "There
{{PLURAL:$2|has been a failed attempt|have been $2 failed attempts}} to log in
to your account '$1' on {{SITENAME}}. If this was you, then you can disregard
this message. If it wasn't, please make sure your account has a strong
password.",
"notification-loginnotify-login-fail-known-emailbatch": "There
{{PLURAL:$2|has been a failed attempt|have been $2 failed attempts}} to log in
to your account, '$1' on {{SITENAME}}. If this was you, then you can disregard
this message. If it wasn't, please make sure your account has a strong
password.",
"notification-loginnotify-login-success-emailbatch": "Someone has
successfully logged into your account '$1' on {{SITENAME}} from a computer
which you have not edited from recently.",
- "notification-bundled-header-login-fail": "There have been '''$1 failed
attempts''' to login to your account since the last time you logged in. If this
was you, then you can disregard this message. If it wasn't, please make sure
your account has a strong password.",
- "notification-unbundled-header-login-fail": "There have been multiple
failed login attempts to your account. Please make sure your account has a
strong password."
+ "notification-new-bundled-header-login-fail": "There have been '''$1
failed login attempts''' to your account, from a new device, since the last
time you logged in. If this was you, then you can disregard this message. If it
wasn't, please make sure your account has a strong password.",
+ "notification-known-bundled-header-login-fail": "There have been '''$1
failed login attempts''' to your account since the last time you logged in. If
this was you, then you can disregard this message. If it wasn't, please make
sure your account has a strong password.",
+ "notification-new-unbundled-header-login-fail": "There have been
multiple failed login attempts to your account from a new device. Please make
sure your account has a strong password.",
+ "notification-knwon-unbundled-header-login-fail": "There have been
multiple failed login attempts to your account. Please make sure your account
has a strong password."
}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index a38b862..3d7108e 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -17,6 +17,8 @@
"notification-loginnotify-login-fail-new-emailbatch": "Body of email
notification that someone from a computer not previously used by the user has
attempted and failed to log into the user's account. Subject of Message is
{{msg-mw|notification-loginnotify-login-fail-email-subject}}. $1 is account
name. $2 is the number of attempts",
"notification-loginnotify-login-fail-known-emailbatch": "Body of email
notification that someone from a computer which has been previously used by the
user has attempted and failed to log into the user's account. Subject of
Message is {{msg-mw|notification-loginnotify-login-fail-email-subject}}. $1 is
account name. $2 is the number of attempts",
"notification-loginnotify-login-success-emailbatch": "Body of email
notification that someone from a computer not previously used by the user has
succesfully logged into the user's account. Subject of Message is
{{msg-mw|notification-loginnotify-login-success-email-subject}}. $1 is account
name.",
+ "notification-new-bundled-header-login-fail": "Message string shown for
bundled notifications for login attempts from a new device",
"notification-bundled-header-login-fail": "Message string shown for
bundled notifications",
+ "notification-new-unbundled-header-login-fail": "Message string shown
for individual notifications for login attempts from a new device, when the
bundle disperses",
"notification-unbundled-header-login-fail": "Message string shown for
individual notifications when the bundle disperses"
}
--
To view, visit https://gerrit.wikimedia.org/r/349264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0997123020f9c0e3190fc016e9a4990523d146f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
_
[MediaWiki-commits] [Gerrit] mediawiki...CodeMirror[master]: Swap parser function and assessment template colors
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348521 )
Change subject: Swap parser function and assessment template colors
..
Swap parser function and assessment template colors
Bug: T162206
Change-Id: I2d8705a8ec44c668aebc4728cd84e0953cd497a1
---
M resources/mode/mediawiki/mediawiki.css
1 file changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeMirror
refs/changes/21/348521/1
diff --git a/resources/mode/mediawiki/mediawiki.css
b/resources/mode/mediawiki/mediawiki.css
index 55aec4a..ecbcc13 100644
--- a/resources/mode/mediawiki/mediawiki.css
+++ b/resources/mode/mediawiki/mediawiki.css
@@ -22,12 +22,12 @@
pre.cm-mw-section-6 { font-weight: bold; }
.cm-mw-section-header { color: #08f; font-weight: normal; }
-.cm-mw-template { color: #a11; font-weight: normal; }
-.cm-mw-template-name { color: #a11; font-weight: bold; }
+.cm-mw-template { color: #70a; font-weight: normal; }
+.cm-mw-template-name { color: #70a; font-weight: bold; }
.cm-mw-template-name-mnemonic { font-weight: normal; }
-.cm-mw-template-argument-name { color: #a11; font-weight: bold; }
-.cm-mw-template-delimiter { color: #a11; font-weight: bold; }
-.cm-mw-template-bracket { color: #a11; font-weight: bold; }
+.cm-mw-template-argument-name { color: #70a; font-weight: bold; }
+.cm-mw-template-delimiter { color: #70a; font-weight: bold; }
+.cm-mw-template-bracket { color: #70a; font-weight: bold; }
.cm-mw-templatevariable { color: #f50; font-weight: normal; }
.cm-mw-templatevariable-name { color: #f50; font-weight: bold; }
@@ -35,9 +35,9 @@
.cm-mw-templatevariable-delimiter { color: #f50; font-weight: bold; }
.cm-mw-parserfunction { font-weight: normal; }
-.cm-mw-parserfunction-name { color: #70a; font-weight: bold; }
-.cm-mw-parserfunction-bracket { color: #70a; font-weight: bold; }
-.cm-mw-parserfunction-delimiter { color: #70a; font-weight: bold; }
+.cm-mw-parserfunction-name { color: #a11; font-weight: bold; }
+.cm-mw-parserfunction-bracket { color: #a11; font-weight: bold; }
+.cm-mw-parserfunction-delimiter { color: #a11; font-weight: bold; }
pre.cm-mw-exttag { background-image: url( img/ext2.png ); }
.cm-mw-exttag { background-image: url( img/ext4.png ); }
--
To view, visit https://gerrit.wikimedia.org/r/348521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d8705a8ec44c668aebc4728cd84e0953cd497a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Remove use of blacklist for related pages feature"
Hello Florianschmidtwelzow, jenkins-bot, Jdlrobson, I'd like you to do a code review. Please visit https://gerrit.wikimedia.org/r/348175 to review the following change. Change subject: Revert "Remove use of blacklist for related pages feature" .. Revert "Remove use of blacklist for related pages feature" This reverts commit b1e2c68eb44eaf33743d2420eacc950adc29519a. Change-Id: Id471a115fd9c4f332d41becd1f6ed26673ca655d --- M wmf-config/InitialiseSettings.php 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/75/348175/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index fdac7c3..485c565 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -16920,6 +16920,12 @@ 'related-articles-footer-blacklisted-skins' => [], ], +// Can be removed when T160076 is deployed everywhere +'wmgRelatedArticlesFooterBlacklistedSkins' => [ + 'default' => [], + 'related-articles-footer-blacklisted-skins' => [ 'minerva' ], +], + 'wgRelatedArticlesEnabledSamplingRate' => [ 'default' => 1, 'enwiki' => 0.9, -- To view, visit https://gerrit.wikimedia.org/r/348175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id471a115fd9c4f332d41becd1f6ed26673ca655d Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Jdlrobson 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]: Update the LoginNotify config to match what would be going i...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/348003 )
Change subject: Update the LoginNotify config to match what would be going into
prod
..
Update the LoginNotify config to match what would be going into prod
Bug: T162104
Change-Id: I8ad6ca996917fb5f7579f93762e31ad9a807969a
---
M wmf-config/CommonSettings-labs.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/03/348003/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index c1cb82d..4ad54e9 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -348,7 +348,8 @@
if ( $wmgUseLoginNotify ) {
wfLoadExtension( 'LoginNotify' );
- $wgLoginNotifyAttemptsKnownIP = 4;
+ $wgLoginNotifyAttemptsKnownIP = 10;
+ $wgLoginNotifyAttemptsNewIP = 1;
}
$wgMessageCacheType = CACHE_ACCEL;
--
To view, visit https://gerrit.wikimedia.org/r/348003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ad6ca996917fb5f7579f93762e31ad9a807969a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Bundle notifications and show a single header message
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347120 )
Change subject: Bundle notifications and show a single header message
..
Bundle notifications and show a single header message
Bug: T162104
Change-Id: I6056098de7947dc450efdbbce6e42638bec4e2fd
---
M LoginNotify.hooks.php
M LoginNotifyPresentationModel.php
M extension.json
M i18n/en.json
4 files changed, 34 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/20/347120/1
diff --git a/LoginNotify.hooks.php b/LoginNotify.hooks.php
index 0831d17..3b985da 100644
--- a/LoginNotify.hooks.php
+++ b/LoginNotify.hooks.php
@@ -44,6 +44,10 @@
'category' => 'login-fail',
'group' => 'negative',
'presentation-model' => 'LoginNotifyPresentationModel',
+ 'bundle' => [
+ 'web' => true,
+ 'expandable' => false
+ ],
// fixme, what does this actually do?
'title-message' => 'loginnotify-login-fail',
'title-params' => [],
@@ -79,6 +83,16 @@
return true;
}
+ public static function onEchoGetBundleRules( $event, &$bundleString ) {
+ switch ( $event->getType() ) {
+ case 'login-fail-known':
+ case 'login-fail-new':
+ $bundleString = 'login-fail';
+ break;
+ }
+ return true;
+ }
+
/**
* Old hook for pre 1.27 or wikis with auth manager disabled.
*
diff --git a/LoginNotifyPresentationModel.php b/LoginNotifyPresentationModel.php
index cf1e2cd..dbe79f7 100644
--- a/LoginNotifyPresentationModel.php
+++ b/LoginNotifyPresentationModel.php
@@ -23,16 +23,24 @@
* Include the number of attempts in the message
*
* (For grep) This uses i18n messages:
-* notification-header-login-fail-known
-* notification-header-login-fail-new
-* notification-header-login-success
+* notification-bundled-header-login-fail
+* notification-unbundled-header-login-fail
*
* @return Message
*/
public function getHeaderMessage() {
- return parent::getHeaderMessage()->numParams(
- $this->event->getExtraParam( 'count', 0 )
- );
+ if ( $this->isBundled() ) {
+ $msg = $this->msg(
'notification-bundled-header-login-fail' );
+ $msg->params( $this->getBundleCount() );
+ return $msg;
+ } else {
+ $msg = $this->msg(
'notification-unbundled-header-login-fail' );
+ return $msg;
+ }
+ }
+
+ public function getCompactHeaderMessage() {
+ return $this->msg( 'somethingshort' );
}
/**
diff --git a/extension.json b/extension.json
index fb3933e..305da8a 100644
--- a/extension.json
+++ b/extension.json
@@ -33,6 +33,9 @@
"BeforeCreateEchoEvent": [
"LoginNotifyHooks::onBeforeCreateEchoEvent"
],
+ "EchoGetBundleRules": [
+ "LoginNotifyHooks::onEchoGetBundleRules"
+ ],
"LoginAuthenticateAudit": [
"LoginNotifyHooks::onLoginAuthenticateAudit"
],
diff --git a/i18n/en.json b/i18n/en.json
index 61e5992..c16925e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -13,10 +13,10 @@
"loginnotify-login-fail": "There have been several failed attempts to
log in to your account",
"notification-loginnotify-login-fail-email-subject":
"{{PLURAL:$2|Failed attempt|Multiple failed attempts}} to log in to
{{SITENAME}} as $1",
"notification-loginnotify-login-success-email-subject": "Login to
{{SITENAME}} as $1 from a computer you have not recently used",
- "notification-header-login-fail-known": "There {{PLURAL:$3|has been
'''one failed attempt'''|have been '''$3 failed attempts'''}} to log in to your
account since the last time you logged in. If this was you, then you can
disregard this message. If it wasn't, please make sure your account has a
strong password.",
- "notification-header-login-fail-new": "There {{PLURAL:$3|has been
'''one failed attempt'''|have been '''$3 failed attempts'''}} to log in to your
account since the last time you logged in. If this was you, then you can
disregard this message. If it wasn't, please make sure your account has a
strong password.",
"notification-header-login-success": "Someone has successfully logged
into your account
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346464 )
Change subject: Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing
easier
..
Update $wgLoginNotifyAttemptsKnownIP in Labs to make testing easier
Bug: T160094
Change-Id: I6ca70ac3b2dc908bb7f739c196b23da363bbec6c
---
M wmf-config/CommonSettings-labs.php
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/64/346464/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 5cfb670..1b2fb8d 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -348,6 +348,7 @@
if ( $wmgUseLoginNotify ) {
wfLoadExtension( 'LoginNotify' );
+ $wgLoginNotifyAttemptsKnownIP = 4;
}
$wgMessageCacheType = CACHE_ACCEL;
--
To view, visit https://gerrit.wikimedia.org/r/346464
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ca70ac3b2dc908bb7f739c196b23da363bbec6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
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 LoginNotify on Beta cluster
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345726 )
Change subject: Test LoginNotify on Beta cluster
..
Test LoginNotify on Beta cluster
Bug: T158878
Change-Id: I149fe7e82c26c2133b3e73dcf3a6ecf13a3dba8a
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/extension-list-labs
3 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/26/345726/1
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 2328f55..5cfb670 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -346,6 +346,10 @@
wfLoadSkin( 'Timeless' ); // T160643
}
+if ( $wmgUseLoginNotify ) {
+ wfLoadExtension( 'LoginNotify' );
+}
+
$wgMessageCacheType = CACHE_ACCEL;
// Let Beta Cluster Commons do upload-from-URL from production Commons.
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 6c321fa..e6d64a4 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -494,6 +494,10 @@
'default' => true, // T127297
],
+ 'wmgUseLoginNotify' => [
+ 'default' => true, // T158878
+ ],
+
'wmgUseRevisionSlider' => [
'default' => true, // T134770
],
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index da1257a..d94751d 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -7,3 +7,4 @@
$IP/extensions/PerformanceInspector/extension.json
$IP/extensions/Sentry/extension.json
$IP/skins/Timeless/skin.json
+$IP/extensions/LoginNotify/extension.json
--
To view, visit https://gerrit.wikimedia.org/r/345726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I149fe7e82c26c2133b3e73dcf3a6ecf13a3dba8a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Drop targets from form - workaround for some CSP weirdness
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334706 ) Change subject: Drop targets from form - workaround for some CSP weirdness .. Drop targets from form - workaround for some CSP weirdness Change-Id: I7ace038b99ae98603e82d13a87b2cae8ab8067cf --- M data/i18n/en.json 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships refs/changes/06/334706/1 diff --git a/data/i18n/en.json b/data/i18n/en.json index c2f131a..befead1 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -33,7 +33,7 @@ "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania 2017, the annual international conference centered on Wikimedia projects. Awardees will receive a scholarship which will cover conference registration fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada, Aug 9-13, 2017.\nApplications may be submitted in any language, but every applicant must provide evidence of English language abilities that are at a level which would enable them to participate in Wikimania, a conference which is primarily conducted in English. Sufficient English abilities could be demonstrated in the application itself or elsewhere.\nThis is not a scholarship for university study. Applications not obviously related to the conference will be discarded.\nPlease carefully consider your financial needs before applying for a scholarship to attend Wikimania. There are limited funds available and many applicants do not have the financial means to attend Wikimania without this opportunity. Thank you.\nPlease note that if you need more then 10 minutes to complete this application, please draft your answers in a text editor, reload this page and then copy-paste your answers into corresponding fields before submitting. This application may give an error (\"Missing or invalid CSRF token\") if it is open for more then 15 minutes before submitting.\nThe deadline to apply is February 20, 23:59 UTC. ", - "form-intro-faq": "Frequently asked questions", + "form-intro-faq": "Frequently asked questions", "form-scholarship-type": "Type of Scholarship", "form-scholarship": "This year for Wikimania 2017, the Wikimedia Foundation will be offering Partial scholarships which will cover all registration fees (which includes accommodation during Wikimania); however, these partial scholarships will NOT cover travel or incidental expenses. In contrast, Full scholarships will cover travel, registration and incidental expenses.\n Please indicate which type of Wikimania Foundation scholarship are you applying for. Note that those who choose \"I am applying for a full scholarship, but would be able to attend if awarded a partial scholarship.\" will be considered according to the https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships#Scholarship_details\";>selection rules.", @@ -130,7 +130,7 @@ "form-active-project": "Most active Wikimedia project:", "form-active-project2": "Second most active Wikimedia project (if applicable):", "form-extent-explain": "Tell us about your involvement in your home wiki or the broader Wikimedia movement. What have you built or contributed to in order to improve your wiki or community? Have you led or organized any of these activities?", - "form-contrib-explain": "What’s something great that happened as a result of these activities? This could be described either quantitatively or qualitatively, and could impact either online or offline. Here are some https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships#Relevant_experience\"; target=\"_blank\">examples that might help.", + "form-contrib-explain": "What’s something great that happened as a result of these activities? This could be described either quantitatively or qualitatively, and could impact either online or offline. Here are some https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships#Relevant_experience\";>examples that might help.", "form-experience-explain": "How do you usually share your experiences (or things you’ve learned) with your community? Examples of on-wiki summaries/reports, blog posts, meetup talks, etc. are welcome here.", "form-collaboration-explain": "What collaborations with other Wikimedians or Wikimedia organizations are you most proud of?", @@ -139,14 +139,14 @@ "form-prev-scholar": "Have you previously attended any Wikimania on a WMF scholarship?", "form-last-year-scholar": "In 2016, did you receive a WMF Scholarship and attend Wikimania on that scholarship?", "form-attending-reports": "Please provide the links to all of your previous WMF Scholarship reports.", -
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Modify a question on Ellie's request.
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/334700 ) Change subject: Modify a question on Ellie's request. .. Modify a question on Ellie's request. Ask applicant to indicant whether they work for WMF part/full time Change-Id: I68f038c09f97dec3ff3c8d3860ffdd3aeefde93b --- M data/i18n/en.json 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships refs/changes/00/334700/1 diff --git a/data/i18n/en.json b/data/i18n/en.json index 408fcb1..c2f131a 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -123,7 +123,7 @@ "form-wikimedia-staff": "Are you currently a paid or contract staff member of any Wikimedia organization?", "form-wikimedia-board": "Are you currently board member of any Wikimedia organization?", - "form-staff-organization": "If yes, please identify the Wikimedia organization here:", + "form-staff-organization": "If yes, please identify the Wikimedia organization and whether you are full or part-time:", "form-board-organization": "If yes, please identify the Wikimedia organization here:", "form-community": "Primary language community on wiki:", -- To view, visit https://gerrit.wikimedia.org/r/334700 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68f038c09f97dec3ff3c8d3860ffdd3aeefde93b Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/wikimania-scholarships Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Remove EchoBasicFormatter - no longer in use
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333671 )
Change subject: Remove EchoBasicFormatter - no longer in use
..
Remove EchoBasicFormatter - no longer in use
Cleanup LoginNotify
Bug: T151414
Change-Id: Idc8913ebd80418dc40fb97d0a92fb51de5b07abf
---
M LoginNotify.hooks.php
D LoginNotifyFormatter.php
2 files changed, 2 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/71/333671/1
diff --git a/LoginNotify.hooks.php b/LoginNotify.hooks.php
index ce1474f..45ccfb4 100644
--- a/LoginNotify.hooks.php
+++ b/LoginNotify.hooks.php
@@ -87,7 +87,6 @@
* @param $user User User in question
* @param $pass String password
* @param $retval int LoginForm constant (e.g. LoginForm::SUCCESS)
-* @return bool Standard hook return
*/
public static function onLoginAuthenticateAudit( User $user, $pass,
$retval ) {
if ( !class_exists( 'EchoEvent' ) ) {
@@ -173,7 +172,7 @@
return true;
}
- if ( !self::isUserOptionOverriden( $user,
$wgLoginNotifyEnableForPriv ) ) {
+ if ( !self::isUserOptionOverriden( $user ) ) {
return true;
}
@@ -213,7 +212,7 @@
global $wgLoginNotifyEnableForPriv;
$optionsToCheck = self::getOverridenOptions();
$defaultOpts = User::getDefaultOptions();
- if ( !self::isUserOptionOverriden( $user,
$wgLoginNotifyEnableForPriv ) ) {
+ if ( !self::isUserOptionOverriden( $user ) ) {
return true;
}
foreach ( $optionsToCheck as $opt ) {
diff --git a/LoginNotifyFormatter.php b/LoginNotifyFormatter.php
deleted file mode 100644
index 60a8df7..000
--- a/LoginNotifyFormatter.php
+++ /dev/null
@@ -1,19 +0,0 @@
-params( $event->getExtraParam( 'count' ) );
- } else {
- parent::processParam( $event, $param, $message, $user );
- }
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/333671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc8913ebd80418dc40fb97d0a92fb51de5b07abf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Disable logins on loginwiki to support LoginNotify
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/333653 ) Change subject: Disable logins on loginwiki to support LoginNotify .. Disable logins on loginwiki to support LoginNotify LoginNotify extension notifies users (using Echo) about new logins. Loginwiki does not have Echo, which means an account login from loginwiki will not send a notification to the user about the login. Bug: T154064 Change-Id: I727a1a40ab5fca26efd2ff6c4b0defb03a8e6638 --- M wmf-config/CommonSettings.php 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/53/333653/1 diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index e980808..439649b 100644 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -849,7 +849,7 @@ //for avconv / ffmpeg2theora $wgTranscodeBackgroundMemoryLimit = 4 * 1024 * 1024; // 4GB $wgFFmpegThreads = 2; - + // ffmpeg tends to use about 175% CPU when threaded, so hits // the default 8-hour ulimit in 4-6 hours. This tends to cut // off very large files at very high resolution just before @@ -1196,6 +1196,7 @@ $wgGroupPermissions['*'] = [ 'read' => true, 'autocreateaccount' => true, + 'createaccount' => false, ]; $wgGroupPermissions['user'] = [ 'read' => true, @@ -1213,6 +1214,7 @@ 'editinterface' => false, 'editusercss' => false, 'edituserjs' => false, + 'createaccount' => false, ] ); } -- To view, visit https://gerrit.wikimedia.org/r/333653 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I727a1a40ab5fca26efd2ff6c4b0defb03a8e6638 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Update AddNewAccount->LocalUserCreated hook for LoginNotify
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333563 )
Change subject: Update AddNewAccount->LocalUserCreated hook for LoginNotify
..
Update AddNewAccount->LocalUserCreated hook for LoginNotify
Bug: t135270
Change-Id: I0efbacac13807d802e5cc6e4d226d75050f01d2d
---
M LoginNotify.hooks.php
1 file changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify
refs/changes/63/333563/1
diff --git a/LoginNotify.hooks.php b/LoginNotify.hooks.php
index ce1474f..00611c0 100644
--- a/LoginNotify.hooks.php
+++ b/LoginNotify.hooks.php
@@ -144,6 +144,8 @@
}
/**
+* Deprecated since v1.27
+*
* Set a cookie saying this is a known computer when creating an
account.
*
* @todo This still sets cookies if user creates account well logged in
as someone else.
@@ -158,6 +160,21 @@
}
/**
+* Hook for new account creation since v1.27
+*
+* Called immediately after a local user has been created and saved to
the database
+*
+* @param User $user User created
+* @param boolean $autocreated Whether this was an auto-created account
+*/
+ public static function onLocalUserCreated( $user, $autocreated ) {
+ if ( !$autocreated ) {
+ $loginNotify = new LoginNotify();
+ $loginNotify->setCurrentAddressAsKnown( $user );
+ }
+ }
+
+ /**
* Hook for loading options.
*
* This is a bit hacky. Used to be able to set a different
--
To view, visit https://gerrit.wikimedia.org/r/333563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0efbacac13807d802e5cc6e4d226d75050f01d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LoginNotify
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Fix a couple of typos
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332949 ) Change subject: Fix a couple of typos .. Fix a couple of typos Change-Id: Ic2cad7046333b7dc69efe6283e86f10f6581e39d --- M data/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships refs/changes/49/332949/1 diff --git a/data/i18n/en.json b/data/i18n/en.json index 44b79f5..408fcb1 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -121,7 +121,7 @@ "form-engagement-option9": "Organizer of Wikimedia events (e.g. WLM, edit-a-thons)", "form-engagement-option10": "None of the above", - "form-wikimedia-staff": "Are you currently a paid or contract staff memeber of any Wikimedia organization?", + "form-wikimedia-staff": "Are you currently a paid or contract staff member of any Wikimedia organization?", "form-wikimedia-board": "Are you currently board member of any Wikimedia organization?", "form-staff-organization": "If yes, please identify the Wikimedia organization here:", "form-board-organization": "If yes, please identify the Wikimedia organization here:", @@ -147,7 +147,7 @@ "form-travel-conditions": "If I am awarded and accept a grant, I agree to use the travel booking service provided and paid for by the Wikimedia Foundation.", "form-travel-only": "If I am awarded and accept a grant, I agree to use the grant exclusively for my travel expenses. I promise to reimburse the Wikimedia Foundation for any unspent or improperly spent funds.", "form-friendly-space": "If I am awarded and accept a grant, I agree to abide by the Wikimedia Foundation https://wikimediafoundation.org/wiki/Special:MyLanguage/Friendly_space_policy\"; target=\"blank\">Friendly Space Policy. If I am found in violation of this policy and asked to leave, I agree to be responsible for any changes in my own travel expenses.", - "form-info-true": "I certify that all of the information provided with my application is true and accurate to the best of my knowledge and belief. The Wikimedia Foundation reserves the right to require me to pay back all or part of the grant if any of the information I provide is found to be untrue or inaccurate.", + "form-info-true": "I certify that all of the information provided with my application is true and accurate to the best of my knowledge and belief. The Wikimedia Foundation reserves the right to require me to pay back all or part of the grant if any of the information I provide is found to be untrue or inaccurate.", "form-privacy": "Privacy", "form-review": "All information contained in this application will be reviewed by the members of the https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarship_committee\";>Wikimania Scholarship Committee. All personal information will be held strictly confidential by the Committee, and the https://wikimediafoundation.org/\";>Wikimedia Foundation.", -- To view, visit https://gerrit.wikimedia.org/r/332949 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic2cad7046333b7dc69efe6283e86f10f6581e39d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/wikimania-scholarships Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...WikimediaEvents[master]: Only record cookie-block events in eventlogging.
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332769 )
Change subject: Only record cookie-block events in eventlogging.
..
Only record cookie-block events in eventlogging.
This change needs a corresponding change in the schema
https://meta.wikimedia.org/wiki/Schema:CookieBlock
to change schema field data type to bool.
Change-Id: I8994b2ee0f4450430197869271c79a81d4427e11
---
M WikimediaEventsHooks.php
1 file changed, 13 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents
refs/changes/69/332769/1
diff --git a/WikimediaEventsHooks.php b/WikimediaEventsHooks.php
index 8b6f928..0805034 100644
--- a/WikimediaEventsHooks.php
+++ b/WikimediaEventsHooks.php
@@ -617,12 +617,20 @@
$isCookieSetOnAutoblock = $rc->getConfig()->get(
'CookieSetOnAutoblock' );
$blockCookieVal = $request->getCookie( 'BlockID' );
$trigger = $user->blockTrigger;
- if ( $isCookieSetOnAutoblock && $blockCookieVal > 0 && $blocked
&& $trigger !== false ) {
- $logData = [
- 'ip' => $request->getIP(),
- 'block' => $trigger
- ];
+ if ( $isCookieSetOnAutoblock && $blockCookieVal > 0 && $blocked
) {
+ if ( $trigger == 'cookie-block' ) {
+ $logData = [
+ 'ip' => $request->getIP(),
+ 'block' => true
+ ];
+ } else {
+ $logData = [
+ 'ip' => $request->getIP(),
+ 'block' => false
+ ];
+ }
EventLogging::logEvent( 'CookieBlock', 16046548,
$logData );
}
}
+
}
--
To view, visit https://gerrit.wikimedia.org/r/332769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8994b2ee0f4450430197869271c79a81d4427e11
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Replace block trigger string by bool to indicate whether it ...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/330890 )
Change subject: Replace block trigger string by bool to indicate whether it was
a cookie block
..
Replace block trigger string by bool to indicate whether it was a cookie block
Bug: T146230
Change-Id: Ie771f29645c19cd4ae4c038a1ee7d554819a2f00
---
M includes/user/User.php
1 file changed, 6 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/330890/1
diff --git a/includes/user/User.php b/includes/user/User.php
index 562f0d1..f4f87e7 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -300,10 +300,8 @@
/** @var integer User::READ_* constant bitfield used to load data */
protected $queryFlagsUsed = self::READ_NORMAL;
- /** @var string Indicates type of block (used for eventlogging)
-* Permitted values: 'cookie-block', 'proxy-block', 'openproxy-block',
'xff-block'
-*/
- public $blockTrigger = false;
+ /** @var bool Indicates whether it was a cookie block (used for
eventlogging) */
+ public $cookieBlock = false;
public static $idCacheByName = [];
@@ -1629,7 +1627,7 @@
if ( $blockIsValid && $useBlockCookie ) {
// Use the block.
$block = $tmpBlock;
- $this->blockTrigger = 'cookie-block';
+ $this->cookieBlock = true;
} else {
// If the block is not valid, clear the
block cookie (but don't delete it,
// because it needs to be cleared from
LocalStorage as well and an empty string
@@ -1649,7 +1647,7 @@
'address' => $ip,
'systemBlock' => 'proxy',
] );
- $this->blockTrigger = 'proxy-block';
+ $this->cookieBlock = false;
} elseif ( $this->isAnon() && $this->isDnsBlacklisted(
$ip ) ) {
$block = new Block( [
'byText' => wfMessage( 'sorbs'
)->text(),
@@ -1657,7 +1655,7 @@
'address' => $ip,
'systemBlock' => 'dnsbl',
] );
- $this->blockTrigger = 'openproxy-block';
+ $this->cookieBlock = false;
}
}
@@ -1676,7 +1674,7 @@
# Mangle the reason to alert the user that the
block
# originated from matching the X-Forwarded-For
header.
$block->mReason = wfMessage( 'xffblockreason',
$block->mReason )->text();
- $this->blockTrigger = 'xff-block';
+ $this->cookieBlock = false;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/330890
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie771f29645c19cd4ae4c038a1ee7d554819a2f00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] Make language-appropriate collations default during in...
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327762 )
Change subject: [WIP] Make language-appropriate collations default during
install
..
[WIP] Make language-appropriate collations default during install
Bug: T47611
Change-Id: Ieac1e7449aadd74775bf467202b76db6b04a3d2d
---
M includes/installer/Installer.php
1 file changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/62/327762/1
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 03f9974..5234cae 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -374,6 +374,9 @@
$configOverrides->set( 'ObjectCaches', $objectCaches );
+ // Set language-appropriate collation
+ $configOverrides->set( 'CategoryCollation',
self::getCollation() );
+
// Load the installer's i18n.
$messageDirs = $baseConfig->get( 'MessagesDirs' );
$messageDirs['MediawikiInstaller'] = __DIR__ . '/i18n';
@@ -449,6 +452,31 @@
}
/**
+* Get language appropriate collation value (T47611)
+*
+* @return string Collation value
+*/
+ public function getCollation() {
+ $wikiLang = $this->getVar( 'wgLanguageCode' );
+ $supportedLangCollations = [ 'af', 'ast', 'az', 'be',
'be-tarask', 'bg', 'br', 'bs', 'ca',
+ 'co', 'cs', 'cy', 'da', 'de', 'dsb', 'el', 'en', 'eo',
'es', 'et', 'eu', 'fa', 'fi',
+ 'fo', 'fr', 'fur', 'fy', 'ga', 'gd', 'gl', 'hr', 'hsb',
'hu', 'is', 'it', 'kk', 'kl',
+ 'ku', 'ky', 'la', 'lb', 'lt', 'lv', 'mk', 'mo', 'mt',
'nl', 'no', 'oc', 'pl', 'pt',
+ 'rm', 'ro', 'ru', 'rup', 'sco', 'sk', 'sl', 'smn',
'sq', 'sr', 'sv', 'ta', 'tk', 'tl',
+ 'tr', 'tt', 'uk', 'uz', 'vi' ];
+ if ( extension_loaded( 'intl' ) ) {
+ if ( in_array( $wikiLang, $supportedLangCollations ) ) {
+ return 'uca-' . $wikiLang . '-u-kn';
+ } else {
+ return 'uca-default-u-kn';
+ }
+ }
+ return 'numeric';
+
+ }
+
+
+ /**
* Get a list of known DB types.
*
* @return array
--
To view, visit https://gerrit.wikimedia.org/r/327762
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieac1e7449aadd74775bf467202b76db6b04a3d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...LoginNotify[master]: Add README
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/327457 ) Change subject: Add README .. Add README Change-Id: I11a0592eeb59a8c4876ac1e01f421fb1aa8decde --- A README.md 1 file changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LoginNotify refs/changes/57/327457/1 diff --git a/README.md b/README.md new file mode 100644 index 000..0b45a16 --- /dev/null +++ b/README.md @@ -0,0 +1,28 @@ +The LoginNotify extension notifies you when someone logs into your account. It can be configured to give warnings after a certain number of failed login attempts (The number is configurable, and can be different between unknown IPs/devices and known IP/devices). It can also give echo/email notices for successful logins from IPs you don't normally use. It can optionally integrate into the CheckUser extension in order to determine if the login is from an IP address you don't normally use. It can also set a cookie to try and determine if the login is from a device you normally use. + + Installation +* This extension requires the Echo extension to be installed. This extension can optionally integrate with the CheckUser extension if it is installed, but does not require it. +* Download and place the file(s) in a directory called LoginNotify in your extensions/ folder. +* Add the following code at the bottom of your LocalSettings.php: `wfLoadExtension( 'LoginNotify' );` +* Navigate to Special:Version on your wiki to verify that the extension is successfully installed. + + Configuration parameters + + "LoginNotifyAttemptsKnownIP": 10, + "LoginNotifyExpiryKnownIP": 604800, + "LoginNotifyAttemptsNewIP": 3, + "LoginNotifyExpiryNewIP": 1209600, + "LoginNotifyCheckKnownIPs": true, + "LoginNotifyEnableOnSuccess": true, + "@doc": "Enable notification for users with certain rights. To disable set to false", + "LoginNotifyEnableForPriv": [ "editinterface", "userrights" ], + "@doc": "Override this to use a different secret than $wgSecretKey", + "LoginNotifySecretKey": null, + "@doc": "Expiry in seconds. Default is 180 days", + "LoginNotifyCookieExpire": 15552000, + "@doc": "Override to allow sharing login cookies between sites on different subdomains", + "LoginNotifyCookieDomain": null, + "LoginNotifyMaxCookieRecords": 6, + "@doc": "Set to false to disable caching IPs in memcache. Set to 0 to cache forever. Default 60 days.", + "LoginNotifyCacheLoginIPExpiry": 5184000 + -- To view, visit https://gerrit.wikimedia.org/r/327457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I11a0592eeb59a8c4876ac1e01f421fb1aa8decde Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/LoginNotify Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Deploy scholarships with scap3
Niharika29 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326461 )
Change subject: Deploy scholarships with scap3
..
Deploy scholarships with scap3
Bug: T129134
Change-Id: I24094dd9335b930f9933d8f58d53f5be3ae25e23
---
M hieradata/common/role/deployment.yaml
M hieradata/role/common/deployment/server.yaml
M modules/role/manifests/wikimania_scholarships.pp
M modules/wikimania_scholarships/manifests/init.pp
4 files changed, 12 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/326461/1
diff --git a/hieradata/common/role/deployment.yaml
b/hieradata/common/role/deployment.yaml
index 6cef155..473036e 100644
--- a/hieradata/common/role/deployment.yaml
+++ b/hieradata/common/role/deployment.yaml
@@ -35,8 +35,6 @@
elasticsearch/plugins:
gitfat_enabled: true
upstream:
https://gerrit.wikimedia.org/r/operations/software/elasticsearch/plugins
- scholarships/scholarships:
-upstream: https://gerrit.wikimedia.org/r/wikimedia/wikimania-scholarships
librenms/librenms:
upstream: https://gerrit.wikimedia.org/r/operations/software/librenms
iegreview/iegreview:
diff --git a/hieradata/role/common/deployment/server.yaml
b/hieradata/role/common/deployment/server.yaml
index e8163ee..bb8dcfa 100644
--- a/hieradata/role/common/deployment/server.yaml
+++ b/hieradata/role/common/deployment/server.yaml
@@ -114,6 +114,8 @@
repository: maps/tilerator/deploy
#lvs_service: tilerator
trending-edits/deploy: {}
+ wikimedia/wikimania-scholarships:
+repository: scholarships/scholarships
wdqs/wdqs:
repository: wikidata/query/deploy
#lvs_service: wdqs
diff --git a/modules/role/manifests/wikimania_scholarships.pp
b/modules/role/manifests/wikimania_scholarships.pp
index 735a3c2..a6b0aa8 100644
--- a/modules/role/manifests/wikimania_scholarships.pp
+++ b/modules/role/manifests/wikimania_scholarships.pp
@@ -24,5 +24,10 @@
port => '80',
}
+scap::target { 'wikimedia/wikimania-scholarships':
+service_name => 'scholarships',
+deploy_user => 'deploy-service'
+}
+
}
# vim:sw=4 ts=4 sts=4 et:
diff --git a/modules/wikimania_scholarships/manifests/init.pp
b/modules/wikimania_scholarships/manifests/init.pp
index 49c94d7..fa069c7 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -47,6 +47,11 @@
provider => 'trebuchet',
}
+scap::target { 'wikimedia/wikimania-scholarships':
+service_name => 'scholarships',
+deploy_user => 'deploy-service'
+}
+
apache::site { 'scholarships.wikimedia.org':
content => template('wikimania_scholarships/apache.conf.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/326461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24094dd9335b930f9933d8f58d53f5be3ae25e23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Niharika29
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Change Feb 16 -> Feb 20 per task edit
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326432 ) Change subject: Change Feb 16 -> Feb 20 per task edit .. Change Feb 16 -> Feb 20 per task edit Bug: T151401#2848855 Change-Id: I866d253dd34b4dc7fef25a859859c40ceb231a7d --- M data/i18n/en.json 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships refs/changes/32/326432/1 diff --git a/data/i18n/en.json b/data/i18n/en.json index 0a1a0b2..6ecceba 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -29,9 +29,9 @@ "not-open": "The 2017 Wikimania Scholarship process is not yet open. For more information, see:\n\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>About Wikimania\nhttps://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Scholarships\";>About Scholarships\n", - "deadline-passed": "Scholarship application deadline was February 16, 23:59 UTC.\nWe will notify applicants in April 2017 about the result of their application.\nPlease see the scholarships page on the wiki for more details.", + "deadline-passed": "Scholarship application deadline was February 20, 23:59 UTC.\nWe will notify applicants in April 2017 about the result of their application.\nPlease see the scholarships page on the wiki for more details.", - "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania 2017, the annual international conference centered on Wikimedia projects. Awardees will receive a scholarship which will cover conference registration fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada , Aug 9-13, 2017.\nApplications may be submitted in any language, but every applicant must provide evidence of English language abilities that are at a level which would enable them to participate in Wikimania, a conference which is primarily conducted in English. Sufficient English abilities could be demonstrated in the application itself or elsewhere.\nThis is not a scholarship for university study. Applications not obviously related to the conference will be discarded.\nPlease carefully consider your financial needs before applying for a scholarship to attend Wikimania. There are limited funds available and many applicants do not have the financial means to attend Wikimania without this opportunity. Thank you.\nPlease note that if you need more then 10 minutes to complete this application, please draft your answers in a text editor, reload this page and then copy-paste your answers into corresponding fields before submitting. This application may give an error (\"Missing or invalid CSRF token\") if it is open for more then 15 minutes before submitting.\nThe deadline to apply is February 16, 23:59 UTC. ", + "form-intro": "This is the application for sponsorship to attend https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Main_Page\";>Wikimania 2017, the annual international conference centered on Wikimedia projects. Awardees will receive a scholarship which will cover conference registration fees, hotel, and roundtrip travel to Wikimania in Montréal, Quebec, Canada , Aug 9-13, 2017.\nApplications may be submitted in any language, but every applicant must provide evidence of English language abilities that are at a level which would enable them to participate in Wikimania, a conference which is primarily conducted in English. Sufficient English abilities could be demonstrated in the application itself or elsewhere.\nThis is not a scholarship for university study. Applications not obviously related to the conference will be discarded.\nPlease carefully consider your financial needs before applying for a scholarship to attend Wikimania. There are limited funds available and many applicants do not have the financial means to attend Wikimania without this opportunity. Thank you.\nPlease note that if you need more then 10 minutes to complete this application, please draft your answers in a text editor, reload this page and then copy-paste your answers into corresponding fields before submitting. This application may give an error (\"Missing or invalid CSRF token\") if it is open for more then 15 minutes before submitting.\nThe deadline to apply is February 20, 23:59 UTC. ", "form-intro-faq": "Frequently asked questions", -- To view, visit https://gerrit.wikimedia.org/r/326432 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I866d253dd34b4dc7fef25a859859c40ceb231a7d Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/wikimania-scholarships Gerrit-Branch: master Gerrit-Owner: Niharika29 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org ht
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Add a question about scholarship in past year, remove previo...
Niharika29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/326103 ) Change subject: Add a question about scholarship in past year, remove previous attendance qns .. Add a question about scholarship in past year, remove previous attendance qns Bug: T151366 Change-Id: I8f68a9079e487635cb790ac9b89325ef9259721e --- A data/db/migrations/20161209-01-update-questions-2017.sql M data/db/schema.mysql M data/i18n/en.json M data/i18n/qqq.json M data/templates/apply.html M data/templates/review/view.html M src/Forms/Apply.php 7 files changed, 26 insertions(+), 53 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships refs/changes/03/326103/1 diff --git a/data/db/migrations/20161209-01-update-questions-2017.sql b/data/db/migrations/20161209-01-update-questions-2017.sql new file mode 100644 index 000..6d58cbb --- /dev/null +++ b/data/db/migrations/20161209-01-update-questions-2017.sql @@ -0,0 +1,16 @@ +-- Remove question about previous years attendance +ALTER TABLE scholarships + DROP COLUMN wm05, + DROP COLUMN wm06, + DROP COLUMN wm07, + DROP COLUMN wm08, + DROP COLUMN wm09, + DROP COLUMN wm10, + DROP COLUMN wm11, + DROP COLUMN wm12, + DROP COLUMN wm13, + DROP COLUMN wm14, + DROP COLUMN wm15; + +-- Question about whether applicant got a scholarship last years +ALTER TABLE scholarships ADD COLUMN last_year_scholar TINYINT(1) DEFAULT NULL AFTER prev_scholar; diff --git a/data/db/schema.mysql b/data/db/schema.mysql index 75aad19..79ec346 100644 --- a/data/db/schema.mysql +++ b/data/db/schema.mysql @@ -52,18 +52,8 @@ , contributionTEXT , experience TEXT , collaboration TEXT - , wm05TINYINT(1) DEFAULT NULL - , wm06TINYINT(1) DEFAULT NULL - , wm07TINYINT(1) DEFAULT NULL - , wm08TINYINT(1) DEFAULT NULL - , wm09TINYINT(1) DEFAULT NULL - , wm10TINYINT(1) DEFAULT NULL - , wm11TINYINT(1) DEFAULT NULL - , wm12TINYINT(1) DEFAULT NULL - , wm13TINYINT(1) DEFAULT NULL - , wm14TINYINT(1) DEFAULT NULL - , wm15TINYINT(1) DEFAULT NULL , prev_scholarTINYINT(1) DEFAULT NULL + , last_year_scholar TINYINT(1) DEFAULT NULL , goals TEXT , presentationTINYINT(1) DEFAULT NULL , presentationTopic TEXT diff --git a/data/i18n/en.json b/data/i18n/en.json index 4d988c4..64c48c7 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -137,6 +137,7 @@ "form-interest": "Attendance and involvement in Wikimania", "form-attended": "Have you attended Wikimania before? If so, in what year or years?", "form-prev-scholar": "Have you previously attended Wikimania on a WMF scholarship?", + "form-last-year-scholar": "In 2016, did you receive a WMF Scholarship and attend Wikimania on that scholarship?", "form-attending-goals": "What are your goals for attending Wikimania? If you have previously attended Wikimania, please also tell us about something great that happened as a result of attending Wikimania. (Previous scholarship recipients may link to their 2015 or 2014 scholarship report, if relevant).", "form-presenter": "Will you submit or have you submitted a presentation for Wikimania 2017? (https://wikimania2017.wikimedia.org/wiki/Special:MyLanguage/Submissions\"; target=\"_blank\">Call for Participation)", "form-presentation-topic": "If you have submitted or will submit a presentation, please provide a link to your presentation or proposal title:", @@ -313,6 +314,7 @@ "review-view-active-projects": "Main wiki project:", "review-view-secondary-project": "Secondary wiki project:", "review-view-previous-scholar": "Previous scholar?", + "review-view-last-year-scholar": "Scholarship in 2016?", "review-view-attending-goals": "Previous experience and goals for attending this year", "review-view-involvement": "What have you built or contributed to in order to improve your wiki or community? Have you lead or organized any of these activities?", "review-view-contrib-explain": "What’s something great that happened as a result of these activities?", diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json index 22d7425..29c2d50 100644 --- a/data/i18n/qqq.json +++ b/data/i18n/qqq.json @@ -127,6 +127,7 @@ "form-interest": "Form section label", "form-attended": "Input label, followed by multiple checkboxes labeled with years (eg 2013, 2012)", "form-prev-scholar": "Input label, followed by yes and no radio buttons, makes form-attending-goals a required field", + "form-l
[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Add two questions for 2017 iteration
Niharika29 has uploaded a new change for review. https://gerrit.wikimedia.org/r/325112 Change subject: Add two questions for 2017 iteration .. Add two questions for 2017 iteration 1. Specify if they are a paid staff or contract worker for any Wikimedia org 2. Specify if they are a board member for any Wikimedia org Bug: T151371 Change-Id: Ie917ec4e3bba178a6898b323879f82ea81da6261 --- A data/db/migrations/20161202-update-questions-2017.sql M data/db/schema.mysql M data/i18n/en.json M data/i18n/qqq.json M data/templates/apply.html M data/templates/review/view.html M src/Forms/Apply.php 7 files changed, 72 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships refs/changes/12/325112/1 diff --git a/data/db/migrations/20161202-update-questions-2017.sql b/data/db/migrations/20161202-update-questions-2017.sql new file mode 100644 index 000..3804105 --- /dev/null +++ b/data/db/migrations/20161202-update-questions-2017.sql @@ -0,0 +1,9 @@ +-- Alter schema for 2017 round + +ALTER TABLE scholarships + ADD COLUMN staff TINYINT(1) DEFAULT NULL AFTER engage10, + ADD COLUMN staffOrg VARCHAR(128) DEFAULT NULL AFTER staff, + ADD COLUMN board TINYINT(1) DEFAULT NULL AFTER staffOrg, + ADD COLUMN boardOrg VARCHAR(128) DEFAULT NULL AFTER board + ; + diff --git a/data/db/schema.mysql b/data/db/schema.mysql index 7ec4004..75aad19 100644 --- a/data/db/schema.mysql +++ b/data/db/schema.mysql @@ -44,6 +44,10 @@ , engage8 TINYINT(1) DEFAULT NULL , engage9 TINYINT(1) DEFAULT NULL , engage10TINYINT(1) DEFAULT NULL + , staff TINYINT(1) DEFAULT NULL + , staffOrgVARCHAR(128) DEFAULT NULL + , board TINYINT(1) DEFAULT NULL + , boardOrgVARCHAR(128) DEFAULT NULL , involvement TEXT , contributionTEXT , experience TEXT diff --git a/data/i18n/en.json b/data/i18n/en.json index 4aa6aa4..603a8d8 100644 --- a/data/i18n/en.json +++ b/data/i18n/en.json @@ -73,6 +73,8 @@ "form-wmfagree-error": "To proceed, please agree to the applicant rights condition.", "form-wmfAgreeName-error": "Please fill in your full name in the given field to agree to the terms and conditions.", "form-engage10-error": "Please select how you have engaged in the Wikimedia movement", + "form-staffOrg-error": "Please indicate the Wikimedia organization you're a paid or contract worker for.", + "form-boardOrg-error": "Please indicate the Wikimedia organization you're a board member for.", "required-field": "Required field", @@ -118,6 +120,12 @@ "form-engagement-option8": "Participant in Wikimedia organized events (e.g. photographer contributing to Wiki Loves Monuments, workshop attendee)", "form-engagement-option9": "Organizer of Wikimedia events (e.g. WLM, edit-a-thons)", "form-engagement-option10": "None of the above", + + "form-wikimedia-staff": "Are you currently a paid or contract staff of any Wikimedia organization?", + "form-wikimedia-board": "Are you currently board member of any Wikimedia organization?", + "form-staff-organization": "If yes, please identify the Wikimedia organization here:", + "form-board-organization": "If yes, please identify the Wikimedia organization here:", + "form-community": "Primary language community on wiki:", "form-active-project": "Most active Wikimedia project:", "form-active-project2": "Second most active Wikimedia project (if applicable):", @@ -299,6 +307,8 @@ "review-view-study": "Field of study", "review-view-username": "Username:", "review-view-alt-users": "Other usernames:", + "review-view-staff-member": "Staff member for:", + "review-view-board-member": "Board member for:", "review-view-community": "Primary language community:", "review-view-active-projects": "Main wiki project:", "review-view-secondary-project": "Secondary wiki project:", diff --git a/data/i18n/qqq.json b/data/i18n/qqq.json index d29d4ce..f7b193d 100644 --- a/data/i18n/qqq.json +++ b/data/i18n/qqq.json @@ -70,6 +70,8 @@ "form-wmfagree-error": "Error message shown to user when user does not agree to applicant rights and conditions.", "form-wmfAgreeName-error": "Error message shown to user when user does not enter full name agreeing the terms and conditions.", "form-engage10-error": "Error message shown to user when user does not select any types of engagement", + "form-staffOrg-error": "Error message shown to user when they did not indicate the Wikimedia organization they work for", + "form-boardOrg-error": "Error message shown to user when they did not indicate the Wikimedia organization th
