diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-07-29 09:02:30 +0200 |
---|---|---|
committer | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2015-07-29 09:02:30 +0200 |
commit | 7e63b892f9682e62f6758bb51c6912499f5bd8d1 (patch) | |
tree | b0b1da23086cba171d134946092f43cd31cd1e62 /app/config | |
parent | 9b9b05008a96a45bbf6da4c0c1c1b1244b83c6af (diff) | |
parent | 9fb6ac830fa669beef1dd11070421262c073192c (diff) | |
download | wallabag-7e63b892f9682e62f6758bb51c6912499f5bd8d1.tar.gz wallabag-7e63b892f9682e62f6758bb51c6912499f5bd8d1.tar.zst wallabag-7e63b892f9682e62f6758bb51c6912499f5bd8d1.zip |
Merge pull request #1250 from frankoa/v2_pagination_and_api
Adds pagerfanta paginator everywhere, modifies article routing.
Diffstat (limited to 'app/config')
-rw-r--r-- | app/config/routing.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/config/routing.yml b/app/config/routing.yml index 8710e97f..e8bf08a5 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -6,10 +6,6 @@ app: | |||
6 | resource: @WallabagCoreBundle/Controller/ | 6 | resource: @WallabagCoreBundle/Controller/ |
7 | type: annotation | 7 | type: annotation |
8 | 8 | ||
9 | homepage: | ||
10 | pattern: / | ||
11 | defaults: { _controller: WallabagCoreBundle:Entry:showUnread } | ||
12 | |||
13 | doc-api: | 9 | doc-api: |
14 | resource: "@NelmioApiDocBundle/Resources/config/routing.yml" | 10 | resource: "@NelmioApiDocBundle/Resources/config/routing.yml" |
15 | prefix: /api/doc | 11 | prefix: /api/doc |
@@ -17,8 +13,10 @@ doc-api: | |||
17 | login: | 13 | login: |
18 | pattern: /login | 14 | pattern: /login |
19 | defaults: { _controller: WallabagCoreBundle:Security:login } | 15 | defaults: { _controller: WallabagCoreBundle:Security:login } |
16 | |||
20 | login_check: | 17 | login_check: |
21 | pattern: /login_check | 18 | pattern: /login_check |
19 | |||
22 | logout: | 20 | logout: |
23 | path: /logout | 21 | path: /logout |
24 | 22 | ||
@@ -26,3 +24,9 @@ rest : | |||
26 | type : rest | 24 | type : rest |
27 | resource : "routing_rest.yml" | 25 | resource : "routing_rest.yml" |
28 | prefix : /api | 26 | prefix : /api |
27 | |||
28 | homepage: | ||
29 | pattern: "/{page}" | ||
30 | defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 } | ||
31 | requirements: | ||
32 | page: \d+ | ||