diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@smile.fr> | 2016-02-04 16:06:05 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@smile.fr> | 2016-02-04 16:06:05 +0100 |
commit | bc358c918005159afe3f7c350c0c0c29f4054e4c (patch) | |
tree | 90add3f7153238e60ab5fb81679704204e04a9c8 | |
parent | 3eb06f2891f4bd990751442d36f4e9cd6c025502 (diff) | |
download | wallabag-bc358c918005159afe3f7c350c0c0c29f4054e4c.tar.gz wallabag-bc358c918005159afe3f7c350c0c0c29f4054e4c.tar.zst wallabag-bc358c918005159afe3f7c350c0c0c29f4054e4c.zip |
CS
7 files changed, 11 insertions, 3 deletions
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index b5385dc3..6d86eab6 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | |||
@@ -9,7 +9,7 @@ export_json: Enable JSON export | |||
9 | export_txt: Enable TXT export | 9 | export_txt: Enable TXT export |
10 | export_xml: Enable XML export | 10 | export_xml: Enable XML export |
11 | pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) | 11 | pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) |
12 | shaarli_url: URL de Shaarli, if the service is enabled | 12 | shaarli_url: Shaarli URL, if the service is enabled |
13 | share_diaspora: Enable share to Diaspora | 13 | share_diaspora: Enable share to Diaspora |
14 | share_mail: Enable share by email | 14 | share_mail: Enable share by email |
15 | share_shaarli: Enable share to Shaarli | 15 | share_shaarli: Enable share to Shaarli |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index bf3fd5f5..7c7413fb 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -40,6 +40,8 @@ parameters: | |||
40 | # two factor stuff | 40 | # two factor stuff |
41 | twofactor_auth: true | 41 | twofactor_auth: true |
42 | twofactor_sender: no-reply@wallabag.org | 42 | twofactor_sender: no-reply@wallabag.org |
43 | |||
44 | # fosuser stuff | ||
43 | fosuser_confirmation: true | 45 | fosuser_confirmation: true |
44 | 46 | ||
45 | from_email: no-reply@wallabag.org | 47 | from_email: no-reply@wallabag.org |
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index bc6c7844..1951f021 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql | |||
@@ -30,6 +30,8 @@ parameters: | |||
30 | # two factor stuff | 30 | # two factor stuff |
31 | twofactor_auth: true | 31 | twofactor_auth: true |
32 | twofactor_sender: no-reply@wallabag.org | 32 | twofactor_sender: no-reply@wallabag.org |
33 | |||
34 | # fosuser stuff | ||
33 | fosuser_confirmation: true | 35 | fosuser_confirmation: true |
34 | 36 | ||
35 | from_email: no-reply@wallabag.org | 37 | from_email: no-reply@wallabag.org |
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 2520fec0..36ad6cde 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql | |||
@@ -30,6 +30,8 @@ parameters: | |||
30 | # two factor stuff | 30 | # two factor stuff |
31 | twofactor_auth: true | 31 | twofactor_auth: true |
32 | twofactor_sender: no-reply@wallabag.org | 32 | twofactor_sender: no-reply@wallabag.org |
33 | |||
34 | # fosuser stuff | ||
33 | fosuser_confirmation: true | 35 | fosuser_confirmation: true |
34 | 36 | ||
35 | from_email: no-reply@wallabag.org | 37 | from_email: no-reply@wallabag.org |
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 253da5b7..6564014a 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite | |||
@@ -30,6 +30,8 @@ parameters: | |||
30 | # two factor stuff | 30 | # two factor stuff |
31 | twofactor_auth: true | 31 | twofactor_auth: true |
32 | twofactor_sender: no-reply@wallabag.org | 32 | twofactor_sender: no-reply@wallabag.org |
33 | |||
34 | # fosuser stuff | ||
33 | fosuser_confirmation: true | 35 | fosuser_confirmation: true |
34 | 36 | ||
35 | from_email: no-reply@wallabag.org | 37 | from_email: no-reply@wallabag.org |
diff --git a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php b/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php index 354aedba..fd698b3e 100644 --- a/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php +++ b/src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php | |||
@@ -6,7 +6,7 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase; | |||
6 | 6 | ||
7 | /** | 7 | /** |
8 | * The controller `SettingsController` does not exist. | 8 | * The controller `SettingsController` does not exist. |
9 | * This test cover security against the internal settings page managed by CraueConfigBundle | 9 | * This test cover security against the internal settings page managed by CraueConfigBundle. |
10 | */ | 10 | */ |
11 | class SettingsControllerTest extends WallabagCoreTestCase | 11 | class SettingsControllerTest extends WallabagCoreTestCase |
12 | { | 12 | { |
diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php index 98017f43..d078bdf7 100644 --- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php +++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php | |||
@@ -48,7 +48,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface | |||
48 | private $supportUrl; | 48 | private $supportUrl; |
49 | 49 | ||
50 | /** | 50 | /** |
51 | * Url for the wallabag instance (only used for image in the HTML email template) | 51 | * Url for the wallabag instance (only used for image in the HTML email template). |
52 | * | 52 | * |
53 | * @var string | 53 | * @var string |
54 | */ | 54 | */ |