diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-06-08 19:15:33 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-06-08 19:15:33 +0200 |
commit | 80f4d85ac92ab4dc490c51f2d831ac7fa3853826 (patch) | |
tree | 0a13d4c7ee0e5ce34e2c21a6492de61a49e627e8 /app | |
parent | e48b238a3e2c387be1f897e6f2c3c481d25f5203 (diff) | |
download | wallabag-80f4d85ac92ab4dc490c51f2d831ac7fa3853826.tar.gz wallabag-80f4d85ac92ab4dc490c51f2d831ac7fa3853826.tar.zst wallabag-80f4d85ac92ab4dc490c51f2d831ac7fa3853826.zip |
Review
Diffstat (limited to 'app')
-rw-r--r-- | app/DoctrineMigrations/Version20170606155640.php | 3 | ||||
-rw-r--r-- | app/config/parameters.yml.dist | 2 | ||||
-rw-r--r-- | app/config/parameters_test.yml | 1 | ||||
-rw-r--r-- | app/config/wallabag.yml | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/app/DoctrineMigrations/Version20170606155640.php b/app/DoctrineMigrations/Version20170606155640.php index 1b234044..e9b50428 100644 --- a/app/DoctrineMigrations/Version20170606155640.php +++ b/app/DoctrineMigrations/Version20170606155640.php | |||
@@ -8,7 +8,8 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Add api_user_registration in craue_config_setting. | 11 | * Remove wallabag_url from craue_config_setting. |
12 | * It has been moved into the parameters.yml | ||
12 | */ | 13 | */ |
13 | class Version20170606155640 extends AbstractMigration implements ContainerAwareInterface | 14 | class Version20170606155640 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 15 | { |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index c00ffb0e..d827219a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -23,7 +23,7 @@ parameters: | |||
23 | # with PostgreSQL and SQLite, you must set "utf8" | 23 | # with PostgreSQL and SQLite, you must set "utf8" |
24 | database_charset: utf8mb4 | 24 | database_charset: utf8mb4 |
25 | 25 | ||
26 | domain_name: wallabag.me | 26 | domain_name: http://your-wallabag-url-instance.com |
27 | 27 | ||
28 | mailer_transport: smtp | 28 | mailer_transport: smtp |
29 | mailer_host: 127.0.0.1 | 29 | mailer_host: 127.0.0.1 |
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 92f0364f..010785e6 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml | |||
@@ -8,4 +8,3 @@ parameters: | |||
8 | test_database_path: "%env(TEST_DATABASE_PATH)%" | 8 | test_database_path: "%env(TEST_DATABASE_PATH)%" |
9 | env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" | 9 | env(TEST_DATABASE_PATH): "%kernel.root_dir%/../data/db/wallabag_test.sqlite" |
10 | test_database_charset: utf8 | 10 | test_database_charset: utf8 |
11 | domain_name: 'http://v2.wallabag.org' | ||
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index d03450a0..51b7e4e3 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
@@ -26,7 +26,6 @@ wallabag_core: | |||
26 | fetching_error_message: | | 26 | fetching_error_message: | |
27 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. | 27 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. |
28 | api_limit_mass_actions: 10 | 28 | api_limit_mass_actions: 10 |
29 | domain_name: '%domain_name%' | ||
30 | default_internal_settings: | 29 | default_internal_settings: |
31 | - | 30 | - |
32 | name: share_public | 31 | name: share_public |