summaryrefslogtreecommitdiff
path: root/app/ServiceProvider
diff options
context:
space:
mode:
Diffstat (limited to 'app/ServiceProvider')
-rw-r--r--app/ServiceProvider/ActionProvider.php2
-rw-r--r--app/ServiceProvider/AuthenticationProvider.php5
-rw-r--r--app/ServiceProvider/AvatarProvider.php2
-rw-r--r--app/ServiceProvider/ClassProvider.php8
-rw-r--r--app/ServiceProvider/FilterProvider.php2
-rw-r--r--app/ServiceProvider/FormatterProvider.php8
-rw-r--r--app/ServiceProvider/GroupProvider.php2
-rw-r--r--app/ServiceProvider/HelperProvider.php2
-rw-r--r--app/ServiceProvider/RouteProvider.php10
-rw-r--r--app/ServiceProvider/UserProvider.php35
10 files changed, 53 insertions, 23 deletions
diff --git a/app/ServiceProvider/ActionProvider.php b/app/ServiceProvider/ActionProvider.php
index a7e8040e..14b84c7a 100644
--- a/app/ServiceProvider/ActionProvider.php
+++ b/app/ServiceProvider/ActionProvider.php
@@ -19,6 +19,7 @@ use Kanboard\Action\TaskAssignColorCategory;
use Kanboard\Action\TaskAssignColorColumn;
use Kanboard\Action\TaskAssignColorLink;
use Kanboard\Action\TaskAssignColorUser;
+use Kanboard\Action\TaskAssignCreator;
use Kanboard\Action\TaskAssignCurrentUser;
use Kanboard\Action\TaskAssignCurrentUserColumn;
use Kanboard\Action\TaskAssignSpecificUser;
@@ -69,6 +70,7 @@ class ActionProvider implements ServiceProviderInterface
$container['actionManager']->register(new TaskAssignColorLink($container));
$container['actionManager']->register(new TaskAssignColorUser($container));
$container['actionManager']->register(new TaskAssignColorPriority($container));
+ $container['actionManager']->register(new TaskAssignCreator($container));
$container['actionManager']->register(new TaskAssignCurrentUser($container));
$container['actionManager']->register(new TaskAssignCurrentUserColumn($container));
$container['actionManager']->register(new TaskAssignSpecificUser($container));
diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index 868696e0..797e70d0 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -89,15 +89,17 @@ class AuthenticationProvider implements ServiceProviderInterface
$acl->add('CustomFilterController', '*', Role::PROJECT_MEMBER);
$acl->add('ExportController', '*', Role::PROJECT_MANAGER);
$acl->add('TaskFileController', array('screenshot', 'create', 'save', 'remove', 'confirm'), Role::PROJECT_MEMBER);
- $acl->add('TaskGanttController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectViewController', array('share', 'updateSharing', 'integrations', 'updateIntegrations', 'notifications', 'updateNotifications', 'duplicate', 'doDuplication'), Role::PROJECT_MANAGER);
$acl->add('ProjectPermissionController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectEditController', '*', Role::PROJECT_MANAGER);
+ $acl->add('ProjectPredefinedContentController', '*', Role::PROJECT_MANAGER);
+ $acl->add('PredefinedTaskDescriptionController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectFileController', '*', Role::PROJECT_MEMBER);
$acl->add('ProjectUserOverviewController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectStatusController', '*', Role::PROJECT_MANAGER);
$acl->add('ProjectTagController', '*', Role::PROJECT_MANAGER);
$acl->add('SubtaskController', '*', Role::PROJECT_MEMBER);
+ $acl->add('SubtaskConverterController', '*', Role::PROJECT_MEMBER);
$acl->add('SubtaskRestrictionController', '*', Role::PROJECT_MEMBER);
$acl->add('SubtaskStatusController', '*', Role::PROJECT_MEMBER);
$acl->add('SwimlaneController', '*', Role::PROJECT_MANAGER);
@@ -145,7 +147,6 @@ class AuthenticationProvider implements ServiceProviderInterface
$acl->add('TagController', '*', Role::APP_ADMIN);
$acl->add('PluginController', '*', Role::APP_ADMIN);
$acl->add('CurrencyController', '*', Role::APP_ADMIN);
- $acl->add('ProjectGanttController', '*', Role::APP_MANAGER);
$acl->add('GroupListController', '*', Role::APP_ADMIN);
$acl->add('GroupCreationController', '*', Role::APP_ADMIN);
$acl->add('GroupModificationController', '*', Role::APP_ADMIN);
diff --git a/app/ServiceProvider/AvatarProvider.php b/app/ServiceProvider/AvatarProvider.php
index d17985ed..e03a047a 100644
--- a/app/ServiceProvider/AvatarProvider.php
+++ b/app/ServiceProvider/AvatarProvider.php
@@ -5,7 +5,6 @@ namespace Kanboard\ServiceProvider;
use Pimple\Container;
use Pimple\ServiceProviderInterface;
use Kanboard\Core\User\Avatar\AvatarManager;
-use Kanboard\User\Avatar\GravatarProvider;
use Kanboard\User\Avatar\AvatarFileProvider;
use Kanboard\User\Avatar\LetterAvatarProvider;
@@ -28,7 +27,6 @@ class AvatarProvider implements ServiceProviderInterface
{
$container['avatarManager'] = new AvatarManager;
$container['avatarManager']->register(new LetterAvatarProvider($container));
- $container['avatarManager']->register(new GravatarProvider($container));
$container['avatarManager']->register(new AvatarFileProvider($container));
return $container;
}
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index d66794df..7f05dfae 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -47,6 +47,7 @@ class ClassProvider implements ServiceProviderInterface
'LinkModel',
'NotificationModel',
'PasswordResetModel',
+ 'PredefinedTaskDescriptionModel',
'ProjectModel',
'ProjectFileModel',
'ProjectActivityModel',
@@ -118,9 +119,9 @@ class ClassProvider implements ServiceProviderInterface
'TaskLinkValidator',
'TaskValidator',
'UserValidator',
+ 'PredefinedTaskDescriptionValidator',
),
'Import' => array(
- 'TaskImport',
'UserImport',
),
'Export' => array(
@@ -129,9 +130,10 @@ class ClassProvider implements ServiceProviderInterface
'TransitionExport',
),
'Pagination' => array(
- 'TaskPagination',
- 'SubtaskPagination',
+ 'DashboardPagination',
'ProjectPagination',
+ 'SubtaskPagination',
+ 'TaskPagination',
'UserPagination',
),
'Core' => array(
diff --git a/app/ServiceProvider/FilterProvider.php b/app/ServiceProvider/FilterProvider.php
index 1cc4da8a..11a29e69 100644
--- a/app/ServiceProvider/FilterProvider.php
+++ b/app/ServiceProvider/FilterProvider.php
@@ -27,6 +27,7 @@ use Kanboard\Filter\TaskMovedDateFilter;
use Kanboard\Filter\TaskPriorityFilter;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Filter\TaskReferenceFilter;
+use Kanboard\Filter\TaskScoreFilter;
use Kanboard\Filter\TaskStatusFilter;
use Kanboard\Filter\TaskSubtaskAssigneeFilter;
use Kanboard\Filter\TaskSwimlaneFilter;
@@ -172,6 +173,7 @@ class FilterProvider implements ServiceProviderInterface
)
->withFilter(new TaskProjectFilter())
->withFilter(new TaskReferenceFilter())
+ ->withFilter(new TaskScoreFilter())
->withFilter(new TaskStatusFilter())
->withFilter(TaskSubtaskAssigneeFilter::getInstance()
->setCurrentUserId($c['userSession']->getId())
diff --git a/app/ServiceProvider/FormatterProvider.php b/app/ServiceProvider/FormatterProvider.php
index feaa597f..efc85d06 100644
--- a/app/ServiceProvider/FormatterProvider.php
+++ b/app/ServiceProvider/FormatterProvider.php
@@ -22,15 +22,17 @@ class FormatterProvider implements ServiceProviderInterface
'BoardTaskFormatter',
'GroupAutoCompleteFormatter',
'ProjectActivityEventFormatter',
- 'ProjectGanttFormatter',
+ 'ProjectApiFormatter',
+ 'ProjectsApiFormatter',
'SubtaskListFormatter',
'SubtaskTimeTrackingCalendarFormatter',
+ 'TaskApiFormatter',
+ 'TasksApiFormatter',
'TaskAutoCompleteFormatter',
- 'TaskCalendarFormatter',
- 'TaskGanttFormatter',
'TaskICalFormatter',
'TaskListFormatter',
'TaskListSubtaskFormatter',
+ 'TaskListSubtaskAssigneeFormatter',
'TaskSuggestMenuFormatter',
'UserAutoCompleteFormatter',
'UserMentionFormatter',
diff --git a/app/ServiceProvider/GroupProvider.php b/app/ServiceProvider/GroupProvider.php
index 08548c73..86f5d112 100644
--- a/app/ServiceProvider/GroupProvider.php
+++ b/app/ServiceProvider/GroupProvider.php
@@ -25,7 +25,7 @@ class GroupProvider implements ServiceProviderInterface
*/
public function register(Container $container)
{
- $container['groupManager'] = new GroupManager;
+ $container['groupManager'] = new GroupManager();
if (DB_GROUP_PROVIDER) {
$container['groupManager']->register(new DatabaseBackendGroupProvider($container));
diff --git a/app/ServiceProvider/HelperProvider.php b/app/ServiceProvider/HelperProvider.php
index 82b175cb..f0f7ac07 100644
--- a/app/ServiceProvider/HelperProvider.php
+++ b/app/ServiceProvider/HelperProvider.php
@@ -19,7 +19,6 @@ class HelperProvider implements ServiceProviderInterface
{
$container['helper'] = new Helper($container);
$container['helper']->register('app', '\Kanboard\Helper\AppHelper');
- $container['helper']->register('calendar', '\Kanboard\Helper\CalendarHelper');
$container['helper']->register('asset', '\Kanboard\Helper\AssetHelper');
$container['helper']->register('board', '\Kanboard\Helper\BoardHelper');
$container['helper']->register('comment', '\Kanboard\Helper\CommentHelper');
@@ -27,7 +26,6 @@ class HelperProvider implements ServiceProviderInterface
$container['helper']->register('file', '\Kanboard\Helper\FileHelper');
$container['helper']->register('form', '\Kanboard\Helper\FormHelper');
$container['helper']->register('hook', '\Kanboard\Helper\HookHelper');
- $container['helper']->register('ical', '\Kanboard\Helper\ICalHelper');
$container['helper']->register('layout', '\Kanboard\Helper\LayoutHelper');
$container['helper']->register('model', '\Kanboard\Helper\ModelHelper');
$container['helper']->register('subtask', '\Kanboard\Helper\SubtaskHelper');
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 08759b22..5b9eca98 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -36,7 +36,6 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('dashboard/:user_id/projects', 'DashboardController', 'projects');
$container['route']->addRoute('dashboard/:user_id/tasks', 'DashboardController', 'tasks');
$container['route']->addRoute('dashboard/:user_id/subtasks', 'DashboardController', 'subtasks');
- $container['route']->addRoute('dashboard/:user_id/calendar', 'DashboardController', 'calendar');
$container['route']->addRoute('dashboard/:user_id/activity', 'DashboardController', 'activity');
$container['route']->addRoute('dashboard/:user_id/notifications', 'DashboardController', 'notifications');
@@ -119,18 +118,10 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('b/:project_id', 'BoardViewController', 'show');
$container['route']->addRoute('public/board/:token', 'BoardViewController', 'readonly');
- // Calendar routes
- $container['route']->addRoute('calendar/:project_id', 'CalendarController', 'show');
- $container['route']->addRoute('c/:project_id', 'CalendarController', 'show');
-
// Listing routes
$container['route']->addRoute('list/:project_id', 'TaskListController', 'show');
$container['route']->addRoute('l/:project_id', 'TaskListController', 'show');
- // Gantt routes
- $container['route']->addRoute('gantt/:project_id', 'TaskGanttController', 'show');
- $container['route']->addRoute('gantt/:project_id/sort/:sorting', 'TaskGanttController', 'show');
-
// Feed routes
$container['route']->addRoute('feed/project/:token', 'FeedController', 'project');
$container['route']->addRoute('feed/user/:token', 'FeedController', 'user');
@@ -167,7 +158,6 @@ class RouteProvider implements ServiceProviderInterface
$container['route']->addRoute('settings/project', 'ConfigController', 'project');
$container['route']->addRoute('settings/project', 'ConfigController', 'project');
$container['route']->addRoute('settings/board', 'ConfigController', 'board');
- $container['route']->addRoute('settings/calendar', 'ConfigController', 'calendar');
$container['route']->addRoute('settings/integrations', 'ConfigController', 'integrations');
$container['route']->addRoute('settings/webhook', 'ConfigController', 'webhook');
$container['route']->addRoute('settings/api', 'ConfigController', 'api');
diff --git a/app/ServiceProvider/UserProvider.php b/app/ServiceProvider/UserProvider.php
new file mode 100644
index 00000000..c80a2aeb
--- /dev/null
+++ b/app/ServiceProvider/UserProvider.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Kanboard\ServiceProvider;
+
+use Kanboard\Core\User\UserManager;
+use Kanboard\User\DatabaseBackendUserProvider;
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+/**
+ * User Provider
+ *
+ * @package Kanboard\ServiceProvider
+ * @author Frederic Guillot
+ */
+class UserProvider implements ServiceProviderInterface
+{
+ /**
+ * Register providers
+ *
+ * @access public
+ * @param \Pimple\Container $container
+ * @return \Pimple\Container
+ */
+ public function register(Container $container)
+ {
+ $container['userManager'] = new UserManager();
+
+ if (DB_USER_PROVIDER) {
+ $container['userManager']->register(new DatabaseBackendUserProvider($container));
+ }
+
+ return $container;
+ }
+}