Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

1 files changed, 15 insertions, 1 deletions

diff --git a/app/Controller/BoardTooltip.php b/app/Controller/BoardTooltip.php
index ed58a2f2..06f4d729 100644
--- a/app/Controller/BoardTooltip.php
+++ b/app/Controller/BoardTooltip.php
@@ -19,7 +19,21 @@ class BoardTooltip extends Base
     {
         $task = $this->getTask();
         $this->response->html($this->template->render('board/tooltip_tasklinks', array(
-            'links' => $this->taskLink->getAll($task['id']),
+            'links' => $this->taskLink->getAllGroupedByLabel($task['id']),
+            'task' => $task,
+        )));
+    }
+
+    /**
+     * Get links on mouseover
+     *
+     * @access public
+     */
+    public function externallinks()
+    {
+        $task = $this->getTask();
+        $this->response->html($this->template->render('board/tooltip_external_links', array(
+            'links' => $this->taskExternalLink->getAll($task['id']),
             'task' => $task,
         )));
     }