Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

1 files changed, 20 insertions, 0 deletions

diff --git a/doc/plugin-hooks.markdown b/doc/plugin-hooks.markdown
index 6e9718d9..eac027c2 100644
--- a/doc/plugin-hooks.markdown
+++ b/doc/plugin-hooks.markdown
@@ -58,8 +58,28 @@ class Plugin extends Base
 }
 ```
 
+Example to override default values for task forms:
+
+```php
+class Plugin extends Base
+{
+    public function initialize()
+    {
+        $this->hook->on('controller:task:form:default', function (array $default_values) {
+            return empty($default_values['score']) ? array('score' => 4) : array();
+        });
+    }
+}
+```
+
 List of merging hooks:
 
+#### controller:task:form:default
+
+- Override default values for task forms
+- Arguments:
+    - `$default_values`: actual default values (array)
+
 #### controller:calendar:project:events
 
 - Add more events to the project calendar