devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-07 23:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS

Browse Source
This commit is contained in:
Nicolas Lœuillet 2016-02-04 16:06:05 +01:00
parent 3eb06f2891
commit bc358c9180
7 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
View File

@ -9,7 +9,7 @@ export_json: Enable JSON export
export_txt: Enable TXT export export_txt: Enable TXT export
export_xml: Enable XML export export_xml: Enable XML export
pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication) pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
shaarli_url: URL de Shaarli, if the service is enabled shaarli_url: Shaarli URL, if the service is enabled
share_diaspora: Enable share to Diaspora share_diaspora: Enable share to Diaspora
share_mail: Enable share by email share_mail: Enable share by email
share_shaarli: Enable share to Shaarli share_shaarli: Enable share to Shaarli

2
app/config/parameters.yml.dist
View File

@ -40,6 +40,8 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
# fosuser stuff
fosuser_confirmation: true fosuser_confirmation: true
from_email: no-reply@wallabag.org from_email: no-reply@wallabag.org

2
app/config/tests/parameters.yml.dist.mysql
View File

@ -30,6 +30,8 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
# fosuser stuff
fosuser_confirmation: true fosuser_confirmation: true
from_email: no-reply@wallabag.org from_email: no-reply@wallabag.org

2
app/config/tests/parameters.yml.dist.pgsql
View File

@ -30,6 +30,8 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
# fosuser stuff
fosuser_confirmation: true fosuser_confirmation: true
from_email: no-reply@wallabag.org from_email: no-reply@wallabag.org

2
app/config/tests/parameters.yml.dist.sqlite
View File

@ -30,6 +30,8 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: no-reply@wallabag.org
# fosuser stuff
fosuser_confirmation: true fosuser_confirmation: true
from_email: no-reply@wallabag.org from_email: no-reply@wallabag.org

2
src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
View File

@ -6,7 +6,7 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
/** /**
* The controller `SettingsController` does not exist. * The controller `SettingsController` does not exist.
* This test cover security against the internal settings page managed by CraueConfigBundle * This test cover security against the internal settings page managed by CraueConfigBundle.
*/ */
class SettingsControllerTest extends WallabagCoreTestCase class SettingsControllerTest extends WallabagCoreTestCase
{ {

2
src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
View File

@ -48,7 +48,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface
private $supportUrl; private $supportUrl;
/** /**
* Url for the wallabag instance (only used for image in the HTML email template) * Url for the wallabag instance (only used for image in the HTML email template).
* *
* @var string * @var string
*/ */