Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Locale/ja_JP/translations.php

2 files changed, 26 insertions, 0 deletions

diff --git a/app/Core/ExternalTask/ExternalTaskManager.php b/app/Core/ExternalTask/ExternalTaskManager.php
index 102ec459..87a46b71 100644
--- a/app/Core/ExternalTask/ExternalTaskManager.php
+++ b/app/Core/ExternalTask/ExternalTaskManager.php
@@ -55,4 +55,14 @@ class ExternalTaskManager
 
         return array();
     }
+
+    /**
+     * Get all providers
+     *
+     * @return ExternalTaskProviderInterface[]
+     */
+    public function getProviders()
+    {
+        return $this->providers;
+    }
 }
diff --git a/app/Core/ExternalTask/ExternalTaskProviderInterface.php b/app/Core/ExternalTask/ExternalTaskProviderInterface.php
index f67f7552..5678efb8 100644
--- a/app/Core/ExternalTask/ExternalTaskProviderInterface.php
+++ b/app/Core/ExternalTask/ExternalTaskProviderInterface.php
@@ -19,6 +19,22 @@ interface ExternalTaskProviderInterface
     public function getName();
 
     /**
+     * Get provider icon
+     *
+     * @access public
+     * @return string
+     */
+    public function getIcon();
+
+    /**
+     * Get label for adding a new task
+     *
+     * @access public
+     * @return string
+     */
+    public function getMenuAddLabel();
+
+    /**
      * Retrieve task from external system or cache
      *
      * @access public