From ae708a712a5dd932c01e734f8450b899b1407a70 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 20 Dec 2016 20:06:39 -0500
Subject: Offer the possibility to override internal formatter objects from
 plugins

---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 628a183c..fa79bb39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ New features:
 
 * Add slideshow for images
 * Add API calls to manage tags
+* Offer the possibility to override internal formatter objects from plugins
 
 Improvements:
 
-- 
cgit v1.2.3


From f5234a278e959bca4a1743cf0f4bfd18adf51f82 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Tue, 20 Dec 2016 20:11:17 -0500
Subject: Make PR #2897 pass unit tests

---
 ChangeLog                                     | 1 +
 app/Core/ExternalTask/ExternalTaskManager.php | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index fa79bb39..648854a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@ Improvements:
 
 Bug fixes:
 
+* Fix compatibility issue with PHP 5.3 for array_combine function
 * Fix wrong controller name on project activity page when using filters
 
 Version 1.0.35 (Dec 4, 2016)
diff --git a/app/Core/ExternalTask/ExternalTaskManager.php b/app/Core/ExternalTask/ExternalTaskManager.php
index dac0fde7..102ec459 100644
--- a/app/Core/ExternalTask/ExternalTaskManager.php
+++ b/app/Core/ExternalTask/ExternalTaskManager.php
@@ -48,8 +48,11 @@ class ExternalTaskManager
     public function getProvidersList()
     {
         $providers = array_keys($this->providers);
+
         if (count($providers)) {
             return array_combine($providers, $providers);
         }
+
+        return array();
     }
 }
-- 
cgit v1.2.3