diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-10-02 15:00:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-02 15:00:02 +0200 |
commit | 1dc3bee6b916b228c596a45d20dc6ae14ac555cb (patch) | |
tree | 2d3573ebc6e6fbd71dd63f15653f3347cde8164e /app | |
parent | 18b8dc0e9984fce01b231810347fef7d32c06ac7 (diff) | |
parent | ccc7faec094387681a59faa5ca79a86e33f06972 (diff) | |
download | wallabag-1dc3bee6b916b228c596a45d20dc6ae14ac555cb.tar.gz wallabag-1dc3bee6b916b228c596a45d20dc6ae14ac555cb.tar.zst wallabag-1dc3bee6b916b228c596a45d20dc6ae14ac555cb.zip |
Merge pull request #2327 from wallabag/user-management
Add users management UI
Diffstat (limited to 'app')
-rw-r--r-- | app/config/routing.yml | 5 | ||||
-rw-r--r-- | app/config/security.yml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/app/config/routing.yml b/app/config/routing.yml index 40cc7165..2be74d7f 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -7,6 +7,11 @@ wallabag_import: | |||
7 | type: annotation | 7 | type: annotation |
8 | prefix: /import | 8 | prefix: /import |
9 | 9 | ||
10 | wallabag_user: | ||
11 | resource: "@WallabagUserBundle/Controller/" | ||
12 | type: annotation | ||
13 | prefix: /users | ||
14 | |||
10 | wallabag_api: | 15 | wallabag_api: |
11 | resource: "@WallabagApiBundle/Resources/config/routing.yml" | 16 | resource: "@WallabagApiBundle/Resources/config/routing.yml" |
12 | prefix: / | 17 | prefix: / |
diff --git a/app/config/security.yml b/app/config/security.yml index 1f30e58b..efb00a53 100644 --- a/app/config/security.yml +++ b/app/config/security.yml | |||
@@ -63,4 +63,5 @@ security: | |||
63 | - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY } | 63 | - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY } |
64 | - { path: ^/settings, roles: ROLE_SUPER_ADMIN } | 64 | - { path: ^/settings, roles: ROLE_SUPER_ADMIN } |
65 | - { path: ^/annotations, roles: ROLE_USER } | 65 | - { path: ^/annotations, roles: ROLE_USER } |
66 | - { path: ^/users, roles: ROLE_SUPER_ADMIN } | ||
66 | - { path: ^/, roles: ROLE_USER } | 67 | - { path: ^/, roles: ROLE_USER } |