aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst12
-rw-r--r--src/web/templates/feed_list.html2
-rw-r--r--src/web/views/feed.py2
3 files changed, 8 insertions, 8 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c18cbbcc..d843525a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,13 +2,13 @@
Release History
=================
-current
--------
+7.0 (2016-04-07)
+----------------
New:
- * Redoing entierly the home page with react, JARR is going on toward a one page app;
- * Implementing categorie;
- * The classic crawler is now taking into account updated articles from feeds;
- * Support of HTTP proxy has been removed;
+ * redoing entierly the home page with react;
+ * implementing category;
+ * the classic crawler is now taking into account updated articles from feeds;
+ * support of HTTP proxy has been removed;
* article URL resolving has been removed (wasn't used).
Improvements:
* Code re-arangement: move all code to /src/
diff --git a/src/web/templates/feed_list.html b/src/web/templates/feed_list.html
index 2e7e8e71..093ed631 100644
--- a/src/web/templates/feed_list.html
+++ b/src/web/templates/feed_list.html
@@ -12,7 +12,7 @@
</tr>
</thead>
<tbody>
- {% for feed in feeds|sort(attribute="title") %}
+ {% for feed in feeds %}
<tr {% if not feed.enabled %}class="warning"{% endif %}>
<td>{{ loop.index }}</td>
<td>
diff --git a/src/web/views/feed.py b/src/web/views/feed.py
index 69e093b2..b6e0974a 100644
--- a/src/web/views/feed.py
+++ b/src/web/views/feed.py
@@ -29,7 +29,7 @@ def feeds():
"Lists the subscribed feeds in a table."
art_contr = ArticleController(current_user.id)
return render_template('feeds.html',
- feeds=FeedController(current_user.id).read(),
+ feeds=FeedController(current_user.id).read().order_by('title'),
unread_article_count=art_contr.count_by_feed(readed=False),
article_count=art_contr.count_by_feed())
bgstack15