Merge https://github.com/kanboard/kanboard

28 files changed, 512 insertions, 322 deletions

diff --git a/app/Controller/ActionCreationController.php b/app/Controller/ActionCreationController.php
index abd8abd3..9b228f28 100644
--- a/app/Controller/ActionCreationController.php
+++ b/app/Controller/ActionCreationController.php
@@ -81,7 +81,7 @@ class ActionCreationController extends BaseController
             'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($project['id']),
             'links_list' => $this->linkModel->getList(0, false),
-            'priorities_list' => $this->projectModel->getPriorities($project),
+            'priorities_list' => $this->projectTaskPriorityModel->getPriorities($project),
             'project' => $project,
             'available_actions' => $this->actionManager->getAvailableActions(),
             'events' => $this->actionManager->getCompatibleEvents($values['action_name']),
diff --git a/app/Controller/ActivityController.php b/app/Controller/ActivityController.php
index 9f9841af..476e4aac 100644
--- a/app/Controller/ActivityController.php
+++ b/app/Controller/ActivityController.php
@@ -40,6 +40,7 @@ class ActivityController extends BaseController
             'task' => $task,
             'project' => $this->projectModel->getById($task['project_id']),
             'events' => $this->helper->projectActivity->getTaskEvents($task['id']),
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 }
diff --git a/app/Controller/AnalyticController.php b/app/Controller/AnalyticController.php
index cf3ba034..ab0646a2 100644
--- a/app/Controller/AnalyticController.php
+++ b/app/Controller/AnalyticController.php
@@ -33,7 +33,7 @@ class AnalyticController extends BaseController
             'metrics' => $this->projectDailyStatsModel->getRawMetrics($project['id'], $from, $to),
             'date_format' => $this->configModel->get('application_date_format'),
             'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
-            'title' => t('Lead and Cycle time for "%s"', $project['name']),
+            'title' => t('Lead and cycle time'),
         )));
     }
 
@@ -60,7 +60,7 @@ class AnalyticController extends BaseController
             'project' => $project,
             'paginator' => $paginator,
             'metrics' => $this->estimatedTimeComparisonAnalytic->build($project['id']),
-            'title' => t('Compare hours for "%s"', $project['name']),
+            'title' => t('Estimated vs actual time'),
         )));
     }
 
@@ -76,7 +76,7 @@ class AnalyticController extends BaseController
         $this->response->html($this->helper->layout->analytic('analytic/avg_time_columns', array(
             'project' => $project,
             'metrics' => $this->averageTimeSpentColumnAnalytic->build($project['id']),
-            'title' => t('Average time spent into each column for "%s"', $project['name']),
+            'title' => t('Average time into each column'),
         )));
     }
 
@@ -92,7 +92,7 @@ class AnalyticController extends BaseController
         $this->response->html($this->helper->layout->analytic('analytic/tasks', array(
             'project' => $project,
             'metrics' => $this->taskDistributionAnalytic->build($project['id']),
-            'title' => t('Task repartition for "%s"', $project['name']),
+            'title' => t('Task distribution'),
         )));
     }
 
@@ -108,7 +108,7 @@ class AnalyticController extends BaseController
         $this->response->html($this->helper->layout->analytic('analytic/users', array(
             'project' => $project,
             'metrics' => $this->userDistributionAnalytic->build($project['id']),
-            'title' => t('User repartition for "%s"', $project['name']),
+            'title' => t('User repartition'),
         )));
     }
 
