Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

4 files changed, 9 insertions, 2 deletions

diff --git a/app/Helper/HookHelper.php b/app/Helper/HookHelper.php
index 2d13ebcc..cb4dc1ef 100644
--- a/app/Helper/HookHelper.php
+++ b/app/Helper/HookHelper.php
@@ -56,7 +56,7 @@ class HookHelper extends Base
      * @access public
      * @param  string  $hook
      * @param  string  $template
-     * @return \Kanboard\Helper\Hook
+     * @return $this
      */
     public function attach($hook, $template)
     {
diff --git a/app/Helper/LayoutHelper.php b/app/Helper/LayoutHelper.php
index 8ebb05d4..8d2e7e00 100644
--- a/app/Helper/LayoutHelper.php
+++ b/app/Helper/LayoutHelper.php
@@ -156,6 +156,10 @@ class LayoutHelper extends Base
      */
     public function analytic($template, array $params)
     {
+        if (isset($params['project']['name'])) {
+            $params['title'] = $params['project']['name'].' > '.$params['title'];
+        }
+
         return $this->subLayout('analytic/layout', 'analytic/sidebar', $template, $params);
     }
 
diff --git a/app/Helper/TaskHelper.php b/app/Helper/TaskHelper.php
index e1d65cca..481a5efb 100644
--- a/app/Helper/TaskHelper.php
+++ b/app/Helper/TaskHelper.php
@@ -50,6 +50,7 @@ class TaskHelper extends Base
     public function selectDescription(array $values, array $errors)
     {
         $html = $this->helper->form->label(t('Description'), 'description');
+        $html .= '<div class="markdown-editor-container">';
         $html .= $this->helper->form->textarea(
             'description',
             $values,
@@ -62,6 +63,7 @@ class TaskHelper extends Base
             'markdown-editor'
         );
 
+        $html .= '</div>';
         return $html;
     }
 
diff --git a/app/Helper/UserHelper.php b/app/Helper/UserHelper.php
index ab259a62..e42bafe4 100644
--- a/app/Helper/UserHelper.php
+++ b/app/Helper/UserHelper.php
@@ -50,7 +50,8 @@ class UserHelper extends Base
      */
     public function getFullname(array $user = array())
     {
-        return $this->userModel->getFullname(empty($user) ? $this->userSession->getAll() : $user);
+        $user = empty($user) ? $this->userSession->getAll() : $user;
+        return $user['name'] ?: $user['username'];
     }
 
     /**