Merged branch 'master' of https://github.com/fguillot/kanboard

only imports conflicted

1 files changed, 16 insertions, 0 deletions

diff --git a/app/Controller/Activity.php b/app/Controller/Activity.php
index 2276b3b8..234e4be4 100644
--- a/app/Controller/Activity.php
+++ b/app/Controller/Activity.php
@@ -26,4 +26,20 @@ class Activity extends Base
             'title' => t('%s\'s activity', $project['name'])
         )));
     }
+
+    /**
+     * Display task activities
+     *
+     * @access public
+     */
+    public function task()
+    {
+        $task = $this->getTask();
+
+        $this->response->html($this->taskLayout('activity/task', array(
+            'title' => $task['title'],
+            'task' => $task,
+            'events' => $this->projectActivity->getTask($task['id']),
+        )));
+    }
 }