aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-12-12 22:54:43 +0100
committerGitHub <noreply@github.com>2016-12-12 22:54:43 +0100
commit375c9e2d3eddebf168e078f4dec7608a3c34245c (patch)
tree9caa9e59d581ea0be79193635683bac5f1065438 /app
parent2c1eed8051160499d40ed033c83dd003c81b371e (diff)
parent24879db1f73c85b121702ba8c6ea36bae285c7c3 (diff)
downloadwallabag-375c9e2d3eddebf168e078f4dec7608a3c34245c.tar.gz
wallabag-375c9e2d3eddebf168e078f4dec7608a3c34245c.tar.zst
wallabag-375c9e2d3eddebf168e078f4dec7608a3c34245c.zip
Merge pull request #2697 from wallabag/fix-list-mode
Add default value for list_mode
Diffstat (limited to 'app')
-rw-r--r--app/DoctrineMigrations/Version20161128084725.php2
-rw-r--r--app/config/config.yml2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/DoctrineMigrations/Version20161128084725.php b/app/DoctrineMigrations/Version20161128084725.php
index 242d5900..ea370076 100644
--- a/app/DoctrineMigrations/Version20161128084725.php
+++ b/app/DoctrineMigrations/Version20161128084725.php
@@ -35,7 +35,7 @@ class Version20161128084725 extends AbstractMigration implements ContainerAwareI
35 $configTable = $schema->getTable($this->getTable('config')); 35 $configTable = $schema->getTable($this->getTable('config'));
36 $this->skipIf($configTable->hasColumn('list_mode'), 'It seems that you already played this migration.'); 36 $this->skipIf($configTable->hasColumn('list_mode'), 'It seems that you already played this migration.');
37 37
38 $configTable->addColumn('list_mode', 'integer'); 38 $configTable->addColumn('list_mode', 'integer', ['notnull' => false]);
39 } 39 }
40 40
41 /** 41 /**
diff --git a/app/config/config.yml b/app/config/config.yml
index 6b1ed056..d52f37c8 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -51,6 +51,8 @@ wallabag_core:
51 rss_limit: 50 51 rss_limit: 50
52 reading_speed: 1 52 reading_speed: 1
53 cache_lifetime: 10 53 cache_lifetime: 10
54 action_mark_as_read: 1
55 list_mode: 1
54 fetching_error_message: | 56 fetching_error_message: |
55 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. 57 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
56 58