From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 8 Mar 2016 17:02:34 +0100 Subject: manage assets through npm first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version --- .../views/themes/material/Entry/entries.html.twig | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 1d569226..98616635 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -32,7 +32,7 @@
{% if not entry.previewPicture is null %} - + more_vert {% endif %} {{ entry.title|striptags|slice(0, 42)|raw }} @@ -56,7 +56,7 @@ {% if not entry.previewPicture is null %}
- + clear {{ entry.title|raw }}
@@ -74,11 +74,11 @@ {{ entry.domainName|removeWww|truncate(18) }} -
@@ -126,6 +126,11 @@ {{ form_label(form.isStarred) }}
+
+ {{ form_widget(form.isUnread) }} + {{ form_label(form.isUnread) }} +
+
-- cgit v1.2.3 From 25dc07d3c9d88dcb84444d69fd0b4822315c3fac Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 23 Jun 2016 09:06:54 +0200 Subject: Add tags on entries view Should be tested on old browsers --- .../views/themes/material/Entry/entries.html.twig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 98616635..d245c8fd 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -26,6 +26,11 @@
{% if not entry.previewPicture is null %}
+
    + {% for tag in entry.tags | slice(0, 3) %} +
  • {{ tag.label }}
    • + {% endfor %} +
{% endif %} @@ -50,6 +55,11 @@ {% if entry.previewPicture is null %}

{{ entry.content|striptags|slice(0, 300)|raw }}…

+
    + {% for tag in entry.tags | slice(0, 2) %} +
  • {{ tag.label }}
    • + {% endfor %} +
{% endif %}
@@ -66,6 +76,15 @@

{{ entry.content|striptags|slice(0, 300)|raw }}…

+ + + {% if entry.tags | length > 2 %} + {{ 'entry.list.number_of_tags'|transchoice(entry.tags | length - 2) }} + {% endif %} {% endif %} -- cgit v1.2.3 From a15022db96fb031f7a9bccbdcc9420a8ca94174c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 23 Jun 2016 23:13:25 +0200 Subject: minor ui fixes --- .../Resources/views/themes/material/Entry/entries.html.twig | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index d245c8fd..d1cadea9 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -40,7 +40,7 @@ more_vert {% endif %} - {{ entry.title|striptags|slice(0, 42)|raw }} + {{ entry.title|striptags|raw }}
@@ -78,13 +78,10 @@

{{ entry.content|striptags|slice(0, 300)|raw }}…

    - {% for tag in entry.tags | slice(0, 2) %} + {% for tag in entry.tags %}
  • {{ tag.label }}
    • {% endfor %}
- {% if entry.tags | length > 2 %} - {{ 'entry.list.number_of_tags'|transchoice(entry.tags | length - 2) }} - {% endif %}
{% endif %} -- cgit v1.2.3 From 1d4d9aaf2971e5b4d00a28f935c815e88bcf1487 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Fri, 1 Jul 2016 13:59:30 +0200 Subject: Bring tags on entries view to baggy Also, a couple of UI improvement and CSS fixing --- .../CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index d1cadea9..e9a2b183 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -77,7 +77,7 @@

{{ entry.content|striptags|slice(0, 300)|raw }}…

