From 389d55f86b962a448d7a5052a5c0cf438d161c41 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 21 Sep 2016 19:51:19 +0200
Subject: fix feeds not syncing on android app

---
 .../Resources/views/themes/material/Entry/entries.xml.twig     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
index 6cabcf44..288bb54f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
@@ -16,15 +16,7 @@
                 <guid>{{ entry.url }}</guid>
                 <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
                 <description>
-                    <![CDATA[
-                    {%- if entry.readingTime > 0 -%}
-                        {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}
-                    {%- else -%}
-                        {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
-                    {%- endif %}
-
-                    {{ entry.content|raw -}}
-                    ]]>
+                    <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
                 </description>
             </item>
 
-- 
cgit v1.2.3


From 2ff9991a1dfac0d3463662b96f529aac70c66f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Fri, 30 Sep 2016 09:38:08 +0200
Subject: Removed duplicated templates files

---
 .../views/themes/material/Entry/entries.xml.twig   | 26 ----------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig

(limited to 'src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
deleted file mode 100644
index 288bb54f..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.xml.twig
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rss version="2.0" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:media="http://search.yahoo.com/mrss/">
-    <channel>
-        <title>wallabag — {{type}} feed</title>
-        <link>{{ url('unread') }}</link>
-        <pubDate>{{ "now"|date('D, d M Y H:i:s') }}</pubDate>
-        <generator>wallabag</generator>
-        <description>wallabag {{type}} elements</description>
-
-        {% for entry in entries %}
-
-            <item>
-                <title><![CDATA[{{ entry.title }}]]></title>
-                <source url="{{ url('view', { 'id': entry.id }) }}">wallabag</source>
-                <link>{{ entry.url }}</link>
-                <guid>{{ entry.url }}</guid>
-                <pubDate>{{ entry.createdAt|date('D, d M Y H:i:s') }}</pubDate>
-                <description>
-                    <![CDATA[{%- if entry.readingTime > 0 -%}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': entry.readingTime}) }}{%- else -%}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{%- endif %}{{ entry.content|raw -}}]]>
-                </description>
-            </item>
-
-        {% endfor %}
-
-    </channel>
-</rss>
-- 
cgit v1.2.3