@@ -119,7 +119,7 @@ class AnalyticController extends BaseController
      */
     public function cfd()
     {
-        $this->commonAggregateMetrics('analytic/cfd', 'total', 'Cumulative flow diagram for "%s"');
+        $this->commonAggregateMetrics('analytic/cfd', 'total', t('Cumulative flow diagram'));
     }
 
     /**
@@ -129,7 +129,7 @@ class AnalyticController extends BaseController
      */
     public function burndown()
     {
-        $this->commonAggregateMetrics('analytic/burndown', 'score', 'Burndown chart for "%s"');
+        $this->commonAggregateMetrics('analytic/burndown', 'score', t('Burndown chart'));
     }
 
     /**
@@ -157,7 +157,7 @@ class AnalyticController extends BaseController
             'project' => $project,
             'date_format' => $this->configModel->get('application_date_format'),
             'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
-            'title' => t($title, $project['name']),
+            'title' => $title,
         )));
     }
 
diff --git a/app/Controller/BoardAjaxController.php b/app/Controller/BoardAjaxController.php
index 24914671..9b721f06 100644
--- a/app/Controller/BoardAjaxController.php
+++ b/app/Controller/BoardAjaxController.php
@@ -134,7 +134,7 @@ class BoardAjaxController extends BaseController
             'board_highlight_period' => $this->configModel->get('board_highlight_period'),
             'swimlanes' => $this->taskLexer
                 ->build($this->userSession->getFilters($project_id))
-                ->format(BoardFormatter::getInstance($this->container)->setProjectId($project_id))
+                ->format(BoardFormatter::getInstance($this->container)->withProjectId($project_id))
         ));
     }
 }
diff --git a/app/Controller/BoardTooltipController.php b/app/Controller/BoardTooltipController.php
index 2a947027..134d728e 100644
--- a/app/Controller/BoardTooltipController.php
+++ b/app/Controller/BoardTooltipController.php
@@ -107,9 +107,9 @@ class BoardTooltipController extends BaseController
 
         $this->response->html($this->template->render('task_recurrence/info', array(
             'task' => $task,
-            'recurrence_trigger_list' => $this->taskModel->getRecurrenceTriggerList(),
-            'recurrence_timeframe_list' => $this->taskModel->getRecurrenceTimeframeList(),
-            'recurrence_basedate_list' => $this->taskModel->getRecurrenceBasedateList(),
+            'recurrence_trigger_list' => $this->taskRecurrenceModel->getRecurrenceTriggerList(),
+            'recurrence_timeframe_list' => $this->taskRecurrenceModel->getRecurrenceTimeframeList(),
+            'recurrence_basedate_list' => $this->taskRecurrenceModel->getRecurrenceBasedateList(),
         )));
     }
 
diff --git a/app/Controller/BoardViewController.php b/app/Controller/BoardViewController.php
index 496fa995..97c99d11 100644
--- a/app/Controller/BoardViewController.php
+++ b/app/Controller/BoardViewController.php
@@ -30,7 +30,11 @@ class BoardViewController extends BaseController
 
         $this->response->html($this->helper->layout->app('board/view_public', array(
             'project' => $project,
-            'swimlanes' => $this->boardModel->getBoard($project['id']),
+            'swimlanes' => BoardFormatter::getInstance($this->container)
+                ->withProjectId($project['id'])
+                ->withQuery($this->taskFinderModel->getExtendedQuery())
+                ->format()
+            ,
             'title' => $project['name'],
             'description' => $project['description'],
             'no_layout' => true,
@@ -59,7 +63,7 @@ class BoardViewController extends BaseController
             'board_highlight_period' => $this->configModel->get('board_highlight_period'),
             'swimlanes' => $this->taskLexer
                 ->build($search)
-                ->format(BoardFormatter::getInstance($this->container)->setProjectId($project['id']))
+                ->format(BoardFormatter::getInstance($this->container)->withProjectId($project['id']))
         )));
     }
 }
diff --git a/app/Controller/ColumnController.php b/app/Controller/ColumnController.php
index 95fbcaaa..d3f0e36e 100644
--- a/app/Controller/ColumnController.php
+++ b/app/Controller/ColumnController.php
@@ -66,7 +66,15 @@ class ColumnController extends BaseController
         list($valid, $errors) = $this->columnValidator->validateCreation($values);
 
         if ($valid) {
-            if ($this->columnModel->create($project['id'], $values['title'], $values['task_limit'], $values['description']) !== false) {
+            $result = $this->columnModel->create(
+                $project['id'],
+                $values['title'],
+                $values['task_limit'],
+                $values['description'],
+                isset($values['hide_in_dashboard']) ? $values['hide_in_dashboard'] : 0
+            );
+
+            if ($result !== false) {
                 $this->flash->success(t('Column created successfully.'));
                 return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])), true);
             } else {
@@ -111,7 +119,15 @@ class ColumnController extends BaseController
         list($valid, $errors) = $this->columnValidator->validateModification($values);
 
         if ($valid) {
-            if ($this->columnModel->update($values['id'], $values['title'], $values['task_limit'], $values['description'])) {
+            $result = $this->columnModel->update(
+                $values['id'],
+                $values['title'],
+                $values['task_limit'],
+                $values['description'],
+                isset($values['hide_in_dashboard']) ? $values['hide_in_dashboard'] : 0
+            );
+
+            if ($result) {
                 $this->flash->success(t('Board updated successfully.'));
                 return $this->response->redirect($this->helper->url->to('ColumnController', 'index', array('project_id' => $project['id'])));
             } else {
diff --git a/app/Controller/DashboardController.php b/app/Controller/DashboardController.php
index 44874546..f32f8552 100644
--- a/app/Controller/DashboardController.php
+++ b/app/Controller/DashboardController.php
@@ -2,9 +2,6 @@
 
 namespace Kanboard\Controller;
 
-use Kanboard\Model\ProjectModel;
-use Kanboard\Model\SubtaskModel;
-
 /**
  * Dashboard Controller
  *
@@ -14,63 +11,6 @@ use Kanboard\Model\SubtaskModel;
 class DashboardController extends BaseController
 {
     /**
-     * Get project pagination
-     *
-     * @access private
-     * @param  integer  $user_id
-     * @param  string   $action
-     * @param  integer  $max
-     * @return \Kanboard\Core\Paginator
-     */
-    private function getProjectPaginator($user_id, $action, $max)
-    {
-        return $this->paginator
-            ->setUrl('DashboardController', $action, array('pagination' => 'projects', 'user_id' => $user_id))
-            ->setMax($max)
-            ->setOrder(ProjectModel::TABLE.'.name')
-            ->setQuery($this->projectModel->getQueryColumnStats($this->projectPermissionModel->getActiveProjectIds($user_id)))
-            ->calculateOnlyIf($this->request->getStringParam('pagination') === 'projects');
-    }
-
-    /**
-     * Get task pagination
-     *
-     * @access private
-     * @param  integer  $user_id
-     * @param  string   $action
-     * @param  integer  $max
-     * @return \Kanboard\Core\Paginator
-     */
-    private function getTaskPaginator($user_id, $action, $max)
-    {
-        return $this->paginator
-            ->setUrl('DashboardController', $action, array('pagination' => 'tasks', 'user_id' => $user_id))
-            ->setMax($max)
-            ->setOrder('tasks.id')
-            ->setQuery($this->taskFinderModel->getUserQuery($user_id))
-            ->calculateOnlyIf($this->request->getStringParam('pagination') === 'tasks');
-    }
-
-    /**
-     * Get subtask pagination
-     *
-     * @access private
-     * @param  integer  $user_id
-     * @param  string   $action
-     * @param  integer  $max
-     * @return \Kanboard\Core\Paginator
-     */
-    private function getSubtaskPaginator($user_id, $action, $max)
-    {
-        return $this->paginator
-            ->setUrl('DashboardController', $action, array('pagination' => 'subtasks', 'user_id' => $user_id))
-            ->setMax($max)
-            ->setOrder('tasks.id')
-            ->setQuery($this->subtaskModel->getUserQuery($user_id, array(SubTaskModel::STATUS_TODO, SubtaskModel::STATUS_INPROGRESS)))
-            ->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');
-    }
-
-    /**
      * Dashboard overview
      *
      * @access public
@@ -80,10 +20,10 @@ class DashboardController extends BaseController
         $user = $this->getUser();
 
         $this->response->html($this->helper->layout->dashboard('dashboard/show', array(
-            'title' => t('Dashboard'),
-            'project_paginator' => $this->getProjectPaginator($user['id'], 'show', 10),
-            'task_paginator' => $this->getTaskPaginator($user['id'], 'show', 10),
-            'subtask_paginator' => $this->getSubtaskPaginator($user['id'], 'show', 10),
+            'title' => t('Dashboard for %s', $this->helper->user->getFullname($user)),
+            'project_paginator' => $this->projectPagination->getDashboardPaginator($user['id'], 'show', 10),
+            'task_paginator' => $this->taskPagination->getDashboardPaginator($user['id'], 'show', 10),
+            'subtask_paginator' => $this->subtaskPagination->getDashboardPaginator($user['id'], 'show', 10),
             'user' => $user,
         )));
     }
@@ -98,8 +38,8 @@ class DashboardController extends BaseController
         $user = $this->getUser();
 
         $this->response->html($this->helper->layout->dashboard('dashboard/tasks', array(
-            'title' => t('My tasks'),
-            'paginator' => $this->getTaskPaginator($user['id'], 'tasks', 50),
+            'title' => t('Tasks overview for %s', $this->helper->user->getFullname($user)),
+            'paginator' => $this->taskPagination->getDashboardPaginator($user['id'], 'tasks', 50),
             'user' => $user,
         )));
     }
@@ -114,8 +54,8 @@ class DashboardController extends BaseController
         $user = $this->getUser();
 
         $this->response->html($this->helper->layout->dashboard('dashboard/subtasks', array(
-            'title' => t('My subtasks'),
-            'paginator' => $this->getSubtaskPaginator($user['id'], 'subtasks', 50),
+            'title' => t('Subtasks overview for %s', $this->helper->user->getFullname($user)),
+            'paginator' => $this->subtaskPagination->getDashboardPaginator($user['id'], 'subtasks', 50),
             'user' => $user,
         )));
     }
@@ -130,8 +70,8 @@ class DashboardController extends BaseController
         $user = $this->getUser();
 
         $this->response->html($this->helper->layout->dashboard('dashboard/projects', array(
-            'title' => t('My projects'),
-            'paginator' => $this->getProjectPaginator($user['id'], 'projects', 25),
+            'title' => t('Projects overview for %s', $this->helper->user->getFullname($user)),
+            'paginator' => $this->projectPagination->getDashboardPaginator($user['id'], 'projects', 25),
             'user' => $user,
         )));
     }
@@ -146,7 +86,7 @@ class DashboardController extends BaseController
         $user = $this->getUser();
 
         $this->response->html($this->helper->layout->dashboard('dashboard/activity', array(
-            'title' => t('My activity stream'),
+            'title' => t('Activity stream for %s', $this->helper->user->getFullname($user)),
             'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']), 100),
             'user' => $user,
         )));
@@ -159,9 +99,11 @@ class DashboardController extends BaseController
      */
     public function calendar()
     {
+        $user = $this->getUser();
+
         $this->response->html($this->helper->layout->dashboard('dashboard/calendar', array(
-            'title' => t('My calendar'),
-            'user' => $this->getUser(),
+            'title' => t('Calendar for %s', $this->helper->user->getFullname($user)),
+            'user' => $user,
         )));
     }
 
