X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2Fconfig%2Frouting.yml;h=0bd2d130675140d54ee3f9c7d4d5b1acb20553e7;hb=21e7ccef3d960f4747d58fc0c9e081618e9451eb;hp=84b98d2323621be0e315ab6e3df3f378c8075808;hpb=86719c63bf47686ca55020e6b0443344de36d45a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/config/routing.yml b/app/config/routing.yml
index 84b98d23..0bd2d130 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,10 +1,20 @@
+wallabag_annotation:
+  type : rest
+  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:
@@ -22,7 +32,9 @@ rest :
 
 homepage:
     path: "/{page}"
-    defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 }
+    defaults:
+        _controller: WallabagCoreBundle:Entry:showUnread
+        page : 1
     requirements:
         page: \d+
 
@@ -31,3 +43,11 @@ fos_user:
 
 fos_oauth_server_token:
     resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
+
+craue_config_settings_modify:
+    path: /settings
+    defaults:
+        _controller: CraueConfigBundle:Settings:modify
+
+fos_js_routing:
+    resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"