[MediaWiki-commits] [Gerrit] Merged BsGroupHelper: Temporary user group also works for lo... - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Merged BsGroupHelper: Temporary user group also works for
lockdown
..
Merged BsGroupHelper: Temporary user group also works for lockdown
* Added Title parameter
* Used $wgNamespacePermissionLockdown
Change-Id: I358bcdd537f35c15b8493de6c09b08ef40a019fe
---
M includes/utility/GroupHelper.class.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/utility/GroupHelper.class.php
b/includes/utility/GroupHelper.class.php
index 483c6c6..6abaa78 100644
--- a/includes/utility/GroupHelper.class.php
+++ b/includes/utility/GroupHelper.class.php
@@ -66,11 +66,13 @@
* @param Array $aPermissions
* @return boolean alway true - keeps the hook system running
*/
- public static function addTemporaryGroupToUser( $oUser, $sGroupName,
$aPermissions ) {
+ public static function addTemporaryGroupToUser( $oUser, $sGroupName,
$aPermissions, Title $oTitle = null ) {
global $wgGroupPermissions;
foreach ( $aPermissions as $sPermission ) {
$wgGroupPermissions[$sGroupName][$sPermission] = true;
+ if( is_null($oTitle) ||
!isset($GLOBALS['wgNamespacePermissionLockdown'])) continue;
+
$GLOBALS['wgNamespacePermissionLockdown'][$oTitle-getNamespace()][$sPermission][]
= $sGroupName;
}
self::$sTempGroup = $sGroupName;
--
To view, visit https://gerrit.wikimedia.org/r/180176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I358bcdd537f35c15b8493de6c09b08ef40a019fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merged BsGroupHelper: Temporary user group also works for lo... - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Merged BsGroupHelper: Temporary user group also works for
lockdown
..
Merged BsGroupHelper: Temporary user group also works for lockdown
* Added Title parameter
* Used $wgNamespacePermissionLockdown
Change-Id: I516379dd3c6c11583dd4024f7761b849cb959b84
---
M includes/utility/GroupHelper.class.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/utility/GroupHelper.class.php
b/includes/utility/GroupHelper.class.php
index 483c6c6..6abaa78 100644
--- a/includes/utility/GroupHelper.class.php
+++ b/includes/utility/GroupHelper.class.php
@@ -66,11 +66,13 @@
* @param Array $aPermissions
* @return boolean alway true - keeps the hook system running
*/
- public static function addTemporaryGroupToUser( $oUser, $sGroupName,
$aPermissions ) {
+ public static function addTemporaryGroupToUser( $oUser, $sGroupName,
$aPermissions, Title $oTitle = null ) {
global $wgGroupPermissions;
foreach ( $aPermissions as $sPermission ) {
$wgGroupPermissions[$sGroupName][$sPermission] = true;
+ if( is_null($oTitle) ||
!isset($GLOBALS['wgNamespacePermissionLockdown'])) continue;
+
$GLOBALS['wgNamespacePermissionLockdown'][$oTitle-getNamespace()][$sPermission][]
= $sGroupName;
}
self::$sTempGroup = $sGroupName;
--
To view, visit https://gerrit.wikimedia.org/r/180178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I516379dd3c6c11583dd4024f7761b849cb959b84
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Merged BsGroupHelper: Temporary user group also works for lo... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: Merged BsGroupHelper: Temporary user group also works for lockdown .. Merged BsGroupHelper: Temporary user group also works for lockdown * Added Title parameter * Used $wgNamespacePermissionLockdown * Wait until this dependency is merged: 180178 Change-Id: Ie5f75a34825383a6d75446d13b9c888dd8597f8a --- M ResponsibleEditors/ResponsibleEditors.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/ResponsibleEditors/ResponsibleEditors.class.php b/ResponsibleEditors/ResponsibleEditors.class.php index 51667a0..42942ee 100644 --- a/ResponsibleEditors/ResponsibleEditors.class.php +++ b/ResponsibleEditors/ResponsibleEditors.class.php @@ -211,7 +211,7 @@ $aAvailablePermissions = BsConfig::get( 'MW::ResponsibleEditors::AutoPermissions' ); if ( empty( $aAvailablePermissions ) ) return true; - BsGroupHelper::addTemporaryGroupToUser( $oUser, 'tmprespeditors', $aAvailablePermissions ); + BsGroupHelper::addTemporaryGroupToUser( $oUser, 'tmprespeditors', $aAvailablePermissions, $oTitle ); return true; } -- To view, visit https://gerrit.wikimedia.org/r/180179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie5f75a34825383a6d75446d13b9c888dd8597f8a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_23 Gerrit-Owner: Pwirth wi...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed a hardcoded path for the BlueSpice config files - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/189436 Change subject: Removed a hardcoded path for the BlueSpice config files .. Removed a hardcoded path for the BlueSpice config files Change-Id: I00a3b21811b4e746fab8c59d4679d4552baa7fbf (cherry picked from commit 1c92810b36f77ed7a87f7e6435b384b806d01a07) --- M includes/CoreHooks.php 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/36/189436/1 diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php index a2e41d8..21b78cd 100755 --- a/includes/CoreHooks.php +++ b/includes/CoreHooks.php @@ -11,7 +11,7 @@ $wgExtraNamespaces, $wgContentNamespaces, $wgNamespacesWithSubpages, $wgNamespacesToBeSearchedDefault, $wgLocalisationCacheConf, $wgAutoloadLocalClasses, $wgFlaggedRevsNamespaces, $wgNamespaceAliases, $wgVersion; - $sConfigPath = BSROOTDIR . DS . 'config'; + $sConfigPath = BSCONFIGDIR; $aConfigFiles = array( 'nm-settings.php', 'gm-settings.php', @@ -598,4 +598,4 @@ 'content' = $oProfilePageSettingsView ); } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/189436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I00a3b21811b4e746fab8c59d4679d4552baa7fbf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Lilu o0lilu0o1...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed a hardcoded path for the BlueSpice config files - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged. Change subject: Removed a hardcoded path for the BlueSpice config files .. Removed a hardcoded path for the BlueSpice config files Change-Id: I00a3b21811b4e746fab8c59d4679d4552baa7fbf --- M includes/CoreHooks.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php index 04069bd..a8467b9 100644 --- a/includes/CoreHooks.php +++ b/includes/CoreHooks.php @@ -11,7 +11,7 @@ $wgExtraNamespaces, $wgContentNamespaces, $wgNamespacesWithSubpages, $wgNamespacesToBeSearchedDefault, $wgLocalisationCacheConf, $wgAutoloadLocalClasses, $wgFlaggedRevsNamespaces, $wgNamespaceAliases, $wgVersion; - $sConfigPath = BSROOTDIR . DS . 'config'; + $sConfigPath = BSCONFIGDIR; $aConfigFiles = array( 'nm-settings.php', 'gm-settings.php', @@ -598,4 +598,4 @@ 'content' = $oProfilePageSettingsView ); } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/188988 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00a3b21811b4e746fab8c59d4679d4552baa7fbf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: REL1_23 Gerrit-Owner: Lilu o0lilu0o1...@gmail.com Gerrit-Reviewer: Jgoettlich goettl...@hallowelt.biz Gerrit-Reviewer: Lilu o0lilu0o1...@gmail.com Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Pwirth wi...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Tr4nt0r dennerl...@hallowelt.biz Gerrit-Reviewer: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed a hardcoded path for the BlueSpice config files - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged. Change subject: Removed a hardcoded path for the BlueSpice config files .. Removed a hardcoded path for the BlueSpice config files Change-Id: I00a3b21811b4e746fab8c59d4679d4552baa7fbf (cherry picked from commit 1c92810b36f77ed7a87f7e6435b384b806d01a07) --- M includes/CoreHooks.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php index a2e41d8..21b78cd 100755 --- a/includes/CoreHooks.php +++ b/includes/CoreHooks.php @@ -11,7 +11,7 @@ $wgExtraNamespaces, $wgContentNamespaces, $wgNamespacesWithSubpages, $wgNamespacesToBeSearchedDefault, $wgLocalisationCacheConf, $wgAutoloadLocalClasses, $wgFlaggedRevsNamespaces, $wgNamespaceAliases, $wgVersion; - $sConfigPath = BSROOTDIR . DS . 'config'; + $sConfigPath = BSCONFIGDIR; $aConfigFiles = array( 'nm-settings.php', 'gm-settings.php', @@ -598,4 +598,4 @@ 'content' = $oProfilePageSettingsView ); } -} \ No newline at end of file +} -- To view, visit https://gerrit.wikimedia.org/r/189436 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I00a3b21811b4e746fab8c59d4679d4552baa7fbf Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Lilu o0lilu0o1...@gmail.com Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] change to set right alt attribute - change (mediawiki...BlueSpiceSkin)
Robert Vogel has submitted this change and it was merged.
Change subject: change to set right alt attribute
..
change to set right alt attribute
Change-Id: I73fd975811d05b5127c893cc66d149a1ae91cc3b
---
M includes/BlueSpiceSkinHooks.php
1 file changed, 14 insertions(+), 9 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/BlueSpiceSkinHooks.php b/includes/BlueSpiceSkinHooks.php
index b1be4c9..2d47b35 100644
--- a/includes/BlueSpiceSkinHooks.php
+++ b/includes/BlueSpiceSkinHooks.php
@@ -3,7 +3,7 @@
class BlueSpiceSkinHooks {
/**
-*
+*
* @param SkinTemplate $sktemplate
* @param BaseTemplate $tpl
* @return boolean Always true to keep Hook running
@@ -24,7 +24,7 @@
}
/**
-*
+*
* @param type $oStatebar
* @param type $aTopViews
* @param type $oUser
@@ -49,7 +49,7 @@
}
/**
-*
+*
* @param SkinTemplate $skin
* @param Title $title
* @param int $section
@@ -125,14 +125,19 @@
$bar['TOOLBOX'] = array();
return true;
}
- public static function onBSGetLogo($sImg){
- $sLogoPath = BsConfig::get('MW::LogoPath');
- if (substr($sLogoPath,0,1) != '/' substr($sLogoPath,0,4) !=
'http')
- $sLogoPath = / . $sLogoPath;
- $sImg = img src='.$sLogoPath.' alt='' /;
+ public static function onBSGetLogo( $sImg ) {
+ global $wgSitename;
+ $sLogoPath = wfExpandUrl(BsConfig::get( 'MW::LogoPath' ));
+ $sPageName = ;
+ $oTitle = Title::newMainPage();
+ if ( !is_null( $oTitle ) ) {
+ $sPageName = $oTitle-getText() . - ;
+ }
+ $sPageName .= $wgSitename;
+ $sImg = img src=' . $sLogoPath . ' alt=' . $sPageName . '
/;
return true;
}
-
+
public static function onVisualEditorConfig($aStandardConf,
$aDefaultConf){
global $wgStylePath, $wgServer;
if (isset($aStandardConf['content_css'])
$aStandardConf['content_css'] != )
--
To view, visit https://gerrit.wikimedia.org/r/188758
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I73fd975811d05b5127c893cc66d149a1ae91cc3b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ApiResult handling for mediawiki/core change I7b37295e - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Update ApiResult handling for mediawiki/core change I7b37295e
..
Update ApiResult handling for mediawiki/core change I7b37295e
Change I7b37295e for mediawiki/core deprecates several methods, and more
importantly changes the format of the data returned from
ApiResult::getData(). This change should handle these differences in a
backwards-compatible manner.
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678d
---
M includes/api/ApiFormatJsonMW.php
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/api/ApiFormatJsonMW.php b/includes/api/ApiFormatJsonMW.php
index 89f7151..d087043 100644
--- a/includes/api/ApiFormatJsonMW.php
+++ b/includes/api/ApiFormatJsonMW.php
@@ -36,10 +36,19 @@
$prefix = preg_replace( /[^][.\\'\\\_A-Za-z0-9]/,
'', $callback ) . '(';
$suffix = ')';
}
+
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $data = $this-getResult()-getResultData();
+ $data = ApiResult::transformForBC( $data );
+ $data = ApiResult::transformForTypes( $data, array(
'BC' = true ) );
+ $data = ApiResult::removeMetadata( $data );
+ } else {
+ $data = $this-getResultData();
+ }
$this-printText(
$prefix .
- FormatJson::encode( $this-getResultData(),
$this-getIsHtml() ) .
+ FormatJson::encode( $data, $this-getIsHtml() ) .
$suffix
);
}
--
To view, visit https://gerrit.wikimedia.org/r/183573
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added hook points to submit forms - change (mediawiki...FlaggedRevs)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189686
Change subject: Added hook points to submit forms
..
Added hook points to submit forms
Added two hooks to the main form objects that allow extension developers
to write code that gets executed before and after a review is made. This
is a frequent requirement when using FlaggedRevs extension in a corporate
intranet wiki system.
I've tried to make minimal changes to the existing logic.
''FlaggedRevsFRGenericSubmitFormReady'': This hook should make it possible to
perform operations _before_ the actual review is written to the database.
One might also modify the forms parameters within the hook handler.
Although the 'ready' method's return value is never evaluated anywhere in
the current code the hook allows to modify it and to prevent the form's status
from being set to FORM_READY
''FlaggedRevsRevisionReviewFormAfterDoSubmit'': This hook only gets called
after all steps of the review form's submit logic got executed. If there
occurs an error in the earlier steps the hook might not get called. It
allows to make a post processing of a review (i.e. sending notifications).
Change-Id: I2883334ccddb7bde1d26c4237a432b8d34d460e2
---
M business/FRGenericSubmitForm.php
M business/RevisionReviewForm.php
A docs/hooks.txt
3 files changed, 28 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FlaggedRevs
refs/changes/86/189686/1
diff --git a/business/FRGenericSubmitForm.php b/business/FRGenericSubmitForm.php
index 4f0ad65..94243c5 100644
--- a/business/FRGenericSubmitForm.php
+++ b/business/FRGenericSubmitForm.php
@@ -52,7 +52,13 @@
final public function ready() {
if ( $this-state != self::FORM_UNREADY ) {
throw new Exception( __CLASS__ . ready() already
called.\n);
- }
+ }
+
+ $result = '';
+ if( !Hooks::run( 'FlaggedRevsFRGenericSubmitFormReady', array(
$this, $result ) ) ) {
+ return $result;
+ }
+
$this-state = self::FORM_READY;
$status = $this-doCheckTargetGiven();
if ( $status !== true ) {
@@ -82,7 +88,7 @@
throw new Exception( __CLASS__ . fields cannot be set
anymore.\n);
} else {
$field = $value; // still allowing input
- }
+ }
}
/*
diff --git a/business/RevisionReviewForm.php b/business/RevisionReviewForm.php
index a7c98a5..95f7460 100644
--- a/business/RevisionReviewForm.php
+++ b/business/RevisionReviewForm.php
@@ -384,6 +384,9 @@
$this-user-addWatch( $this-page );
}
}
+
+ Hooks::run( 'FlaggedRevsRevisionReviewFormAfterDoSubmit',
array( $this, $status ) );
+
return $status;
}
diff --git a/docs/hooks.txt b/docs/hooks.txt
new file mode 100644
index 000..f7c3b1f
--- /dev/null
+++ b/docs/hooks.txt
@@ -0,0 +1,17 @@
+==Events and parameters==
+
+This is a list of events and parameters; please add to it if you're going
+to add events to the FlaggedRevs extension code.
+
+'FlaggedRevsFRGenericSubmitFormReady': When a FRGenericSubmitForm (subclass) is
+about to be submitted. Return boolean 'false' to skip internal processing and
+use $result to return an error message key
+$form: the FRGenericSubmitForm wich contains all parameters submitted by the
user
+$result: empty string. Can be set to an error message key
+
+'FlaggedRevsRevisionReviewFormAfterDoSubmit': After a review has been processed
+and written to the database.
+$form: the RevisionReviewForm object.
+$status: the status value generated from RevisionReviewForm::doSubmit. This is
+not a Status object but string or boolean value! 'true' on success, error
+message key on failure.
--
To view, visit https://gerrit.wikimedia.org/r/189686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2883334ccddb7bde1d26c4237a432b8d34d460e2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] change to set right alt attribute - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: change to set right alt attribute
..
change to set right alt attribute
Change-Id: I5e051f3f461240fb32f561cd375a0d71030e8eed
---
M Flexiskin/Flexiskin.class.php
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index fbc7cf9..255dc6a 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -335,7 +335,14 @@
if ($aConfig[1]-logo == )
return true;
$sPath = BS_DATA_PATH . /flexiskin/ . $sId .
/images/;
- $sImg = img src='.$sPath .
$aConfig[1]-logo.' /;
+ $sPageName = ;
+ global $wgSitename;
+ $oTitle = Title::newMainPage();
+ if ( !is_null( $oTitle ) ) {
+ $sPageName = $oTitle-getText() . - ;
+ }
+ $sPageName .= $wgSitename;
+ $sImg = img src=' . $sPath .
$aConfig[1]-logo . ' alt=' . $sPageName . '/;
return false;
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/188759
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5e051f3f461240fb32f561cd375a0d71030e8eed
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ResponsibleEditors: Fixed missing permissions in ajax context - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189917
Change subject: ResponsibleEditors: Fixed missing permissions in ajax context
..
ResponsibleEditors: Fixed missing permissions in ajax context
Added hook handler for overwrite FRCRevisionReview
RevisionAjaxReviewBeforeParams to apply possible temporary permissions in
AjaxReview context
Also used this method to the StateBarBeforeBodyViewAdd handler
Change-Id: I2e95faff739c4544d0b3108cbb3d6b5c8695eb4f
---
M ResponsibleEditors/ResponsibleEditors.class.php
1 file changed, 66 insertions(+), 14 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/17/189917/1
diff --git a/ResponsibleEditors/ResponsibleEditors.class.php
b/ResponsibleEditors/ResponsibleEditors.class.php
index 9975ee0..8a86546 100644
--- a/ResponsibleEditors/ResponsibleEditors.class.php
+++ b/ResponsibleEditors/ResponsibleEditors.class.php
@@ -88,7 +88,8 @@
$this-setHook( 'BSStateBarAddSortTopVars',
'onStatebarAddSortTopVars' );
$this-setHook( 'BSStateBarAddSortBodyVars',
'onStatebarAddSortBodyVars' );
$this-setHook( 'BSStateBarBeforeTopViewAdd',
'onStateBarBeforeTopViewAdd' );
- $this-setHook( 'BSStateBarBeforeBodyViewAdd',
'onStateBarBeforeBodyViewAdd' );
+ $this-setHook( 'BSStateBarBeforeBodyViewAdd',
'onStateBarBeforeBodyViewAdd', true );
+ $this-setHook( 'RevisionAjaxReviewBeforeParams' );
$this-setHook( 'BSPageAccessAddAdditionalAccessGroups',
'onPageAccessAddAdditionalAccessGroups' );
$this-setHook( 'BSDashboardsUserDashboardPortalConfig' );
$this-setHook( 'BSDashboardsUserDashboardPortalPortlets' );
@@ -184,6 +185,61 @@
return true;
}
+ protected function applyTempPermissionsForRespEditors( Title $oTitle,
User $oUser ) {
+ $iArticleID = $oTitle-getArticleID();
+ $aResponsibleEditorsIDs =
$this-getResponsibleEditorIdsByArticleId( $iArticleID );
+
+ if ( !in_array( $oUser-getId(), $aResponsibleEditorsIDs ) )
return true;
+
+ $aAvailablePermissions = BsConfig::get(
'MW::ResponsibleEditors::AutoPermissions' );
+ if ( empty( $aAvailablePermissions ) ) return true;
+
+ BsGroupHelper::addTemporaryGroupToUser(
+ $oUser,
+ 'tmprespeditors',
+ $aAvailablePermissions,
+ $oTitle
+ );
+ }
+
+ /**
+* Hook handler for FlaggedRevs RevisionReview overwrite
+* @param FRCRevisionReview $oRevisionReview
+* @param Title $oTitle
+* @param type $aArgs
+* @return boolean
+*/
+ public function onRevisionAjaxReviewBeforeParams( $oRevisionReview,
$oTitle, $aArgs ) {
+ //MW BeforeInitialize hook is not present in ajax calls, so
apply
+ //possible permissions for responsible editors in this context
+ if( is_null($oTitle) ) {
+ foreach( $aArgs as $sArg ) {
+ $set = explode( '|', $sArg, 2 );
+ if( count( $set ) != 2 ) {
+ continue;
+ }
+
+ list( $sKey, $vVal ) = $set;
+ if( $sKey != 'target' ) {
+ continue;
+ }
+
+ $oTitle = Title::newFromURL( $vVal );
+ break;
+ }
+ }
+ if( is_null($oTitle) || !$oTitle-exists() )
+ return true;
+
+ $aActivatedNamespaces =
BsConfig::get('MW::ResponsibleEditors::ActivatedNamespaces');
+ if ( !in_array($oTitle-getNamespace(), $aActivatedNamespaces) )
+ return true;
+
+ global $wgUser;
+ $this-applyTempPermissionsForRespEditors( $oTitle, $wgUser );
+ return true;
+ }
+
/**
* Hook-Handler for MediaWiki hook BeforeInitialize
* @global array $wgGroupPermissions
@@ -197,21 +253,12 @@
* @return boolean Always true
*/
public function onBeforeInitialize( $oTitle, $article, $output,
$oUser, $request, $mediaWiki ) {
- if ( !$oTitle-exists() ) return true;
+ if( is_null($oTitle) || !$oTitle-exists() ) return true;
$aActivatedNamespaces =
BsConfig::get('MW::ResponsibleEditors::ActivatedNamespaces');
- if ( !is_array( $aActivatedNamespaces ) ) return true;
if ( !in_array($oTitle-getNamespace(), $aActivatedNamespaces)
) return true;
[MediaWiki-commits] [Gerrit] shoutbox mentions implementation - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: shoutbox mentions implementation
..
shoutbox mentions implementation
* user can decide if he wants to get notifications via web and/or mail
* typing @ in the shoutbox brings up a list of available usernames
* doc added
Change-Id: I18a7f4c01e7a1cc2f0dbf930967c072cf0e80eac
(cherry picked from commit 3c9fa86f6d26103334cb9064635af4105868e458)
---
M ShoutBox/ShoutBox.class.php
M ShoutBox/ShoutBox.setup.php
M ShoutBox/docs/Hooks.txt
M ShoutBox/i18n/de-formal.json
M ShoutBox/i18n/de.json
M ShoutBox/i18n/en.json
M ShoutBox/i18n/qqq.json
A ShoutBox/resources/bluespice.shoutBox.mention.js
A ShoutBox/resources/jquery.textcomplete/jquery.textcomplete.css
A ShoutBox/resources/jquery.textcomplete/jquery.textcomplete.js
A ShoutBox/resources/jquery.textcomplete/jquery.textcomplete.min.js
11 files changed, 1,328 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index 5355c88..aa55513 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -103,6 +103,9 @@
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BSInsertMagicAjaxGetData' );
$this-setHook( 'BSStateBarBeforeTopViewAdd',
'onStateBarBeforeTopViewAdd' );
+ $this-setHook( 'BeforeCreateEchoEvent' );
+ $this-setHook( 'EchoGetDefaultNotifiedUsers' );
+
// Permissions
$this-mCore-registerPermission( 'readshoutbox' );
@@ -217,6 +220,7 @@
$oOutputPage-addModuleStyles( 'ext.bluespice.shoutbox.styles'
);
$oOutputPage-addModules( 'ext.bluespice.shoutbox' );
+ $oOutputPage-addModules( 'ext.bluespice.shoutbox.mention' );
BsExtensionManager::setContext( 'MW::ShoutboxShow' );
return true;
@@ -272,7 +276,7 @@
$sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'ShoutBox',
$iArticleId, $iLimit );
$aData = BsCacheHelper::get( $sKey );
-
+$aData = false;
if ( $aData !== false ) {
wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetching
shouts from cache' );
$sOutput = $aData;
@@ -317,6 +321,7 @@
while ( $row = $dbr-fetchRow( $res ) ) {
$oUser = User::newFromId( $row['sb_user_id'] );
$oProfile =
BsCore::getInstance()-getUserMiniProfile( $oUser );
+ $sMessage = preg_replace_callback(#@(\w*)#,
self::replaceUsernameInMessage, $row['sb_message']);
$oShoutBoxMessageView = new
ViewShoutBoxMessage();
if ( $bShowAge )
$oShoutBoxMessageView-setDate(
BsFormatConverter::mwTimestampToAgeString( $row['sb_timestamp'], true ) );
@@ -324,7 +329,7 @@
$oShoutBoxMessageView-setUsername(
$row['sb_user_name'] );
$oShoutBoxMessageView-setUser( $oUser );
$oShoutBoxMessageView-setMiniProfile(
$oProfile );
- $oShoutBoxMessageView-setMessage(
$row['sb_message'] );
+ $oShoutBoxMessageView-setMessage( $sMessage );
$oShoutBoxMessageView-setShoutID(
$row['sb_id'] );
$oShoutBoxMessageListView-addItem(
$oShoutBoxMessageView );
// Since we have one more shout than iLimit, we
need to count :)
@@ -431,6 +436,7 @@
); // TODO RBV (21.10.10 17:21): Send error / success to client.
wfRunHooks( 'BSShoutBoxAfterInsertShout', array( $iArticleId,
$iUserId, $sNick, $sMessage, $sTimestamp ) );
+ self::notify(insert, $iArticleId, $iUserId, $sNick,
$sMessage, $sTimestamp);
self::invalidateShoutBoxCache( $iArticleId );
return FormatJson::encode(
@@ -511,4 +517,133 @@
return true;
}
+ /**
+* Notifies a User for different actions
+* @param String $sAction
+* @param int $iArticleId
+* @param int $iUserId
+* @param String $sNick
+* @param String $sMessage
+* @param String $sTimestamp
+*/
+ public static function notify( $sAction, $iArticleId, $iUserId, $sNick,
$sMessage, $sTimestamp ) {
+ switch ( $sAction ) {
+ case insert:
+ $aUsers = self::getUsersMentioned( $sMessage );
+ if ( count( $aUsers ) 1 )
+ break;
+ self::notifyUser( mention,
[MediaWiki-commits] [Gerrit] shoutbox mentions implementation - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189458
Change subject: shoutbox mentions implementation
..
shoutbox mentions implementation
* user can decide if he wants to get notifications via web and/or mail
* typing @ in the shoutbox brings up a list of available usernames
* doc added
Change-Id: I18a7f4c01e7a1cc2f0dbf930967c072cf0e80eac
(cherry picked from commit 3c9fa86f6d26103334cb9064635af4105868e458)
---
M ShoutBox/ShoutBox.class.php
M ShoutBox/ShoutBox.setup.php
M ShoutBox/docs/Hooks.txt
M ShoutBox/i18n/de-formal.json
M ShoutBox/i18n/de.json
M ShoutBox/i18n/en.json
M ShoutBox/i18n/qqq.json
A ShoutBox/resources/bluespice.shoutBox.mention.js
A ShoutBox/resources/jquery.textcomplete/jquery.textcomplete.css
A ShoutBox/resources/jquery.textcomplete/jquery.textcomplete.js
A ShoutBox/resources/jquery.textcomplete/jquery.textcomplete.min.js
11 files changed, 1,328 insertions(+), 7 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/58/189458/1
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index 5355c88..aa55513 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -103,6 +103,9 @@
$this-setHook( 'BeforePageDisplay' );
$this-setHook( 'BSInsertMagicAjaxGetData' );
$this-setHook( 'BSStateBarBeforeTopViewAdd',
'onStateBarBeforeTopViewAdd' );
+ $this-setHook( 'BeforeCreateEchoEvent' );
+ $this-setHook( 'EchoGetDefaultNotifiedUsers' );
+
// Permissions
$this-mCore-registerPermission( 'readshoutbox' );
@@ -217,6 +220,7 @@
$oOutputPage-addModuleStyles( 'ext.bluespice.shoutbox.styles'
);
$oOutputPage-addModules( 'ext.bluespice.shoutbox' );
+ $oOutputPage-addModules( 'ext.bluespice.shoutbox.mention' );
BsExtensionManager::setContext( 'MW::ShoutboxShow' );
return true;
@@ -272,7 +276,7 @@
$sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'ShoutBox',
$iArticleId, $iLimit );
$aData = BsCacheHelper::get( $sKey );
-
+$aData = false;
if ( $aData !== false ) {
wfDebugLog( 'BsMemcached', __CLASS__ . ': Fetching
shouts from cache' );
$sOutput = $aData;
@@ -317,6 +321,7 @@
while ( $row = $dbr-fetchRow( $res ) ) {
$oUser = User::newFromId( $row['sb_user_id'] );
$oProfile =
BsCore::getInstance()-getUserMiniProfile( $oUser );
+ $sMessage = preg_replace_callback(#@(\w*)#,
self::replaceUsernameInMessage, $row['sb_message']);
$oShoutBoxMessageView = new
ViewShoutBoxMessage();
if ( $bShowAge )
$oShoutBoxMessageView-setDate(
BsFormatConverter::mwTimestampToAgeString( $row['sb_timestamp'], true ) );
@@ -324,7 +329,7 @@
$oShoutBoxMessageView-setUsername(
$row['sb_user_name'] );
$oShoutBoxMessageView-setUser( $oUser );
$oShoutBoxMessageView-setMiniProfile(
$oProfile );
- $oShoutBoxMessageView-setMessage(
$row['sb_message'] );
+ $oShoutBoxMessageView-setMessage( $sMessage );
$oShoutBoxMessageView-setShoutID(
$row['sb_id'] );
$oShoutBoxMessageListView-addItem(
$oShoutBoxMessageView );
// Since we have one more shout than iLimit, we
need to count :)
@@ -431,6 +436,7 @@
); // TODO RBV (21.10.10 17:21): Send error / success to client.
wfRunHooks( 'BSShoutBoxAfterInsertShout', array( $iArticleId,
$iUserId, $sNick, $sMessage, $sTimestamp ) );
+ self::notify(insert, $iArticleId, $iUserId, $sNick,
$sMessage, $sTimestamp);
self::invalidateShoutBoxCache( $iArticleId );
return FormatJson::encode(
@@ -511,4 +517,133 @@
return true;
}
+ /**
+* Notifies a User for different actions
+* @param String $sAction
+* @param int $iArticleId
+* @param int $iUserId
+* @param String $sNick
+* @param String $sMessage
+* @param String $sTimestamp
+*/
+ public static function notify( $sAction, $iArticleId, $iUserId, $sNick,
$sMessage, $sTimestamp ) {
+ switch ( $sAction ) {
+ case insert:
+ $aUsers = self::getUsersMentioned( $sMessage );
+ if ( count( $aUsers ) 1 )
+
[MediaWiki-commits] [Gerrit] forwardport from REL1_22 - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: forwardport from REL1_22
..
forwardport from REL1_22
* see Change-Id: I983bf10040c5ad5e6736ab4b4d21e1150f0331d8 for more infos
Change-Id: Id4dc667a65954a8f29f6d8bb134f895af378e90d
---
M Flexiskin/Flexiskin.class.php
M Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
A Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js
R Flexiskin/resources/BS.Flexiskin/menu/GeneralItem.js
R Flexiskin/resources/BS.Flexiskin/menu/HeaderItem.js
R Flexiskin/resources/BS.Flexiskin/menu/PositionItem.js
6 files changed, 69 insertions(+), 31 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 6b6aaf1..7d48545 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -192,6 +192,10 @@
$sConfig = '[{id:general,name:' . $oData-name .
',desc:' . $oData-desc .
',backgroundColor:F4F4F4,customBackgroundColor:F4F4F4,backgroundImage:,repeatBackground:no-repeat},';
$sConfig .= '{id:header,logo:},';
$sConfig .=
'{id:position,navigation:left,content:center,width:1222,
fullWidth:0}]';
+ $bReturn = wfRunHooks( BSFlexiskinGenerateConfigFile, array(
$oData, $sConfig ) );
+ if ( !$bReturn ) {
+ return [{}];
+ }
return $sConfig;
}
@@ -361,6 +365,7 @@
else
$aReturn[] = body{background-image:none !important;};
$aReturn[] =
body{background-repeat:.$aConfig-repeatBackground . !important;};
+ wfRunHooks(BSFlexiskinFormatterGeneral, array($aConfig,
$aReturn));
return implode( \n, $aReturn);
}
@@ -369,6 +374,7 @@
$aReturn = array();
//$aReturn[] =
#bs-logo{background-image:url('images/.$aConfig-logo.');};
+ wfRunHooks(BSFlexiskinFormatterHeader, array($aConfig,
$aReturn));
return implode( \n, $aReturn);
}
@@ -394,6 +400,7 @@
$aReturn[] = #bs-application{width:100%;};
$aReturn[] = #bs-wrapper{width:100%;min-width:100%;};
}
+ wfRunHooks(BSFlexiskinFormatterPosition, array($aConfig,
$aReturn));
return implode( \n, $aReturn);
}
diff --git a/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
b/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
index 7ef..34a1f0e 100644
--- a/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
+++ b/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
@@ -37,10 +37,11 @@
]
}];
this.items = [
- Ext.create(BS.Flexiskin.Menuitems.General),
- Ext.create(BS.Flexiskin.Menuitems.Header),
- Ext.create(BS.Flexiskin.Menuitems.Position)
+ Ext.create(BS.Flexiskin.menu.GeneralItem),
+ Ext.create(BS.Flexiskin.menu.HeaderItem),
+ Ext.create(BS.Flexiskin.menu.PositionItem)
];
+ $(document).trigger(BSFlexiskinPreviewMenuInitComponent,
[this, this.items]);
this.afterInitComponent(arguments);
this.callParent(arguments);
@@ -55,6 +56,7 @@
if (typeof (items[i].getData) !== 'undefined')
data.push(items[i].getData());
}
+ $(document).trigger(BSFlexiskinMenuPreviewGetData, [this,
data]);
return data;
},
setData: function( obj ) {
@@ -63,7 +65,7 @@
for (var i = 0; i items.length; i++) {
items[i].setData( {skinId : obj.skinId, config:
obj.config[i]} );
}
-
+ $(document).trigger(BSFlexiskinMenuPreviewSetData, [this,
this.items]);
//this.callParent( arguments );
},
btnSaveClick: function() {
diff --git a/Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js
b/Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js
new file mode 100644
index 000..f65b186
--- /dev/null
+++ b/Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js
@@ -0,0 +1,32 @@
+Ext.define('BS.Flexiskin.menu.BaseItem', {
+ extend: 'Ext.Panel',
+ layout: 'form',
+ currentData: {},
+ initComponent: function() {
+ this.callParent(arguments);
+ },
+ getData: function() {
+ this.callParent(arguments);
+ },
+ setData: function(data) {
+ this.callParents(arguments);
+ },
+ setColor: function(el, clr, textfield) {
+ if( typeof clr == undefined || clr == null) return;
+
+ var bFound = false;
+ clr =
[MediaWiki-commits] [Gerrit] Review: Fixed wrong permission error - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Review: Fixed wrong permission error
..
Review: Fixed wrong permission error
* Added ! to expression
* I646154023bed3b88042bc8282abf57c1dc34529b
Change-Id: Ib9f9c4830b758df5e318845a3bfe4f88fbb3d391
---
M Review/Review.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Review/Review.class.php b/Review/Review.class.php
index 972867f..f51947a 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -1026,7 +1026,7 @@
if ($oTitle === false || !$oTitle-exists() || $oUser ===
false){
return wfMessage('bs-review-review-error')-plain();
}
- if ($oTitle-userCan(workflowview, $oUser)) {
+ if (!$oTitle-userCan(workflowview, $oUser)) {
return
wfMessage('bs-review-error-insufficient-permissions', 'workflowview')-text();
}
--
To view, visit https://gerrit.wikimedia.org/r/189445
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9f9c4830b758df5e318845a3bfe4f88fbb3d391
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing classes to autoload - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Add missing classes to autoload
..
Add missing classes to autoload
Classes are:
BsValidatorResponse
BsValidatorEmailPlugin
BsValidatorUrlPlugin
BsValidatorPositiveIntegerPlugin
BsValidatorIntegerRangePlugin
BsValidatorArgCountPlugin
BsValidatorCategoryPlugin
BsValidatorSetItemPlugin
BsExtJSSortParam
HTMLCheckFieldOverride
XmlMultiSelect
Also remove copies from classes ORAField and ORAResult, there are part
of mediawiki/core with the exact name and with the same code (just
whitespaces and comments where changed).
Found by tests, see
https://integration.wikimedia.org/ci/job/mwext-BlueSpiceFoundation-testextension-zend/6/console
Change-Id: I361f4cc835e7eba57d4bd8cfce733d3ff8698472
---
M includes/AutoLoader.php
M includes/db/DatabaseOracleBase.php
2 files changed, 11 insertions(+), 156 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index fc00905..03fbc59 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -19,6 +19,14 @@
$GLOBALS['wgAutoloadClasses']['BsValidator'] =
__DIR__./validator/Validator.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorResponse'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorEmailPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorUrlPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorPositiveIntegerPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorIntegerRangePlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorArgCountPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorCategoryPlugin'] =
__DIR__./validator/Validator.class.php;
+$GLOBALS['wgAutoloadClasses']['BsValidatorSetItemPlugin'] =
__DIR__./validator/Validator.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorMwGroupnamePlugin'] =
__DIR__./validator/plugins/BsValidator/BsValidatorMwGroupnamePlugin.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorMwNamespacePlugin'] =
__DIR__./validator/plugins/BsValidator/BsValidatorMwNamespacePlugin.class.php;
$GLOBALS['wgAutoloadClasses']['BsValidatorMwUsernamePlugin'] =
__DIR__./validator/plugins/BsValidator/BsValidatorMwUsernamePlugin.class.php;
@@ -40,6 +48,7 @@
$GLOBALS['wgAutoloadClasses']['BsCAResponse'] = __DIR__./CAResponse.php;
$GLOBALS['wgAutoloadClasses']['BsCAIResponse'] = __DIR__./CAResponse.php;
$GLOBALS['wgAutoloadClasses']['BsExtJSStoreParams'] =
__DIR__./ExtJSStoreParams.php;
+$GLOBALS['wgAutoloadClasses']['BsExtJSSortParam'] =
__DIR__./ExtJSStoreParams.php;
//api
$GLOBALS['wgAutoloadClasses']['BsApiBase'] = __DIR__./api/BsApiBase.php;
@@ -54,7 +63,9 @@
$GLOBALS['wgAutoloadClasses']['HTMLTextFieldOverride'] =
__DIR__./html/htmlformfields/HTMLFormFieldOverrides.php;
$GLOBALS['wgAutoloadClasses']['HTMLIntFieldOverride'] =
__DIR__./html/htmlformfields/HTMLFormFieldOverrides.php;
$GLOBALS['wgAutoloadClasses']['HTMLStaticImageFieldOverride'] =
__DIR__./html/htmlformfields/HTMLFormFieldOverrides.php;
+$GLOBALS['wgAutoloadClasses']['HTMLCheckFieldOverride'] =
__DIR__./html/htmlformfields/HTMLFormFieldOverrides.php;
$GLOBALS['wgAutoloadClasses']['HTMLMultiSelectEx'] =
__DIR__./html/htmlformfields/HTMLMultiSelectEx.php;
+$GLOBALS['wgAutoloadClasses']['XmlMultiSelect'] =
__DIR__./html/htmlformfields/HTMLMultiSelectEx.php;
$GLOBALS['wgAutoloadClasses']['HTMLMultiSelectPlusAdd'] =
__DIR__./html/htmlformfields/HTMLMultiSelectPlusAdd.php;
$GLOBALS['wgAutoloadClasses']['HTMLMultiSelectSortList'] =
__DIR__./html/htmlformfields/HTMLMultiSelectSortList.php;
@@ -119,9 +130,6 @@
$GLOBALS['wgAutoloadClasses']['DatabaseOracle'] =
__DIR__./db/DatabaseOraclePre120.php;
}
$GLOBALS['wgAutoloadClasses']['BSOracleHooks'] =
__DIR__./db/BSOracleHooks.php;
-
-$GLOBALS['wgAutoloadClasses']['ORAField'] =
__DIR__./db/DatabaseOracleBase.php;
-$GLOBALS['wgAutoloadClasses']['ORAResult'] =
__DIR__./db/DatabaseOracleBase.php;
//Special pages
$GLOBALS['wgAutoloadClasses']['SpecialDiagnostics'] = __DIR__ .
'/specials/SpecialDiagnostics.class.php';
diff --git a/includes/db/DatabaseOracleBase.php
b/includes/db/DatabaseOracleBase.php
index 31fd6c6..f5795d5 100644
--- a/includes/db/DatabaseOracleBase.php
+++ b/includes/db/DatabaseOracleBase.php
@@ -7,159 +7,6 @@
*/
/**
- * The oci8 extension is fairly weak and doesn't support oci_num_rows, among
- * other things. We use a wrapper class to handle that and other
- * Oracle-specific bits, like converting column names back to lowercase.
- * @ingroup Database
- */
-class ORAResult {
-
[MediaWiki-commits] [Gerrit] fixed error, flexiskin now opens edit window now - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fixed error, flexiskin now opens edit window now
..
fixed error, flexiskin now opens edit window now
Change-Id: I983bf10040c5ad5e6736ab4b4d21e1150f0331d8
---
M Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
M Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
R Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js
R Flexiskin/resources/BS.Flexiskin/menu/GeneralItem.js
R Flexiskin/resources/BS.Flexiskin/menu/HeaderItem.js
R Flexiskin/resources/BS.Flexiskin/menu/PositionItem.js
6 files changed, 19 insertions(+), 39 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
b/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
index 1f0a679..820a51a 100644
--- a/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
+++ b/Flexiskin/resources/BS.Flexiskin/PreviewMenu.js
@@ -37,9 +37,9 @@
]
}];
this.items = [
- Ext.create(BS.Flexiskin.Menuitems.General),
- Ext.create(BS.Flexiskin.Menuitems.Header),
- Ext.create(BS.Flexiskin.Menuitems.Position)
+ Ext.create(BS.Flexiskin.menu.GeneralItem),
+ Ext.create(BS.Flexiskin.menu.HeaderItem),
+ Ext.create(BS.Flexiskin.menu.PositionItem)
];
$(document).trigger(BSFlexiskinPreviewMenuInitComponent,
[this, this.items]);
@@ -65,7 +65,7 @@
for (var i = 0; i items.length; i++) {
items[i].setData( {skinId : obj.skinId, config:
obj.config[i]} );
}
- $(document).trigger(BSFlexiskinMenuPreviewSetData, [this,
data]);
+ $(document).trigger(BSFlexiskinMenuPreviewSetData, [this,
this.items]);
//this.callParent( arguments );
},
btnSaveClick: function() {
diff --git a/Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
b/Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
index 08b947c..f86e20f 100644
--- a/Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
+++ b/Flexiskin/resources/BS.Flexiskin/PreviewWindow.js
@@ -15,10 +15,10 @@
//Custom Setting
currentData: {},
-
+
initComponent: function() {
this.pnlMenu = Ext.create(BS.Flexiskin.PreviewMenu);
-
+
this.cpIframe = Ext.create( 'Ext.Component', {
xtype: component,
region: 'center',
@@ -29,7 +29,7 @@
},
scope: this
});
-
+
this.items = [
this.pnlMenu,
this.cpIframe
@@ -37,30 +37,30 @@
this.on('show', this.onShow, this);
//this.on('afterrender', this.onAfterRender, this);
-
+
this.callParent(arguments);
},
-
+
onShow: function() {
Ext.getCmp('bs-flexiskin-preview-frame').setLoading();
Ext.get('bs-flexiskin-preview-frame').on('load', function() {
Ext.getCmp('bs-flexiskin-preview-frame').setLoading(false);
});
this.setWidth(Ext.getBody().getWidth());
-
+
this.callParent(arguments);
},
-
-
-
+
+
+
setData: function( obj ) {
this.currentData = obj;
- Ext.getCmp('bs-flexiskin-preview-frame').autoEl.src =
+ Ext.getCmp('bs-flexiskin-preview-frame').autoEl.src =
mw.util.wikiScript() +?+ $.param({
flexiskin: this.currentData.skinId
});
if( this.rendered ) {
- Ext.getCmp('bs-flexiskin-preview-frame').autoEl.src =
+ Ext.getCmp('bs-flexiskin-preview-frame').autoEl.src =
mw.util.wikiScript() +?+ $.param({
flexiskin: this.currentData.skinId
});
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/BaseItem.js
b/Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js
similarity index 100%
rename from Flexiskin/resources/BS.Flexiskin/Menuitems/BaseItem.js
rename to Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js
diff --git a/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
b/Flexiskin/resources/BS.Flexiskin/menu/GeneralItem.js
similarity index 92%
rename from Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
rename to Flexiskin/resources/BS.Flexiskin/menu/GeneralItem.js
index af336b5..0343c4c 100644
--- a/Flexiskin/resources/BS.Flexiskin/Menuitems/General.js
+++
[MediaWiki-commits] [Gerrit] Fixed umlaut handling in links without caption - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Fixed umlaut handling in links without caption
..
Fixed umlaut handling in links without caption
In tinymce, innerhtml comes with html entities. So umlauts are entity
encoded. When caption and link target are identical, the editor should not
produce a caption in wikitext. Due to different encoding, this was the
case until now. Now, encoding is the same and thus identical caption and
target are now recognized even if there are umlauts.
Change-Id: I00457510708afb2e5b8273faf836960abea36e76
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index bdd9dd6..651e92a 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -631,6 +631,9 @@
if (inner) {
label = inner[1];
label = label.replace(/br.*?\//gi,
'');
+ // label comes with encoded html
entities, so we need to decode this here.
+ // Otherwise, resolution of special
characters like umlauts won't work.
+ label = $('textarea
/').html(label).text();
}
//TODO: Maybe we should relay on classes
instead?
--
To view, visit https://gerrit.wikimedia.org/r/195554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00457510708afb2e5b8273faf836960abea36e76
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make sure image caption is always at the end of image parame... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Make sure image caption is always at the end of image parameters
..
Make sure image caption is always at the end of image parameters
Image caption should always be at the end of an image link
Change-Id: I78360d2977a6255ad9c382931aeb13e6a5bcc8af
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 12 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index 651e92a..f6595ce 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -341,7 +341,7 @@
for (var i = 0; i images.length; i++) {
var image, htmlImageObject, wikiImageObject,
- attributes, attribute, wikiText,
+ attributes, attribute, wikiText, imageCaption,
size, property, value;
image = images[i];
@@ -405,6 +405,7 @@
// Build wikitext
wikiText = [];
+ imageCaption = false;
wikiText.push(wikiImageObject.imagename);
for (property in wikiImageObject) {
if ($.inArray(property, ['imagename',
'thumbsize']) !== -1) {
@@ -444,8 +445,12 @@
wikiText.push(property + '=' + value);
continue;
}
- if ($.inArray(property, ['caption', 'align'])
!== -1) {
+ if ( property == 'align' ) {
wikiText.push(value);
+ continue;
+ }
+ if ( property == 'caption' ) {
+ imageCaption = value;
continue;
}
if (value === true) {
@@ -453,6 +458,11 @@
}
}
+ // make sure image caption comes in the end
+ if ( imageCaption ) {
+ wikiText.push( imageCaption );
+ }
+
text = text.replace(image, '[[' +
wikiText.join('|').replace(@@PIPE@@, '|') + ']]');
}
return text;
--
To view, visit https://gerrit.wikimedia.org/r/195557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I78360d2977a6255ad9c382931aeb13e6a5bcc8af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changed pdf export link to be displayed in the toolbox if bl... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: changed pdf export link to be displayed in the toolbox if
bluespiceskin is not active
..
changed pdf export link to be displayed in the toolbox if bluespiceskin is not
active
Change-Id: I1d3461c87b605dd37adf22a39c265aaf94045e05
---
M UEModulePDF/UEModulePDF.class.php
1 file changed, 56 insertions(+), 28 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/UEModulePDF/UEModulePDF.class.php
b/UEModulePDF/UEModulePDF.class.php
index 1c8698c..4980d66 100644
--- a/UEModulePDF/UEModulePDF.class.php
+++ b/UEModulePDF/UEModulePDF.class.php
@@ -93,6 +93,7 @@
$this-setHook('BSUniversalExportGetWidget');
$this-setHook('BSUniversalExportSpecialPageExecute');
$this-setHook('SkinTemplateOutputPageBeforeExec');
+ $this-setHook('BaseTemplateToolbox');
wfProfileOut( 'BS::'.__METHOD__ );
}
@@ -200,7 +201,58 @@
return true;
}
- public function onSkinTemplateOutputPageBeforeExec($skin, $template){
+ /**
+* Hook to insert the PDF-Export link if BlueSpiceSkin is active
+* @param SkinTemplate $oSkin
+* @param QuickTemplate $oTemplate
+* @return boolean
+*/
+ public function onSkinTemplateOutputPageBeforeExec( $oSkin,
$oTemplate ) {
+ if ( !$oTemplate instanceof BsBaseTemplate ) {
+ return true;
+ }
+
+ $oTemplate-data['bs_title_actions'][] =
$this-buildContentAction();
+
+ return true;
+ }
+
+ /**
+* Hook to be executed when the Vector Skin is activated to add the
PDF-Export Link to the Toolbox
+* @param SkinTemplate $oTemplate
+* @param Array $aToolbox
+* @return boolean
+*/
+ public function onBaseTemplateToolbox( $oTemplate, $aToolbox ) {
+ $oTitle = RequestContext::getMain()-getTitle();
+ //if the BlueSpiceSkin is activated we don't need to add the
Link to the Toolbox,
+ //onSkinTemplateOutputPageBeforeExec will handle it
+ if ( $oTemplate instanceof BsBaseTemplate ||
!$oTitle-isContentPage() ) {
+ return true;
+ }
+
+ //if print is set insert pdf export afterwards
+ if ( isset( $aToolbox['print'] ) ) {
+ $aToolboxNew = array();
+ foreach ( $aToolbox as $sKey = $aValue ) {
+ $aToolboxNew[$sKey] = $aValue;
+ if ( $sKey === print ) {
+ $aToolboxNew['uemodulepdf'] =
$this-buildContentAction();
+ }
+ }
+ $aToolbox = $aToolboxNew;
+ } else {
+ $aToolbox['uemodulepdf'] = $this-buildContentAction();
+ }
+
+ return true;
+ }
+
+ /**
+* Builds the ContentAction Array fort the current page
+* @return Array The ContentAction Array
+*/
+ private function buildContentAction() {
$aCurrentQueryParams = $this-getRequest()-getValues();
if ( isset( $aCurrentQueryParams['title'] ) ) {
$sTitle = $aCurrentQueryParams['title'];
@@ -213,37 +265,13 @@
unset( $aCurrentQueryParams['title'] );
}
$aCurrentQueryParams['ue[module]'] = 'pdf';
- $aContentActions = array(
+ return array(
'id' = 'bs-ta-uemodulepdf',
'href' = $oSpecialPage-getLinkUrl(
$aCurrentQueryParams ),
'title' = wfMessage(
'bs-uemodulepdf-widgetlink-single-no-attachments-title' )-text(),
- 'text' =
wfMessage('bs-uemodulepdf-widgetlink-single-no-attachments-text')-text(),
+ 'text' = wfMessage(
'bs-uemodulepdf-widgetlink-single-no-attachments-text' )-text(),
'class' = 'icon-file-pdf'
);
-
- if ( $template instanceof BsBaseTemplate ) {
- $template-data['bs_title_actions'][] =
$aContentActions;
- } else {
- //this is the case when BlueSpice Skin is not active,
so use vector methods.
- $template-data['prebodyhtml'] = Html::rawElement(
- span,
- array('class' =
'bs-ta-uemodulepdf-container'),
- Html::rawElement(
- 'a',
- array(
-
[MediaWiki-commits] [Gerrit] BsMailer: Fixed mail footer - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: BsMailer: Fixed mail footer
..
BsMailer: Fixed mail footer
* Mail footer message gets actually rendered now
* Updated qqq: There was a param (sitename) that can be used
* Used the site name param in de, de-formal and en
* P2: Removed Space, Removed {} in $sFooter var assignment
Change-Id: I159402b7df390cf3d7a6261df3355c1bdab03604
---
M i18n/core/de-formal.json
M i18n/core/de.json
M i18n/core/en.json
M i18n/core/qqq.json
M includes/Mailer.class.php
5 files changed, 13 insertions(+), 11 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Tweichart: Checked; Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, but someone else must approve
diff --git a/i18n/core/de-formal.json b/i18n/core/de-formal.json
index 07df833..f685108 100644
--- a/i18n/core/de-formal.json
+++ b/i18n/core/de-formal.json
@@ -1,6 +1,6 @@
{
@metadata: [],
- bs-email-footer: Dies ist eine automatisch generierte E-Mail. Bitte
antworten Sie nicht auf diese E-Mail!,
+ bs-email-footer: Dies ist eine automatisch generierte E-Mail aus $1.
Bitte antworten Sie nicht auf diese E-Mail!,
bs-userpreferences-link-title: Zeigt Ihre persönlichen
Benutzereinstellungen an.,
bs-exception-view-admin-hint: Bitte kontaktieren Sie Ihren
Administrator.,
bs-imageofotheruser: Sie sind nicht berechtigt, ein Bild für einen
anderen Benutzer hochzuladen.
diff --git a/i18n/core/de.json b/i18n/core/de.json
index 6cea030..c33db88 100644
--- a/i18n/core/de.json
+++ b/i18n/core/de.json
@@ -27,7 +27,7 @@
bs-now: jetzt,
bs-email-greeting-receiver: {{GENDER:$1|Hallo Herr $2|Hallo Frau
$2|Hallo $2}},,
bs-email-greeting-no-receiver: Hallo,,
- bs-email-footer: Dies ist eine automatisch generierte E-Mail. Bitte
antworte nicht auf diese E-Mail!,
+ bs-email-footer: Dies ist eine automatisch generierte E-Mail aus $1.
Bitte antworte nicht auf diese E-Mail!,
bs-userpagesettings-legend: Benutzereinstellungen,
bs-userpreferences-link-text: Weitere Benutzereinstellungen,
bs-userpreferences-link-title: Zeigt deine persönlichen
Benutzereinstellungen an,
diff --git a/i18n/core/en.json b/i18n/core/en.json
index 8bd6e27..96eea79 100644
--- a/i18n/core/en.json
+++ b/i18n/core/en.json
@@ -27,7 +27,7 @@
bs-now: now,
bs-email-greeting-receiver: {{GENDER:$1|Hello Mr $2|Hello Mrs
$2|Hello $2}},,
bs-email-greeting-no-receiver: Hello,,
- bs-email-footer: This message was generated automatically. Please do
not reply to this email.,
+ bs-email-footer: This message was generated automatically by $1.
Please do not reply to this email.,
bs-userpagesettings-legend: User settings,
bs-userpreferences-link-text: More user settings,
bs-userpreferences-link-title: Display your personal user settings,
diff --git a/i18n/core/qqq.json b/i18n/core/qqq.json
index 3363582..20c3ec6 100644
--- a/i18n/core/qqq.json
+++ b/i18n/core/qqq.json
@@ -31,7 +31,7 @@
bs-now: Text shown for \now\ when indicating how long ago an event
was.\n{{Identical|Now}},
bs-email-greeting-receiver: Used in emails as first line in body to
greet the receiver.\n\nParameters:\n* $1 is the username of the receiver - use
for GENDER distinction \n*$2 is real name of the receiver, if the receiver has
not set a real name it is the username,
bs-email-greeting-no-receiver: Used in emails as first line in body
to greet the reveiver\n{{Identical|Hello}},
- bs-email-footer: Used in plain text mails as last line,
+ bs-email-footer: Used in mails as last line\n* $1 is the site name
($wgSitename),
bs-userpagesettings-legend: Label for section with links to special
user related settings,
bs-userpreferences-link-text: Label for link to user preferences on
user page,
bs-userpreferences-link-title: Title (shown as flyout) for link to
user preferences on user page,
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index 1c69e62..96bcfdd 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -118,10 +118,13 @@
);
}
- $sFooter = ( $this-bSendHTML ) ? br /br
/-br /br / : \n\n-\n\n;
- $sFooter .= wfMessage( 'bs-email-footer', $wgSitename
)-plain() . ( $this-bSendHTML )
- ? br /br /-
- : \n\n-;
+ //Note that this is system lang!
+ $sNL = $this-bSendHTML ? br / : \n;
+ $sFooter =
+ $sNL$sNL-$sNL$sNL
+ .wfMessage( 'bs-email-footer', $wgSitename )-text()
+
[MediaWiki-commits] [Gerrit] SmartList: Added mode whatlinkshere - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: SmartList: Added mode whatlinkshere
..
SmartList: Added mode whatlinkshere
* P2: Used page title instead of article title to match mediawiki default
Change-Id: I4ee2f5236365604812b7c6539c0230473b02b8ac
---
M SmartList/SmartList.class.php
M SmartList/i18n/de.json
M SmartList/i18n/en.json
M SmartList/i18n/qqq.json
4 files changed, 99 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Raimond Spekking: Looks good to me, but someone else must approve
diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index 42cbd5a..f20d600 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -565,6 +565,7 @@
$aArgs['showns'] = BsCore::sanitizeArrayEntry( $aArgs,
'showns', true, BsPARAMTYPE::BOOL );
$aArgs['numwithtext'] = BsCore::sanitizeArrayEntry( $aArgs,
'numwithtext', 100, BsPARAMTYPE::INT );
$aArgs['meta'] = BsCore::sanitizeArrayEntry( $aArgs, 'meta',
false, BsPARAMTYPE::BOOL );
+ $aArgs['target'] = BsCore::sanitizeArrayEntry( $aArgs,
'target', '', BsPARAMTYPE::STRING );
$oSmartListView = new ViewBaseElement();
if ( !empty( $aArgs['heading'] ) ) {
@@ -819,8 +820,102 @@
$iCount++;
}
$dbr-freeResult( $res );
+
+ } elseif( $aArgs['mode'] == 'whatlinkshere' ) {
+ //PW(25.02.2015) TODO:
+ //There could be filters - see Special:Whatlinkshere
+
+ $oTargetTitle = empty( $aArgs['target'] )
+ ? $this-getContext()-getTitle()
+ : Title::newFromText( $aArgs['target'] )
+ ;
+
+ if( is_null($oTargetTitle) ) {
+ $oErrorListView-addItem(
+ new ViewTagError(
+ wfMessage(
'bs-smartlist-invalid-target' )-text()
+ )
+ );
+ return $oErrorListView-execute();
+ }
+
+ $oDbr = wfGetDB( DB_SLAVE );
+ $aTables = array(
+ 'pagelinks',
+ 'page',
+ );
+ $aFields = array(
+ 'title' = 'page_title',
+ 'namespace' = 'page_namespace',
+ );
+ $aConditions = array(
+ page_id = pl_from,
+ pl_namespace =
{$oTargetTitle-getNamespace()},
+ pl_from NOT IN
({$oTargetTitle-getArticleID()}),
+ pl_title = '{$oTargetTitle-getDBkey()}',
+ );
+ $aOptions = array();
+
+ try {
+ $aNamespaceIds =
BsNamespaceHelper::getNamespaceIdsFromAmbiguousCSVString(
+ $aArgs['namespaces']
+ );
+ $aConditions['page_namespace'] = $aNamespaceIds;
+ } catch ( BsInvalidNamespaceException $ex ) {
+ $sInvalidNamespaces = implode( ', ',
$ex-getListOfInvalidNamespaces() );
+ $oErrorListView-addItem(
+ new ViewTagError(
+ wfMessage(
'bs-smartlist-invalid-namespaces' )
+ -numParams( count(
$ex-getListOfInvalidNamespaces() ) )
+ -params(
$sInvalidNamespaces )
+ -text()
+ )
+ );
+ return $oErrorListView-execute();
+ }
+
+ //Default: time
+ $aOptions['ORDER BY'] = $aArgs['sort'] == 'title'
+ ? 'page_title'
+ : 'page_id'
+ ;
+
+ //Default DESC
+ $aOptions['ORDER BY'] .= $aArgs['order'] == 'ASC'
+ ? ' ASC'
+ : ' DESC'
+ ;
+
+ $oRes = $oDbr-select(
+ $aTables,
+ $aFields,
+ $aConditions,
+
[MediaWiki-commits] [Gerrit] Using $wgResourceLoaderLESSVars for most LESS vars - change (mediawiki...BlueSpiceSkin)
Robert Vogel has submitted this change and it was merged.
Change subject: Using $wgResourceLoaderLESSVars for most LESS vars
..
Using $wgResourceLoaderLESSVars for most LESS vars
This change should make it easier to adapt the look of BlueSpiceSkin to
the requirements of customers. It also enables extensions like FlexiSkin
to modify the variables by using 'ResourceLoaderGetLessVars' (1.25+) hook.
I don't know why, but having 'bs-skin-path' variable in the array breaks
the function. This should be subject to future improvements.
Change-Id: I6ad1a5719acb1a78b20be7fb602f5112524c373d
(cherry picked from commit ab9dc6e3917188f1bcb6132bb4b5804a312bd3bc)
---
M BlueSpiceSkin.php
M resources/variables.less
2 files changed, 33 insertions(+), 29 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 772eecc..e193e40 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -86,4 +86,36 @@
$wgDefaultSkin = 'bluespiceskin';
$wgSkipSkins = array( 'chick', 'cologneblue', 'common', 'modern', 'monobook',
- 'myskin', 'nostalgia', 'simple', 'standard' );
\ No newline at end of file
+ 'myskin', 'nostalgia', 'simple', 'standard' );
+
+// Set LESS global variables
+ $localBasePath = dirname( __DIR__ );
+ $wgResourceLoaderLESSImportPaths = array_merge(
$wgResourceLoaderLESSImportPaths, array(
+ $localBasePath/resources/,
+ ) );
+
+$wgResourceLoaderLESSVars += array(
+ 'body-font-size' = '1em',
+ 'bs-color-primary' = '#3e5389', //blue
+ 'bs-color-secondary' = '#ffae00', //orange
+ 'bs-color-tertiary' = '#b73a3a', //red
+ 'bs-color-neutral' = '#929292', //grey
+ 'bs-color-neutral2' = '#ABABAB', //lighten(@bs-color-neutral1, 10%); -
LESS / RL issue
+ 'bs-color-neutral3' = '#C4C4C4', //lighten(@bs-color-neutral1, 20%)',
+ 'bs-color-neutral4' = '#787878', //darken(@bs-color-neutral1, 10%)',
+ 'bs-color-dark-blue' = 'rgb(62, 83, 137)',
+ 'bs-color-bright-blue-a' = 'rgba(205, 223, 242, 0.6)',
+ 'bs-color-middle-blue-a' = 'rgba(62, 83, 137, 0.44)',
+ 'bs-color-middle-blue' = 'rgba(152, 167, 196)',
+ 'bs-color-light-grey' = 'rgb(211, 211, 211)',
+ 'bs-color-dark-grey' = 'rgb(186, 186, 186)',
+ 'bs-color-darker-grey' = '#494949',
+ 'bs-color-content-default' = '#252525',
+ 'bs-color-redlink' = '#ba',
+ 'bs-font-default' = 'Source Sans Pro, sans-serif',
+ 'bs-font-roboto' = 'RobotoSlab',
+ 'bs-box-shadow' = '0px 4px 20px 0px rgba(9, 7, 9, 0.45)',
+ 'bs-width-page' = '1222px',
+ 'bs-width-navcol' = '276px',
+ 'bs-margin-left-content' = '302px'
+);
\ No newline at end of file
diff --git a/resources/variables.less b/resources/variables.less
index 985d8cf..d9f362d 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -1,32 +1,4 @@
-@body-font-size: 1em;
@bs-skin-path: ;
-
-// BlueSpice
-//
INT:https://wiki.hallowelt.biz/index.php/Blue_spice/Style_Guide/Allgemeine_Designobjekte
-@bs-color-primary: #3e5389; //blue
-@bs-color-secondary: #ffae00; //orange
-@bs-color-tertiary: #b73a3a; //red
-@bs-color-neutral: #929292; //grey
-@bs-color-neutral2: #ABABAB; //lighten(@bs-color-neutral1, 10%); - LESS / RL
issue
-@bs-color-neutral3: #C4C4C4; //lighten(@bs-color-neutral1, 20%);
-@bs-color-neutral4: #787878; //darken(@bs-color-neutral1, 10%);
-@bs-color-dark-blue: rgb(62, 83, 137);
-@bs-color-bright-blue-a: rgba(205, 223, 242, 0.6);
-@bs-color-middle-blue-a: rgba(62, 83, 137, 0.44);
-@bs-color-middle-blue: rgba(152, 167, 196);
-@bs-color-light-grey: rgb(211, 211, 211);
-@bs-color-dark-grey: rgb(186, 186, 186);
-@bs-color-darker-grey: #494949;
-@bs-color-content-default: #252525;
-@bs-color-redlink: #ba;
-//@bs-font-default: Neue Helvetica, Helvetica, Arial, sans-serif;
-@bs-font-default: Source Sans Pro, sans-serif;
-@bs-font-roboto: RobotoSlab;
-@bs-box-shadow: 0px 4px 20px 0px rgba(9, 7, 9, 0.45);
-
-@bs-width-page: 1222px;
-@bs-width-navcol: 276px;
-@bs-margin-left-content: 302px;
.border-radius(@radius) {
-webkit-border-radius: @radius;
--
To view, visit https://gerrit.wikimedia.org/r/194854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ad1a5719acb1a78b20be7fb602f5112524c373d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Using $wgResourceLoaderLESSVars for most LESS vars - change (mediawiki...BlueSpiceSkin)
Robert Vogel has submitted this change and it was merged.
Change subject: Using $wgResourceLoaderLESSVars for most LESS vars
..
Using $wgResourceLoaderLESSVars for most LESS vars
This change should make it easier to adapt the look of BlueSpiceSkin to
the requirements of customers. It also enables extensions like FlexiSkin
to modify the variables by using 'ResourceLoaderGetLessVars' (1.25+) hook.
I don't know why, but having 'bs-skin-path' variable in the array breaks
the function. This should be subject to future improvements.
Change-Id: I6ad1a5719acb1a78b20be7fb602f5112524c373d
---
M BlueSpiceSkin.php
M resources/variables.less
2 files changed, 33 insertions(+), 29 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Tweichart: Checked; Looks good to me, but someone else must approve
diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 772eecc..e193e40 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -86,4 +86,36 @@
$wgDefaultSkin = 'bluespiceskin';
$wgSkipSkins = array( 'chick', 'cologneblue', 'common', 'modern', 'monobook',
- 'myskin', 'nostalgia', 'simple', 'standard' );
\ No newline at end of file
+ 'myskin', 'nostalgia', 'simple', 'standard' );
+
+// Set LESS global variables
+ $localBasePath = dirname( __DIR__ );
+ $wgResourceLoaderLESSImportPaths = array_merge(
$wgResourceLoaderLESSImportPaths, array(
+ $localBasePath/resources/,
+ ) );
+
+$wgResourceLoaderLESSVars += array(
+ 'body-font-size' = '1em',
+ 'bs-color-primary' = '#3e5389', //blue
+ 'bs-color-secondary' = '#ffae00', //orange
+ 'bs-color-tertiary' = '#b73a3a', //red
+ 'bs-color-neutral' = '#929292', //grey
+ 'bs-color-neutral2' = '#ABABAB', //lighten(@bs-color-neutral1, 10%); -
LESS / RL issue
+ 'bs-color-neutral3' = '#C4C4C4', //lighten(@bs-color-neutral1, 20%)',
+ 'bs-color-neutral4' = '#787878', //darken(@bs-color-neutral1, 10%)',
+ 'bs-color-dark-blue' = 'rgb(62, 83, 137)',
+ 'bs-color-bright-blue-a' = 'rgba(205, 223, 242, 0.6)',
+ 'bs-color-middle-blue-a' = 'rgba(62, 83, 137, 0.44)',
+ 'bs-color-middle-blue' = 'rgba(152, 167, 196)',
+ 'bs-color-light-grey' = 'rgb(211, 211, 211)',
+ 'bs-color-dark-grey' = 'rgb(186, 186, 186)',
+ 'bs-color-darker-grey' = '#494949',
+ 'bs-color-content-default' = '#252525',
+ 'bs-color-redlink' = '#ba',
+ 'bs-font-default' = 'Source Sans Pro, sans-serif',
+ 'bs-font-roboto' = 'RobotoSlab',
+ 'bs-box-shadow' = '0px 4px 20px 0px rgba(9, 7, 9, 0.45)',
+ 'bs-width-page' = '1222px',
+ 'bs-width-navcol' = '276px',
+ 'bs-margin-left-content' = '302px'
+);
\ No newline at end of file
diff --git a/resources/variables.less b/resources/variables.less
index 985d8cf..d9f362d 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -1,32 +1,4 @@
-@body-font-size: 1em;
@bs-skin-path: ;
-
-// BlueSpice
-//
INT:https://wiki.hallowelt.biz/index.php/Blue_spice/Style_Guide/Allgemeine_Designobjekte
-@bs-color-primary: #3e5389; //blue
-@bs-color-secondary: #ffae00; //orange
-@bs-color-tertiary: #b73a3a; //red
-@bs-color-neutral: #929292; //grey
-@bs-color-neutral2: #ABABAB; //lighten(@bs-color-neutral1, 10%); - LESS / RL
issue
-@bs-color-neutral3: #C4C4C4; //lighten(@bs-color-neutral1, 20%);
-@bs-color-neutral4: #787878; //darken(@bs-color-neutral1, 10%);
-@bs-color-dark-blue: rgb(62, 83, 137);
-@bs-color-bright-blue-a: rgba(205, 223, 242, 0.6);
-@bs-color-middle-blue-a: rgba(62, 83, 137, 0.44);
-@bs-color-middle-blue: rgba(152, 167, 196);
-@bs-color-light-grey: rgb(211, 211, 211);
-@bs-color-dark-grey: rgb(186, 186, 186);
-@bs-color-darker-grey: #494949;
-@bs-color-content-default: #252525;
-@bs-color-redlink: #ba;
-//@bs-font-default: Neue Helvetica, Helvetica, Arial, sans-serif;
-@bs-font-default: Source Sans Pro, sans-serif;
-@bs-font-roboto: RobotoSlab;
-@bs-box-shadow: 0px 4px 20px 0px rgba(9, 7, 9, 0.45);
-
-@bs-width-page: 1222px;
-@bs-width-navcol: 276px;
-@bs-margin-left-content: 302px;
.border-radius(@radius) {
-webkit-border-radius: @radius;
--
To view, visit https://gerrit.wikimedia.org/r/194832
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ad1a5719acb1a78b20be7fb602f5112524c373d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
[MediaWiki-commits] [Gerrit] Using $wgResourceLoaderLESSVars for most LESS vars - change (mediawiki...BlueSpiceSkin)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194854
Change subject: Using $wgResourceLoaderLESSVars for most LESS vars
..
Using $wgResourceLoaderLESSVars for most LESS vars
This change should make it easier to adapt the look of BlueSpiceSkin to
the requirements of customers. It also enables extensions like FlexiSkin
to modify the variables by using 'ResourceLoaderGetLessVars' (1.25+) hook.
I don't know why, but having 'bs-skin-path' variable in the array breaks
the function. This should be subject to future improvements.
Change-Id: I6ad1a5719acb1a78b20be7fb602f5112524c373d
(cherry picked from commit ab9dc6e3917188f1bcb6132bb4b5804a312bd3bc)
---
M BlueSpiceSkin.php
M resources/variables.less
2 files changed, 33 insertions(+), 29 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/54/194854/1
diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index 772eecc..e193e40 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -86,4 +86,36 @@
$wgDefaultSkin = 'bluespiceskin';
$wgSkipSkins = array( 'chick', 'cologneblue', 'common', 'modern', 'monobook',
- 'myskin', 'nostalgia', 'simple', 'standard' );
\ No newline at end of file
+ 'myskin', 'nostalgia', 'simple', 'standard' );
+
+// Set LESS global variables
+ $localBasePath = dirname( __DIR__ );
+ $wgResourceLoaderLESSImportPaths = array_merge(
$wgResourceLoaderLESSImportPaths, array(
+ $localBasePath/resources/,
+ ) );
+
+$wgResourceLoaderLESSVars += array(
+ 'body-font-size' = '1em',
+ 'bs-color-primary' = '#3e5389', //blue
+ 'bs-color-secondary' = '#ffae00', //orange
+ 'bs-color-tertiary' = '#b73a3a', //red
+ 'bs-color-neutral' = '#929292', //grey
+ 'bs-color-neutral2' = '#ABABAB', //lighten(@bs-color-neutral1, 10%); -
LESS / RL issue
+ 'bs-color-neutral3' = '#C4C4C4', //lighten(@bs-color-neutral1, 20%)',
+ 'bs-color-neutral4' = '#787878', //darken(@bs-color-neutral1, 10%)',
+ 'bs-color-dark-blue' = 'rgb(62, 83, 137)',
+ 'bs-color-bright-blue-a' = 'rgba(205, 223, 242, 0.6)',
+ 'bs-color-middle-blue-a' = 'rgba(62, 83, 137, 0.44)',
+ 'bs-color-middle-blue' = 'rgba(152, 167, 196)',
+ 'bs-color-light-grey' = 'rgb(211, 211, 211)',
+ 'bs-color-dark-grey' = 'rgb(186, 186, 186)',
+ 'bs-color-darker-grey' = '#494949',
+ 'bs-color-content-default' = '#252525',
+ 'bs-color-redlink' = '#ba',
+ 'bs-font-default' = 'Source Sans Pro, sans-serif',
+ 'bs-font-roboto' = 'RobotoSlab',
+ 'bs-box-shadow' = '0px 4px 20px 0px rgba(9, 7, 9, 0.45)',
+ 'bs-width-page' = '1222px',
+ 'bs-width-navcol' = '276px',
+ 'bs-margin-left-content' = '302px'
+);
\ No newline at end of file
diff --git a/resources/variables.less b/resources/variables.less
index 985d8cf..d9f362d 100644
--- a/resources/variables.less
+++ b/resources/variables.less
@@ -1,32 +1,4 @@
-@body-font-size: 1em;
@bs-skin-path: ;
-
-// BlueSpice
-//
INT:https://wiki.hallowelt.biz/index.php/Blue_spice/Style_Guide/Allgemeine_Designobjekte
-@bs-color-primary: #3e5389; //blue
-@bs-color-secondary: #ffae00; //orange
-@bs-color-tertiary: #b73a3a; //red
-@bs-color-neutral: #929292; //grey
-@bs-color-neutral2: #ABABAB; //lighten(@bs-color-neutral1, 10%); - LESS / RL
issue
-@bs-color-neutral3: #C4C4C4; //lighten(@bs-color-neutral1, 20%);
-@bs-color-neutral4: #787878; //darken(@bs-color-neutral1, 10%);
-@bs-color-dark-blue: rgb(62, 83, 137);
-@bs-color-bright-blue-a: rgba(205, 223, 242, 0.6);
-@bs-color-middle-blue-a: rgba(62, 83, 137, 0.44);
-@bs-color-middle-blue: rgba(152, 167, 196);
-@bs-color-light-grey: rgb(211, 211, 211);
-@bs-color-dark-grey: rgb(186, 186, 186);
-@bs-color-darker-grey: #494949;
-@bs-color-content-default: #252525;
-@bs-color-redlink: #ba;
-//@bs-font-default: Neue Helvetica, Helvetica, Arial, sans-serif;
-@bs-font-default: Source Sans Pro, sans-serif;
-@bs-font-roboto: RobotoSlab;
-@bs-box-shadow: 0px 4px 20px 0px rgba(9, 7, 9, 0.45);
-
-@bs-width-page: 1222px;
-@bs-width-navcol: 276px;
-@bs-margin-left-content: 302px;
.border-radius(@radius) {
-webkit-border-radius: @radius;
--
To view, visit https://gerrit.wikimedia.org/r/194854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ad1a5719acb1a78b20be7fb602f5112524c373d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ExtensionInfo: Fixed group title - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195217
Change subject: ExtensionInfo: Fixed group title
..
ExtensionInfo: Fixed group title
The package name is now displayed in the group title.
Change-Id: Id84808e41bcdf31fc978bb3bdb7bdbe73b0372ea
---
M ExtensionInfo/resources/BS.ExtensionInfo/Panel.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/17/195217/1
diff --git a/ExtensionInfo/resources/BS.ExtensionInfo/Panel.js
b/ExtensionInfo/resources/BS.ExtensionInfo/Panel.js
index 324f08d..180ce3b 100644
--- a/ExtensionInfo/resources/BS.ExtensionInfo/Panel.js
+++ b/ExtensionInfo/resources/BS.ExtensionInfo/Panel.js
@@ -53,7 +53,7 @@
this.features = [
Ext.create('Ext.grid.feature.Grouping',{
- groupHeaderTpl: '{text} ({[values.rows.length]}
' + mw.message( 'bs-extensioninfo-groupingtemplateviewtext',
'{[values.rows.length]}' ).text() + ')'
+ groupHeaderTpl: '{name} ({[values.rows.length]}
' + mw.message( 'bs-extensioninfo-groupingtemplateviewtext',
'{[values.rows.length]}' ).text() + ')'
})
];
--
To view, visit https://gerrit.wikimedia.org/r/195217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id84808e41bcdf31fc978bb3bdb7bdbe73b0372ea
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BsInsertImage: Fixes - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: BsInsertImage: Fixes
..
BsInsertImage: Fixes
* Used watchlist instead of deprecated watch param for API
* Some fields now wont be send to prevent API warnings
* Used a hidden field to create the value for text param
* Used windows-nonascii-filename message to localize API error message
* Upload field will not be reset after an error occurred
* Added TODO: Make a second ajax request to edit file description (text), cause
mediawiki api for action upload does not allow to change an existing text while
uploading
Change-Id: I20f7a5f7b5f62cacff12b5ea1170c1f8e3dfe006
---
M InsertFile/InsertFile.setup.php
M InsertFile/resources/BS.InsertFile/UploadPanel.js
2 files changed, 35 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/InsertFile/InsertFile.setup.php b/InsertFile/InsertFile.setup.php
index ccd9aef..5a65c49 100644
--- a/InsertFile/InsertFile.setup.php
+++ b/InsertFile/InsertFile.setup.php
@@ -83,7 +83,8 @@
'bs-insertfile-linktext',
'bs-insertfile-no-link',
'bs-insertfile-error-no-imagelink',
- 'bs-insertfile-error-no-medialink'
+ 'bs-insertfile-error-no-medialink',
+ 'windows-nonascii-filename',
)
) + $aResourceModuleTemplate;
diff --git a/InsertFile/resources/BS.InsertFile/UploadPanel.js
b/InsertFile/resources/BS.InsertFile/UploadPanel.js
index d323d23..8322c3f 100644
--- a/InsertFile/resources/BS.InsertFile/UploadPanel.js
+++ b/InsertFile/resources/BS.InsertFile/UploadPanel.js
@@ -29,7 +29,8 @@
name: 'file',
emptyText:
mw.message('bs-insertfile-uploadfileemptytext').plain(),
validator: this.validateFile,
- validateOnChange: true
+ validateOnChange: true,
+ clearOnSubmit: false
});
this.fuFile.on( 'change', this.fuFileChange, this );
@@ -42,6 +43,15 @@
this.taDescription = Ext.create('Ext.form.field.TextArea', {
fieldLabel:
mw.message('bs-insertfile-uploaddescfilelabel').plain(),
+ id: this.getId()+'-description',
+ value: '',
+ //name: 'text',
+ submitValue: false
+ });
+
+ //This hidden field will store the combined data of
this.storeLicenses,
+ //this.taDescription and this.bsCategories on submit
+ this.hfText = Ext.create('Ext.form.field.Hidden', {
id: this.getId()+'-text',
value: '',
name: 'text'
@@ -61,7 +71,8 @@
type: this.storeFileType
},
remoteSort: true,
- fields: ['text', 'value', 'indent']
+ fields: ['text', 'value', 'indent'],
+ submitValue: false
});
this.cbLicences = Ext.create('Ext.form.ComboBox',{
@@ -100,7 +111,8 @@
this.cbxWatch = Ext.create('Ext.form.field.Checkbox', {
boxLabel:
mw.message('bs-insertfile-uploadwatchthislabel').plain(),
id: this.getId()+'watch_page',
- name: 'watch'
+ name: 'watchlist',
+ inputValue: 'watch'
});
this.cbxWarnings = Ext.create('Ext.form.field.Checkbox', {
@@ -111,8 +123,8 @@
this.bsCategories = Ext.create( 'BS.form.CategoryBoxSelect', {
id: this.getId()+'categories',
- name: 'categories',
- fieldLabel:
mw.message('bs-insertfile-categories').plain()
+ fieldLabel:
mw.message('bs-insertfile-categories').plain(),
+ submitValue: false
});
this.fsDetails = Ext.create( 'Ext.form.FieldSet', {
@@ -205,6 +217,9 @@
return true;
},
+ //PW(12.03.2015) TODO: Make a second ajax request to edit file
description
+ //(text), cause mediawiki api for action upload does not allow to
change an
+ //existing text while uploading.
uploadFile: function( sessionKeyForReupload ) {
var desc = this.taDescription.getValue();
var licence = this.cbLicences.getValue();
@@ -222,7 +237,7 @@
});
desc += \n + categoryLink.toString();
}
- this.taDescription.setValue( desc );
+ this.hfText.setValue(desc);
this.cbLicences.disable(); //To prevent the form from
submitting a
[MediaWiki-commits] [Gerrit] SmartList: 'whatlinkshere' now supports 'cat' - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196212
Change subject: SmartList: 'whatlinkshere' now supports 'cat'
..
SmartList: 'whatlinkshere' now supports 'cat'
Added support for 'cat' and 'catmode' parameters to 'whatlinkshere' mode.
\/\
) ( ')
( / )
\(__)|
Change-Id: I4a0c911e1f9a29d2ac8be09922707de18e4f248f
---
M SmartList/SmartList.class.php
1 file changed, 33 insertions(+), 29 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/12/196212/1
diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php
index f20d600..cf765dd 100644
--- a/SmartList/SmartList.class.php
+++ b/SmartList/SmartList.class.php
@@ -707,16 +707,6 @@
if ( $aArgs['mode'] == 'recentchanges' ) {
$dbr = wfGetDB( DB_SLAVE );
$aConditions = array();
- // TODO RBV (17.05.11 16:52): Put this into abstraction
layer
- if ( $aArgs['categories'] != '-'
$aArgs['categories'] != '' ) {
- $aCategories = explode( ',',
$aArgs['categories'] );
- $iCnt = count( $aCategories );
- for ( $i = 0; $i $iCnt; $i++ ) {
- $aCategories[$i] = str_replace( ' ',
'_', $aCategories[$i] );
- $aCategories[$i] = ' . trim( ucfirst(
$aCategories[$i] ) ) . ';
- }
- $aArgs['categories'] = implode( ',',
$aCategories );
- }
switch ( $aArgs['period'] ) {
case 'month': $sMinTimestamp = $dbr-timestamp(
time() - 30 * 24 * 60 * 60 );
@@ -744,15 +734,7 @@
);
}
- if ( $aArgs['categories'] != '-'
$aArgs['categories'] != '' ) {
- if ( $aArgs['categoryMode'] == 'OR' ) {
- $aConditions[] = 'rc_cur_id IN ( SELECT
cl_from FROM ' . $dbr-tableName( 'categorylinks' ) . ' WHERE cl_to IN (' .
$aArgs['categories'] . ') )';
- } else {
- foreach ( $aCategories as $sCategory ) {
- $aConditions[] = 'rc_cur_id IN
( SELECT cl_from FROM ' . $dbr-tableName( 'categorylinks' ) . ' WHERE cl_to =
' . $sCategory . ' )';
- }
- }
- }
+ $this-makeCategoriesFilterCondition( $aConditions,
$aArgs, 'rc_cur_id' );
switch ( $aArgs['sort'] ) {
case 'title':
@@ -839,7 +821,7 @@
return $oErrorListView-execute();
}
- $oDbr = wfGetDB( DB_SLAVE );
+ $dbr = wfGetDB( DB_SLAVE );
$aTables = array(
'pagelinks',
'page',
@@ -874,6 +856,8 @@
return $oErrorListView-execute();
}
+ $this-makeCategoriesFilterCondition( $aConditions,
$aArgs, 'page_id' );
+
//Default: time
$aOptions['ORDER BY'] = $aArgs['sort'] == 'title'
? 'page_title'
@@ -886,7 +870,7 @@
: ' DESC'
;
- $oRes = $oDbr-select(
+ $res = $dbr-select(
$aTables,
$aFields,
$aConditions,
@@ -895,27 +879,26 @@
);
$iCount = 0;
- foreach( $oRes as $o ) {
+ foreach( $res as $row ) {
if( $iCount == $aArgs['count'] ) {
break;
}
- $oTitle = Title::makeTitleSafe( $o-namespace,
$o-title );
+ $oTitle = Title::makeTitleSafe(
$row-namespace, $row-title );
if( !$oTitle || !$oTitle-quickUserCan( 'read'
) ) {
continue;
}
- $aObjectList[] = $o;
+ $aObjectList[] = $row;
$iCount++;
}
- $oDbr-freeResult( $oRes );
+ $dbr-freeResult( $res );
} else {
-
[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/medi... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: Merge branch 'master' of https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceExtensions .. Merge branch 'master' of https://gerrit.wikimedia.org/r/mediawiki/extensions/BlueSpiceExtensions Change-Id: Ib9ef558db7adbe027ccbe8e4dde0d1c84d08c30b --- 0 files changed, 0 insertions(+), 0 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved -- To view, visit https://gerrit.wikimedia.org/r/19 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib9ef558db7adbe027ccbe8e4dde0d1c84d08c30b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ExtensionInfo: Fixed typo - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/195570 Change subject: ExtensionInfo: Fixed typo .. ExtensionInfo: Fixed typo ... Change-Id: I0f817c5f16faff2f5d7d978b3711d1bcfc6d1ca7 --- M ExtensionInfo/includes/ViewExtensionInfoTable.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/70/195570/1 diff --git a/ExtensionInfo/includes/ViewExtensionInfoTable.php b/ExtensionInfo/includes/ViewExtensionInfoTable.php index c95e851..da75ea8 100644 --- a/ExtensionInfo/includes/ViewExtensionInfoTable.php +++ b/ExtensionInfo/includes/ViewExtensionInfoTable.php @@ -86,7 +86,7 @@ $aOut[] = 'td'.$sVersion.'/td'; $aOut[] = '/tr'; $aOut[] = 'tr'; - $aOut[] = 'tda title=Mediawiki href=http://www.mediawiki.org/; Mediawiki /a/td'; + $aOut[] = 'tda title=MediaWiki href=http://www.mediawiki.org/; MediaWiki /a/td'; $oTitle = SpecialPage::getTitleFor( Version ); $aOut[] = 'tda title=' . $oTitle-getFullText() . ' href=' . $oTitle-getFullURL() . '' . $wgVersion . '/a/td'; $aOut[] = '/tr'; -- To view, visit https://gerrit.wikimedia.org/r/195570 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0f817c5f16faff2f5d7d978b3711d1bcfc6d1ca7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Robert Vogel vo...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BsMailer: Reverted Use of real name commit - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: BsMailer: Reverted Use of real name commit
..
BsMailer: Reverted Use of real name commit
* I996a6f4be4e37bfef2bd8c38ca3200209ad8a65b
* Must be username, cause it is needed for GENDER destinction
* However realname is $2
Change-Id: Iad357f51d1a616b53a17a186158b232df6730c68
---
M includes/Mailer.class.php
1 file changed, 4 insertions(+), 7 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index 1c69e62..e419aff 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -77,8 +77,8 @@
if ( $vReceiver instanceof User ) {
if ( $vReceiver-getEmail() ) {
$aEmailTo[] = array(
- 'mail' = new
MailAddress($vReceiver),
- 'greeting' =
BsCore::getUserDisplayName( $vReceiver ),
+ 'mail' = new
MailAddress($vReceiver),
+ 'greeting' =
$vReceiver-getName(),
);
}
} elseif ( strpos( $vReceiver, '@' ) !== false ) {
@@ -97,7 +97,7 @@
if ( $oUser-getEmail() ) {
$aEmailTo[] = array(
'mail' = new MailAddress(
$oUser ),
- 'greeting' =
BsCore::getUserDisplayName( $vReceiver ),
+ 'greeting' =
$vReceiver-getName(),
);
}
}
@@ -129,10 +129,7 @@
//Prepare message
if ( $aReceiver['greeting'] ) {
$oUser = User::newFromName(
$aReceiver['greeting'] );
- $sRealname = $oUser-getRealName();
- if ( empty( $sRealname ) ) {
- $sRealname = $aReceiver['greeting'];
- }
+ $sRealname = BsCore::getUserDisplayName( $oUser
);
$sGreeting = wfMessage(
'bs-email-greeting-receiver', $aReceiver['greeting'], $sRealname )
-inLanguage( $oUser-getOption(
'language' ) )
-text();
--
To view, visit https://gerrit.wikimedia.org/r/195512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad357f51d1a616b53a17a186158b232df6730c68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] GridFilter: Added icon for filtered columns - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: GridFilter: Added icon for filtered columns
..
GridFilter: Added icon for filtered columns
* An Icons is showen when a filter is activated on a grid column
Change-Id: I9f5a20402973598125ce8db7ded42f0d098b14d8
---
M resources/bluespice.extjs/bluespice.extjs.fixes.css
A resources/bluespice.extjs/images/icon_filter.png
2 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/resources/bluespice.extjs/bluespice.extjs.fixes.css
b/resources/bluespice.extjs/bluespice.extjs.fixes.css
index 11321d8..63c846e 100644
--- a/resources/bluespice.extjs/bluespice.extjs.fixes.css
+++ b/resources/bluespice.extjs/bluespice.extjs.fixes.css
@@ -88,4 +88,11 @@
.x-btn-toolbar {
text-decoration: none !important;
+}
+
+.ux-filtered-column {
+ /*@embed*/
+ background-image:url(images/icon_filter.png);
+ background-repeat: no-repeat !important;
+ background-position: calc(100% - 5px) 3px !important;
}
\ No newline at end of file
diff --git a/resources/bluespice.extjs/images/icon_filter.png
b/resources/bluespice.extjs/images/icon_filter.png
new file mode 100644
index 000..18711fc
--- /dev/null
+++ b/resources/bluespice.extjs/images/icon_filter.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/195549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9f5a20402973598125ce8db7ded42f0d098b14d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added missing en l10n - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: added missing en l10n .. added missing en l10n Change-Id: I68849a9ac1db0145d654d4edb4ebba47a1500418 --- M GroupManager/GroupManager.i18n.php 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/GroupManager/GroupManager.i18n.php b/GroupManager/GroupManager.i18n.php index ead3236..637aa03 100644 --- a/GroupManager/GroupManager.i18n.php +++ b/GroupManager/GroupManager.i18n.php @@ -127,6 +127,8 @@ 'bs-groupmanager-grp_exists'= 'The group already exists.', 'bs-groupmanager-grp_not_exists'= 'The group does not exist.', 'bs-groupmanager-grpadded' = 'The group has been added successfully', + 'bs-groupmanager-grpedited' = 'The group has been edited successfully', + 'bs-groupmanager-grpremoved'= 'The group has been removed successfully', 'bs-groupmanager-import'= 'import articles', 'bs-groupmanager-invalid_grp' = 'The group name is invalid.', 'bs-groupmanager-invalid_grp_esc' = 'The group name is invalid. Please do not use apostrophes or backslashes.', -- To view, visit https://gerrit.wikimedia.org/r/193818 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68849a9ac1db0145d654d4edb4ebba47a1500418 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_22 Gerrit-Owner: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] notifications + warning fix - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: notifications + warning fix
..
notifications + warning fix
* fixed warning in pm
* changed some echo message calls to actually work
Change-Id: I9c65a8a790443bc25f2968c62200f96678eae443
---
M Notifications/Notifications.class.php
M Notifications/includes/BsNotificationsFormatter.class.php
M PermissionManager/PermissionManager.class.php
M ShoutBox/ShoutBox.class.php
4 files changed, 14 insertions(+), 8 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Notifications/Notifications.class.php
b/Notifications/Notifications.class.php
index 4b82a4b..fccb30b 100644
--- a/Notifications/Notifications.class.php
+++ b/Notifications/Notifications.class.php
@@ -290,11 +290,11 @@
'flyout-message' =
'bs-notifications-email-addaccount-subject',
'flyout-params' = array( 'userlink' ),
'email-subject-message' =
'bs-notifications-email-addaccount-subject',
- 'email-subject-params' = array( 'user' ),
+ 'email-subject-params' = array( 'username' ),
'email-body-message' =
'bs-notifications-email-addaccount',
- 'email-body-params' = array( 'userlink' ),
+ 'email-body-params' = array( 'userlink', 'username' ),
'email-body-batch-message' =
'bs-notifications-email-addaccount',
- 'email-body-batch-params' = array( 'userlink' ),
+ 'email-body-batch-params' = array(
'userlink','username' ),
'icon' = 'bs-newuser',
);
@@ -464,6 +464,7 @@
// TODO SW: implement own notifications formatter
'extra' = array(
'user' = $oUser-getName(),
+ 'username' =
isset($aUserDetails['realname']) ? $aUserDetails['realname'] :
$aUserDetails['username'],
'userlink' = true,
)
) );
diff --git a/Notifications/includes/BsNotificationsFormatter.class.php
b/Notifications/includes/BsNotificationsFormatter.class.php
index 63ead14..df60fb1 100644
--- a/Notifications/includes/BsNotificationsFormatter.class.php
+++ b/Notifications/includes/BsNotificationsFormatter.class.php
@@ -91,6 +91,10 @@
$aExtra = $event-getExtra();
$sMessage = $aExtra['shoutmsg'];
$message-params( $sMessage );
+ } else if( $param === 'username' ) {
+ $aExtra = $event-getExtra();
+ $sMessage = $aExtra['username'];
+ $message-params( $sMessage );
} else {
parent::processParam( $event, $param, $message, $user );
}
diff --git a/PermissionManager/PermissionManager.class.php
b/PermissionManager/PermissionManager.class.php
index aa1642d..bd19064 100644
--- a/PermissionManager/PermissionManager.class.php
+++ b/PermissionManager/PermissionManager.class.php
@@ -344,7 +344,7 @@
);
}
$aConfig = $bsgPermissionConfig[$sRight];
- $bGlobalPermission = $aConfig['type'] ==
'global' ? true : false;
+ $bGlobalPermission = (isset($aConfig['type'])
$aConfig['type'] == 'global') ? true : false;
$aMetadata[] = array(
'right' = $sRight,
'type' = $bGlobalPermission ? 2 : 1,
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index b57deee..ca4c60d 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -627,13 +627,14 @@
'category' = 'bs-shoutbox-mention-cat',
'group' = 'neutral',
'formatter-class' = 'BsNotificationsFormatter',
- 'title-message' =
'bs-shoutbox-notifications-title-message-text',
- 'title-params' = array( 'agent', 'agentlink',
'titlelink' ),
+ 'title-message' =
'bs-shoutbox-notifications-title-message-subject',
'flyout-message' =
'bs-shoutbox-notifications-title-message-text',
- 'title-params' = array( 'agent', 'agentlink',
'titlelink' ),
+ 'flyout-params' = array( 'agent', 'agentlink',
'titlelink' ),
'email-subject-message' =
'bs-shoutbox-notifications-title-message-subject',
'email-body-message' =
'bs-shoutbox-notifications-title-message-text',
-
[MediaWiki-commits] [Gerrit] Review: Fixed comment issue added new icon - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196564
Change subject: Review: Fixed comment issue added new icon
..
Review: Fixed comment issue added new icon
* Fixed a bug where the user got displayed the wrong comment
* Added icon for 'active' state
Change-Id: I9c6ea901be6cab7e668023415a689b25d9abd40a
---
M Review/Review.class.php
M Review/resources/bluespice.review.css
A Review/resources/images/bs-infobar-workflow-active.png
A Review/resources/images/bs-infobar-workflow-active_sprite.png
4 files changed, 20 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/64/196564/1
diff --git a/Review/Review.class.php b/Review/Review.class.php
index 3ea4dff..de798eb 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -777,6 +777,8 @@
/**
* Hook-Handler for Hook 'BSStateBarBeforeTopViewAdd'
* @param StateBar $oStateBar
+* @param User $oUser
+* @param Title $oTitle
* @param array $aTopViews
* @return boolean Always true to keep hook running
*/
@@ -810,6 +812,15 @@
}
}
}
+
+ $aNextUsers = $oRev-getNextUsers();
+ foreach( $aNextUsers as $aNextUser ) {
+ if( $aNextUser['id'] === $oUser-getId() ) {
+ $sIcon = bs-infobar-workflow-active;
+ break;
+ }
+ }
+
$sIcon .= .png;
$aTopViews['statebartopreview'] =
$this-makeStateBarTopReview($sIcon);
@@ -960,7 +971,7 @@
$oReviewView-setVotable( true );
$sUserName = BsCore::getUserDisplayName($oUser);
- $oReviewView-setComment( em{$sUserName}:/em
{$_step-comment} );
+ $oReviewView-setComment( em{$sUserName}:/em
{$step-comment} );
wfRunHooks('BsReview::checkStatus::afterMessage', array($step,
$oReviewView));
if ( $oTitle-userCan( workflowview, $oUser ) ) {
diff --git a/Review/resources/bluespice.review.css
b/Review/resources/bluespice.review.css
index 48aec30..1912cd2 100644
--- a/Review/resources/bluespice.review.css
+++ b/Review/resources/bluespice.review.css
@@ -27,6 +27,14 @@
height:24px;
}
+.rv_active {
+ background-repeat:no-repeat;
+ /*@embed*/
+ background-image:url(images/bs-infobar-workflow-active.png);
+ width:24px;
+ height:24px;
+}
+
.rv_unknown {
background-repeat:no-repeat;
/*@embed*/
diff --git a/Review/resources/images/bs-infobar-workflow-active.png
b/Review/resources/images/bs-infobar-workflow-active.png
new file mode 100644
index 000..d27872d
--- /dev/null
+++ b/Review/resources/images/bs-infobar-workflow-active.png
Binary files differ
diff --git a/Review/resources/images/bs-infobar-workflow-active_sprite.png
b/Review/resources/images/bs-infobar-workflow-active_sprite.png
new file mode 100644
index 000..d7240bd
--- /dev/null
+++ b/Review/resources/images/bs-infobar-workflow-active_sprite.png
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/196564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c6ea901be6cab7e668023415a689b25d9abd40a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BsInsertImage: Fixed inital file description - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: BsInsertImage: Fixed inital file description .. BsInsertImage: Fixed inital file description * Added hidden text filed to detailsItems[] Change-Id: I38639acf6c687dd9792cdb8adabc5266e4bef418 --- M InsertFile/resources/BS.InsertFile/UploadPanel.js 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved Tweichart: Looks good to me, but someone else must approve diff --git a/InsertFile/resources/BS.InsertFile/UploadPanel.js b/InsertFile/resources/BS.InsertFile/UploadPanel.js index 8322c3f..cfa824d 100644 --- a/InsertFile/resources/BS.InsertFile/UploadPanel.js +++ b/InsertFile/resources/BS.InsertFile/UploadPanel.js @@ -145,6 +145,7 @@ this.fsDetails ]; var detailsItems = [ + this.hfText, this.bsCategories, this.taDescription, this.cbLicences, -- To view, visit https://gerrit.wikimedia.org/r/196577 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I38639acf6c687dd9792cdb8adabc5266e4bef418 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Pwirth wi...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added code tag to list of tags special tags - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Added code tag to list of tags special tags
..
Added code tag to list of tags special tags
The content of code tags must not be altered. So they are treated as
special tags in the future.
Change-Id: I95e6ccd5e8a2bbfc2f63b30f2a04d5f4a9d6f359
---
M VisualEditor/VisualEditor.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/VisualEditor/VisualEditor.class.php
b/VisualEditor/VisualEditor.class.php
index 5e3a31d..7b8833e 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -314,7 +314,7 @@
$aDefaultTags = array(
syntaxhighlight, source, infobox, categorytree,
presentation, includeonly, onlyinclude,
noinclude,
- backlink, gallery, math, video, rss,
tagcloud
+ backlink, gallery, math, video, rss,
tagcloud, code
);
$this-aConfigStandard[specialtaglist] =
BsConfig::get('MW::VisualEditor::SpecialTags')
. implode('|', $aDefaultTags);
--
To view, visit https://gerrit.wikimedia.org/r/196209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I95e6ccd5e8a2bbfc2f63b30f2a04d5f4a9d6f359
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Review: Notifications - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Review: Notifications
..
Review: Notifications
* Re-Added i18n keys that got lost to imporvements
* Fixed qqq for existing mail i18n-keys
* Stoped using sendNotification method - keys will not be generated now
* Marked Review::sendNotification as deprecated
* Added TODO for echo notifications
* Used -text() instead of -plain() for mail messages
* Removed old params for lost keys
* Used GENDER destinction in de, de-formal, en
* prevented review finished mail from being sent when review is not finished
Change-Id: I0ce9f270021013eb233e7105ca2513ba14f1a568
---
M Review/Review.class.php
M Review/i18n/de-formal.json
M Review/i18n/de.json
M Review/i18n/en.json
M Review/i18n/qqq.json
5 files changed, 143 insertions(+), 28 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Tweichart: Checked; Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, but someone else must approve
diff --git a/Review/Review.class.php b/Review/Review.class.php
index 20f29a6..3b5880c 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -341,7 +341,8 @@
/**
* Wrapper method for the process of sending notification mails
-*
+* DEPRECATED - Use own functionallity instead!
+* @deprecated since version 2.23.1
* @param string $sType a key which identifies the messages keys for
the mail (accept, decline etc)
* @param User $oReceiver the user object of the user which should get
the notification
* @param array $aParams additional parameters for the message
@@ -350,6 +351,7 @@
*/
public static function sendNotification($sType, $oReceiver, $aParams =
array(), $sRelatedLink = null, $oInvolvedUser = null) {
global $wgSitename;
+ wfDeprecated( __METHOD__, '2.23.1' );
// save the basic message key for this mail
$sBaseMessageKey = bs-review-mail- . strtolower($sType);
@@ -1036,8 +1038,6 @@
}
$oReview = BsExtensionManager::getExtension('Review');
- $sTitleText = $oTitle-getPrefixedText();
- $sLink = BsLinkProvider::makeLink( $oTitle,
$oTitle-getFullURL() );
$oNext = null;
$dbw = wfGetDB(DB_MASTER);
@@ -1096,7 +1096,6 @@
// Identify owner
$oReviewProcess = BsReviewProcess::newFromPid($iArticleId);
$oOwner = User::newFromID($oReviewProcess-getOwner());
- $sOwnerMail = $oOwner-getEmail();
$sUserName = BsCore::getUserDisplayName($oUser);
$sOwnerName = BsCore::getUserDisplayName($oOwner);
@@ -1120,18 +1119,67 @@
$oTitle-invalidateCache();
+ if( $sVote == 'no' $oReviewProcess-isSequential() ) {
+ $oReviewProcess-reset( $sComment );
+ }
+
+ //PW(09.03.2015): Echo notifications
+ //Notify the owner of the revie, that a user did some action
+ // if the receiver deactivated mail notifications, we stop
right here
+ if (!BsConfig::getVarForUser('MW::Review::EmailNotifyReviewer',
$oOwner-getName())) {
+ // Unfortunately, there is no way of verifying the
result :(
+ return wfMessage('bs-review-review-saved')-plain();
+ }
+
+ $aParams = array(
+ BsCore::getUserDisplayName( $oUser ),
+ $oUser-getName(),
+ $oTitle-getPrefixedText(),
+ );
+
if ($sVote == 'yes') {
- self::sendNotification('accept', $oOwner,
array($sTitleText, date('Y-m-d')), $sLink, $oUser);
+ $sSubject = wfMessage( bs-review-mail-accept-header,
$aParams )
+ -inLanguage( $oOwner-getOption('language') )
+ -text()
+ ;
+ $sMessage = wfMessage( bs-review-mail-accept-body,
$aParams )
+ -inLanguage( $oOwner-getOption('language') )
+ -text()
+ ;
} elseif ($sVote == 'no') {
if ($oReviewProcess-isSequential()) {
- $oReviewProcess-reset($sComment);
- self::sendNotification('deny-and-restart',
$oOwner, array($sTitleText, date('Y-m-d')), $sLink, $oUser);
+ $sSubject = wfMessage(
bs-review-mail-deny-and-restart-header, $aParams )
+ -inLanguage(
$oOwner-getOption('language') )
+ -text()
+ ;
+
[MediaWiki-commits] [Gerrit] ExtJS CSS fixes: Combobox flyout font-size - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/196205
Change subject: ExtJS CSS fixes: Combobox flyout font-size
..
ExtJS CSS fixes: Combobox flyout font-size
BlueSpiceSkin messes this up
Change-Id: Ib347a64cdb4568f8b37a4f61747ebb49d4a2f785
---
M resources/bluespice.extjs/bluespice.extjs.fixes.css
1 file changed, 4 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/05/196205/1
diff --git a/resources/bluespice.extjs/bluespice.extjs.fixes.css
b/resources/bluespice.extjs/bluespice.extjs.fixes.css
index 63c846e..3404c88 100644
--- a/resources/bluespice.extjs/bluespice.extjs.fixes.css
+++ b/resources/bluespice.extjs/bluespice.extjs.fixes.css
@@ -95,4 +95,8 @@
background-image:url(images/icon_filter.png);
background-repeat: no-repeat !important;
background-position: calc(100% - 5px) 3px !important;
+}
+
+.x-boundlist-item {
+ font-size: 13px;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/196205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib347a64cdb4568f8b37a4f61747ebb49d4a2f785
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added i18n for notification on review complete - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: added i18n for notification on review complete
..
added i18n for notification on review complete
Change-Id: I402fffc0b21e1a00fa75dbc59a46d1ca9e66d16c
---
M Review/i18n/de.json
M Review/i18n/en.json
M Review/i18n/qqq.json
3 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Pwirth: Checked; Looks good to me, but someone else must approve
Raimond Spekking: Looks good to me, but someone else must approve
diff --git a/Review/i18n/de.json b/Review/i18n/de.json
index 3fcb099..6a29aa7 100644
--- a/Review/i18n/de.json
+++ b/Review/i18n/de.json
@@ -77,5 +77,6 @@
bs-review-header-enddate: Ende,
bs-review-confirm-delete-step: Möchtest du diesen Schritt wirklich
löschen?,
bs-review-confirm-delete-review: Möchtest du diese Begutachtung
wirklich löschen?,
- bs-review-error-insufficient-permissions: Du hast nicht die
benötigte Berechtigung, um diese Aktion auszuführen (\$1\ wird benötigt).
+ bs-review-error-insufficient-permissions: Du hast nicht die
benötigte Berechtigung, um diese Aktion auszuführen (\$1\ wird benötigt).,
+ echo-category-title-bs-review-complete-cat: Benachrichtigung beim
Abschließen einer Begutachtung
}
diff --git a/Review/i18n/en.json b/Review/i18n/en.json
index 4631e0b..1aeaed9 100644
--- a/Review/i18n/en.json
+++ b/Review/i18n/en.json
@@ -75,5 +75,6 @@
bs-review-header-enddate: End,
bs-review-confirm-delete-step: Do you really want to delete this
step?,
bs-review-confirm-delete-review: Do you really want to delete this
review?,
- bs-review-error-insufficient-permissions: You don't have the
permission to execute this action (\$1\ needed).
+ bs-review-error-insufficient-permissions: You don't have the
permission to execute this action (\$1\ needed).,
+ echo-category-title-bs-review-complete-cat: Notification for
completing a review
}
diff --git a/Review/i18n/qqq.json b/Review/i18n/qqq.json
index c13278c..9364b8d 100644
--- a/Review/i18n/qqq.json
+++ b/Review/i18n/qqq.json
@@ -81,5 +81,6 @@
bs-review-header-enddate: Column headline for
end\n{{Identical|End}},
bs-review-confirm-delete-step: Text message if you want to delete a
step of a review,
bs-review-confirm-delete-review: Text message if you want to delete
the review,
- bs-review-error-insufficient-permissions: Text message if user tries
to do a review without the permissions.\n\nParameters:\n* $1 - the permission
they're lacking
+ bs-review-error-insufficient-permissions: Text message if user tries
to do a review without the permissions.\n\nParameters:\n* $1 - the permission
they're lacking,
+ echo-category-title-bs-review-complete-cat: Settings message for
notify on completing a review
}
--
To view, visit https://gerrit.wikimedia.org/r/193371
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I402fffc0b21e1a00fa75dbc59a46d1ca9e66d16c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Raimond Spekking raimond.spekk...@gmail.com
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added marker about table_class_list - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Added marker about table_class_list
..
Added marker about table_class_list
Reminder not to use table_class_list. If used, the table properties dialog
will break table formatting.
Change-Id: Ie6b139092f110c758614ada990927f90aa1a801a
---
M VisualEditor/VisualEditor.class.php
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/VisualEditor/VisualEditor.class.php
b/VisualEditor/VisualEditor.class.php
index 95318af..5e3a31d 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -169,6 +169,7 @@
array('title' = 'Paragraph', 'block' = 'p')
),
'contextmenu' = 'bsContextMenuMarker image | inserttable
bstableprops bsdeletetable bscell bsrow bscolumn'
+ // do not use table_class_list, as this breaks any existing
classes upon editing
);
/**
--
To view, visit https://gerrit.wikimedia.org/r/195879
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie6b139092f110c758614ada990927f90aa1a801a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Mask templates in table style definitions - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Mask templates in table style definitions
..
Mask templates in table style definitions
This masks templates in table, tr, td, and th style definitions, as they
cannot be rendered in TinyMCE.
Change-Id: I7ce5b2109049f8991b883852f704e17aa6f2b9c7
---
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
1 file changed, 31 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Tweichart: Checked; Looks good to me, but someone else must approve
diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index f6595ce..ffcbe9e 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -2197,6 +2197,34 @@
text = text.replace(/span
class=toggletext([\s\S]*?)\/span/gmi, '$1');
}
+ // mark templates in table headers, as they cannot be rendered
+ var i = 0;
+ while (text.match(/^(\{\|.*?)(\{\{(.*?)\}\})(.*?)$/gmi)) {
+ text =
text.replace(/^(\{\|.*?)(\{\{(.*?)\}\})(.*?)$/gmi, '$1
data-bs-table-tpl'+i+'=$3$4');
+ i++;
+ }
+
+ // mark templates in row definitions, as they cannot be rendered
+ var i = 0;
+ while (text.match(/^(\|-.*?)(\{\{(.*?)\}\})(.*?)$/gmi)) {
+ text =
text.replace(/^(\|-.*?)(\{\{(.*?)\}\})(.*?)$/gmi, '$1
data-bs-tr-tpl'+i+'=$3$4');
+ i++;
+ }
+
+ // mark templates in header definitions, as they cannot be
rendered
+ var i = 0;
+ while (text.match(/^(!.*?)(\{\{(.*?)\}\})(.*?\|)/gmi)) {
+ text = text.replace(/^(!.*?)(\{\{(.*?)\}\})(.*?\|)/gmi,
'$1 data-bs-th-tpl'+i+'=$3$4');
+ i++;
+ }
+
+ // mark templates in cell definitions, as they cannot be
rendered
+ var i = 0;
+ while (text.match(/^(\|.*?)(\{\{(.*?)\}\})(.*?\|)/gmi)) {
+ text =
text.replace(/^(\|.*?)(\{\{(.*?)\}\})(.*?\|)/gmi, '$1
data-bs-td-tpl'+i+'=$3$4');
+ i++;
+ }
+
//special tags before pres prevents spaces in special tags like
GeSHi to take effect
text = _preserveSpecialTags(text);
@@ -2280,6 +2308,9 @@
}
e.content = _recoverSpecialTags(e.content);
+
+ // cleanup templates in table markers
+ e.content =
e.content.replace(/data-bs-t.*?-tpl.*?=(.*?)/gmi, {{$1}});
}
}
--
To view, visit https://gerrit.wikimedia.org/r/195581
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ce5b2109049f8991b883852f704e17aa6f2b9c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release 2.23.1: Manual merge from master - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/200549 Change subject: Release 2.23.1: Manual merge from master .. Release 2.23.1: Manual merge from master This is the complete codebase as of 2015-03-16 Change-Id: Ia30a8f0db4eb289f5d84cd3a714491d45af316f1 --- M ArticleInfo/ArticleInfo.class.php A ArticleInfo/i18n/awa.json A ArticleInfo/i18n/bgn.json A ArticleInfo/i18n/cv.json M ArticleInfo/i18n/eu.json A ArticleInfo/i18n/frr.json M ArticleInfo/i18n/lb.json A ArticleInfo/i18n/mai.json A ArticleInfo/i18n/ps.json A ArticleInfo/i18n/roa-tara.json A ArticleInfo/i18n/uz.json A ArticleInfo/i18n/vi.json M ArticleInfo/i18n/zh-hant.json M Authors/Authors.class.php M Authors/i18n/ast.json A Authors/i18n/eu.json M Authors/i18n/lv.json A Authors/i18n/vi.json M Authors/i18n/zh-hant.json M Authors/views/view.AuthorsUserPageProfileImageSetting.php M Avatars/Avatars.class.php A Avatars/i18n/bgn.json A Avatars/i18n/cv.json M Avatars/i18n/roa-tara.json A Avatars/i18n/vi.json M Blog/Blog.class.php A Blog/i18n/bho.json M Blog/i18n/de.json M Blog/i18n/en.json M Blog/i18n/es.json M Blog/i18n/eu.json M Blog/i18n/fr.json M Blog/i18n/gl.json A Blog/i18n/ksh.json M Blog/i18n/lb.json M Blog/i18n/mk.json M Blog/i18n/qqq.json A Blog/i18n/roa-tara.json A Blog/i18n/tl.json A Blog/i18n/vi.json M Blog/i18n/zh-hans.json M Blog/resources/bluespice.blog.css M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.class.php M CSyntaxHighlight/CSyntaxHighlight.class.php A CSyntaxHighlight/i18n/cv.json A CSyntaxHighlight/i18n/roa-tara.json M Checklist/Checklist.class.php M Checklist/i18n/de.json M Checklist/i18n/es.json M Checklist/i18n/eu.json M Checklist/i18n/fa.json M Checklist/i18n/gl.json A Checklist/i18n/ps.json A Checklist/i18n/roa-tara.json M Checklist/i18n/sv.json A Checklist/i18n/vi.json M Checklist/i18n/zh-hant.json M ContextMenu/ContextMenu.class.php A ContextMenu/i18n/az.json A ContextMenu/i18n/bgn.json M ContextMenu/i18n/fa.json A ContextMenu/i18n/ms.json A ContextMenu/i18n/roa-tara.json M ContextMenu/i18n/zh-hant.json M CountThings/CountThings.class.php M CountThings/i18n/de.json A CountThings/i18n/roa-tara.json M Dashboards/Dashboards.class.php A Dashboards/i18n/roa-tara.json M Emoticons/Emoticons.class.php M Emoticons/i18n/fa.json M Emoticons/i18n/id.json A Emoticons/i18n/ksh.json A Emoticons/i18n/pt.json A Emoticons/i18n/roa-tara.json M ExtendedEditBar/ExtendedEditBar.class.php M ExtendedEditBar/i18n/ce.json M ExtendedEditBar/i18n/eu.json A ExtendedEditBar/i18n/roa-tara.json M ExtendedSearch/ExtendedSearch.class.php M ExtendedSearch/api/ApiFeedExtendedSearch.php A ExtendedSearch/i18n/bgn.json M ExtendedSearch/i18n/ce.json A ExtendedSearch/i18n/cv.json M ExtendedSearch/i18n/eu.json M ExtendedSearch/i18n/gl.json A ExtendedSearch/i18n/krc.json A ExtendedSearch/i18n/ksh.json M ExtendedSearch/i18n/lb.json A ExtendedSearch/i18n/ps.json M ExtendedSearch/i18n/pt.json A ExtendedSearch/i18n/roa-tara.json M ExtendedSearch/i18n/sv.json M ExtensionInfo/ExtensionInfo.class.php A ExtensionInfo/i18n/bgn.json M ExtensionInfo/i18n/de.json A ExtensionInfo/i18n/jbo.json A ExtensionInfo/i18n/roa-tara.json M ExtensionInfo/i18n/zh-hans.json M ExtensionInfo/includes/ViewExtensionInfoTable.php M ExtensionInfo/resources/BS.ExtensionInfo/Panel.js M Flexiskin/Flexiskin.class.php A Flexiskin/i18n/bgn.json A Flexiskin/i18n/cv.json A Flexiskin/i18n/eu.json M Flexiskin/i18n/qqq.json A Flexiskin/i18n/roa-tara.json M Flexiskin/i18n/zh-hant.json R Flexiskin/resources/BS.Flexiskin/Menuitems/General.js R Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js R Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js M Flexiskin/resources/BS.Flexiskin/PreviewMenu.js D Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js M FormattingHelp/FormattingHelp.class.php A FormattingHelp/i18n/cv.json A FormattingHelp/i18n/eu.json A FormattingHelp/i18n/ksh.json M FormattingHelp/i18n/zh-hant.json M GroupManager/GroupManager.class.php A GroupManager/i18n/bgn.json M GroupManager/i18n/de.json A GroupManager/i18n/eu.json M GroupManager/i18n/gl.json M HideTitle/HideTitle.class.php M HideTitle/i18n/fa.json A HideTitle/i18n/gl.json A HideTitle/i18n/roa-tara.json M InsertCategory/InsertCategory.class.php A InsertCategory/i18n/bgn.json A InsertCategory/i18n/cv.json A InsertCategory/i18n/eu.json A InsertCategory/i18n/gl.json A InsertCategory/i18n/ksh.json M InsertCategory/i18n/oc.json A InsertCategory/i18n/roa-tara.json M InsertFile/InsertFile.class.php M InsertFile/InsertFile.setup.php A InsertFile/i18n/bgn.json A InsertFile/i18n/bs.json M InsertFile/i18n/en.json A InsertFile/i18n/eu.json A InsertFile/i18n/frc.json A InsertFile/i18n/gl.json A InsertFile/i18n/ka.json M InsertFile/i18n/lb.json A InsertFile/i18n/ps.json A InsertFile/i18n/roa-tara.json A InsertFile/i18n/si.json A InsertFile/i18n/ur.json A InsertFile/i18n/yi.json M InsertFile/i18n/zh-hant.json M
[MediaWiki-commits] [Gerrit] Release 2.23.1: Manual merge from master - change (mediawiki...BlueSpiceSkin)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200545
Change subject: Release 2.23.1: Manual merge from master
..
Release 2.23.1: Manual merge from master
This is the complete codebase as of 2015-03-16
Change-Id: I7be6941aabdff5646f3c52acbfa2889c5d19840a
---
A i18n/ar.json
M i18n/av.json
A i18n/bs.json
A i18n/cs.json
A i18n/eu.json
A i18n/fi.json
A i18n/frc.json
A i18n/gl.json
A i18n/hi.json
A i18n/ko.json
M i18n/nb.json
A i18n/oc.json
A i18n/ps.json
A i18n/szl.json
M resources/components/extension.widgetbar.less
M resources/components/skin.content.less
M resources/components/skin.menuTop.less
17 files changed, 143 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin
refs/changes/45/200545/1
diff --git a/i18n/ar.json b/i18n/ar.json
new file mode 100644
index 000..4f626c5
--- /dev/null
+++ b/i18n/ar.json
@@ -0,0 +1,12 @@
+{
+ @metadata: {
+ authors: [
+ Khaled
+ ]
+ },
+ bluespiceskin-desc: تصميم أضافة بلوسبايس,
+ bs-tools-widgets-headline: برمجيات صغيرة,
+ bs-tools-button: المزيد,
+ bs-title-actions-print-text: أطبع,
+ bs-title-actions-print-title: أعرض الصفحة القابلة للطباعة
+}
diff --git a/i18n/av.json b/i18n/av.json
index 33662a8..8fa0833 100644
--- a/i18n/av.json
+++ b/i18n/av.json
@@ -1,12 +1,13 @@
{
@metadata: {
authors: [
- Gazimagomedov
+ Gazimagomedov,
+ Аль-Гимравий
]
},
bluespiceskin-desc: Расширениялъул сипат-сурат гьабиялъул куц
BӀueSpice,
bs-tools-widgets-headline: ВИДЖЕТАЛ,
bs-tools-button: ЖЕГИ,
bs-title-actions-print-text: КIутIизе,
- bs-title-actions-print-title: КӀутӀизе бегьулеб гьумералъул версия
бихьизабула
+ bs-title-actions-print-title: Басмаялда бахъизе версия бихьизабула
}
diff --git a/i18n/bs.json b/i18n/bs.json
new file mode 100644
index 000..606481f
--- /dev/null
+++ b/i18n/bs.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Palapa
+ ]
+ },
+ bs-title-actions-print-text: Štampaj
+}
diff --git a/i18n/cs.json b/i18n/cs.json
new file mode 100644
index 000..5a3d6c9
--- /dev/null
+++ b/i18n/cs.json
@@ -0,0 +1,13 @@
+{
+ @metadata: {
+ authors: [
+ Juandev,
+ Mormegil
+ ]
+ },
+ bluespiceskin-desc: Vzhled rozšíření BlueSpice,
+ bs-tools-widgets-headline: WIDGETY,
+ bs-tools-button: VÍCE,
+ bs-title-actions-print-text: Tisknout,
+ bs-title-actions-print-title: Zobrazit tuto stránku ve verzi pro
tisk
+}
diff --git a/i18n/eu.json b/i18n/eu.json
new file mode 100644
index 000..e270de9
--- /dev/null
+++ b/i18n/eu.json
@@ -0,0 +1,9 @@
+{
+ @metadata: {
+ authors: [
+ Subi
+ ]
+ },
+ bs-tools-button: GEHIAGO,
+ bs-title-actions-print-text: Inprimatu
+}
diff --git a/i18n/fi.json b/i18n/fi.json
new file mode 100644
index 000..de0d94c
--- /dev/null
+++ b/i18n/fi.json
@@ -0,0 +1,12 @@
+{
+ @metadata: {
+ authors: [
+ McSalama
+ ]
+ },
+ bluespiceskin-desc: BlueSpice-laajennuksen teema,
+ bs-tools-widgets-headline: PIENOISOHJELMAT,
+ bs-tools-button: LISÄÄ,
+ bs-title-actions-print-text: Tulosta,
+ bs-title-actions-print-title: Näyttää tulostettavan version sivusta
+}
diff --git a/i18n/frc.json b/i18n/frc.json
new file mode 100644
index 000..4ee260a
--- /dev/null
+++ b/i18n/frc.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Hangmanwa7id
+ ]
+ },
+ bs-tools-button: PLUS
+}
diff --git a/i18n/gl.json b/i18n/gl.json
new file mode 100644
index 000..16b19aa
--- /dev/null
+++ b/i18n/gl.json
@@ -0,0 +1,12 @@
+{
+ @metadata: {
+ authors: [
+ Elisardojm
+ ]
+ },
+ bluespiceskin-desc: Aparencia da extensión BlueSpice,
+ bs-tools-widgets-headline: WIDGETS,
+ bs-tools-button: MÁIS,
+ bs-title-actions-print-text: Imprimir,
+ bs-title-actions-print-title: Muestra unha versión da páxina
axeitada para imprimirse
+}
diff --git a/i18n/hi.json b/i18n/hi.json
new file mode 100644
index 000..5155bdc
--- /dev/null
+++ b/i18n/hi.json
@@ -0,0 +1,12 @@
+{
+ @metadata: {
+ authors: [
+ Siddhartha Ghai
+ ]
+ },
+ bluespiceskin-desc: ब्लू स्पाइस एक्सटेंशन की त्वचा,
+ bs-tools-widgets-headline: विजेट,
+ bs-tools-button: अधिक,
+ bs-title-actions-print-text: प्रिंट करें,
+
[MediaWiki-commits] [Gerrit] Release 2.23.1: Manual merge from master - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: Release 2.23.1: Manual merge from master .. Release 2.23.1: Manual merge from master This is the complete codebase as of 2015-03-16 Change-Id: Ia30a8f0db4eb289f5d84cd3a714491d45af316f1 --- M ArticleInfo/ArticleInfo.class.php A ArticleInfo/i18n/awa.json A ArticleInfo/i18n/bgn.json A ArticleInfo/i18n/cv.json M ArticleInfo/i18n/eu.json A ArticleInfo/i18n/frr.json M ArticleInfo/i18n/lb.json A ArticleInfo/i18n/mai.json A ArticleInfo/i18n/ps.json A ArticleInfo/i18n/roa-tara.json A ArticleInfo/i18n/uz.json A ArticleInfo/i18n/vi.json M ArticleInfo/i18n/zh-hant.json M Authors/Authors.class.php M Authors/i18n/ast.json A Authors/i18n/eu.json M Authors/i18n/lv.json A Authors/i18n/vi.json M Authors/i18n/zh-hant.json M Authors/views/view.AuthorsUserPageProfileImageSetting.php M Avatars/Avatars.class.php A Avatars/i18n/bgn.json A Avatars/i18n/cv.json M Avatars/i18n/roa-tara.json A Avatars/i18n/vi.json M Blog/Blog.class.php A Blog/i18n/bho.json M Blog/i18n/de.json M Blog/i18n/en.json M Blog/i18n/es.json M Blog/i18n/eu.json M Blog/i18n/fr.json M Blog/i18n/gl.json A Blog/i18n/ksh.json M Blog/i18n/lb.json M Blog/i18n/mk.json M Blog/i18n/qqq.json A Blog/i18n/roa-tara.json A Blog/i18n/tl.json A Blog/i18n/vi.json M Blog/i18n/zh-hans.json M Blog/resources/bluespice.blog.css M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.class.php M CSyntaxHighlight/CSyntaxHighlight.class.php A CSyntaxHighlight/i18n/cv.json A CSyntaxHighlight/i18n/roa-tara.json M Checklist/Checklist.class.php M Checklist/i18n/de.json M Checklist/i18n/es.json M Checklist/i18n/eu.json M Checklist/i18n/fa.json M Checklist/i18n/gl.json A Checklist/i18n/ps.json A Checklist/i18n/roa-tara.json M Checklist/i18n/sv.json A Checklist/i18n/vi.json M Checklist/i18n/zh-hant.json M ContextMenu/ContextMenu.class.php A ContextMenu/i18n/az.json A ContextMenu/i18n/bgn.json M ContextMenu/i18n/fa.json A ContextMenu/i18n/ms.json A ContextMenu/i18n/roa-tara.json M ContextMenu/i18n/zh-hant.json M CountThings/CountThings.class.php M CountThings/i18n/de.json A CountThings/i18n/roa-tara.json M Dashboards/Dashboards.class.php A Dashboards/i18n/roa-tara.json M Emoticons/Emoticons.class.php M Emoticons/i18n/fa.json M Emoticons/i18n/id.json A Emoticons/i18n/ksh.json A Emoticons/i18n/pt.json A Emoticons/i18n/roa-tara.json M ExtendedEditBar/ExtendedEditBar.class.php M ExtendedEditBar/i18n/ce.json M ExtendedEditBar/i18n/eu.json A ExtendedEditBar/i18n/roa-tara.json M ExtendedSearch/ExtendedSearch.class.php M ExtendedSearch/api/ApiFeedExtendedSearch.php A ExtendedSearch/i18n/bgn.json M ExtendedSearch/i18n/ce.json A ExtendedSearch/i18n/cv.json M ExtendedSearch/i18n/eu.json M ExtendedSearch/i18n/gl.json A ExtendedSearch/i18n/krc.json A ExtendedSearch/i18n/ksh.json M ExtendedSearch/i18n/lb.json A ExtendedSearch/i18n/ps.json M ExtendedSearch/i18n/pt.json A ExtendedSearch/i18n/roa-tara.json M ExtendedSearch/i18n/sv.json M ExtensionInfo/ExtensionInfo.class.php A ExtensionInfo/i18n/bgn.json M ExtensionInfo/i18n/de.json A ExtensionInfo/i18n/jbo.json A ExtensionInfo/i18n/roa-tara.json M ExtensionInfo/i18n/zh-hans.json M ExtensionInfo/includes/ViewExtensionInfoTable.php M ExtensionInfo/resources/BS.ExtensionInfo/Panel.js M Flexiskin/Flexiskin.class.php A Flexiskin/i18n/bgn.json A Flexiskin/i18n/cv.json A Flexiskin/i18n/eu.json M Flexiskin/i18n/qqq.json A Flexiskin/i18n/roa-tara.json M Flexiskin/i18n/zh-hant.json R Flexiskin/resources/BS.Flexiskin/Menuitems/General.js R Flexiskin/resources/BS.Flexiskin/Menuitems/Header.js R Flexiskin/resources/BS.Flexiskin/Menuitems/Position.js M Flexiskin/resources/BS.Flexiskin/PreviewMenu.js D Flexiskin/resources/BS.Flexiskin/menu/BaseItem.js M FormattingHelp/FormattingHelp.class.php A FormattingHelp/i18n/cv.json A FormattingHelp/i18n/eu.json A FormattingHelp/i18n/ksh.json M FormattingHelp/i18n/zh-hant.json M GroupManager/GroupManager.class.php A GroupManager/i18n/bgn.json M GroupManager/i18n/de.json A GroupManager/i18n/eu.json M GroupManager/i18n/gl.json M HideTitle/HideTitle.class.php M HideTitle/i18n/fa.json A HideTitle/i18n/gl.json A HideTitle/i18n/roa-tara.json M InsertCategory/InsertCategory.class.php A InsertCategory/i18n/bgn.json A InsertCategory/i18n/cv.json A InsertCategory/i18n/eu.json A InsertCategory/i18n/gl.json A InsertCategory/i18n/ksh.json M InsertCategory/i18n/oc.json A InsertCategory/i18n/roa-tara.json M InsertFile/InsertFile.class.php M InsertFile/InsertFile.setup.php A InsertFile/i18n/bgn.json A InsertFile/i18n/bs.json M InsertFile/i18n/en.json A InsertFile/i18n/eu.json A InsertFile/i18n/frc.json A InsertFile/i18n/gl.json A InsertFile/i18n/ka.json M InsertFile/i18n/lb.json A InsertFile/i18n/ps.json A InsertFile/i18n/roa-tara.json A InsertFile/i18n/si.json A InsertFile/i18n/ur.json A InsertFile/i18n/yi.json M InsertFile/i18n/zh-hant.json M InsertFile/resources/BS.InsertFile/ImageDialog.js M
[MediaWiki-commits] [Gerrit] Release 2.23.1: Manual merge from master - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged. Change subject: Release 2.23.1: Manual merge from master .. Release 2.23.1: Manual merge from master This is the complete codebase as of 2015-03-16 Change-Id: Ic578dd35a6c549dcb36c27ae5448b3fe724b93f5 --- M BLUESPICE-RELEASE-HISTORY M BLUESPICE-RELEASE-NOTES M BlueSpiceFoundation.php M i18n/core/ast.json A i18n/core/bgn.json A i18n/core/bs.json A i18n/core/cv.json M i18n/core/de-formal.json M i18n/core/de.json M i18n/core/el.json M i18n/core/en.json M i18n/core/es.json A i18n/core/eu.json M i18n/core/fa.json M i18n/core/fr.json M i18n/core/gl.json M i18n/core/it.json A i18n/core/ksh.json M i18n/core/lb.json A i18n/core/min.json M i18n/core/mk.json M i18n/core/nds-nl.json A i18n/core/nds.json M i18n/core/oc.json A i18n/core/ps.json M i18n/core/pt.json M i18n/core/qqq.json M i18n/core/ru.json M i18n/core/sr-el.json A i18n/core/tl.json A i18n/core/vi.json M i18n/core/zh-hans.json A i18n/credits/bgn.json M i18n/credits/eu.json M i18n/credits/id.json A i18n/credits/ksh.json A i18n/credits/roa-tara.json M i18n/credits/zh-hant.json A i18n/diagnostics/pms.json A i18n/diagnostics/roa-tara.json A i18n/extjs-portal/bgn.json A i18n/extjs-portal/cv.json A i18n/extjs-portal/eu.json M i18n/extjs-portal/gl.json A i18n/extjs-portal/ksh.json M i18n/extjs-portal/zh-hant.json A i18n/extjs/bgn.json A i18n/extjs/bho.json M i18n/extjs/ce.json A i18n/extjs/cv.json M i18n/extjs/de.json M i18n/extjs/en.json M i18n/extjs/es.json M i18n/extjs/eu.json M i18n/extjs/fa.json M i18n/extjs/fr.json M i18n/extjs/gl.json M i18n/extjs/it.json M i18n/extjs/kk-cyrl.json A i18n/extjs/ksh.json M i18n/extjs/lb.json A i18n/extjs/lt.json M i18n/extjs/mk.json M i18n/extjs/om.json A i18n/extjs/ps.json M i18n/extjs/qqq.json M i18n/extjs/roa-tara.json A i18n/extjs/sdh.json A i18n/extjs/tl.json M i18n/extjs/zh-hans.json M i18n/extjs/zh-hant.json A i18n/installer/gl.json A i18n/installer/roa-tara.json M i18n/validator/zh-hant.json M includes/AutoLoader.php M includes/BsBaseTemplate.php M includes/Core.class.php M includes/DefaultSettings.php M includes/ExtensionMW.class.php M includes/Mailer.class.php M includes/api/ApiFormatJsonMW.php M includes/api/BsApiBase.php M includes/db/DatabaseOracleBase.php M includes/installer/BsWebInstallerOutput.php M includes/outputhandler/views/view.BaseElement.php M includes/utility/FileSystemHelper.class.php M includes/utility/GroupHelper.class.php M languages/BlueSpice.Credits.alias.php M languages/BlueSpice.Diagnostics.alias.php M resources/Resources.php M resources/bluespice.extjs/Ext.ux/grid/menu/RangeMenu.js M resources/bluespice.extjs/bluespice.extjs.fixes.css A resources/bluespice.extjs/images/icon_filter.png M resources/bluespice/bluespice.wikiText.js 94 files changed, 1,134 insertions(+), 442 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/BLUESPICE-RELEASE-HISTORY b/BLUESPICE-RELEASE-HISTORY index e48c2e5..26bb39c 100644 --- a/BLUESPICE-RELEASE-HISTORY +++ b/BLUESPICE-RELEASE-HISTORY @@ -5,6 +5,227 @@ = BlueSpice release notes = +==BlueSpice 2.23.0== +BlueSpice 2.23.0 is a minor and maintenance release. + +===Notable new features=== +* Internationalisation: BlueSpice is translated by the [https://translatewiki.net translatewiki.net] community. As of now it is completely available in Chinese (simplified), English, French, German, Macedonian, Russian, Spanish, Svedish and Ukrainian. There are 40 more languages with partial translations. +* Internationalization: Existing English and German localisation was completely revised and checked for consistency. +* Performance: BlueSpice now supports memcached caching and uses caching for its extensions. Expect a considerable performance increase. +* Skinning: BlueSpice skin has been completely rewritten. It is now easier extensible and maintainable. +* Skinning: There is a vector skin implementation for BlueSpice. +* Skinning: User and BlueSpice preferences have been completely redesigned for better usability. +* Skinning: Added MobileFronted extension for better mobile support (MW 1.23+) +* Installation: An integrated package installer for MediaWiki and BlueSpice was added. Now you can set up MediaWiki and BlueSpice in one go. +* Administration: Support for editing and deleting multiple items in most managers has been added. +* Administration: PermissionManager was completely rewritten. It is now faster and way easier to use, e.g. with fullscreen mode and quick switch between groups. +* Usability: In InsertFile dialogue, files can be found by their category. +* ExtendedSearch: Opensearch is now supported. Search BlueSpice from your browser's searchbox. +* ExtendedSearch: Precision has been improved by boosting content namespaces in scoring +* Context menu: A right click menu has been added to links in the content area that leads you directly to the page's actions. + +
[MediaWiki-commits] [Gerrit] Release 2.23.1: Manual merge from master - change (mediawiki...BlueSpiceSkin)
Robert Vogel has submitted this change and it was merged.
Change subject: Release 2.23.1: Manual merge from master
..
Release 2.23.1: Manual merge from master
This is the complete codebase as of 2015-03-16
Change-Id: I7be6941aabdff5646f3c52acbfa2889c5d19840a
---
A i18n/ar.json
M i18n/av.json
A i18n/bs.json
A i18n/cs.json
A i18n/eu.json
A i18n/fi.json
A i18n/frc.json
A i18n/gl.json
A i18n/hi.json
A i18n/ko.json
M i18n/nb.json
A i18n/oc.json
A i18n/ps.json
A i18n/szl.json
M resources/components/extension.widgetbar.less
M resources/components/skin.content.less
M resources/components/skin.menuTop.less
17 files changed, 143 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/i18n/ar.json b/i18n/ar.json
new file mode 100644
index 000..4f626c5
--- /dev/null
+++ b/i18n/ar.json
@@ -0,0 +1,12 @@
+{
+ @metadata: {
+ authors: [
+ Khaled
+ ]
+ },
+ bluespiceskin-desc: تصميم أضافة بلوسبايس,
+ bs-tools-widgets-headline: برمجيات صغيرة,
+ bs-tools-button: المزيد,
+ bs-title-actions-print-text: أطبع,
+ bs-title-actions-print-title: أعرض الصفحة القابلة للطباعة
+}
diff --git a/i18n/av.json b/i18n/av.json
index 33662a8..8fa0833 100644
--- a/i18n/av.json
+++ b/i18n/av.json
@@ -1,12 +1,13 @@
{
@metadata: {
authors: [
- Gazimagomedov
+ Gazimagomedov,
+ Аль-Гимравий
]
},
bluespiceskin-desc: Расширениялъул сипат-сурат гьабиялъул куц
BӀueSpice,
bs-tools-widgets-headline: ВИДЖЕТАЛ,
bs-tools-button: ЖЕГИ,
bs-title-actions-print-text: КIутIизе,
- bs-title-actions-print-title: КӀутӀизе бегьулеб гьумералъул версия
бихьизабула
+ bs-title-actions-print-title: Басмаялда бахъизе версия бихьизабула
}
diff --git a/i18n/bs.json b/i18n/bs.json
new file mode 100644
index 000..606481f
--- /dev/null
+++ b/i18n/bs.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Palapa
+ ]
+ },
+ bs-title-actions-print-text: Štampaj
+}
diff --git a/i18n/cs.json b/i18n/cs.json
new file mode 100644
index 000..5a3d6c9
--- /dev/null
+++ b/i18n/cs.json
@@ -0,0 +1,13 @@
+{
+ @metadata: {
+ authors: [
+ Juandev,
+ Mormegil
+ ]
+ },
+ bluespiceskin-desc: Vzhled rozšíření BlueSpice,
+ bs-tools-widgets-headline: WIDGETY,
+ bs-tools-button: VÍCE,
+ bs-title-actions-print-text: Tisknout,
+ bs-title-actions-print-title: Zobrazit tuto stránku ve verzi pro
tisk
+}
diff --git a/i18n/eu.json b/i18n/eu.json
new file mode 100644
index 000..e270de9
--- /dev/null
+++ b/i18n/eu.json
@@ -0,0 +1,9 @@
+{
+ @metadata: {
+ authors: [
+ Subi
+ ]
+ },
+ bs-tools-button: GEHIAGO,
+ bs-title-actions-print-text: Inprimatu
+}
diff --git a/i18n/fi.json b/i18n/fi.json
new file mode 100644
index 000..de0d94c
--- /dev/null
+++ b/i18n/fi.json
@@ -0,0 +1,12 @@
+{
+ @metadata: {
+ authors: [
+ McSalama
+ ]
+ },
+ bluespiceskin-desc: BlueSpice-laajennuksen teema,
+ bs-tools-widgets-headline: PIENOISOHJELMAT,
+ bs-tools-button: LISÄÄ,
+ bs-title-actions-print-text: Tulosta,
+ bs-title-actions-print-title: Näyttää tulostettavan version sivusta
+}
diff --git a/i18n/frc.json b/i18n/frc.json
new file mode 100644
index 000..4ee260a
--- /dev/null
+++ b/i18n/frc.json
@@ -0,0 +1,8 @@
+{
+ @metadata: {
+ authors: [
+ Hangmanwa7id
+ ]
+ },
+ bs-tools-button: PLUS
+}
diff --git a/i18n/gl.json b/i18n/gl.json
new file mode 100644
index 000..16b19aa
--- /dev/null
+++ b/i18n/gl.json
@@ -0,0 +1,12 @@
+{
+ @metadata: {
+ authors: [
+ Elisardojm
+ ]
+ },
+ bluespiceskin-desc: Aparencia da extensión BlueSpice,
+ bs-tools-widgets-headline: WIDGETS,
+ bs-tools-button: MÁIS,
+ bs-title-actions-print-text: Imprimir,
+ bs-title-actions-print-title: Muestra unha versión da páxina
axeitada para imprimirse
+}
diff --git a/i18n/hi.json b/i18n/hi.json
new file mode 100644
index 000..5155bdc
--- /dev/null
+++ b/i18n/hi.json
@@ -0,0 +1,12 @@
+{
+ @metadata: {
+ authors: [
+ Siddhartha Ghai
+ ]
+ },
+ bluespiceskin-desc: ब्लू स्पाइस एक्सटेंशन की त्वचा,
+ bs-tools-widgets-headline: विजेट,
+ bs-tools-button: अधिक,
+ bs-title-actions-print-text: प्रिंट करें,
+ bs-title-actions-print-title: इस पृष्ठ का प्रिंट करने लायक अवतरण
दिखाएँ
+}
[MediaWiki-commits] [Gerrit] Removed LESS include path - change (mediawiki...BlueSpiceSkin)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/200578 Change subject: Removed LESS include path .. Removed LESS include path This caused trouble with existing customer skins and had no advantage at the moment. Change-Id: I72204d3472f1a1c471f3d71ef70e13795a887346 --- M BlueSpiceSkin.php M includes/BlueSpiceSkinHooks.php 2 files changed, 1 insertion(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin refs/changes/78/200578/1 diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php index e193e40..fe7030a 100644 --- a/BlueSpiceSkin.php +++ b/BlueSpiceSkin.php @@ -89,11 +89,6 @@ 'myskin', 'nostalgia', 'simple', 'standard' ); // Set LESS global variables - $localBasePath = dirname( __DIR__ ); - $wgResourceLoaderLESSImportPaths = array_merge( $wgResourceLoaderLESSImportPaths, array( - $localBasePath/resources/, - ) ); - $wgResourceLoaderLESSVars += array( 'body-font-size' = '1em', 'bs-color-primary' = '#3e5389', //blue diff --git a/includes/BlueSpiceSkinHooks.php b/includes/BlueSpiceSkinHooks.php index 840788e..18ed4eb 100644 --- a/includes/BlueSpiceSkinHooks.php +++ b/includes/BlueSpiceSkinHooks.php @@ -83,7 +83,7 @@ 'text' = wfMessage( 'bs-navigation-contact' )-plain(), 'href' = 'http://www.blue-spice.org/de/ueber-uns/kontakt-anfahrt/', 'id' = 'contact' - ), + ) ) ); -- To view, visit https://gerrit.wikimedia.org/r/200578 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72204d3472f1a1c471f3d71ef70e13795a887346 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: master Gerrit-Owner: Robert Vogel vo...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Release 2.23.1: Manual merge from master - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/200532 Change subject: Release 2.23.1: Manual merge from master .. Release 2.23.1: Manual merge from master This is the complete codebase as of 2015-03-16 Change-Id: Ic578dd35a6c549dcb36c27ae5448b3fe724b93f5 --- M BLUESPICE-RELEASE-HISTORY M BLUESPICE-RELEASE-NOTES M BlueSpiceFoundation.php M i18n/core/ast.json A i18n/core/bgn.json A i18n/core/bs.json A i18n/core/cv.json M i18n/core/de-formal.json M i18n/core/de.json M i18n/core/el.json M i18n/core/en.json M i18n/core/es.json A i18n/core/eu.json M i18n/core/fa.json M i18n/core/fr.json M i18n/core/gl.json M i18n/core/it.json A i18n/core/ksh.json M i18n/core/lb.json A i18n/core/min.json M i18n/core/mk.json M i18n/core/nds-nl.json A i18n/core/nds.json M i18n/core/oc.json A i18n/core/ps.json M i18n/core/pt.json M i18n/core/qqq.json M i18n/core/ru.json M i18n/core/sr-el.json A i18n/core/tl.json A i18n/core/vi.json M i18n/core/zh-hans.json A i18n/credits/bgn.json M i18n/credits/eu.json M i18n/credits/id.json A i18n/credits/ksh.json A i18n/credits/roa-tara.json M i18n/credits/zh-hant.json A i18n/diagnostics/pms.json A i18n/diagnostics/roa-tara.json A i18n/extjs-portal/bgn.json A i18n/extjs-portal/cv.json A i18n/extjs-portal/eu.json M i18n/extjs-portal/gl.json A i18n/extjs-portal/ksh.json M i18n/extjs-portal/zh-hant.json A i18n/extjs/bgn.json A i18n/extjs/bho.json M i18n/extjs/ce.json A i18n/extjs/cv.json M i18n/extjs/de.json M i18n/extjs/en.json M i18n/extjs/es.json M i18n/extjs/eu.json M i18n/extjs/fa.json M i18n/extjs/fr.json M i18n/extjs/gl.json M i18n/extjs/it.json M i18n/extjs/kk-cyrl.json A i18n/extjs/ksh.json M i18n/extjs/lb.json A i18n/extjs/lt.json M i18n/extjs/mk.json M i18n/extjs/om.json A i18n/extjs/ps.json M i18n/extjs/qqq.json M i18n/extjs/roa-tara.json A i18n/extjs/sdh.json A i18n/extjs/tl.json M i18n/extjs/zh-hans.json M i18n/extjs/zh-hant.json A i18n/installer/gl.json A i18n/installer/roa-tara.json M i18n/validator/zh-hant.json M includes/AutoLoader.php M includes/BsBaseTemplate.php M includes/Core.class.php M includes/DefaultSettings.php M includes/ExtensionMW.class.php M includes/Mailer.class.php M includes/api/ApiFormatJsonMW.php M includes/api/BsApiBase.php M includes/db/DatabaseOracleBase.php M includes/installer/BsWebInstallerOutput.php M includes/outputhandler/views/view.BaseElement.php M includes/utility/FileSystemHelper.class.php M includes/utility/GroupHelper.class.php M languages/BlueSpice.Credits.alias.php M languages/BlueSpice.Diagnostics.alias.php M resources/Resources.php M resources/bluespice.extjs/Ext.ux/grid/menu/RangeMenu.js M resources/bluespice.extjs/bluespice.extjs.fixes.css A resources/bluespice.extjs/images/icon_filter.png M resources/bluespice/bluespice.wikiText.js 94 files changed, 1,134 insertions(+), 442 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/32/200532/1 diff --git a/BLUESPICE-RELEASE-HISTORY b/BLUESPICE-RELEASE-HISTORY index e48c2e5..26bb39c 100644 --- a/BLUESPICE-RELEASE-HISTORY +++ b/BLUESPICE-RELEASE-HISTORY @@ -5,6 +5,227 @@ = BlueSpice release notes = +==BlueSpice 2.23.0== +BlueSpice 2.23.0 is a minor and maintenance release. + +===Notable new features=== +* Internationalisation: BlueSpice is translated by the [https://translatewiki.net translatewiki.net] community. As of now it is completely available in Chinese (simplified), English, French, German, Macedonian, Russian, Spanish, Svedish and Ukrainian. There are 40 more languages with partial translations. +* Internationalization: Existing English and German localisation was completely revised and checked for consistency. +* Performance: BlueSpice now supports memcached caching and uses caching for its extensions. Expect a considerable performance increase. +* Skinning: BlueSpice skin has been completely rewritten. It is now easier extensible and maintainable. +* Skinning: There is a vector skin implementation for BlueSpice. +* Skinning: User and BlueSpice preferences have been completely redesigned for better usability. +* Skinning: Added MobileFronted extension for better mobile support (MW 1.23+) +* Installation: An integrated package installer for MediaWiki and BlueSpice was added. Now you can set up MediaWiki and BlueSpice in one go. +* Administration: Support for editing and deleting multiple items in most managers has been added. +* Administration: PermissionManager was completely rewritten. It is now faster and way easier to use, e.g. with fullscreen mode and quick switch between groups. +* Usability: In InsertFile dialogue, files can be found by their category. +* ExtendedSearch: Opensearch is now supported. Search BlueSpice from your browser's searchbox. +* ExtendedSearch: Precision has been improved by boosting content namespaces in scoring +* Context menu: A right click menu has been added to links in
[MediaWiki-commits] [Gerrit] [WIP] VisualEditor: Support of MediaWiki default styles - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200579
Change subject: [WIP] VisualEditor: Support of MediaWiki default styles
..
[WIP] VisualEditor: Support of MediaWiki default styles
Work in progess. No review/merge needed yet.
Change-Id: Id9fc580119b0a534f0f745242d9ec1aadcd9545f
---
M VisualEditor/VisualEditor.class.php
M VisualEditor/i18n/de.json
M VisualEditor/i18n/en.json
3 files changed, 12 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/79/200579/1
diff --git a/VisualEditor/VisualEditor.class.php
b/VisualEditor/VisualEditor.class.php
index 792ff58..036416e 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -166,7 +166,10 @@
array('title' = 'bs-visualeditor-alignbottom',
'selector' = 'td', 'styles' = array( 'vertical-align' = 'bottom') )
)),
array('title' = 'Pre', 'block' = 'pre', 'classes' =
'bs_pre_from_space'),
- array('title' = 'Paragraph', 'block' = 'p')
+ array('title' = 'Paragraph', 'block' = 'p'),
+ array('title' =
'bs-visualeditor-blockstyle-successbox', 'block' = 'div', 'classes' =
'successbox'),
+ array('title' =
'bs-visualeditor-blockstyle-warningbox', 'block' = 'div', 'classes' =
'warningbox'),
+ array('title' = 'bs-visualeditor-blockstyle-errorbox',
'block' = 'div', 'classes' = 'errorbox')
),
'contextmenu' = 'bsContextMenuMarker image | inserttable
bstableprops bsdeletetable bscell bsrow bscolumn'
// do not use table_class_list, as this breaks any existing
classes upon editing
diff --git a/VisualEditor/i18n/de.json b/VisualEditor/i18n/de.json
index 6e1cdd9..950c0af 100644
--- a/VisualEditor/i18n/de.json
+++ b/VisualEditor/i18n/de.json
@@ -37,5 +37,8 @@
bs-visualeditor-bsactions-heading4: Überschrift 4,
bs-visualeditor-bsactions-heading5: Überschrift 5,
bs-visualeditor-bsactions-heading6: Überschrift 6,
- bs-visualeditor-switch-noeditor-desc: Deaktiviert den Visuellen
Editor auf dieser Seite.
+ bs-visualeditor-switch-noeditor-desc: Deaktiviert den Visuellen
Editor auf dieser Seite.,
+ bs-visualeditor-blockstyle-successbox: Positiv,
+ bs-visualeditor-blockstyle-warningbox: Warnung,
+ bs-visualeditor-blockstyle-errorbox: Negativ
}
diff --git a/VisualEditor/i18n/en.json b/VisualEditor/i18n/en.json
index 9230b43..30d8704 100644
--- a/VisualEditor/i18n/en.json
+++ b/VisualEditor/i18n/en.json
@@ -36,5 +36,8 @@
bs-visualeditor-bsactions-heading4: Heading 4,
bs-visualeditor-bsactions-heading5: Heading 5,
bs-visualeditor-bsactions-heading6: Heading 6,
- bs-visualeditor-switch-noeditor-desc: Disables the visual editor on
this page.
+ bs-visualeditor-switch-noeditor-desc: Disables the visual editor on
this page.,
+ bs-visualeditor-blockstyle-successbox: Positive,
+ bs-visualeditor-blockstyle-warningbox: Warning,
+ bs-visualeditor-blockstyle-errorbox: Negative
}
--
To view, visit https://gerrit.wikimedia.org/r/200579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9fc580119b0a534f0f745242d9ec1aadcd9545f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BlueSpiceSkin: Skin js components are loaded earlier - change (mediawiki...BlueSpiceSkin)
Robert Vogel has submitted this change and it was merged. Change subject: BlueSpiceSkin: Skin js components are loaded earlier .. BlueSpiceSkin: Skin js components are loaded earlier * This stops some flickering and the page loading looks faster - even on pages with heavy extjs stuff Change-Id: Idf7d6a75fa202e3bc85f09cea7d46e051b54b12d (cherry picked from commit cb43477726d51a43cb433ebd6877a3bbd25945a4) --- M BlueSpiceSkin.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php index e193e40..2804f69 100644 --- a/BlueSpiceSkin.php +++ b/BlueSpiceSkin.php @@ -56,9 +56,9 @@ 'messages' = array( 'bs-tools-button' ), + 'position' = 'top', 'styles' = array(), 'dependencies' = array( - 'ext.bluespice', 'mediawiki.jqueryMsg', 'jquery.ui.tabs', ), -- To view, visit https://gerrit.wikimedia.org/r/200814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf7d6a75fa202e3bc85f09cea7d46e051b54b12d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: REL1_23 Gerrit-Owner: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Pwirth wi...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] changed return value so it works again for widgetbar - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: changed return value so it works again for widgetbar .. changed return value so it works again for widgetbar Change-Id: Ifd7357114d1dea332582554eb87bfc5395d9fd68 --- M SmartList/SmartList.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved Pwirth: Looks good to me, but someone else must approve diff --git a/SmartList/SmartList.class.php b/SmartList/SmartList.class.php index e712725..871a526 100644 --- a/SmartList/SmartList.class.php +++ b/SmartList/SmartList.class.php @@ -495,7 +495,7 @@ $aTmpViews = array(); $this-onBSWidgetBarGetDefaultWidgets( $aTmpViews, null, null ); - return $aTmpViews; + return $aTmpViews['SMARTLIST']; } /** -- To view, visit https://gerrit.wikimedia.org/r/197865 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd7357114d1dea332582554eb87bfc5395d9fd68 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Pwirth wi...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BlueSpiceSkin: Skin js components are loaded earlier - change (mediawiki...BlueSpiceSkin)
Robert Vogel has uploaded a new change for review. https://gerrit.wikimedia.org/r/200814 Change subject: BlueSpiceSkin: Skin js components are loaded earlier .. BlueSpiceSkin: Skin js components are loaded earlier * This stops some flickering and the page loading looks faster - even on pages with heavy extjs stuff Change-Id: Idf7d6a75fa202e3bc85f09cea7d46e051b54b12d (cherry picked from commit cb43477726d51a43cb433ebd6877a3bbd25945a4) --- M BlueSpiceSkin.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/BlueSpiceSkin refs/changes/14/200814/1 diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php index e193e40..2804f69 100644 --- a/BlueSpiceSkin.php +++ b/BlueSpiceSkin.php @@ -56,9 +56,9 @@ 'messages' = array( 'bs-tools-button' ), + 'position' = 'top', 'styles' = array(), 'dependencies' = array( - 'ext.bluespice', 'mediawiki.jqueryMsg', 'jquery.ui.tabs', ), -- To view, visit https://gerrit.wikimedia.org/r/200814 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf7d6a75fa202e3bc85f09cea7d46e051b54b12d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: REL1_23 Gerrit-Owner: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Pwirth wi...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BlueSpiceSkin: Skin js components are loaded earlier - change (mediawiki...BlueSpiceSkin)
Robert Vogel has submitted this change and it was merged. Change subject: BlueSpiceSkin: Skin js components are loaded earlier .. BlueSpiceSkin: Skin js components are loaded earlier * This stops some flickering and the page loading looks faster - even on pages with heavy extjs stuff Change-Id: Idf7d6a75fa202e3bc85f09cea7d46e051b54b12d --- M BlueSpiceSkin.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php index e193e40..2804f69 100644 --- a/BlueSpiceSkin.php +++ b/BlueSpiceSkin.php @@ -56,9 +56,9 @@ 'messages' = array( 'bs-tools-button' ), + 'position' = 'top', 'styles' = array(), 'dependencies' = array( - 'ext.bluespice', 'mediawiki.jqueryMsg', 'jquery.ui.tabs', ), -- To view, visit https://gerrit.wikimedia.org/r/200136 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idf7d6a75fa202e3bc85f09cea7d46e051b54b12d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: master Gerrit-Owner: Pwirth wi...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] watchlist bug fixed where i18n was not loaded properly - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: watchlist bug fixed where i18n was not loaded properly .. watchlist bug fixed where i18n was not loaded properly Change-Id: I592fc6007304a0a05355d5f5e167699b5d975a22 --- M WatchList/WatchList.setup.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved jenkins-bot: Checked diff --git a/WatchList/WatchList.setup.php b/WatchList/WatchList.setup.php index 3e25827..2ac2894 100644 --- a/WatchList/WatchList.setup.php +++ b/WatchList/WatchList.setup.php @@ -4,6 +4,6 @@ $GLOBALS['wgAutoloadClasses']['WatchList'] = __DIR__ . '/WatchList.class.php'; -$wgMessagesDirs['WatchList'] = __DIR__ . '/i18n'; +$wgMessagesDirs['BSWatchList'] = __DIR__ . '/i18n'; //TODO: Must not be WatchList, somehting's overriding here otherwise $wgExtensionMessagesFiles['WatchList'] = __DIR__ . '/languages/WatchList.i18n.php'; \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/200858 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I592fc6007304a0a05355d5f5e167699b5d975a22 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: REL1_23 Gerrit-Owner: Tweichart weich...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PageAccess: I18N fixes from translatewiki - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201136
Change subject: PageAccess: I18N fixes from translatewiki
..
PageAccess: I18N fixes from translatewiki
This is a follow up commit of I51bfa9c6c1cda0382fe60379712e4a7996e00c1d [1]
It applies the changes from legacy .i18n.php file to the json i18n file
and creates shim.
[1] https://gerrit.wikimedia.org/r/#/c/199254/1
Change-Id: I6805551d9b9b851d8e0b5d20b17a4b1950ce13e3
---
M PageAccess/PageAccess.i18n.php
M PageAccess/i18n/en.json
2 files changed, 29 insertions(+), 44 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/36/201136/1
diff --git a/PageAccess/PageAccess.i18n.php b/PageAccess/PageAccess.i18n.php
index e9cf848..5836d12 100644
--- a/PageAccess/PageAccess.i18n.php
+++ b/PageAccess/PageAccess.i18n.php
@@ -1,50 +1,35 @@
?php
/**
- * Internationalisation file for PageAccess
+ * This is a backwards-compatibility shim, generated by:
+ *
https://git.wikimedia.org/blob/mediawiki%2Fcore.git/HEAD/maintenance%2FgenerateJsonI18n.php
*
- * Part of BlueSpice for MediaWiki
+ * Beginning with MediaWiki 1.23, translation strings are stored in json files,
+ * and the EXTENSION.i18n.php file only exists to provide compatibility with
+ * older releases of MediaWiki. For more information about this migration, see:
+ * https://www.mediawiki.org/wiki/Requests_for_comment/Localisation_format
*
- * @author Marc Reymann reym...@hallowelt.biz
- * @author Stephan Muggli mug...@hallowelt.biz
- * @packageBlueSpice_Extensions
- * @subpackage CountThings
- * @copyright Copyright (C) 2012 Hallo Welt! - Medienwerkstatt GmbH, All
rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or
later
- * @filesource
+ * This shim maintains compatibility back to MediaWiki 1.17.
*/
-
$messages = array();
+if ( !function_exists( 'wfJsonI18nShimb8d8bcdc73ff1bd7' ) ) {
+ function wfJsonI18nShimb8d8bcdc73ff1bd7( $cache, $code, $cachedData ) {
+ $codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
+ foreach ( $codeSequence as $csCode ) {
+ $fileName = dirname( __FILE__ ) . /i18n//$csCode.json;
+ if ( is_readable( $fileName ) ) {
+ $data = FormatJson::decode( file_get_contents(
$fileName ), true );
+ foreach ( array_keys( $data ) as $key ) {
+ if ( $key === '' || $key[0] === '@' ) {
+ unset( $data[$key] );
+ }
+ }
+ $cachedData['messages'] = array_merge( $data,
$cachedData['messages'] );
+ }
-$messages['de'] = array(
- 'bs-pageaccess-desc' = 'Regelt den Zugriff auf Seitenebene.',
- 'bs-pageaccess-error-no-groups-given' = 'Es wurden keine Gruppen
angegeben.',
- 'bs-pageaccess-error-not-member-of-given-groups' = 'Du bist nicht
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Du dich aus der Seite
aussperrst, wurde das Speichern deaktiviert.',
- 'bs-pageaccess-error-included-forbidden-template' = 'Du hast das
Template $1 eingebunden, auf das du keine Leseberechtigung hast. Um zu
verhindern, dass Du dich aus der Seite aussperrst, wurde das Speichern
deaktiviert.',
- 'bs-pageaccess-tag-groups-desc' = 'Gib die Gruppen an, die exklusiven
Zugriff auf die Seite erhalten sollen. Mehrere Gruppen können durch Kommata
getrennt werden.',
- 'pageaccess' = 'Durch Page Access geschützte Seiten'
-);
+ $cachedData['deps'][] = new FileDependency( $fileName );
+ }
+ return true;
+ }
-$messages['de-formal'] = array(
- 'bs-pageaccess-error-not-member-of-given-groups' = 'Sie sind nicht
Mitglied der angegebenen Gruppen. Um zu verhindern, dass Sie sich aus der Seite
aussperren, wurde das Speichern deaktiviert.',
- 'bs-pageaccess-error-included-forbidden-template' = 'Sie haben das
Template $1 eingebunden, auf das Sie keine Leseberechtigung haben. Um zu
verhindern, dass Sie sich aus der Seite aussperren, wurde das Speichern
deaktiviert.',
- 'bs-pageaccess-tag-groups-desc' = 'Geben Sie die Gruppen an, die
exklusiven Zugriff auf die Seite erhalten sollen. Mehrere Gruppen können durch
Kommata getrennt werden.',
- 'pageaccess' = 'Durch PageAccess geschützte Seiten'
-);
-
-$messages['en'] = array(
- 'bs-pageaccess-desc' = 'Controls access on page level.',
- 'bs-pageaccess-error-no-groups-given' = 'No groups were specified.',
- 'bs-pageaccess-error-not-member-of-given-groups' = 'You are not a
member of the given groups. In order to prevent you from locking yourself out,
[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: cherry pick from REL1_22 Change-Id:
I6759c48b91afb9ac74edebed2c1e42989fa89052
..
cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052
Change-Id: I18379577769e889dc923d29644881957f63e6588
---
M Flexiskin/Flexiskin.class.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..898fc01 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'),
flexiskin . DS . self::getVal('id') . DS . images);
if (!$oStatus-isGood())
- $aResult = json_encode(array('success' = false, 'msg'
= err_cd: . $aStatus['status']));
+ $aResult = json_encode(array('success' = false, 'msg'
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name'
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,9 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
- if (is_callable($func))
+ $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile,
array($func, $aConfig));
+
+ if ( $bReturn === true is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);
--
To view, visit https://gerrit.wikimedia.org/r/200817
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18379577769e889dc923d29644881957f63e6588
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BlueSiceExtensions: minor message text enhancement - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged. Change subject: BlueSiceExtensions: minor message text enhancement .. BlueSiceExtensions: minor message text enhancement See: https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Bs-pageaccess-error-included-forbidden-template/en https://translatewiki.net/wiki/Thread:Support/About_MediaWiki:Wikigrok-dialog-error-message-heading/en Change-Id: I51bfa9c6c1cda0382fe60379712e4a7996e00c1d --- M PageAccess/PageAccess.i18n.php 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/PageAccess/PageAccess.i18n.php b/PageAccess/PageAccess.i18n.php index a56555b..e9cf848 100644 --- a/PageAccess/PageAccess.i18n.php +++ b/PageAccess/PageAccess.i18n.php @@ -34,8 +34,8 @@ $messages['en'] = array( 'bs-pageaccess-desc' = 'Controls access on page level.', 'bs-pageaccess-error-no-groups-given' = 'No groups were specified.', - 'bs-pageaccess-error-not-member-of-given-groups' = 'You\'re not a member of the given groups. In order to prevent you from locking yourself out, saving was disabled.', - 'bs-pageaccess-error-included-forbidden-template' = 'You\'ve tried to use the template $1 to which you don\'t have read access. In order to prevent you from locking yourself out, saving was disabled.', + 'bs-pageaccess-error-not-member-of-given-groups' = 'You are not a member of the given groups. In order to prevent you from locking yourself out, saving was disabled.', + 'bs-pageaccess-error-included-forbidden-template' = 'You have tried to use the template $1 to which you do not have read access. In order to prevent you from locking yourself out, saving was disabled.', 'bs-pageaccess-tag-groups-desc' = 'Specify the groups that should have exclusive access to this page. Multiple groups can be separated by commas.', 'pageaccess' = 'Pages secured by PageAccess' ); -- To view, visit https://gerrit.wikimedia.org/r/199254 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I51bfa9c6c1cda0382fe60379712e4a7996e00c1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Purodha puro...@blissenbach.org Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: Siebrand siebr...@kitano.nl Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: cherry pick from REL1_22 Change-Id:
I6759c48b91afb9ac74edebed2c1e42989fa89052
..
cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052
PatchSet 2: Fixed whitespace error
Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
---
M Flexiskin/Flexiskin.class.php
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..404f8b7 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'),
flexiskin . DS . self::getVal('id') . DS . images);
if (!$oStatus-isGood())
- $aResult = json_encode(array('success' = false, 'msg'
= err_cd: . $aStatus['status']));
+ $aResult = json_encode(array('success' = false, 'msg'
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name'
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,8 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
- if (is_callable($func))
+ $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile,
array($func, $aConfig));
+ if ( $bReturn === true is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);
--
To view, visit https://gerrit.wikimedia.org/r/200815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Invalidate cache on changes in BLOG_TALK - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201185
Change subject: Invalidate cache on changes in BLOG_TALK
..
Invalidate cache on changes in BLOG_TALK
Change-Id: Iac4c4b0f8a7645f20ea0daaa5ba77374eccd1897
(cherry picked from commit d7891cf1a7e8f9275487b2f42c435fcd9000da56)
---
M Blog/Blog.class.php
1 file changed, 2 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/85/201185/1
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 746ac84..d2c4975 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -211,7 +211,8 @@
*/
public function onPageContentSaveComplete( $article, $user, $content,
$summary,
$isMinor, $isWatch, $section, $flags, $revision,
$status, $baseRevId ) {
- if ( $article-getTitle()-getNamespace() !== NS_BLOG ) return
true;
+ # TODO: Cache must also be invalidated on other occasions like
blog tags for subpages or categories.
+ if ( !in_array( $article-getTitle()-getNamespace(), array(
NS_BLOG, NS_BLOG_TALK) ) ) return true;
$sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
$aTagsData = BsCacheHelper::get( $sTagsKey );
--
To view, visit https://gerrit.wikimedia.org/r/201185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac4c4b0f8a7645f20ea0daaa5ba77374eccd1897
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Invalidate cache on changes in BLOG_TALK - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Invalidate cache on changes in BLOG_TALK
..
Invalidate cache on changes in BLOG_TALK
Change-Id: Iac4c4b0f8a7645f20ea0daaa5ba77374eccd1897
---
M Blog/Blog.class.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 746ac84..d2c4975 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -211,7 +211,8 @@
*/
public function onPageContentSaveComplete( $article, $user, $content,
$summary,
$isMinor, $isWatch, $section, $flags, $revision,
$status, $baseRevId ) {
- if ( $article-getTitle()-getNamespace() !== NS_BLOG ) return
true;
+ # TODO: Cache must also be invalidated on other occasions like
blog tags for subpages or categories.
+ if ( !in_array( $article-getTitle()-getNamespace(), array(
NS_BLOG, NS_BLOG_TALK) ) ) return true;
$sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
$aTagsData = BsCacheHelper::get( $sTagsKey );
--
To view, visit https://gerrit.wikimedia.org/r/201183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac4c4b0f8a7645f20ea0daaa5ba77374eccd1897
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Invalidate cache on changes in BLOG_TALK - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Invalidate cache on changes in BLOG_TALK
..
Invalidate cache on changes in BLOG_TALK
Change-Id: Iac4c4b0f8a7645f20ea0daaa5ba77374eccd1897
(cherry picked from commit d7891cf1a7e8f9275487b2f42c435fcd9000da56)
---
M Blog/Blog.class.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 746ac84..d2c4975 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -211,7 +211,8 @@
*/
public function onPageContentSaveComplete( $article, $user, $content,
$summary,
$isMinor, $isWatch, $section, $flags, $revision,
$status, $baseRevId ) {
- if ( $article-getTitle()-getNamespace() !== NS_BLOG ) return
true;
+ # TODO: Cache must also be invalidated on other occasions like
blog tags for subpages or categories.
+ if ( !in_array( $article-getTitle()-getNamespace(), array(
NS_BLOG, NS_BLOG_TALK) ) ) return true;
$sTagsKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'Blog',
'Tags' );
$aTagsData = BsCacheHelper::get( $sTagsKey );
--
To view, visit https://gerrit.wikimedia.org/r/201185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac4c4b0f8a7645f20ea0daaa5ba77374eccd1897
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ContextMenu: Fixed NPE - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200160
Change subject: ContextMenu: Fixed NPE
..
ContextMenu: Fixed NPE
In some cases the file object parameter is null
Change-Id: I758651130fc7a8c04771ce81e3bf96509b65c65d
---
M ContextMenu/ContextMenu.class.php
1 file changed, 6 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/60/200160/1
diff --git a/ContextMenu/ContextMenu.class.php
b/ContextMenu/ContextMenu.class.php
index 681612a..aa777dd 100644
--- a/ContextMenu/ContextMenu.class.php
+++ b/ContextMenu/ContextMenu.class.php
@@ -123,7 +123,12 @@
public function onLinkerMakeMediaLinkFile( $title, $file, $html,
$attribs, $ret ) {
$attribs['data-bs-title'] = $title-getPrefixedText();
- $attribs['data-bs-filename'] = $file-getName();
+ if( $file instanceof File ) {
+ $attribs['data-bs-filename'] = $file-getName();
+ }
+ else {
+ $attribs['data-bs-filename'] = $title-getText();
+ }
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/200160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I758651130fc7a8c04771ce81e3bf96509b65c65d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] UEModulePDF: Support for target name in upload - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200161
Change subject: UEModulePDF: Support for target name in upload
..
UEModulePDF: Support for target name in upload
* Added new BShtml2PDF servlet which supports a target name when uploading
files
* Adapted PHP code to support this new feature
* Fixed issue with entities in CSS
Change-Id: Ic7a507e689a4bd8a6bdd9ff86ead8a65625e410e
---
M UEModulePDF/includes/PDFServlet.class.php
M UEModulePDF/includes/PDFTemplateProvider.class.php
M UEModulePDF/webservices/BShtml2PDF.war
3 files changed, 30 insertions(+), 22 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/61/200161/1
diff --git a/UEModulePDF/includes/PDFServlet.class.php
b/UEModulePDF/includes/PDFServlet.class.php
index 3521c86..e86b4a7 100644
--- a/UEModulePDF/includes/PDFServlet.class.php
+++ b/UEModulePDF/includes/PDFServlet.class.php
@@ -44,9 +44,10 @@
'timeout' = 120,
'postData' = array(
'fileType' = '', //Need to stay empty so
UploadAsset servlet saves file to document root directory
- 'documentToken' =
$this-aParams['document-token'],
+ 'documentToken' =
$this-aParams['document-token'],
+ 'sourceHtmlFile_name' = basename(
$sTmpHtmlFile ),
'sourceHtmlFile' = '@'.$sTmpHtmlFile,
- 'wikiId' = wfWikiID()
+ 'wikiId' = wfWikiID()
)
);
@@ -65,8 +66,8 @@
//Upload HTML source
//TODO: Handle $sResponse
$sResponse = Http::post(
-
$this-aParams['soap-service-url'].'/UploadAsset',
- $aOptions
+ $this-aParams['soap-service-url'].'/UploadAsset',
+ $aOptions
);
//Now do the rendering
@@ -123,7 +124,9 @@
$aErrors[] = $sFilePath;
continue;
}
- $aPostData['file'.$iCounter++] = '@'.$sFilePath;
+ $aPostData['file'.$iCounter.'_name'] =
$sFileName;
+ $aPostData['file'.$iCounter] = '@'.$sFilePath;
+ $iCounter++;
}
if( !empty( $aErrors ) ) {
@@ -142,6 +145,7 @@
global $bsgUEModulePDFCURLOptions;
$aOptions = array_merge_recursive($aOptions,
$bsgUEModulePDFCURLOptions);
+
$vHttpEngine = Http::$httpEngine;
Http::$httpEngine = 'curl';
$sResponse = Http::post(
diff --git a/UEModulePDF/includes/PDFTemplateProvider.class.php
b/UEModulePDF/includes/PDFTemplateProvider.class.php
index 4b0de00..438c78e 100644
--- a/UEModulePDF/includes/PDFTemplateProvider.class.php
+++ b/UEModulePDF/includes/PDFTemplateProvider.class.php
@@ -19,9 +19,9 @@
* @subpackage UEModulePDF
*/
class BsPDFTemplateProvider {
-
+
/**
-* Provides a array suitable for the MediaWiki HtmlFormField class
+* Provides a array suitable for the MediaWiki HtmlFormField class
* HtmlSelectField.
* @param array $aParams Has to contain the 'template-path' that has to
be
* searched for valid templates.
@@ -45,13 +45,13 @@
wfDebugLog( 'BS::UEModulePDF',
'BsPDFTemplateProvider::getTemplatesForSelectOptions: Error: '.$e-getMessage()
);
return array( '-' = '-' );
}
-
+
return $aOptions;
-
+
}
-
+
/**
-* Reads in a template file to a DOMDocuments and collects additional
+* Reads in a template file to a DOMDocuments and collects additional
* information.
* @param array $aParams Has to contain a valid 'template' entry.
* @return array with the DOMDocument and some references.
@@ -77,23 +77,23 @@
$oTemplateDOM = new DOMDocument();
$oTemplateDOM-formatOutput = true;
$oTemplateDOM-load( $sTemplateMarkup );
-
+
$oHeadElement = $oTemplateDOM-getElementsByTagName( 'head'
)-item( 0 );
$oBodyElement = $oTemplateDOM-getElementsByTagName( 'body'
)-item( 0 );
$oTitleElement = $oTemplateDOM-getElementsByTagName( 'title'
)-item( 0 );
-
+
$aResources = array();
foreach( $aTemplate['resources'] as $sType = $aFiles ) {
[MediaWiki-commits] [Gerrit] Merged - Added Messages to number filter date menu - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Merged - Added Messages to number filter date menu
..
Merged - Added Messages to number filter date menu
* Added i18n messages
* Added Fieldlabels Ext.ux.grid.filter.DateFilter
* Added i18n keys to resource module messages array
* = Needs manual merge to master
Change-Id: I83a1532911c6a292e871c837a62c36d5df7948c2
---
M languages/BlueSpice.ExtJS.i18n.php
M resources/Resources.php
M resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
3 files changed, 15 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/languages/BlueSpice.ExtJS.i18n.php
b/languages/BlueSpice.ExtJS.i18n.php
index c8d2782..3129b0e 100644
--- a/languages/BlueSpice.ExtJS.i18n.php
+++ b/languages/BlueSpice.ExtJS.i18n.php
@@ -41,6 +41,9 @@
'bs-extjs-filter-ends-with' = 'Ends with',
'bs-extjs-filter-greater-than' = 'Greater than',
'bs-extjs-filter-less-than' = 'Less than',
+ 'bs-extjs-filter-on' = 'On',
+ 'bs-extjs-filter-after' = 'After',
+ 'bs-extjs-filter-before' = 'Before',
);
$messages['qqq'] = array(
@@ -81,6 +84,9 @@
'bs-extjs-filter-ends-with' = 'Label for a filter input box that
fitlers for datasets where the value of the field ends with the entered value',
'bs-extjs-filter-greater-than' = 'Label for a filter input box that
fitlers for datasets where the value of the field is greater than the entered
value',
'bs-extjs-filter-less-than' = 'Label for a filter input box that
fitlers for datasets where the value of the field is less than the entered
value',
+ 'bs-extjs-filter-on' = 'Label for a filter input box that fitlers for
datasets where the value of the field on a specific date',
+ 'bs-extjs-filter-after' = 'Label for a filter input box that fitlers
for datasets where the value of the field after a specific date',
+ 'bs-extjs-filter-before' = 'Label for a filter input box that fitlers
for datasets where the value of the field before a specific date',
);
$messages['de'] = array(
@@ -122,6 +128,9 @@
'bs-extjs-filter-ends-with' = 'Endet mit',
'bs-extjs-filter-greater-than' = 'Größer als',
'bs-extjs-filter-less-than' = 'Kleiner als',
+ 'bs-extjs-filter-on' = 'Am',
+ 'bs-extjs-filter-after' = 'Nach dem',
+ 'bs-extjs-filter-before' = 'Vor dem',
);
$messages['de-formal'] = array(
diff --git a/resources/Resources.php b/resources/Resources.php
index 65d63d5..b54013b 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -109,6 +109,9 @@
'bs-extjs-filter-ends-with',
'bs-extjs-filter-greater-than',
'bs-extjs-filter-less-than',
+ 'bs-extjs-filter-on',
+ 'bs-extjs-filter-after',
+ 'bs-extjs-filter-before',
),
'position' = 'bottom'
) + $aResourceModuleTemplate;
diff --git a/resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
b/resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
index f3d5b2d..7fb2ecd 100644
--- a/resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
+++ b/resources/bluespice.extjs/Ext.ux/grid/filter/DateFilter.js
@@ -32,12 +32,12 @@
* @cfg {String} afterText
* Defaults to 'After'.
*/
-afterText : 'After',
+afterText : mw.messages.get('bs-extjs-filter-after'),
/**
* @cfg {String} beforeText
* Defaults to 'Before'.
*/
-beforeText : 'Before',
+beforeText : mw.messages.get('bs-extjs-filter-before'),
/**
* @cfg {Object} compareMap
* Map for assigning the comparison values used in serialization.
@@ -86,7 +86,7 @@
* @cfg {String} onText
* Defaults to 'On'.
*/
-onText : 'On',
+onText : mw.messages.get('bs-extjs-filter-on'),
/**
* @cfg {Object} pickerOpts
--
To view, visit https://gerrit.wikimedia.org/r/192796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83a1532911c6a292e871c837a62c36d5df7948c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Siebrand siebr...@kitano.nl
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Blog: Added bs:blog:time tag - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Blog: Added bs:blog:time tag
..
Blog: Added bs:blog:time tag
* Added parserhook on onBlogTime
* Changed bs:blog tag query
* Added messages
* P2: Marked ...og:time timestamp / as deptecated. Now: ...og:time
time=timestamp /
* P2: Entries with future timestamp will not listed
Change-Id: I9bebcc78bdeeddab7a30969338693bd3280a21f9
---
M Blog/Blog.class.php
M Blog/languages/Blog.i18n.php
2 files changed, 89 insertions(+), 15 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index fc89264..ef57430 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -231,6 +231,9 @@
$parser-setHook( 'more', array( $this, 'onMore' ) );
$parser-setHook( 'bs:blog', array( $this, 'onBlog' ) );
$parser-setHook( 'bs:blog:more', array( $this, 'onMore' ) );
+ // get timestamp for custom sorting
+ $parser-setHook( 'blog:time', array( $this, 'onBlogTime' ) );
+ $parser-setHook( 'bs:blog:time', array( $this, 'onBlogTime' )
);
return true;
}
@@ -251,6 +254,14 @@
'code' = 'bs:blog /',
);
+ $oResponse-result[] = array(
+ 'id' = 'bs:blog:time',
+ 'type' = 'tag',
+ 'name' = 'blogtime',
+ 'desc' = wfMessage( 'bs-blog-tag-blogtime-desc'
)-plain(),
+ 'code' = 'bs:blog:time /',
+ );
+
return true;
}
@@ -263,6 +274,38 @@
*/
public function onMore( $input, $args, $parser ) {
$parser-disableCache();
+ return '';
+ }
+
+ public function onBlogTime( $input, $args, $parser ) {
+ $oDate = null;
+ if( !isset($args['time']) ) {
+ //Deprecated: bs:blog:time timestamp /
+ //Use: bs:blog:time time=timestamp /
+ $aKeys = array_keys($args);
+ foreach( $aKeys as $sKey ) {
+ if( !is_numeric($sKey) || strlen( $sKey ) !==
12 ) {
+ continue;
+ }
+ if( !$oDate =
DateTime::createFromFormat('YmdHi', $sKey) ) {
+ continue;
+ } else {
+ wfDeprecated(__METHOD__, '2.22.2');
+ break;
+ }
+ }
+ } else {
+ $oDate = DateTime::createFromFormat( 'YmdHi',
$args['time'] );
+ }
+ if( empty($oDate) ) {
+ $oErrorListView = new ViewTagErrorList( $this );
+ $oErrorListView-addItem( new ViewTagError(
+ wfMessage('bs-blog-tag-blogtime-err')-plain() )
+ );
+ return $oErrorListView-execute();
+ }
+
+ $parser-getOutput()-setProperty( 'blogtime',
$oDate-format('YmdHis') );
return '';
}
@@ -409,27 +452,53 @@
$aArticleIds = 0;
}
- // get blog entries
- $aOptions = array();
- if ( !$argsSSortBy || $argsSSortBy == 'creation' ) {
- $aOptions['ORDER BY'] = 'page_id DESC';
- } elseif ( $argsSSortBy == 'title' ) {
- $aOptions['ORDER BY'] = 'page_title ASC';
- }
-
$aTables = array( 'page' );
- $sFiels = '';
+ $aFields = array( 'entry_page_id' = 'page_id' );
$aConditions = array();
+ $aOptions = array();
+ $aJoins = array();
$dbr = wfGetDB( DB_SLAVE );
+ // get blog entries
+ if( $argsSSortBy == 'title' ) {
+ $aOptions['ORDER BY'] = 'page_title ASC';
+ } else {
+ //Creation: Also fetch possible custom timestamps from
page_props table
+ $aOptions['ORDER BY'] = 'entry_timestamp DESC';
+ $aOptions['GROUP BY'] = 'page_id';
+
+ global $wgDBtype;
+ switch( $wgDBtype ) {
+ case 'oracle':
+ $aFields['entry_timestamp'] = NVL(
pp_value, rev_timestamp );
+ $aConditions[] = NVL( pp_value,
rev_timestamp ) .wfTimestampNow();
+ break;
+
[MediaWiki-commits] [Gerrit] added pdf export link for vector skin - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: added pdf export link for vector skin
..
added pdf export link for vector skin
Change-Id: Ie3f2ab1b53c273c385e3ef32059a2ea5dea16818
---
M UEModulePDF/UEModulePDF.class.php
1 file changed, 23 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/UEModulePDF/UEModulePDF.class.php
b/UEModulePDF/UEModulePDF.class.php
index 0f200b6..1c8698c 100644
--- a/UEModulePDF/UEModulePDF.class.php
+++ b/UEModulePDF/UEModulePDF.class.php
@@ -221,7 +221,29 @@
'class' = 'icon-file-pdf'
);
- $template-data['bs_title_actions'][] = $aContentActions;
+ if ( $template instanceof BsBaseTemplate ) {
+ $template-data['bs_title_actions'][] =
$aContentActions;
+ } else {
+ //this is the case when BlueSpice Skin is not active,
so use vector methods.
+ $template-data['prebodyhtml'] = Html::rawElement(
+ span,
+ array('class' =
'bs-ta-uemodulepdf-container'),
+ Html::rawElement(
+ 'a',
+ array(
+ 'href' =
$aContentActions['href'],
+ 'title' =
$aContentActions['title'],
+ 'class' =
$aContentActions['class'],
+ 'id' =
$aContentActions['id']
+ ),
+ Html::element(
+ 'span',
+ array(),
+
$aContentActions['text']
+ )
+ )
+ );
+ }
return true;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/192768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3f2ab1b53c273c385e3ef32059a2ea5dea16818
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed warning if no user image was set - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fixed warning if no user image was set
..
fixed warning if no user image was set
Change-Id: I456a670befde89168495b61eb721af34edb86140
---
M Authors/views/view.AuthorsUserPageProfileImageSetting.php
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Authors/views/view.AuthorsUserPageProfileImageSetting.php
b/Authors/views/view.AuthorsUserPageProfileImageSetting.php
index b409022..16cb738 100644
--- a/Authors/views/view.AuthorsUserPageProfileImageSetting.php
+++ b/Authors/views/view.AuthorsUserPageProfileImageSetting.php
@@ -71,11 +71,11 @@
public function setCurrentUser( $oUser ) {
$this-oUser = $oUser;
}
-
+
public function setImagePath( $sImagePath ) {
$this-sImagePath = $sImagePath;
}
-
+
public function getImagePath() {
return $this-sImagePath;
}
@@ -91,7 +91,7 @@
//Is it a URL? Some external image?
$aParsedUrl = parse_url( $sUserImage );
- if ( $sUserImage{0} == '/' || isset( $aParsedUrl['scheme'] ) ) {
+ if ( !empty($sUserImage) ($sUserImage{0} == '/' || isset(
$aParsedUrl['scheme'] )) ) {
$this-sImageUploadPath = SpecialPage::getTitleFor(
'Preferences' )-getLinkUrl();
$aPathInfo = pathinfo( $aParsedUrl['path'] );
--
To view, visit https://gerrit.wikimedia.org/r/192566
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I456a670befde89168495b61eb721af34edb86140
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
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 no links in insertimage - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fix for no links in insertimage
..
fix for no links in insertimage
Change-Id: Idd9a9cbd490c58d3dbe4f95118699288cbee729c
---
M InsertFile/resources/BS.InsertFile/ImageDialog.js
1 file changed, 8 insertions(+), 9 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/InsertFile/resources/BS.InsertFile/ImageDialog.js
b/InsertFile/resources/BS.InsertFile/ImageDialog.js
index 50a41d7..f584ae0 100644
--- a/InsertFile/resources/BS.InsertFile/ImageDialog.js
+++ b/InsertFile/resources/BS.InsertFile/ImageDialog.js
@@ -226,12 +226,9 @@
frame: false,
//VisualEditor stuff
imagename: this.tfFileName.getValue(),
+ noLink: this.cbxNoLink.getValue(),
src: Ext.htmlDecode(this.hdnUrl.getValue())
//Ext.htmlDecode(): this feels like the wrong place...
});
-
- if(this.cbxNoLink.getValue() === true ) {
- cfg.link = '';
- }
var format = this.rgFormat.getValue();
format = format['img-type'];
@@ -339,12 +336,14 @@
if( obj.link !== '' obj.link !== false obj.link !==
'false' ) {
this.cbPages.setValue( obj.link );
}
-
- if( obj.link === '' ) {
- this.cbxNoLink.setValue(true);
- } else {
- this.cbxNoLink.setValue(false);
+ if (obj.nolink === true){
+ this.cbPages.disable( );
}
+ else{
+ this.cbPages.enable( );
+ }
+
+ this.cbxNoLink.setValue(obj.nolink);
this.hdnUrl.setValue( obj.src );
this.isSetData = false;
--
To view, visit https://gerrit.wikimedia.org/r/187357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd9a9cbd490c58d3dbe4f95118699288cbee729c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
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.badge: Swap non-breaking space character for regular ... - change (mediawiki/core)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193357
Change subject: jquery.badge: Swap non-breaking space character for regular
space
..
jquery.badge: Swap non-breaking space character for regular space
Follows-up d453f81f4e. PHP's native json_encode requires input
being a UTF-8 string. For some reason MediaWiki, Git or OS X is
not reading jquery.badge.css as UTF-8 for me.
https://bugs.php.net/bug.php?id=51947
Due to json_encode rejecting the entire value and returning null
instead, the jquery.badge stylesheet was absent. load.php:
mw.loader.implement(jquery.badge,function, {css:[null]} );
Change-Id: I84d2017a976249f55bdb269d2b9762db941292fe
(cherry picked from commit a334bfbb250c48f32827562d54d8cba8ed873d05)
---
M resources/src/jquery/jquery.badge.css
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/193357/1
diff --git a/resources/src/jquery/jquery.badge.css
b/resources/src/jquery/jquery.badge.css
index f313663..65c331b 100644
--- a/resources/src/jquery/jquery.badge.css
+++ b/resources/src/jquery/jquery.badge.css
@@ -13,7 +13,7 @@
font-weight: bold;
color: white;
vertical-align: baseline;
- text-shadow: 0 1px rgba(0, 0, 0, 0.4);
+ text-shadow: 0 1px rgba(0, 0, 0, 0.4);
}
.mw-badge-inline {
--
To view, visit https://gerrit.wikimedia.org/r/193357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I84d2017a976249f55bdb269d2b9762db941292fe
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Canonical name can not have underscores - change (mediawiki...LdapAuthentication)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/193359
Change subject: Canonical name can not have underscores
..
Canonical name can not have underscores
LdapAuthentication auth plugin in combination with auto-auth feature
may create usernames with underscores.
Having underscores in database field 'user.user_name' causes several
issues within MediaWiki. I. e. recursion warnings in
RequestContext.php:320
This fix makes sure the database does not contain any usernames with
underscores.
Change-Id: Id707f41cad5c28c228656109ee0cd4f6dc4aaef0
---
M LdapAuthentication.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LdapAuthentication
refs/changes/59/193359/1
diff --git a/LdapAuthentication.php b/LdapAuthentication.php
index 5b258fc..6b53346 100644
--- a/LdapAuthentication.php
+++ b/LdapAuthentication.php
@@ -1303,6 +1303,9 @@
global $wgMemc;
$this-printDebug( Entering getCanonicalName, NONSENSITIVE );
+
+ $username = str_replace( '_', ' ', $username );
+
if ( User::isIP( $username ) ) {
$this-printDebug( Username is an IP, not munging.,
NONSENSITIVE );
return $username;
--
To view, visit https://gerrit.wikimedia.org/r/193359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id707f41cad5c28c228656109ee0cd4f6dc4aaef0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LdapAuthentication
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BsMailer: Used user real name if possible - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194459
Change subject: BsMailer: Used user real name if possible
..
BsMailer: Used user real name if possible
Change-Id: I996a6f4be4e37bfef2bd8c38ca3200209ad8a65b
(cherry picked from commit 2e5f3529f552e79c6b95b841ff07ff9f5749c18e)
---
M includes/Mailer.class.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/59/194459/1
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index 3881ee8..1c69e62 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -78,7 +78,7 @@
if ( $vReceiver-getEmail() ) {
$aEmailTo[] = array(
'mail' = new
MailAddress($vReceiver),
- 'greeting' =
$vReceiver-getName()
+ 'greeting' =
BsCore::getUserDisplayName( $vReceiver ),
);
}
} elseif ( strpos( $vReceiver, '@' ) !== false ) {
@@ -97,7 +97,7 @@
if ( $oUser-getEmail() ) {
$aEmailTo[] = array(
'mail' = new MailAddress(
$oUser ),
- 'greeting' =
$vReceiver-getName()
+ 'greeting' =
BsCore::getUserDisplayName( $vReceiver ),
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/194459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I996a6f4be4e37bfef2bd8c38ca3200209ad8a65b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BsMailer: Used user real name if possible - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: BsMailer: Used user real name if possible
..
BsMailer: Used user real name if possible
Change-Id: I996a6f4be4e37bfef2bd8c38ca3200209ad8a65b
---
M includes/Mailer.class.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index 3881ee8..1c69e62 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -78,7 +78,7 @@
if ( $vReceiver-getEmail() ) {
$aEmailTo[] = array(
'mail' = new
MailAddress($vReceiver),
- 'greeting' =
$vReceiver-getName()
+ 'greeting' =
BsCore::getUserDisplayName( $vReceiver ),
);
}
} elseif ( strpos( $vReceiver, '@' ) !== false ) {
@@ -97,7 +97,7 @@
if ( $oUser-getEmail() ) {
$aEmailTo[] = array(
'mail' = new MailAddress(
$oUser ),
- 'greeting' =
$vReceiver-getName()
+ 'greeting' =
BsCore::getUserDisplayName( $vReceiver ),
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/194117
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I996a6f4be4e37bfef2bd8c38ca3200209ad8a65b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Review: Separated from Statebar|Added Hook AfterMakeJSDataOb... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Review: Separated from Statebar|Added Hook AfterMakeJSDataObject
..
Review: Separated from Statebar|Added Hook AfterMakeJSDataObject
* Separated makeJSDataObject from Statebar - Now Review works without it
* Added Hook BsReviewAfterMakeJSDataObject
Change-Id: I0be7a082e158718902c768c6d2c69c49f91fdd31
---
M Review/Review.class.php
1 file changed, 46 insertions(+), 34 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Review/Review.class.php b/Review/Review.class.php
index 20f29a6..75227ea 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -810,12 +810,6 @@
}
$sIcon .= .png;
- //This hook is too late for OutputPage::addJsConfigVars
- $this-getOutput()-addHTML(
- Html::inlineScript(
- 'var bsReview = ' .
Xml::encodeJsVar($this-makeJSDataObject($oRev)) . ';'
- )
- );
$aTopViews['statebartopreview'] =
$this-makeStateBarTopReview($sIcon);
}
return true;
@@ -827,37 +821,47 @@
* @param BsReviewProcess $oReview
* @return \stdClass
*/
- protected function makeJSDataObject($oReview) {
- //TODO: Allow injection of data by ExtendedReview or other
extensions
+ protected function makeJSDataObject( $oReview ) {
+ //Defaults
$oData = new stdClass();
- $oData-startdate = strtotime($oReview-startdate);
- $oData-enddate = strtotime($oReview-enddate);
- $oData-owner_user_id = $oReview-getOwner();
- $oData-owner_user_name =
User::newFromId($oReview-getOwner())-getName();
- $oData-page_id = $oReview-getPid();
- $oData-page_prefixed_text =
Title::newFromID($oReview-getPid())-getPrefixedText();
- $oData-editable = $oReview-isEditable();
- $oData-sequential = $oReview-isSequential();
- $oData-abortable = $oReview-isAbortWhenDenied();
- $oData-steps = array();
- foreach ($oReview-steps as $oStep) {
- if ($oStep instanceof BsReviewProcessStep == false)
- continue;
-
- $oUser = User::newFromId($oStep-user);
-
- $aStep = array(
- 'user_id' = $oStep-user,
- 'user_name' = $oUser-getName(),
- 'user_display_name' =
BsCore::getUserDisplayName($oUser),
- 'comment' = $oStep-comment,
- 'status' = $oStep-status,
- 'sort_id' = $oStep-sort_id,
- );
-
- $oData-steps[] = $aStep;
+ $oTitle = $this-getContext()-getTitle();
+ if( !is_null($oTitle) ) {
+ $oData-page_id =$oTitle-getArticleID();
}
+
+ if( $oReview !== false ) {
+ $oData-startdate = strtotime($oReview-startdate);
+ $oData-enddate = strtotime($oReview-enddate);
+ $oData-owner_user_id = $oReview-getOwner();
+ $oData-owner_user_name =
User::newFromId($oReview-getOwner())-getName();
+ $oData-page_id = $oReview-getPid();
+ $oData-page_prefixed_text =
Title::newFromID($oReview-getPid())-getPrefixedText();
+ $oData-editable = $oReview-isEditable();
+ $oData-sequential = $oReview-isSequential();
+ $oData-abortable = $oReview-isAbortWhenDenied();
+ $oData-steps = array();
+
+ foreach ($oReview-steps as $oStep) {
+ if ($oStep instanceof BsReviewProcessStep ==
false)
+ continue;
+
+ $oUser = User::newFromId($oStep-user);
+
+ $aStep = array(
+ 'user_id' = $oStep-user,
+ 'user_name' = $oUser-getName(),
+ 'user_display_name' =
BsCore::getUserDisplayName($oUser),
+ 'comment' = $oStep-comment,
+ 'status' = $oStep-status,
+ 'sort_id' = $oStep-sort_id,
+ );
+
+ $oData-steps[] = $aStep;
+ }
+
[MediaWiki-commits] [Gerrit] Review: Separated from Statebar|Added Hook AfterMakeJSDataOb... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194460
Change subject: Review: Separated from Statebar|Added Hook AfterMakeJSDataObject
..
Review: Separated from Statebar|Added Hook AfterMakeJSDataObject
* Separated makeJSDataObject from Statebar - Now Review works without it
* Added Hook BsReviewAfterMakeJSDataObject
Change-Id: I0be7a082e158718902c768c6d2c69c49f91fdd31
(cherry picked from commit 90d978878ab3fedf0fa054da026dd4c57e7d2e53)
---
M Review/Review.class.php
1 file changed, 46 insertions(+), 34 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/60/194460/1
diff --git a/Review/Review.class.php b/Review/Review.class.php
index dc387ed..da28bc9 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -810,12 +810,6 @@
}
$sIcon .= .png;
- //This hook is too late for OutputPage::addJsConfigVars
- $this-getOutput()-addHTML(
- Html::inlineScript(
- 'var bsReview = ' .
Xml::encodeJsVar($this-makeJSDataObject($oRev)) . ';'
- )
- );
$aTopViews['statebartopreview'] =
$this-makeStateBarTopReview($sIcon);
}
return true;
@@ -827,37 +821,47 @@
* @param BsReviewProcess $oReview
* @return \stdClass
*/
- protected function makeJSDataObject($oReview) {
- //TODO: Allow injection of data by ExtendedReview or other
extensions
+ protected function makeJSDataObject( $oReview ) {
+ //Defaults
$oData = new stdClass();
- $oData-startdate = strtotime($oReview-startdate);
- $oData-enddate = strtotime($oReview-enddate);
- $oData-owner_user_id = $oReview-getOwner();
- $oData-owner_user_name =
User::newFromId($oReview-getOwner())-getName();
- $oData-page_id = $oReview-getPid();
- $oData-page_prefixed_text =
Title::newFromID($oReview-getPid())-getPrefixedText();
- $oData-editable = $oReview-isEditable();
- $oData-sequential = $oReview-isSequential();
- $oData-abortable = $oReview-isAbortWhenDenied();
- $oData-steps = array();
- foreach ($oReview-steps as $oStep) {
- if ($oStep instanceof BsReviewProcessStep == false)
- continue;
-
- $oUser = User::newFromId($oStep-user);
-
- $aStep = array(
- 'user_id' = $oStep-user,
- 'user_name' = $oUser-getName(),
- 'user_display_name' =
BsCore::getUserDisplayName($oUser),
- 'comment' = $oStep-comment,
- 'status' = $oStep-status,
- 'sort_id' = $oStep-sort_id,
- );
-
- $oData-steps[] = $aStep;
+ $oTitle = $this-getContext()-getTitle();
+ if( !is_null($oTitle) ) {
+ $oData-page_id =$oTitle-getArticleID();
}
+
+ if( $oReview !== false ) {
+ $oData-startdate = strtotime($oReview-startdate);
+ $oData-enddate = strtotime($oReview-enddate);
+ $oData-owner_user_id = $oReview-getOwner();
+ $oData-owner_user_name =
User::newFromId($oReview-getOwner())-getName();
+ $oData-page_id = $oReview-getPid();
+ $oData-page_prefixed_text =
Title::newFromID($oReview-getPid())-getPrefixedText();
+ $oData-editable = $oReview-isEditable();
+ $oData-sequential = $oReview-isSequential();
+ $oData-abortable = $oReview-isAbortWhenDenied();
+ $oData-steps = array();
+
+ foreach ($oReview-steps as $oStep) {
+ if ($oStep instanceof BsReviewProcessStep ==
false)
+ continue;
+
+ $oUser = User::newFromId($oStep-user);
+
+ $aStep = array(
+ 'user_id' = $oStep-user,
+ 'user_name' = $oUser-getName(),
+ 'user_display_name' =
BsCore::getUserDisplayName($oUser),
+ 'comment' = $oStep-comment,
+ 'status' = $oStep-status,
+ 'sort_id'
[MediaWiki-commits] [Gerrit] Allow all file types to be uploaded. This is fine in an intr... - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged. Change subject: Allow all file types to be uploaded. This is fine in an intranet environment. .. Allow all file types to be uploaded. This is fine in an intranet environment. Change-Id: I1eb460a2f15322331226aa4db7c1738a3531f4e8 --- M includes/DefaultSettings.php 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 73fdb0b..13679c1 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -40,6 +40,8 @@ $wgCapitalLinkOverrides[ NS_FILE ] = false; $wgRestrictDisplayTitle = false; //Otherwise only titles that normalize to the same DB key are allowed $wgUrlProtocols[] = file://; +$wgVerifyMimeType = false; +$wgAllowJavaUploads = true; //wgScriptPath relative paths $sResourcesPath = '/extensions/BlueSpiceFoundation/resources'; @@ -217,4 +219,4 @@ */ $bsgSystemNamespaces = array( //1599 = 'NS_COOL_STUFF' -); \ No newline at end of file +); -- To view, visit https://gerrit.wikimedia.org/r/194296 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1eb460a2f15322331226aa4db7c1738a3531f4e8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] BsMailer: Used user real name if possible - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: BsMailer: Used user real name if possible
..
BsMailer: Used user real name if possible
Change-Id: I996a6f4be4e37bfef2bd8c38ca3200209ad8a65b
(cherry picked from commit 2e5f3529f552e79c6b95b841ff07ff9f5749c18e)
---
M includes/Mailer.class.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index 3881ee8..1c69e62 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -78,7 +78,7 @@
if ( $vReceiver-getEmail() ) {
$aEmailTo[] = array(
'mail' = new
MailAddress($vReceiver),
- 'greeting' =
$vReceiver-getName()
+ 'greeting' =
BsCore::getUserDisplayName( $vReceiver ),
);
}
} elseif ( strpos( $vReceiver, '@' ) !== false ) {
@@ -97,7 +97,7 @@
if ( $oUser-getEmail() ) {
$aEmailTo[] = array(
'mail' = new MailAddress(
$oUser ),
- 'greeting' =
$vReceiver-getName()
+ 'greeting' =
BsCore::getUserDisplayName( $vReceiver ),
);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/194459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I996a6f4be4e37bfef2bd8c38ca3200209ad8a65b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Review: Separated from Statebar|Added Hook AfterMakeJSDataOb... - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Review: Separated from Statebar|Added Hook AfterMakeJSDataObject
..
Review: Separated from Statebar|Added Hook AfterMakeJSDataObject
* Separated makeJSDataObject from Statebar - Now Review works without it
* Added Hook BsReviewAfterMakeJSDataObject
Change-Id: I0be7a082e158718902c768c6d2c69c49f91fdd31
(cherry picked from commit 90d978878ab3fedf0fa054da026dd4c57e7d2e53)
---
M Review/Review.class.php
1 file changed, 46 insertions(+), 34 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Review/Review.class.php b/Review/Review.class.php
index dc387ed..da28bc9 100644
--- a/Review/Review.class.php
+++ b/Review/Review.class.php
@@ -810,12 +810,6 @@
}
$sIcon .= .png;
- //This hook is too late for OutputPage::addJsConfigVars
- $this-getOutput()-addHTML(
- Html::inlineScript(
- 'var bsReview = ' .
Xml::encodeJsVar($this-makeJSDataObject($oRev)) . ';'
- )
- );
$aTopViews['statebartopreview'] =
$this-makeStateBarTopReview($sIcon);
}
return true;
@@ -827,37 +821,47 @@
* @param BsReviewProcess $oReview
* @return \stdClass
*/
- protected function makeJSDataObject($oReview) {
- //TODO: Allow injection of data by ExtendedReview or other
extensions
+ protected function makeJSDataObject( $oReview ) {
+ //Defaults
$oData = new stdClass();
- $oData-startdate = strtotime($oReview-startdate);
- $oData-enddate = strtotime($oReview-enddate);
- $oData-owner_user_id = $oReview-getOwner();
- $oData-owner_user_name =
User::newFromId($oReview-getOwner())-getName();
- $oData-page_id = $oReview-getPid();
- $oData-page_prefixed_text =
Title::newFromID($oReview-getPid())-getPrefixedText();
- $oData-editable = $oReview-isEditable();
- $oData-sequential = $oReview-isSequential();
- $oData-abortable = $oReview-isAbortWhenDenied();
- $oData-steps = array();
- foreach ($oReview-steps as $oStep) {
- if ($oStep instanceof BsReviewProcessStep == false)
- continue;
-
- $oUser = User::newFromId($oStep-user);
-
- $aStep = array(
- 'user_id' = $oStep-user,
- 'user_name' = $oUser-getName(),
- 'user_display_name' =
BsCore::getUserDisplayName($oUser),
- 'comment' = $oStep-comment,
- 'status' = $oStep-status,
- 'sort_id' = $oStep-sort_id,
- );
-
- $oData-steps[] = $aStep;
+ $oTitle = $this-getContext()-getTitle();
+ if( !is_null($oTitle) ) {
+ $oData-page_id =$oTitle-getArticleID();
}
+
+ if( $oReview !== false ) {
+ $oData-startdate = strtotime($oReview-startdate);
+ $oData-enddate = strtotime($oReview-enddate);
+ $oData-owner_user_id = $oReview-getOwner();
+ $oData-owner_user_name =
User::newFromId($oReview-getOwner())-getName();
+ $oData-page_id = $oReview-getPid();
+ $oData-page_prefixed_text =
Title::newFromID($oReview-getPid())-getPrefixedText();
+ $oData-editable = $oReview-isEditable();
+ $oData-sequential = $oReview-isSequential();
+ $oData-abortable = $oReview-isAbortWhenDenied();
+ $oData-steps = array();
+
+ foreach ($oReview-steps as $oStep) {
+ if ($oStep instanceof BsReviewProcessStep ==
false)
+ continue;
+
+ $oUser = User::newFromId($oStep-user);
+
+ $aStep = array(
+ 'user_id' = $oStep-user,
+ 'user_name' = $oUser-getName(),
+ 'user_display_name' =
BsCore::getUserDisplayName($oUser),
+ 'comment' = $oStep-comment,
+ 'status' = $oStep-status,
+ 'sort_id' = $oStep-sort_id,
+ );
+
+
[MediaWiki-commits] [Gerrit] Fixed checkbox insert in IE - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Fixed checkbox insert in IE
..
Fixed checkbox insert in IE
In IE, a construct like span id=@@ID@@button //span causes tinymce
to forget the id attribute. So using button/button instead, which
works.
Change-Id: I546c016a962aaf781a9bdf1aa9e82c87c2f77ec5
---
M Checklist/resources/bluespice.checklist.js
M VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Checklist/resources/bluespice.checklist.js
b/Checklist/resources/bluespice.checklist.js
index a957b26..dad25e6 100644
--- a/Checklist/resources/bluespice.checklist.js
+++ b/Checklist/resources/bluespice.checklist.js
@@ -101,7 +101,8 @@
} else {
innerText += BsChecklist.checkboxImage;
}
- innerText += '\'); /';
+ // Do not use short notation for closing tag (/), as it breaks
IE
+ innerText += '\'); /button';
return innerText;
},
@@ -131,7 +132,7 @@
makeAndRegisterCheckboxSpecialTag: function(ed, checked) {
var id = ed.plugins.bswikicode.getSpecialTagList().length;
- ed.plugins.bswikicode.getSpecialTagList().push('bs:checklist
value= /');
+ ed.plugins.bswikicode.pushSpecialTagList('bs:checklist
value= /');
var node = ed.dom.create(
'span',
{
@@ -149,7 +150,7 @@
makeAndRegisterSelectboxSpecialTag: function(ed, listname, value) {
var id = ed.plugins.bswikicode.getSpecialTagList().length;
- ed.plugins.bswikicode.getSpecialTagList().push('bs:checklist
type=list value= list='+listname+'/');
+ ed.plugins.bswikicode.pushSpecialTagList('bs:checklist
type=list value= list='+listname+'/');
var node = ed.dom.create(
'span',
{
diff --git a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
index 04dc148..bdd9dd6 100644
--- a/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
+++ b/VisualEditor/resources/tiny_mce_plugins/bswikicode/plugin.js
@@ -2334,6 +2334,10 @@
return _specialtags;
};
+ this.pushSpecialTagList = function( item ) {
+ _specialtags.push( item );
+ }
+
this.getTemplateList = function() {
return _templates;
};
--
To view, visit https://gerrit.wikimedia.org/r/191857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I546c016a962aaf781a9bdf1aa9e82c87c2f77ec5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed regex to match everything except whitespaces - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fixed regex to match everything except whitespaces
..
fixed regex to match everything except whitespaces
Change-Id: I1e2780aab8d7888e7f35dd7a6d148f4d8710e7c8
(cherry picked from commit d9a382e3d9c52928382a994935c4441fba4f4bc6)
---
M ShoutBox/ShoutBox.class.php
M ShoutBox/resources/bluespice.shoutBox.mention.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index aa55513..1549641 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -321,7 +321,7 @@
while ( $row = $dbr-fetchRow( $res ) ) {
$oUser = User::newFromId( $row['sb_user_id'] );
$oProfile =
BsCore::getInstance()-getUserMiniProfile( $oUser );
- $sMessage = preg_replace_callback(#@(\w*)#,
self::replaceUsernameInMessage, $row['sb_message']);
+ $sMessage = preg_replace_callback(#@(\S*)#,
self::replaceUsernameInMessage, $row['sb_message']);
$oShoutBoxMessageView = new
ViewShoutBoxMessage();
if ( $bShowAge )
$oShoutBoxMessageView-setDate(
BsFormatConverter::mwTimestampToAgeString( $row['sb_timestamp'], true ) );
@@ -544,7 +544,7 @@
public static function getUsersMentioned( $sMessage ) {
if ( empty( $sMessage ) )
return array();
- $bResult = preg_match_all( #@(\w*)#, $sMessage, $aMatches );
+ $bResult = preg_match_all( #@(\S*)#, $sMessage, $aMatches );
if ( $bResult === false || $bResult 1 )
return array();
$aReturn = array();
diff --git a/ShoutBox/resources/bluespice.shoutBox.mention.js
b/ShoutBox/resources/bluespice.shoutBox.mention.js
index b52e731..ca0114c 100644
--- a/ShoutBox/resources/bluespice.shoutBox.mention.js
+++ b/ShoutBox/resources/bluespice.shoutBox.mention.js
@@ -2,7 +2,7 @@
var BSShoutboxMentions = {
mentions: [ ],
//matches whole words starting with @
- match: /\B@(\w*)$/,
+ match: /\B@(\S*)$/,
search: function ( term, callback ) {
//if the mentions array is empty get a list of all
users available
//first trigger with the @ in the shoutbox to not
overload requests
--
To view, visit https://gerrit.wikimedia.org/r/192298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e2780aab8d7888e7f35dd7a6d148f4d8710e7c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] NamespaceCombo: removed defaultValue - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192304
Change subject: NamespaceCombo: removed defaultValue
..
NamespaceCombo: removed defaultValue
Apparently it is better to have no default value set.
THIS CHANGE NEEDS TO BE CHERRYPICKED TO REL1_23!
See also https://gerrit.wikimedia.org/r/#/c/191553/
Change-Id: I2cd1a114da77fcfbf24098ddb979b4eeb83a5392
---
M resources/bluespice.extjs/BS/form/NamespaceCombo.js
1 file changed, 3 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/04/192304/1
diff --git a/resources/bluespice.extjs/BS/form/NamespaceCombo.js
b/resources/bluespice.extjs/BS/form/NamespaceCombo.js
index 5c1680d..92bd189 100644
--- a/resources/bluespice.extjs/BS/form/NamespaceCombo.js
+++ b/resources/bluespice.extjs/BS/form/NamespaceCombo.js
@@ -6,9 +6,8 @@
queryMode: 'local',
typeAhead: true,
triggerAction: 'all',
- value: 0,
fieldLabel: mw.message('bs-extjs-label-namespace').plain(),
-
+
//Custom Settings
includeAll: false,
excludeIds: [],
@@ -21,10 +20,10 @@
this.callParent(arguments);
},
-
+
setValue: function( value, doSelect ) {
//In many cases we only know the namespace text and not the id.
To make
- //the life of us developers easier this litte snippet tries to
convert
+ //the life of us developers easier this litte snippet tries to
convert
//from text to id.
if( Ext.isString(value) ) {
var normText = value.toLowerCase().replace(' ', '_');
--
To view, visit https://gerrit.wikimedia.org/r/192304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cd1a114da77fcfbf24098ddb979b4eeb83a5392
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] NamespaceCombo: removed defaultValue - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: NamespaceCombo: removed defaultValue
..
NamespaceCombo: removed defaultValue
Apparently it is better to have no default value set.
THIS CHANGE NEEDS TO BE CHERRYPICKED TO REL1_23 AND master!
Change-Id: If9996f7393efd7c1e32e3f82faeaa1b8d0dd77ee
---
M resources/bluespice.extjs/BS/form/NamespaceCombo.js
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/resources/bluespice.extjs/BS/form/NamespaceCombo.js
b/resources/bluespice.extjs/BS/form/NamespaceCombo.js
index 85df785..d439171 100644
--- a/resources/bluespice.extjs/BS/form/NamespaceCombo.js
+++ b/resources/bluespice.extjs/BS/form/NamespaceCombo.js
@@ -6,7 +6,6 @@
queryMode: 'local',
typeAhead: true,
triggerAction: 'all',
- value: 0,
fieldLabel: mw.message('bs-extjs-namespace').plain(),
//Custom Settings
@@ -35,4 +34,4 @@
}
this.callParent([value, doSelect]);
}
-});
\ No newline at end of file
+});
--
To view, visit https://gerrit.wikimedia.org/r/191553
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If9996f7393efd7c1e32e3f82faeaa1b8d0dd77ee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed regex to match everything except whitespaces - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fixed regex to match everything except whitespaces
..
fixed regex to match everything except whitespaces
Change-Id: I1e2780aab8d7888e7f35dd7a6d148f4d8710e7c8
---
M ShoutBox/ShoutBox.class.php
M ShoutBox/resources/bluespice.shoutBox.mention.js
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index a41827d..fce9549 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -323,7 +323,7 @@
while ( $row = $dbr-fetchRow( $res ) ) {
$oUser = User::newFromId( $row['sb_user_id'] );
$oProfile =
BsCore::getInstance()-getUserMiniProfile( $oUser );
- $sMessage = preg_replace_callback(#@(\w*)#,
self::replaceUsernameInMessage, $row['sb_message']);
+ $sMessage = preg_replace_callback(#@(\S*)#,
self::replaceUsernameInMessage, $row['sb_message']);
$oShoutBoxMessageView = new
ViewShoutBoxMessage();
if ( $bShowAge )
$oShoutBoxMessageView-setDate(
BsFormatConverter::mwTimestampToAgeString( $row['sb_timestamp'], true ) );
@@ -546,7 +546,7 @@
public static function getUsersMentioned( $sMessage ) {
if ( empty( $sMessage ) )
return array();
- $bResult = preg_match_all( #@(\w*)#, $sMessage, $aMatches );
+ $bResult = preg_match_all( #@(\S*)#, $sMessage, $aMatches );
if ( $bResult === false || $bResult 1 )
return array();
$aReturn = array();
diff --git a/ShoutBox/resources/bluespice.shoutBox.mention.js
b/ShoutBox/resources/bluespice.shoutBox.mention.js
index b52e731..ca0114c 100644
--- a/ShoutBox/resources/bluespice.shoutBox.mention.js
+++ b/ShoutBox/resources/bluespice.shoutBox.mention.js
@@ -2,7 +2,7 @@
var BSShoutboxMentions = {
mentions: [ ],
//matches whole words starting with @
- match: /\B@(\w*)$/,
+ match: /\B@(\S*)$/,
search: function ( term, callback ) {
//if the mentions array is empty get a list of all
users available
//first trigger with the @ in the shoutbox to not
overload requests
--
To view, visit https://gerrit.wikimedia.org/r/190805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e2780aab8d7888e7f35dd7a6d148f4d8710e7c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed regex to match everything except whitespaces - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192298
Change subject: fixed regex to match everything except whitespaces
..
fixed regex to match everything except whitespaces
Change-Id: I1e2780aab8d7888e7f35dd7a6d148f4d8710e7c8
(cherry picked from commit d9a382e3d9c52928382a994935c4441fba4f4bc6)
---
M ShoutBox/ShoutBox.class.php
M ShoutBox/resources/bluespice.shoutBox.mention.js
2 files changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/98/192298/1
diff --git a/ShoutBox/ShoutBox.class.php b/ShoutBox/ShoutBox.class.php
index aa55513..1549641 100644
--- a/ShoutBox/ShoutBox.class.php
+++ b/ShoutBox/ShoutBox.class.php
@@ -321,7 +321,7 @@
while ( $row = $dbr-fetchRow( $res ) ) {
$oUser = User::newFromId( $row['sb_user_id'] );
$oProfile =
BsCore::getInstance()-getUserMiniProfile( $oUser );
- $sMessage = preg_replace_callback(#@(\w*)#,
self::replaceUsernameInMessage, $row['sb_message']);
+ $sMessage = preg_replace_callback(#@(\S*)#,
self::replaceUsernameInMessage, $row['sb_message']);
$oShoutBoxMessageView = new
ViewShoutBoxMessage();
if ( $bShowAge )
$oShoutBoxMessageView-setDate(
BsFormatConverter::mwTimestampToAgeString( $row['sb_timestamp'], true ) );
@@ -544,7 +544,7 @@
public static function getUsersMentioned( $sMessage ) {
if ( empty( $sMessage ) )
return array();
- $bResult = preg_match_all( #@(\w*)#, $sMessage, $aMatches );
+ $bResult = preg_match_all( #@(\S*)#, $sMessage, $aMatches );
if ( $bResult === false || $bResult 1 )
return array();
$aReturn = array();
diff --git a/ShoutBox/resources/bluespice.shoutBox.mention.js
b/ShoutBox/resources/bluespice.shoutBox.mention.js
index b52e731..ca0114c 100644
--- a/ShoutBox/resources/bluespice.shoutBox.mention.js
+++ b/ShoutBox/resources/bluespice.shoutBox.mention.js
@@ -2,7 +2,7 @@
var BSShoutboxMentions = {
mentions: [ ],
//matches whole words starting with @
- match: /\B@(\w*)$/,
+ match: /\B@(\S*)$/,
search: function ( term, callback ) {
//if the mentions array is empty get a list of all
users available
//first trigger with the @ in the shoutbox to not
overload requests
--
To view, visit https://gerrit.wikimedia.org/r/192298
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e2780aab8d7888e7f35dd7a6d148f4d8710e7c8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for invalid file upload - change (mediawiki...NSFileRepo)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192303
Change subject: Fix for invalid file upload
..
Fix for invalid file upload
If a user selects a file that is not allowed by $wgFileExtensions and
tries to upload it (without noticing the message)
$uploadForm-mDesiredDestName
is an empty string. In this case NSFileRepo causes a fatal error.
Change-Id: Iada71324a867d9794dee3ce707236e2aca03132f
---
M NSFileRepo.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NSFileRepo
refs/changes/03/192303/1
diff --git a/NSFileRepo.php b/NSFileRepo.php
index 56e7f9c..8b8da9c 100644
--- a/NSFileRepo.php
+++ b/NSFileRepo.php
@@ -80,6 +80,9 @@
*/
function NSFileRepoNSCheck( $uploadForm ) {
$title = Title::newFromText($uploadForm-mDesiredDestName);
+ if( $title === null ) {
+ return true;
+ }
if ( $title-getNamespace() 100 ) {
$uploadForm-mDesiredDestName = preg_replace( /:/, '-',
$uploadForm-mDesiredDestName );
} else {
--
To view, visit https://gerrit.wikimedia.org/r/192303
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iada71324a867d9794dee3ce707236e2aca03132f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/NSFileRepo
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for empty window after inserting a file - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fix for empty window after inserting a file
..
fix for empty window after inserting a file
Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
(cherry picked from commit a6fee7464f1ab45cf77b7997bd383b02a0afca34)
(cherry picked from commit eaa91defa34754140ce9c97998a1042ad0d7f2b2)
---
M InsertFile/resources/bluespice.insertFile.js
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/InsertFile/resources/bluespice.insertFile.js
b/InsertFile/resources/bluespice.insertFile.js
index 6b7dc25..2461beb 100644
--- a/InsertFile/resources/bluespice.insertFile.js
+++ b/InsertFile/resources/bluespice.insertFile.js
@@ -14,6 +14,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.FileDialog.setData({});
});
var data = {};
@@ -56,6 +57,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.ImageDialog.setData({});
});
var data = {};
@@ -318,4 +320,4 @@
}
}
});
-});
\ No newline at end of file
+});
--
To view, visit https://gerrit.wikimedia.org/r/192280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed crash when query is broken - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fixed crash when query is broken
..
fixed crash when query is broken
Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
(cherry picked from commit 82885c371e5ce7d439899ed8197989bdee0a1b4b)
(cherry picked from commit 8ff75fe16a1934a745a35e9782f046723bb40f2d)
---
M Statistics/includes/MySQLDbReader.class.php
1 file changed, 11 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Statistics/includes/MySQLDbReader.class.php
b/Statistics/includes/MySQLDbReader.class.php
index fd3cb74..f3dde83 100644
--- a/Statistics/includes/MySQLDbReader.class.php
+++ b/Statistics/includes/MySQLDbReader.class.php
@@ -16,13 +16,13 @@
/**
* Reads data from database for Statistics for BlueSpice.
* @packageBlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class MySQLDbReader extends StatsDataProvider {
-
+
/**
* Database server host
-* @var string
+* @var string
*/
public $host;
/**
@@ -59,9 +59,12 @@
$sql = str_replace(@period, BETWEEN
'.$interval-getStartTS(YmdHis).' AND '.$interval-getEndTS(YmdHis).'
, $sql);
$sql = str_replace(@start,
'.$interval-getStartTS(YmdHis).' , $sql);
- $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
+ $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
$res = mysql_query($sql);
+ if (!$res){
+ return 0;
+ }
$row = mysql_fetch_array($res);
$item = $row[0];
@@ -90,6 +93,9 @@
$sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
//echo 'br'.$sql;
$res = mysql_query($sql);
+ if (!$res){
+ return $uniqueValues;
+ }
while ($row = mysql_fetch_array($res)) {
$rowArr = array();
@@ -97,7 +103,7 @@
$rowArr[] = $row[$i];
$uniqueValues[] = $rowArr;
}
-
+
--
To view, visit https://gerrit.wikimedia.org/r/192284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed crash when query is broken - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192284
Change subject: fixed crash when query is broken
..
fixed crash when query is broken
Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
(cherry picked from commit 82885c371e5ce7d439899ed8197989bdee0a1b4b)
(cherry picked from commit 8ff75fe16a1934a745a35e9782f046723bb40f2d)
---
M Statistics/includes/MySQLDbReader.class.php
1 file changed, 11 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/84/192284/1
diff --git a/Statistics/includes/MySQLDbReader.class.php
b/Statistics/includes/MySQLDbReader.class.php
index fd3cb74..f3dde83 100644
--- a/Statistics/includes/MySQLDbReader.class.php
+++ b/Statistics/includes/MySQLDbReader.class.php
@@ -16,13 +16,13 @@
/**
* Reads data from database for Statistics for BlueSpice.
* @packageBlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class MySQLDbReader extends StatsDataProvider {
-
+
/**
* Database server host
-* @var string
+* @var string
*/
public $host;
/**
@@ -59,9 +59,12 @@
$sql = str_replace(@period, BETWEEN
'.$interval-getStartTS(YmdHis).' AND '.$interval-getEndTS(YmdHis).'
, $sql);
$sql = str_replace(@start,
'.$interval-getStartTS(YmdHis).' , $sql);
- $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
+ $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
$res = mysql_query($sql);
+ if (!$res){
+ return 0;
+ }
$row = mysql_fetch_array($res);
$item = $row[0];
@@ -90,6 +93,9 @@
$sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
//echo 'br'.$sql;
$res = mysql_query($sql);
+ if (!$res){
+ return $uniqueValues;
+ }
while ($row = mysql_fetch_array($res)) {
$rowArr = array();
@@ -97,7 +103,7 @@
$rowArr[] = $row[$i];
$uniqueValues[] = $rowArr;
}
-
+
--
To view, visit https://gerrit.wikimedia.org/r/192284
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update ApiResult handling for mediawiki/core change I7b37295e - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Update ApiResult handling for mediawiki/core change I7b37295e
..
Update ApiResult handling for mediawiki/core change I7b37295e
Change I7b37295e for mediawiki/core deprecates several methods, and more
importantly changes the format of the data returned from
ApiResult::getData(). This change should handle these differences in a
backwards-compatible manner.
Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678d
---
M UEModulePDF/includes/PDFPageProvider.class.php
1 file changed, 7 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/UEModulePDF/includes/PDFPageProvider.class.php
b/UEModulePDF/includes/PDFPageProvider.class.php
index 524521a..2ee58be 100644
--- a/UEModulePDF/includes/PDFPageProvider.class.php
+++ b/UEModulePDF/includes/PDFPageProvider.class.php
@@ -116,7 +116,13 @@
$oAPI = new ApiMain( $aAPIParams );
$oAPI-execute();
- $aResult = $oAPI-getResultData();
+ if ( defined( 'ApiResult::META_CONTENT' ) ) {
+ $aResult = $oAPI-getResult()-getResultData();
+ $aResult = ApiResult::transformForBC( $aResult
);
+ $aResult = ApiResult::removeMetadata( $aResult
);
+ } else {
+ $aResult = $oAPI-getResultData();
+ }
foreach($aResult['parse']['categories'] as $aCat ) {
$aCategories[] = $aCat['*'];
--
To view, visit https://gerrit.wikimedia.org/r/191081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b37295e8862b188d1f3b0cd07f66ac34629678d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
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 empty window after inserting a file - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192279
Change subject: fix for empty window after inserting a file
..
fix for empty window after inserting a file
Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
(cherry picked from commit a6fee7464f1ab45cf77b7997bd383b02a0afca34)
---
M InsertFile/resources/bluespice.insertFile.js
1 file changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/79/192279/1
diff --git a/InsertFile/resources/bluespice.insertFile.js
b/InsertFile/resources/bluespice.insertFile.js
index 6b7dc25..2461beb 100644
--- a/InsertFile/resources/bluespice.insertFile.js
+++ b/InsertFile/resources/bluespice.insertFile.js
@@ -14,6 +14,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.FileDialog.setData({});
});
var data = {};
@@ -56,6 +57,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.ImageDialog.setData({});
});
var data = {};
@@ -318,4 +320,4 @@
}
}
});
-});
\ No newline at end of file
+});
--
To view, visit https://gerrit.wikimedia.org/r/192279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for empty window after inserting a file - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fix for empty window after inserting a file
..
fix for empty window after inserting a file
Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
---
M InsertFile/resources/bluespice.insertFile.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/InsertFile/resources/bluespice.insertFile.js
b/InsertFile/resources/bluespice.insertFile.js
index 7b80c09..7c9a463 100644
--- a/InsertFile/resources/bluespice.insertFile.js
+++ b/InsertFile/resources/bluespice.insertFile.js
@@ -14,6 +14,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.FileDialog.setData({});
});
var data = {};
@@ -56,6 +57,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.ImageDialog.setData({});
});
var data = {};
--
To view, visit https://gerrit.wikimedia.org/r/191878
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
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 empty window after inserting a file - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fix for empty window after inserting a file
..
fix for empty window after inserting a file
Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
(cherry picked from commit a6fee7464f1ab45cf77b7997bd383b02a0afca34)
---
M InsertFile/resources/bluespice.insertFile.js
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/InsertFile/resources/bluespice.insertFile.js
b/InsertFile/resources/bluespice.insertFile.js
index 6b7dc25..2461beb 100644
--- a/InsertFile/resources/bluespice.insertFile.js
+++ b/InsertFile/resources/bluespice.insertFile.js
@@ -14,6 +14,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.FileDialog.setData({});
});
var data = {};
@@ -56,6 +57,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.ImageDialog.setData({});
});
var data = {};
@@ -318,4 +320,4 @@
}
}
});
-});
\ No newline at end of file
+});
--
To view, visit https://gerrit.wikimedia.org/r/192279
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
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 empty window after inserting a file - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192280
Change subject: fix for empty window after inserting a file
..
fix for empty window after inserting a file
Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
(cherry picked from commit a6fee7464f1ab45cf77b7997bd383b02a0afca34)
(cherry picked from commit eaa91defa34754140ce9c97998a1042ad0d7f2b2)
---
M InsertFile/resources/bluespice.insertFile.js
1 file changed, 3 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/80/192280/1
diff --git a/InsertFile/resources/bluespice.insertFile.js
b/InsertFile/resources/bluespice.insertFile.js
index 6b7dc25..2461beb 100644
--- a/InsertFile/resources/bluespice.insertFile.js
+++ b/InsertFile/resources/bluespice.insertFile.js
@@ -14,6 +14,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.FileDialog.setData({});
});
var data = {};
@@ -56,6 +57,7 @@
delete( data.src );
var wikiLink = new bs.wikiText.Link( data );
bs.util.selection.restore( wikiLink.toString()
);
+ BS.InsertFile.ImageDialog.setData({});
});
var data = {};
@@ -318,4 +320,4 @@
}
}
});
-});
\ No newline at end of file
+});
--
To view, visit https://gerrit.wikimedia.org/r/192280
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf726ea293d87ae3fa6e6438315a149e883245a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove ve loading if not in edit mode - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192278
Change subject: remove ve loading if not in edit mode
..
remove ve loading if not in edit mode
* this hook call should be reevaluated, jumping out saves 40 queries
Change-Id: I9578ac40b3d3768b590dcf1d4f5d9d743bae15ed
(cherry picked from commit 4386eab5d6986500f8bd35074057e3abb353a96d)
---
M VisualEditor/VisualEditor.class.php
1 file changed, 4 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/78/192278/1
diff --git a/VisualEditor/VisualEditor.class.php
b/VisualEditor/VisualEditor.class.php
index 29f44ef..95318af 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -286,6 +286,10 @@
public function onParserAfterTidy($oParser) {
global $wgLang, $wgOut;
+ $sAction = $wgOut-getRequest()-getVal('action', 'view');
+ if ($sAction != 'edit' $sAction != 'preview' $sAction !=
'submit')
+ return true;
+
if ($this-bTagsCollected) return true;
$this-bTagsCollected = true;
--
To view, visit https://gerrit.wikimedia.org/r/192278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9578ac40b3d3768b590dcf1d4f5d9d743bae15ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove ve loading if not in edit mode - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: remove ve loading if not in edit mode
..
remove ve loading if not in edit mode
* this hook call should be reevaluated, jumping out saves 40 queries
Change-Id: I9578ac40b3d3768b590dcf1d4f5d9d743bae15ed
---
M VisualEditor/VisualEditor.class.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/VisualEditor/VisualEditor.class.php
b/VisualEditor/VisualEditor.class.php
index 29f44ef..95318af 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -286,6 +286,10 @@
public function onParserAfterTidy($oParser) {
global $wgLang, $wgOut;
+ $sAction = $wgOut-getRequest()-getVal('action', 'view');
+ if ($sAction != 'edit' $sAction != 'preview' $sAction !=
'submit')
+ return true;
+
if ($this-bTagsCollected) return true;
$this-bTagsCollected = true;
--
To view, visit https://gerrit.wikimedia.org/r/192277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9578ac40b3d3768b590dcf1d4f5d9d743bae15ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
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 ve loading if not in edit mode - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: remove ve loading if not in edit mode
..
remove ve loading if not in edit mode
* this hook call should be reevaluated, jumping out saves 40 queries
Change-Id: I9578ac40b3d3768b590dcf1d4f5d9d743bae15ed
(cherry picked from commit 4386eab5d6986500f8bd35074057e3abb353a96d)
---
M VisualEditor/VisualEditor.class.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/VisualEditor/VisualEditor.class.php
b/VisualEditor/VisualEditor.class.php
index 29f44ef..95318af 100644
--- a/VisualEditor/VisualEditor.class.php
+++ b/VisualEditor/VisualEditor.class.php
@@ -286,6 +286,10 @@
public function onParserAfterTidy($oParser) {
global $wgLang, $wgOut;
+ $sAction = $wgOut-getRequest()-getVal('action', 'view');
+ if ($sAction != 'edit' $sAction != 'preview' $sAction !=
'submit')
+ return true;
+
if ($this-bTagsCollected) return true;
$this-bTagsCollected = true;
--
To view, visit https://gerrit.wikimedia.org/r/192278
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9578ac40b3d3768b590dcf1d4f5d9d743bae15ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Notifications Badge not shown on Vector Skin - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Notifications Badge not shown on Vector Skin
..
Notifications Badge not shown on Vector Skin
Fixed bug where Notifications Badge is moved from personal_urls
to bs_personal_info Navigation on non-BlueSpice Skins
Change-Id: I5dc79fe52d424e28ba968eadec2340f3b4773c52
---
M Notifications/Notifications.class.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Tweichart: Checked; Looks good to me, but someone else must approve
diff --git a/Notifications/Notifications.class.php
b/Notifications/Notifications.class.php
index e9fcdd9..4b82a4b 100644
--- a/Notifications/Notifications.class.php
+++ b/Notifications/Notifications.class.php
@@ -480,7 +480,7 @@
* @return boolean Always true to keep hook running
*/
public function onSkinTemplateOutputPageBeforeExec($sktemplate, $tpl){
- if (!isset($tpl-data['personal_urls']['notifications'])) {
+ if (!isset($tpl-data['personal_urls']['notifications']) ||
$tpl instanceof BsBaseTemplate != true) {
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/191588
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5dc79fe52d424e28ba968eadec2340f3b4773c52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tr4nt0r dennerl...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed crash when query is broken - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192283
Change subject: fixed crash when query is broken
..
fixed crash when query is broken
Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
(cherry picked from commit 82885c371e5ce7d439899ed8197989bdee0a1b4b)
---
M Statistics/includes/MySQLDbReader.class.php
1 file changed, 11 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/83/192283/1
diff --git a/Statistics/includes/MySQLDbReader.class.php
b/Statistics/includes/MySQLDbReader.class.php
index fd3cb74..f3dde83 100644
--- a/Statistics/includes/MySQLDbReader.class.php
+++ b/Statistics/includes/MySQLDbReader.class.php
@@ -16,13 +16,13 @@
/**
* Reads data from database for Statistics for BlueSpice.
* @packageBlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class MySQLDbReader extends StatsDataProvider {
-
+
/**
* Database server host
-* @var string
+* @var string
*/
public $host;
/**
@@ -59,9 +59,12 @@
$sql = str_replace(@period, BETWEEN
'.$interval-getStartTS(YmdHis).' AND '.$interval-getEndTS(YmdHis).'
, $sql);
$sql = str_replace(@start,
'.$interval-getStartTS(YmdHis).' , $sql);
- $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
+ $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
$res = mysql_query($sql);
+ if (!$res){
+ return 0;
+ }
$row = mysql_fetch_array($res);
$item = $row[0];
@@ -90,6 +93,9 @@
$sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
//echo 'br'.$sql;
$res = mysql_query($sql);
+ if (!$res){
+ return $uniqueValues;
+ }
while ($row = mysql_fetch_array($res)) {
$rowArr = array();
@@ -97,7 +103,7 @@
$rowArr[] = $row[$i];
$uniqueValues[] = $rowArr;
}
-
+
--
To view, visit https://gerrit.wikimedia.org/r/192283
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed crash when query is broken - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fixed crash when query is broken
..
fixed crash when query is broken
Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
(cherry picked from commit 82885c371e5ce7d439899ed8197989bdee0a1b4b)
---
M Statistics/includes/MySQLDbReader.class.php
1 file changed, 11 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Statistics/includes/MySQLDbReader.class.php
b/Statistics/includes/MySQLDbReader.class.php
index fd3cb74..f3dde83 100644
--- a/Statistics/includes/MySQLDbReader.class.php
+++ b/Statistics/includes/MySQLDbReader.class.php
@@ -16,13 +16,13 @@
/**
* Reads data from database for Statistics for BlueSpice.
* @packageBlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class MySQLDbReader extends StatsDataProvider {
-
+
/**
* Database server host
-* @var string
+* @var string
*/
public $host;
/**
@@ -59,9 +59,12 @@
$sql = str_replace(@period, BETWEEN
'.$interval-getStartTS(YmdHis).' AND '.$interval-getEndTS(YmdHis).'
, $sql);
$sql = str_replace(@start,
'.$interval-getStartTS(YmdHis).' , $sql);
- $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
+ $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
$res = mysql_query($sql);
+ if (!$res){
+ return 0;
+ }
$row = mysql_fetch_array($res);
$item = $row[0];
@@ -90,6 +93,9 @@
$sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
//echo 'br'.$sql;
$res = mysql_query($sql);
+ if (!$res){
+ return $uniqueValues;
+ }
while ($row = mysql_fetch_array($res)) {
$rowArr = array();
@@ -97,7 +103,7 @@
$rowArr[] = $row[$i];
$uniqueValues[] = $rowArr;
}
-
+
--
To view, visit https://gerrit.wikimedia.org/r/192283
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fixed crash when query is broken - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: fixed crash when query is broken
..
fixed crash when query is broken
Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
---
M Statistics/includes/MySQLDbReader.class.php
1 file changed, 11 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Statistics/includes/MySQLDbReader.class.php
b/Statistics/includes/MySQLDbReader.class.php
index fd3cb74..f3dde83 100644
--- a/Statistics/includes/MySQLDbReader.class.php
+++ b/Statistics/includes/MySQLDbReader.class.php
@@ -16,13 +16,13 @@
/**
* Reads data from database for Statistics for BlueSpice.
* @packageBlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class MySQLDbReader extends StatsDataProvider {
-
+
/**
* Database server host
-* @var string
+* @var string
*/
public $host;
/**
@@ -59,9 +59,12 @@
$sql = str_replace(@period, BETWEEN
'.$interval-getStartTS(YmdHis).' AND '.$interval-getEndTS(YmdHis).'
, $sql);
$sql = str_replace(@start,
'.$interval-getStartTS(YmdHis).' , $sql);
- $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
+ $sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
$res = mysql_query($sql);
+ if (!$res){
+ return 0;
+ }
$row = mysql_fetch_array($res);
$item = $row[0];
@@ -90,6 +93,9 @@
$sql = str_replace(@end,
'.$interval-getEndTS(YmdHis).' , $sql);
//echo 'br'.$sql;
$res = mysql_query($sql);
+ if (!$res){
+ return $uniqueValues;
+ }
while ($row = mysql_fetch_array($res)) {
$rowArr = array();
@@ -97,7 +103,7 @@
$rowArr[] = $row[$i];
$uniqueValues[] = $rowArr;
}
-
+
--
To view, visit https://gerrit.wikimedia.org/r/191558
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4888fb92f4fa9b22f307dc7fcd136c2338a8a52
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_22
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