@@ -175,7 +117,7 @@ class DashboardController extends BaseController
         $user = $this->getUser();
 
         $this->response->html($this->helper->layout->dashboard('dashboard/notifications', array(
-            'title' => t('My notifications'),
+            'title' => t('Notifications for %s', $this->helper->user->getFullname($user)),
             'notifications' => $this->userUnreadNotificationModel->getAll($user['id']),
             'user' => $user,
         )));
diff --git a/app/Controller/DocumentationController.php b/app/Controller/DocumentationController.php
index d86fb3c8..0d02ebda 100644
--- a/app/Controller/DocumentationController.php
+++ b/app/Controller/DocumentationController.php
@@ -20,16 +20,7 @@ class DocumentationController extends BaseController
             $page = 'index';
         }
 
-        if ($this->languageModel->getCurrentLanguage() === 'fr_FR') {
-            $filename = __DIR__.'/../../doc/fr/' . $page . '.markdown';
-        } else {
-            $filename = __DIR__ . '/../../doc/' . $page . '.markdown';
-        }
-
-        if (!file_exists($filename)) {
-            $filename = __DIR__.'/../../doc/index.markdown';
-        }
-
+        $filename = $this->getPageFilename($page);
         $this->response->html($this->helper->layout->app('doc/show', $this->render($filename)));
     }
 
@@ -83,10 +74,63 @@ class DocumentationController extends BaseController
      */
     public function replaceImageUrl(array $matches)
     {
-        if ($this->languageModel->getCurrentLanguage() === 'fr_FR') {
-            return '('.$this->helper->url->base().'doc/fr/'.$matches[1].')';
+        return '('.$this->getFileBaseUrl($matches[1]).')';
+    }
+
+    /**
+     * Get Markdown file according to the current language
+     *
+     * @access private
+     * @param  string $page
+     * @return string
+     */
+    private function getPageFilename($page)
+    {
+        return $this->getFileLocation($page . '.markdown') ?:
+            implode(DIRECTORY_SEPARATOR, array(ROOT_DIR, 'doc', 'index.markdown'));
+    }
+
+    /**
+     * Get base URL for Markdown links
+     *
+     * @access private
+     * @param  string $filename
+     * @return string
+     */
+    private function getFileBaseUrl($filename)
+    {
+        $language = $this->languageModel->getCurrentLanguage();
+        $path = $this->getFileLocation($filename);
+
+        if (strpos($path, $language) !== false) {
+            $url = implode('/', array('doc', $language, $filename));
+        } else {
+            $url = implode('/', array('doc', $filename));
+        }
+
+        return $this->helper->url->base().$url;
+    }
+
+    /**
+     * Get file location according to the current language
+     *
+     * @access private
+     * @param  string $filename
+     * @return string
+     */
+    private function getFileLocation($filename)
+    {
+        $files = array(
+            implode(DIRECTORY_SEPARATOR, array(ROOT_DIR, 'doc', $this->languageModel->getCurrentLanguage(), $filename)),
+            implode(DIRECTORY_SEPARATOR, array(ROOT_DIR, 'doc', $filename)),
+        );
+
+        foreach ($files as $filename) {
+            if (file_exists($filename)) {
+                return $filename;
+            }
         }
 
-        return '('.$this->helper->url->base().'doc/'.$matches[1].')';
+        return '';
     }
 }
diff --git a/app/Controller/ExportController.php b/app/Controller/ExportController.php
index b2fe0ebd..27046c76 100644
--- a/app/Controller/ExportController.php
+++ b/app/Controller/ExportController.php
@@ -31,22 +31,23 @@ class ExportController extends BaseController
             $data = $this->$model->$method($project['id'], $from, $to);
             $this->response->withFileDownload($filename.'.csv');
             $this->response->csv($data);
