X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=app%2Fconfig%2Frouting.yml;h=0bd2d130675140d54ee3f9c7d4d5b1acb20553e7;hb=6fb06904ecde15b1b07d0a2af945338b416cf0e2;hp=8fbcb6432a6a6b063702a7568bcfc7148836a1a3;hpb=f38e03dc02c96344677fd2720912605b21c90b5d;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/config/routing.yml b/app/config/routing.yml
index 8fbcb643..0bd2d130 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,14 +1,20 @@
-wallabag_comment:
+wallabag_annotation:
   type : rest
-  resource: "@WallabagCommentBundle/Resources/config/routing_comments.yml"
+  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
 
 wallabag_import:
     resource: "@WallabagImportBundle/Controller/"
-    type:     annotation
-    prefix:   /import
+    type: annotation
+    prefix: /import
+
+wallabag_user:
+    resource: "@WallabagUserBundle/Controller/"
+    type: annotation
+    prefix: /users
 
 wallabag_api:
-    resource: "@WallabagApiBundle/Resources/config/routing.yml"
+    resource: "@WallabagApiBundle/Controller/"
+    type: annotation
     prefix: /
 
 app:
@@ -42,3 +48,6 @@ craue_config_settings_modify:
     path: /settings
     defaults:
         _controller: CraueConfigBundle:Settings:modify
+
+fos_js_routing:
+    resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"