Download as
Browse Code »

Commit d1458bd9417a96a736871fb7ff67743f940d176c

Authored by Sergio Oliveira
1 parent 4a3e8b3d
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Updating feedzilla to latest stable version

Showing 3 changed files with 2 additions and 4 deletions   Show diff stats
requirements.txt
  Diff comments   View file @d1458bd
@@ -24,10 +24,9 @@ git+https://github.com/TracyWebTech/django-revproxy/ @@ -24,10 +24,9 @@ git+https://github.com/TracyWebTech/django-revproxy/
24 django-conversejs 24 django-conversejs
25 25
26 # Feedzilla (planet) and deps 26 # Feedzilla (planet) and deps
27 -https://bitbucket.org/lorien/feedzilla/get/tip.tar.gz # Temporarily work around 27 +feedzilla==0.22
28 django-common 28 django-common
29 django-taggit 29 django-taggit
30 -django-taggit-templatetags  
31 feedparser 30 feedparser
32 lxml 31 lxml
33 grab 32 grab
src/colab/custom_settings.py
  Diff comments   View file @d1458bd
@@ -36,7 +36,6 @@ INSTALLED_APPS = INSTALLED_APPS + ( @@ -36,7 +36,6 @@ INSTALLED_APPS = INSTALLED_APPS + (
36 # Feedzilla and deps 36 # Feedzilla and deps
37 'feedzilla', 37 'feedzilla',
38 'taggit', 38 'taggit',
39 - 'taggit_templatetags',  
40 'common', 39 'common',
41 ) 40 )
42 41
src/planet/templates/feedzilla/base.html
  Diff comments   View file @d1458bd
1 {% extends 'base.html' %} 1 {% extends 'base.html' %}
2 -{% load i18n feedzilla_tags taggit_extras %} 2 +{% load i18n feedzilla_tags %}
3 3
4 {% block main-content %} 4 {% block main-content %}
5 <h2>{% trans 'Planet' %}</h2> 5 <h2>{% trans 'Planet' %}</h2>