-
    +
      {% for tag in entry.tags %}
    • {{ tag.label }}
      • {% endfor %} -- cgit v1.2.3 From 891456ba9a592a200d8b23029e8f4514d9803080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 14 Apr 2016 15:03:22 +0200 Subject: Links on each tag in Tags view --- .../Resources/views/themes/material/Entry/entries.html.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index eca8924e..a0a0b02f 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -122,6 +122,7 @@ + {% if form is not null %}
      @@ -205,5 +206,6 @@
      - {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} + {% endif %} + {% endblock %} -- cgit v1.2.3 From 371bcca0f6b18951a15e56daae5bca2558c01851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 20 Apr 2016 10:04:32 +0200 Subject: Translations and baggy view for tags --- .../CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index a0a0b02f..2a972e1c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -9,10 +9,11 @@ {{ 'entry.page_titles.archived'|trans }} {% elseif currentRoute == 'all' %} {{ 'entry.page_titles.filtered'|trans }} + {% elseif currentRoute == 'tag_entries' %} + {{ 'entry.page_titles.filtered_tags'|trans }} {% else %} {{ 'entry.page_titles.unread'|trans }} {% endif %} - {% endblock %} {% block content %} -- cgit v1.2.3 From 74d68fbf25e313ef5cc8af17812387a8ae813df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 26 Aug 2016 21:26:21 +0200 Subject: Changed where page title is displayed --- .../views/themes/material/Entry/entries.html.twig | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 2a972e1c..a061bdc3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -1,19 +1,7 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% set currentRoute = app.request.attributes.get('_route') %} - - {% if currentRoute == 'starred' %} - {{ 'entry.page_titles.starred'|trans }} - {% elseif currentRoute == 'archive' %} - {{ 'entry.page_titles.archived'|trans }} - {% elseif currentRoute == 'all' %} - {{ 'entry.page_titles.filtered'|trans }} - {% elseif currentRoute == 'tag_entries' %} - {{ 'entry.page_titles.filtered_tags'|trans }} - {% else %} - {{ 'entry.page_titles.unread'|trans }} - {% endif %} + {% include "@WallabagCore/themes/_title.html.twig" %} {% endblock %} {% block content %} -- cgit v1.2.3 From c146f6940a176142084b4fc3c610d13aca60d90e Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 28 Sep 2016 10:30:18 +0200 Subject: Assets work * ES6 all the things ! * ESLint checks everything * CSS fixes (use stylelint) * Fix #2231 --- .../CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 806a4eef..1c5057dd 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -66,7 +66,7 @@

      {{ entry.content|striptags|slice(0, 300)|raw }}…

      -
        +
          {% for tag in entry.tags %}
        • {{ tag.label }}
          • {% endfor %} -- cgit v1.2.3 From 2ff9991a1dfac0d3463662b96f529aac70c66f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 30 Sep 2016 09:38:08 +0200 Subject: Removed duplicated templates files --- .../CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 806a4eef..e889dea8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -1,7 +1,7 @@ {% extends "WallabagCoreBundle::layout.html.twig" %} {% block title %} - {% include "@WallabagCore/themes/_title.html.twig" %} + {% include "@WallabagCore/themes/common/Entry/_title.html.twig" %} {% endblock %} {% block content %} -- cgit v1.2.3 From 15f1352ef8761d3e083fc17c8354c30ca3542050 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 5 Oct 2016 14:06:55 +0200 Subject: better tags on material --- .../Resources/views/themes/material/Entry/entries.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 01fde953..55b3ee5c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -17,7 +17,7 @@
            {% for tag in entry.tags | slice(0, 3) %} -
          • {{ tag.label }}
            • +
          • {{ tag.label }}
            • {% endfor %}
          @@ -46,7 +46,7 @@

          {{ entry.content|striptags|slice(0, 300)|raw }}…

            {% for tag in entry.tags | slice(0, 2) %} -
          • {{ tag.label }}
            • +
          • {{ tag.label }}
            • {% endfor %}
          {% endif %} @@ -68,7 +68,7 @@
            {% for tag in entry.tags %} -
          • {{ tag.label }}
            • +
          • {{ tag.label }}
            • {% endfor %}
          -- cgit v1.2.3 From c5e4293efdff9c32d9b37865ae127c8f99f7020e Mon Sep 17 00:00:00 2001 From: Krzysztof Szafranek Date: Sun, 9 Oct 2016 03:37:21 +0200 Subject: Fix few invalid HTML tags --- .../CoreBundle/Resources/views/themes/material/Entry/entries.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig') diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index 55b3ee5c..919f94ec 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -77,7 +77,7 @@
          {{ entry.domainName|removeWww|truncate(18) }} - +
          • -- cgit v1.2.3