aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-26 18:17:37 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2016-02-26 18:17:37 +0100
commit162954763e6f68e0cf4002822007683bde62fc25 (patch)
treea85f850eddb30b3435d1bb5f45d16d9ab465bbf9 /app/config
parentd3f1a9dc1ac181033ec54f9149d2807199fa8f17 (diff)
parentb07c7dfe787313b75e0996265e13cccc78da41be (diff)
downloadwallabag-162954763e6f68e0cf4002822007683bde62fc25.tar.gz
wallabag-162954763e6f68e0cf4002822007683bde62fc25.tar.zst
wallabag-162954763e6f68e0cf4002822007683bde62fc25.zip
Merge pull request #1653 from wallabag/v2-annotator-comments
V2 annotator comments
Diffstat (limited to 'app/config')
-rw-r--r--app/config/routing.yml4
-rw-r--r--app/config/routing_rest.yml1
-rw-r--r--app/config/security.yml1
3 files changed, 6 insertions, 0 deletions
diff --git a/app/config/routing.yml b/app/config/routing.yml
index c491d35d..6a6aa6ac 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,3 +1,7 @@
1wallabag_annotation:
2 type : rest
3 resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
4
1wallabag_import: 5wallabag_import:
2 resource: "@WallabagImportBundle/Controller/" 6 resource: "@WallabagImportBundle/Controller/"
3 type: annotation 7 type: annotation
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml
index 0a64ad78..52d395dd 100644
--- a/app/config/routing_rest.yml
+++ b/app/config/routing_rest.yml
@@ -1,3 +1,4 @@
1Rest_Wallabag: 1Rest_Wallabag:
2 type : rest 2 type : rest
3 resource: "@WallabagApiBundle/Resources/config/routing_rest.yml" 3 resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"
4
diff --git a/app/config/security.yml b/app/config/security.yml
index 7c10889f..7f05123a 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -58,4 +58,5 @@ security:
58 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } 58 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
59 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY } 59 - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
60 - { path: ^/settings, roles: ROLE_SUPER_ADMIN } 60 - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
61 - { path: ^/annotations, roles: ROLE_USER }
61 - { path: ^/, roles: ROLE_USER } 62 - { path: ^/, roles: ROLE_USER }