diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-02-07 16:52:59 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-02-26 18:13:17 +0100 |
commit | f38e03dc02c96344677fd2720912605b21c90b5d (patch) | |
tree | 2028cecf5d0930e1569ddb977e245ea44bedc38a /app | |
parent | d3f1a9dc1ac181033ec54f9149d2807199fa8f17 (diff) | |
download | wallabag-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')
-rw-r--r-- | app/AppKernel.php | 1 | ||||
-rw-r--r-- | app/config/routing.yml | 4 | ||||
-rw-r--r-- | app/config/routing_rest.yml | 1 | ||||
-rw-r--r-- | app/config/security.yml | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index 08c9cc27..1f2d4ad4 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -35,6 +35,7 @@ class AppKernel extends Kernel | |||
35 | new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), | 35 | new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), |
36 | new Craue\ConfigBundle\CraueConfigBundle(), | 36 | new Craue\ConfigBundle\CraueConfigBundle(), |
37 | new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(), | 37 | new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(), |
38 | new Wallabag\CommentBundle\WallabagCommentBundle(), | ||
38 | ]; | 39 | ]; |
39 | 40 | ||
40 | if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { | 41 | if (in_array($this->getEnvironment(), ['dev', 'test'], true)) { |
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 @@ | |||
1 | wallabag_comment: | ||
2 | type : rest | ||
3 | resource: "@WallabagCommentBundle/Resources/config/routing_comments.yml" | ||
4 | |||
1 | wallabag_import: | 5 | wallabag_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 @@ | |||
1 | Rest_Wallabag: | 1 | Rest_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 } |