-        }
+        } else {
 
-        $this->response->html($this->helper->layout->project('export/'.$action, array(
-            'values' => array(
-                'controller' => 'ExportController',
-                'action' => $action,
-                'project_id' => $project['id'],
-                'from' => $from,
-                'to' => $to,
-            ),
-            'errors' => array(),
-            'date_format' => $this->configModel->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
-            'project' => $project,
-            'title' => $page_title,
-        ), 'export/sidebar'));
+            $this->response->html($this->helper->layout->project('export/'.$action, array(
+                'values' => array(
+                    'controller' => 'ExportController',
+                    'action' => $action,
+                    'project_id' => $project['id'],
+                    'from' => $from,
+                    'to' => $to,
+                ),
+                'errors' => array(),
+                'date_format' => $this->configModel->get('application_date_format'),
+                'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
+                'project' => $project,
+                'title' => $page_title,
+            ), 'export/sidebar'));
+        }
     }
 
     /**
@@ -76,7 +77,7 @@ class ExportController extends BaseController
      */
     public function summary()
     {
-        $this->common('projectDailyColumnStats', 'getAggregatedMetrics', t('Summary'), 'summary', t('Daily project summary export'));
+        $this->common('projectDailyColumnStatsModel', 'getAggregatedMetrics', t('Summary'), 'summary', t('Daily project summary export'));
     }
 
     /**
diff --git a/app/Controller/FeedController.php b/app/Controller/FeedController.php
index cf2b1088..f9b0ed7c 100644
--- a/app/Controller/FeedController.php
+++ b/app/Controller/FeedController.php
@@ -2,7 +2,11 @@
 
 namespace Kanboard\Controller;
 
+use DateTime;
 use Kanboard\Core\Controller\AccessForbiddenException;
+use PicoFeed\Syndication\AtomFeedBuilder;
+use PicoFeed\Syndication\AtomItemBuilder;
+use PicoFeed\Syndication\FeedBuilder;
 
 /**
  * Atom/RSS Feed controller
@@ -27,10 +31,15 @@ class FeedController extends BaseController
             throw AccessForbiddenException::getInstance()->withoutLayout();
         }
 
-        $this->response->xml($this->template->render('feed/user', array(
-            'events' => $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id'])),
-            'user' => $user,
-        )));
+        $events = $this->helper->projectActivity->getProjectsEvents($this->projectPermissionModel->getActiveProjectIds($user['id']));
+
+        $feedBuilder = AtomFeedBuilder::create()
+            ->withTitle(e('Project activities for %s', $this->helper->user->getFullname($user)))
+            ->withFeedUrl($this->helper->url->to('FeedController', 'user', array('token' => $user['token']), '', true))
+            ->withSiteUrl($this->helper->url->base())
+            ->withDate(new DateTime());
+
+        $this->response->xml($this->buildFeedItems($events, $feedBuilder)->build());
     }
 
     /**
@@ -47,9 +56,44 @@ class FeedController extends BaseController
             throw AccessForbiddenException::getInstance()->withoutLayout();
         }
 
-        $this->response->xml($this->template->render('feed/project', array(
-            'events' => $this->helper->projectActivity->getProjectEvents($project['id']),
-            'project' => $project,
-        )));
+        $events = $this->helper->projectActivity->getProjectEvents($project['id']);
+
+        $feedBuilder = AtomFeedBuilder::create()
+            ->withTitle(e('%s\'s activity', $project['name']))
+            ->withFeedUrl($this->helper->url->to('FeedController', 'project', array('token' => $project['token']), '', true))
+            ->withSiteUrl($this->helper->url->base())
+            ->withDate(new DateTime());
+
+        $this->response->xml($this->buildFeedItems($events, $feedBuilder)->build());
+    }
+
+    /**
+     * Build feed items
+     *
+     * @access protected
+     * @param  array       $events
+     * @param  FeedBuilder $feedBuilder
+     * @return FeedBuilder
+     */
+    protected function buildFeedItems(array $events, FeedBuilder $feedBuilder)
+    {
+        foreach ($events as $event) {
+            $itemDate = new DateTime();
+            $itemDate->setTimestamp($event['date_creation']);
+
+            $itemUrl = $this->helper->url->to('TaskViewController', 'show', array('task_id' => $event['task_id']), '', true);
+
+            $feedBuilder
+                ->withItem(AtomItemBuilder::create($feedBuilder)
+                    ->withTitle($event['event_title'])
+                    ->withUrl($itemUrl.'#event-'.$event['id'])
+                    ->withAuthor($event['author'])
+                    ->withPublishedDate($itemDate)
+                    ->withUpdatedDate($itemDate)
+                    ->withContent($event['event_content'])
+                );
+        }
+
+        return $feedBuilder;
     }
 }
diff --git a/app/Controller/ProjectListController.php b/app/Controller/ProjectListController.php
index e1172400..4de73c97 100644
--- a/app/Controller/ProjectListController.php
+++ b/app/Controller/ProjectListController.php
@@ -20,7 +20,7 @@ class ProjectListController extends BaseController
         if ($this->userSession->isAdmin()) {
             $project_ids = $this->projectModel->getAllIds();
         } else {
-            $project_ids = $this->projectPermissionModel->getActiveProjectIds($this->userSession->getId());
+            $project_ids = $this->projectPermissionModel->getProjectIds($this->userSession->getId());
         }
 
         $nb_projects = count($project_ids);
