[MediaWiki-commits] [Gerrit] Add jshintrc and make it pass - change (mediawiki...BlogPage)
jenkins-bot has submitted this change and it was merged.
Change subject: Add jshintrc and make it pass
..
Add jshintrc and make it pass
- Expected '===' and instead saw '=='.
- 'alert' is not defined.
- 'document' is not defined.
- 'jQuery' is not defined.
- 'mw' is not defined.
- 'sajax_do_call' is not defined.
- 'sajax_request_type' is not defined.
- 'index' is defined but never used.
Change-Id: Ie0b5c162c42166828f59a366e0cf51c21efb2c89
---
A .jshintrc
M CreateBlogPost.js
2 files changed, 26 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..f840f82
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,19 @@
+{
+ // Enforcing
+ "bitwise": true,
+ "eqeqeq": true,
+ "freeze": true,
+ "latedef": true,
+ "noarg": true,
+ "nonew": true,
+ "undef": true,
+ "unused": true,
+
+ // Environment
+ "browser": true,
+
+ "globals": {
+ "mediaWiki": false,
+ "jQuery": false
+ }
+}
diff --git a/CreateBlogPost.js b/CreateBlogPost.js
index f1e0e1b..c91060f 100644
--- a/CreateBlogPost.js
+++ b/CreateBlogPost.js
@@ -1,3 +1,4 @@
+( function ( mw ) {
var CreateBlogPost = {
/**
* Insert a tag (category) from the category cloud into the inputbox
below
@@ -22,16 +23,17 @@
* if there's already a blog post with the same name as their blog post.
*/
performChecks: function() {
+ /*global sajax_request_type:true, sajax_do_call, alert */
// In PHP, we need to use $wgRequest->getVal( 'title2' );
'title'
// contains the current special page's name instead of the blog
post
// name
var title = document.getElementById( 'title' ).value;
- if ( !title || title == '' ) {
+ if ( !title || title === '' ) {
alert( mw.msg( 'blog-js-create-error-need-title' ) );
return '';
}
var pageBody = document.getElementById( 'pageBody' ).value;
- if ( !pageBody || pageBody == '' ) {
+ if ( !pageBody || pageBody === '' ) {
alert( mw.msg( 'blog-js-create-error-need-content' ) );
return '';
}
@@ -49,7 +51,7 @@
jQuery( document ).ready( function() {
// Tag cloud
- jQuery( 'a.tag-cloud-entry' ).each( function( index ) {
+ jQuery( 'a.tag-cloud-entry' ).each( function () {
var that = jQuery( this );
that.click( function() {
CreateBlogPost.insertTag(
@@ -63,4 +65,5 @@
jQuery( 'input[name="wpSave"]' ).click( function() {
CreateBlogPost.performChecks();
} );
-} );
\ No newline at end of file
+} );
+}( mediaWiki ) );
--
To view, visit https://gerrit.wikimedia.org/r/137894
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0b5c162c42166828f59a366e0cf51c21efb2c89
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlogPage
Gerrit-Branch: master
Gerrit-Owner: Hashar
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: UltrasonicNXT
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Login and create account buttons - change (apps...wikipedia)
BearND has uploaded a new change for review. https://gerrit.wikimedia.org/r/141380 Change subject: Login and create account buttons .. Login and create account buttons Also made both layouts scrollable Change-Id: I1adfa7ab094a62cbbc7ba71f44c2d5206b5e1a6b --- A wikipedia/res/drawable/button_selector_green_progressive.xml A wikipedia/res/drawable/button_shape_disabled.xml A wikipedia/res/drawable/button_shape_green_progressive.xml A wikipedia/res/drawable/button_shape_green_progressive_dark.xml M wikipedia/res/layout/activity_create_account.xml M wikipedia/res/layout/activity_login.xml M wikipedia/res/layout/group_captcha.xml D wikipedia/res/menu/menu_create_account.xml D wikipedia/res/menu/menu_login.xml M wikipedia/res/values/color.xml M wikipedia/res/values/dimens.xml M wikipedia/res/values/styles.xml M wikipedia/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java M wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java 14 files changed, 130 insertions(+), 69 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/80/141380/1 diff --git a/wikipedia/res/drawable/button_selector_green_progressive.xml b/wikipedia/res/drawable/button_selector_green_progressive.xml new file mode 100644 index 000..2a87103 --- /dev/null +++ b/wikipedia/res/drawable/button_selector_green_progressive.xml @@ -0,0 +1,7 @@ + + +http://schemas.android.com/apk/res/android";> + + + + \ No newline at end of file diff --git a/wikipedia/res/drawable/button_shape_disabled.xml b/wikipedia/res/drawable/button_shape_disabled.xml new file mode 100644 index 000..df10ec3 --- /dev/null +++ b/wikipedia/res/drawable/button_shape_disabled.xml @@ -0,0 +1,6 @@ + +http://schemas.android.com/apk/res/android"; +android:shape="rectangle" android:padding="10dp"> + + + \ No newline at end of file diff --git a/wikipedia/res/drawable/button_shape_green_progressive.xml b/wikipedia/res/drawable/button_shape_green_progressive.xml new file mode 100644 index 000..f57af5a --- /dev/null +++ b/wikipedia/res/drawable/button_shape_green_progressive.xml @@ -0,0 +1,6 @@ + +http://schemas.android.com/apk/res/android"; +android:shape="rectangle" android:padding="10dp"> + + + \ No newline at end of file diff --git a/wikipedia/res/drawable/button_shape_green_progressive_dark.xml b/wikipedia/res/drawable/button_shape_green_progressive_dark.xml new file mode 100644 index 000..1e3faff --- /dev/null +++ b/wikipedia/res/drawable/button_shape_green_progressive_dark.xml @@ -0,0 +1,6 @@ + +http://schemas.android.com/apk/res/android"; +android:shape="rectangle" android:padding="10dp"> + + + \ No newline at end of file diff --git a/wikipedia/res/layout/activity_create_account.xml b/wikipedia/res/layout/activity_create_account.xml index 3b4da88..8ca1def 100644 --- a/wikipedia/res/layout/activity_create_account.xml +++ b/wikipedia/res/layout/activity_create_account.xml @@ -1,13 +1,18 @@ -http://schemas.android.com/apk/res/android"; +http://schemas.android.com/apk/res/android"; +android:layout_width="match_parent" +android:layout_height="match_parent" +android:background="@android:color/white"> + + @@ -52,7 +57,14 @@ android:singleLine="true" android:inputType="textEmailAddress" /> + + - \ No newline at end of file + + diff --git a/wikipedia/res/layout/activity_login.xml b/wikipedia/res/layout/activity_login.xml index 17a7c50..e472206 100644 --- a/wikipedia/res/layout/activity_login.xml +++ b/wikipedia/res/layout/activity_login.xml @@ -1,11 +1,17 @@ -http://schemas.android.com/apk/res/android"; +http://schemas.android.com/apk/res/android"; +android:layout_width="match_parent" +android:layout_height="match_parent" +android:background="@android:color/white"> + + + - @@ -44,7 +49,8 @@ android:layout_gravity="bottom|center_horizontal" android:padding="8dp" android:text="@string/login_create_account_link" -style="?android:textAppearanceMedium" +style="?android:textAppearanceSmall" +android:textColor="@color/link" /> - - \ No newline at end of file + + diff --git a/wikipedia/res/layout/group_captcha.xml b/wikipedia/res/layout/group_captcha.xml index 9a0a519..3b45ae1 100644 --- a/wikipedia/res/layout/group_captcha.xml +++ b/wikipedia/res/layout/group_captcha.xml @@ -3,16 +3,17 @@ http://schemas.android.com/apk/res/android"; android:id="@+id/captcha_container" android:layout_width="match_parent" -android:layout_height="match_parent" +android:layout_height="wrap_content" android:gravity="center" android:background="@android:color/background_light" android:orientation="vertical" +android:padding="16dp"
[MediaWiki-commits] [Gerrit] Don't allow some E_NOTICE messages to end up in the LocalSet... - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141307
Change subject: Don't allow some E_NOTICE messages to end up in the
LocalSettings.php
..
Don't allow some E_NOTICE messages to end up in the LocalSettings.php
There is probably a better, more comprehensive way to produce a
LocalSettings.php file so that E_STRICT and E_NOTICE errors don't end
up in the file, or to notify users that there is a problem with the
generated file, at least. This only attempts to address those issues
reported as a result of c978cee8562f018dab158b41e15266fcf873bf1b.
Bug: 66922
Change-Id: I0fe70446d9fe23aed2a147e20e5ff3851371726d
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/141307/1
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index fe036ad..162bede 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -221,9 +221,12 @@
wfBoolToStr( $perm ) . ";\n";
}
}
- if ( $this->groupPermissions['*']['edit'] === false
- &&
$this->groupPermissions['*']['createaccount'] === false
- && $this->groupPermissions['*']['read'] !==
false
+ if ( ( isset( $this->groupPermissions['*']['edit'] ) &&
+ $this->groupPermissions['*']['edit']
=== false )
+ && ( isset(
$this->groupPermissions['*']['createaccount'] ) &&
+
$this->groupPermissions['*']['createaccount'] === false )
+ && ( isset(
$this->groupPermissions['*']['read'] ) &&
+ $this->groupPermissions['*']['read']
!== false )
) {
$noFollow = "\n# Set \$wgNoFollowLinks to true
if you open up your wiki to editing by\n"
. "# the general public and wish to
apply nofollow to external links as a\n"
--
To view, visit https://gerrit.wikimedia.org/r/141307
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fe70446d9fe23aed2a147e20e5ff3851371726d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: MarkAHershberger
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix = vs == - change (mediawiki...VectorBeta)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix = vs ==
..
Fix = vs ==
Clearly an assignment wasn't intended here.
Change-Id: I938d8042fb41c2a32c26fb2a99df5e6baa2f1551
---
M VectorBeta.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VectorBeta.hooks.php b/VectorBeta.hooks.php
index ddcecee..9b3591d 100644
--- a/VectorBeta.hooks.php
+++ b/VectorBeta.hooks.php
@@ -34,7 +34,7 @@
$className .= 'mw-menu-item mw-icon mw-' . $key .
'-icon';
if ( strpos( $item['id'], 'ca-nstab' ) === 0 ) {
$className .= ' mw-page-icon';
- } elseif ( $item['id'] = 'ca-talk' ) {
+ } elseif ( $item['id'] == 'ca-talk' ) {
$className .= ' mw-talk-icon';
}
$htmlMenu .= Html::openElement( 'li', array(
--
To view, visit https://gerrit.wikimedia.org/r/141298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I938d8042fb41c2a32c26fb2a99df5e6baa2f1551
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Jorm
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix syntax error - change (mediawiki...FundraisingChart)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141306
Change subject: Fix syntax error
..
Fix syntax error
Change-Id: I6d0b15b4e4bc74037f1115ecf48aaf18616ad732
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 4 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FundraisingChart
refs/changes/06/141306/1
diff --git a/i18n/en.json b/i18n/en.json
index 0119d08..54accbf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,5 @@
"Sherah Smith"
]
},
- "fundraisingchart-desc": "A tag that affords JavaScript chart embedding
for fundraising datasets",
-}
\ No newline at end of file
+ "fundraisingchart-desc": "A tag that affords JavaScript chart embedding
for fundraising datasets"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9f6e395..db10a40 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,5 +4,5 @@
"Sherah Smith"
]
},
- "fundraisingchart-desc":
"{{desc|name=FundraisingChart|url=https://www.mediawiki.org/wiki/Extension:FundraisingChart}}";,
-}
\ No newline at end of file
+ "fundraisingchart-desc":
"{{desc|name=FundraisingChart|url=https://www.mediawiki.org/wiki/Extension:FundraisingChart}}";
+}
--
To view, visit https://gerrit.wikimedia.org/r/141306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d0b15b4e4bc74037f1115ecf48aaf18616ad732
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FundraisingChart
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't insert source title if there's no target link - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141379
Change subject: Don't insert source title if there's no target link
..
Don't insert source title if there's no target link
Bug: 66967
Change-Id: I022a2a333a2c41723a1b1310eb331d05a3f4e50a
---
M modules/tools/ext.cx.tools.link.js
1 file changed, 1 insertion(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/79/141379/1
diff --git a/modules/tools/ext.cx.tools.link.js
b/modules/tools/ext.cx.tools.link.js
index 6ee6f44..e916c54 100644
--- a/modules/tools/ext.cx.tools.link.js
+++ b/modules/tools/ext.cx.tools.link.js
@@ -108,8 +108,7 @@
var title = mw.Title.newFromText(
page.title );
if ( title ) {
- linkPairs[
title.getPrefixedDb() ] = page.langlinks && page.langlinks[ 0 ][ '*' ] ||
- page.title; //
Redirects will not have langlinks property
+ linkPairs[
title.getPrefixedDb() ] = page.langlinks && page.langlinks[ 0 ][ '*' ];
}
} );
}
--
To view, visit https://gerrit.wikimedia.org/r/141379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I022a2a333a2c41723a1b1310eb331d05a3f4e50a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Config vars either before or after require - change (mediawiki...TitleIcon)
Cicalese has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141362
Change subject: Config vars either before or after require
..
Config vars either before or after require
Change-Id: I6439c7c91c4e24bc1a04faecc94f394f20b100fa
---
M TitleIcon.php
1 file changed, 36 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TitleIcon
refs/changes/62/141362/1
diff --git a/TitleIcon.php b/TitleIcon.php
index af4f85c..fbbad20 100644
--- a/TitleIcon.php
+++ b/TitleIcon.php
@@ -31,7 +31,7 @@
$wgExtensionCredits['semantic'][] = array (
'name' => 'Title Icon',
- 'version' => '1.2.0',
+ 'version' => '1.3',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]'
),
@@ -51,15 +51,42 @@
$wgHooks['ParserFirstCallInit'][] = 'efTitleIconSetup';
-$TitleIcon_EnableIconInPageTitle = true;
-$TitleIcon_EnableIconInSearchTitle = true;
-$TitleIcon_UseFileNameAsToolTip = true;
-$TitleIcon_TitleIconPropertyName = "Title Icon";
-$TitleIcon_HideTitleIconPropertyName = "Hide Title Icon";
-$TitleIcon_UseDisplayTitle = false;
-$TitleIcon_DisplayTitlePropertyName = "Display Title";
-
function efTitleIconSetup (& $parser) {
+ global $TitleIcon_EnableIconInPageTitle;
+ if (!isset($TitleIcon_EnableIconInPageTitle)) {
+ $TitleIcon_EnableIconInPageTitle = true;
+ }
+
+ global $TitleIcon_EnableIconInSearchTitle;
+ if (!isset($TitleIcon_EnableIconInSearchTitle)) {
+ $TitleIcon_EnableIconInSearchTitle = true;
+ }
+
+ global $TitleIcon_UseFileNameAsToolTip;
+ if (!isset($TitleIcon_UseFileNameAsToolTip)) {
+ $TitleIcon_UseFileNameAsToolTip = true;
+ }
+
+ global $TitleIcon_TitleIconPropertyName;
+ if (!isset($TitleIcon_TitleIconPropertyName)) {
+ $TitleIcon_TitleIconPropertyName = "Title Icon";
+ }
+
+ global $TitleIcon_HideTitleIconPropertyName;
+ if (!isset($TitleIcon_HideTitleIconPropertyName)) {
+ $TitleIcon_HideTitleIconPropertyName = "Hide Title Icon";
+ }
+
+ global $TitleIcon_UseDisplayTitle;
+ if (!isset($TitleIcon_UseDisplayTitle)) {
+ $TitleIcon_UseDisplayTitle = false;
+ }
+
+ global $TitleIcon_DisplayTitlePropertyName;
+ if (!isset($TitleIcon_DisplayTitlePropertyName)) {
+ $TitleIcon_DisplayTitlePropertyName = "Display Title";
+ }
+
global $TitleIcon_EnableIconInPageTitle,
$TitleIcon_EnableIconInSearchTitle,
$wgHooks;
if ($TitleIcon_EnableIconInPageTitle) {
--
To view, visit https://gerrit.wikimedia.org/r/141362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6439c7c91c4e24bc1a04faecc94f394f20b100fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleIcon
Gerrit-Branch: master
Gerrit-Owner: Cicalese
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix syntax error - change (mediawiki...FundraisingChart)
Raimond Spekking has submitted this change and it was merged.
Change subject: Fix syntax error
..
Fix syntax error
Change-Id: I6d0b15b4e4bc74037f1115ecf48aaf18616ad732
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Raimond Spekking: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 0119d08..54accbf 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4,5 +4,5 @@
"Sherah Smith"
]
},
- "fundraisingchart-desc": "A tag that affords JavaScript chart embedding
for fundraising datasets",
-}
\ No newline at end of file
+ "fundraisingchart-desc": "A tag that affords JavaScript chart embedding
for fundraising datasets"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 9f6e395..db10a40 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -4,5 +4,5 @@
"Sherah Smith"
]
},
- "fundraisingchart-desc":
"{{desc|name=FundraisingChart|url=https://www.mediawiki.org/wiki/Extension:FundraisingChart}}";,
-}
\ No newline at end of file
+ "fundraisingchart-desc":
"{{desc|name=FundraisingChart|url=https://www.mediawiki.org/wiki/Extension:FundraisingChart}}";
+}
--
To view, visit https://gerrit.wikimedia.org/r/141306
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6d0b15b4e4bc74037f1115ecf48aaf18616ad732
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FundraisingChart
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking
Gerrit-Reviewer: Raimond Spekking
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix validation bug and replace cookie w/ field - change (mediawiki...Campaigns)
AndyRussG has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141378
Change subject: Fix validation bug and replace cookie w/ field
..
Fix validation bug and replace cookie w/ field
Continue to process the campaign even after a form validation error,
while maintaining the user's opt in/out selection. Also discontinue
use of the campaign cookie; use instead a hidden field on the account
creation form.
Change-Id: I3c432594a54f471988f0319e7ca48f4e35cd99c4
---
M Campaigns.hooks.php
M modules/ext.campaigns.js
2 files changed, 55 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Campaigns
refs/changes/78/141378/1
diff --git a/Campaigns.hooks.php b/Campaigns.hooks.php
index 4537c50..2ae0e16 100644
--- a/Campaigns.hooks.php
+++ b/Campaigns.hooks.php
@@ -39,18 +39,13 @@
/**
* If there's a ?campaign=someName in the query string and the user is
not
-* logged in, send JavaScript with the page to process campaign.
-*
-* Don't set the cookie in PHP because we believe the Squid cache will
not
-* send the Set-Cookie header along with a cached version of the page.
The
-* Squid cache fragments on query string, hence the right campaign
value and
-* JS module will be sent to the client for different ?campaign=foo
parameters.
+* logged in, add some hidden fields to the form and send JavaScript to
+* display a warning and an opt-in control.
*
* @param &$template template instance for the form
* @return bool True
*/
public static function onUserCreateForm( &$template ) {
- global $wgCookiePrefix;
$maxCampaignLen = 40;
$skin = $template->getSkin();
@@ -63,6 +58,13 @@
return true;
}
+
+ // Add the same campaign query string to the form's URL. This
ensures we
+ // return here if there are form validation errors (including
captcha
+ // errors) and that the query string remains visible in the URL.
+ $currentUrl = $template->get( 'action' );
+ $newUrl = wfAppendQuery( $currentUrl, 'campaign=' .
$campaignUrlKey );
+ $template->set( 'action', $newUrl );
// The version of the page for a logged-in user will not be
cached and
// served to anonymous users, so it's OK to check on server.
@@ -79,15 +81,27 @@
$campaign = $campaignProvider->getOrCreateCampaign(
$campaignUrlKey );
$out = $skin->getOutput();
- $out->addJsConfigVars( 'wgCampaignsCampaignUrlKey',
$campaignUrlKey );
$out->addJsConfigVars( 'wgCampaignsCampaignName',
$campaign->getName() );
+ // If we were just here and are returning following a form
validation
+ // failure, tell the JS module to keep the existing opt-in
value. We
+ // have to do this via JS because the default "true" value is
set via
+ // JS. (This ensures that users with JS disabled aren't added
to a
+ // campaign without their knowledge.)
+ $previousOptInVal = $request->getVal( 'wpCampaignOptIn', '' );
+
+ if ( $previousOptInVal === '' ) {
+ $previousOptInVal = 'true';
+ }
+
+ $out->addJsConfigVars( 'wgCampaignsCampaignSetOptIn',
$previousOptInVal );
$out->addModules( 'ext.campaigns' );
- // Hidden control on form for opting in or out. Will be set
correctly
- // via Javascript.
- $template->addInputItem( 'wpCampaignOptIn', 'false', 'hidden',
- '' );
+ // Hidden controls on form
+ $template->addInputItem( 'wpCampaignOptIn', 'false', 'hidden',
null );
+
+ $template->addInputItem(
+ 'wpCampaignUrlKey', $campaignUrlKey, 'hidden', null );
return true;
}
@@ -101,7 +115,7 @@
* @return bool True
*/
public static function onAddNewAccount( $user, $byEmail ) {
- global $wgEventLoggingSchemaRevs, $wgRequest, $wgUser,
$wgCookiePrefix;
+ global $wgEventLoggingSchemaRevs, $wgRequest, $wgUser;
$userId = $user->getId();
$creatorUserId = $wgUser->getId();
@@ -114,8 +128,7 @@
$displayMobile = class_exists( 'MobileContext' ) &&
MobileContext::singleton()->shouldDisplayMobileView();
- $campaignUrlKey =
- $wgRequest->getCookie( '-campaign', $wgCookiePrefix, ''
);
+ $campaignUrlKey = $wgRequest->getVal( 'wpCampaignUrlKey', '' );
$event = array(
'token'
[MediaWiki-commits] [Gerrit] Work in progress: fix for linking to pages with fragments - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141365
Change subject: Work in progress: fix for linking to pages with fragments
..
Work in progress: fix for linking to pages with fragments
* updates MWPageTitle class a bit, which wasn't previously used
* sticks it in the middle of link handling briefly to remove the fragment
todo:
* fix some methods to take MWPageTitle instead of string directly
* handle jumping to the fragment-specific section on page load
todo later:
* figure out if/how to handle namespacing
Change-Id: Ib203d62ab2499cceaa72604285751b7f93460afc
---
M wikipedia/View Controllers/WebView/WebViewController.m
M wikipedia/mw-support/MWPageTitle.h
M wikipedia/mw-support/MWPageTitle.m
M wikipedia/mw-support/MWSite.m
4 files changed, 118 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/65/141365/1
diff --git a/wikipedia/View Controllers/WebView/WebViewController.m
b/wikipedia/View Controllers/WebView/WebViewController.m
index 9cbe0f6..af694fa 100644
--- a/wikipedia/View Controllers/WebView/WebViewController.m
+++ b/wikipedia/View Controllers/WebView/WebViewController.m
@@ -18,6 +18,7 @@
#import "MWLanguageInfo.h"
#import "CenterNavController.h"
#import "Defines.h"
+#import "MWPageTitle.h"
#import "UIViewController+SearchChildViewControllers.h"
#import "NSManagedObjectContext+SimpleFetch.h"
@@ -818,8 +819,9 @@
if ([href hasPrefix:@"/wiki/"]) {
NSString *title = [href substringWithRange:NSMakeRange(6,
href.length - 6)];
+MWPageTitle *pageTitle = [MWPageTitle titleWithString:title];
-[weakSelf navigateToPage: title
+[weakSelf navigateToPage: pageTitle.prefixedText
domain: [SessionSingleton
sharedInstance].currentArticleDomain
discoveryMethod: DISCOVERY_METHOD_LINK
invalidatingCache: NO];
diff --git a/wikipedia/mw-support/MWPageTitle.h
b/wikipedia/mw-support/MWPageTitle.h
index 17e7929..2f8747a 100644
--- a/wikipedia/mw-support/MWPageTitle.h
+++ b/wikipedia/mw-support/MWPageTitle.h
@@ -5,12 +5,64 @@
@interface MWPageTitle : NSObject
-+(MWPageTitle *)titleFromNamespace:(NSString *)namespace text:(NSString *)text;
+/**
+ * Initialize a new MWPageTitle object from string input
+ */
+-(id)initWithString:(NSString *)str;
--(id)initFromNamespace:(NSString *)namespace text:(NSString *)text;
+/**
+ * Create a new MWPageTitle object from string input
+ */
++(MWPageTitle *)titleWithString:(NSString *)str;
--(NSString *)namespace;
--(NSString *)text;
--(NSString *)prefixedText;
+/**
+ * Normalize a title string portion to text form
+ */
++(NSString *)normalize:(NSString *)str;
+
+
+/**
+ * Normalized namespace (decoded, no underscores)
+ * Warning: not implemented yet
+ */
+@property (readonly) NSString *namespace;
+
+/**
+ * Normalized title component only (decoded, no underscores)
+ */
+@property (readonly) NSString *text;
+
+/**
+ * Fragment (component after the '#')
+ * Warning: fragment may be nil!
+ */
+@property (readonly) NSString *fragment;
+
+
+/**
+ * Full text-normalized namespace+title
+ * Decoded, with spaces
+ */
+@property (readonly) NSString *prefixedText;
+
+/**
+ * Full DB-normalized namespace+title
+ * Decoded, with underscores
+ */
+@property (readonly) NSString *prefixedDBKey;
+
+/**
+ * Full URL-normalized namespace+title
+ * Encoded, with underscores
+ */
+@property (readonly) NSString *prefixedURL;
+
+/**
+ * URL-normalized fragment, including the # if applicable
+ * Always returns a string, may be empty string.
+ */
+@property (readonly) NSString *fragmentForURL;
+
+
@end
diff --git a/wikipedia/mw-support/MWPageTitle.m
b/wikipedia/mw-support/MWPageTitle.m
index f92e9f8..deb2aa0 100644
--- a/wikipedia/mw-support/MWPageTitle.m
+++ b/wikipedia/mw-support/MWPageTitle.m
@@ -2,30 +2,50 @@
// Copyright (c) 2013 Wikimedia Foundation. Provided under MIT-style license;
please copy and modify!
#import "MWPageTitle.h"
+#import "NSString+Extras.h"
@implementation MWPageTitle {
-NSString *_namespace;
NSString *_text;
+NSString *_fragment;
}
-+(MWPageTitle *)titleFromNamespace:(NSString *)namespace text:(NSString *)text
+#pragma mark - Class methods
+
++(MWPageTitle *)titleWithString:(NSString *)str
{
-return [[MWPageTitle alloc] initFromNamespace:namespace text:text];
+return [[MWPageTitle alloc] initWithString:str];
}
--(id)initFromNamespace:(NSString *)namespace text:(NSString *)text
++(NSString *)normalize:(NSString *)str
+{
+// @todo implement fuller normalization?
+return [str stringByReplacingOccurrencesOfString:@"_" withString:@" "];
+}
+
+#pragma mark - Initializers
+
+-(id)initWithString:(NSString *)str
{
self = [self init];
if (self) {
-_namespace = namespace;
-_text = text;
+N
[MediaWiki-commits] [Gerrit] [FundraisingChart] Register extension - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/141304 Change subject: [FundraisingChart] Register extension .. [FundraisingChart] Register extension Change-Id: I4d00dd861fa7430898ff29bad68c4517ec5804d0 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/04/141304/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 1668f3c..c57da5c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -703,6 +703,8 @@ ignored = fundraiserlandingpage-wmch-landing-page, fundraiserlandingpage-wmde-landing-page ignored = fundraiserlandingpage-wmfr-landing-page, fundraiserlandingpage-wmuk-landing-page +Fundraising Chart + # Fundraising Email Unsubscribe / Git repo somehow broken: fatal: Not a git repository (or any of the parent directories): .git Gadgets -- To view, visit https://gerrit.wikimedia.org/r/141304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d00dd861fa7430898ff29bad68c4517ec5804d0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Message cleanup - change (mediawiki...MediaWikiChat)
UltrasonicNXT has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141361
Change subject: Message cleanup
..
Message cleanup
Replace one with a core MW message, reorder messages in definition
Change-Id: Ief4fdcadd52ba4dcfcee451ecb0e1a67d91277c6
---
M MediaWikiChat.js
M MediaWikiChat.php
M i18n/en.json
3 files changed, 8 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiChat
refs/changes/61/141361/1
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 81c974b..f99bbb2 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -74,7 +74,7 @@
var diff = ( tsNow - timestamp ) / 100;
if ( diff < 30 ) {
- return mw.message( 'chat-just-now' ).text();
+ return mw.message( 'just-now' ).text();
} else if ( diff < 2 * 60 ) {
return mw.message( 'chat-a-minute-ago' ).text();
} else if ( diff < 60 * 60 ) {
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index e312dd2..d577baf 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -32,18 +32,13 @@
$wgResourceModules['ext.mediawikichat.js'] = array(
'scripts' => 'MediaWikiChat.js',
'messages' => array(
- 'january', 'february', 'march', 'april', 'may', 'june',
- 'july', 'august', 'september', 'october', 'november',
'december',
- 'monday', 'tuesday', 'wednesday', 'thursday', 'friday',
'saturday',
- 'sunday', 'chat-type-your-private-message',
'chat-no-other-users',
- 'chat-blocked-from-chat', 'chat-just-now', 'chat-a-minute-ago',
- 'chat-quarter-of-an-hour-ago', 'chat-half-an-hour-ago',
- 'chat-an-hour-ago', 'minutes-ago', 'chat-youve-been-kicked',
- 'chat-you-kicked', 'chat-kicked', 'chat-kick',
- 'chat-youve-been-blocked', 'chat-you-blocked', 'chat-blocked',
- 'chat-block', 'chat-private-message', 'chat-user-is-moderator',
- 'chat-you-are-moderator', 'chat-joined', 'chat-left',
- 'chat-mod-image', 'chat-yesterday', 'chat-flood',
'chat-too-long',
+ 'january', 'february', 'march', 'april', 'may', 'june', 'july',
'august', 'september', 'october',
+ 'november', 'december', 'monday', 'tuesday', 'wednesday',
'thursday', 'friday', 'saturday',
+ 'sunday', 'chat-type-your-private-message',
'chat-no-other-users', 'chat-blocked-from-chat',
+ 'just-now', 'chat-a-minute-ago', 'minutes-ago',
'chat-youve-been-kicked','chat-you-kicked',
+ 'chat-kicked', 'chat-kick', 'chat-youve-been-blocked',
'chat-you-blocked', 'chat-blocked',
+ 'chat-block', 'chat-private-message', 'chat-user-is-moderator',
'chat-you-are-moderator',
+ 'chat-joined', 'chat-left', 'chat-mod-image', 'chat-yesterday',
'chat-flood', 'chat-too-long',
'chat-idle-minutes', 'chat-idle-hours', 'chat-idle-more'
),
'dependencies' => 'mediawiki.jqueryMsg',
diff --git a/i18n/en.json b/i18n/en.json
index 7ae0756..ebcfdd5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,7 +15,6 @@
"chat-sounds": "Play sounds",
"chat-flood": "You can't send messages that fast, please wait before
sending more.",
"chat-too-long": "That message was too long, please send a shorter
message.",
-"chat-just-now": "just now",
"chat-a-minute-ago": "a minute ago",
"chat-yesterday": "yesterday",
"chat-kick": "kick",
--
To view, visit https://gerrit.wikimedia.org/r/141361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief4fdcadd52ba4dcfcee451ecb0e1a67d91277c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rename Parser_DiffTest class to ParserDiffTest - change (mediawiki/core)
Withoutaname has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141360
Change subject: Rename Parser_DiffTest class to ParserDiffTest
..
Rename Parser_DiffTest class to ParserDiffTest
Change-Id: I5fca44a3fffbc60a66be32fad9ed6d1713056d81
---
M RELEASE-NOTES-1.24
M includes/AutoLoader.php
M includes/cache/MessageCache.php
R includes/parser/ParserDiffTest.php
4 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/60/141360/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 4f0ae21..60d4ccf 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -181,6 +181,7 @@
* CLDRPluralRuleEvaluator_Range to CLDRPluralRuleEvaluatorRange
* CSSJanus_Tokenizer to CSSJanusTokenizer
* MediaWiki_I18N to MediaWikiI18N
+* Parser_DiffTest to ParserDiffTest
* RevDel_ArchiveItem to RevDelArchiveItem
* RevDel_ArchiveList to RevDelArchiveList
* RevDel_ArchivedFileItem to RevDelArchivedFileItem
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 94264ae..3ac4722 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -830,7 +830,7 @@
'ParserCache' => 'includes/parser/ParserCache.php',
'ParserOptions' => 'includes/parser/ParserOptions.php',
'ParserOutput' => 'includes/parser/ParserOutput.php',
- 'Parser_DiffTest' => 'includes/parser/Parser_DiffTest.php',
+ 'ParserDiffTest' => 'includes/parser/ParserDiffTest.php',
'Preprocessor' => 'includes/parser/Preprocessor.php',
'Preprocessor_DOM' => 'includes/parser/Preprocessor_DOM.php',
'Preprocessor_Hash' => 'includes/parser/Preprocessor_Hash.php',
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index a3cf87e..e5afd21 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -1025,7 +1025,7 @@
$wgParser->firstCallInit();
# Clone it and store it
$class = $wgParserConf['class'];
- if ( $class == 'Parser_DiffTest' ) {
+ if ( $class == 'ParserDiffTest' ) {
# Uncloneable
$this->mParser = new $class( $wgParserConf );
} else {
diff --git a/includes/parser/Parser_DiffTest.php
b/includes/parser/ParserDiffTest.php
similarity index 97%
rename from includes/parser/Parser_DiffTest.php
rename to includes/parser/ParserDiffTest.php
index 920b6f6..2db0597 100644
--- a/includes/parser/Parser_DiffTest.php
+++ b/includes/parser/ParserDiffTest.php
@@ -24,7 +24,7 @@
/**
* @ingroup Parser
*/
-class Parser_DiffTest
+class ParserDiffTest
{
var $parsers, $conf;
var $shortOutput = false;
@@ -98,7 +98,7 @@
} else {
$diff = '[too many parsers]';
}
- $msg = "Parser_DiffTest: results mismatch on call to
$name\n";
+ $msg = "ParserDiffTest: results mismatch on call to
$name\n";
if ( !$this->shortOutput ) {
$msg .= 'Arguments: ' . $this->formatArray(
$args ) . "\n";
}
--
To view, visit https://gerrit.wikimedia.org/r/141360
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5fca44a3fffbc60a66be32fad9ed6d1713056d81
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improved rendering - change (mediawiki...SemanticRating)
Cicalese has submitted this change and it was merged.
Change subject: Improved rendering
..
Improved rendering
Change-Id: Ife7530525f39405cc6499f1ab12e3d215c3ea4f9
---
M SemanticRating.class.php
M SemanticRating.php
2 files changed, 4 insertions(+), 8 deletions(-)
Approvals:
Cicalese: Verified; Looks good to me, approved
diff --git a/SemanticRating.class.php b/SemanticRating.class.php
index 40e4a63..eaf4fb4 100644
--- a/SemanticRating.class.php
+++ b/SemanticRating.class.php
@@ -26,9 +26,7 @@
public function renderRating($input, $imagepath) {
- $output =
- Html::openElement('table', array('style' =>
'display:inline;')) .
- Html::openElement('td');
+ $output = Html::openElement('span');
if ($input < 0) {
$input = 0;
@@ -57,8 +55,7 @@
}
$output .=
- Html::closeElement('td') .
- Html::closeElement('table');
+ Html::closeElement('span');
return $output;
}
diff --git a/SemanticRating.php b/SemanticRating.php
index 8e0089d..37189d2 100644
--- a/SemanticRating.php
+++ b/SemanticRating.php
@@ -39,7 +39,7 @@
$wgExtensionCredits['semantic'][] = array (
'name' => 'SemanticRating',
- 'version' => '1.1.0',
+ 'version' => '1.2',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]'
),
@@ -84,8 +84,7 @@
global $SemanticRating_ImagePath;
$instance = new SemanticRating;
$output = $instance->renderRating($input, $SemanticRating_ImagePath);
- return array($parser->insertStripItem( $output, $parser->mStripState ),
- 'noparse' => false);
+ return $output;
}
function editRating($cur_value, $input_name, $is_mandatory, $is_disabled,
--
To view, visit https://gerrit.wikimedia.org/r/141309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ife7530525f39405cc6499f1ab12e3d215c3ea4f9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SemanticRating
Gerrit-Branch: master
Gerrit-Owner: Cicalese
Gerrit-Reviewer: Cicalese
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Security fix - change (mediawiki...Vine)
Cook879 has submitted this change and it was merged. Change subject: Security fix .. Security fix Passed the value of the size parameter straight to the output without validating, leaving an xss hole. This should fix that issue. Change-Id: Iead26a54a34babe1b580d64d98fff2357e5731e5 --- M Vine.php 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Cook879: Verified; Looks good to me, approved diff --git a/Vine.php b/Vine.php index 98b9590..02fd7ed 100644 --- a/Vine.php +++ b/Vine.php @@ -4,7 +4,7 @@ * * @file * @ingroup Extensions - * @version 1.1 + * @version 1.1.1 * @author Richard Cook * @copyright Copyright © 2014 Richard Cook * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 3.0 or later @@ -18,7 +18,7 @@ // Extension credits that will show up on Special:Version $wgExtensionCredits['parserhook'][] = array( 'name' => 'Vine', - 'version' => '1.0', + 'version' => '1.1.1', 'author' => '[http://www.shoutwiki.com/wiki/User:Cook879 Richard Cook]', 'url' => 'http://www.mediawiki.com/wiki/Extension:Vine', 'description' => 'Adds atag to add Vine posts to your site' @@ -45,7 +45,7 @@ $type = 'postcard'; } - if ( !empty( $args['size'] ) ) { + if ( !empty( $args['size'] ) && filter_var( $args['size'], FILTER_VALIDATE_INT, array( 'options' => array( 'min-range' => 0 ) ) ) ) { $size = $args['size']; } -- To view, visit https://gerrit.wikimedia.org/r/141291 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iead26a54a34babe1b580d64d98fff2357e5731e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Vine Gerrit-Branch: master Gerrit-Owner: Cook879 Gerrit-Reviewer: Cook879 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Moved Article::render() to RenderAction::show() - change (mediawiki/core)
Withoutaname has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141359
Change subject: Moved Article::render() to RenderAction::show()
..
Moved Article::render() to RenderAction::show()
Also added a deprecation notice to Article::render()
and to the release notes for 1.24.
Change-Id: Ib032991bd178fef04694ff4b7fa662a07c9d8079
---
M RELEASE-NOTES-1.24
M includes/actions/RenderAction.php
M includes/page/Article.php
3 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/59/141359/1
diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24
index 4f0ae21..d3e9f3c 100644
--- a/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@ -173,6 +173,8 @@
* Removed WebRequest::escapeAppendQuery(). (deprecated since 1.20)
* Removed info(), purge(), revert() and rollback() from the Article class; they
have since become subclasses of the Action class. (deprecated since 1.19)
+* Deprecated Article::render() in favor of RenderAction::show(), to consolidate
+ subclasses of the Action class.
Renamed classes
* CLDRPluralRuleConverter_Expression to CLDRPluralRuleConverterExpression
diff --git a/includes/actions/RenderAction.php
b/includes/actions/RenderAction.php
index 16e407f..a77fffc 100644
--- a/includes/actions/RenderAction.php
+++ b/includes/actions/RenderAction.php
@@ -1,6 +1,6 @@
page->render();
+ $this->getRequest()->response()->header( 'X-Robots-Tag:
noindex' );
+ $this->getOutput()->setArticleBodyOnly( true );
+ $this->getOutput()->enableSectionEditLinks( false );
+ $view = new ViewAction();
+ $view->show();
}
}
diff --git a/includes/page/Article.php b/includes/page/Article.php
index c68c675..782e809 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -1494,12 +1494,11 @@
/**
* Handle action=render
+* @deprecated since 1.24
*/
public function render() {
- $this->getContext()->getRequest()->response()->header(
'X-Robots-Tag: noindex' );
- $this->getContext()->getOutput()->setArticleBodyOnly( true );
- $this->getContext()->getOutput()->enableSectionEditLinks( false
);
- $this->view();
+ wfDeprecated( __METHOD__, '1.24' );
+ Action::factory( 'render', $this )->show();
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/141359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib032991bd178fef04694ff4b7fa662a07c9d8079
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Withoutaname
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta.labs: logo and favicon change for dewiki - change (operations/mediawiki-config)
Se4598 has uploaded a new change for review. https://gerrit.wikimedia.org/r/141305 Change subject: beta.labs: logo and favicon change for dewiki .. beta.labs: logo and favicon change for dewiki a magenta logo and favicon to visually separate real dewiki and beta discussed at http://de.wikipedia.beta.wmflabs.org/w/index.php?title=Benutzer_Diskussion:PerfektesChaos&oldid=5766#Was_geht_hier.3F Change-Id: I5cd91c3e1929c547c73f40f122ad4b466b8701e9 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/05/141305/1 diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 6af6565..8cf17ba 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -153,6 +153,11 @@ 'wgLogo' => array( 'commonswiki' => '$stdlogo', + 'dewiki' => '//upload.wikimedia.org/wikipedia/commons/8/8f/Wikipedia-logo-v2-de-beta.png', + ), + + 'wgFavicon' => array( + 'dewiki' => '//upload.wikimedia.org/wikipedia/commons/1/14/Favicon-beta-wikipedia.png', ), // Editor Engagement stuff -- To view, visit https://gerrit.wikimedia.org/r/141305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cd91c3e1929c547c73f40f122ad4b466b8701e9 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Se4598 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [AdvancedMeta] Add extension but commented out due to missin... - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [AdvancedMeta] Add extension but commented out due to missing qqq .. [AdvancedMeta] Add extension but commented out due to missing qqq Change-Id: Ifb4c090cc071652bcd716f8a30d7ebd44df4d3ef --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 29e7a4c..1668f3c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -26,6 +26,10 @@ Ads +# Missing message documentation qqq +# Advanced Meta +# descmsg = ameta-desc + Agora # Missing message documentatin -- To view, visit https://gerrit.wikimedia.org/r/141302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb4c090cc071652bcd716f8a30d7ebd44df4d3ef Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for missing revision ID in save event logging - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Fix for missing revision ID in save event logging
..
Fix for missing revision ID in save event logging
Change-Id: I2fe7c82e1b078dc875d6f33f8e854f02a1868613
---
M wikipedia/Data/Operations/UploadSectionWikiTextOp.h
M wikipedia/Data/Operations/UploadSectionWikiTextOp.m
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
3 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Data/Operations/UploadSectionWikiTextOp.h
b/wikipedia/Data/Operations/UploadSectionWikiTextOp.h
index 332e7da..4a52b96 100644
--- a/wikipedia/Data/Operations/UploadSectionWikiTextOp.h
+++ b/wikipedia/Data/Operations/UploadSectionWikiTextOp.h
@@ -24,7 +24,7 @@
summary: (NSString *)summary
captchaId: (NSString *)captchaId
captchaWord: (NSString *)captchaWord
- completionBlock: (void (^)(NSString *))completionBlock
+ completionBlock: (void (^)(NSDictionary *))completionBlock
cancelledBlock: (void (^)(NSError *))cancelledBlock
errorBlock: (void (^)(NSError *))errorBlock
;
diff --git a/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
b/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
index 2c1d68a..1d60265 100644
--- a/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
+++ b/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
@@ -16,7 +16,7 @@
summary: (NSString *)summary
captchaId: (NSString *)captchaId
captchaWord: (NSString *)captchaWord
- completionBlock: (void (^)(NSString *))completionBlock
+ completionBlock: (void (^)(NSDictionary *))completionBlock
cancelledBlock: (void (^)(NSError *))cancelledBlock
errorBlock: (void (^)(NSError *))errorBlock
{
@@ -73,7 +73,8 @@
weakSelf.error = [NSError errorWithDomain:@"Upload Wikitext
Op" code:WIKITEXT_UPLOAD_ERROR_SERVER userInfo:errorDict];
}
-NSString *result = weakSelf.jsonRetrieved[@"edit"][@"result"];
+NSDictionary *resultDict = weakSelf.jsonRetrieved[@"edit"];
+NSString *result = resultDict[@"result"];
if (!weakSelf.error && !result) {
NSMutableDictionary *errorDict = [@{} mutableCopy];
@@ -142,7 +143,7 @@
return;
}
-completionBlock(result);
+completionBlock(resultDict);
};
}
return self;
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
index 1dcc846..43bb260 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
@@ -484,11 +484,12 @@
NSString *title = section.fromTitle ? section.fromTitle :
section.article.title;
UploadSectionWikiTextOp *uploadWikiTextOp =
-[[UploadSectionWikiTextOp alloc] initForPageTitle:title
domain:section.article.domain section:section.index wikiText:self.wikiText
summary:editSummary captchaId:self.captchaId
captchaWord:self.captchaViewController.captchaTextBox.text
completionBlock:^(NSString *result){
+[[UploadSectionWikiTextOp alloc] initForPageTitle:title
domain:section.article.domain section:section.index wikiText:self.wikiText
summary:editSummary captchaId:self.captchaId
captchaWord:self.captchaViewController.captchaTextBox.text
completionBlock:^(NSDictionary *resultDict){
+[self.funnel logSavedRevision:[resultDict[@"newrevid"] intValue]];
+
// Mark article for refreshing and reload it.
if (articleID) {
-[self.funnel logSavedRevision:0]; // @fixme need revision ID
[[NSOperationQueue mainQueue] addOperationWithBlock: ^ {
WebViewController *webVC = [self.navigationController
searchNavStackForViewControllerOfClass:[WebViewController class]];
[webVC reloadCurrentArticleInvalidatingCache:YES];
--
To view, visit https://gerrit.wikimedia.org/r/141363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fe7c82e1b078dc875d6f33f8e854f02a1868613
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER
Gerrit-Reviewer: Brion VIBBER
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add support for login domains, to make this work with LDAP E... - change (mediawiki...Push)
Drobbins has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141364
Change subject: Add support for login domains, to make this work with LDAP
Extension. Use egPushLoginDomains.
..
Add support for login domains, to make this work with LDAP Extension. Use
egPushLoginDomains.
Change-Id: I64befa112df9a9b3b97bf7dc16522a62b9e44a4c
---
M Push_Settings.php
M api/ApiPush.php
M api/ApiPushImages.php
3 files changed, 31 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Push
refs/changes/64/141364/1
diff --git a/Push_Settings.php b/Push_Settings.php
index ca510fc..236d3fe 100644
--- a/Push_Settings.php
+++ b/Push_Settings.php
@@ -60,6 +60,7 @@
# no login interface. If there is, they will be filled in as default.
$egPushLoginUser = '';
$egPushLoginPass = '';
+$egPushLoginDomain = '';
# Default login data per target. Overrides $egPushLoginUser and
$egPushLoginPass when specified.
# Array keys should be the urls assigned in the $egPushTargets array.
@@ -67,6 +68,7 @@
# no login interface. If there is, they will be filled in as default.
$egPushLoginUsers = array();
$egPushLoginPasswords = array();
+$egPushLoginDomains = array();
# The amount of push 'workers' (simultanious push requests) on Special:Push.
$egPushBulkWorkers = 3;
diff --git a/api/ApiPush.php b/api/ApiPush.php
index 58d7ebf..1e76cb6 100644
--- a/api/ApiPush.php
+++ b/api/ApiPush.php
@@ -35,7 +35,7 @@
$this->dieUsageMsg( array( 'badaccess-groups' ) );
}
- global $egPushLoginUser, $egPushLoginPass, $egPushLoginUsers,
$egPushLoginPasswords;
+ global $egPushLoginUser, $egPushLoginPass, $egPushLoginUsers,
$egPushLoginPasswords, $egPushLoginDomain, $egPushLoginDomains;
$params = $this->extractRequestParams();
@@ -49,10 +49,12 @@
PushFunctions::flipKeys( $egPushLoginUsers, 'users' );
PushFunctions::flipKeys( $egPushLoginPasswords, 'passwds' );
+ PushFunctions::flipKeys( $egPushLoginDomains, 'domains' );
foreach ( $params['targets'] as &$target ) {
$user = false;
$pass = false;
+ $domain = false;
if ( array_key_exists( $target, $egPushLoginUsers ) &&
array_key_exists( $target, $egPushLoginPasswords ) ) {
$user = $egPushLoginUsers[$target];
@@ -62,6 +64,12 @@
$user = $egPushLoginUser;
$pass = $egPushLoginPass;
}
+ if ( array_key_exists( $target, $egPushLoginDomains ) )
{
+ $domain = $egPushLoginDomains[$target];
+ }
+ elseif ( $egPushLoginDomain != '' ) {
+ $domain = $egPushLoginDomain;
+ }
if ( substr( $target, -1 ) !== '/' ) {
$target .= '/';
@@ -70,7 +78,7 @@
$target .= 'api.php';
if ( $user !== false ) {
- $this->doLogin( $user, $pass, $target );
+ $this->doLogin( $user, $pass, $domain, $target
);
}
}
@@ -105,13 +113,16 @@
* @param CookieJar $cookie
* @param integer $attemtNr
*/
- protected function doLogin( $user, $password, $target, $token = null,
$cookieJar = null, $attemtNr = 0 ) {
+ protected function doLogin( $user, $password, $domain, $target, $token
= null, $cookieJar = null, $attemtNr = 0 ) {
$requestData = array(
'action' => 'login',
'format' => 'json',
'lgname' => $user,
'lgpassword' => $password
);
+ if ( $domain != false )
+ $requestData['lgdomain'] = $domain;
+
if ( !is_null( $token ) ) {
$requestData['lgtoken'] = $token;
@@ -140,7 +151,7 @@
&& property_exists( $response->login, 'result'
) ) {
if ( $response->login->result == 'NeedToken' &&
$attemtNr < 3 ) {
- $this->doLogin( $user, $password,
$target, $response->login->token, $req->getCookieJar(), $attemtNr );
+ $this->doLogin( $user, $password,
$domain, $target, $response->login->token, $req->getCookieJar(), $attemtNr );
}
elseif ( $response->login->result == 'Success'
) {
$this->cookieJars[$target] =
$req->getCookieJar();
diff --gi
[MediaWiki-commits] [Gerrit] [FundraisingChart] Register extension - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [FundraisingChart] Register extension .. [FundraisingChart] Register extension Change-Id: I4d00dd861fa7430898ff29bad68c4517ec5804d0 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 1668f3c..c57da5c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -703,6 +703,8 @@ ignored = fundraiserlandingpage-wmch-landing-page, fundraiserlandingpage-wmde-landing-page ignored = fundraiserlandingpage-wmfr-landing-page, fundraiserlandingpage-wmuk-landing-page +Fundraising Chart + # Fundraising Email Unsubscribe / Git repo somehow broken: fatal: Not a git repository (or any of the parent directories): .git Gadgets -- To view, visit https://gerrit.wikimedia.org/r/141304 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d00dd861fa7430898ff29bad68c4517ec5804d0 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct condition for MWHttpRequest::proxySetup() function - change (mediawiki/core)
devunt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141366
Change subject: Use correct condition for MWHttpRequest::proxySetup() function
..
Use correct condition for MWHttpRequest::proxySetup() function
Use "$this->proxy || $this->noProxy"[1] instead of current one
"$this->proxy && !$this->noProxy"[2]. Condition [1] is the
correct one.
[1] if the proxy is already set or proxy is disabled.
[2] if the proxy is already set and proxy is not disabled.
Change-Id: I642150652440390449a44982b71ad6e9e8a276c4
---
M includes/HttpFunctions.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/66/141366/1
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index c9dd0c0..796ca2a 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -334,8 +334,8 @@
public function proxySetup() {
global $wgHTTPProxy;
- // If there is an explicit proxy set and proxies are not
disabled, then use it
- if ( $this->proxy && !$this->noProxy ) {
+ // If the proxy is already set or noProxy is set, skip setup
process
+ if ( $this->proxy || $this->noProxy ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/141366
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I642150652440390449a44982b71ad6e9e8a276c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: devunt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (bug 66960) Require MediaWiki:Licenses to enable uploads (WMF) - change (mediawiki...WikimediaMessages)
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 66960) Require MediaWiki:Licenses to enable uploads (WMF)
..
(bug 66960) Require MediaWiki:Licenses to enable uploads (WMF)
This change checks whether MediaWiki:Licenses has any text.
By default it does not, which means by default uploading is disabled.
To enable, the page needs to be simply created.
The advantage is that some or many small WMF wikis still do not have
license options, which is really needed for our copyright requirements.
https://wikimediafoundation.org/wiki/Resolution:Licensing_policy
A previous attempt in core was unwanted, see
I465daaff4aed4b484a1f4707fe57d45c0e9ce6cd
Change-Id: I364f48f387d5987ba2b93e90ea6b2a3c5de1461d
---
M WikimediaMessages.php
M i18n/wikimedia/en.json
M i18n/wikimedia/qqq.json
3 files changed, 16 insertions(+), 2 deletions(-)
Approvals:
Hoo man: Looks good to me, but someone else must approve
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikimediaMessages.php b/WikimediaMessages.php
index 26a78ed..da01558 100644
--- a/WikimediaMessages.php
+++ b/WikimediaMessages.php
@@ -126,3 +126,15 @@
}
return true;
};
+
+/**
+ * Require the creation of MediaWiki:Licenses to enable uploading.
+ * This should prevent a lot of uploading without licenses on small wikis;
+ * some or many of the small WMF wikis do not have any license options,
+ * which is really needed for our copyright policy.
+ */
+$wgHooks['UploadForm:initial'][] = function() {
+ if ( wfMessage( 'licenses' )->isDisabled() ) {
+ throw new ErrorPageError( 'uploaddisabled',
'wikimedia-upload-nolicenses' );
+ }
+};
diff --git a/i18n/wikimedia/en.json b/i18n/wikimedia/en.json
index 8978a5e..bdc0820 100644
--- a/i18n/wikimedia/en.json
+++ b/i18n/wikimedia/en.json
@@ -195,5 +195,6 @@
"mwoauth-grant-checkuser": "Access checkuser data",
"wikimedia-flow-terms-of-use-new-topic": "By clicking
\"{{int:flow-newtopic-save}}\", you agree to our
[//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to
irrevocably release your text under the
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL]",
"wikimedia-flow-terms-of-use-reply": "By clicking
\"{{int:flow-reply-submit}}\", you agree to our
[//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to
irrevocably release your text under the
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL]",
-"wikimedia-flow-terms-of-use-edit": "By saving changes, you agree to our
[//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to
irrevocably release your text under the
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL]"
+"wikimedia-flow-terms-of-use-edit": "By saving changes, you agree to our
[//wikimediafoundation.org/wiki/Terms_of_use Terms of Use] and agree to
irrevocably release your text under the
[//creativecommons.org/licenses/by-sa/3.0 CC BY-SA 3.0 License] and
[//en.wikipedia.org/wiki/Wikipedia:Text_of_the_GNU_Free_Documentation_License
GFDL]",
+"wikimedia-upload-nolicenses": "Uploading files to this wiki is not
enabled. Please [[commons:Special:UploadWizard|upload to Wikimedia
Commons]].\n\nTo be able to use this special page to upload to this wiki, an
administrator needs to add one or more license options to the page
[[MediaWiki:Licenses]].\n\nUse the following format: * Template
name|Label. Use any text to enable uploading without license options."
}
diff --git a/i18n/wikimedia/qqq.json b/i18n/wikimedia/qqq.json
index d2885a1..cea4b6f 100644
--- a/i18n/wikimedia/qqq.json
+++ b/i18n/wikimedia/qqq.json
@@ -216,5 +216,6 @@
"mwoauth-grant-checkuser": "Name for OAuth grant
\"checkuser\".\n{{Related|Mwoauth-grant}}",
"wikimedia-flow-terms-of-use-new-topic": "Terms of use and copyright
warning shown when adding a new topic to a Flow board\n\nRefers to
{{msg-mw|Flow-newtopic-save}}.",
"wikimedia-flow-terms-of-use-reply": "Terms of use and copyright
warning shown when adding a reply at a Flow board.\n\nRefers to
{{msg-mw|Flow-reply-submit}}.",
- "wikimedia-flow-terms-of-use-edit": "Terms of use and copyright warning
shown when editing the header or an existing topic or message at a Flow board"
+ "wikimedia-flow-terms-of-use-edit": "Terms of use and copyright warning
shown when editing the header or an existing topic or message at a Flow board",
+ "wikimedia-upload-nolicenses": "This error is shown on
[[Special:Upload]] when no license options are configured on
[[MediaWiki:Licenses]].\n\nSee also [[mw:Manual:Image admini
[MediaWiki-commits] [Gerrit] [AdvancedMeta] Add extension but commented out due to missin... - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/141302 Change subject: [AdvancedMeta] Add extension but commented out due to missing qqq .. [AdvancedMeta] Add extension but commented out due to missing qqq Change-Id: Ifb4c090cc071652bcd716f8a30d7ebd44df4d3ef --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/02/141302/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 29e7a4c..1668f3c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -26,6 +26,10 @@ Ads +# Missing message documentation qqq +# Advanced Meta +# descmsg = ameta-desc + Agora # Missing message documentatin -- To view, visit https://gerrit.wikimedia.org/r/141302 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb4c090cc071652bcd716f8a30d7ebd44df4d3ef Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Implement options to format text to improve readability - change (mediawiki...BookManagerv2)
Deepali has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141301
Change subject: Implement options to format text to improve readability
..
Implement options to format text to improve readability
Bug:65329
Change-Id: I1ac4ef10a08f398a0907f33853480e2bc557f920
---
M BookManagerv2.hooks.php
M BookManagerv2.php
M i18n/en.json
A images/Gear_font_awesome.png
A images/dark.png
A images/justify.png
A images/left_align.png
A images/light.png
A images/right_align.png
M modules/ext.BookManagerv2.css
M modules/ext.BookManagerv2.js
M modules/ext.BookManagerv2js.css
12 files changed, 291 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BookManagerv2
refs/changes/01/141301/1
diff --git a/BookManagerv2.hooks.php b/BookManagerv2.hooks.php
index 5af91b0..e80b833 100644
--- a/BookManagerv2.hooks.php
+++ b/BookManagerv2.hooks.php
@@ -73,7 +73,7 @@
* @return string HTML string
*/
public static function readingInterfaceUX( $prev, $next, $chapterList,
$metadata,
- $currentPageTitle
+ $currentPageTitle, $readabiltyOptions
) {
if ( $prev === null && $next === null && $chapterList === null
&& $metadata === null ) {
@@ -86,6 +86,23 @@
$html = Html::openElement( 'div', array( 'class' =>
'mw-bookmanagerv2-nav-wrap' ) )
. Html::openElement( 'div', array( 'class' =>
'mw-bookmanagerv2-nav-constrain' ) )
. Html::openElement( 'div', array( 'class' =>
'mw-bookmanagerv2-nav-bar' ) );
+ if ( $readabiltyOptions ) {
+ $imgHtml = Html::element( 'img', array(
+ 'class' =>
'mw-bookmanagerv2-nav-read-opt',
+ 'src' => $imagePath .
'Gear_font_awesome.png',
+ 'alt' => wfMessage(
'bookmanagerv2-read-opt' )->text(),
+ 'title' => wfMessage(
'bookmanagerv2-read-opt' )->text()
+ ), '' );
+ $html .= Linker::link(
+ $currentPageTitle,
+ $imgHtml,
+ array( 'class' => array(
+ 'mw-bookmanagerv2-nav-icon',
+ 'mw-bookmanagerv2-nav-read-opt'
) ),
+ array(),
+ array()
+ );
+ }
if ( $metadata ) {
$imgHtml = Html::element( 'img', array(
'class' => 'mw-bookmanagerv2-nav-data',
@@ -145,6 +162,14 @@
);
}
$html .= Html::closeElement( 'div' )
+ . Html::openElement( 'div', array() )
+ . Html::rawElement( 'div', array(
+ 'class' => array(
+ 'mw-bookmanagerv2-nav-dropdown',
+ 'mw-bookmanagerv2-nav-read-opt' )
+ ),
+ $readabiltyOptions
+ )
. Html::rawElement( 'div', array(
'class' => array(
'mw-bookmanagerv2-nav-dropdown',
@@ -163,6 +188,7 @@
),
$chapterList
)
+ . Html::closeElement( 'div' )
. Html::closeElement( 'div' )
. Html::closeElement( 'div' )
. Html::closeElement( 'div' );
@@ -422,6 +448,172 @@
}
/**
+* Generates HTML for the readability options.
+*
+* @return string HTML unordered list element
+*/
+ public static function createReadabilityOptions() {
+ $html = '';
+ global $wgExtensionAssetsPath;
+ $imagePath = $wgExtensionAssetsPath . "/BookManagerv2/images/";
+ $leftImg = Html::element( 'img', array(
+ 'class' => 'mw-bookmanagerv2-nav-read-opt',
+ 'src' => $imagePath . 'left_align.png',
+ 'alt' => wfMessage( 'bookmanagerv2-read-opt'
)->text(),
+ 'title' => wfMessage( 'bookmanagerv2-read-opt'
)->text()
+ ), '' );
+ $rightImg = Html::element( 'img', array(
+ 'class' => 'mw-bookmanagerv2-nav-read-opt',
+ 'src' => $imagePath . 'right_align.png',
+ 'alt' => wfMessage( 'bookmanagerv2-read-opt'
)->text(),
+
[MediaWiki-commits] [Gerrit] Separate handling of core skins MonoBook and Vector - change (translatewiki)
Raimond Spekking has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141303
Change subject: Separate handling of core skins MonoBook and Vector
..
Separate handling of core skins MonoBook and Vector
per changes
https://gerrit.wikimedia.org/r/#/c/135413/
https://gerrit.wikimedia.org/r/#/c/138795/
Change-Id: I985dca4c657a3b8e7973339a220d082e0a1e487b
---
M groups/MediaWiki/MediaWiki.yaml
1 file changed, 40 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/translatewiki
refs/changes/03/141303/1
diff --git a/groups/MediaWiki/MediaWiki.yaml b/groups/MediaWiki/MediaWiki.yaml
index 246e139..2e671d0 100644
--- a/groups/MediaWiki/MediaWiki.yaml
+++ b/groups/MediaWiki/MediaWiki.yaml
@@ -10,6 +10,8 @@
- core
- ext-0-all
- ext-installer
+ - ext-skins-monobook
+ - ext-skins-vector
---
BASIC:
@@ -166,8 +168,6 @@
- minutes-abbrev
- modern.css
- modern.js
-- monobook.css
-- monobook.js
- nocookiesforlogin
- noscript.css
- pageinfo-redirects-value
@@ -197,8 +197,6 @@
- size-zetabytes
- skinname-cologneblue
- skinname-modern
-- skinname-monobook
-- skinname-vector
- sorbs
- sp-contributions-explain
- timezone-utc
@@ -245,8 +243,6 @@
- variantname-zh-my
- variantname-zh-sg
- variantname-zh-tw
-- vector.css
-- vector.js
- version-api
- version-entrypoints-articlepath
- version-entrypoints-scriptpath
@@ -529,3 +525,41 @@
- config-type-postgres
- config-type-sqlite
- config-type-oracle
+
+---
+BASIC:
+ id: ext-skins-monobook
+ label: Skins-MonoBook
+ icon: wiki://Mediawiki-logo.png
+ class: FileBasedMessageGroup
+ namespace: NS_MEDIAWIKI
+ description: "{{int:translate-group-desc-skins-monobook}}"
+
+FILES:
+ class: JsonFFS
+ sourcePattern: %GROUPROOT%/mediawiki/master/skins/MonoBook/i18n/%CODE%.json
+
+TAGS:
+ optional:
+- monobook.css
+- monobook.js
+- skinname-monobook
+
+---
+BASIC:
+ id: ext-skins-vector
+ label: Skins-Vector
+ icon: wiki://Mediawiki-logo.png
+ class: FileBasedMessageGroup
+ namespace: NS_MEDIAWIKI
+ description: "{{int:translate-group-desc-skins-vector}}"
+
+FILES:
+ class: JsonFFS
+ sourcePattern: %GROUPROOT%/mediawiki/master/skins/Vector/i18n/%CODE%.json
+
+TAGS:
+ optional:
+- skinname-vector
+- vector.css
+- vector.js
--
To view, visit https://gerrit.wikimedia.org/r/141303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I985dca4c657a3b8e7973339a220d082e0a1e487b
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 839463f..d04b3bf - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 839463f..d04b3bf .. Syncronize VisualEditor: 839463f..d04b3bf Change-Id: Ic8f2d6094e37d5fe5734ec8c3140f97a3844b93c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 839463f..d04b3bf 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 839463f988506c32e8a900ed5a6fcf3a7ad1b8eb +Subproject commit d04b3bf4ca2b6cd9633efad1d974899838d1c0cf -- To view, visit https://gerrit.wikimedia.org/r/141358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic8f2d6094e37d5fe5734ec8c3140f97a3844b93c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 839463f..d04b3bf - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/141358 Change subject: Syncronize VisualEditor: 839463f..d04b3bf .. Syncronize VisualEditor: 839463f..d04b3bf Change-Id: Ic8f2d6094e37d5fe5734ec8c3140f97a3844b93c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/58/141358/1 diff --git a/VisualEditor b/VisualEditor index 839463f..d04b3bf 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 839463f988506c32e8a900ed5a6fcf3a7ad1b8eb +Subproject commit d04b3bf4ca2b6cd9633efad1d974899838d1c0cf -- To view, visit https://gerrit.wikimedia.org/r/141358 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8f2d6094e37d5fe5734ec8c3140f97a3844b93c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for missing revision ID in save event logging - change (apps...wikipedia)
Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141363
Change subject: Fix for missing revision ID in save event logging
..
Fix for missing revision ID in save event logging
Change-Id: I2fe7c82e1b078dc875d6f33f8e854f02a1868613
---
M wikipedia/Data/Operations/UploadSectionWikiTextOp.h
M wikipedia/Data/Operations/UploadSectionWikiTextOp.m
M wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
3 files changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/63/141363/1
diff --git a/wikipedia/Data/Operations/UploadSectionWikiTextOp.h
b/wikipedia/Data/Operations/UploadSectionWikiTextOp.h
index 332e7da..4a52b96 100644
--- a/wikipedia/Data/Operations/UploadSectionWikiTextOp.h
+++ b/wikipedia/Data/Operations/UploadSectionWikiTextOp.h
@@ -24,7 +24,7 @@
summary: (NSString *)summary
captchaId: (NSString *)captchaId
captchaWord: (NSString *)captchaWord
- completionBlock: (void (^)(NSString *))completionBlock
+ completionBlock: (void (^)(NSDictionary *))completionBlock
cancelledBlock: (void (^)(NSError *))cancelledBlock
errorBlock: (void (^)(NSError *))errorBlock
;
diff --git a/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
b/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
index 2c1d68a..1d60265 100644
--- a/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
+++ b/wikipedia/Data/Operations/UploadSectionWikiTextOp.m
@@ -16,7 +16,7 @@
summary: (NSString *)summary
captchaId: (NSString *)captchaId
captchaWord: (NSString *)captchaWord
- completionBlock: (void (^)(NSString *))completionBlock
+ completionBlock: (void (^)(NSDictionary *))completionBlock
cancelledBlock: (void (^)(NSError *))cancelledBlock
errorBlock: (void (^)(NSError *))errorBlock
{
@@ -73,7 +73,8 @@
weakSelf.error = [NSError errorWithDomain:@"Upload Wikitext
Op" code:WIKITEXT_UPLOAD_ERROR_SERVER userInfo:errorDict];
}
-NSString *result = weakSelf.jsonRetrieved[@"edit"][@"result"];
+NSDictionary *resultDict = weakSelf.jsonRetrieved[@"edit"];
+NSString *result = resultDict[@"result"];
if (!weakSelf.error && !result) {
NSMutableDictionary *errorDict = [@{} mutableCopy];
@@ -142,7 +143,7 @@
return;
}
-completionBlock(result);
+completionBlock(resultDict);
};
}
return self;
diff --git a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
index 1dcc846..43bb260 100644
--- a/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
+++ b/wikipedia/View Controllers/Preview/PreviewAndSaveViewController.m
@@ -484,11 +484,12 @@
NSString *title = section.fromTitle ? section.fromTitle :
section.article.title;
UploadSectionWikiTextOp *uploadWikiTextOp =
-[[UploadSectionWikiTextOp alloc] initForPageTitle:title
domain:section.article.domain section:section.index wikiText:self.wikiText
summary:editSummary captchaId:self.captchaId
captchaWord:self.captchaViewController.captchaTextBox.text
completionBlock:^(NSString *result){
+[[UploadSectionWikiTextOp alloc] initForPageTitle:title
domain:section.article.domain section:section.index wikiText:self.wikiText
summary:editSummary captchaId:self.captchaId
captchaWord:self.captchaViewController.captchaTextBox.text
completionBlock:^(NSDictionary *resultDict){
+[self.funnel logSavedRevision:[resultDict[@"newrevid"] intValue]];
+
// Mark article for refreshing and reload it.
if (articleID) {
-[self.funnel logSavedRevision:0]; // @fixme need revision ID
[[NSOperationQueue mainQueue] addOperationWithBlock: ^ {
WebViewController *webVC = [self.navigationController
searchNavStackForViewControllerOfClass:[WebViewController class]];
[webVC reloadCurrentArticleInvalidatingCache:YES];
--
To view, visit https://gerrit.wikimedia.org/r/141363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2fe7c82e1b078dc875d6f33f8e854f02a1868613
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Check for empty response - change (mediawiki...Popups)
Prtksxna has submitted this change and it was merged.
Change subject: Check for empty response
..
Check for empty response
In combination with other gadgets the error
TypeError: re.query is undefined
can occur because the request contains titles:'' and the response is [].
Change-Id: I46d02e7c48a55cd9af20fd7ef729b4d26f69a8c0
---
M resources/ext.popups.renderer.article.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Prtksxna: Verified; Looks good to me, approved
diff --git a/resources/ext.popups.renderer.article.js
b/resources/ext.popups.renderer.article.js
index 74a5922..7e56c73 100644
--- a/resources/ext.popups.renderer.article.js
+++ b/resources/ext.popups.renderer.article.js
@@ -33,7 +33,7 @@
var
href = link.attr( 'href' ),
title = link.data( 'title' ),
- deferred = $.Deferred();
+ deferred = $.Deferred();
mw.popups.render.currentRequest = mw.popups.api.get( {
action: 'query',
@@ -57,6 +57,7 @@
mw.popups.render.currentRequest = undefined;
if (
+ !re.query ||
!re.query.pages ||
!re.query.pages[ re.query.pageids[ 0 ]
].extract ||
re.query.pages[ re.query.pageids[ 0 ] ].extract
=== ''
--
To view, visit https://gerrit.wikimedia.org/r/140569
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I46d02e7c48a55cd9af20fd7ef729b4d26f69a8c0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Gerrit Patch Uploader
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mproved renderingImprove - change (mediawiki...SemanticRating)
Cicalese has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141309
Change subject: mproved renderingImprove
..
mproved renderingImprove
Change-Id: Ife7530525f39405cc6499f1ab12e3d215c3ea4f9
---
M SemanticRating.class.php
M SemanticRating.php
2 files changed, 4 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticRating
refs/changes/09/141309/1
diff --git a/SemanticRating.class.php b/SemanticRating.class.php
index 40e4a63..eaf4fb4 100644
--- a/SemanticRating.class.php
+++ b/SemanticRating.class.php
@@ -26,9 +26,7 @@
public function renderRating($input, $imagepath) {
- $output =
- Html::openElement('table', array('style' =>
'display:inline;')) .
- Html::openElement('td');
+ $output = Html::openElement('span');
if ($input < 0) {
$input = 0;
@@ -57,8 +55,7 @@
}
$output .=
- Html::closeElement('td') .
- Html::closeElement('table');
+ Html::closeElement('span');
return $output;
}
diff --git a/SemanticRating.php b/SemanticRating.php
index 8e0089d..37189d2 100644
--- a/SemanticRating.php
+++ b/SemanticRating.php
@@ -39,7 +39,7 @@
$wgExtensionCredits['semantic'][] = array (
'name' => 'SemanticRating',
- 'version' => '1.1.0',
+ 'version' => '1.2',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]'
),
@@ -84,8 +84,7 @@
global $SemanticRating_ImagePath;
$instance = new SemanticRating;
$output = $instance->renderRating($input, $SemanticRating_ImagePath);
- return array($parser->insertStripItem( $output, $parser->mStripState ),
- 'noparse' => false);
+ return $output;
}
function editRating($cur_value, $input_name, $is_mandatory, $is_disabled,
--
To view, visit https://gerrit.wikimedia.org/r/141309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife7530525f39405cc6499f1ab12e3d215c3ea4f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticRating
Gerrit-Branch: master
Gerrit-Owner: Cicalese
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unnecessary tuple return type - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/141370 Change subject: Remove unnecessary tuple return type .. Remove unnecessary tuple return type The tuple return type of addCommonscat() has been unnecessary since 2010. https://www.mediawiki.org/wiki/Special:Code/pywikipedia/8548 Returned (status, always) were unused variables. Change-Id: I767c00ea8b500dc955c1f80b626a076c1c330510 --- M scripts/commonscat.py 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/70/141370/1 diff --git a/scripts/commonscat.py b/scripts/commonscat.py index e0f1b9a..de28ab2 100755 --- a/scripts/commonscat.py +++ b/scripts/commonscat.py @@ -262,8 +262,7 @@ pywikibot.output(u'Page %s is a disambiguation. Skipping.' % page.title(asLink=True)) else: -(status, always) = self.addCommonscat(page) -return +self.addCommonscat(page) def load(self, page): """ Load the given page, do some changes, and save it. """ @@ -369,14 +368,14 @@ # The current commonscat link is good pywikibot.output(u'Commonscat link at %s to Category:%s is ok' % (page.title(), currentCommonscatTarget)) -return (True, self.always) +return True elif checkedCommonscatTarget != u'': # We have a new Commonscat link, replace the old one self.changeCommonscat(page, currentCommonscatTemplate, currentCommonscatTarget, primaryCommonscat, checkedCommonscatTarget, LinkText, Note) -return (True, self.always) +return True else: #Commonscat link is wrong commonscatLink = self.findCommonscatLink(page) @@ -403,8 +402,8 @@ self.summary, None, None, self.always) -return (True, self.always) -return (True, self.always) +return True +return True def changeCommonscat(self, page=None, oldtemplate=u'', oldcat=u'', newtemplate=u'', newcat=u'', linktitle=u'', -- To view, visit https://gerrit.wikimedia.org/r/141370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I767c00ea8b500dc955c1f80b626a076c1c330510 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a Library of Congress domain to whitelist - change (operations/mediawiki-config)
Odder has uploaded a new change for review. https://gerrit.wikimedia.org/r/141308 Change subject: Add a Library of Congress domain to whitelist .. Add a Library of Congress domain to whitelist This patch adds a Library of Congress domain to the wgCopyUploadsDomains whitelist so as to allow uploads with the GWToolset tool. Bug: 66945 Change-Id: If39f5a80b9b83549594253c2f9feecaf9c89013e --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/08/141308/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9c87c4e..61505bd 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10426,6 +10426,7 @@ '*.unine.ch',// University of Neuchâtel '*.mindat.org', // Mineral and locality database '*.culture.gouv.fr', // French Ministry for Culture bug 65905 + 'memory.loc.gov',// Library of Congress bug 66945 ), ), -- To view, visit https://gerrit.wikimedia.org/r/141308 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If39f5a80b9b83549594253c2f9feecaf9c89013e Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Odder ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hide drop down menus when an item is clicked - change (mediawiki...Flow)
Werdna has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141371
Change subject: Hide drop down menus when an item is clicked
..
Hide drop down menus when an item is clicked
Change-Id: Id1fef3436b214167ad4ca6696151235572b65564
---
M modules/new/components/flow-board.js
1 file changed, 10 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/71/141371/1
diff --git a/modules/new/components/flow-board.js
b/modules/new/components/flow-board.js
index a9ce5cf..f506179 100644
--- a/modules/new/components/flow-board.js
+++ b/modules/new/components/flow-board.js
@@ -1014,7 +1014,8 @@
*/
FlowBoardComponent.UI.events.onToggleHoverMenu = function (
event ) {
var $this = $( event.target ),
- $menu = $this.closest( '.flow-menu' );
+ $menu = $this.closest( '.flow-menu' ),
+ $dropDown = $this.closest(
'.flow-ui-button-container' );
if ( event.type === 'click' ) {
// If the caret was clicked, toggle focus
@@ -1025,6 +1026,14 @@
if ( $menu.hasClass( 'focus' ) ) {
$menu.find(
'.flow-menu-js-drop' ).find( 'a' ).focus();
}
+ } else if ( $dropDown.length ) {
+ if ( $( event.target ).is( 'a' ) ) {
+ // Somebody clicked one of the
menu items
+ // Force the drop down menu to
go away for a small
+ // time so that it disappears
+ $dropDown.css( 'display',
'none' );
+ setTimeout( function() {
$dropDown.css( 'display', '' ); }, 200 );
+ }
}
} else if ( event.type === 'focusin' ) {
// If we are focused on a menu item, open the
whole menu
--
To view, visit https://gerrit.wikimedia.org/r/141371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1fef3436b214167ad4ca6696151235572b65564
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: frontend-rewrite
Gerrit-Owner: Werdna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] beta.labs: logo and favicon change for dewiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: beta.labs: logo and favicon change for dewiki .. beta.labs: logo and favicon change for dewiki a magenta logo and favicon to visually separate real dewiki and beta discussed at http://de.wikipedia.beta.wmflabs.org/w/index.php?title=Benutzer_Diskussion:PerfektesChaos&oldid=5766#Was_geht_hier.3F Change-Id: I5cd91c3e1929c547c73f40f122ad4b466b8701e9 --- M wmf-config/InitialiseSettings-labs.php 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings-labs.php b/wmf-config/InitialiseSettings-labs.php index 6af6565..d3e5a2d 100644 --- a/wmf-config/InitialiseSettings-labs.php +++ b/wmf-config/InitialiseSettings-labs.php @@ -153,6 +153,11 @@ 'wgLogo' => array( 'commonswiki' => '$stdlogo', + 'dewiki' => '$stdlogo', + ), + + 'wgFavicon' => array( + 'dewiki' => '//upload.wikimedia.org/wikipedia/commons/1/14/Favicon-beta-wikipedia.png', ), // Editor Engagement stuff -- To view, visit https://gerrit.wikimedia.org/r/141305 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cd91c3e1929c547c73f40f122ad4b466b8701e9 Gerrit-PatchSet: 3 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Se4598 Gerrit-Reviewer: Hoo man Gerrit-Reviewer: Steinsplitter Gerrit-Reviewer: Umherirrender Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove no longer needed base::access::dc-techs - change (operations/puppet)
Hoo man has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141373
Change subject: Remove no longer needed base::access::dc-techs
..
Remove no longer needed base::access::dc-techs
Obsolete per Icfe27474157b6dc1254d9cc64a02e41ba9197ea8
Change-Id: I0fce7e9defa97a8fbf93df0aea8093e36431a22e
---
M modules/base/manifests/init.pp
1 file changed, 0 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/141373/1
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 7d12523..8cffa78 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,23 +1,3 @@
-class base::access::dc-techs {
-# add account and sudoers rules for data center techs
-#include accounts::cmjohnson
-
-# hardy doesn't support sudoers.d; only do sudo_user for lucid and later
-if versioncmp($::lsbdistrelease, '10.04') >= 0 {
-sudo_user { [ 'cmjohnson' ]: privileges => [
-'ALL = (root) NOPASSWD: /sbin/fdisk',
-'ALL = (root) NOPASSWD: /sbin/mdadm',
-'ALL = (root) NOPASSWD: /sbin/parted',
-'ALL = (root) NOPASSWD: /sbin/sfdisk',
-'ALL = (root) NOPASSWD: /usr/bin/MegaCli',
-'ALL = (root) NOPASSWD: /usr/bin/arcconf',
-'ALL = (root) NOPASSWD: /usr/bin/lshw',
-'ALL = (root) NOPASSWD: /usr/sbin/grub-install',
-]}
-}
-
-}
-
class base::grub {
# Disable the 'quiet' kernel command line option so console messages
# will be printed.
@@ -412,7 +392,6 @@
base::standard-packages,
base::environment,
base::platform,
-base::access::dc-techs,
base::screenconfig,
ssh::client,
ssh::server,
--
To view, visit https://gerrit.wikimedia.org/r/141373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fce7e9defa97a8fbf93df0aea8093e36431a22e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hoo man
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Rewrite python version dependent import - change (pywikibot...httplib2)
Merlijn van Deen has submitted this change and it was merged. Change subject: Rewrite python version dependent import .. Rewrite python version dependent import The top level of this external includes a __init__.py so that it may be imported with only 'externals' in sys.path. However it copies the contents of the python version dependent httplib2 code, resulting in module level variables appearing in two different namespaces. As a result, regarding bug 66161, the 'httplib2.debuglevel' modified in pywikibot code is a different variable to the 'httplib2.debuglevel' used by the httplib2 module. Instead of copying the python version dependent httplib2, re-import the python version dependent httplib2. Change-Id: Ic520505545a5f50f669a01375b253426ecad15ed --- M __init__.py 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: John Vandenberg: Looks good to me, but someone else must approve Merlijn van Deen: Verified; Looks good to me, approved diff --git a/__init__.py b/__init__.py index 18f9398..f61d228 100644 --- a/__init__.py +++ b/__init__.py @@ -1,7 +1,7 @@ -import inspect +import os import sys -if sys.version_info[0] == 2: -from .python2 import httplib2 -else: -from .python3 import httplib2 -globals().update(inspect.getmembers(httplib2)) + +path = os.path.dirname(__file__)+os.path.sep+'python'+str(sys.version_info[0]) +sys.path.insert(0, path) +del sys.modules['httplib2'] +import httplib2 -- To view, visit https://gerrit.wikimedia.org/r/139602 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic520505545a5f50f669a01375b253426ecad15ed Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/externals/httplib2 Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Re-use result instead of querying the DOM for selector multi... - change (mediawiki...Popups)
jenkins-bot has submitted this change and it was merged.
Change subject: Re-use result instead of querying the DOM for selector multiple
times
..
Re-use result instead of querying the DOM for selector multiple times
It's a complicated query, we should not repeat it when not necessary.
Change-Id: I71d47de088afa7dab0a6eaed214c61db699fcd0c
---
M resources/ext.popups.core.js
1 file changed, 19 insertions(+), 9 deletions(-)
Approvals:
Prtksxna: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index a209cc2..9db8c8c 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -89,9 +89,8 @@
*
* @method removeTooltips
*/
- mw.popups.removeTooltips = function () {
- var notSelector = ':not(' + mw.popups.IGNORE_CLASSES.join(', ')
+ ')';
- mw.popups.$content.find( 'a' + notSelector + ':not([title=""])'
)
+ mw.popups.removeTooltips = function ( $elements ) {
+ $elements
.on( 'mouseenter focus', function () {
$( this )
.data( 'title', $( this ).attr( 'title'
) )
@@ -123,10 +122,8 @@
*
* @method setupTriggers
*/
- mw.popups.setupTriggers = function () {
- var notSelector = ':not(' + mw.popups.IGNORE_CLASSES.join(', ')
+ ')';
-
- mw.popups.$content.find( 'a' + notSelector + ':not([title=""])'
).on( 'mouseenter focus', function ( event ) {
+ mw.popups.setupTriggers = function ( $elements ) {
+ $elements.on( 'mouseenter focus', function ( event ) {
var
$this = $( this ),
href = $this.attr( 'href' );
@@ -143,10 +140,23 @@
} );
};
+ /**
+* Returns links that can have Popups
+*
+* @method selectPopupElements
+*/
+ mw.popups.selectPopupElements = function () {
+ var notSelector = ':not(' + mw.popups.IGNORE_CLASSES.join(', ')
+ ')';
+
+ return mw.popups.$content.find( 'a' + notSelector +
':not([title=""])' );
+ };
+
mw.hook( 'wikipage.content').add( function ( $content ) {
mw.popups.$content = $content;
- mw.popups.removeTooltips();
- mw.popups.setupTriggers();
+
+ var $elements = mw.popups.selectPopupElements();
+ mw.popups.removeTooltips( $elements );
+ mw.popups.setupTriggers( $elements );
} );
$( function () {
--
To view, visit https://gerrit.wikimedia.org/r/134266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71d47de088afa7dab0a6eaed214c61db699fcd0c
Gerrit-PatchSet: 9
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Prtksxna
Gerrit-Reviewer: Spage
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Config vars either before or after require - change (mediawiki...TitleIcon)
Cicalese has submitted this change and it was merged.
Change subject: Config vars either before or after require
..
Config vars either before or after require
Change-Id: I6439c7c91c4e24bc1a04faecc94f394f20b100fa
---
M TitleIcon.php
1 file changed, 36 insertions(+), 9 deletions(-)
Approvals:
Cicalese: Verified; Looks good to me, approved
diff --git a/TitleIcon.php b/TitleIcon.php
index af4f85c..fbbad20 100644
--- a/TitleIcon.php
+++ b/TitleIcon.php
@@ -31,7 +31,7 @@
$wgExtensionCredits['semantic'][] = array (
'name' => 'Title Icon',
- 'version' => '1.2.0',
+ 'version' => '1.3',
'author' => array(
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]'
),
@@ -51,15 +51,42 @@
$wgHooks['ParserFirstCallInit'][] = 'efTitleIconSetup';
-$TitleIcon_EnableIconInPageTitle = true;
-$TitleIcon_EnableIconInSearchTitle = true;
-$TitleIcon_UseFileNameAsToolTip = true;
-$TitleIcon_TitleIconPropertyName = "Title Icon";
-$TitleIcon_HideTitleIconPropertyName = "Hide Title Icon";
-$TitleIcon_UseDisplayTitle = false;
-$TitleIcon_DisplayTitlePropertyName = "Display Title";
-
function efTitleIconSetup (& $parser) {
+ global $TitleIcon_EnableIconInPageTitle;
+ if (!isset($TitleIcon_EnableIconInPageTitle)) {
+ $TitleIcon_EnableIconInPageTitle = true;
+ }
+
+ global $TitleIcon_EnableIconInSearchTitle;
+ if (!isset($TitleIcon_EnableIconInSearchTitle)) {
+ $TitleIcon_EnableIconInSearchTitle = true;
+ }
+
+ global $TitleIcon_UseFileNameAsToolTip;
+ if (!isset($TitleIcon_UseFileNameAsToolTip)) {
+ $TitleIcon_UseFileNameAsToolTip = true;
+ }
+
+ global $TitleIcon_TitleIconPropertyName;
+ if (!isset($TitleIcon_TitleIconPropertyName)) {
+ $TitleIcon_TitleIconPropertyName = "Title Icon";
+ }
+
+ global $TitleIcon_HideTitleIconPropertyName;
+ if (!isset($TitleIcon_HideTitleIconPropertyName)) {
+ $TitleIcon_HideTitleIconPropertyName = "Hide Title Icon";
+ }
+
+ global $TitleIcon_UseDisplayTitle;
+ if (!isset($TitleIcon_UseDisplayTitle)) {
+ $TitleIcon_UseDisplayTitle = false;
+ }
+
+ global $TitleIcon_DisplayTitlePropertyName;
+ if (!isset($TitleIcon_DisplayTitlePropertyName)) {
+ $TitleIcon_DisplayTitlePropertyName = "Display Title";
+ }
+
global $TitleIcon_EnableIconInPageTitle,
$TitleIcon_EnableIconInSearchTitle,
$wgHooks;
if ($TitleIcon_EnableIconInPageTitle) {
--
To view, visit https://gerrit.wikimedia.org/r/141362
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6439c7c91c4e24bc1a04faecc94f394f20b100fa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TitleIcon
Gerrit-Branch: master
Gerrit-Owner: Cicalese
Gerrit-Reviewer: Cicalese
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove unused imports, methods and variables - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141368
Change subject: Remove unused imports, methods and variables
..
Remove unused imports, methods and variables
The method load was copied from basic.py in the initial port from compat,
and is unused as the bot does page checking in treat().
Likewise import of config was copied from basic.py.
main() variable checkcurrent is set but was not used. Moved a block of code.
Change-Id: I97b83965bd08a8ce156634cea30841b0174a3ba7
---
M scripts/commonscat.py
1 file changed, 10 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/68/141368/1
diff --git a/scripts/commonscat.py b/scripts/commonscat.py
index e0f1b9a..a4858e7 100755
--- a/scripts/commonscat.py
+++ b/scripts/commonscat.py
@@ -67,7 +67,6 @@
import add_text
import pywikibot
-from pywikibot import config
from pywikibot import pagegenerators
docuReplacements = {
@@ -264,20 +263,6 @@
else:
(status, always) = self.addCommonscat(page)
return
-
-def load(self, page):
-""" Load the given page, do some changes, and save it. """
-try:
-text = page.get()
-except pywikibot.NoPage:
-pywikibot.output(u"Page %s does not exist; skipping."
- % page.title(asLink=True))
-except pywikibot.IsRedirectPage:
-pywikibot.output(u"Page %s is a redirect; skipping."
- % page.title(asLink=True))
-else:
-return text
-return None
def save(self, text, page, comment, minorEdit=True, botflag=True):
# only save if something was changed
@@ -573,20 +558,21 @@
summary = arg[9:]
elif arg.startswith('-checkcurrent'):
checkcurrent = True
-primaryCommonscat, commonscatAlternatives = \
-CommonscatBot.getCommonscatTemplate(
-pywikibot.Site().code)
-generator = pagegenerators.NamespaceFilterPageGenerator(
-pagegenerators.ReferringPageGenerator(
-pywikibot.Page(pywikibot.Site(),
- u'Template:' + primaryCommonscat),
-onlyTemplateInclusion=True), ns)
-
elif arg == '-always':
always = True
else:
genFactory.handleArg(arg)
+if checkcurrent:
+primaryCommonscat, commonscatAlternatives = \
+CommonscatBot.getCommonscatTemplate(
+pywikibot.Site().code)
+generator = pagegenerators.NamespaceFilterPageGenerator(
+pagegenerators.ReferringPageGenerator(
+pywikibot.Page(pywikibot.Site(),
+ u'Template:' + primaryCommonscat),
+onlyTemplateInclusion=True), ns)
+
if not generator:
generator = genFactory.getCombinedGenerator()
if not generator:
--
To view, visit https://gerrit.wikimedia.org/r/141368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I97b83965bd08a8ce156634cea30841b0174a3ba7
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SpecialCite: fix escaping of message - change (mediawiki...Cite)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/141372 Change subject: SpecialCite: fix escaping of message .. SpecialCite: fix escaping of message Linker::link takes raw HTML, so use ->escaped(). Also use $skin->msg() instead of wfMessage. Change-Id: I56c0791d31897793b0e8cd8ac18ea337a96d1ff0 --- M SpecialCite.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cite refs/changes/72/141372/1 diff --git a/SpecialCite.php b/SpecialCite.php index 60fd967..3dc8975 100644 --- a/SpecialCite.php +++ b/SpecialCite.php @@ -79,7 +79,7 @@ array( 'id' => 't-cite' ), Linker::link( SpecialPage::getTitleFor( 'Cite' ), - wfMessage( 'cite_article_link' )->text(), // @todo Should be escaped()? + $skin->msg( 'cite_article_link' )->escaped(), # Used message keys: 'tooltip-cite-article', 'accesskey-cite-article' Linker::tooltipAndAccessKeyAttribs( 'cite-article' ), $skin->data['nav_urls']['cite']['args'] -- To view, visit https://gerrit.wikimedia.org/r/141372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56c0791d31897793b0e8cd8ac18ea337a96d1ff0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Message cleanup - change (mediawiki...MediaWikiChat)
UltrasonicNXT has submitted this change and it was merged.
Change subject: Message cleanup
..
Message cleanup
Replace one with a core MW message, reorder messages in definition
Change-Id: Ief4fdcadd52ba4dcfcee451ecb0e1a67d91277c6
---
M MediaWikiChat.js
M MediaWikiChat.php
M i18n/en.json
3 files changed, 8 insertions(+), 14 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/MediaWikiChat.js b/MediaWikiChat.js
index 81c974b..f99bbb2 100644
--- a/MediaWikiChat.js
+++ b/MediaWikiChat.js
@@ -74,7 +74,7 @@
var diff = ( tsNow - timestamp ) / 100;
if ( diff < 30 ) {
- return mw.message( 'chat-just-now' ).text();
+ return mw.message( 'just-now' ).text();
} else if ( diff < 2 * 60 ) {
return mw.message( 'chat-a-minute-ago' ).text();
} else if ( diff < 60 * 60 ) {
diff --git a/MediaWikiChat.php b/MediaWikiChat.php
index e312dd2..d577baf 100644
--- a/MediaWikiChat.php
+++ b/MediaWikiChat.php
@@ -32,18 +32,13 @@
$wgResourceModules['ext.mediawikichat.js'] = array(
'scripts' => 'MediaWikiChat.js',
'messages' => array(
- 'january', 'february', 'march', 'april', 'may', 'june',
- 'july', 'august', 'september', 'october', 'november',
'december',
- 'monday', 'tuesday', 'wednesday', 'thursday', 'friday',
'saturday',
- 'sunday', 'chat-type-your-private-message',
'chat-no-other-users',
- 'chat-blocked-from-chat', 'chat-just-now', 'chat-a-minute-ago',
- 'chat-quarter-of-an-hour-ago', 'chat-half-an-hour-ago',
- 'chat-an-hour-ago', 'minutes-ago', 'chat-youve-been-kicked',
- 'chat-you-kicked', 'chat-kicked', 'chat-kick',
- 'chat-youve-been-blocked', 'chat-you-blocked', 'chat-blocked',
- 'chat-block', 'chat-private-message', 'chat-user-is-moderator',
- 'chat-you-are-moderator', 'chat-joined', 'chat-left',
- 'chat-mod-image', 'chat-yesterday', 'chat-flood',
'chat-too-long',
+ 'january', 'february', 'march', 'april', 'may', 'june', 'july',
'august', 'september', 'october',
+ 'november', 'december', 'monday', 'tuesday', 'wednesday',
'thursday', 'friday', 'saturday',
+ 'sunday', 'chat-type-your-private-message',
'chat-no-other-users', 'chat-blocked-from-chat',
+ 'just-now', 'chat-a-minute-ago', 'minutes-ago',
'chat-youve-been-kicked','chat-you-kicked',
+ 'chat-kicked', 'chat-kick', 'chat-youve-been-blocked',
'chat-you-blocked', 'chat-blocked',
+ 'chat-block', 'chat-private-message', 'chat-user-is-moderator',
'chat-you-are-moderator',
+ 'chat-joined', 'chat-left', 'chat-mod-image', 'chat-yesterday',
'chat-flood', 'chat-too-long',
'chat-idle-minutes', 'chat-idle-hours', 'chat-idle-more'
),
'dependencies' => 'mediawiki.jqueryMsg',
diff --git a/i18n/en.json b/i18n/en.json
index 7ae0756..ebcfdd5 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,7 +15,6 @@
"chat-sounds": "Play sounds",
"chat-flood": "You can't send messages that fast, please wait before
sending more.",
"chat-too-long": "That message was too long, please send a shorter
message.",
-"chat-just-now": "just now",
"chat-a-minute-ago": "a minute ago",
"chat-yesterday": "yesterday",
"chat-kick": "kick",
--
To view, visit https://gerrit.wikimedia.org/r/141361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief4fdcadd52ba4dcfcee451ecb0e1a67d91277c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiChat
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT
Gerrit-Reviewer: UltrasonicNXT
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SpecialCite: fix escaping of message - change (mediawiki...Cite)
jenkins-bot has submitted this change and it was merged. Change subject: SpecialCite: fix escaping of message .. SpecialCite: fix escaping of message Linker::link takes raw HTML, so use ->escaped(). Also use $skin->msg() instead of wfMessage. Change-Id: I56c0791d31897793b0e8cd8ac18ea337a96d1ff0 --- M SpecialCite.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Hoo man: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialCite.php b/SpecialCite.php index 60fd967..3dc8975 100644 --- a/SpecialCite.php +++ b/SpecialCite.php @@ -79,7 +79,7 @@ array( 'id' => 't-cite' ), Linker::link( SpecialPage::getTitleFor( 'Cite' ), - wfMessage( 'cite_article_link' )->text(), // @todo Should be escaped()? + $skin->msg( 'cite_article_link' )->escaped(), # Used message keys: 'tooltip-cite-article', 'accesskey-cite-article' Linker::tooltipAndAccessKeyAttribs( 'cite-article' ), $skin->data['nav_urls']['cite']['args'] -- To view, visit https://gerrit.wikimedia.org/r/141372 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I56c0791d31897793b0e8cd8ac18ea337a96d1ff0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Cite Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Hoo man Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct condition for MWHttpRequest::proxySetup() function - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141376
Change subject: Use correct condition for MWHttpRequest::proxySetup() function
..
Use correct condition for MWHttpRequest::proxySetup() function
Use "$this->proxy || $this->noProxy"[1] instead of current one
"$this->proxy && !$this->noProxy"[2]. Condition [1] is the
correct one.
[1] if the proxy is already set or proxy is disabled.
[2] if the proxy is already set and proxy is not disabled.
Bug: 66757
Change-Id: I642150652440390449a44982b71ad6e9e8a276c4
---
M includes/HttpFunctions.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/76/141376/1
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index dc65c67..3941877 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -318,8 +318,8 @@
public function proxySetup() {
global $wgHTTPProxy;
- // If there is an explicit proxy set and proxies are not
disabled, then use it
- if ( $this->proxy && !$this->noProxy ) {
+ // If the proxy is already set or noProxy is set, skip setup
process
+ if ( $this->proxy || $this->noProxy ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/141376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I642150652440390449a44982b71ad6e9e8a276c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_21
Gerrit-Owner: MarkAHershberger
Gerrit-Reviewer: devunt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct condition for MWHttpRequest::proxySetup() function - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141375
Change subject: Use correct condition for MWHttpRequest::proxySetup() function
..
Use correct condition for MWHttpRequest::proxySetup() function
Use "$this->proxy || $this->noProxy"[1] instead of current one
"$this->proxy && !$this->noProxy"[2]. Condition [1] is the
correct one.
[1] if the proxy is already set or proxy is disabled.
[2] if the proxy is already set and proxy is not disabled.
Bug: 66757
Change-Id: I642150652440390449a44982b71ad6e9e8a276c4
---
M includes/HttpFunctions.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/75/141375/1
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index b405ede..3d185e6 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -330,8 +330,8 @@
public function proxySetup() {
global $wgHTTPProxy;
- // If there is an explicit proxy set and proxies are not
disabled, then use it
- if ( $this->proxy && !$this->noProxy ) {
+ // If the proxy is already set or noProxy is set, skip setup
process
+ if ( $this->proxy || $this->noProxy ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/141375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I642150652440390449a44982b71ad6e9e8a276c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_22
Gerrit-Owner: MarkAHershberger
Gerrit-Reviewer: devunt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use correct condition for MWHttpRequest::proxySetup() function - change (mediawiki/core)
MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141374
Change subject: Use correct condition for MWHttpRequest::proxySetup() function
..
Use correct condition for MWHttpRequest::proxySetup() function
Use "$this->proxy || $this->noProxy"[1] instead of current one
"$this->proxy && !$this->noProxy"[2]. Condition [1] is the
correct one.
[1] if the proxy is already set or proxy is disabled.
[2] if the proxy is already set and proxy is not disabled.
Bug: 66757
Change-Id: I642150652440390449a44982b71ad6e9e8a276c4
---
M includes/HttpFunctions.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/74/141374/1
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 1fd437e..9e6833d 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -334,8 +334,8 @@
public function proxySetup() {
global $wgHTTPProxy;
- // If there is an explicit proxy set and proxies are not
disabled, then use it
- if ( $this->proxy && !$this->noProxy ) {
+ // If the proxy is already set or noProxy is set, skip setup
process
+ if ( $this->proxy || $this->noProxy ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/141374
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I642150652440390449a44982b71ad6e9e8a276c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: MarkAHershberger
Gerrit-Reviewer: devunt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup basic.py - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/141369 Change subject: Cleanup basic.py .. Cleanup basic.py - Fix pyflakes and pep257 - Remove global site - revise incorrect docstring for BasicBot.load() Change-Id: I4be20e6ed4a47ce21ff12a1f7a8f019fa5ebcd79 --- M scripts/basic.py 1 file changed, 15 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/69/141369/1 diff --git a/scripts/basic.py b/scripts/basic.py index e51c8c2..6850dc7 100755 --- a/scripts/basic.py +++ b/scripts/basic.py @@ -1,6 +1,8 @@ #!/usr/bin/python # -*- coding: utf-8 -*- """ +An incomplete sample script. + This is not a complete bot; rather, it is a template from which simple bots can be made. You can rename it to mybot.py, then edit it in whatever way you want. @@ -35,13 +37,18 @@ class BasicBot: + +"""An incomplete sample bot.""" + # Edit summary message that should be used is placed on /i18n subdirectory. # The file containing these messages should have the same name as the caller # script (i.e. basic.py in this case) def __init__(self, generator, dry): """ -Constructor. Parameters: +Constructor. + +Parameters: @param generator: The page generator that determines on which pages to work. @type generator: generator. @@ -49,20 +56,20 @@ what would have been changed. @type dry: boolean. """ -site = pywikibot.Site() self.generator = generator self.dry = dry + # Set the edit summary message +site = pywikibot.Site() self.summary = i18n.twtranslate(site, 'basic-changing') def run(self): +""" Process each page from the generator. """ for page in self.generator: self.treat(page) def treat(self, page): -""" -Loads the given page, does some changes, and saves it. -""" +""" Load the given page, does some changes, and saves it. """ text = self.load(page) if not text: return @@ -79,9 +86,7 @@ pywikibot.output(u'Page %s not saved.' % page.title(asLink=True)) def load(self, page): -""" -Loads the given page, does some changes, and saves it. -""" +""" Load the text of the given page. """ try: # Load the page text = page.get() @@ -97,6 +102,7 @@ def save(self, text, page, comment=None, minorEdit=True, botflag=True): +""" Update the given page with new text. """ # only save if something was changed if text != page.get(): # Show the title of the page we're working on. @@ -133,8 +139,7 @@ def main(): -global site - +""" Process command line arguments and invoke BasicBot. """ # Process global arguments to determine desired site local_args = pywikibot.handleArgs() site = pywikibot.Site() -- To view, visit https://gerrit.wikimedia.org/r/141369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4be20e6ed4a47ce21ff12a1f7a8f019fa5ebcd79 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Link dialog: do basic URI validation - change (mediawiki...WikiEditor)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141367
Change subject: Link dialog: do basic URI validation
..
Link dialog: do basic URI validation
This isn't very sophisticated, but it will handle the basics. Also
reworked the switch between internal and external links and moved all
state calculation into a single function instead of having it spread
troughout..
Bug: 28789
Change-Id: I243106901939b4baef6d9d04a4e0e428f2a6b79e
---
M WikiEditor.php
M i18n/en.json
M i18n/qqq.json
M modules/jquery.wikiEditor.dialogs.config.css
M modules/jquery.wikiEditor.dialogs.config.js
5 files changed, 35 insertions(+), 28 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/67/141367/1
diff --git a/WikiEditor.php b/WikiEditor.php
index 723c4bf..848e7b0 100644
--- a/WikiEditor.php
+++ b/WikiEditor.php
@@ -99,6 +99,7 @@
'jquery.wikiEditor.toolbar.i18n',
'jquery.suggestions',
'mediawiki.Title',
+ 'mediawiki.Uri',
'mediawiki.jqueryMsg',
),
'messages' => array(
@@ -181,6 +182,7 @@
'wikieditor-toolbar-tool-link-int-target-status-exists',
'wikieditor-toolbar-tool-link-int-target-status-notexists',
'wikieditor-toolbar-tool-link-int-target-status-invalid',
+
'wikieditor-toolbar-tool-link-int-target-status-invalidurl',
'wikieditor-toolbar-tool-link-int-target-status-external',
'wikieditor-toolbar-tool-link-int-target-status-loading',
'wikieditor-toolbar-tool-link-int-target-status-disambig',
diff --git a/i18n/en.json b/i18n/en.json
index 5d4ae47..ecd4208 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -53,6 +53,7 @@
"wikieditor-toolbar-tool-link-int-target-status-exists": "Page exists",
"wikieditor-toolbar-tool-link-int-target-status-notexists": "Page does not
exist",
"wikieditor-toolbar-tool-link-int-target-status-invalid": "Invalid title",
+"wikieditor-toolbar-tool-link-int-target-status-invalidurl": "Invalid URL",
"wikieditor-toolbar-tool-link-int-target-status-external": "External link",
"wikieditor-toolbar-tool-link-int-target-status-loading": "Checking page
existence...",
"wikieditor-toolbar-tool-link-int-target-status-disambig": "Disambiguation
page",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 22bb04f..34a3ed9 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -60,6 +60,7 @@
"wikieditor-toolbar-tool-link-int-target-status-exists": "Text shown
when the title the user entered exists",
"wikieditor-toolbar-tool-link-int-target-status-notexists": "Text shown
when the title the user entered does not exist",
"wikieditor-toolbar-tool-link-int-target-status-invalid": "Text shown
when the title the user entered is invalid.\n{{Identical|Invalid title}}",
+ "wikieditor-toolbar-tool-link-int-target-status-invalid": "Text shown
when the external URL the user entered is invalid.",
"wikieditor-toolbar-tool-link-int-target-status-external": "Text shown
when the link target the user entered points to an external web
site\n{{Identical|External link}}",
"wikieditor-toolbar-tool-link-int-target-status-loading": "alt text and
title text for the image shown while the title the user entered is being
checked for existence",
"wikieditor-toolbar-tool-link-int-target-status-disambig": "Text shown
when the link target the user entered points to a disambiguation
page.\n{{Identical|Disambiguation page}}",
diff --git a/modules/jquery.wikiEditor.dialogs.config.css
b/modules/jquery.wikiEditor.dialogs.config.css
index 1cc9f5a..a9fa7b1 100644
--- a/modules/jquery.wikiEditor.dialogs.config.css
+++ b/modules/jquery.wikiEditor.dialogs.config.css
@@ -55,6 +55,7 @@
#wikieditor-toolbar-link-int-target-status-exists,
#wikieditor-toolbar-link-int-target-status-notexists,
#wikieditor-toolbar-link-int-target-status-invalid,
+#wikieditor-toolbar-link-int-target-status-invalidurl,
#wikieditor-toolbar-link-int-target-status-external,
#wikieditor-toolbar-link-int-target-status-disambig {
padding-left: 30px;
@@ -71,7 +72,8 @@
background-image: url(images/dialogs/insert-link-notexists.png);
background-position: left;
}
-#wikieditor-toolbar-link-int-target-status-invalid {
+#wikieditor-toolbar-link-int-target-status-invalid,
+#wikieditor-toolbar-link-int-target-status-invalidurl {
/* @embed */
background-image: url(images/dialogs/insert-link-invalid.png);
background-position: left;
diff --git a/modules/jquery.wikiEditor.dialogs.config.js
b/modules/jquery.wikiEditor.dialogs.config.js
index 3ec2641..75df58c 100644
--- a/modules/jquery.wikiEditor.dialogs
[MediaWiki-commits] [Gerrit] Add authorship info and tweaks to $wgExtensionCredits for co... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Add authorship info and tweaks to $wgExtensionCredits for core skins .. Add authorship info and tweaks to $wgExtensionCredits for core skins Change-Id: I13ae94385b629fcd504b84470471e0125f39f22d --- A skins/MonoBook/COPYING M skins/MonoBook/MonoBook.php M skins/MonoBook/i18n/en.json M skins/MonoBook/i18n/qqq.json A skins/Vector/COPYING M skins/Vector/Vector.php M skins/Vector/i18n/en.json M skins/Vector/i18n/qqq.json 8 files changed, 698 insertions(+), 2 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/skins/MonoBook/COPYING b/skins/MonoBook/COPYING new file mode 100644 index 000..019694a --- /dev/null +++ b/skins/MonoBook/COPYING @@ -0,0 +1,342 @@ +== GNU GENERAL PUBLIC LICENSE == + +Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +Everyone is permitted to copy and distribute verbatim copies +of this license document, but changing it is not allowed. + +=== Preamble === + +The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + +When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + +To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + +For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + +We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + +Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + +The precise terms and conditions for copying, distribution and +modification follow. + +== TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION == + +'''0.''' This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + +'''1.''' You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and app
[MediaWiki-commits] [Gerrit] Number of pages was wrongly set in the database - change (mediawiki...ProofreadPage)
Tpt has uploaded a new change for review. https://gerrit.wikimedia.org/r/141300 Change subject: Number of pages was wrongly set in the database .. Number of pages was wrongly set in the database Change-Id: I82390599a3ce7e52e7471623e4d5250da2c67110 --- M ProofreadPage.body.php 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/00/141300/1 diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php index bd58b84..79f4bbe 100644 --- a/ProofreadPage.body.php +++ b/ProofreadPage.body.php @@ -448,8 +448,6 @@ $indexTitle = $index->getTitle(); $indexId = $index->getID(); - $n = 0; - // read the list of pages $pages = array(); $pagination = Context::getDefaultContext()->getPaginationFactory()->getPaginationForIndexPage( @@ -485,7 +483,7 @@ $n4 = ProofreadPageDbConnector::queryCount( $queryArr, 'proofreadpage_quality4_category' ); $n1 = $total - $n0 - $n2 - $n3 - $n4; - ProofreadIndexDbConnector::setIndexData( $n, $n0, $n1, $n2, $n3, $n4, $indexId ); + ProofreadIndexDbConnector::setIndexData( $pagination->getNumberOfPages(), $n0, $n1, $n2, $n3, $n4, $indexId ); } /** -- To view, visit https://gerrit.wikimedia.org/r/141300 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82390599a3ce7e52e7471623e4d5250da2c67110 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: wmf/1.24wmf10 Gerrit-Owner: Tpt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Number of pages was wrongly set in the database - change (mediawiki...ProofreadPage)
jenkins-bot has submitted this change and it was merged. Change subject: Number of pages was wrongly set in the database .. Number of pages was wrongly set in the database Change-Id: I82390599a3ce7e52e7471623e4d5250da2c67110 --- M ProofreadPage.body.php 1 file changed, 1 insertion(+), 3 deletions(-) Approvals: Phe: Looks good to me, but someone else must approve Tpt: Looks good to me, approved jenkins-bot: Verified diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php index bd58b84..79f4bbe 100644 --- a/ProofreadPage.body.php +++ b/ProofreadPage.body.php @@ -448,8 +448,6 @@ $indexTitle = $index->getTitle(); $indexId = $index->getID(); - $n = 0; - // read the list of pages $pages = array(); $pagination = Context::getDefaultContext()->getPaginationFactory()->getPaginationForIndexPage( @@ -485,7 +483,7 @@ $n4 = ProofreadPageDbConnector::queryCount( $queryArr, 'proofreadpage_quality4_category' ); $n1 = $total - $n0 - $n2 - $n3 - $n4; - ProofreadIndexDbConnector::setIndexData( $n, $n0, $n1, $n2, $n3, $n4, $indexId ); + ProofreadIndexDbConnector::setIndexData( $pagination->getNumberOfPages(), $n0, $n1, $n2, $n3, $n4, $indexId ); } /** -- To view, visit https://gerrit.wikimedia.org/r/141299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82390599a3ce7e52e7471623e4d5250da2c67110 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Tpt Gerrit-Reviewer: Phe Gerrit-Reviewer: Tpt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Number of pages was wrongly set in the database - change (mediawiki...ProofreadPage)
Tpt has uploaded a new change for review. https://gerrit.wikimedia.org/r/141299 Change subject: Number of pages was wrongly set in the database .. Number of pages was wrongly set in the database Change-Id: I82390599a3ce7e52e7471623e4d5250da2c67110 --- M ProofreadPage.body.php 1 file changed, 1 insertion(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/99/141299/1 diff --git a/ProofreadPage.body.php b/ProofreadPage.body.php index bd58b84..79f4bbe 100644 --- a/ProofreadPage.body.php +++ b/ProofreadPage.body.php @@ -448,8 +448,6 @@ $indexTitle = $index->getTitle(); $indexId = $index->getID(); - $n = 0; - // read the list of pages $pages = array(); $pagination = Context::getDefaultContext()->getPaginationFactory()->getPaginationForIndexPage( @@ -485,7 +483,7 @@ $n4 = ProofreadPageDbConnector::queryCount( $queryArr, 'proofreadpage_quality4_category' ); $n1 = $total - $n0 - $n2 - $n3 - $n4; - ProofreadIndexDbConnector::setIndexData( $n, $n0, $n1, $n2, $n3, $n4, $indexId ); + ProofreadIndexDbConnector::setIndexData( $pagination->getNumberOfPages(), $n0, $n1, $n2, $n3, $n4, $indexId ); } /** -- To view, visit https://gerrit.wikimedia.org/r/141299 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I82390599a3ce7e52e7471623e4d5250da2c67110 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ProofreadPage Gerrit-Branch: master Gerrit-Owner: Tpt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.searchSuggest: Enable result caching - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.searchSuggest: Enable result caching
..
mediawiki.searchSuggest: Enable result caching
Also remove redundant 'delay' option, this is 120 by default.
Bug: 65581
Change-Id: I38d5fe0cb9bb883d398295a97e30c29d68211e31
---
M resources/src/mediawiki/mediawiki.searchSuggest.js
1 file changed, 4 insertions(+), 5 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Florianschmidtwelzow: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js
b/resources/src/mediawiki/mediawiki.searchSuggest.js
index 282cf6f..a314dcb 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -121,9 +121,8 @@
];
$( searchboxesSelectors.join( ', ' ) )
.suggestions( {
- fetch: function ( query ) {
- var $textbox = this,
- node = this[0];
+ fetch: function ( query, response ) {
+ var node = this[0];
api = api || new mw.Api();
@@ -133,7 +132,7 @@
namespace: 0,
suggest: ''
} ).done( function ( data ) {
- $textbox.suggestions(
'suggestions', data[1] );
+ response( data[ 1 ] );
} ) );
},
cancel: function () {
@@ -152,7 +151,7 @@
return true;
}
},
- delay: 120,
+ cache: true,
highlightInput: true
} )
.bind( 'paste cut drop', function () {
--
To view, visit https://gerrit.wikimedia.org/r/134542
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38d5fe0cb9bb883d398295a97e30c29d68211e31
Gerrit-PatchSet: 11
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Fomafix
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] jquery.suggestions: Support caching results to save http req... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: jquery.suggestions: Support caching results to save http
requests
..
jquery.suggestions: Support caching results to save http requests
When typing the same thing multiple times, or when pressing backspace
(thus reverting to an earlier known value), or otherwise ending
up with the same value, we can re-use the data we already used.
Doesn't happen in the basic case of typing one thing without mistakes
and selecting a results, but happens more than one might think.
People are often impatient, or even use the suggestions as their
search results and based on that might try something else and then
go back (e.g. try "Foo", find a good result but not ideal, try "Bar",
even worse, go back to "Foo", select "Foo thing").
During this, requests for "B", "Ba", "F", "Fo" and "Foo" would be
fired more than once (B-Ba when backspacing, F-Fo-Foo when typing it
the second time, or simply using ctrl-Z a couple times).
By default cache disabled (individual users of this plugin have
to opt-in). When enabled it defaults to an expiry of 1 minute.
Also:
* Cleaned up computing of $textbox.val(), it was being computed several
times in a synchronous block.
* Simplified bool cast from foo ? true : false, to !!foo.
Bug: 65581
Change-Id: Ib10c65f6ab31773b7f517b2f9c3cc7c7b93c6d39
---
M resources/src/jquery/jquery.suggestions.js
1 file changed, 47 insertions(+), 6 deletions(-)
Approvals:
Hoo man: Looks good to me, but someone else must approve
Bartosz Dziewoński: Looks good to me, approved
Florianschmidtwelzow: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/resources/src/jquery/jquery.suggestions.js
b/resources/src/jquery/jquery.suggestions.js
index 7a32076..08ed5d9 100644
--- a/resources/src/jquery/jquery.suggestions.js
+++ b/resources/src/jquery/jquery.suggestions.js
@@ -31,6 +31,10 @@
* Type: Number, Range: 1 - 100, Default: 7
* delay: Number of ms to wait for the user to stop typing
* Type: Number, Range: 0 - 1200, Default: 120
+ * cache: Whether to cache results from a fetch
+ * Type: Boolean, Default: false
+ * cacheMaxAge: Number of ms to cache results from a fetch
+ * Type: Number, Range: 1 - Infinity, Default: 6 (1 minute)
* submitOnClick: Whether to submit the form containing the textbox when a
suggestion is clicked
* Type: Boolean, Default: false
* maxExpandFactor: Maximum suggestions box width relative to the textbox
width. If set
@@ -46,6 +50,8 @@
* Type: Boolean, Default: false
*/
( function ( $ ) {
+
+var hasOwn = Object.hasOwnProperty;
$.suggestions = {
/**
@@ -90,18 +96,44 @@
*/
update: function ( context, delayed ) {
function maybeFetch() {
+ var val = context.data.$textbox.val(),
+ cache = context.data.cache,
+ cacheHit;
+
// Only fetch if the value in the textbox changed and
is not empty, or if the results were hidden
// if the textbox is empty then clear the result div,
but leave other settings intouched
- if ( context.data.$textbox.val().length === 0 ) {
+ if ( val.length === 0 ) {
$.suggestions.hide( context );
context.data.prevText = '';
} else if (
- context.data.$textbox.val() !==
context.data.prevText ||
+ val !== context.data.prevText ||
!context.data.$container.is( ':visible' )
) {
- if ( typeof context.config.fetch === 'function'
) {
- context.data.prevText =
context.data.$textbox.val();
- context.config.fetch.call(
context.data.$textbox, context.data.$textbox.val() );
+ context.data.prevText = val;
+ // Try cache first
+ if ( context.config.cache && hasOwn.call(
cache, val ) ) {
+ if ( +new Date() - cache[ val
].timestamp < context.config.cacheMaxAge ) {
+
context.data.$textbox.suggestions( 'suggestions', cache[ val ].suggestions );
+ cacheHit = true;
+ } else {
+ // Cache expired
+ delete cache[ val ];
+ }
+ }
+ if ( !cacheHit && typeof context.con
[MediaWiki-commits] [Gerrit] Only list Create account when permissions allow it - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Only list Create account when permissions allow it
..
Only list Create account when permissions allow it
Bug: 66589
Change-Id: I3848ae3e19aae7625acbf3ec332f8820d02215d6
---
M includes/specials/SpecialCreateAccount.php
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
TTO: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/specials/SpecialCreateAccount.php
b/includes/specials/SpecialCreateAccount.php
index 448637e..f3af312 100644
--- a/includes/specials/SpecialCreateAccount.php
+++ b/includes/specials/SpecialCreateAccount.php
@@ -42,6 +42,14 @@
return true;
}
+ public function isRestricted() {
+ return true;
+ }
+
+ public function userCanExecute( User $user ) {
+ return $user->isAllowed( 'createaccount' );
+ }
+
protected function getGroupName() {
return 'login';
}
--
To view, visit https://gerrit.wikimedia.org/r/139392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3848ae3e19aae7625acbf3ec332f8820d02215d6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Talktodan
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: IAlex
Gerrit-Reviewer: TTO
Gerrit-Reviewer: Talktodan
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix = vs == - change (mediawiki...VectorBeta)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141298
Change subject: Fix = vs ==
..
Fix = vs ==
Clearly an assignment wasn't intended here.
Change-Id: I938d8042fb41c2a32c26fb2a99df5e6baa2f1551
---
M VectorBeta.hooks.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta
refs/changes/98/141298/1
diff --git a/VectorBeta.hooks.php b/VectorBeta.hooks.php
index ddcecee..9b3591d 100644
--- a/VectorBeta.hooks.php
+++ b/VectorBeta.hooks.php
@@ -34,7 +34,7 @@
$className .= 'mw-menu-item mw-icon mw-' . $key .
'-icon';
if ( strpos( $item['id'], 'ca-nstab' ) === 0 ) {
$className .= ' mw-page-icon';
- } elseif ( $item['id'] = 'ca-talk' ) {
+ } elseif ( $item['id'] == 'ca-talk' ) {
$className .= ' mw-talk-icon';
}
$htmlMenu .= Html::openElement( 'li', array(
--
To view, visit https://gerrit.wikimedia.org/r/141298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I938d8042fb41c2a32c26fb2a99df5e6baa2f1551
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] CPB: Make LQT messages show up in CPB. - change (mediawiki...VectorBeta)
jenkins-bot has submitted this change and it was merged.
Change subject: CPB: Make LQT messages show up in CPB.
..
CPB: Make LQT messages show up in CPB.
I was missing these notification too often on mediawiki.org
Change-Id: I75d47503ca0ed3dfd68a66b60f0aaede0e96ebef
---
M resources/compactPersonalBar/compactPersonalBar.js
M resources/compactPersonalBar/compactPersonalBar.less
2 files changed, 3 insertions(+), 0 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/compactPersonalBar/compactPersonalBar.js
b/resources/compactPersonalBar/compactPersonalBar.js
index b882f64..7c12398 100644
--- a/resources/compactPersonalBar/compactPersonalBar.js
+++ b/resources/compactPersonalBar/compactPersonalBar.js
@@ -121,6 +121,7 @@
count: $( '#pt-notifications' ).text(),
href: $( '#pt-notifications' ).find( 'a'
).attr( 'href' )
} ) ).
+ addItem( 'interactions', 'newmessages', $(
'#pt-newmessages' ).clone().attr( 'id', 'pt-newmessages-flyout' ) ).
addItem( 'interactions', 'talk', $( '#pt-mytalk'
).clone().attr( 'id', 'pt-mytalk-flyout' ) ).
addItem( 'interactions', 'watchlist', $(
'#pt-watchlist' ).clone().attr( 'id', 'pt-watchlist-flyout' ) ).
addItem( 'preferences', 'preferences', $(
'#pt-preferences' ) ).
@@ -137,6 +138,7 @@
bar.
addItem( 'main', 'language', $( '#pt-uls' ) ).
+ addItem( 'main', 'newmessages', $( '#pt-newmessages' )
).
addItem( 'main', 'watchlist', $( '#pt-watchlist' ) ).
addItem( 'main', 'talk', $( '#pt-mytalk' ) ).
addItem( 'main', 'notifications', $(
'#pt-notifications' ) ).
diff --git a/resources/compactPersonalBar/compactPersonalBar.less
b/resources/compactPersonalBar/compactPersonalBar.less
index bb3bfda..1bab10f 100644
--- a/resources/compactPersonalBar/compactPersonalBar.less
+++ b/resources/compactPersonalBar/compactPersonalBar.less
@@ -158,6 +158,7 @@
.background-icon("notifications");
}
+#pt-newmessages-flyout a,
#pt-mytalk-flyout a {
.background-icon("talk");
}
--
To view, visit https://gerrit.wikimedia.org/r/140248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75d47503ca0ed3dfd68a66b60f0aaede0e96ebef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jorm
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] php codesniffer suggestions - change (mediawiki...VectorBeta)
jenkins-bot has submitted this change and it was merged.
Change subject: php codesniffer suggestions
..
php codesniffer suggestions
* Limit lines to 100 chars
* Use 'elseif' instead of 'else if'
Change-Id: Ic18ce2968fd50c3f344655a93926e0ba9f6eac16
---
M VectorBeta.hooks.php
M VectorBeta.php
2 files changed, 8 insertions(+), 6 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VectorBeta.hooks.php b/VectorBeta.hooks.php
index f1c1a72..08d652c 100644
--- a/VectorBeta.hooks.php
+++ b/VectorBeta.hooks.php
@@ -34,7 +34,7 @@
$className .= 'mw-menu-item mw-icon mw-' . $key .
'-icon';
if ( strpos( $item['id'], 'ca-nstab' ) === 0 ) {
$className .= ' mw-page-icon';
- } else if ( $item['id'] = 'ca-talk' ) {
+ } elseif ( $item['id'] = 'ca-talk' ) {
$className .= ' mw-talk-icon';
}
$htmlMenu .= Html::openElement( 'li', array(
@@ -59,7 +59,8 @@
*/
static function isFixedHeaderEnabled( $user ) {
global $wgVectorBetaWinter;
- return $wgVectorBetaWinter && BetaFeatures::isFeatureEnabled(
$user, 'betafeatures-vector-fixedheader' );
+ return $wgVectorBetaWinter &&
+ BetaFeatures::isFeatureEnabled( $user,
'betafeatures-vector-fixedheader' );
}
/**
@@ -81,7 +82,7 @@
if ( !class_exists( 'BetaFeatures' ) ) {
wfDebugLog( 'VectorBeta', 'The BetaFeatures extension
is not installed' );
return true;
- } else if ( self::isFixedHeaderEnabled( $skin->getUser() ) ) {
+ } elseif ( self::isFixedHeaderEnabled( $skin->getUser() ) ) {
$data = $tpl->data;
$skin = $data['skin'];
$nav = $data['content_navigation'];
@@ -152,7 +153,7 @@
// Make ajax work
$pageActions['watch']['class'] .= ' mw-watchlink';
unset( $actions['watch'] );
- } else if ( isset( $actions['unwatch'] ) ){
+ } elseif ( isset( $actions['unwatch'] ) ){
$pageActions['unwatch'] = $actions['unwatch'];
// Make ajax work
$pageActions['unwatch']['class'] .= ' mw-watchlink';
@@ -222,7 +223,7 @@
if ( isset( $views['edit'] ) ) {
$edit = $views['edit'];
- } else if ( isset( $views['viewsource'] ) ) {
+ } elseif ( isset( $views['viewsource'] ) ) {
$edit = $views['viewsource'];
} else {
$edit = false;
diff --git a/VectorBeta.php b/VectorBeta.php
index b0b2e96..ee8deee 100644
--- a/VectorBeta.php
+++ b/VectorBeta.php
@@ -125,7 +125,8 @@
),
) );
-$wgHooks['SkinTemplateOutputPageBeforeExec'][] =
'VectorBetaHooks::getSkinTemplateOutputPageBeforeExec';
+$wgHooks['SkinTemplateOutputPageBeforeExec'][] =
+ 'VectorBetaHooks::getSkinTemplateOutputPageBeforeExec';
$wgHooks['GetBetaFeaturePreferences'][] = 'VectorBetaHooks::getPreferences';
$wgHooks['BeforePageDisplay'][] = 'VectorBetaHooks::onBeforePageDisplay';
$wgHooks['SkinVectorStyleModules'][] =
'VectorBetaHooks::skinVectorStyleModules';
--
To view, visit https://gerrit.wikimedia.org/r/131261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic18ce2968fd50c3f344655a93926e0ba9f6eac16
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: KartikMistry
Gerrit-Reviewer: Amire80
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jorm
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Opera 12 flyout collapsing to early - change (mediawiki...VectorBeta)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix Opera 12 flyout collapsing to early
..
Fix Opera 12 flyout collapsing to early
This is a possible fix for a problem in Opera 12 (and possibly other
browsers) caused by the active hover reagion limited to max-height: 2.2em.
This second attempt is a bit different from the first (avoids px margins
and uses line-height instead) and tested in Chrome, Firefox and Opera.
The main purpose of this patch ist to let you know it's fairly easy to
avoid this problem.
I'm open for discussions.
Feel free to take this patch and submit additional patch sets on top
of mine.
Change-Id: I9bac959211e4f3d9bfb80793b153e3be3fb8c5db
---
M resources/compactPersonalBar/compactPersonalBar.less
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/compactPersonalBar/compactPersonalBar.less
b/resources/compactPersonalBar/compactPersonalBar.less
index bb3bfda..6aebd47 100644
--- a/resources/compactPersonalBar/compactPersonalBar.less
+++ b/resources/compactPersonalBar/compactPersonalBar.less
@@ -23,8 +23,8 @@
}
#pt-flyout {
- // prevent bar elements from jumping when flyout expanded
- max-height: 2.2em;
+ line-height: 1.125em;
+ margin-top: .3em;
// Set correct alignment in Firefox in RTL wikis.
// This shouldn't be needed, but Firefox has a bug with this.
@@ -114,9 +114,10 @@
}
#p-personal > div > ul > li {
- vertical-align: middle;
+ vertical-align: top;
display: inline-block;
float: none;
+ line-height: 32px; /* same as the images, important for ULS */
}
#pt-watchlist a, #pt-mytalk a {
--
To view, visit https://gerrit.wikimedia.org/r/133628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9bac959211e4f3d9bfb80793b153e3be3fb8c5db
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: JGonera
Gerrit-Reviewer: Jdlrobson
Gerrit-Reviewer: Jorm
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merge remote-tracking branch 'origin/master' into HEAD - change (pywikibot...httplib2)
Merlijn van Deen has submitted this change and it was merged. Change subject: Merge remote-tracking branch 'origin/master' into HEAD .. Merge remote-tracking branch 'origin/master' into HEAD Conflicts: .gitignore python2/httplib2/cacerts.txt python3/httplib2/cacerts.txt setup.py Change-Id: I3b1e2fc062ddb6c57b7a9d355b4e1f6832cacc38 --- M .gitignore M python2/httplib2/cacerts.txt M python3/httplib2/cacerts.txt M setup.py 4 files changed, 277 insertions(+), 6,636 deletions(-) Approvals: John Vandenberg: Verified; Looks good to me, approved Objections: Merlijn van Deen: There's a problem with this change, please improve -- To view, visit https://gerrit.wikimedia.org/r/137369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b1e2fc062ddb6c57b7a9d355b4e1f6832cacc38 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/externals/httplib2 Gerrit-Branch: master Gerrit-Owner: Pywikipedia Conversion Bot Gerrit-Reviewer: John Vandenberg Gerrit-Reviewer: Merlijn van Deen ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (syntax fix) Http() redirect limit exception - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: (syntax fix) Http() redirect limit exception .. (syntax fix) Http() redirect limit exception threadedhttp.Http() copied exception code from httplib2 and omitted a module prefix for httplib2.RedirectLimit Change-Id: I565e8b30efcd68cb76cc626b1ece9c2365ef0c20 --- M pywikibot/comms/threadedhttp.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 5dd0840..c1a37d7 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -301,7 +301,7 @@ headers=headers, max_redirects=max_redirects - 1) else: -raise RedirectLimit( +raise httplib2.RedirectLimit( "Redirected more times than redirection_limit allows.", response, content) -- To view, visit https://gerrit.wikimedia.org/r/139605 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I565e8b30efcd68cb76cc626b1ece9c2365ef0c20 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Xqt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] toollabs: Add phantomjs package - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: toollabs: Add phantomjs package .. toollabs: Add phantomjs package Bug: 66928 Change-Id: Id88e9e1dc472ed5a3c291f0b82f2f4f453ddb493 --- M modules/toollabs/manifests/exec_environ.pp 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved Tim Landscheidt: Looks good to me, but someone else must approve Legoktm: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 902c6ae..6a9450d 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -322,6 +322,7 @@ 'supybot', # Bug 61088. 'p7zip', 'pdftk', # Bug #65048. +'phantomjs', # Bug #66928 'phpunit', 'poppler-utils', # Bug #53869. 'postgresql-client-9.1', -- To view, visit https://gerrit.wikimedia.org/r/141280 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id88e9e1dc472ed5a3c291f0b82f2f4f453ddb493 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda Gerrit-Reviewer: Alexandros Kosiaris Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: Dzahn Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Tim Landscheidt Gerrit-Reviewer: coren Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:ExpandTemplates: Load RL modules - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:ExpandTemplates: Load RL modules
..
Special:ExpandTemplates: Load RL modules
Bug: 39049
Change-Id: I85d0c820d7fb5e3faa0081bf2e8e4672f2887b38
---
M includes/specials/SpecialExpandTemplates.php
1 file changed, 8 insertions(+), 10 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialExpandTemplates.php
b/includes/specials/SpecialExpandTemplates.php
index f89f03c..35a3ba1 100644
--- a/includes/specials/SpecialExpandTemplates.php
+++ b/includes/specials/SpecialExpandTemplates.php
@@ -118,13 +118,13 @@
$out->addHTML( $tmp );
- $rawhtml = $this->generateHtml( $title, $output );
-
+ $pout = $this->generateHtml( $title, $output );
+ $rawhtml = $pout->getText();
if ( $this->generateRawHtml && strlen( $rawhtml ) > 0 )
{
$out->addHTML( $this->makeOutput( $rawhtml,
'expand_templates_html_output' ) );
}
- $this->showHtmlPreview( $title, $rawhtml, $out );
+ $this->showHtmlPreview( $title, $pout, $out );
}
}
@@ -222,26 +222,24 @@
*
* @param Title $title
* @param string $text
-* @return string
+* @return ParserOutput
*/
private function generateHtml( Title $title, $text ) {
global $wgParser;
$popts = ParserOptions::newFromContext( $this->getContext() );
$popts->setTargetLanguage( $title->getPageLanguage() );
- $pout = $wgParser->parse( $text, $title, $popts );
-
- return $pout->getText();
+ return $wgParser->parse( $text, $title, $popts );
}
/**
* Wraps the provided html code in a div and outputs it to the page
*
* @param Title $title
-* @param string $html
+* @param ParserOutput $pout
* @param OutputPage $out
*/
- private function showHtmlPreview( Title $title, $html, OutputPage $out
) {
+ private function showHtmlPreview( Title $title, ParserOutput $pout,
OutputPage $out ) {
$lang = $title->getPageViewLanguage();
$out->addHTML( "" . $this->msg( 'expand_templates_preview'
)->escaped() . "\n" );
$out->addHTML( Html::openElement( 'div', array(
@@ -249,7 +247,7 @@
'dir' => $lang->getDir(),
'lang' => $lang->getHtmlCode(),
) ) );
- $out->addHTML( $html );
+ $out->addParserOutputContent( $pout );
$out->addHTML( Html::closeElement( 'div' ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/131412
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I85d0c820d7fb5e3faa0081bf2e8e4672f2887b38
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: TheDJ
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove storing passwords in test API cache - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged. Change subject: Remove storing passwords in test API cache .. Remove storing passwords in test API cache - remove password cache entries if they exist - do not create new password cache entries Change-Id: I8d01edd1a6fdbfc6ec91ff98ed9f70201ef3261b --- M tests/__init__.py 1 file changed, 29 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/__init__.py b/tests/__init__.py index a9b675e..3ac2361 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -13,6 +13,9 @@ class TestRequest(CachedRequest): + +"""Add caching to every Request except logins.""" + def __init__(self, *args, **kwargs): super(TestRequest, self).__init__(0, *args, **kwargs) @@ -22,8 +25,34 @@ return path def _expired(self, dt): +"""Never invalidate cached data.""" return False +def _load_cache(self): +"""Return whether the cache can be used.""" +if not super(TestRequest, self)._load_cache(): +return False + +if 'lgpassword' in self._uniquedescriptionstr(): +self._delete_cache() +self._data = None +return False + +return True + +def _delete_cache(self): +"""Delete cached response if it exists.""" +self._load_cache() +if self._cachetime: +os.remove(self._cachefile_path()) + +def _write_cache(self, data): +"""Write data except login details.""" +if 'lgpassword' in self._uniquedescriptionstr(): +return + +return super(TestRequest, self)._write_cache(data) + def patch_request(): global original_expired -- To view, visit https://gerrit.wikimedia.org/r/140631 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8d01edd1a6fdbfc6ec91ff98ed9f70201ef3261b Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg Gerrit-Reviewer: Ladsgroup Gerrit-Reviewer: Merlijn van Deen Gerrit-Reviewer: Mpaa Gerrit-Reviewer: Nullzero Gerrit-Reviewer: Whym Gerrit-Reviewer: Withoutaname Gerrit-Reviewer: devunt Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Commit a live hack. - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: Commit a live hack. .. Commit a live hack. No idea by whom and why but the live hack run into a merge conflict :-( Change-Id: I8daa5d11ffca897d67ad2a46cfc4f42440912dd8 --- M bin/repoexport 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/bin/repoexport b/bin/repoexport index 2b82116..47b2052 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -44,6 +44,7 @@ elif [ "$PROJECT" = "europeana" ] then + exit php "$EXPORTER" --target . --group=out-europeana --lang='*' --skip en,qqq --threshold 75 php "$EXPORTER" --target . --group=out-europeana --lang qqq -- To view, visit https://gerrit.wikimedia.org/r/141297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8daa5d11ffca897d67ad2a46cfc4f42440912dd8 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Commit a live hack. - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/141297 Change subject: Commit a live hack. .. Commit a live hack. No idea by whom and why but the live hack run into a merge conflict :-( Change-Id: I8daa5d11ffca897d67ad2a46cfc4f42440912dd8 --- M bin/repoexport 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/97/141297/1 diff --git a/bin/repoexport b/bin/repoexport index 2b82116..47b2052 100755 --- a/bin/repoexport +++ b/bin/repoexport @@ -44,6 +44,7 @@ elif [ "$PROJECT" = "europeana" ] then + exit php "$EXPORTER" --target . --group=out-europeana --lang='*' --skip en,qqq --threshold 75 php "$EXPORTER" --target . --group=out-europeana --lang qqq -- To view, visit https://gerrit.wikimedia.org/r/141297 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8daa5d11ffca897d67ad2a46cfc4f42440912dd8 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pyflakes - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: pyflakes
..
pyflakes
Change-Id: I97aee976f8d80306b70ab68253ec9697c2587427
---
M pywikibot/i18n.py
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index 259b505..dc6b697 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -429,6 +429,7 @@
},
}
#use a number
+>>> from pywikibot import i18n
>>> i18n.twntranslate('en', 'test-changing', 0) % {'num': 'no'}
Bot: Changing no pages.
#use a string
--
To view, visit https://gerrit.wikimedia.org/r/141275
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I97aee976f8d80306b70ab68253ec9697c2587427
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix httplib2 dependency check - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix httplib2 dependency check
..
Fix httplib2 dependency check
- Move dependency check from threadedhttp.py to http.py
and revise it removing the dependency on setuptools for
running pywikibot (it is still required to use setup.py)
- Add httplib2 version checks, and display the httplib2 __file__
to assist the user identify why they have the wrong version.
Bug: 66618
Change-Id: I66c9a42f80710dec78b6e2b25ccb7b4b949c5740
---
M README-conversion.txt
M pwb.py
M pywikibot/comms/http.py
M pywikibot/comms/threadedhttp.py
4 files changed, 26 insertions(+), 14 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README-conversion.txt b/README-conversion.txt
index e229ab0..24d62f4 100644
--- a/README-conversion.txt
+++ b/README-conversion.txt
@@ -48,10 +48,9 @@
so that these dependencies will be loaded automatically when the package is
installed, and users won't need to worry about this...]
-To run pywikibot, you will need the httplib2, simplejson, and setuptools
+To run pywikibot, you will need the httplib2 and simplejson:
packages--
* httplib2 : http://code.google.com/p/httplib2/
-* setuptools : http://pypi.python.org/pypi/setuptools/
* simplejson :
http://svn.red-bean.com/bob/simplejson/tags/simplejson-1.7.1/docs/index.html
or, if you already have setuptools installed, just execute
diff --git a/pwb.py b/pwb.py
index 2fba1d3..a375826 100644
--- a/pwb.py
+++ b/pwb.py
@@ -108,7 +108,17 @@
import httplib2
except ImportError as e:
print("ImportError: %s" % e)
-print("Did you clone without --recursive? Try running 'git submodule
update --init'.")
+print("Python module httplib2 >= 0.6.0 is required.")
+print("Did you clone without --recursive?"
+ "Try running 'git submodule update --init'.")
+sys.exit(1)
+
+from distutils.version import StrictVersion
+if StrictVersion(httplib2.__version__) < StrictVersion("0.6.0"):
+print("Python module httplib2 (%s) needs to be 0.6.0 or greater." %
+ httplib2.__file__)
+print("Did you clone without --recursive?"
+ "Try running 'git submodule update --init'.")
sys.exit(1)
if "PYWIKIBOT2_DIR" not in os.environ:
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index affc571..14a55ac 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -27,6 +27,19 @@
import atexit
import time
+# Verify that a working httplib2 is present.
+try:
+import httplib2
+except ImportError:
+print("Error: Python module httplib2 >= 0.6.0 is required.")
+sys.exit(1)
+
+from distutils.version import StrictVersion
+if StrictVersion(httplib2.__version__) < StrictVersion("0.6.0"):
+print("Error: Python module httplib2 (%s) is not 0.6.0 or greater." %
+ httplib2.__file__)
+sys.exit(1)
+
if sys.version_info[0] == 2:
from httplib2 import SSLHandshakeError
import Queue
diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py
index 5dd0840..0f04f5e 100644
--- a/pywikibot/comms/threadedhttp.py
+++ b/pywikibot/comms/threadedhttp.py
@@ -42,17 +42,7 @@
_logger = "comm.threadedhttp"
-# easy_install safeguarded dependencies
-try:
-import httplib2
-except ImportError:
-try:
-import pkg_resources
-pkg_resources.require("httplib2")
-except ImportError:
-pywikibot.error(
-u"Error: You need the python module httplib2 to use this module")
-sys.exit(1)
+import httplib2
class ConnectionPool(object):
--
To view, visit https://gerrit.wikimedia.org/r/139604
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I66c9a42f80710dec78b6e2b25ccb7b4b949c5740
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Mpaa
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] config command line option 'modified' fails - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: config command line option 'modified' fails
..
config command line option 'modified' fails
- move global name 'base_dir' before the population of _glv
- delete variable 'ov' which is used only in a procedural block
that is executed in the global scope
Bug 66950
Change-Id: I482ce11abd1a0a6b078ef489ee1256fde2320758
---
M pywikibot/config2.py
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 6cca983..4b30df4 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -160,6 +160,8 @@
return base_dir
_base_dir = _get_base_dir()
+# Save base_dir for use by other modules
+base_dir = _base_dir
family_files = {}
@@ -716,7 +718,7 @@
print("WARNING: Type of '%(_key)s' changed" % locals())
print(" %(was)s: %(old)s" % {'was': "Was", 'old': ot})
print(" %(now)s: %(new)s" % {'now': "Now", 'new': nt})
-del nt, ot
+del nt, ot, ov
else:
print(("WARNING: "
"Configuration variable %(_key)r is defined but unknown.\n"
@@ -741,9 +743,6 @@
transliteration_target = None
elif transliteration_target in ('None', 'none'):
transliteration_target = None
-
-# Save base_dir for use by other modules
-base_dir = _base_dir
#
--
To view, visit https://gerrit.wikimedia.org/r/141288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I482ce11abd1a0a6b078ef489ee1256fde2320758
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not remove imported packages - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Do not remove imported packages
..
Do not remove imported packages
Imported modules were hidden in 2009, as part of a large cleanup of the
symbols exported by config.py
https://mediawiki.org/wiki/Special:Code/pywikipedia/4285
While there is benefit in hiding symbols not intended to be public,
hiding the imported modules is not beneficial as it is unlikely that
any config value will be of type module, so they can be differentiated,
and indeed they were already skipped in 'list of config options' code.
https://mediawiki.org/wiki/Special:Code/pywikipedia/4887
The removal of symbols __sys and os currently cause pyflakes error F821.
While this isnt a functional problem, it does prevent reflection and
inspection of the loaded python code, and is unecessary.
Also moved platform import into the only code block that uses it,
meaning it wont be loaded on many systems.
Also removed 're' import, as it was unused.
Change-Id: I783fba623a2825af3273ecad286d47e897c2a674
---
M pywikibot/config2.py
1 file changed, 15 insertions(+), 20 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 6cca983..37579ad 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -9,9 +9,7 @@
#
import os
-import sys as __sys
-import re
-import platform
+import sys
# IMPORTANT:
# Do not change any of the variables in this file. Instead, make
@@ -121,18 +119,19 @@
"""
NAME = "pywikibot"
-for arg in __sys.argv[1:]:
+for arg in sys.argv[1:]:
if arg.startswith("-dir:"):
base_dir = arg[5:]
-__sys.argv.remove(arg)
+sys.argv.remove(arg)
break
else:
if "PYWIKIBOT2_DIR" in os.environ:
base_dir = os.environ["PYWIKIBOT2_DIR"]
else:
-is_windows = __sys.platform == 'win32'
+is_windows = sys.platform == 'win32'
home = os.path.expanduser("~")
if is_windows:
+import platform
_win_version = int(platform.version()[0])
if _win_version == 5:
base_dir = os.path.join(home, "Application Data", NAME)
@@ -194,7 +193,7 @@
# This default code should work fine, so you don't have to think about it.
# TODO: consider getting rid of this config variable.
try:
-console_encoding = __sys.stdout.encoding
+console_encoding = sys.stdout.encoding
except:
# When using pywikibot inside a daemonized twisted application,
# we get "StdioOnnaStick instance has no attribute 'encoding'"
@@ -250,7 +249,7 @@
# ANSI colors.
try:
# Don't print colorized when the output is, for example, piped to a file.
-colorized_output = __sys.stdout.isatty()
+colorized_output = sys.stdout.isatty()
except:
colorized_output = False
@@ -258,7 +257,7 @@
# The command for the editor you want to use. If set to None, a simple Tkinter
# editor will be used.
# On Windows systems, this script tries to determine the default text editor.
-if __sys.platform == 'win32':
+if sys.platform == 'win32':
try:
import _winreg
_key1 = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER,
@@ -643,7 +642,6 @@
from hol...@trillke.net 2002/03/18
"""
-import os
dpath = os.path.normpath(os.path.dirname(path))
if not os.path.exists(dpath):
os.makedirs(dpath)
@@ -658,13 +656,11 @@
directories in the path that do not already exist are created.
"""
-import os.path
return makepath(os.path.join(base_dir, *filename))
def shortpath(path):
"""Return a file path relative to config.base_dir."""
-import os.path
if path.startswith(base_dir):
return path[len(base_dir) + len(os.path.sep):]
return path
@@ -687,8 +683,8 @@
_filestatus = os.stat(_filename)
_filemode = _filestatus[0]
_fileuid = _filestatus[4]
-if __sys.platform == 'win32' or _fileuid in [os.getuid(), 0]:
-if __sys.platform == 'win32' or _filemode & 0o02 == 0 or True:
+if sys.platform == 'win32' or _fileuid in [os.getuid(), 0]:
+if sys.platform == 'win32' or _filemode & 0o02 == 0 or True:
exec(compile(open(_filename).read(), _filename, 'exec'))
else:
print("WARNING: Skipped '%(fn)s': writeable by others."
@@ -724,14 +720,14 @@
# Fix up default console_encoding
if console_encoding is None:
-if __sys.platform == 'win32':
+if sys.platform == 'win32':
console_encoding = 'cp850'
else:
console_encoding = 'iso-8859-1'
# Fix up transliteration_target
if transliteration_target == 'not set':
-if __sys.platform == 'win32':
+if sys.platform == 'win32':
transliteration_target = console_encodi
[MediaWiki-commits] [Gerrit] Only add WikiEditor for content model WikiText - change (mediawiki...WikiEditor)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141296
Change subject: Only add WikiEditor for content model WikiText
..
Only add WikiEditor for content model WikiText
Together with solving bug 29908, this makes the presence of the
toolbar consistent. It is added to pages handling wikitext.
Note that we provide the CodeEditor on all JS/CSS/Lua pages.
Bug: 24713
Bug: 24041
Change-Id: Iaa6b9a6c511380ed1669d8b95cba4a3ddc6f9ab6
---
M WikiEditor.hooks.php
1 file changed, 8 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikiEditor
refs/changes/96/141296/1
diff --git a/WikiEditor.hooks.php b/WikiEditor.hooks.php
index 660f5e5..8c6800c 100644
--- a/WikiEditor.hooks.php
+++ b/WikiEditor.hooks.php
@@ -155,11 +155,14 @@
*
* Adds the modules to the edit form
*
-* @param $toolbar array list of toolbar items
+* @param $editPage EditPage the current EditPage object.
+* @param $output OutputPage object.
* @return bool
*/
- public static function editPageShowEditFormInitial( &$toolbar ) {
- global $wgOut;
+ public static function editPageShowEditFormInitial( $editPage,
$outputPage ) {
+ if ( $editPage->contentModel !== CONTENT_MODEL_WIKITEXT ) {
+ return true;
+ }
// Add modules for enabled features
foreach ( self::$features as $name => $feature ) {
@@ -167,10 +170,10 @@
continue;
}
if ( isset( $feature['stylemodules'] ) ) {
- $wgOut->addModuleStyles(
$feature['stylemodules'] );
+ $outputPage->addModuleStyles(
$feature['stylemodules'] );
}
if ( isset( $feature['modules'] ) ) {
- $wgOut->addModules( $feature['modules'] );
+ $outputPage->addModules( $feature['modules'] );
}
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/141296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa6b9a6c511380ed1669d8b95cba4a3ddc6f9ab6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Finding minimum bounding rectangle for language screenshot - change (mediawiki...VisualEditor)
Vikassy has uploaded a new change for review. https://gerrit.wikimedia.org/r/141295 Change subject: Finding minimum bounding rectangle for language screenshot .. Finding minimum bounding rectangle for language screenshot Change-Id: I19b98c79b837896e348433dd77969d07f9e5a366 --- A modules/ve-mw/test/browser/features/support/rectangle.rb A modules/ve-mw/test/browser/features/support/rectangle_spec.rb 2 files changed, 44 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/95/141295/1 diff --git a/modules/ve-mw/test/browser/features/support/rectangle.rb b/modules/ve-mw/test/browser/features/support/rectangle.rb new file mode 100644 index 000..c7f76aa --- /dev/null +++ b/modules/ve-mw/test/browser/features/support/rectangle.rb @@ -0,0 +1,14 @@ +def rectangle input_rectangle_1, input_rectangle_2=nil + return input_rectangle_1 unless input_rectangle_2 + + # Finding minimum from the top left + top_left_x = [input_rectangle_1[0][0],input_rectangle_2[0][0]].min + top_left_y = [input_rectangle_1[0][1],input_rectangle_2[0][1]].min + + # Finding maximum from the bottom right + bottom_right_x = [input_rectangle_1[3][0],input_rectangle_2[3][0]].max + bottom_right_y = [input_rectangle_1[3][1],input_rectangle_2[3][1]].max + + # The new rectangle is constructed with its minimum and maximum co-ordinates. + [[top_left_x, top_left_y], [bottom_right_x, top_left_y], [top_left_x, bottom_right_y], [bottom_right_x, bottom_right_y]] +end \ No newline at end of file diff --git a/modules/ve-mw/test/browser/features/support/rectangle_spec.rb b/modules/ve-mw/test/browser/features/support/rectangle_spec.rb new file mode 100644 index 000..06df0af --- /dev/null +++ b/modules/ve-mw/test/browser/features/support/rectangle_spec.rb @@ -0,0 +1,30 @@ +require_relative 'rectangle' + +# Rectangle is defined as set of co-ordinates represnted in (x,y). +# Positions are Top left, Top Right, Bottom left and Bottom right +describe "Rectangle" do + it "should return the co-ordinates of provided 1 rectangle" do + input_rectangle = [[0,0],[1,0],[0,1],[1,1]] + expect(rectangle(input_rectangle)).to eq(input_rectangle) + end + + it "if we provide 2 rectangles and if one contains the other then it should return co-ordinates of bigger rectangle" do +input_rectangle_1 = [[0,0],[1,0],[0,1],[1,1]] +input_rectangle_2 = [[0,0],[2,0],[0,2],[2,2]] +output_rectangle = input_rectangle_2 + expect(rectangle(input_rectangle_1, input_rectangle_2)).to eq(output_rectangle) + end + + it "if we provide 2 rectangles it should return co-ordinates of third rectanlge which contains both" do +input_rectangle_1 = [[0,0],[1,0],[0,1],[1,1]] +input_rectangle_2 = [[1,0],[2,0],[1,1],[2,1]] +output_rectangle_1 = [[0,0],[2,0],[0,1],[2,1]] + expect(rectangle(input_rectangle_1, input_rectangle_2)).to eq(output_rectangle_1) + + input_rectangle_3 = [[1,1],[2,1],[1,2],[2,2]] +input_rectangle_4 = [[3,3],[4,3],[3,4],[4,4]] +output_rectangle_2 = [[1,1],[4,1],[1,4],[4,4]] + expect(rectangle(input_rectangle_3, input_rectangle_4)).to eq(output_rectangle_2) + + end +end \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/141295 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I19b98c79b837896e348433dd77969d07f9e5a366 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Vikassy ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [GlobalPreferences] Register alias file - change (translatewiki)
Raimond Spekking has submitted this change and it was merged. Change subject: [GlobalPreferences] Register alias file .. [GlobalPreferences] Register alias file https://gerrit.wikimedia.org/r/#/c/140894/ Change-Id: I2744555d8e059c3cbc1013dfd56828b605a679e7 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 4d84867..29e7a4c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -737,6 +737,7 @@ #file = GlobalCssJs/i18n/central/%CODE%.json Global Preferences +aliasfile = GlobalPreferences/GlobalPreferences.alias.php descmsg = globalprefs-desc Global Usage -- To view, visit https://gerrit.wikimedia.org/r/141294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2744555d8e059c3cbc1013dfd56828b605a679e7 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [GlobalPreferences] Register alias file - change (translatewiki)
Raimond Spekking has uploaded a new change for review. https://gerrit.wikimedia.org/r/141294 Change subject: [GlobalPreferences] Register alias file .. [GlobalPreferences] Register alias file https://gerrit.wikimedia.org/r/#/c/140894/ Change-Id: I2744555d8e059c3cbc1013dfd56828b605a679e7 --- M groups/MediaWiki/mediawiki-defines.txt 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/94/141294/1 diff --git a/groups/MediaWiki/mediawiki-defines.txt b/groups/MediaWiki/mediawiki-defines.txt index 4d84867..29e7a4c 100644 --- a/groups/MediaWiki/mediawiki-defines.txt +++ b/groups/MediaWiki/mediawiki-defines.txt @@ -737,6 +737,7 @@ #file = GlobalCssJs/i18n/central/%CODE%.json Global Preferences +aliasfile = GlobalPreferences/GlobalPreferences.alias.php descmsg = globalprefs-desc Global Usage -- To view, visit https://gerrit.wikimedia.org/r/141294 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2744555d8e059c3cbc1013dfd56828b605a679e7 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix undefined index help in search profiles - change (mediawiki...LiquidThreads)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix undefined index help in search profiles
..
Fix undefined index help in search profiles
Same code as in I17cc79c
Change-Id: Idcb59c6b0a937d7ed7c030b809a6d41ab68f9d4d
---
M classes/Hooks.php
1 file changed, 14 insertions(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/classes/Hooks.php b/classes/Hooks.php
index ffc7757..8140150 100644
--- a/classes/Hooks.php
+++ b/classes/Hooks.php
@@ -334,7 +334,20 @@
),
);
- $profiles = wfArrayInsertAfter( $profiles, $insert, 'help' );
+ // Insert translations before 'all'
+ $index = array_search( 'all', array_keys( $profiles ) );
+
+ // Or just at the end if all is not found
+ if ( $index === false ) {
+ wfWarn( '"all" not found in search profiles' );
+ $index = count( $profiles );
+ }
+
+ $profiles = array_merge(
+ array_slice( $profiles, 0, $index ),
+ $insert,
+ array_slice( $profiles, $index )
+ );
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/141118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idcb59c6b0a937d7ed7c030b809a6d41ab68f9d4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit
Gerrit-Reviewer: Alex Monk
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Toolbar: Only show on WikiText pages - change (mediawiki/core)
TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141293
Change subject: Toolbar: Only show on WikiText pages
..
Toolbar: Only show on WikiText pages
The toolbar is highly specific to Wikitext anyway. It was already not
added to JS and CSS subpages, but still visible on site css/js pages
and on Lua pages. This was inconsistent.
Ideally at some point, we might want a 'toolbar api' where you can
configure a 'toolbar' per content model, but let's first make it
consistent and then iterate from there when required.
Bug: 29908
Change-Id: If0853e9faf640f93b7030c4937137149d3f08cf5
---
M includes/EditPage.php
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/93/141293/1
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 98e0ec4..1a6a9e5 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2531,7 +2531,9 @@
$wgOut->addHTML( $this->editFormTextBeforeContent );
- if ( !$this->isCssJsSubpage && $showToolbar &&
$wgUser->getOption( 'showtoolbar' ) ) {
+ if ( $this->contentModel === 'CONTENT_MODEL_WIKITEXT'
+ && $showToolbar && $wgUser->getOption( 'showtoolbar' ) )
+ {
$wgOut->addHTML( EditPage::getEditToolbar() );
}
--
To view, visit https://gerrit.wikimedia.org/r/141293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If0853e9faf640f93b7030c4937137149d3f08cf5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] re-order keys: put 'en', 'qqq' on top - change (pywikibot/core)
jenkins-bot has submitted this change and it was merged.
Change subject: re-order keys: put 'en', 'qqq' on top
..
re-order keys: put 'en', 'qqq' on top
Change-Id: I17c17ab64bc8fdab7c0859e66899e17cbf802b84
---
M scripts/maintenance/make_i18n_dict.py
1 file changed, 14 insertions(+), 6 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/maintenance/make_i18n_dict.py
b/scripts/maintenance/make_i18n_dict.py
index 452ba61..3292d11 100644
--- a/scripts/maintenance/make_i18n_dict.py
+++ b/scripts/maintenance/make_i18n_dict.py
@@ -43,7 +43,13 @@
def print_all(self):
keys = self.dict.keys()
+keys.remove('qqq')
keys.sort()
+keys.insert(0, 'qqq')
+if 'en' in keys:
+keys.remove('en')
+keys.insert(0, 'en')
+
print "# -*- coding: utf-8 -*-"
print "msg = {"
for code in keys:
@@ -58,20 +64,22 @@
def read(self, item):
msg = getattr(self.script, item)
-self.keys = msg.keys()
-self.keys.append('qqq')
-self.keys.sort()
-for code in self.keys:
+keys = msg.keys()
+keys.append('qqq')
+for code in keys:
label = "%s-%s" % (self.scriptname, item)
if code == 'qqq':
if code not in self.dict:
self.dict[code] = {}
-self.dict[code][label] = \
-u'Edit summary for %s report' % self.scriptname
+self.dict[code][label] = (
+u'Edit summary for message %s of %s report'
+% (self.scriptname, item))
elif code != 'commons':
if code not in self.dict:
self.dict[code] = {}
self.dict[code][label] = msg[code]
+if 'en' not in keys:
+print 'WARNING: "en" key missing for message %s' % item
def run(self):
for msg in self.messages:
--
To view, visit https://gerrit.wikimedia.org/r/141290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17c17ab64bc8fdab7c0859e66899e17cbf802b84
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
Gerrit-Reviewer: John Vandenberg
Gerrit-Reviewer: Ladsgroup
Gerrit-Reviewer: Merlijn van Deen
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Special:Cite: Load RL modules of parsed content - change (mediawiki...Cite)
jenkins-bot has submitted this change and it was merged.
Change subject: Special:Cite: Load RL modules of parsed content
..
Special:Cite: Load RL modules of parsed content
Bug: 39049
Change-Id: Ib14a7cbc54e0317d7fa47f5569e54f5e0381613c
---
M SpecialCite_body.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/SpecialCite_body.php b/SpecialCite_body.php
index 0425c85..f10cdf8 100644
--- a/SpecialCite_body.php
+++ b/SpecialCite_body.php
@@ -137,7 +137,13 @@
}
$ret = $wgParser->parse( $msg, $this->mTitle,
$this->mParserOptions, false, true, $this->getRevId() );
$wgOut->addModules( 'ext.specialcite' );
- $wgOut->addHTML( $ret->getText() );
+
+ # Introduced in 1.24
+ if( method_exists( $wgOut, 'addParserOutputContent' ) ) {
+ $wgOut->addParserOutputContent( $ret );
+ } else {
+ $wgOut->addHTML( $ret->getText() );
+ }
}
function genParserOptions() {
--
To view, visit https://gerrit.wikimedia.org/r/131411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib14a7cbc54e0317d7fa47f5569e54f5e0381613c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Cite
Gerrit-Branch: master
Gerrit-Owner: TheDJ
Gerrit-Reviewer: Bartosz Dziewoński
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Trigger link search also when selecting using the keyboard - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141292
Change subject: Trigger link search also when selecting using the keyboard
..
Trigger link search also when selecting using the keyboard
Bug: 66956
Change-Id: Ibef6a5fdb69dd3f5fdb5730e8debf197861039eb
---
M modules/translation/ext.cx.translation.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/92/141292/1
diff --git a/modules/translation/ext.cx.translation.js
b/modules/translation/ext.cx.translation.js
index 033ab8b..f85ddc3 100644
--- a/modules/translation/ext.cx.translation.js
+++ b/modules/translation/ext.cx.translation.js
@@ -143,7 +143,7 @@
// Calculate the progress of the translation
this.calculateCompletion();
mw.hook( 'mw.cx.translation.change' ).fire();
- $section.on( 'click', function () {
+ $section.on( 'click keyup', function () {
var selection = window.getSelection().toString();
if ( selection ) {
mw.hook( 'mw.cx.search.link' ).fire(
selection.toLowerCase() );
--
To view, visit https://gerrit.wikimedia.org/r/141292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibef6a5fdb69dd3f5fdb5730e8debf197861039eb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup some integer type conversion warnings - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Cleanup some integer type conversion warnings
..
Cleanup some integer type conversion warnings
* NSInteger is 'int' on 32-bit and 'long' on 64-bit, so there were
some fun warnings about usage in formatting strings where %d was
being used when building for 64-bit device
* Some warnings about enum types
Change-Id: I4bea97dc4b80e44ed63336132100ce4440658e0c
---
M wikipedia/Categories/NSString+Extras.m
M wikipedia/Categories/NSString+FormattedAttributedString.m
M wikipedia/Categories/Section+DisplayHtml.m
M wikipedia/View Controllers/ModalOverlay/ModalContentViewController.m
M wikipedia/View Controllers/Navigation/Secondary/SecondaryMenuViewController.m
M wikipedia/View Controllers/WebView/WebViewController.m
6 files changed, 18 insertions(+), 18 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/Categories/NSString+Extras.m
b/wikipedia/Categories/NSString+Extras.m
index 74fc208..c1c5ed0 100644
--- a/wikipedia/Categories/NSString+Extras.m
+++ b/wikipedia/Categories/NSString+Extras.m
@@ -23,7 +23,7 @@
}
uint8_t digest[CC_SHA1_DIGEST_LENGTH];
-CC_SHA1(data.bytes, data.length, digest);
+CC_SHA1(data.bytes, (unsigned int)data.length, digest);
NSMutableString *output = [NSMutableString
stringWithCapacity:CC_SHA1_DIGEST_LENGTH * 2];
for (int i = 0; i < CC_SHA1_DIGEST_LENGTH; i++)
diff --git a/wikipedia/Categories/NSString+FormattedAttributedString.m
b/wikipedia/Categories/NSString+FormattedAttributedString.m
index cc320ea..6093dd6 100644
--- a/wikipedia/Categories/NSString+FormattedAttributedString.m
+++ b/wikipedia/Categories/NSString+FormattedAttributedString.m
@@ -15,7 +15,7 @@
for (NSUInteger i = 0; i < substitutionStrings.count; i++) {
NSRegularExpression *regex =
-[NSRegularExpression regularExpressionWithPattern: [NSString
stringWithFormat:@"\\$%d+", i + 1]
+[NSRegularExpression regularExpressionWithPattern: [NSString
stringWithFormat:@"\\$%lu+", (unsigned long)i + 1]
options: 0
error: nil];
NSArray *matches =
diff --git a/wikipedia/Categories/Section+DisplayHtml.m
b/wikipedia/Categories/Section+DisplayHtml.m
index 854963a..318b1e7 100644
--- a/wikipedia/Categories/Section+DisplayHtml.m
+++ b/wikipedia/Categories/Section+DisplayHtml.m
@@ -13,16 +13,16 @@
return
[NSString stringWithFormat:@"\
-\
+\
%@\
-\
+\
%@\
\
\
",
- self.sectionId.integerValue,
+ (long)self.sectionId.integerValue,
(isMainPage ? @"" : [self getHeaderTag:isMainPage]),
- self.sectionId.integerValue,
+ (long)self.sectionId.integerValue,
self.html
];
}
@@ -39,17 +39,17 @@
return
[NSString stringWithFormat:@"\
-\
+\
%@\
%@\
-\
+\
",
-headingTagSize,
-self.sectionId.integerValue,
+(long)headingTagSize,
+(long)self.sectionId.integerValue,
self.anchor,
title,
pencilAnchor,
-headingTagSize
+(long)headingTagSize
];
}
@@ -78,8 +78,8 @@
-(NSString *)getEditPencilAnchor
{
return [NSString stringWithFormat:
-@"",
-self.sectionId.integerValue];
+@"",
+(long)self.sectionId.integerValue];
}
@end
diff --git a/wikipedia/View
Controllers/ModalOverlay/ModalContentViewController.m b/wikipedia/View
Controllers/ModalOverlay/ModalContentViewController.m
index 124c413..9e2862b 100644
--- a/wikipedia/View Controllers/ModalOverlay/ModalContentViewController.m
+++ b/wikipedia/View Controllers/ModalOverlay/ModalContentViewController.m
@@ -64,7 +64,7 @@
[invocation invoke];
NSUInteger destNavBarMode;
[invocation getReturnValue:&destNavBarMode];
-self.navBarMode = destNavBarMode;
+self.navBarMode = (NavBarMode)destNavBarMode;
}
selector = NSSelectorFromString(@"navBarStyle");
@@ -76,7 +76,7 @@
[invocation invoke];
NSUInteger destNavBarStyle;
[invocation getReturnValue:&destNavBarStyle];
-self.navBarStyle = destNavBarStyle;
+self.navBarStyle = (NavBarStyle)destNavBarStyle;
}
}
diff --git a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
index 0e1963f..27b2e56 100644
--- a/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
+++ b/wikipedia/View
Controllers/Navigation/Secondary/SecondaryMenuViewController.m
@@ -195,7 +195,7 @@
-(SecondaryMenuRowIndex)getIndexOfRow:(NSDictionary *)row
{
-return ((NSNumber *)row[@"tag"]).integ
[MediaWiki-commits] [Gerrit] Automatically run "npm install" when building the app - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Automatically run "npm install" when building the app
..
Automatically run "npm install" when building the app
Otherwise, grunt will exit with a non-helpful error message. After
the first run, npm won't do anything.
Also document that nodejs/npm are required to build.
Change-Id: Ic3f3039856ec6642b8077912be9fad9a61992ddf
---
M README.md
M scripts/run-grunt.sh
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/README.md b/README.md
index 7d56763..704acd6 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
Note that due to Apple's restrictions on iOS app installation, to run a custom
build on a standard iOS device you must pay for a [developer account with
Apple](https://developer.apple.com/devcenter/ios/index.action) and register the
device with your account.
+You'll also need to install [nodejs](http://nodejs.org/) and npm.
# Running tests
diff --git a/scripts/run-grunt.sh b/scripts/run-grunt.sh
index 01f45a2..be5a9ce 100755
--- a/scripts/run-grunt.sh
+++ b/scripts/run-grunt.sh
@@ -3,6 +3,7 @@
PATH=${PATH}:/usr/local/bin
cd "www/" && {
+npm install
grunt
}
--
To view, visit https://gerrit.wikimedia.org/r/141281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3f3039856ec6642b8077912be9fad9a61992ddf
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Legoktm
Gerrit-Reviewer: Brion VIBBER
Gerrit-Reviewer: Mhurd
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the updated method for ReadingActionFunnel (alt event lo... - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged. Change subject: Use the updated method for ReadingActionFunnel (alt event logging) .. Use the updated method for ReadingActionFunnel (alt event logging) Change-Id: I0ec7448ad9d9c6dfcacdb9d9040d4f1195820d0a --- M wikipedia/Data/Operations/DownloadSectionsOp.m M wikipedia/EventLogging/ReadingActionFunnel.h 2 files changed, 8 insertions(+), 1 deletion(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/Data/Operations/DownloadSectionsOp.m b/wikipedia/Data/Operations/DownloadSectionsOp.m index ff98fde..2d35e3d 100644 --- a/wikipedia/Data/Operations/DownloadSectionsOp.m +++ b/wikipedia/Data/Operations/DownloadSectionsOp.m @@ -7,7 +7,7 @@ #import "NSURLRequest+DictionaryRequest.h" #import "NSString+Extras.h" #import "NSObject+Extras.h" - +#import "ReadingActionFunnel.h" @implementation DownloadSectionsOp @@ -42,6 +42,9 @@ //(if there's more than a single section). params[@"sections"] = @"0"; + +ReadingActionFunnel *funnel = [[ReadingActionFunnel alloc] init]; +params[@"appInstallID"] = funnel.appInstallID; } self.request = [NSURLRequest getRequestWithURL: [[SessionSingleton sharedInstance] urlForDomain:domain] diff --git a/wikipedia/EventLogging/ReadingActionFunnel.h b/wikipedia/EventLogging/ReadingActionFunnel.h index fea0c76..c0123ad 100644 --- a/wikipedia/EventLogging/ReadingActionFunnel.h +++ b/wikipedia/EventLogging/ReadingActionFunnel.h @@ -12,6 +12,10 @@ @property NSString *appInstallID; +/** + * Note this method is not actually used; the appInstallID key is instead + * sent with the 'action=mobileview' API request on a fresh page read. + */ -(void)logSomethingHappened; @end -- To view, visit https://gerrit.wikimedia.org/r/141274 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0ec7448ad9d9c6dfcacdb9d9040d4f1195820d0a Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Brion VIBBER Gerrit-Reviewer: Brion VIBBER ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update to CSS - change (apps...wikipedia)
Brion VIBBER has submitted this change and it was merged.
Change subject: Update to CSS
..
Update to CSS
Change-Id: Ie5a6d3e45fae45dc21d34b45d67f669854ab910c
---
M wikipedia/assets/abusefilter.css
M wikipedia/assets/preview.css
M wikipedia/assets/styles.css
3 files changed, 15 insertions(+), 0 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/assets/abusefilter.css b/wikipedia/assets/abusefilter.css
index 89b5850..8ddf0bf 100644
--- a/wikipedia/assets/abusefilter.css
+++ b/wikipedia/assets/abusefilter.css
@@ -94,6 +94,11 @@
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
+div#centralNotice {
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ box-sizing: content-box;
+}
button {
border: none;
background-color: transparent;
diff --git a/wikipedia/assets/preview.css b/wikipedia/assets/preview.css
index d792df7..cadde49 100644
--- a/wikipedia/assets/preview.css
+++ b/wikipedia/assets/preview.css
@@ -94,6 +94,11 @@
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
+div#centralNotice {
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ box-sizing: content-box;
+}
button {
border: none;
background-color: transparent;
diff --git a/wikipedia/assets/styles.css b/wikipedia/assets/styles.css
index 89b5850..8ddf0bf 100644
--- a/wikipedia/assets/styles.css
+++ b/wikipedia/assets/styles.css
@@ -94,6 +94,11 @@
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
+div#centralNotice {
+ -moz-box-sizing: content-box;
+ -webkit-box-sizing: content-box;
+ box-sizing: content-box;
+}
button {
border: none;
background-color: transparent;
--
To view, visit https://gerrit.wikimedia.org/r/141270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5a6d3e45fae45dc21d34b45d67f669854ab910c
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER
Gerrit-Reviewer: Brion VIBBER
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Security fix - change (mediawiki...Vine)
Cook879 has uploaded a new change for review. https://gerrit.wikimedia.org/r/141291 Change subject: Security fix .. Security fix Passed the value of the size parameter straight to the output without validating, leaving an xss hole. This should fix that issue. Change-Id: Iead26a54a34babe1b580d64d98fff2357e5731e5 --- M Vine.php 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Vine refs/changes/91/141291/1 diff --git a/Vine.php b/Vine.php index 98b9590..02fd7ed 100644 --- a/Vine.php +++ b/Vine.php @@ -4,7 +4,7 @@ * * @file * @ingroup Extensions - * @version 1.1 + * @version 1.1.1 * @author Richard Cook * @copyright Copyright © 2014 Richard Cook * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 3.0 or later @@ -18,7 +18,7 @@ // Extension credits that will show up on Special:Version $wgExtensionCredits['parserhook'][] = array( 'name' => 'Vine', - 'version' => '1.0', + 'version' => '1.1.1', 'author' => '[http://www.shoutwiki.com/wiki/User:Cook879 Richard Cook]', 'url' => 'http://www.mediawiki.com/wiki/Extension:Vine', 'description' => 'Adds atag to add Vine posts to your site' @@ -45,7 +45,7 @@ $type = 'postcard'; } - if ( !empty( $args['size'] ) ) { + if ( !empty( $args['size'] ) && filter_var( $args['size'], FILTER_VALIDATE_INT, array( 'options' => array( 'min-range' => 0 ) ) ) ) { $size = $args['size']; } -- To view, visit https://gerrit.wikimedia.org/r/141291 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iead26a54a34babe1b580d64d98fff2357e5731e5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Vine Gerrit-Branch: master Gerrit-Owner: Cook879 ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] re-order keys: put 'en', 'qqq' on top - change (pywikibot/core)
Xqt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141290
Change subject: re-order keys: put 'en', 'qqq' on top
..
re-order keys: put 'en', 'qqq' on top
Change-Id: I17c17ab64bc8fdab7c0859e66899e17cbf802b84
---
M scripts/maintenance/make_i18n_dict.py
1 file changed, 14 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/90/141290/1
diff --git a/scripts/maintenance/make_i18n_dict.py
b/scripts/maintenance/make_i18n_dict.py
index 452ba61..3292d11 100644
--- a/scripts/maintenance/make_i18n_dict.py
+++ b/scripts/maintenance/make_i18n_dict.py
@@ -43,7 +43,13 @@
def print_all(self):
keys = self.dict.keys()
+keys.remove('qqq')
keys.sort()
+keys.insert(0, 'qqq')
+if 'en' in keys:
+keys.remove('en')
+keys.insert(0, 'en')
+
print "# -*- coding: utf-8 -*-"
print "msg = {"
for code in keys:
@@ -58,20 +64,22 @@
def read(self, item):
msg = getattr(self.script, item)
-self.keys = msg.keys()
-self.keys.append('qqq')
-self.keys.sort()
-for code in self.keys:
+keys = msg.keys()
+keys.append('qqq')
+for code in keys:
label = "%s-%s" % (self.scriptname, item)
if code == 'qqq':
if code not in self.dict:
self.dict[code] = {}
-self.dict[code][label] = \
-u'Edit summary for %s report' % self.scriptname
+self.dict[code][label] = (
+u'Edit summary for message %s of %s report'
+% (self.scriptname, item))
elif code != 'commons':
if code not in self.dict:
self.dict[code] = {}
self.dict[code][label] = msg[code]
+if 'en' not in keys:
+print 'WARNING: "en" key missing for message %s' % item
def run(self):
for msg in self.messages:
--
To view, visit https://gerrit.wikimedia.org/r/141290
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17c17ab64bc8fdab7c0859e66899e17cbf802b84
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Do not remove imported packages - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141289
Change subject: Do not remove imported packages
..
Do not remove imported packages
Imported modules were hidden in 2009, as part of a large cleanup of the
symbols exported by config.py
https://mediawiki.org/wiki/Special:Code/pywikipedia/4285
While there is benefit in hiding symbols not intended to be public,
hiding the imported modules is not beneficial as it is unlikely that
any config value will be of type module, so they can be differentiated,
and indeed they were already skipped in 'list of config options' code.
https://mediawiki.org/wiki/Special:Code/pywikipedia/4887
The removal of symbols __sys and os currently cause pyflakes error F821.
While this isnt a functional problem, it does prevent reflection and
inspection of the loaded python code, and is unecessary.
Also moved platform import into the only code block that uses it,
meaning it wont be loaded on many systems.
Also removed 're' import, as it was unused.
Change-Id: I783fba623a2825af3273ecad286d47e897c2a674
---
M pywikibot/config2.py
1 file changed, 15 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/89/141289/1
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 6cca983..37579ad 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -9,9 +9,7 @@
#
import os
-import sys as __sys
-import re
-import platform
+import sys
# IMPORTANT:
# Do not change any of the variables in this file. Instead, make
@@ -121,18 +119,19 @@
"""
NAME = "pywikibot"
-for arg in __sys.argv[1:]:
+for arg in sys.argv[1:]:
if arg.startswith("-dir:"):
base_dir = arg[5:]
-__sys.argv.remove(arg)
+sys.argv.remove(arg)
break
else:
if "PYWIKIBOT2_DIR" in os.environ:
base_dir = os.environ["PYWIKIBOT2_DIR"]
else:
-is_windows = __sys.platform == 'win32'
+is_windows = sys.platform == 'win32'
home = os.path.expanduser("~")
if is_windows:
+import platform
_win_version = int(platform.version()[0])
if _win_version == 5:
base_dir = os.path.join(home, "Application Data", NAME)
@@ -194,7 +193,7 @@
# This default code should work fine, so you don't have to think about it.
# TODO: consider getting rid of this config variable.
try:
-console_encoding = __sys.stdout.encoding
+console_encoding = sys.stdout.encoding
except:
# When using pywikibot inside a daemonized twisted application,
# we get "StdioOnnaStick instance has no attribute 'encoding'"
@@ -250,7 +249,7 @@
# ANSI colors.
try:
# Don't print colorized when the output is, for example, piped to a file.
-colorized_output = __sys.stdout.isatty()
+colorized_output = sys.stdout.isatty()
except:
colorized_output = False
@@ -258,7 +257,7 @@
# The command for the editor you want to use. If set to None, a simple Tkinter
# editor will be used.
# On Windows systems, this script tries to determine the default text editor.
-if __sys.platform == 'win32':
+if sys.platform == 'win32':
try:
import _winreg
_key1 = _winreg.OpenKey(_winreg.HKEY_CURRENT_USER,
@@ -643,7 +642,6 @@
from hol...@trillke.net 2002/03/18
"""
-import os
dpath = os.path.normpath(os.path.dirname(path))
if not os.path.exists(dpath):
os.makedirs(dpath)
@@ -658,13 +656,11 @@
directories in the path that do not already exist are created.
"""
-import os.path
return makepath(os.path.join(base_dir, *filename))
def shortpath(path):
"""Return a file path relative to config.base_dir."""
-import os.path
if path.startswith(base_dir):
return path[len(base_dir) + len(os.path.sep):]
return path
@@ -687,8 +683,8 @@
_filestatus = os.stat(_filename)
_filemode = _filestatus[0]
_fileuid = _filestatus[4]
-if __sys.platform == 'win32' or _fileuid in [os.getuid(), 0]:
-if __sys.platform == 'win32' or _filemode & 0o02 == 0 or True:
+if sys.platform == 'win32' or _fileuid in [os.getuid(), 0]:
+if sys.platform == 'win32' or _filemode & 0o02 == 0 or True:
exec(compile(open(_filename).read(), _filename, 'exec'))
else:
print("WARNING: Skipped '%(fn)s': writeable by others."
@@ -724,14 +720,14 @@
# Fix up default console_encoding
if console_encoding is None:
-if __sys.platform == 'win32':
+if sys.platform == 'win32':
console_encoding = 'cp850'
else:
console_encoding = 'iso-8859-1'
# Fix up transliteration_target
if transliteration_target == 'not set':
-if __sys.platform == 'win32':
+if sys.platform == 'win32':
[MediaWiki-commits] [Gerrit] config command line option 'modified' fails - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141288
Change subject: config command line option 'modified' fails
..
config command line option 'modified' fails
- move global name 'base_dir' before the population of _glv
- delete variable 'ov' which is used only in a procedural block
that is executed in the global scope
Bug 66950
Change-Id: I482ce11abd1a0a6b078ef489ee1256fde2320758
---
M pywikibot/config2.py
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/88/141288/1
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 6cca983..4b30df4 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -160,6 +160,8 @@
return base_dir
_base_dir = _get_base_dir()
+# Save base_dir for use by other modules
+base_dir = _base_dir
family_files = {}
@@ -716,7 +718,7 @@
print("WARNING: Type of '%(_key)s' changed" % locals())
print(" %(was)s: %(old)s" % {'was': "Was", 'old': ot})
print(" %(now)s: %(new)s" % {'now': "Now", 'new': nt})
-del nt, ot
+del nt, ot, ov
else:
print(("WARNING: "
"Configuration variable %(_key)r is defined but unknown.\n"
@@ -741,9 +743,6 @@
transliteration_target = None
elif transliteration_target in ('None', 'none'):
transliteration_target = None
-
-# Save base_dir for use by other modules
-base_dir = _base_dir
#
--
To view, visit https://gerrit.wikimedia.org/r/141288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I482ce11abd1a0a6b078ef489ee1256fde2320758
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed primary hostname to support custom Return-Path - change (operations/puppet)
01tonythomas has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141287
Change subject: Removed primary hostname to support custom Return-Path
..
Removed primary hostname to support custom Return-Path
* Required to implement VERP
* Now, Return-Path is fetched from the $headers[ 'Return-Path' ]
* Helps in identifying failing recipients
Needed By: I9463ae33ae327405725ea9693d45ad61b8ecf798
Change-Id: Ibb88a6cfd762f834340f6362fe70ea7e6c838b37
---
M templates/mail/exim4.minimal.erb
1 file changed, 5 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/141287/1
diff --git a/templates/mail/exim4.minimal.erb b/templates/mail/exim4.minimal.erb
index b0e37cb..0116796 100644
--- a/templates/mail/exim4.minimal.erb
+++ b/templates/mail/exim4.minimal.erb
@@ -23,6 +23,9 @@
log_selector = +address_rewrite +all_parents +delivery_size +deliver_time
+incoming_interface +incoming_port +smtp_confirmation +smtp_protocol_error
+smtp_syntax_error
message_logs = false
+# Return Path
+return_path_remove = false
+
begin routers
# Catch unqualified e-mail addresses from MediaWiki
@@ -49,7 +52,8 @@
wiki_mail:
driver = manualroute
condition = ${if eqi{$header_X-Mailer:}{MediaWiki mailer}}
- errors_to = w...@wikimedia.org
+ errors_to = ${if def:h_return-path: {${address:$h_return-path:}} fail}
+ headers_remove = return-path
transport = remote_smtp
route_list = * <%= exim_mediawiki_route_list %>
@@ -74,10 +78,3 @@
* * F,2h,5m; F,1d,15m
-
-begin rewrite
-
-# Rewrite the envelope From for mails from internal servers in *.wmnet,
-# as they are usually rejected by sender domain address verification.
-
-*@$primary_hostnamer...@wikimedia.org F
--
To view, visit https://gerrit.wikimedia.org/r/141287
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb88a6cfd762f834340f6362fe70ea7e6c838b37
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 01tonythomas <01tonytho...@gmail.com>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] add support for pagefromfile - change (translatewiki)
Xqt has uploaded a new change for review. https://gerrit.wikimedia.org/r/141286 Change subject: add support for pagefromfile .. add support for pagefromfile Change-Id: I49c0392a141bf2738f3fe85a153bd03668c18533 --- M groups/Pywikibot/Pywikibot.yaml 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/86/141286/1 diff --git a/groups/Pywikibot/Pywikibot.yaml b/groups/Pywikibot/Pywikibot.yaml index e7a8e0f..0639078 100644 --- a/groups/Pywikibot/Pywikibot.yaml +++ b/groups/Pywikibot/Pywikibot.yaml @@ -276,6 +276,14 @@ definitionFile: %GROUPROOT%/pywikibot/noreferences.py --- BASIC: + id: out-pywikipedia-pagefromfile + label: Pywikibot Page from File + +FILES: + sourcePattern: %GROUPROOT%/pywikibot/pagefromfile.py + definitionFile: %GROUPROOT%/pywikibot/pagefromfile.py +--- +BASIC: id: out-pywikipedia-pywikibot label: Pywikibot Pywikibot -- To view, visit https://gerrit.wikimedia.org/r/141286 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I49c0392a141bf2738f3fe85a153bd03668c18533 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] New Wikidata Build - 22/06/2014 10:00 - change (mediawiki...Wikidata)
WikidataBuilder has uploaded a new change for review. https://gerrit.wikimedia.org/r/141285 Change subject: New Wikidata Build - 22/06/2014 10:00 .. New Wikidata Build - 22/06/2014 10:00 Change-Id: I92f15b86dd72a1901aa45ec2e89a271935cf2ea4 --- M composer.lock M extensions/ValueView/README.md M extensions/ValueView/lib/jquery.ui/jquery.ui.suggester.js M extensions/Wikibase/client/WikibaseClient.i18n.magic.php M extensions/Wikibase/client/i18n/es.json M extensions/Wikibase/client/i18n/fa.json M extensions/Wikibase/client/i18n/qu.json M extensions/Wikibase/client/i18n/ro.json M extensions/Wikibase/client/i18n/zh-hans.json M extensions/Wikibase/client/includes/ChangeHandler.php M extensions/Wikibase/client/includes/WikibaseClient.php M extensions/Wikibase/client/includes/store/sql/DirectSqlStore.php M extensions/Wikibase/client/resources/jquery.wikibase/jquery.wikibase.linkitem.js M extensions/Wikibase/client/tests/phpunit/includes/ChangeHandlerTest.php M extensions/Wikibase/client/tests/phpunit/includes/ReferencedPagesFinderTest.php M extensions/Wikibase/client/tests/phpunit/includes/SiteLinkCommentCreatorTest.php M extensions/Wikibase/client/tests/phpunit/includes/WikibaseClientTest.php M extensions/Wikibase/client/tests/phpunit/includes/hooks/OtherProjectsSidebarGeneratorTest.php M extensions/Wikibase/client/tests/phpunit/includes/scribunto/WikibaseLuaEntityBindingsTest.php M extensions/Wikibase/client/tests/phpunit/includes/store/sql/DirectSqlStoreTest.php M extensions/Wikibase/composer.json M extensions/Wikibase/docs/options.wiki M extensions/Wikibase/lib/WikibaseLib.hooks.php M extensions/Wikibase/lib/i18n/fa.json M extensions/Wikibase/lib/includes/EntityFactory.php M extensions/Wikibase/lib/includes/changes/EntityChange.php A extensions/Wikibase/lib/includes/changes/EntityChangeFactory.php M extensions/Wikibase/lib/includes/formatters/EntityIdHtmlLinkFormatter.php M extensions/Wikibase/lib/includes/formatters/MwTimeIsoFormatter.php A extensions/Wikibase/lib/includes/serializers/ForbiddenSerializer.php A extensions/Wikibase/lib/includes/serializers/LegacyInternalEntitySerializer.php M extensions/Wikibase/lib/includes/serializers/SnakSerializer.php M extensions/Wikibase/lib/includes/store/EntityContentDataCodec.php M extensions/Wikibase/lib/includes/store/sql/PropertyInfoTable.php M extensions/Wikibase/lib/includes/store/sql/WikiPageEntityLookup.php M extensions/Wikibase/lib/maintenance/dispatchChanges.php M extensions/Wikibase/lib/resources/Resources.php M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.entityselector.js M extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.wbtooltip.js M extensions/Wikibase/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.entityselector.css M extensions/Wikibase/lib/tests/phpunit/MockRepository.php M extensions/Wikibase/lib/tests/phpunit/MockRepositoryTest.php M extensions/Wikibase/lib/tests/phpunit/WikibaseDataTypeBuildersTest.php A extensions/Wikibase/lib/tests/phpunit/changes/EntityChangeFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/changes/EntityChangeTest.php M extensions/Wikibase/lib/tests/phpunit/changes/ItemChangeTest.php M extensions/Wikibase/lib/tests/phpunit/changes/TestChanges.php M extensions/Wikibase/lib/tests/phpunit/entity/EntityFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/CommonsLinkFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/DispatchingSnakFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/DispatchingValueFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/EscapingValueFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/GlobeCoordinateDetailsFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/HtmlTimeFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/HtmlUrlFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/MessageSnakFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/MonolingualHtmlFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/MonolingualTextFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/MwTimeIsoFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/OutputFormatSnakFormatterFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/OutputFormatValueFormatterFactoryTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/PropertyValueSnakFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/QuantityDetailsFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/TimeDetailsFormatterTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/WikibaseSnakFormatterBuildersTest.php M extensions/Wikibase/lib/tests/phpunit/formatters/WikibaseValueFormatterBuildersTest.php M extensions/Wikibase/lib/tests/phpunit/serializers/EntitySerializerBaseTest.ph
[MediaWiki-commits] [Gerrit] Use new OutputPageScriptsForBottomQueue hook - change (mediawiki...GlobalCssJs)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141284
Change subject: Use new OutputPageScriptsForBottomQueue hook
..
Use new OutputPageScriptsForBottomQueue hook
Bug: 62602
Change-Id: Ie70903f0491c76ee776518d8268e5a3e351daec7
Depends-On: Ifccac7889e80b2f674cd54bb4ad3e53c6aa1dfa1
---
M GlobalCssJs.hooks.php
M GlobalCssJs.php
2 files changed, 13 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalCssJs
refs/changes/84/141284/1
diff --git a/GlobalCssJs.hooks.php b/GlobalCssJs.hooks.php
index 5077b67..f99d64a 100644
--- a/GlobalCssJs.hooks.php
+++ b/GlobalCssJs.hooks.php
@@ -3,28 +3,24 @@
class GlobalCssJsHooks {
/**
-* @param &$out OutputPage
-* @param &$skin Skin
+* @param OutputPage $out
+* @param array $links
+* @param bool $inHead
* @return bool
*/
- static function onBeforePageDisplay( &$out, &$skin ) {
- global $wgGlobalCssJsConfig, $wgUseGlobalSiteCssJs;
+ static function onOutputPageScriptsForBottomQueue( OutputPage $out,
array &$links, $inHead ) {
+ global $wgUseGlobalSiteCssJs;
if ( $wgUseGlobalSiteCssJs ) {
- // Global site modules are loaded for everyone, if
enabled
- $out->addModules( 'ext.globalCssJs.site' );
+ $links[] = $out->makeResourceLoaderLink(
'ext.globalCssJs.site', ResourceLoaderModule::TYPE_COMBINED,
+ /* $useESI = */ false, /* $extraQuery = */
array(), /* $loadCall = */ $inHead
+ );
}
- $user = $out->getUser();
- // Only load user modules for logged in users
- if ( $user->isAnon() ) {
- return true;
- }
-
- // If we are on a different site, use a hook to allow other
extensions
- // like CentralAuth verify that the same account exists on both
sites
- if ( self::loadForUser( $user ) ) {
- $out->addModules( 'ext.globalCssJs.user' );
+ if ( !$out->getUser()->isAnon() && self::loadForUser(
$out->getUser() ) ) {
+ $links[] = $out->makeResourceLoaderLink(
'ext.globalCssJs.user', ResourceLoaderModule::TYPE_COMBINED,
+ /* $useESI = */ false, /* $extraQuery = */
array(), /* $loadCall = */ $inHead
+ );
}
return true;
diff --git a/GlobalCssJs.php b/GlobalCssJs.php
index c3f00da..8a0f105 100644
--- a/GlobalCssJs.php
+++ b/GlobalCssJs.php
@@ -60,7 +60,7 @@
}
};
-$wgHooks['BeforePageDisplay'][] = 'GlobalCssJsHooks::onBeforePageDisplay';
+$wgHooks['OutputPageScriptsForBottomQueue'][] =
'GlobalCssJsHooks::onOutputPageScriptsForBottomQueue';
$wgHooks['ResourceLoaderRegisterModules'][] =
'GlobalCssJsHooks::onResourceLoaderRegisterModules';
$wgHooks['EditPage::showEditForm:initial'][] =
'GlobalCssJsHooks::onEditPageshowEditForminitial';
$wgHooks['GetPreferences'][] = 'GlobalCssJsHooks::onGetPreferences';
--
To view, visit https://gerrit.wikimedia.org/r/141284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie70903f0491c76ee776518d8268e5a3e351daec7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalCssJs
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Various improvements - change (mediawiki...MassMessage)
Wctaiwan has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141283
Change subject: [WIP] Various improvements
..
[WIP] Various improvements
* Separate errors for nonexistent and invalid pages
* Add checks for external targets where forbidden in validation
* Improve target construction
* Other minor changes
Change-Id: Ie9a9497b874707e0484e6533f1a683c7abe19c35
TODO: Improve validation in SpecialEditMassMessageList
---
M i18n/en.json
M i18n/qqq.json
M includes/MassMessage.php
M includes/content/MassMessageListContent.php
M includes/content/MassMessageListContentHandler.php
5 files changed, 26 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage
refs/changes/83/141283/1
diff --git a/i18n/en.json b/i18n/en.json
index 028ac36..edda76d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -17,7 +17,8 @@
"massmessage-fieldset-preview": "Preview",
"massmessage-submitted": "Your message delivery to {{PLURAL:$1|$1
page|$1 pages}} has been queued.",
"massmessage-just-preview": "This is just a preview. Press
\"{{int:massmessage-form-submit}}\" to send the message.",
- "massmessage-spamlist-doesnotexist": "The specified page-list page does
not exist.",
+ "massmessage-spamlist-doesnotexist": "The specified delivery list page
or category does not exist.",
+ "massmessage-spamlist-invalid": "The specified page does not contain a
valid delivery list.",
"massmessage-empty-subject": "The subject line is empty.",
"massmessage-empty-message": "The message body is empty.",
"massmessage-unescaped-langlinks": "Warning: There are unescaped
language links in your message.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 920b81e..558b656 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -18,7 +18,8 @@
"massmessage-fieldset-preview": "Label for the fieldset box around the
page preview.\n{{Identical|Preview}}",
"massmessage-submitted": "Confirmation message the user sees after the
form is submitted successfully and the request is queued in the job
queue.\n\nParameters:\n* $1 - the number of deliveries that have been queued",
"massmessage-just-preview": "Warning to user that what they are seeing
is just a preview, and they should hit the send button to actually submit
it.\n\nRefers to {{msg-mw|Massmessage-form-submit}}.",
- "massmessage-spamlist-doesnotexist": "Error message the user sees if an
invalid spamlist is provided.\n\nThe spamlist is the page containing list of
pages to leave a message on.\n\nThis message probably means that said page, as
provided by the user, does not exist.",
+ "massmessage-spamlist-doesnotexist": "Error message the user sees if
the delivery list page or category they entered does not exist.",
+ "massmessage-spamlist-invalid": "Error message the user sees if the
delivery list page they entered is invalid.",
"massmessage-empty-subject": "Error message the user sees if the
\"subject\" field is empty.",
"massmessage-empty-message": "Error message the user sees if the
\"message\" field is empty.",
"massmessage-unescaped-langlinks": "Warning shown to user when
previewing if their message text has unescaped language links.",
diff --git a/includes/MassMessage.php b/includes/MassMessage.php
index 717934a..de78f73 100644
--- a/includes/MassMessage.php
+++ b/includes/MassMessage.php
@@ -185,10 +185,15 @@
* @return array
*/
public static function getMassMessageListContentTargets ( Title
$spamlist ) {
+ global $wgServer;
+
$targets = Revision::newFromTitle( $spamlist
)->getContent()->getTargets();
- foreach ( $targets as $index => &$target ) {
+ foreach ( $targets as &$target ) {
if ( !array_key_exists( 'site', $target ) ) {
+ $target['site'] = MassMessage::getBaseUrl(
$wgServer );
$target['wiki'] = wfWikiID();
+ } else {
+ $target['wiki'] = MassMessage::getDBName(
$target['site'] );
}
}
return self::normalizeTargets( $targets );
@@ -291,7 +296,7 @@
wfWikiID(),
$url
);
- } else {
+ } else { // $spamlist contains a message key for an error
message
$status->fatal( $spamlist );
}
@@ -326,17 +331,20 @@
// Page exists, follow a redirect if possible
$target = MassMessage::followRedirect( $spamlist );
if ( $target === null || !$target->exists() ) {
- return 'massmessage-spamlist-doesnotexist'; //
Interw
[MediaWiki-commits] [Gerrit] Add OutputPageScriptsForBottomQueue hook - change (mediawiki/core)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/141282 Change subject: Add OutputPageScriptsForBottomQueue hook .. Add OutputPageScriptsForBottomQueue hook This allows for extensions to add specific modules into the bottom queue. Hook subscribers would append to $links using OutputPage::makeResourceLoaderLink, which is now public. Bug: 62602 Change-Id: Ifccac7889e80b2f674cd54bb4ad3e53c6aa1dfa1 --- M docs/hooks.txt M includes/OutputPage.php 2 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/82/141282/1 diff --git a/docs/hooks.txt b/docs/hooks.txt index 80ac174..57bfd49 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1845,6 +1845,11 @@ $links: array, intended to hold the result. Must be an associative array with category types as keys and arrays of HTML links as values. +'OutputPageScriptsForBottomQueue': Allows adding modules to the bottom queue. +$out: OutputPage instance +&$links: Array of links containing return value of OutputPage::makeResourceLoaderLink +$inHead: Boolean, whether scripts are being loaded in the element. + 'PageContentInsertComplete': After a new article is created. $wikiPage: WikiPage created $user: User creating the article diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 612dc32..d1db59a 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2710,7 +2710,7 @@ * call rather than a "
[MediaWiki-commits] [Gerrit] Move implementations of Page to separate file - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Move implementations of Page to separate file .. Move implementations of Page to separate file Moved implementations of the Page interface, including subclasses of WikiPage and Article, to a separate /includes/page file. Separated PoolWorkArticleView to the includes/poolcounter file. Change-Id: I4557eab76e0cb12d9d7f93644c5831bdd5b472b0 --- M includes/AutoLoader.php R includes/page/Article.php R includes/page/CategoryPage.php R includes/page/ImagePage.php R includes/page/WikiCategoryPage.php R includes/page/WikiFilePage.php R includes/page/WikiPage.php A includes/poolcounter/PoolWorkArticleView.php 8 files changed, 220 insertions(+), 200 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 5442507..94264ae 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -32,7 +32,6 @@ 'AjaxDispatcher' => 'includes/AjaxDispatcher.php', 'AjaxResponse' => 'includes/AjaxResponse.php', 'AlphabeticPager' => 'includes/Pager.php', - 'Article' => 'includes/Article.php', 'AtomFeed' => 'includes/Feed.php', 'AuthPlugin' => 'includes/AuthPlugin.php', 'AuthPluginUser' => 'includes/AuthPlugin.php', @@ -42,7 +41,6 @@ 'CacheHelper' => 'includes/CacheHelper.php', 'Category' => 'includes/Category.php', 'Categoryfinder' => 'includes/Categoryfinder.php', - 'CategoryPage' => 'includes/CategoryPage.php', 'CategoryViewer' => 'includes/CategoryViewer.php', 'ChangesFeed' => 'includes/ChangesFeed.php', 'ChangeTags' => 'includes/ChangeTags.php', @@ -112,9 +110,6 @@ 'ICacheHelper' => 'includes/CacheHelper.php', 'IcuCollation' => 'includes/Collation.php', 'IdentityCollation' => 'includes/Collation.php', - 'ImageHistoryList' => 'includes/ImagePage.php', - 'ImageHistoryPseudoPager' => 'includes/ImagePage.php', - 'ImagePage' => 'includes/ImagePage.php', 'ImageQueryPage' => 'includes/ImageQueryPage.php', 'ImportStreamSource' => 'includes/Import.php', 'ImportStringSource' => 'includes/Import.php', @@ -145,7 +140,6 @@ 'MWInit' => 'includes/Init.php', 'MWNamespace' => 'includes/Namespace.php', 'OutputPage' => 'includes/OutputPage.php', - 'Page' => 'includes/WikiPage.php', 'PageQueryPage' => 'includes/PageQueryPage.php', 'Pager' => 'includes/Pager.php', 'PasswordError' => 'includes/User.php', @@ -157,7 +151,7 @@ 'PoolCounterRedis' => 'includes/poolcounter/PoolCounterRedis.php', 'PoolCounterWork' => 'includes/poolcounter/PoolCounterWork.php', 'PoolCounterWorkViaCallback' => 'includes/poolcounter/PoolCounterWork.php', - 'PoolWorkArticleView' => 'includes/WikiPage.php', + 'PoolWorkArticleView' => 'includes/poolcounter/PoolWorkArticleView.php', 'Preferences' => 'includes/Preferences.php', 'PreferencesForm' => 'includes/Preferences.php', 'PrefixSearch' => 'includes/PrefixSearch.php', @@ -207,11 +201,8 @@ 'WebRequest' => 'includes/WebRequest.php', 'WebRequestUpload' => 'includes/WebRequest.php', 'WebResponse' => 'includes/WebResponse.php', - 'WikiCategoryPage' => 'includes/WikiCategoryPage.php', 'WikiExporter' => 'includes/Export.php', - 'WikiFilePage' => 'includes/WikiFilePage.php', 'WikiImporter' => 'includes/Import.php', - 'WikiPage' => 'includes/WikiPage.php', 'WikiRevision' => 'includes/Import.php', 'WikiMap' => 'includes/WikiMap.php', 'WikiReference' => 'includes/WikiMap.php', @@ -796,6 +787,17 @@ 'WinCacheBagOStuff' => 'includes/objectcache/WinCacheBagOStuff.php', 'XCacheBagOStuff' => 'includes/objectcache/XCacheBagOStuff.php', + # includes/page + 'Article' => 'includes/page/Article.php', + 'CategoryPage' => 'includes/page/CategoryPage.php', + 'ImageHistoryList' => 'includes/page/ImagePage.php', + 'ImageHistoryPseudoPager' => 'includes/page/ImagePage.php', + 'ImagePage' => 'includes/page/ImagePage.php', + 'Page' => 'includes/page/WikiPage.php', + 'WikiCategoryPage' => 'includes/page/WikiCategoryPage.php', + 'WikiFilePage' => 'includes/page/WikiFilePage.php', + 'WikiPage' => 'includes/page/WikiPage.php', + # includes/parser 'CacheTime' => 'includes/parser/CacheTime.php', 'CoreParserFunctions' => 'includes/parser/CoreParserFunctions.php', diff --git a/includes/Article.php b/includes/page/Article.php similarity index 100% rename from includes/Article.php rename to includes/page/Article.php diff --git a/includes/CategoryPage.php b/includes/page/CategoryPage.php similarity index 100% rename from includes/CategoryPage.php rename to i
[MediaWiki-commits] [Gerrit] Automatically run "npm install" when building the app - change (apps...wikipedia)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/141281
Change subject: Automatically run "npm install" when building the app
..
Automatically run "npm install" when building the app
Otherwise, grunt will exit with a non-helpful error message. After
the first run, npm won't do anything.
Also document that nodejs/npm are required to build.
Change-Id: Ic3f3039856ec6642b8077912be9fad9a61992ddf
---
M README.md
M scripts/run-grunt.sh
2 files changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/81/141281/1
diff --git a/README.md b/README.md
index 7d56763..704acd6 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@
Note that due to Apple's restrictions on iOS app installation, to run a custom
build on a standard iOS device you must pay for a [developer account with
Apple](https://developer.apple.com/devcenter/ios/index.action) and register the
device with your account.
+You'll also need to install [nodejs](http://nodejs.org/) and npm.
# Running tests
diff --git a/scripts/run-grunt.sh b/scripts/run-grunt.sh
index 01f45a2..be5a9ce 100755
--- a/scripts/run-grunt.sh
+++ b/scripts/run-grunt.sh
@@ -3,6 +3,7 @@
PATH=${PATH}:/usr/local/bin
cd "www/" && {
+npm install
grunt
}
--
To view, visit https://gerrit.wikimedia.org/r/141281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3f3039856ec6642b8077912be9fad9a61992ddf
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
