Merged branch 'master' of https://github.com/fguillot/kanboard

only imports conflicted

7 files changed, 144 insertions, 56 deletions

diff --git a/docs/analytics-tasks.markdown b/docs/analytics-tasks.markdown
new file mode 100644
index 00000000..c5acea5f
--- /dev/null
+++ b/docs/analytics-tasks.markdown
@@ -0,0 +1,24 @@
+Analytics for tasks
+===================
+
+Each task have an analytics section available from the left menu in the task view.
+
+Lead and cycle time
+-------------------
+
+![Lead and cycle time](http://kanboard.net/screenshots/documentation/task-lead-cycle-time.png)
+
+- The lead time is the time between the task creation and the date of completion (task closed).
+- The cycle time is the time between the start date and the date of completion.
+- If the task is not closed the current time is used instead of the date of completion.
+- If the start date is not specified, the cycle time is not calculated.
+
+Note: You can configure an automatic action to define automatically the start date when you move a task to the column of your choice.
+
+Time spent into each column
+---------------------------
+
+![Time spent into each column](http://kanboard.net/screenshots/documentation/time-into-each-column.png)
+
+- This chart show the total time spent into each column for the task.
+- The time spent is calculated until the task is closed.
diff --git a/docs/analytics.markdown b/docs/analytics.markdown
index a6685917..810b5921 100644
--- a/docs/analytics.markdown
+++ b/docs/analytics.markdown
@@ -1,6 +1,8 @@
 Analytics
 =========
 
+Each project have an analytics section. Depending how you are using Kanboard, you can see those reports:
+
 User repartition
 ----------------
 
@@ -20,7 +22,8 @@ Cumulative flow diagram
 
 ![Cumulative flow diagram](http://kanboard.net/screenshots/documentation/cfd.png)
 
-This chart show the number of tasks cumulatively for each column over the time.
+- This chart show the number of tasks cumulatively for each column over the time.
+- Everyday, the total number of tasks is recorded for each column.
 
 Note: You need to have at least 2 days of data to see the graph.
 
@@ -30,13 +33,37 @@ Burndown chart
 ![Burndown chart](http://kanboard.net/screenshots/documentation/burndown-chart.png)
 
 The [burn down chart](http://en.wikipedia.org/wiki/Burn_down_chart) is available for each project.
-This chart is a graphical representation of work left to do versus time.
 
-Kanboard use the complexity or story point to generate this diagram.
+- This chart is a graphical representation of work left to do versus time.
+- Kanboard use the complexity or story point to generate this diagram. 
+- Everyday, the sum of the story points for each column is calculated.
+
+Average time spent into each column
+-----------------------------------
+
+![Average time spent into each column](http://kanboard.net/screenshots/documentation/average-time-spent-into-each-column.png)
+
+This chart show the average time spent into each column for the last 1000 tasks.
+
+- Kanboard use the task transitions to calculate the data.
+- The time spent is calculated until the task is closed.
+
+Average Lead and Cycle time
+---------------------------
+
+![Average time spent into each column](http://kanboard.net/screenshots/documentation/average-lead-cycle-time.png)
+
+This chart show the average lead and cycle time for the last 1000 tasks over the time.
+
+- The lead time is the time between the task creation and the date of completion.
+- The cycle time is time between the specified start date of the task to completion date.
+- If the task is not closed, the current time is used instead of the date of completion.
+
+Those metrics are calculated and recorded everyday for the whole project.
 
 Don't forget to run the daily job for stats calculation
 -------------------------------------------------------
 
-To generate accurate analytics data, you should run the daily cronjob **project daily summaries** just before midnight.
+To generate accurate analytics data, you should run the daily cronjob **project daily statistics**.
 
-[Read the documentation about Kanboard CLI](http://kanboard.net/documentation/cli)
+[Read the documentation about Kanboard CLI](cli.markdown)
diff --git a/docs/api-json-rpc.markdown b/docs/api-json-rpc.markdown
index e54c3a13..8a637412 100644
--- a/docs/api-json-rpc.markdown
+++ b/docs/api-json-rpc.markdown
@@ -306,9 +306,19 @@ Response example:
         "name": "API test",
         "is_active": "1",
         "token": "",
-        "last_modified": "1410263246",
+        "last_modified": "1436119135",
         "is_public": "0",
-        "description": "A sample project"
+        "is_private": "0",
+        "is_everybody_allowed": "0",
+        "default_swimlane": "Default swimlane",
+        "show_default_swimlane": "1",
+        "description": "test",
+        "identifier": "",
+        "url": {
+            "board": "http:\/\/127.0.0.1:8000\/?controller=board&action=show&project_id=1",
+            "calendar": "http:\/\/127.0.0.1:8000\/?controller=calendar&action=show&project_id=1",
+            "list": "http:\/\/127.0.0.1:8000\/?controller=listing&action=show&project_id=1"
+        }
     }
 }
 ```
@@ -345,9 +355,19 @@ Response example:
         "name": "Test",
         "is_active": "1",
         "token": "",
-        "last_modified": "0",
+        "last_modified": "1436119135",
         "is_public": "0",
-        "description": "A sample project"
+        "is_private": "0",
+        "is_everybody_allowed": "0",
+        "default_swimlane": "Default swimlane",
+        "show_default_swimlane": "1",
+        "description": "test",
+        "identifier": "",
+        "url": {
+            "board": "http:\/\/127.0.0.1:8000\/?controller=board&action=show&project_id=1",
+            "calendar": "http:\/\/127.0.0.1:8000\/?controller=calendar&action=show&project_id=1",
+            "list": "http:\/\/127.0.0.1:8000\/?controller=listing&action=show&project_id=1"
+        }
     }
 }
 ```
@@ -366,7 +386,7 @@ Request example:
 {
     "jsonrpc": "2.0",
     "method": "getAllProjects",
-    "id": 134982303
+    "id": 2134420212
 }
 ```
 
@@ -375,25 +395,26 @@ Response example:
 ```json
 {
     "jsonrpc": "2.0",
-    "id": 134982303,
+    "id": 2134420212,
     "result": [
         {
-            "id": "2",
-            "name": "PHP client",
-            "is_active": "1",
-            "token": "",
-            "last_modified": "0",
-            "is_public": "0",
-            "description": "PHP client project"
-        },
-        {
             "id": "1",
-            "name": "Test",
+            "name": "API test",
             "is_active": "1",
             "token": "",
-            "last_modified": "0",
+            "last_modified": "1436119570",
             "is_public": "0",
-            "description": "Test project"
+            "is_private": "0",
+            "is_everybody_allowed": "0",
+            "default_swimlane": "Default swimlane",
+            "show_default_swimlane": "1",
+            "description": null,
+            "identifier": "",
+            "url": {
+                "board": "http:\/\/127.0.0.1:8000\/?controller=board&action=show&project_id=1",
+                "calendar": "http:\/\/127.0.0.1:8000\/?controller=calendar&action=show&project_id=1",
+                "list": "http:\/\/127.0.0.1:8000\/?controller=listing&action=show&project_id=1"
+            }
         }
     ]
 }
@@ -1970,8 +1991,9 @@ Response example:
         "recurrence_timeframe": "0",
         "recurrence_basedate": "0",
         "recurrence_parent": null,
-        "recurrence_child": null
-        }
+        "recurrence_child": null,
+        "url": "http:\/\/127.0.0.1:8000\/?controller=task&action=show&task_id=1&project_id=1"
+    }
 }
 ```
 
@@ -2033,7 +2055,8 @@ Response example:
         "recurrence_timeframe": "0",
         "recurrence_basedate": "0",
         "recurrence_parent": null,
-        "recurrence_child": null
+        "recurrence_child": null,
+        "url": "http:\/\/127.0.0.1:8000\/?controller=task&action=show&task_id=5&project_id=1"
     }
 }
 ```
@@ -2097,7 +2120,8 @@ Response example:
             "recurrence_timeframe": "0",
             "recurrence_basedate": "0",
             "recurrence_parent": null,
-            "recurrence_child": null
+            "recurrence_child": null,
+            "url": "http:\/\/127.0.0.1:8000\/?controller=task&action=show&task_id=1&project_id=1"
         },
         {
             "id": "2",
@@ -2128,7 +2152,8 @@ Response example:
             "recurrence_timeframe": "0",
             "recurrence_basedate": "0",
             "recurrence_parent": null,
-            "recurrence_child": null
+            "recurrence_child": null,
+            "url": "http:\/\/127.0.0.1:8000\/?controller=task&action=show&task_id=2&project_id=1"
         },
         ...
     ]
diff --git a/docs/cli.markdown b/docs/cli.markdown
index 21183177..38cba496 100644
--- a/docs/cli.markdown
+++ b/docs/cli.markdown
@@ -13,36 +13,35 @@ Usage
 - Run the command `./kanboard`
 
 ```bash
-$ ./kanboard
 Kanboard version master
 
 Usage:
- command [options] [arguments]
+  command [options] [arguments]
 
 Options:
- --help (-h)           Display this help message
- --quiet (-q)          Do not output any message
- --verbose (-v|vv|vvv) Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
- --version (-V)        Display this application version
- --ansi                Force ANSI output
- --no-ansi             Disable ANSI output
- --no-interaction (-n) Do not ask any interactive question
+  -h, --help            Display this help message
+  -q, --quiet           Do not output any message
+  -V, --version         Display this application version
+      --ansi            Force ANSI output
+      --no-ansi         Disable ANSI output
+  -n, --no-interaction  Do not ask any interactive question
+  -v|vv|vvv, --verbose  Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug
 
 Available commands:
- help                           Displays help for a command
- list                           Lists commands
-export
- export:daily-project-summary   Daily project summary CSV export (number of tasks per column and per day)
- export:subtasks                Subtasks CSV export
- export:tasks                   Tasks CSV export
- export:transitions             Task transitions CSV export
-locale
-  locale:compare                Compare application translations with the fr_FR locale
-  locale:sync                   Synchronize all translations based on the fr_FR locale
-notification
- notification:overdue-tasks     Send notifications for overdue tasks
-projects
- projects:daily-summary         Calculate daily summary data for all projects
+  help                               Displays help for a command
+  list                               Lists commands
+ export
+  export:daily-project-column-stats  Daily project column stats CSV export (number of tasks per column and per day)
+  export:subtasks                    Subtasks CSV export
+  export:tasks                       Tasks CSV export
+  export:transitions                 Task transitions CSV export
+ locale
+  locale:compare                     Compare application translations with the fr_FR locale
+  locale:sync                        Synchronize all translations based on the fr_FR locale
+ notification
+  notification:overdue-tasks         Send notifications for overdue tasks
+ projects
+  projects:daily-stats               Calculate daily statistics for all projects
 ```
 
 Available commands
@@ -97,13 +96,13 @@ Example:
 The exported data will be printed on the standard output:
 
 ```bash
-./kanboard export:daily-project-summary <project_id> <start_date> <end_date>
+./kanboard export:daily-project-column-stats <project_id> <start_date> <end_date>
 ```
 
 Example:
 
 ```bash
-./kanboard export:daily-project-summary 1 2014-10-01 2014-11-30 > /tmp/my_custom_export.csv
+./kanboard export:daily-project-column-stats 1 2014-10-01 2014-11-30 > /tmp/my_custom_export.csv
 ```
 
 ### Send notifications for overdue tasks
@@ -133,12 +132,12 @@ Cronjob example:
 0 8 * * *  cd /path/to/kanboard && ./kanboard notification:overdue-tasks >/dev/null 2>&1
 ```
 
-### Run daily project summaries calculation
+### Run daily project stats calculation
 
-You can add a background task that calculate the daily project summaries everyday:
+You can add a background task to calculate the project statistics everyday:
 
 ```bash
-$ ./kanboard projects:daily-summary
+$ ./kanboard projects:daily-stats
 Run calculation for Project #0
 Run calculation for Project #1
 Run calculation for Project #10
diff --git a/docs/ical.markdown b/docs/ical.markdown
index e5f2f936..5c52bf82 100644
--- a/docs/ical.markdown
+++ b/docs/ical.markdown
@@ -7,6 +7,8 @@ This feature allow you to import Kanboard tasks in almost any calendar program (
 Calendar subscriptions are **read-only** access, you cannot create tasks from an external calendar software.
 The Calendar feed export follow the iCal standard.
 
+Note: Only tasks within the date range of -2 months to +6 months are exported to the iCalendar feed.
+
 Project calendars
 -----------------
 
diff --git a/docs/index.markdown b/docs/index.markdown
index bf315ee6..410cc402 100644
--- a/docs/index.markdown
+++ b/docs/index.markdown
@@ -33,6 +33,7 @@ Using Kanboard
 - [Recurring tasks](recurring-tasks.markdown)
 - [Create tasks by email](create-tasks-by-email.markdown)
 - [Subtasks](subtasks.markdown)
+- [Analytics for tasks](analytics-tasks.markdown)
 
 ### Working with users
 
diff --git a/docs/slack.markdown b/docs/slack.markdown
index af60d38e..f90464e8 100644
--- a/docs/slack.markdown
+++ b/docs/slack.markdown
@@ -26,3 +26,13 @@ This feature use the [Incoming webhook](https://api.slack.com/incoming-webhooks)
 3. Copy the webhook url to the Kanboard settings page: **Settings > Integrations > Slack** or **Project settings > Integrations > Slack**
 
 Now, Kanboard events will be sent to the Slack channel.
+
+### Overriding Channel (Optional)
+
+Optionally you can override the channel, private group or send direct messages by filling up **Channel/Group/User** text box. Leaving it empty will post to the channel configured during webhook configuration.
+
+Examples:
+
+- Send messages to another channel: **#mychannel1**
+- Send messages to a private group: **#myprivategroup1**
+- Send messages directly to someone: **@anotheruser1**