aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/config
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2016-02-07 16:52:59 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-02-26 18:13:17 +0100
commitf38e03dc02c96344677fd2720912605b21c90b5d (patch)
tree2028cecf5d0930e1569ddb977e245ea44bedc38a /app/config
parentd3f1a9dc1ac181033ec54f9149d2807199fa8f17 (diff)
downloadwallabag-f38e03dc02c96344677fd2720912605b21c90b5d.tar.gz
wallabag-f38e03dc02c96344677fd2720912605b21c90b5d.tar.zst
wallabag-f38e03dc02c96344677fd2720912605b21c90b5d.zip
Comment work with annotator v2
- add missing annotator.js file and fix typo - edit & delete routes, started tests - basic tests
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..8fbcb643 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,3 +1,7 @@
1wallabag_comment:
2 type : rest
3 resource: "@WallabagCommentBundle/Resources/config/routing_comments.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 }