diff --git a/app/Controller/ProjectPermissionController.php b/app/Controller/ProjectPermissionController.php
index f3ca6ed9..99f556e8 100644
--- a/app/Controller/ProjectPermissionController.php
+++ b/app/Controller/ProjectPermissionController.php
@@ -147,7 +147,7 @@ class ProjectPermissionController extends BaseController
         $values = $this->request->getValues();
 
         if (empty($values['group_id']) && ! empty($values['external_id'])) {
-            $values['group_id'] = $this->groupModel->create($values['name'], $values['external_id']);
+            $values['group_id'] = $this->groupModel->getOrCreateExternalGroupId($values['name'], $values['external_id']);
         }
 
         if ($this->projectGroupRoleModel->addGroup($project['id'], $values['group_id'], $values['role'])) {
diff --git a/app/Controller/ProjectTagController.php b/app/Controller/ProjectTagController.php
new file mode 100644
index 00000000..acf514d3
--- /dev/null
+++ b/app/Controller/ProjectTagController.php
@@ -0,0 +1,134 @@
+<?php
+
+namespace Kanboard\Controller;
+
+use Kanboard\Core\Controller\AccessForbiddenException;
+
+/**
+ * Class ProjectTagController
+ *
+ * @package Kanboard\Controller
+ * @author  Frederic Guillot
+ */
+class ProjectTagController extends BaseController
+{
+    public function index()
+    {
+        $project = $this->getProject();
+
+        $this->response->html($this->helper->layout->project('project_tag/index', array(
+            'project' => $project,
+            'tags' => $this->tagModel->getAllByProject($project['id']),
+            'title' => t('Project tags management'),
+        )));
+    }
+
+    public function create(array $values = array(), array $errors = array())
+    {
+        $project = $this->getProject();
+
+        if (empty($values)) {
+            $values['project_id'] = $project['id'];
+        }
+
+        $this->response->html($this->template->render('project_tag/create', array(
+            'project' => $project,
+            'values' => $values,
+            'errors' => $errors,
+        )));
+    }
+
+    public function save()
+    {
+        $project = $this->getProject();
+        $values = $this->request->getValues();
+        list($valid, $errors) = $this->tagValidator->validateCreation($values);
+
+        if ($valid) {
+            if ($this->tagModel->create($project['id'], $values['name']) > 0) {
+                $this->flash->success(t('Tag created successfully.'));
+            } else {
+                $this->flash->failure(t('Unable to create this tag.'));
+            }
+
+            $this->response->redirect($this->helper->url->to('ProjectTagController', 'index', array('project_id' => $project['id'])));
+        } else {
+            $this->create($values, $errors);
+        }
+    }
+
+    public function edit(array $values = array(), array $errors = array())
+    {
+        $project = $this->getProject();
+        $tag_id = $this->request->getIntegerParam('tag_id');
+        $tag = $this->tagModel->getById($tag_id);
+
+        if (empty($values)) {
+            $values = $tag;
+        }
+
+        $this->response->html($this->template->render('project_tag/edit', array(
+            'project' => $project,
+            'tag' => $tag,
+            'values' => $values,
+            'errors' => $errors,
+        )));
+    }
+
+    public function update()
+    {
+        $project = $this->getProject();
+        $tag_id = $this->request->getIntegerParam('tag_id');
+        $tag = $this->tagModel->getById($tag_id);
+        $values = $this->request->getValues();
+        list($valid, $errors) = $this->tagValidator->validateModification($values);
+
+        if ($tag['project_id'] != $project['id']) {
+            throw new AccessForbiddenException();
+        }
+
+        if ($valid) {
+            if ($this->tagModel->update($values['id'], $values['name'])) {
+                $this->flash->success(t('Tag updated successfully.'));
+            } else {
+                $this->flash->failure(t('Unable to update this tag.'));
+            }
+
+            $this->response->redirect($this->helper->url->to('ProjectTagController', 'index', array('project_id' => $project['id'])));
+        } else {
+            $this->edit($values, $errors);
+        }
+    }
+
+    public function confirm()
+    {
+        $project = $this->getProject();
+        $tag_id = $this->request->getIntegerParam('tag_id');
+        $tag = $this->tagModel->getById($tag_id);
+
+        $this->response->html($this->template->render('project_tag/remove', array(
+            'tag' => $tag,
+            'project' => $project,
+        )));
+    }
+
+    public function remove()
+    {
+        $this->checkCSRFParam();
+        $project = $this->getProject();
+        $tag_id = $this->request->getIntegerParam('tag_id');
+        $tag = $this->tagModel->getById($tag_id);
+
+        if ($tag['project_id'] != $project['id']) {
+            throw new AccessForbiddenException();
+        }
+
+        if ($this->tagModel->remove($tag_id)) {
+            $this->flash->success(t('Tag removed successfully.'));
+        } else {
+            $this->flash->failure(t('Unable to remove this tag.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('ProjectTagController', 'index', array('project_id' => $project['id'])));
+    }
+}
diff --git a/app/Controller/SubtaskController.php b/app/Controller/SubtaskController.php
index 93dab5cd..7502d84f 100644
--- a/app/Controller/SubtaskController.php
+++ b/app/Controller/SubtaskController.php
@@ -168,7 +168,7 @@ class SubtaskController extends BaseController
         $values = $this->request->getJson();
 
         if (! empty($values) && $this->helper->user->hasProjectAccess('SubtaskController', 'movePosition', $project_id)) {
-            $result = $this->subtaskModel->changePosition($task_id, $values['subtask_id'], $values['position']);
+            $result = $this->subtaskPositionModel->changePosition($task_id, $values['subtask_id'], $values['position']);
             $this->response->json(array('result' => $result));
         } else {
             throw new AccessForbiddenException();
diff --git a/app/Controller/SubtaskConverterController.php b/app/Controller/SubtaskConverterController.php
index 65bcd2da..404c50d0 100644
--- a/app/Controller/SubtaskConverterController.php
+++ b/app/Controller/SubtaskConverterController.php
@@ -26,7 +26,7 @@ class SubtaskConverterController extends BaseController
         $project = $this->getProject();
         $subtask = $this->getSubtask();
 
-        $task_id = $this->subtaskModel->convertToTask($project['id'], $subtask['id']);
+        $task_id = $this->subtaskTaskConversionModel->convertToTask($project['id'], $subtask['id']);
 
         if ($task_id !== false) {
             $this->flash->success(t('Subtask converted to task successfully.'));
diff --git a/app/Controller/SubtaskRestrictionController.php b/app/Controller/SubtaskRestrictionController.php
index 084fc0d9..cb642e1c 100644
--- a/app/Controller/SubtaskRestrictionController.php
+++ b/app/Controller/SubtaskRestrictionController.php
@@ -27,7 +27,7 @@ class SubtaskRestrictionController extends BaseController
                 SubtaskModel::STATUS_TODO => t('Todo'),
                 SubtaskModel::STATUS_DONE => t('Done'),
             ),
-            'subtask_inprogress' => $this->subtaskModel->getSubtaskInProgress($this->userSession->getId()),
+            'subtask_inprogress' => $this->subtaskStatusModel->getSubtaskInProgress($this->userSession->getId()),
             'subtask' => $subtask,
             'task' => $task,
         )));
diff --git a/app/Controller/SubtaskStatusController.php b/app/Controller/SubtaskStatusController.php
index 699951fe..d4d356c3 100644
--- a/app/Controller/SubtaskStatusController.php
+++ b/app/Controller/SubtaskStatusController.php
@@ -20,7 +20,7 @@ class SubtaskStatusController extends BaseController
         $task = $this->getTask();
         $subtask = $this->getSubtask();
 
-        $status = $this->subtaskModel->toggleStatus($subtask['id']);
+        $status = $this->subtaskStatusModel->toggleStatus($subtask['id']);
 
         if ($this->request->getIntegerParam('refresh-table') === 0) {
             $subtask['status'] = $status;
diff --git a/app/Controller/TagController.php b/app/Controller/TagController.php
new file mode 100644
index 00000000..b8389910
--- /dev/null
+++ b/app/Controller/TagController.php
@@ -0,0 +1,121 @@
+<?php
+
+namespace Kanboard\Controller;
+
+use Kanboard\Core\Controller\AccessForbiddenException;
+
+/**
+ * Class TagController
+ *
+ * @package Kanboard\Controller
+ * @author  Frederic Guillot
+ */
+class TagController extends BaseController
+{
+    public function index()
+    {
+        $this->response->html($this->helper->layout->config('tag/index', array(
+            'tags' => $this->tagModel->getAllByProject(0),
+            'title' => t('Settings').' &gt; '.t('Global tags management'),
+        )));
+    }
+
+    public function create(array $values = array(), array $errors = array())
+    {
+        if (empty($values)) {
+            $values['project_id'] = 0;
+        }
+
+        $this->response->html($this->template->render('tag/create', array(
+            'values' => $values,
+            'errors' => $errors,
+        )));
+    }
+
+    public function save()
+    {
+        $values = $this->request->getValues();
+        list($valid, $errors) = $this->tagValidator->validateCreation($values);
+
+        if ($valid) {
+            if ($this->tagModel->create(0, $values['name']) > 0) {
+                $this->flash->success(t('Tag created successfully.'));
+            } else {
+                $this->flash->failure(t('Unable to create this tag.'));
+            }
+
+            $this->response->redirect($this->helper->url->to('TagController', 'index'));
+        } else {
+            $this->create($values, $errors);
+        }
+    }
+
+    public function edit(array $values = array(), array $errors = array())
+    {
+        $tag_id = $this->request->getIntegerParam('tag_id');
+        $tag = $this->tagModel->getById($tag_id);
+
+        if (empty($values)) {
+            $values = $tag;
+        }
+
+        $this->response->html($this->template->render('tag/edit', array(
+            'tag' => $tag,
+            'values' => $values,
+            'errors' => $errors,
+        )));
+    }
+
+    public function update()
+    {
+        $tag_id = $this->request->getIntegerParam('tag_id');
+        $tag = $this->tagModel->getById($tag_id);
+        $values = $this->request->getValues();
+        list($valid, $errors) = $this->tagValidator->validateModification($values);
+
+        if ($tag['project_id'] != 0) {
+            throw new AccessForbiddenException();
+        }
+
+        if ($valid) {
+            if ($this->tagModel->update($values['id'], $values['name'])) {
+                $this->flash->success(t('Tag updated successfully.'));
+            } else {
+                $this->flash->failure(t('Unable to update this tag.'));
+            }
+
+            $this->response->redirect($this->helper->url->to('TagController', 'index'));
+        } else {
+            $this->edit($values, $errors);
+        }
+    }
+
+    public function confirm()
+    {
+        $tag_id = $this->request->getIntegerParam('tag_id');
+        $tag = $this->tagModel->getById($tag_id);
+
+        $this->response->html($this->template->render('tag/remove', array(
+            'tag' => $tag,
+        )));
+    }
+
+    public function remove()
+    {
+        $this->checkCSRFParam();
+        $tag_id = $this->request->getIntegerParam('tag_id');
+        $tag = $this->tagModel->getById($tag_id);
+
+        if ($tag['project_id'] != 0) {
+            throw new AccessForbiddenException();
+        }
+
+        if ($this->tagModel->remove($tag_id)) {
+            $this->flash->success(t('Tag removed successfully.'));
+        } else {
+            $this->flash->failure(t('Unable to remove this tag.'));
+        }
+
+        $this->response->redirect($this->helper->url->to('TagController', 'index'));
+    }
+}
diff --git a/app/Controller/TaskCreationController.php b/app/Controller/TaskCreationController.php
index 819de96e..5f1337e5 100644
--- a/app/Controller/TaskCreationController.php
+++ b/app/Controller/TaskCreationController.php
@@ -2,6 +2,8 @@
 
 namespace Kanboard\Controller;
 
+use Kanboard\Core\Controller\PageNotFoundException;
+
 /**
  * Task Creation Controller
  *
@@ -14,9 +16,9 @@ class TaskCreationController extends BaseController
      * Display a form to create a new task
      *
      * @access public
-     * @param array $values
-     * @param array $errors
-     * @throws \Kanboard\Core\Controller\PageNotFoundException
+     * @param  array $values
+     * @param  array $errors
+     * @throws PageNotFoundException
      */
     public function show(array $values = array(), array $errors = array())
     {
@@ -24,15 +26,7 @@ class TaskCreationController extends BaseController
         $swimlanes_list = $this->swimlaneModel->getList($project['id'], false, true);
 
         if (empty($values)) {
-            $values = array(
-                'swimlane_id' => $this->request->getIntegerParam('swimlane_id', key($swimlanes_list)),
-                'column_id' => $this->request->getIntegerParam('column_id'),
-                'color_id' => $this->colorModel->getDefaultColor(),
-                'owner_id' => $this->userSession->getId(),
-            );
-
-            $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
-            $values = $this->hook->merge('controller:task-creation:form:default', $values, array('default_values' => $values));
+            $values = $this->prepareValues($swimlanes_list);
         }
 
         $this->response->html($this->template->render('task_creation/show', array(
@@ -41,10 +35,8 @@ class TaskCreationController extends BaseController
             'values' => $values + array('project_id' => $project['id']),
             'columns_list' => $this->columnModel->getList($project['id']),
             'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true),
-            'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($project['id']),
             'swimlanes_list' => $swimlanes_list,
-            'title' => $project['name'].' &gt; '.t('New task')
         )));
     }
 
@@ -62,17 +54,17 @@ class TaskCreationController extends BaseController
 
         if ($valid && $this->taskCreationModel->create($values)) {
             $this->flash->success(t('Task created successfully.'));
-            return $this->afterSave($project, $values);
+            $this->afterSave($project, $values);
+        } else {
+            $this->flash->failure(t('Unable to create your task.'));
+            $this->show($values, $errors);
         }
-
-        $this->flash->failure(t('Unable to create your task.'));
-        return $this->show($values, $errors);
     }
 
     private function afterSave(array $project, array &$values)
     {
         if (isset($values['another_task']) && $values['another_task'] == 1) {
-            return $this->show(array(
+            $this->show(array(
                 'owner_id' => $values['owner_id'],
                 'color_id' => $values['color_id'],
                 'category_id' => isset($values['category_id']) ? $values['category_id'] : 0,
@@ -80,8 +72,29 @@ class TaskCreationController extends BaseController
                 'swimlane_id' => isset($values['swimlane_id']) ? $values['swimlane_id'] : 0,
                 'another_task' => 1,
             ));
+        } else {
+            $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $project['id'])), true);
         }
+    }
+
+    /**
+     * Prepare form values
+     *
+     * @access protected
+     * @param  array $swimlanes_list
+     * @return array
+     */
+    protected function prepareValues(array $swimlanes_list)
+    {
+        $values = array(
+            'swimlane_id' => $this->request->getIntegerParam('swimlane_id', key($swimlanes_list)),
+            'column_id'   => $this->request->getIntegerParam('column_id'),
+            'color_id'    => $this->colorModel->getDefaultColor(),
+            'owner_id'    => $this->userSession->getId(),
+        );
 
-        return $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $project['id'])), true);
+        $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
+        $values = $this->hook->merge('controller:task-creation:form:default', $values, array('default_values' => $values));
+        return $values;
     }
 }
