aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-03-08 15:49:13 +0100
committerJeremy Benoist <j0k3r@users.noreply.github.com>2016-03-08 15:49:13 +0100
commitd460a7377ab3672cf05ec18301f94c9d66fc5cff (patch)
tree4d0fd76f21209c6269ae110ec8c7ca8e3b8bd8fe
parentf4109a9bbfe73c964155d699653044ef77e1daff (diff)
parentcebb42234cd8a5cb5a777b4b7ef2640fb5a82b90 (diff)
downloadwallabag-d460a7377ab3672cf05ec18301f94c9d66fc5cff.tar.gz
wallabag-d460a7377ab3672cf05ec18301f94c9d66fc5cff.tar.zst
wallabag-d460a7377ab3672cf05ec18301f94c9d66fc5cff.zip
Merge pull request #1766 from wallabag/v2-add-wallabag-in-title
Fix #1756: Added 'wallabag' in page title
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/base.html.twig2
-rw-r--r--src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php2
-rw-r--r--src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php2
-rw-r--r--src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 4c0d4fee..dacdb9ca 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -47,7 +47,7 @@
47 <script src="{{ asset('bundles/wallabagcore/themes/_global/js/annotator.min.js') }}"></script> 47 <script src="{{ asset('bundles/wallabagcore/themes/_global/js/annotator.min.js') }}"></script>
48 {% endblock %} 48 {% endblock %}
49 49
50 <title>{% block title %}{% endblock %}</title> 50 <title>wallabag - {% block title %}{% endblock %}</title>
51 {% endblock %} 51 {% endblock %}
52 </head> 52 </head>
53 53
diff --git a/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php b/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php
index bc9e2f42..92712b9d 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php
+++ b/src/Wallabag/ImportBundle/Tests/Import/PocketImportTest.php
@@ -351,7 +351,7 @@ class PocketImportTest extends \PHPUnit_Framework_TestCase
351 $this->em 351 $this->em
352 ->expects($this->any()) 352 ->expects($this->any())
353 ->method('persist') 353 ->method('persist')
354 ->with($this->callback(function($persistedEntry) { 354 ->with($this->callback(function ($persistedEntry) {
355 return $persistedEntry->isArchived(); 355 return $persistedEntry->isArchived();
356 })); 356 }));
357 357
diff --git a/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php b/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php
index fbcd270d..8ab7e830 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php
+++ b/src/Wallabag/ImportBundle/Tests/Import/WallabagV1ImportTest.php
@@ -103,7 +103,7 @@ class WallabagV1ImportTest extends \PHPUnit_Framework_TestCase
103 $this->em 103 $this->em
104 ->expects($this->any()) 104 ->expects($this->any())
105 ->method('persist') 105 ->method('persist')
106 ->with($this->callback(function($persistedEntry) { 106 ->with($this->callback(function ($persistedEntry) {
107 return $persistedEntry->isArchived(); 107 return $persistedEntry->isArchived();
108 })); 108 }));
109 109
diff --git a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php b/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
index c461168c..2b642d27 100644
--- a/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
+++ b/src/Wallabag/ImportBundle/Tests/Import/WallabagV2ImportTest.php
@@ -94,7 +94,7 @@ class WallabagV2ImportTest extends \PHPUnit_Framework_TestCase
94 $this->em 94 $this->em
95 ->expects($this->any()) 95 ->expects($this->any())
96 ->method('persist') 96 ->method('persist')
97 ->with($this->callback(function($persistedEntry) { 97 ->with($this->callback(function ($persistedEntry) {
98 return $persistedEntry->isArchived(); 98 return $persistedEntry->isArchived();
99 })); 99 }));
100 100