aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--src/bootstrap.py (renamed from bootstrap.py)0
-rw-r--r--src/conf.py (renamed from conf.py)0
-rw-r--r--src/conf/conf.cfg-sample (renamed from conf/conf.cfg-sample)0
-rwxr-xr-xsrc/manager.py (renamed from manager.py)0
-rwxr-xr-xsrc/migrations/README (renamed from migrations/README)0
-rw-r--r--src/migrations/alembic.ini (renamed from migrations/alembic.ini)0
-rw-r--r--src/migrations/env.py (renamed from migrations/env.py)0
-rwxr-xr-xsrc/migrations/script.py.mako (renamed from migrations/script.py.mako)0
-rw-r--r--src/migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py (renamed from migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py)0
-rw-r--r--src/migrations/versions/19bdaa6208e_add_icon_column.py (renamed from migrations/versions/19bdaa6208e_add_icon_column.py)0
-rw-r--r--src/migrations/versions/1b750a389c22_remove_email_notification_column.py (renamed from migrations/versions/1b750a389c22_remove_email_notification_column.py)0
-rw-r--r--src/migrations/versions/25ca960a207_mv_icons_from_feed_tbl_to_icon_tbl.py (renamed from migrations/versions/25ca960a207_mv_icons_from_feed_tbl_to_icon_tbl.py)0
-rw-r--r--src/migrations/versions/422da2d0234_adding_filters_field.py (renamed from migrations/versions/422da2d0234_adding_filters_field.py)0
-rw-r--r--src/migrations/versions/48f561c0ce6_add_column_entry_id.py (renamed from migrations/versions/48f561c0ce6_add_column_entry_id.py)0
-rw-r--r--src/migrations/versions/cde34831ea_adding_feed_and_user_attributes_for_.py (renamed from migrations/versions/cde34831ea_adding_feed_and_user_attributes_for_.py)0
-rwxr-xr-xsrc/runserver.py (renamed from runserver.py)0
-rw-r--r--src/scripts/__init__.py (renamed from scripts/__init__.py)0
-rw-r--r--src/scripts/probes.py (renamed from scripts/probes.py)0
-rw-r--r--src/tests/__init__.py (renamed from tests/__init__.py)0
-rw-r--r--src/tests/base.py (renamed from tests/base.py)0
-rw-r--r--src/tests/controllers/__init__.py (renamed from tests/controllers/__init__.py)0
-rw-r--r--src/tests/controllers/article.py (renamed from tests/controllers/article.py)0
-rw-r--r--src/tests/controllers/feed.py (renamed from tests/controllers/feed.py)0
-rw-r--r--src/tests/fixtures.py (renamed from tests/fixtures.py)0
-rw-r--r--src/web/__init__.py (renamed from web/__init__.py)0
-rw-r--r--src/web/controllers/__init__.py (renamed from web/controllers/__init__.py)0
-rw-r--r--src/web/controllers/abstract.py (renamed from web/controllers/abstract.py)0
-rw-r--r--src/web/controllers/article.py (renamed from web/controllers/article.py)0
-rw-r--r--src/web/controllers/feed.py (renamed from web/controllers/feed.py)0
-rw-r--r--src/web/controllers/icon.py (renamed from web/controllers/icon.py)0
-rw-r--r--src/web/controllers/user.py (renamed from web/controllers/user.py)0
-rw-r--r--src/web/crawler.py (renamed from web/crawler.py)0
-rw-r--r--src/web/decorators.py (renamed from web/decorators.py)0
-rw-r--r--src/web/emails.py (renamed from web/emails.py)0
-rw-r--r--src/web/export.py (renamed from web/export.py)0
-rw-r--r--src/web/forms.py (renamed from web/forms.py)0
-rw-r--r--src/web/lib/__init__.py (renamed from web/lib/__init__.py)0
-rw-r--r--src/web/lib/article_utils.py (renamed from web/lib/article_utils.py)0
-rw-r--r--src/web/lib/crawler.py (renamed from web/lib/crawler.py)0
-rw-r--r--src/web/lib/feed_utils.py (renamed from web/lib/feed_utils.py)6
-rw-r--r--src/web/lib/utils.py (renamed from web/lib/utils.py)0
-rw-r--r--src/web/lib/view_utils.py (renamed from web/lib/view_utils.py)0
-rw-r--r--src/web/models/__init__.py (renamed from web/models/__init__.py)0
-rw-r--r--src/web/models/article.py (renamed from web/models/article.py)0
-rw-r--r--src/web/models/feed.py (renamed from web/models/feed.py)0
-rw-r--r--src/web/models/icon.py (renamed from web/models/icon.py)0
-rw-r--r--src/web/models/role.py (renamed from web/models/role.py)0
-rw-r--r--src/web/models/user.py (renamed from web/models/user.py)0
-rw-r--r--src/web/notifications.py (renamed from web/notifications.py)0
-rw-r--r--src/web/static/css/bootstrap-theme.css (renamed from web/static/css/bootstrap-theme.css)0
-rw-r--r--src/web/static/css/bootstrap-theme.css.map (renamed from web/static/css/bootstrap-theme.css.map)0
-rw-r--r--src/web/static/css/bootstrap-theme.min.css (renamed from web/static/css/bootstrap-theme.min.css)0
-rw-r--r--src/web/static/css/bootstrap.css (renamed from web/static/css/bootstrap.css)0
-rw-r--r--src/web/static/css/bootstrap.css.map (renamed from web/static/css/bootstrap.css.map)0
-rw-r--r--src/web/static/css/bootstrap.min.css (renamed from web/static/css/bootstrap.min.css)0
-rw-r--r--src/web/static/css/customized-bootstrap.css (renamed from web/static/css/customized-bootstrap.css)0
-rw-r--r--src/web/static/css/side-nav.css (renamed from web/static/css/side-nav.css)0
-rw-r--r--src/web/static/fonts/glyphicons-halflings-regular.eot (renamed from web/static/fonts/glyphicons-halflings-regular.eot)bin20127 -> 20127 bytes
-rw-r--r--src/web/static/fonts/glyphicons-halflings-regular.svg (renamed from web/static/fonts/glyphicons-halflings-regular.svg)0
-rw-r--r--src/web/static/fonts/glyphicons-halflings-regular.ttf (renamed from web/static/fonts/glyphicons-halflings-regular.ttf)bin45404 -> 45404 bytes
-rw-r--r--src/web/static/fonts/glyphicons-halflings-regular.woff (renamed from web/static/fonts/glyphicons-halflings-regular.woff)bin23424 -> 23424 bytes
-rw-r--r--src/web/static/fonts/glyphicons-halflings-regular.woff2 (renamed from web/static/fonts/glyphicons-halflings-regular.woff2)bin18028 -> 18028 bytes
-rw-r--r--src/web/static/img/favicon.png (renamed from web/static/img/favicon.png)bin6879 -> 6879 bytes
-rw-r--r--src/web/static/img/logo.png (renamed from web/static/img/logo.png)bin6879 -> 6879 bytes
-rw-r--r--src/web/static/img/pinboard.png (renamed from web/static/img/pinboard.png)bin597 -> 597 bytes
-rwxr-xr-xsrc/web/static/img/reddit.png (renamed from web/static/img/reddit.png)bin525 -> 525 bytes
-rw-r--r--src/web/static/img/twitter.png (renamed from web/static/img/twitter.png)bin640 -> 640 bytes
-rw-r--r--src/web/static/js/articles.js (renamed from web/static/js/articles.js)0
-rw-r--r--src/web/static/js/bootstrap.js (renamed from web/static/js/bootstrap.js)0
-rw-r--r--src/web/static/js/bootstrap.min.js (renamed from web/static/js/bootstrap.min.js)0
-rw-r--r--src/web/static/js/feed.js (renamed from web/static/js/feed.js)0
-rw-r--r--src/web/static/js/jquery.js (renamed from web/static/js/jquery.js)0
-rw-r--r--src/web/templates/about.html (renamed from web/templates/about.html)0
-rw-r--r--src/web/templates/admin/create_user.html (renamed from web/templates/admin/create_user.html)0
-rw-r--r--src/web/templates/admin/dashboard.html (renamed from web/templates/admin/dashboard.html)0
-rw-r--r--src/web/templates/admin/user.html (renamed from web/templates/admin/user.html)0
-rw-r--r--src/web/templates/article.html (renamed from web/templates/article.html)0
-rw-r--r--src/web/templates/duplicates.html (renamed from web/templates/duplicates.html)0
-rw-r--r--src/web/templates/edit_feed.html (renamed from web/templates/edit_feed.html)0
-rw-r--r--src/web/templates/emails/new_account.html (renamed from web/templates/emails/new_account.html)0
-rw-r--r--src/web/templates/emails/new_account.txt (renamed from web/templates/emails/new_account.txt)0
-rw-r--r--src/web/templates/emails/new_article.html (renamed from web/templates/emails/new_article.html)0
-rw-r--r--src/web/templates/emails/new_article.txt (renamed from web/templates/emails/new_article.txt)0
-rw-r--r--src/web/templates/errors/404.html (renamed from web/templates/errors/404.html)0
-rw-r--r--src/web/templates/errors/500.html (renamed from web/templates/errors/500.html)0
-rw-r--r--src/web/templates/feed.html (renamed from web/templates/feed.html)0
-rw-r--r--src/web/templates/feed_list.html (renamed from web/templates/feed_list.html)0
-rw-r--r--src/web/templates/feeds.html (renamed from web/templates/feeds.html)0
-rw-r--r--src/web/templates/history.html (renamed from web/templates/history.html)0
-rw-r--r--src/web/templates/home.html (renamed from web/templates/home.html)0
-rw-r--r--src/web/templates/inactives.html (renamed from web/templates/inactives.html)0
-rw-r--r--src/web/templates/layout.html (renamed from web/templates/layout.html)0
-rw-r--r--src/web/templates/login.html (renamed from web/templates/login.html)0
-rw-r--r--src/web/templates/management.html (renamed from web/templates/management.html)0
-rw-r--r--src/web/templates/opml.xml (renamed from web/templates/opml.xml)0
-rw-r--r--src/web/templates/profile.html (renamed from web/templates/profile.html)0
-rw-r--r--src/web/templates/recover.html (renamed from web/templates/recover.html)0
-rw-r--r--src/web/templates/signup.html (renamed from web/templates/signup.html)0
-rw-r--r--src/web/translations/fr/LC_MESSAGES/messages.mo (renamed from web/translations/fr/LC_MESSAGES/messages.mo)bin16842 -> 16842 bytes
-rw-r--r--src/web/translations/fr/LC_MESSAGES/messages.po (renamed from web/translations/fr/LC_MESSAGES/messages.po)0
-rwxr-xr-xsrc/web/utils.py (renamed from web/utils.py)0
-rw-r--r--src/web/var/english-stop-words.txt (renamed from web/var/english-stop-words.txt)0
-rw-r--r--src/web/var/french-stop-words.txt (renamed from web/var/french-stop-words.txt)0
-rwxr-xr-xsrc/web/var/generate-top-words-list.sh (renamed from web/var/generate-top-words-list.sh)0
-rw-r--r--src/web/var/stop_words/english-stop-words-list.txt (renamed from web/var/stop_words/english-stop-words-list.txt)0
-rw-r--r--src/web/var/stop_words/french-stop-words-list.txt (renamed from web/var/stop_words/french-stop-words-list.txt)0
-rw-r--r--src/web/views/__init__.py (renamed from web/views/__init__.py)0
-rw-r--r--src/web/views/api/__init__.py (renamed from web/views/api/__init__.py)0
-rw-r--r--src/web/views/api/article.py (renamed from web/views/api/article.py)0
-rw-r--r--src/web/views/api/common.py (renamed from web/views/api/common.py)0
-rw-r--r--src/web/views/api/feed.py (renamed from web/views/api/feed.py)0
-rw-r--r--src/web/views/article.py (renamed from web/views/article.py)0
-rw-r--r--src/web/views/feed.py (renamed from web/views/feed.py)0
-rw-r--r--src/web/views/icon.py (renamed from web/views/icon.py)0
-rw-r--r--src/web/views/views.py (renamed from web/views/views.py)0
116 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index d4f704d7..65848cc3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,5 @@ eproject.cfg
venv
build
-conf/conf.cfg
+src/conf/conf.cfg
.coverage
diff --git a/bootstrap.py b/src/bootstrap.py
index d790ee2f..d790ee2f 100644
--- a/bootstrap.py
+++ b/src/bootstrap.py
diff --git a/conf.py b/src/conf.py
index 1827a7b3..1827a7b3 100644
--- a/conf.py
+++ b/src/conf.py
diff --git a/conf/conf.cfg-sample b/src/conf/conf.cfg-sample
index be5fc87c..be5fc87c 100644
--- a/conf/conf.cfg-sample
+++ b/src/conf/conf.cfg-sample
diff --git a/manager.py b/src/manager.py
index 5aedbe18..5aedbe18 100755
--- a/manager.py
+++ b/src/manager.py
diff --git a/migrations/README b/src/migrations/README
index 98e4f9c4..98e4f9c4 100755
--- a/migrations/README
+++ b/src/migrations/README
diff --git a/migrations/alembic.ini b/src/migrations/alembic.ini
index f8ed4801..f8ed4801 100644
--- a/migrations/alembic.ini
+++ b/src/migrations/alembic.ini
diff --git a/migrations/env.py b/src/migrations/env.py
index 70961ce2..70961ce2 100644
--- a/migrations/env.py
+++ b/src/migrations/env.py
diff --git a/migrations/script.py.mako b/src/migrations/script.py.mako
index 95702017..95702017 100755
--- a/migrations/script.py.mako
+++ b/src/migrations/script.py.mako
diff --git a/migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py b/src/migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py
index 035646c6..035646c6 100644
--- a/migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py
+++ b/src/migrations/versions/17dcb75f3fe_changed_the_type_of_the_column_last_.py
diff --git a/migrations/versions/19bdaa6208e_add_icon_column.py b/src/migrations/versions/19bdaa6208e_add_icon_column.py
index 2efa376f..2efa376f 100644
--- a/migrations/versions/19bdaa6208e_add_icon_column.py
+++ b/src/migrations/versions/19bdaa6208e_add_icon_column.py
diff --git a/migrations/versions/1b750a389c22_remove_email_notification_column.py b/src/migrations/versions/1b750a389c22_remove_email_notification_column.py
index 71529855..71529855 100644
--- a/migrations/versions/1b750a389c22_remove_email_notification_column.py
+++ b/src/migrations/versions/1b750a389c22_remove_email_notification_column.py
diff --git a/migrations/versions/25ca960a207_mv_icons_from_feed_tbl_to_icon_tbl.py b/src/migrations/versions/25ca960a207_mv_icons_from_feed_tbl_to_icon_tbl.py
index 2c8eeda5..2c8eeda5 100644
--- a/migrations/versions/25ca960a207_mv_icons_from_feed_tbl_to_icon_tbl.py
+++ b/src/migrations/versions/25ca960a207_mv_icons_from_feed_tbl_to_icon_tbl.py
diff --git a/migrations/versions/422da2d0234_adding_filters_field.py b/src/migrations/versions/422da2d0234_adding_filters_field.py
index bcbdf042..bcbdf042 100644
--- a/migrations/versions/422da2d0234_adding_filters_field.py
+++ b/src/migrations/versions/422da2d0234_adding_filters_field.py
diff --git a/migrations/versions/48f561c0ce6_add_column_entry_id.py b/src/migrations/versions/48f561c0ce6_add_column_entry_id.py
index f464849a..f464849a 100644
--- a/migrations/versions/48f561c0ce6_add_column_entry_id.py
+++ b/src/migrations/versions/48f561c0ce6_add_column_entry_id.py
diff --git a/migrations/versions/cde34831ea_adding_feed_and_user_attributes_for_.py b/src/migrations/versions/cde34831ea_adding_feed_and_user_attributes_for_.py
index 116fdaa1..116fdaa1 100644
--- a/migrations/versions/cde34831ea_adding_feed_and_user_attributes_for_.py
+++ b/src/migrations/versions/cde34831ea_adding_feed_and_user_attributes_for_.py
diff --git a/runserver.py b/src/runserver.py
index 8e1e2459..8e1e2459 100755
--- a/runserver.py
+++ b/src/runserver.py
diff --git a/scripts/__init__.py b/src/scripts/__init__.py
index e69de29b..e69de29b 100644
--- a/scripts/__init__.py
+++ b/src/scripts/__init__.py
diff --git a/scripts/probes.py b/src/scripts/probes.py
index 94ca25fc..94ca25fc 100644
--- a/scripts/probes.py
+++ b/src/scripts/probes.py
diff --git a/tests/__init__.py b/src/tests/__init__.py
index e69de29b..e69de29b 100644
--- a/tests/__init__.py
+++ b/src/tests/__init__.py
diff --git a/tests/base.py b/src/tests/base.py
index d6f62583..d6f62583 100644
--- a/tests/base.py
+++ b/src/tests/base.py
diff --git a/tests/controllers/__init__.py b/src/tests/controllers/__init__.py
index 26922c43..26922c43 100644
--- a/tests/controllers/__init__.py
+++ b/src/tests/controllers/__init__.py
diff --git a/tests/controllers/article.py b/src/tests/controllers/article.py
index a62d1a83..a62d1a83 100644
--- a/tests/controllers/article.py
+++ b/src/tests/controllers/article.py
diff --git a/tests/controllers/feed.py b/src/tests/controllers/feed.py
index 6467a5a1..6467a5a1 100644
--- a/tests/controllers/feed.py
+++ b/src/tests/controllers/feed.py
diff --git a/tests/fixtures.py b/src/tests/fixtures.py
index 99f46c37..99f46c37 100644
--- a/tests/fixtures.py
+++ b/src/tests/fixtures.py
diff --git a/web/__init__.py b/src/web/__init__.py
index e69de29b..e69de29b 100644
--- a/web/__init__.py
+++ b/src/web/__init__.py
diff --git a/web/controllers/__init__.py b/src/web/controllers/__init__.py
index ad77fa1d..ad77fa1d 100644
--- a/web/controllers/__init__.py
+++ b/src/web/controllers/__init__.py
diff --git a/web/controllers/abstract.py b/src/web/controllers/abstract.py
index f33d241e..f33d241e 100644
--- a/web/controllers/abstract.py
+++ b/src/web/controllers/abstract.py
diff --git a/web/controllers/article.py b/src/web/controllers/article.py
index 8b6926b7..8b6926b7 100644
--- a/web/controllers/article.py
+++ b/src/web/controllers/article.py
diff --git a/web/controllers/feed.py b/src/web/controllers/feed.py
index 15be8663..15be8663 100644
--- a/web/controllers/feed.py
+++ b/src/web/controllers/feed.py
diff --git a/web/controllers/icon.py b/src/web/controllers/icon.py
index 07c4a4ef..07c4a4ef 100644
--- a/web/controllers/icon.py
+++ b/src/web/controllers/icon.py
diff --git a/web/controllers/user.py b/src/web/controllers/user.py
index 3f96b185..3f96b185 100644
--- a/web/controllers/user.py
+++ b/src/web/controllers/user.py
diff --git a/web/crawler.py b/src/web/crawler.py
index 47ce97ce..47ce97ce 100644
--- a/web/crawler.py
+++ b/src/web/crawler.py
diff --git a/web/decorators.py b/src/web/decorators.py
index 6572b9f4..6572b9f4 100644
--- a/web/decorators.py
+++ b/src/web/decorators.py
diff --git a/web/emails.py b/src/web/emails.py
index 9210c29a..9210c29a 100644
--- a/web/emails.py
+++ b/src/web/emails.py
diff --git a/web/export.py b/src/web/export.py
index f2eac25b..f2eac25b 100644
--- a/web/export.py
+++ b/src/web/export.py
diff --git a/web/forms.py b/src/web/forms.py
index 447a54e9..447a54e9 100644
--- a/web/forms.py
+++ b/src/web/forms.py
diff --git a/web/lib/__init__.py b/src/web/lib/__init__.py
index e69de29b..e69de29b 100644
--- a/web/lib/__init__.py
+++ b/src/web/lib/__init__.py
diff --git a/web/lib/article_utils.py b/src/web/lib/article_utils.py
index 02ca2cd1..02ca2cd1 100644
--- a/web/lib/article_utils.py
+++ b/src/web/lib/article_utils.py
diff --git a/web/lib/crawler.py b/src/web/lib/crawler.py
index 90a268e8..90a268e8 100644
--- a/web/lib/crawler.py
+++ b/src/web/lib/crawler.py
diff --git a/web/lib/feed_utils.py b/src/web/lib/feed_utils.py
index f39fe693..f3b18224 100644
--- a/web/lib/feed_utils.py
+++ b/src/web/lib/feed_utils.py
@@ -47,7 +47,11 @@ def construct_feed_from(url=None, fp_parsed=None, feed=None, query_site=True):
or all(bool(feed.get(k)) for k in ('link', 'title', 'icon_url')):
return feed
- response = requests.get(feed['site_link'], verify=False)
+ try:
+ response = requests.get(feed['site_link'], verify=False)
+ except Exception:
+ logger.exception('failed to retreive %r', feed['site_link'])
+ return feed
bs_parsed = BeautifulSoup(response.content, 'html.parser',
parse_only=SoupStrainer('head'))
diff --git a/web/lib/utils.py b/src/web/lib/utils.py
index aa552a12..aa552a12 100644
--- a/web/lib/utils.py
+++ b/src/web/lib/utils.py
diff --git a/web/lib/view_utils.py b/src/web/lib/view_utils.py
index d4c119da..d4c119da 100644
--- a/web/lib/view_utils.py
+++ b/src/web/lib/view_utils.py
diff --git a/web/models/__init__.py b/src/web/models/__init__.py
index 54168279..54168279 100644
--- a/web/models/__init__.py
+++ b/src/web/models/__init__.py
diff --git a/web/models/article.py b/src/web/models/article.py
index c25d09d9..c25d09d9 100644
--- a/web/models/article.py
+++ b/src/web/models/article.py
diff --git a/web/models/feed.py b/src/web/models/feed.py
index 59456a7f..59456a7f 100644
--- a/web/models/feed.py
+++ b/src/web/models/feed.py
diff --git a/web/models/icon.py b/src/web/models/icon.py
index 22ef1164..22ef1164 100644
--- a/web/models/icon.py
+++ b/src/web/models/icon.py
diff --git a/web/models/role.py b/src/web/models/role.py
index a9184d64..a9184d64 100644
--- a/web/models/role.py
+++ b/src/web/models/role.py
diff --git a/web/models/user.py b/src/web/models/user.py
index c5e70036..c5e70036 100644
--- a/web/models/user.py
+++ b/src/web/models/user.py
diff --git a/web/notifications.py b/src/web/notifications.py
index 6f920672..6f920672 100644
--- a/web/notifications.py
+++ b/src/web/notifications.py
diff --git a/web/static/css/bootstrap-theme.css b/src/web/static/css/bootstrap-theme.css
index b0fdfcbf..b0fdfcbf 100644
--- a/web/static/css/bootstrap-theme.css
+++ b/src/web/static/css/bootstrap-theme.css
diff --git a/web/static/css/bootstrap-theme.css.map b/src/web/static/css/bootstrap-theme.css.map
index 5a12d631..5a12d631 100644
--- a/web/static/css/bootstrap-theme.css.map
+++ b/src/web/static/css/bootstrap-theme.css.map
diff --git a/web/static/css/bootstrap-theme.min.css b/src/web/static/css/bootstrap-theme.min.css
index cefa3d1a..cefa3d1a 100644
--- a/web/static/css/bootstrap-theme.min.css
+++ b/src/web/static/css/bootstrap-theme.min.css
diff --git a/web/static/css/bootstrap.css b/src/web/static/css/bootstrap.css
index 686809a5..686809a5 100644
--- a/web/static/css/bootstrap.css
+++ b/src/web/static/css/bootstrap.css
diff --git a/web/static/css/bootstrap.css.map b/src/web/static/css/bootstrap.css.map
index 2fd84f36..2fd84f36 100644
--- a/web/static/css/bootstrap.css.map
+++ b/src/web/static/css/bootstrap.css.map
diff --git a/web/static/css/bootstrap.min.css b/src/web/static/css/bootstrap.min.css
index cd1c616a..cd1c616a 100644
--- a/web/static/css/bootstrap.min.css
+++ b/src/web/static/css/bootstrap.min.css
diff --git a/web/static/css/customized-bootstrap.css b/src/web/static/css/customized-bootstrap.css
index 9f3febfc..9f3febfc 100644
--- a/web/static/css/customized-bootstrap.css
+++ b/src/web/static/css/customized-bootstrap.css
diff --git a/web/static/css/side-nav.css b/src/web/static/css/side-nav.css
index 5786bffa..5786bffa 100644
--- a/web/static/css/side-nav.css
+++ b/src/web/static/css/side-nav.css
diff --git a/web/static/fonts/glyphicons-halflings-regular.eot b/src/web/static/fonts/glyphicons-halflings-regular.eot
index b93a4953..b93a4953 100644
--- a/web/static/fonts/glyphicons-halflings-regular.eot
+++ b/src/web/static/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/web/static/fonts/glyphicons-halflings-regular.svg b/src/web/static/fonts/glyphicons-halflings-regular.svg
index 94fb5490..94fb5490 100644
--- a/web/static/fonts/glyphicons-halflings-regular.svg
+++ b/src/web/static/fonts/glyphicons-halflings-regular.svg
diff --git a/web/static/fonts/glyphicons-halflings-regular.ttf b/src/web/static/fonts/glyphicons-halflings-regular.ttf
index 1413fc60..1413fc60 100644
--- a/web/static/fonts/glyphicons-halflings-regular.ttf
+++ b/src/web/static/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/web/static/fonts/glyphicons-halflings-regular.woff b/src/web/static/fonts/glyphicons-halflings-regular.woff
index 9e612858..9e612858 100644
--- a/web/static/fonts/glyphicons-halflings-regular.woff
+++ b/src/web/static/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/web/static/fonts/glyphicons-halflings-regular.woff2 b/src/web/static/fonts/glyphicons-halflings-regular.woff2
index 64539b54..64539b54 100644
--- a/web/static/fonts/glyphicons-halflings-regular.woff2
+++ b/src/web/static/fonts/glyphicons-halflings-regular.woff2
Binary files differ
diff --git a/web/static/img/favicon.png b/src/web/static/img/favicon.png
index d4d38473..d4d38473 100644
--- a/web/static/img/favicon.png
+++ b/src/web/static/img/favicon.png
Binary files differ
diff --git a/web/static/img/logo.png b/src/web/static/img/logo.png
index d4d38473..d4d38473 100644
--- a/web/static/img/logo.png
+++ b/src/web/static/img/logo.png
Binary files differ
diff --git a/web/static/img/pinboard.png b/src/web/static/img/pinboard.png
index 6dddc10b..6dddc10b 100644
--- a/web/static/img/pinboard.png
+++ b/src/web/static/img/pinboard.png
Binary files differ
diff --git a/web/static/img/reddit.png b/src/web/static/img/reddit.png
index 2d615f2a..2d615f2a 100755
--- a/web/static/img/reddit.png
+++ b/src/web/static/img/reddit.png
Binary files differ
diff --git a/web/static/img/twitter.png b/src/web/static/img/twitter.png
index fc11c4ce..fc11c4ce 100644
--- a/web/static/img/twitter.png
+++ b/src/web/static/img/twitter.png
Binary files differ
diff --git a/web/static/js/articles.js b/src/web/static/js/articles.js
index 350723a4..350723a4 100644
--- a/web/static/js/articles.js
+++ b/src/web/static/js/articles.js
diff --git a/web/static/js/bootstrap.js b/src/web/static/js/bootstrap.js
index 1c88b71e..1c88b71e 100644
--- a/web/static/js/bootstrap.js
+++ b/src/web/static/js/bootstrap.js
diff --git a/web/static/js/bootstrap.min.js b/src/web/static/js/bootstrap.min.js
index c8f82e59..c8f82e59 100644
--- a/web/static/js/bootstrap.min.js
+++ b/src/web/static/js/bootstrap.min.js
diff --git a/web/static/js/feed.js b/src/web/static/js/feed.js
index ceef58fc..ceef58fc 100644
--- a/web/static/js/feed.js
+++ b/src/web/static/js/feed.js
diff --git a/web/static/js/jquery.js b/src/web/static/js/jquery.js
index e5ace116..e5ace116 100644
--- a/web/static/js/jquery.js
+++ b/src/web/static/js/jquery.js
diff --git a/web/templates/about.html b/src/web/templates/about.html
index 8d042077..8d042077 100644
--- a/web/templates/about.html
+++ b/src/web/templates/about.html
diff --git a/web/templates/admin/create_user.html b/src/web/templates/admin/create_user.html
index 64387dce..64387dce 100644
--- a/web/templates/admin/create_user.html
+++ b/src/web/templates/admin/create_user.html
diff --git a/web/templates/admin/dashboard.html b/src/web/templates/admin/dashboard.html
index 25bd3883..25bd3883 100644
--- a/web/templates/admin/dashboard.html
+++ b/src/web/templates/admin/dashboard.html
diff --git a/web/templates/admin/user.html b/src/web/templates/admin/user.html
index d1e08c0d..d1e08c0d 100644
--- a/web/templates/admin/user.html
+++ b/src/web/templates/admin/user.html
diff --git a/web/templates/article.html b/src/web/templates/article.html
index b1f950b4..b1f950b4 100644
--- a/web/templates/article.html
+++ b/src/web/templates/article.html
diff --git a/web/templates/duplicates.html b/src/web/templates/duplicates.html
index 32fbdf9a..32fbdf9a 100644
--- a/web/templates/duplicates.html
+++ b/src/web/templates/duplicates.html
diff --git a/web/templates/edit_feed.html b/src/web/templates/edit_feed.html
index 68da0d48..68da0d48 100644
--- a/web/templates/edit_feed.html
+++ b/src/web/templates/edit_feed.html
diff --git a/web/templates/emails/new_account.html b/src/web/templates/emails/new_account.html
index 5b173e7e..5b173e7e 100644
--- a/web/templates/emails/new_account.html
+++ b/src/web/templates/emails/new_account.html
diff --git a/web/templates/emails/new_account.txt b/src/web/templates/emails/new_account.txt
index 6397f502..6397f502 100644
--- a/web/templates/emails/new_account.txt
+++ b/src/web/templates/emails/new_account.txt
diff --git a/web/templates/emails/new_article.html b/src/web/templates/emails/new_article.html
index 5a6b7c4a..5a6b7c4a 100644
--- a/web/templates/emails/new_article.html
+++ b/src/web/templates/emails/new_article.html
diff --git a/web/templates/emails/new_article.txt b/src/web/templates/emails/new_article.txt
index 9b800855..9b800855 100644
--- a/web/templates/emails/new_article.txt
+++ b/src/web/templates/emails/new_article.txt
diff --git a/web/templates/errors/404.html b/src/web/templates/errors/404.html
index c64a2be8..c64a2be8 100644
--- a/web/templates/errors/404.html
+++ b/src/web/templates/errors/404.html
diff --git a/web/templates/errors/500.html b/src/web/templates/errors/500.html
index 417fc0c7..417fc0c7 100644
--- a/web/templates/errors/500.html
+++ b/src/web/templates/errors/500.html
diff --git a/web/templates/feed.html b/src/web/templates/feed.html
index c421a411..c421a411 100644
--- a/web/templates/feed.html
+++ b/src/web/templates/feed.html
diff --git a/web/templates/feed_list.html b/src/web/templates/feed_list.html
index c5cadab0..c5cadab0 100644
--- a/web/templates/feed_list.html
+++ b/src/web/templates/feed_list.html
diff --git a/web/templates/feeds.html b/src/web/templates/feeds.html
index 9ba16359..9ba16359 100644
--- a/web/templates/feeds.html
+++ b/src/web/templates/feeds.html
diff --git a/web/templates/history.html b/src/web/templates/history.html
index 6be54d71..6be54d71 100644
--- a/web/templates/history.html
+++ b/src/web/templates/history.html
diff --git a/web/templates/home.html b/src/web/templates/home.html
index 86d96e94..86d96e94 100644
--- a/web/templates/home.html
+++ b/src/web/templates/home.html
diff --git a/web/templates/inactives.html b/src/web/templates/inactives.html
index eb546eca..eb546eca 100644
--- a/web/templates/inactives.html
+++ b/src/web/templates/inactives.html
diff --git a/web/templates/layout.html b/src/web/templates/layout.html
index 3a10f2d6..3a10f2d6 100644
--- a/web/templates/layout.html
+++ b/src/web/templates/layout.html
diff --git a/web/templates/login.html b/src/web/templates/login.html
index c37d6937..c37d6937 100644
--- a/web/templates/login.html
+++ b/src/web/templates/login.html
diff --git a/web/templates/management.html b/src/web/templates/management.html
index 72259551..72259551 100644
--- a/web/templates/management.html
+++ b/src/web/templates/management.html
diff --git a/web/templates/opml.xml b/src/web/templates/opml.xml
index 96fe66f5..96fe66f5 100644
--- a/web/templates/opml.xml
+++ b/src/web/templates/opml.xml
diff --git a/web/templates/profile.html b/src/web/templates/profile.html
index acd593b2..acd593b2 100644
--- a/web/templates/profile.html
+++ b/src/web/templates/profile.html
diff --git a/web/templates/recover.html b/src/web/templates/recover.html
index c1176d55..c1176d55 100644
--- a/web/templates/recover.html
+++ b/src/web/templates/recover.html
diff --git a/web/templates/signup.html b/src/web/templates/signup.html
index 3962c42a..3962c42a 100644
--- a/web/templates/signup.html
+++ b/src/web/templates/signup.html
diff --git a/web/translations/fr/LC_MESSAGES/messages.mo b/src/web/translations/fr/LC_MESSAGES/messages.mo
index c7135b4c..c7135b4c 100644
--- a/web/translations/fr/LC_MESSAGES/messages.mo
+++ b/src/web/translations/fr/LC_MESSAGES/messages.mo
Binary files differ
diff --git a/web/translations/fr/LC_MESSAGES/messages.po b/src/web/translations/fr/LC_MESSAGES/messages.po
index 785f1d47..785f1d47 100644
--- a/web/translations/fr/LC_MESSAGES/messages.po
+++ b/src/web/translations/fr/LC_MESSAGES/messages.po
diff --git a/web/utils.py b/src/web/utils.py
index 91e2bd9f..91e2bd9f 100755
--- a/web/utils.py
+++ b/src/web/utils.py
diff --git a/web/var/english-stop-words.txt b/src/web/var/english-stop-words.txt
index 497a1f96..497a1f96 100644
--- a/web/var/english-stop-words.txt
+++ b/src/web/var/english-stop-words.txt
diff --git a/web/var/french-stop-words.txt b/src/web/var/french-stop-words.txt
index 08a2f5d7..08a2f5d7 100644
--- a/web/var/french-stop-words.txt
+++ b/src/web/var/french-stop-words.txt
diff --git a/web/var/generate-top-words-list.sh b/src/web/var/generate-top-words-list.sh
index 2a87e147..2a87e147 100755
--- a/web/var/generate-top-words-list.sh
+++ b/src/web/var/generate-top-words-list.sh
diff --git a/web/var/stop_words/english-stop-words-list.txt b/src/web/var/stop_words/english-stop-words-list.txt
index caa26aaf..caa26aaf 100644
--- a/web/var/stop_words/english-stop-words-list.txt
+++ b/src/web/var/stop_words/english-stop-words-list.txt
diff --git a/web/var/stop_words/french-stop-words-list.txt b/src/web/var/stop_words/french-stop-words-list.txt
index a6a36c79..a6a36c79 100644
--- a/web/var/stop_words/french-stop-words-list.txt
+++ b/src/web/var/stop_words/french-stop-words-list.txt
diff --git a/web/views/__init__.py b/src/web/views/__init__.py
index 36d382bd..36d382bd 100644
--- a/web/views/__init__.py
+++ b/src/web/views/__init__.py
diff --git a/web/views/api/__init__.py b/src/web/views/api/__init__.py
index 24472ebe..24472ebe 100644
--- a/web/views/api/__init__.py
+++ b/src/web/views/api/__init__.py
diff --git a/web/views/api/article.py b/src/web/views/api/article.py
index 51844b20..51844b20 100644
--- a/web/views/api/article.py
+++ b/src/web/views/api/article.py
diff --git a/web/views/api/common.py b/src/web/views/api/common.py
index 3476cad9..3476cad9 100644
--- a/web/views/api/common.py
+++ b/src/web/views/api/common.py
diff --git a/web/views/api/feed.py b/src/web/views/api/feed.py
index 2bb9814f..2bb9814f 100644
--- a/web/views/api/feed.py
+++ b/src/web/views/api/feed.py
diff --git a/web/views/article.py b/src/web/views/article.py
index bb914a6b..bb914a6b 100644
--- a/web/views/article.py
+++ b/src/web/views/article.py
diff --git a/web/views/feed.py b/src/web/views/feed.py
index 2a9b2da8..2a9b2da8 100644
--- a/web/views/feed.py
+++ b/src/web/views/feed.py
diff --git a/web/views/icon.py b/src/web/views/icon.py
index 895b4740..895b4740 100644
--- a/web/views/icon.py
+++ b/src/web/views/icon.py
diff --git a/web/views/views.py b/src/web/views/views.py
index ed4ae8a7..ed4ae8a7 100644
--- a/web/views/views.py
+++ b/src/web/views/views.py
bgstack15