[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/medi... - change (mediawiki...BlueSpiceExtensions)

2016-05-31 Thread Pwirth (Code Review) 
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 
-===
- * For further information visit http://www.blue-spice.org
+
  * @author Robert Vogel 
->>> BRANCH (1c321a Merge "Replaced all *@hallowelt.biz addresses with 
*@hallowe)
  * @version2.23.1
  * @packageBlueSpice_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
@@

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/medi... - change (mediawiki...BlueSpiceExtensions)

2015-03-10 Thread Mglaser (Code Review) 
Mglaser has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/19

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(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/55/19/1


-- 
To view, visit https://gerrit.wikimedia.org/r/19
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9ef558db7adbe027ccbe8e4dde0d1c84d08c30b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Mglaser gla...@hallowelt.biz

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Merge branch 'master' of https://gerrit.wikimedia.org/r/medi... - change (mediawiki...BlueSpiceExtensions)

2015-03-10 Thread Robert Vogel (Code Review) 
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