diff --git a/app/Controller/TaskDuplicationController.php b/app/Controller/TaskDuplicationController.php
index 6a475374..915bf8f8 100644
--- a/app/Controller/TaskDuplicationController.php
+++ b/app/Controller/TaskDuplicationController.php
@@ -50,7 +50,7 @@ class TaskDuplicationController extends BaseController
             $values = $this->request->getValues();
             list($valid, ) = $this->taskValidator->validateProjectModification($values);
 
-            if ($valid && $this->taskDuplicationModel->moveToProject($task['id'],
+            if ($valid && $this->taskProjectMoveModel->moveToProject($task['id'],
                                                                 $values['project_id'],
                                                                 $values['swimlane_id'],
                                                                 $values['column_id'],
@@ -80,7 +80,7 @@ class TaskDuplicationController extends BaseController
             list($valid, ) = $this->taskValidator->validateProjectModification($values);
 
             if ($valid) {
-                $task_id = $this->taskDuplicationModel->duplicateToProject(
+                $task_id = $this->taskProjectDuplicationModel->duplicateToProject(
                     $task['id'], $values['project_id'], $values['swimlane_id'],
                     $values['column_id'], $values['category_id'], $values['owner_id']
                 );
diff --git a/app/Controller/TaskGanttCreationController.php b/app/Controller/TaskGanttCreationController.php
index c2998a3e..0fbac8bb 100644
--- a/app/Controller/TaskGanttCreationController.php
+++ b/app/Controller/TaskGanttCreationController.php
@@ -36,10 +36,8 @@ class TaskGanttCreationController extends BaseController
             'errors' => $errors,
             'values' => $values,
             'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id'], true, false, true),
-            'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($project['id']),
             'swimlanes_list' => $this->swimlaneModel->getList($project['id'], false, true),
-            'title' => $project['name'].' &gt; '.t('New task')
         )));
     }
 
