Merge remote-tracking branch 'origin/master' into 2.2

2016-11-03 16:41:29 +01:00
parent da41365579 84795d015b
commit 5a619812ca
60 changed files with 2477 additions and 1936 deletions
--- a/src/Wallabag/ApiBundle/Resources/config/routing_rest.yml
+++ b/src/Wallabag/ApiBundle/Resources/config/routing_rest.yml
@ -1,4 +1,14 @@
-api:
-    type: rest
-    resource: "WallabagApiBundle:WallabagRest"
-    name_prefix:  api_
+entry:
+  type: rest
+  resource: "WallabagApiBundle:EntryRest"
+  name_prefix:  api_
+
+tag:
+  type: rest
+  resource: "WallabagApiBundle:TagRest"
+  name_prefix:  api_
+
+misc:
+  type: rest
+  resource: "WallabagApiBundle:WallabagRest"
+  name_prefix:  api_