From: Nicolas LÅ“uillet Date: Wed, 20 Jan 2016 16:16:17 +0000 (+0100) Subject: SensioLabsInsight fixes X-Git-Tag: 2.0.0-beta.1~61^2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5f8a785719c1dfeacc0bccc0781a94bd396b80ff;p=github%2Fwallabag%2Fwallabag.git SensioLabsInsight fixes --- diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 11d31b24..e474ec07 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -31,8 +31,6 @@ parameters: mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ - switftmailer_username: null - switftmailer_password: null locale: en diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index bd45f091..88b1d2b4 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -21,8 +21,6 @@ parameters: mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ - switftmailer_username: null - switftmailer_password: null locale: en diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index 8352a1ad..3c61142d 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -21,8 +21,6 @@ parameters: mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ - switftmailer_username: null - switftmailer_password: null locale: en diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 617e9f04..2f7699b5 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -21,8 +21,6 @@ parameters: mailer_host: 127.0.0.1 mailer_user: ~ mailer_password: ~ - switftmailer_username: null - switftmailer_password: null locale: en diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 6c375909..b01aaa7f 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -198,7 +198,7 @@ class ConfigController extends Controller * * @return \Symfony\Component\HttpFoundation\RedirectResponse */ - public function deleteTaggingRule(TaggingRule $rule) + public function deleteTaggingRuleAction(TaggingRule $rule) { if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { throw $this->createAccessDeniedException('You can not access this tagging ryle.'); diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 747976e3..ea77d138 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php @@ -81,7 +81,7 @@ class EntryController extends Controller * * @return \Symfony\Component\HttpFoundation\Response */ - public function addEntryViaBookmarklet(Request $request) + public function addEntryViaBookmarkletAction(Request $request) { $entry = new Entry($this->getUser()); $entry->setUrl($request->get('url')); diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md index 1f0054a4..3db07873 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md @@ -1,3 +1,3 @@ # Baggy Theme -theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/ \ No newline at end of file +theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/ diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md index 534eea30..54e8a0e2 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md @@ -2,4 +2,4 @@ Theme created by Danilow (@modos189) Alexandr http://modos189.ru/ -Used framework http://materializecss.com/ \ No newline at end of file +Used framework http://materializecss.com/ diff --git a/web/favicon.ico b/web/favicon.ico new file mode 100644 index 00000000..0346558b Binary files /dev/null and b/web/favicon.ico differ