@@ -55,17 +53,12 @@ class TaskGanttCreationController extends BaseController
 
         list($valid, $errors) = $this->taskValidator->validateCreation($values);
 
-        if ($valid) {
-            $task_id = $this->taskCreationModel->create($values);
-
-            if ($task_id !== false) {
-                $this->flash->success(t('Task created successfully.'));
-                return $this->response->redirect($this->helper->url->to('TaskGanttController', 'show', array('project_id' => $project['id'])));
-            } else {
-                $this->flash->failure(t('Unable to create your task.'));
-            }
+        if ($valid && $this->taskCreationModel->create($values)) {
+            $this->flash->success(t('Task created successfully.'));
+            $this->response->redirect($this->helper->url->to('TaskGanttController', 'show', array('project_id' => $project['id'])));
+        } else {
+            $this->flash->failure(t('Unable to create your task.'));
+            $this->show($values, $errors);
         }
-
-        return $this->show($values, $errors);
     }
 }
diff --git a/app/Controller/TaskModificationController.php b/app/Controller/TaskModificationController.php
index f9c63c12..cbc3777a 100644
--- a/app/Controller/TaskModificationController.php
+++ b/app/Controller/TaskModificationController.php
@@ -23,55 +23,6 @@ class TaskModificationController extends BaseController
     }
 
     /**
-     * Edit description form
-     *
-     * @access public
-     * @param array $values
-     * @param array $errors
-     * @throws \Kanboard\Core\Controller\AccessForbiddenException
-     * @throws \Kanboard\Core\Controller\PageNotFoundException
-     */
-    public function description(array $values = array(), array $errors = array())
-    {
-        $task = $this->getTask();
-
-        if (empty($values)) {
-            $values = array('id' => $task['id'], 'description' => $task['description']);
-        }
-
-        $this->response->html($this->template->render('task_modification/edit_description', array(
-            'values' => $values,
-            'errors' => $errors,
-            'task' => $task,
-        )));
-    }
-
-    /**
-     * Update description
-     *
-     * @access public
-     */
-    public function updateDescription()
-    {
-        $task = $this->getTask();
-        $values = $this->request->getValues();
-
-        list($valid, $errors) = $this->taskValidator->validateDescriptionCreation($values);
-
-        if ($valid) {
-            if ($this->taskModificationModel->update($values)) {
-                $this->flash->success(t('Task updated successfully.'));
-            } else {
-                $this->flash->failure(t('Unable to update your task.'));
-            }
-
-            return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true);
-        }
-
-        return $this->description($values, $errors);
-    }
-
-    /**
      * Display a form to edit a task
      *
      * @access public
@@ -86,20 +37,16 @@ class TaskModificationController extends BaseController
         $project = $this->projectModel->getById($task['project_id']);
 
         if (empty($values)) {
-            $values = $task;
-            $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
-            $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
-            $values = $this->dateParser->format($values, array('date_due'), $this->dateParser->getUserDateFormat());
-            $values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat());
+            $values = $this->prepareValues($task);
         }
 
-        $this->response->html($this->template->render('task_modification/edit_task', array(
+        $this->response->html($this->template->render('task_modification/show', array(
             'project' => $project,
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
+            'tags' => $this->taskTagModel->getList($task['id']),
             'users_list' => $this->projectUserRoleModel->getAssignableUsersList($task['project_id']),
-            'colors_list' => $this->colorModel->getList(),
             'categories_list' => $this->categoryModel->getList($task['project_id']),
         )));
     }
@@ -124,4 +71,19 @@ class TaskModificationController extends BaseController
             $this->edit($values, $errors);
         }
     }
+
+    /**
+     * Prepare form values
+     *
+     * @access protected
+     * @param  array $task
+     * @return array
+     */
+    protected function prepareValues(array $task)
+    {
+        $values = $task;
+        $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
+        $values = $this->hook->merge('controller:task-modification:form:default', $values, array('default_values' => $values));
+        return $values;
+    }
 }
