From 6da1aebc946e6448dd0d5080ee88e79c2bae4666 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 30 Mar 2017 16:24:59 +0200 Subject: Allow to remove all archived entries Since we still support fucking SQLite, we need to retrieve all tags & annotations for archived entries before deleting them. Signed-off-by: Thomas Citharel --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 5d411fdd..708ff951 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -229,6 +229,9 @@ {{ 'config.reset.tags'|trans }} + + {{ 'config.reset.archived'|trans }} + {{ 'config.reset.entries'|trans }} -- cgit v1.2.3 From fdd725f58cfe96d9bb9454d0347f6ff847fce69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 20 Apr 2017 14:58:20 +0200 Subject: Added notmatches operator for tagging rule --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 708ff951..d6e414e9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -413,8 +413,8 @@ domainName {{ 'config.form_rules.faq.variable_description.domainName'|trans }} - matches - {{ 'config.form_rules.faq.operator_description.matches'|trans|raw }} + matches
notmaches + {{ 'config.form_rules.faq.operator_description.matches'|trans|raw }}
{{ 'config.form_rules.faq.operator_description.notmatches'|trans|raw }} -- cgit v1.2.3 From 17cc3aacb7c059c12eaadf35f53a97e5b8c19b93 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 29 Apr 2017 20:04:54 +0200 Subject: fix theme changes Signed-off-by: Thomas Citharel --- .../Resources/views/themes/material/Config/index.html.twig | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index d6e414e9..de1fca24 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -25,9 +25,9 @@
- {{ form_label(form.config.theme) }} {{ form_errors(form.config.theme) }} {{ form_widget(form.config.theme) }} + {{ form_label(form.config.theme) }}
@@ -38,9 +38,9 @@
- {{ form_label(form.config.items_per_page) }} {{ form_errors(form.config.items_per_page) }} {{ form_widget(form.config.items_per_page) }} + {{ form_label(form.config.items_per_page) }}
@@ -51,9 +51,9 @@
- {{ form_label(form.config.reading_speed) }} {{ form_errors(form.config.reading_speed) }} {{ form_widget(form.config.reading_speed) }} + {{ form_label(form.config.reading_speed) }}

{{ 'config.form_settings.reading_speed.help_message'|trans }} myreadspeed @@ -68,17 +68,17 @@

- {{ form_label(form.config.action_mark_as_read) }} {{ form_errors(form.config.action_mark_as_read) }} {{ form_widget(form.config.action_mark_as_read) }} + {{ form_label(form.config.action_mark_as_read) }}
- {{ form_label(form.config.language) }} {{ form_errors(form.config.language) }} {{ form_widget(form.config.language) }} + {{ form_label(form.config.language) }}
@@ -89,9 +89,9 @@
- {{ form_label(form.config.pocket_consumer_key) }} {{ form_errors(form.config.pocket_consumer_key) }} {{ form_widget(form.config.pocket_consumer_key) }} + {{ form_label(form.config.pocket_consumer_key) }}

» https://getpocket.com/developer/docs/authentication -- cgit v1.2.3 From 34806fab1b26eb626862d45402cb4e265cc0af5b Mon Sep 17 00:00:00 2001 From: Aline Date: Sun, 7 May 2017 15:07:50 +0200 Subject: Fix reviews Signed-off-by: Aline --- .../Resources/views/themes/material/Config/index.html.twig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index de1fca24..9b0816eb 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -132,8 +132,8 @@

-
- +
+
{{ 'config.form_rss.token_label'|trans }}
{% if rss.token %} {{ rss.token }} @@ -151,8 +151,8 @@
{% if rss.token %}
-
- +
+
{{ 'config.form_rss.rss_links'|trans }}
  • {{ 'config.form_rss.rss_link.unread'|trans }}
  • {{ 'config.form_rss.rss_link.starred'|trans }}
    • -- cgit v1.2.3 From f92fcb53ca78cc8822962e676b0db117e1a08aa5 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 4 Dec 2016 13:51:58 +0100 Subject: Add CRUD for site credentials --- .../views/themes/material/Config/index.html.twig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 9b0816eb..1e10bf38 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -66,13 +66,13 @@
-
-
- {{ form_errors(form.config.action_mark_as_read) }} - {{ form_widget(form.config.action_mark_as_read) }} - {{ form_label(form.config.action_mark_as_read) }} +
+
+ {{ form_label(form.config.action_mark_as_read) }} + {{ form_errors(form.config.action_mark_as_read) }} + {{ form_widget(form.config.action_mark_as_read) }} +
-
@@ -254,11 +254,11 @@ {{ form_start(form.pwd) }} {{ form_errors(form.pwd) }} -
-
- {{ 'config.form_password.description'|trans }} +
+
+ {{ 'config.form_password.description'|trans }} +
-
-- cgit v1.2.3 From bd40f1af88979cb5257206d178d26819e350a24c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 20 Jun 2017 18:29:46 +0200 Subject: Add all entries RSS feed and put links on tag page itself and baggy too Signed-off-by: Thomas Citharel --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index 1e10bf38..f290cb49 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -157,6 +157,7 @@
  • {{ 'config.form_rss.rss_link.unread'|trans }}
  • {{ 'config.form_rss.rss_link.starred'|trans }}
  • {{ 'config.form_rss.rss_link.archive'|trans }}
    • +
  • {{ 'config.form_rss.rss_link.all'|trans }}
    • -- cgit v1.2.3 From e2a038d65345a055aab51334a86a6a184631fab2 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 20 Jun 2017 18:43:10 +0200 Subject: Fix translations on QR code instructions --- .../CoreBundle/Resources/views/themes/material/Config/index.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig index f290cb49..a8143315 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig @@ -107,7 +107,7 @@
    {{ 'config.form_settings.android_configuration'|trans }}
    - Touch here to prefill your Android application + {{ 'config.form_settings.android_instruction' | trans }}