aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php2
-rw-r--r--src/Wallabag/ApiBundle/Controller/EntryRestController.php1
-rw-r--r--src/Wallabag/CoreBundle/Controller/EntryController.php1
-rw-r--r--src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php3
-rw-r--r--src/Wallabag/CoreBundle/Helper/EntriesExport.php4
-rw-r--r--src/Wallabag/CoreBundle/Repository/EntryRepository.php9
-rw-r--r--src/Wallabag/CoreBundle/Repository/TagRepository.php1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig2
-rw-r--r--src/Wallabag/ImportBundle/Controller/WallabagController.php2
-rw-r--r--src/Wallabag/ImportBundle/Import/BrowserImport.php3
-rw-r--r--src/Wallabag/UserBundle/Repository/UserRepository.php2
23 files changed, 33 insertions, 9 deletions
diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
index 014c29b6..b44f7e64 100644
--- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
+++ b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
@@ -3,6 +3,8 @@
3namespace Wallabag\AnnotationBundle\Repository; 3namespace Wallabag\AnnotationBundle\Repository;
4 4
5use Doctrine\ORM\EntityRepository; 5use Doctrine\ORM\EntityRepository;
6use Doctrine\ORM\QueryBuilder;
7use Wallabag\AnnotationBundle\Entity\Annotation;
6 8
7/** 9/**
8 * AnnotationRepository. 10 * AnnotationRepository.
diff --git a/src/Wallabag/ApiBundle/Controller/EntryRestController.php b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
index 9277e1a1..bc1b6f92 100644
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@@ -8,6 +8,7 @@ use JMS\Serializer\SerializationContext;
8use Nelmio\ApiDocBundle\Annotation\ApiDoc; 8use Nelmio\ApiDocBundle\Annotation\ApiDoc;
9use Symfony\Component\HttpFoundation\JsonResponse; 9use Symfony\Component\HttpFoundation\JsonResponse;
10use Symfony\Component\HttpFoundation\Request; 10use Symfony\Component\HttpFoundation\Request;
11use Symfony\Component\HttpFoundation\Response;
11use Symfony\Component\HttpKernel\Exception\HttpException; 12use Symfony\Component\HttpKernel\Exception\HttpException;
12use Symfony\Component\Routing\Generator\UrlGeneratorInterface; 13use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
13use Wallabag\CoreBundle\Entity\Entry; 14use Wallabag\CoreBundle\Entity\Entry;
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php
index 845ebef6..3dcfbebe 100644
--- a/src/Wallabag/CoreBundle/Controller/EntryController.php
+++ b/src/Wallabag/CoreBundle/Controller/EntryController.php
@@ -573,6 +573,7 @@ class EntryController extends Controller
573 'entries' => $entries, 573 'entries' => $entries,
574 'currentPage' => $page, 574 'currentPage' => $page,
575 'searchTerm' => $searchTerm, 575 'searchTerm' => $searchTerm,
576 'isFiltered' => $form->isSubmitted(),
576 ] 577 ]
577 ); 578 );
578 } 579 }
diff --git a/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php b/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
index 10689c62..da19fe31 100644
--- a/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
+++ b/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
@@ -8,6 +8,7 @@ use Graby\SiteConfig\ConfigBuilder;
8use Psr\Log\LoggerInterface; 8use Psr\Log\LoggerInterface;
9use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; 9use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
10use Wallabag\CoreBundle\Repository\SiteCredentialRepository; 10use Wallabag\CoreBundle\Repository\SiteCredentialRepository;
11use Wallabag\UserBundle\Entity\User;
11 12
12class GrabySiteConfigBuilder implements SiteConfigBuilder 13class GrabySiteConfigBuilder implements SiteConfigBuilder
13{ 14{
@@ -27,7 +28,7 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
27 private $logger; 28 private $logger;
28 29
29 /** 30 /**
30 * @var Wallabag\UserBundle\Entity\User|null 31 * @var User|null
31 */ 32 */
32 private $currentUser; 33 private $currentUser;
33 34
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index 64d82193..de259e7f 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -2,12 +2,12 @@
2 2
3namespace Wallabag\CoreBundle\Helper; 3namespace Wallabag\CoreBundle\Helper;
4 4
5use JMS\Serializer;
6use JMS\Serializer\SerializationContext; 5use JMS\Serializer\SerializationContext;
7use JMS\Serializer\SerializerBuilder; 6use JMS\Serializer\SerializerBuilder;
8use PHPePub\Core\EPub; 7use PHPePub\Core\EPub;
9use PHPePub\Core\Structure\OPF\DublinCore; 8use PHPePub\Core\Structure\OPF\DublinCore;
10use Symfony\Component\HttpFoundation\Response; 9use Symfony\Component\HttpFoundation\Response;
10use Wallabag\CoreBundle\Entity\Entry;
11 11
12/** 12/**
13 * This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest. 13 * This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest.
@@ -427,7 +427,7 @@ class EntriesExport
427 * 427 *
428 * @param string $format 428 * @param string $format
429 * 429 *
430 * @return Serializer 430 * @return string
431 */ 431 */
432 private function prepareSerializingContent($format) 432 private function prepareSerializingContent($format)
433 { 433 {
diff --git a/src/Wallabag/CoreBundle/Repository/EntryRepository.php b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
index c27ee90c..7f35bb9a 100644
--- a/src/Wallabag/CoreBundle/Repository/EntryRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/EntryRepository.php
@@ -3,9 +3,10 @@
3namespace Wallabag\CoreBundle\Repository; 3namespace Wallabag\CoreBundle\Repository;
4 4
5use Doctrine\ORM\EntityRepository; 5use Doctrine\ORM\EntityRepository;
6use Doctrine\ORM\Query; 6use Doctrine\ORM\QueryBuilder;
7use Pagerfanta\Adapter\DoctrineORMAdapter; 7use Pagerfanta\Adapter\DoctrineORMAdapter;
8use Pagerfanta\Pagerfanta; 8use Pagerfanta\Pagerfanta;
9use Wallabag\CoreBundle\Entity\Entry;
9use Wallabag\CoreBundle\Entity\Tag; 10use Wallabag\CoreBundle\Entity\Tag;
10 11
11class EntryRepository extends EntityRepository 12class EntryRepository extends EntityRepository
@@ -74,7 +75,7 @@ class EntryRepository extends EntityRepository
74 * 75 *
75 * @param int $userId 76 * @param int $userId
76 * @param string $term 77 * @param string $term
77 * @param strint $currentRoute 78 * @param string $currentRoute
78 * 79 *
79 * @return QueryBuilder 80 * @return QueryBuilder
80 */ 81 */
@@ -126,7 +127,7 @@ class EntryRepository extends EntityRepository
126 * @param int $since 127 * @param int $since
127 * @param string $tags 128 * @param string $tags
128 * 129 *
129 * @return array 130 * @return Pagerfanta
130 */ 131 */
131 public function findEntries($userId, $isArchived = null, $isStarred = null, $isPublic = null, $sort = 'created', $order = 'ASC', $since = 0, $tags = '') 132 public function findEntries($userId, $isArchived = null, $isStarred = null, $isPublic = null, $sort = 'created', $order = 'ASC', $since = 0, $tags = '')
132 { 133 {
@@ -172,7 +173,7 @@ class EntryRepository extends EntityRepository
172 * 173 *
173 * @param int $userId 174 * @param int $userId
174 * 175 *
175 * @return Entry 176 * @return array
176 */ 177 */
177 public function findOneWithTags($userId) 178 public function findOneWithTags($userId)
178 { 179 {
diff --git a/src/Wallabag/CoreBundle/Repository/TagRepository.php b/src/Wallabag/CoreBundle/Repository/TagRepository.php
index 6c63a6a2..213283e5 100644
--- a/src/Wallabag/CoreBundle/Repository/TagRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/TagRepository.php
@@ -3,6 +3,7 @@
3namespace Wallabag\CoreBundle\Repository; 3namespace Wallabag\CoreBundle\Repository;
4 4
5use Doctrine\ORM\EntityRepository; 5use Doctrine\ORM\EntityRepository;
6use Wallabag\CoreBundle\Entity\Tag;
6 7
7class TagRepository extends EntityRepository 8class TagRepository extends EntityRepository
8{ 9{
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 5229ac73..5e5bbde2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -169,6 +169,7 @@ entry:
169 # filtered_tags: 'Filtered by tags:' 169 # filtered_tags: 'Filtered by tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 # untagged: 'Untagged entries' 171 # untagged: 'Untagged entries'
172 # all: 'All entries'
172 list: 173 list:
173 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 174 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
174 reading_time: 'estimeret læsetid' 175 reading_time: 'estimeret læsetid'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 996f173a..48f8a535 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Gefiltert nach Tags:' 169 filtered_tags: 'Gefiltert nach Tags:'
170 filtered_search: 'Gefiltert nach Suche:' 170 filtered_search: 'Gefiltert nach Suche:'
171 untagged: 'Nicht getaggte Einträge' 171 untagged: 'Nicht getaggte Einträge'
172 all: 'Alle Einträge'
172 list: 173 list:
173 number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.' 174 number_on_the_page: '{0} Es gibt keine Einträge.|{1} Es gibt einen Eintrag.|]1,Inf[ Es gibt %count% Einträge.'
174 reading_time: 'geschätzte Lesezeit' 175 reading_time: 'geschätzte Lesezeit'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index aa1cd1a9..f41a7c85 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtered by tags:' 169 filtered_tags: 'Filtered by tags:'
170 filtered_search: 'Filtered by search:' 170 filtered_search: 'Filtered by search:'
171 untagged: 'Untagged entries' 171 untagged: 'Untagged entries'
172 all: 'All entries'
172 list: 173 list:
173 number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 174 number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
174 reading_time: 'estimated reading time' 175 reading_time: 'estimated reading time'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 96998f53..ea4d84ba 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtrado por etiquetas:' 169 filtered_tags: 'Filtrado por etiquetas:'
170 filtered_search: 'Filtrado por búsqueda:' 170 filtered_search: 'Filtrado por búsqueda:'
171 untagged: 'Artículos sin etiquetas' 171 untagged: 'Artículos sin etiquetas'
172 all: "Todos los artículos"
172 list: 173 list:
173 number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.' 174 number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
174 reading_time: 'tiempo estimado de lectura' 175 reading_time: 'tiempo estimado de lectura'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 57e6c029..11047e83 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -169,6 +169,7 @@ entry:
169 # filtered_tags: 'Filtered by tags:' 169 # filtered_tags: 'Filtered by tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 # untagged: 'Untagged entries' 171 # untagged: 'Untagged entries'
172 # all: 'All entries'
172 list: 173 list:
173 number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.' 174 number_on_the_page: '{0} هیج مقاله‌ای نیست.|{1} یک مقاله هست.|]1,Inf[ %count% مقاله هست.'
174 reading_time: 'زمان تخمینی برای خواندن' 175 reading_time: 'زمان تخمینی برای خواندن'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 6eac4c36..246add86 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: "Articles filtrés par tags :" 169 filtered_tags: "Articles filtrés par tags :"
170 filtered_search: "Articles filtrés par recherche :" 170 filtered_search: "Articles filtrés par recherche :"
171 untagged: "Article sans tag" 171 untagged: "Article sans tag"
172 all: "Tous les articles"
172 list: 173 list:
173 number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles." 174 number_on_the_page: "{0} Il n’y a pas d’article.|{1} Il y a un article.|]1,Inf[ Il y a %count% articles."
174 reading_time: "durée de lecture" 175 reading_time: "durée de lecture"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index fa7ae0b2..0de8bed7 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtrati per etichetta:' 169 filtered_tags: 'Filtrati per etichetta:'
170 filtered_search: 'Filtrati per ricerca:' 170 filtered_search: 'Filtrati per ricerca:'
171 untagged: 'Articoli non etichettati' 171 untagged: 'Articoli non etichettati'
172 all: 'Tutti gli articoli'
172 list: 173 list:
173 number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti." 174 number_on_the_page: "{0} Non ci sono contenuti.|{1} C'è un contenuto.|]1,Inf[ Ci sono %count% contenuti."
174 reading_time: 'tempo di lettura stimato' 175 reading_time: 'tempo di lettura stimato'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index be57e903..b2842ed2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Articles filtrats per etiquetas :' 169 filtered_tags: 'Articles filtrats per etiquetas :'
170 filtered_search: 'Articles filtrats per recèrca :' 170 filtered_search: 'Articles filtrats per recèrca :'
171 untagged: 'Articles sens etiqueta' 171 untagged: 'Articles sens etiqueta'
172 all: 'Totes los articles'
172 list: 173 list:
173 number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles." 174 number_on_the_page: "{0} I a pas cap d'article.|{1} I a un article.|]1,Inf[ I a %count% articles."
174 reading_time: 'durada de lectura' 175 reading_time: 'durada de lectura'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 00c559ed..ab1b3d63 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtrowane po tagach:' 169 filtered_tags: 'Filtrowane po tagach:'
170 filtered_search: 'Filtrowanie po wyszukiwaniu:' 170 filtered_search: 'Filtrowanie po wyszukiwaniu:'
171 untagged: 'Odtaguj wpisy' 171 untagged: 'Odtaguj wpisy'
172 all: 'Wszystkie przedmioty'
172 list: 173 list:
173 number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.' 174 number_on_the_page: '{0} Nie ma wpisów.|{1} Jest jeden wpis.|]1,Inf[ Są %count% wpisy.'
174 reading_time: 'szacunkowy czas czytania' 175 reading_time: 'szacunkowy czas czytania'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 4ab5f144..5c1ae058 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -169,6 +169,7 @@ entry:
169 filtered_tags: 'Filtrar por tags:' 169 filtered_tags: 'Filtrar por tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 untagged: 'Entradas sem tags' 171 untagged: 'Entradas sem tags'
172 # all: 'All entries'
172 list: 173 list:
173 number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.' 174 number_on_the_page: '{0} Não existem entradas.|{1} Existe uma entrada.|]1,Inf[ Existem %count% entradas.'
174 reading_time: 'tempo estimado de leitura' 175 reading_time: 'tempo estimado de leitura'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index f16504ed..0d6f5f8e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -169,6 +169,7 @@ entry:
169 # filtered_tags: 'Filtered by tags:' 169 # filtered_tags: 'Filtered by tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 # untagged: 'Untagged entries' 171 # untagged: 'Untagged entries'
172 # all: 'All entries'
172 list: 173 list:
173 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.' 174 # number_on_the_page: '{0} There is no entry.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
174 reading_time: 'timp estimat de citire' 175 reading_time: 'timp estimat de citire'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 90a140cd..87b5e200 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -169,6 +169,7 @@ entry:
169 # filtered_tags: 'Filtered by tags:' 169 # filtered_tags: 'Filtered by tags:'
170 # filtered_search: 'Filtered by search:' 170 # filtered_search: 'Filtered by search:'
171 # untagged: 'Untagged entries' 171 # untagged: 'Untagged entries'
172 # all: 'All entries'
172 list: 173 list:
173 number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.' 174 number_on_the_page: '{0} Herhangi bir makale yok.|{1} Burada bir adet makale var.|]1,Inf[ Burada %count% adet makale var.'
174 reading_time: 'tahmini okuma süresi' 175 reading_time: 'tahmini okuma süresi'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
index 654c1d2d..5c17e9f7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/_title.html.twig
@@ -5,7 +5,7 @@
5{% elseif currentRoute == 'archive' %} 5{% elseif currentRoute == 'archive' %}
6 {{ 'entry.page_titles.archived'|trans }} 6 {{ 'entry.page_titles.archived'|trans }}
7{% elseif currentRoute == 'all' %} 7{% elseif currentRoute == 'all' %}
8 {{ 'entry.page_titles.filtered'|trans }} 8 {{ isFiltered ? 'entry.page_titles.filtered'|trans : 'entry.page_titles.all'|trans }}
9{% elseif currentRoute == 'search' %} 9{% elseif currentRoute == 'search' %}
10 {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }} 10 {{ 'entry.page_titles.filtered_search'|trans }} {{ filter }}
11{% elseif currentRoute == 'tag_entries' %} 11{% elseif currentRoute == 'tag_entries' %}
diff --git a/src/Wallabag/ImportBundle/Controller/WallabagController.php b/src/Wallabag/ImportBundle/Controller/WallabagController.php
index 7b61805b..6e6524b4 100644
--- a/src/Wallabag/ImportBundle/Controller/WallabagController.php
+++ b/src/Wallabag/ImportBundle/Controller/WallabagController.php
@@ -3,7 +3,9 @@
3namespace Wallabag\ImportBundle\Controller; 3namespace Wallabag\ImportBundle\Controller;
4 4
5use Symfony\Bundle\FrameworkBundle\Controller\Controller; 5use Symfony\Bundle\FrameworkBundle\Controller\Controller;
6use Symfony\Component\HttpFoundation\RedirectResponse;
6use Symfony\Component\HttpFoundation\Request; 7use Symfony\Component\HttpFoundation\Request;
8use Symfony\Component\HttpFoundation\Response;
7use Wallabag\ImportBundle\Form\Type\UploadImportType; 9use Wallabag\ImportBundle\Form\Type\UploadImportType;
8 10
9/** 11/**
diff --git a/src/Wallabag/ImportBundle/Import/BrowserImport.php b/src/Wallabag/ImportBundle/Import/BrowserImport.php
index f1195824..78077324 100644
--- a/src/Wallabag/ImportBundle/Import/BrowserImport.php
+++ b/src/Wallabag/ImportBundle/Import/BrowserImport.php
@@ -4,7 +4,6 @@ namespace Wallabag\ImportBundle\Import;
4 4
5use Wallabag\CoreBundle\Entity\Entry; 5use Wallabag\CoreBundle\Entity\Entry;
6use Wallabag\CoreBundle\Event\EntrySavedEvent; 6use Wallabag\CoreBundle\Event\EntrySavedEvent;
7use Wallabag\UserBundle\Entity\User;
8 7
9abstract class BrowserImport extends AbstractImport 8abstract class BrowserImport extends AbstractImport
10{ 9{
@@ -232,4 +231,6 @@ abstract class BrowserImport extends AbstractImport
232 231
233 return $importedEntry; 232 return $importedEntry;
234 } 233 }
234
235 abstract protected function prepareEntry(array $entry = []);
235} 236}
diff --git a/src/Wallabag/UserBundle/Repository/UserRepository.php b/src/Wallabag/UserBundle/Repository/UserRepository.php
index b1d753d2..75cbeef2 100644
--- a/src/Wallabag/UserBundle/Repository/UserRepository.php
+++ b/src/Wallabag/UserBundle/Repository/UserRepository.php
@@ -3,6 +3,8 @@
3namespace Wallabag\UserBundle\Repository; 3namespace Wallabag\UserBundle\Repository;
4 4
5use Doctrine\ORM\EntityRepository; 5use Doctrine\ORM\EntityRepository;
6use Doctrine\ORM\QueryBuilder;
7use Wallabag\UserBundle\Entity\User;
6 8
7class UserRepository extends EntityRepository 9class UserRepository extends EntityRepository
8{ 10{