X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=app%2Fconfig%2Frouting.yml;h=d4defca02b2d7fdd04697427dca8ad2f33915ea5;hb=9f0957b831622ee577fa7d8f92ec0df6f3a8e274;hp=40cc7165bb4e410f175a330fa591e2f79ea70e59;hpb=0faeabefa7faedb3a6a3675a5e49e947554adae9;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/config/routing.yml b/app/config/routing.yml
index 40cc7165..d4defca0 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -7,8 +7,14 @@ wallabag_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,50 @@ craue_config_settings_modify:
     path: /settings
     defaults:
         _controller: CraueConfigBundle:Settings:modify
+
+fos_js_routing:
+    resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
+
+2fa_login:
+    path: /2fa
+    defaults:
+        _controller: "scheb_two_factor.form_controller:form"
+
+2fa_login_check:
+    path: /2fa_check
+
+# redirect RSS feed to Atom
+rss_to_atom_unread:
+    path: /{username}/{token}/unread.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: unread_feed
+        permanent: true
+
+rss_to_atom_archive:
+    path: /{username}/{token}/archive.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: archive_feed
+        permanent: true
+
+rss_to_atom_starred:
+    path: /{username}/{token}/starred.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: starred_feed
+        permanent: true
+
+rss_to_atom_all:
+    path: /{username}/{token}/all.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: all_feed
+        permanent: true
+
+rss_to_atom_tags:
+    path: /{username}/{token}/tags/{slug}.xml
+    defaults:
+        _controller: FrameworkBundle:Redirect:redirect
+        route: tag_feed
+        permanent: true