aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2015-11-09 16:45:48 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2015-11-09 16:45:48 +0100
commit0a0c600887dde4cc755de0862a3301830c415882 (patch)
tree4d82bc16e921248bb6ab1b203a33e1b55b4ff445 /app
parentf1eccfd63f214dcc730ab0d18a694a5465f425db (diff)
parent16bbb4aa417188e7c21eb4a1734adf0f0c9b25f9 (diff)
downloadwallabag-0a0c600887dde4cc755de0862a3301830c415882.tar.gz
wallabag-0a0c600887dde4cc755de0862a3301830c415882.tar.zst
wallabag-0a0c600887dde4cc755de0862a3301830c415882.zip
Merge pull request #1422 from wallabag/v2-ebook
V2 – Export entries
Diffstat (limited to 'app')
-rw-r--r--app/config/parameters.yml.dist1
-rw-r--r--app/config/tests/parameters.yml.dist.mysql1
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql1
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite1
4 files changed, 4 insertions, 0 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 52f9bccb..b475d637 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -51,6 +51,7 @@ parameters:
51 export_epub: true 51 export_epub: true
52 export_mobi: true 52 export_mobi: true
53 export_pdf: true 53 export_pdf: true
54 wallabag_url: http://v2.wallabag.org
54 55
55 # default user config 56 # default user config
56 items_on_page: 12 57 items_on_page: 12
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 03fdf5a6..5b29690c 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -51,6 +51,7 @@ parameters:
51 export_epub: true 51 export_epub: true
52 export_mobi: true 52 export_mobi: true
53 export_pdf: true 53 export_pdf: true
54 wallabag_url: http://v2.wallabag.org
54 55
55 # default user config 56 # default user config
56 items_on_page: 12 57 items_on_page: 12
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index 675ba6c9..efdac961 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -51,6 +51,7 @@ parameters:
51 export_epub: true 51 export_epub: true
52 export_mobi: true 52 export_mobi: true
53 export_pdf: true 53 export_pdf: true
54 wallabag_url: http://v2.wallabag.org
54 55
55 # default user config 56 # default user config
56 items_on_page: 12 57 items_on_page: 12
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 258627af..276d1147 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -51,6 +51,7 @@ parameters:
51 export_epub: true 51 export_epub: true
52 export_mobi: true 52 export_mobi: true
53 export_pdf: true 53 export_pdf: true
54 wallabag_url: http://v2.wallabag.org
54 55
55 # default user config 56 # default user config
56 items_on_page: 12 57 items_on_page: 12