From: Nicolas LÅ“uillet Date: Fri, 31 Mar 2017 08:53:23 +0000 (+0200) Subject: Added delete button on Baggy theme X-Git-Tag: 2.3.0~31^2~122^2~2 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=9102851f59d960869b210bb26ab0e9c266781c4f;hp=73f28afb19655f1a31d8d840d96deb898ba52763;p=github%2Fwallabag%2Fwallabag.git Added delete button on Baggy theme --- diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php index 23f21c3e..3af53805 100644 --- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php +++ b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php @@ -124,9 +124,10 @@ class AnnotationRepository extends EntityRepository } /** - * Find all annotations related to archived entries + * Find all annotations related to archived entries. * * @param $userId + * * @return mixed */ public function findAllByArchivedEntriesAndUserId($userId) diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 3548f590..01f63a7b 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -199,6 +199,11 @@ {{ 'config.reset.tags'|trans }} +
  • + + {{ 'config.reset.archived'|trans }} + +
  • {{ 'config.reset.entries'|trans }}