aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/config/parameters.yml.dist2
-rw-r--r--app/config/tests/parameters.yml.dist.mysql2
-rw-r--r--app/config/tests/parameters.yml.dist.pgsql2
-rw-r--r--app/config/tests/parameters.yml.dist.sqlite2
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php2
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/README.md2
-rw-r--r--web/favicon.icobin0 -> 34494 bytes
9 files changed, 4 insertions, 12 deletions
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:
31 mailer_host: 127.0.0.1 31 mailer_host: 127.0.0.1
32 mailer_user: ~ 32 mailer_user: ~
33 mailer_password: ~ 33 mailer_password: ~
34 switftmailer_username: null
35 switftmailer_password: null
36 34
37 locale: en 35 locale: en
38 36
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:
21 mailer_host: 127.0.0.1 21 mailer_host: 127.0.0.1
22 mailer_user: ~ 22 mailer_user: ~
23 mailer_password: ~ 23 mailer_password: ~
24 switftmailer_username: null
25 switftmailer_password: null
26 24
27 locale: en 25 locale: en
28 26
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:
21 mailer_host: 127.0.0.1 21 mailer_host: 127.0.0.1
22 mailer_user: ~ 22 mailer_user: ~
23 mailer_password: ~ 23 mailer_password: ~
24 switftmailer_username: null
25 switftmailer_password: null
26 24
27 locale: en 25 locale: en
28 26
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:
21 mailer_host: 127.0.0.1 21 mailer_host: 127.0.0.1
22 mailer_user: ~ 22 mailer_user: ~
23 mailer_password: ~ 23 mailer_password: ~
24 switftmailer_username: null
25 switftmailer_password: null
26 24
27 locale: en 25 locale: en
28 26
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
198 * 198 *
199 * @return \Symfony\Component\HttpFoundation\RedirectResponse 199 * @return \Symfony\Component\HttpFoundation\RedirectResponse
200 */ 200 */
201 public function deleteTaggingRule(TaggingRule $rule) 201 public function deleteTaggingRuleAction(TaggingRule $rule)
202 { 202 {
203 if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { 203 if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) {
204 throw $this->createAccessDeniedException('You can not access this tagging ryle.'); 204 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
81 * 81 *
82 * @return \Symfony\Component\HttpFoundation\Response 82 * @return \Symfony\Component\HttpFoundation\Response
83 */ 83 */
84 public function addEntryViaBookmarklet(Request $request) 84 public function addEntryViaBookmarkletAction(Request $request)
85 { 85 {
86 $entry = new Entry($this->getUser()); 86 $entry = new Entry($this->getUser());
87 $entry->setUrl($request->get('url')); 87 $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 @@
1# Baggy Theme 1# Baggy Theme
2 2
3theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/ \ No newline at end of file 3theme 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 @@
2 2
3Theme created by Danilow (@modos189) Alexandr http://modos189.ru/ 3Theme created by Danilow (@modos189) Alexandr http://modos189.ru/
4 4
5Used framework http://materializecss.com/ \ No newline at end of file 5Used framework http://materializecss.com/
diff --git a/web/favicon.ico b/web/favicon.ico
new file mode 100644
index 00000000..0346558b
--- /dev/null
+++ b/web/favicon.ico
Binary files differ