diff --git a/app/Controller/TaskPopoverController.php b/app/Controller/TaskPopoverController.php
index bf4e23d5..4e3c11a3 100644
--- a/app/Controller/TaskPopoverController.php
+++ b/app/Controller/TaskPopoverController.php
@@ -11,80 +11,6 @@ namespace Kanboard\Controller;
 class TaskPopoverController extends BaseController
 {
     /**
-     * Change a task assignee directly from the board
-     *
-     * @access public
-     */
-    public function changeAssignee()
-    {
-        $task = $this->getTask();
-        $project = $this->projectModel->getById($task['project_id']);
-
-        $this->response->html($this->template->render('task_popover/change_assignee', array(
-            'values'     => $task,
-            'users_list' => $this->projectUserRoleModel->getAssignableUsersList($project['id']),
-            'project'    => $project,
-        )));
-    }
-
-    /**
-     * Validate an assignee modification
-     *
-     * @access public
-     */
-    public function updateAssignee()
-    {
-        $values = $this->request->getValues();
-
-        list($valid,) = $this->taskValidator->validateAssigneeModification($values);
-
-        if ($valid && $this->taskModificationModel->update($values)) {
-            $this->flash->success(t('Task updated successfully.'));
-        } else {
-            $this->flash->failure(t('Unable to update your task.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $values['project_id'])), true);
-    }
-
-    /**
-     * Change a task category directly from the board
-     *
-     * @access public
-     */
-    public function changeCategory()
-    {
-        $task = $this->getTask();
-        $project = $this->projectModel->getById($task['project_id']);
-
-        $this->response->html($this->template->render('task_popover/change_category', array(
-            'values'          => $task,
-            'categories_list' => $this->categoryModel->getList($project['id']),
-            'project'         => $project,
-        )));
-    }
-
-    /**
-     * Validate a category modification
-     *
-     * @access public
-     */
-    public function updateCategory()
-    {
-        $values = $this->request->getValues();
-
-        list($valid,) = $this->taskValidator->validateCategoryModification($values);
-
-        if ($valid && $this->taskModificationModel->update($values)) {
-            $this->flash->success(t('Task updated successfully.'));
-        } else {
-            $this->flash->failure(t('Unable to update your task.'));
-        }
-
-        $this->response->redirect($this->helper->url->to('BoardViewController', 'show', array('project_id' => $values['project_id'])), true);
-    }
-
-    /**
      * Screenshot popover
      *
      * @access public
diff --git a/app/Controller/TaskRecurrenceController.php b/app/Controller/TaskRecurrenceController.php
index dc7a0e1b..c6fdfa37 100644
--- a/app/Controller/TaskRecurrenceController.php
+++ b/app/Controller/TaskRecurrenceController.php
@@ -31,10 +31,10 @@ class TaskRecurrenceController extends BaseController
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
-            'recurrence_status_list' => $this->taskModel->getRecurrenceStatusList(),
-            'recurrence_trigger_list' => $this->taskModel->getRecurrenceTriggerList(),
-            'recurrence_timeframe_list' => $this->taskModel->getRecurrenceTimeframeList(),
-            'recurrence_basedate_list' => $this->taskModel->getRecurrenceBasedateList(),
+            'recurrence_status_list' => $this->taskRecurrenceModel->getRecurrenceStatusList(),
+            'recurrence_trigger_list' => $this->taskRecurrenceModel->getRecurrenceTriggerList(),
+            'recurrence_timeframe_list' => $this->taskRecurrenceModel->getRecurrenceTimeframeList(),
+            'recurrence_basedate_list' => $this->taskRecurrenceModel->getRecurrenceBasedateList(),
         )));
     }
 
diff --git a/app/Controller/TaskViewController.php b/app/Controller/TaskViewController.php
index bd1e86ae..36597457 100644
--- a/app/Controller/TaskViewController.php
+++ b/app/Controller/TaskViewController.php
@@ -22,7 +22,6 @@ class TaskViewController extends BaseController
     {
         $project = $this->projectModel->getByToken($this->request->getStringParam('token'));
 
-        // Token verification
         if (empty($project)) {
             throw AccessForbiddenException::getInstance()->withoutLayout();
         }
@@ -45,6 +44,7 @@ class TaskViewController extends BaseController
             'task' => $task,
             'columns_list' => $this->columnModel->getList($task['project_id']),
             'colors_list' => $this->colorModel->getList(),
+            'tags' => $this->taskTagModel->getList($task['id']),
             'title' => $task['title'],
             'no_layout' => true,
             'auto_refresh' => true,
@@ -62,19 +62,9 @@ class TaskViewController extends BaseController
         $task = $this->getTask();
         $subtasks = $this->subtaskModel->getAll($task['id']);
 
-        $values = array(
-            'id' => $task['id'],
-            'date_started' => $task['date_started'],
-            'time_estimated' => $task['time_estimated'] ?: '',
-            'time_spent' => $task['time_spent'] ?: '',
-        );
-
-        $values = $this->dateParser->format($values, array('date_started'), $this->dateParser->getUserDateTimeFormat());
-
         $this->response->html($this->helper->layout->task('task/show', array(
             'task' => $task,
             'project' => $this->projectModel->getById($task['project_id']),
-            'values' => $values,
             'files' => $this->taskFileModel->getAllDocuments($task['id']),
             'images' => $this->taskFileModel->getAllImages($task['id']),
             'comments' => $this->commentModel->getAll($task['id'], $this->userSession->getCommentSorting()),
@@ -82,6 +72,7 @@ class TaskViewController extends BaseController
             'internal_links' => $this->taskLinkModel->getAllGroupedByLabel($task['id']),
             'external_links' => $this->taskExternalLinkModel->getAll($task['id']),
             'link_label_list' => $this->linkModel->getList(0, false),
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 
@@ -100,6 +91,7 @@ class TaskViewController extends BaseController
             'lead_time' => $this->taskAnalyticModel->getLeadTime($task),
             'cycle_time' => $this->taskAnalyticModel->getCycleTime($task),
             'time_spent_columns' => $this->taskAnalyticModel->getTimeSpentByColumn($task),
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 
@@ -124,6 +116,7 @@ class TaskViewController extends BaseController
             'task' => $task,
             'project' => $this->projectModel->getById($task['project_id']),
             'subtask_paginator' => $subtask_paginator,
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 
@@ -140,6 +133,7 @@ class TaskViewController extends BaseController
             'task' => $task,
             'project' => $this->projectModel->getById($task['project_id']),
             'transitions' => $this->transitionModel->getAllByTask($task['id']),
+            'tags' => $this->taskTagModel->getList($task['id']),
         )));
     }
 }
diff --git a/app/Controller/UserListController.php b/app/Controller/UserListController.php
index 31fcdd44..888583fa 100644
--- a/app/Controller/UserListController.php
+++ b/app/Controller/UserListController.php
@@ -17,12 +17,7 @@ class UserListController extends BaseController
      */
     public function show()
     {
-        $paginator = $this->paginator
-            ->setUrl('UserListController', 'show')
-            ->setMax(30)
-            ->setOrder('username')
-            ->setQuery($this->userModel->getQuery())
-            ->calculate();
+        $paginator = $this->userPagination->getListingPaginator();
 
         $this->response->html($this->helper->layout->app('user_list/show', array(
             'title' => t('Users').' ('.$paginator->getTotal().')',
diff --git a/app/Controller/WebNotificationController.php b/app/Controller/WebNotificationController.php
index 46a42063..30e317f8 100644
--- a/app/Controller/WebNotificationController.php
+++ b/app/Controller/WebNotificationController.php
@@ -54,14 +54,14 @@ class WebNotificationController extends BaseController
             $this->response->redirect($this->helper->url->to(
                 'TaskViewController',
                 'show',
-                array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id']),
+                array('task_id' => $this->notificationModel->getTaskIdFromEvent($notification['event_name'], $notification['event_data'])),
                 'comment-'.$notification['event_data']['comment']['id']
             ));
         } else {
             $this->response->redirect($this->helper->url->to(
                 'TaskViewController',
                 'show',
-                array('task_id' => $notification['event_data']['task']['id'], 'project_id' => $notification['event_data']['task']['project_id'])
+                array('task_id' => $this->notificationModel->getTaskIdFromEvent($notification['event_name'], $notification['event_data']))
             ));
         }
     }