4 files changed, 56 insertions, 4 deletions
diff --git a/app/ServiceProvider/ActionProvider.php b/app/ServiceProvider/ActionProvider.php
index 946fbf41..d46562b7 100644
--- a/app/ServiceProvider/ActionProvider.php
+++ b/app/ServiceProvider/ActionProvider.php
@@ -36,6 +36,8 @@ use Kanboard\Action\TaskOpen;
 use Kanboard\Action\TaskUpdateStartDate;
 use Kanboard\Action\TaskCloseNoActivity;
 use Kanboard\Action\TaskCloseNoActivityColumn;
+use Kanboard\Action\TaskAssignColorSwimlane;
+use Kanboard\Action\TaskAssignPrioritySwimlane;
 
 /**
  * Action Provider
@@ -86,6 +88,8 @@ class ActionProvider implements ServiceProviderInterface
         $container['actionManager']->register(new TaskOpen($container));
         $container['actionManager']->register(new TaskUpdateStartDate($container));
         $container['actionManager']->register(new TaskAssignDueDateOnCreation($container));
+        $container['actionManager']->register(new TaskAssignColorSwimlane($container));
+        $container['actionManager']->register(new TaskAssignPrioritySwimlane($container));
 
         return $container;
     }
diff --git a/app/ServiceProvider/AuthenticationProvider.php b/app/ServiceProvider/AuthenticationProvider.php
index 978bc05b..adff1e63 100644
--- a/app/ServiceProvider/AuthenticationProvider.php
+++ b/app/ServiceProvider/AuthenticationProvider.php
@@ -151,7 +151,7 @@ class AuthenticationProvider implements ServiceProviderInterface
         $acl->add('UserCreationController', '*', Role::APP_ADMIN);
         $acl->add('UserListController', '*', Role::APP_ADMIN);
         $acl->add('UserStatusController', '*', Role::APP_ADMIN);
-        $acl->add('UserCredentialController', array('changeAuthentication', 'saveAuthentication'), Role::APP_ADMIN);
+        $acl->add('UserCredentialController', array('changeAuthentication', 'saveAuthentication', 'unlock'), Role::APP_ADMIN);
 
         return $acl;
     }
diff --git a/app/ServiceProvider/CacheProvider.php b/app/ServiceProvider/CacheProvider.php
new file mode 100644
index 00000000..fac44d53
--- /dev/null
+++ b/app/ServiceProvider/CacheProvider.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Kanboard\ServiceProvider;
+
+use Kanboard\Core\Cache\FileCache;
+use Kanboard\Core\Cache\MemoryCache;
+use Kanboard\Decorator\MetadataCacheDecorator;
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+/**
+ * Cache Provider
+ *
+ * @package Kanboard\ServiceProvider
+ * @author  Frederic Guillot
+ */
+class CacheProvider implements ServiceProviderInterface
+{
+    /**
+     * Register providers
+     *
+     * @access public
+     * @param  \Pimple\Container $container
+     * @return \Pimple\Container
+     */
+    public function register(Container $container)
+    {
+        $container['memoryCache'] = function() {
+            return new MemoryCache();
+        };
+
+        if (CACHE_DRIVER === 'file') {
+            $container['cacheDriver'] = function() {
+                return new FileCache();
+            };
+        } else {
+            $container['cacheDriver'] = $container['memoryCache'];
+        }
+
+        $container['userMetadataCacheDecorator'] = function($c) {
+            return new MetadataCacheDecorator(
+                $c['cacheDriver'],
+                $c['userMetadataModel'],
+                'user.metadata.',
+                $c['userSession']->getId()
+            );
+        };
+
+        return $container;
+    }
+}
diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php
index aab41c74..d837500a 100644
--- a/app/ServiceProvider/ClassProvider.php
+++ b/app/ServiceProvider/ClassProvider.php
@@ -140,9 +140,6 @@ class ClassProvider implements ServiceProviderInterface
             'Response',
             'RememberMeCookie',
         ),
-        'Core\Cache' => array(
-            'MemoryCache',
-        ),
         'Core\Plugin' => array(
             'Hook',
         ),