Pwirth has uploaded a new change for review. https://gerrit.wikimedia.org/r/291906
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 Conflicts: ContextMenu/ContextMenu.class.php InsertLink/InsertLink.class.php Change-Id: I402588cb08d2f8447a66e706303f357f4a053412 --- M BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.class.php M BlueSpiceProjectFeedbackHelper/includes/api/BSApiTasksBlueSpiceProjectFeedbackHelper.php M CSyntaxHighlight/CSyntaxHighlight.class.php M ContextMenu/ContextMenu.class.php M CountThings/CountThings.class.php M Dashboards/Dashboards.class.php M Emoticons/Emoticons.class.php M ExtendedEditBar/ExtendedEditBar.class.php M FormattingHelp/includes/api/BSApiTasksFormattingHelp.php M GroupManager/includes/api/BSApiTasksGroupManager.php M HideTitle/HideTitle.class.php M InsertFile/InsertFile.class.php M InsertLink/InsertLink.class.php M InsertMagic/InsertMagic.class.php M InterWikiLinks/InterWikiLinks.class.php M InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php M NamespaceCss/NamespaceCss.class.php M PageTemplates/includes/api/BSApiPageTemplatesTasks.php M ResponsibleEditors/includes/api/BSApiTasksResponsibleEditors.php M ShoutBox/includes/api/BSApiTasksShoutBox.php M StateBar/StateBar.class.php M TopMenuBarCustomizer/TopMenuBarCustomizer.class.php M TopMenuBarCustomizer/includes/TopMenuBarCustomizerParser.php M UserManager/includes/api/BSApiTasksUserManager.php M UserSidebar/UserSidebar.class.php M VisualEditor/includes/api/BSApiVisualEditorTasks.php M WantedArticle/includes/api/BSApiTasksWantedArticle.php M WidgetBar/WidgetBar.class.php 28 files changed, 31 insertions(+), 39 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions refs/changes/06/291906/1 diff --git a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.class.php b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.class.php index 560ff52..0fe77ab 100644 --- a/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.class.php +++ b/BlueSpiceProjectFeedbackHelper/BlueSpiceProjectFeedbackHelper.class.php @@ -108,4 +108,4 @@ $sData .= $oView->execute(); return true; } -} +} \ No newline at end of file diff --git a/BlueSpiceProjectFeedbackHelper/includes/api/BSApiTasksBlueSpiceProjectFeedbackHelper.php b/BlueSpiceProjectFeedbackHelper/includes/api/BSApiTasksBlueSpiceProjectFeedbackHelper.php index 63b93a2..76bd077 100644 --- a/BlueSpiceProjectFeedbackHelper/includes/api/BSApiTasksBlueSpiceProjectFeedbackHelper.php +++ b/BlueSpiceProjectFeedbackHelper/includes/api/BSApiTasksBlueSpiceProjectFeedbackHelper.php @@ -61,4 +61,4 @@ 'disableFeedback' => array( 'wikiadmin' ) ); } -} +} \ No newline at end of file diff --git a/CSyntaxHighlight/CSyntaxHighlight.class.php b/CSyntaxHighlight/CSyntaxHighlight.class.php index e88f9c3..6668a3d 100644 --- a/CSyntaxHighlight/CSyntaxHighlight.class.php +++ b/CSyntaxHighlight/CSyntaxHighlight.class.php @@ -179,4 +179,4 @@ return true; } -} +} \ No newline at end of file diff --git a/ContextMenu/ContextMenu.class.php b/ContextMenu/ContextMenu.class.php index d23eedb..2036089 100644 --- a/ContextMenu/ContextMenu.class.php +++ b/ContextMenu/ContextMenu.class.php @@ -24,13 +24,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * -<<<<<<< HEAD (57a45b Replaced old url "http://www.blue-spice.org"; with "http://bl) + * For further information visit http://bluespice.com - * @author Robert Vogel <vo...@hallowelt.biz> -======= - * For further information visit http://www.blue-spice.org + * @author Robert Vogel <vo...@hallowelt.com> ->>>>>>> BRANCH (1c321a Merge "Replaced all *@hallowelt.biz addresses with *@hallowe) * @version 2.23.1 * @package BlueSpice_Extensions * @subpackage ContextMenu diff --git a/CountThings/CountThings.class.php b/CountThings/CountThings.class.php index 83788b7..6b6e51e 100644 --- a/CountThings/CountThings.class.php +++ b/CountThings/CountThings.class.php @@ -247,4 +247,4 @@ return $sOut; } -} +} \ No newline at end of file diff --git a/Dashboards/Dashboards.class.php b/Dashboards/Dashboards.class.php index 9535c1d..c47ed51 100644 --- a/Dashboards/Dashboards.class.php +++ b/Dashboards/Dashboards.class.php @@ -245,4 +245,4 @@ ); return true; } -} +} \ No newline at end of file diff --git a/Emoticons/Emoticons.class.php b/Emoticons/Emoticons.class.php index d77a438..dd5ac65 100644 --- a/Emoticons/Emoticons.class.php +++ b/Emoticons/Emoticons.class.php @@ -219,4 +219,4 @@ return true; } -} +} \ No newline at end of file diff --git a/ExtendedEditBar/ExtendedEditBar.class.php b/ExtendedEditBar/ExtendedEditBar.class.php index 8f61b69..42c6468 100644 --- a/ExtendedEditBar/ExtendedEditBar.class.php +++ b/ExtendedEditBar/ExtendedEditBar.class.php @@ -325,4 +325,4 @@ return true; } -} +} \ No newline at end of file diff --git a/FormattingHelp/includes/api/BSApiTasksFormattingHelp.php b/FormattingHelp/includes/api/BSApiTasksFormattingHelp.php index 5c468e7..e4f26b8 100644 --- a/FormattingHelp/includes/api/BSApiTasksFormattingHelp.php +++ b/FormattingHelp/includes/api/BSApiTasksFormattingHelp.php @@ -146,4 +146,4 @@ 'getFormattingHelp' => array( 'read' ) ); } -} +} \ No newline at end of file diff --git a/GroupManager/includes/api/BSApiTasksGroupManager.php b/GroupManager/includes/api/BSApiTasksGroupManager.php index 1893fe0..bf4add9 100644 --- a/GroupManager/includes/api/BSApiTasksGroupManager.php +++ b/GroupManager/includes/api/BSApiTasksGroupManager.php @@ -291,4 +291,4 @@ public function needsToken() { return parent::needsToken(); } -} +} \ No newline at end of file diff --git a/HideTitle/HideTitle.class.php b/HideTitle/HideTitle.class.php index 598087f..9188245 100644 --- a/HideTitle/HideTitle.class.php +++ b/HideTitle/HideTitle.class.php @@ -92,4 +92,4 @@ ); return true; } -} +} \ No newline at end of file diff --git a/InsertFile/InsertFile.class.php b/InsertFile/InsertFile.class.php index 475a214..507b4cc 100644 --- a/InsertFile/InsertFile.class.php +++ b/InsertFile/InsertFile.class.php @@ -116,4 +116,4 @@ ); return true; } -} +} \ No newline at end of file diff --git a/InsertLink/InsertLink.class.php b/InsertLink/InsertLink.class.php index 22b576f..8dcd584 100644 --- a/InsertLink/InsertLink.class.php +++ b/InsertLink/InsertLink.class.php @@ -23,17 +23,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * http://www.gnu.org/copyleft/gpl.html * -<<<<<<< HEAD (57a45b Replaced old url "http://www.blue-spice.org"; with "http://bl) + * For further information visit http://bluespice.com - * @author Markus Glaser <gla...@hallowelt.biz> - * @author Robert Vogel <vo...@hallowelt.biz> - * @author Tobias Weichart <weich...@hallowelt.biz> -======= - * For further information visit http://www.blue-spice.org + * @author Markus Glaser <gla...@hallowelt.com> * @author Robert Vogel <vo...@hallowelt.com> * @author Tobias Weichart <weich...@hallowelt.com> ->>>>>>> BRANCH (1c321a Merge "Replaced all *@hallowelt.biz addresses with *@hallowe) * @version 2.23.1 * @package BlueSpice_Extensions * @subpackage InsertFile @@ -143,4 +138,4 @@ file_put_contents( __DIR__ . "/../../BlueSpiceFoundation/data/bsFileLinkChooser.jnlp", $bsFileLinkChooser); $updater->output( "InsertLink jnlp file created.\n" ); } -} +} \ No newline at end of file diff --git a/InsertMagic/InsertMagic.class.php b/InsertMagic/InsertMagic.class.php index 81559fc..c37a8a6 100644 --- a/InsertMagic/InsertMagic.class.php +++ b/InsertMagic/InsertMagic.class.php @@ -174,4 +174,4 @@ array_splice( $aConfigOverwrite["toolbar2"], $iIndexOverwrite + 1, 0, "bsmagic" ); return true; } -} +} \ No newline at end of file diff --git a/InterWikiLinks/InterWikiLinks.class.php b/InterWikiLinks/InterWikiLinks.class.php index 914c62b..7417820 100644 --- a/InterWikiLinks/InterWikiLinks.class.php +++ b/InterWikiLinks/InterWikiLinks.class.php @@ -127,4 +127,4 @@ } } -} +} \ No newline at end of file diff --git a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php index a2cf4c9..cb2f379 100644 --- a/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php +++ b/InterWikiLinks/includes/api/BSApiTasksInterWikiLinksManager.php @@ -265,4 +265,4 @@ return $oReturn; } -} +} \ No newline at end of file diff --git a/NamespaceCss/NamespaceCss.class.php b/NamespaceCss/NamespaceCss.class.php index 17e0174..65ad4a8 100644 --- a/NamespaceCss/NamespaceCss.class.php +++ b/NamespaceCss/NamespaceCss.class.php @@ -85,4 +85,4 @@ return true; } -} +} \ No newline at end of file diff --git a/PageTemplates/includes/api/BSApiPageTemplatesTasks.php b/PageTemplates/includes/api/BSApiPageTemplatesTasks.php index d2bb068..7dc09b7 100644 --- a/PageTemplates/includes/api/BSApiPageTemplatesTasks.php +++ b/PageTemplates/includes/api/BSApiPageTemplatesTasks.php @@ -183,4 +183,4 @@ 'doDeleteTemplates' => array( 'wikiadmin' ), ); } -} +} \ No newline at end of file diff --git a/ResponsibleEditors/includes/api/BSApiTasksResponsibleEditors.php b/ResponsibleEditors/includes/api/BSApiTasksResponsibleEditors.php index 67625dc..13eddf1 100644 --- a/ResponsibleEditors/includes/api/BSApiTasksResponsibleEditors.php +++ b/ResponsibleEditors/includes/api/BSApiTasksResponsibleEditors.php @@ -107,4 +107,4 @@ public function needsToken() { return parent::needsToken(); } -} +} \ No newline at end of file diff --git a/ShoutBox/includes/api/BSApiTasksShoutBox.php b/ShoutBox/includes/api/BSApiTasksShoutBox.php index 9d5aafe..0d552b1 100644 --- a/ShoutBox/includes/api/BSApiTasksShoutBox.php +++ b/ShoutBox/includes/api/BSApiTasksShoutBox.php @@ -344,4 +344,4 @@ public function needsToken() { return parent::needsToken(); } -} +} \ No newline at end of file diff --git a/StateBar/StateBar.class.php b/StateBar/StateBar.class.php index 1db5ee2..d9390bf 100644 --- a/StateBar/StateBar.class.php +++ b/StateBar/StateBar.class.php @@ -408,4 +408,4 @@ $this->aBodyViews[$iSortId] = $oBodyView; } } -} +} \ No newline at end of file diff --git a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php index fb2ac25..ca07992 100644 --- a/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php +++ b/TopMenuBarCustomizer/TopMenuBarCustomizer.class.php @@ -253,4 +253,4 @@ $this->getCacheKey( 'NavigationSitesData' ) ); } -} +} \ No newline at end of file diff --git a/TopMenuBarCustomizer/includes/TopMenuBarCustomizerParser.php b/TopMenuBarCustomizer/includes/TopMenuBarCustomizerParser.php index 47f4ba7..5aaf465 100644 --- a/TopMenuBarCustomizer/includes/TopMenuBarCustomizerParser.php +++ b/TopMenuBarCustomizer/includes/TopMenuBarCustomizerParser.php @@ -268,4 +268,4 @@ } return $sWikiText; } -} +} \ No newline at end of file diff --git a/UserManager/includes/api/BSApiTasksUserManager.php b/UserManager/includes/api/BSApiTasksUserManager.php index 2185710..7c976a7 100644 --- a/UserManager/includes/api/BSApiTasksUserManager.php +++ b/UserManager/includes/api/BSApiTasksUserManager.php @@ -248,4 +248,4 @@ return $oReturn; } -} +} \ No newline at end of file diff --git a/UserSidebar/UserSidebar.class.php b/UserSidebar/UserSidebar.class.php index 173ada7..02385dd 100644 --- a/UserSidebar/UserSidebar.class.php +++ b/UserSidebar/UserSidebar.class.php @@ -508,4 +508,4 @@ return true; } -} +} \ No newline at end of file diff --git a/VisualEditor/includes/api/BSApiVisualEditorTasks.php b/VisualEditor/includes/api/BSApiVisualEditorTasks.php index 65f347a..756c6c9 100644 --- a/VisualEditor/includes/api/BSApiVisualEditorTasks.php +++ b/VisualEditor/includes/api/BSApiVisualEditorTasks.php @@ -133,4 +133,4 @@ return $oReturn; } -} +} \ No newline at end of file diff --git a/WantedArticle/includes/api/BSApiTasksWantedArticle.php b/WantedArticle/includes/api/BSApiTasksWantedArticle.php index c56ad67..750bf3d 100644 --- a/WantedArticle/includes/api/BSApiTasksWantedArticle.php +++ b/WantedArticle/includes/api/BSApiTasksWantedArticle.php @@ -270,4 +270,4 @@ public function needsToken() { return parent::needsToken(); } -} +} \ No newline at end of file diff --git a/WidgetBar/WidgetBar.class.php b/WidgetBar/WidgetBar.class.php index 1038c2d..728e317 100644 --- a/WidgetBar/WidgetBar.class.php +++ b/WidgetBar/WidgetBar.class.php @@ -246,4 +246,4 @@ return true; } -} +} \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/291906 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I402588cb08d2f8447a66e706303f357f4a053412 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions Gerrit-Branch: master Gerrit-Owner: Pwirth <wi...@hallowelt.biz> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
