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

diff --git a/app/config/routing.yml b/app/config/routing.yml
index f0f8f4b6..0bd2d130 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,15 +1,25 @@
+wallabag_annotation:
+  type : rest
+  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
+
+wallabag_import:
+    resource: "@WallabagImportBundle/Controller/"
+    type: annotation
+    prefix: /import
+
 wallabag_user:
     resource: "@WallabagUserBundle/Controller/"
-    type:     annotation
-    prefix:   /
+    type: annotation
+    prefix: /users
 
 wallabag_api:
-    resource: "@WallabagApiBundle/Resources/config/routing.yml"
-    prefix:   /
+    resource: "@WallabagApiBundle/Controller/"
+    type: annotation
+    prefix: /
 
 app:
-    resource: @WallabagCoreBundle/Controller/
-    type:     annotation
+    resource: "@WallabagCoreBundle/Controller/"
+    type: annotation
 
 doc-api:
     resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
@@ -21,13 +31,23 @@ rest :
     prefix : /api
 
 homepage:
-    pattern:   "/{page}"
-    defaults:  { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 }
+    path: "/{page}"
+    defaults:
+        _controller: WallabagCoreBundle:Entry:showUnread
+        page : 1
     requirements:
-        page:  \d+
+        page: \d+
 
 fos_user:
     resource: "@FOSUserBundle/Resources/config/routing/all.xml"
 
 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"