Download as
Browse Code »

Commit cb04d56e561279b26566577dc183b1469066826e

Authored by Luan
2 parents cefe623f cc7294a2
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

Merge branch 'master' of github.com:TracyWebTech/colab

Showing 4 changed files with 15 additions and 14 deletions   Show diff stats
fabfile.py
  Diff comments   View file @cb04d56
... ... @@ -70,7 +70,7 @@ def install(local_settings=None):
70 70  
71 71 def update_requirements():
72 72 with cd('~/colab'), prefix(WORKON_COLAB):
73   - run('pip install -r requirements.txt')
  73 + run('pip install -U -r requirements.txt')
74 74  
75 75  
76 76 def deploy(update=False):
... ...
src/colab/custom_settings.py
  Diff comments   View file @cb04d56
... ... @@ -209,6 +209,8 @@ LOCALE_PATHS = (
209 209  
210 210 AUTH_USER_MODEL = 'accounts.User'
211 211  
  212 +ALLOWED_HOSTS = ['colab.interlegis.leg.br']
  213 +
212 214 from django.contrib.messages import constants as messages
213 215 MESSAGE_TAGS = {
214 216 messages.INFO: 'alert-info',
... ... @@ -227,6 +229,8 @@ FEEDZILLA_SITE_DESCRIPTION = gettext(u'Colab blog aggregator')
227 229  
228 230 ### BrowserID / Persona
229 231 SITE_URL = 'https://colab.interlegis.leg.br'
  232 +BROWSERID_AUDIENCES = [SITE_URL]
  233 +
230 234  
231 235 LOGIN_URL = '/'
232 236 LOGIN_REDIRECT_URL = '/'
... ... @@ -235,27 +239,20 @@ LOGOUT_REDIRECT_URL = '/'
235 239 BROWSERID_CREATE_USER = False
236 240  
237 241  
238   -### Apache Solr
239   -#SOLR_HOSTNAME = 'solr.interlegis.leg.br'
240   -SOLR_HOSTNAME = '10.1.2.154'
241   -SOLR_PORT = '8080'
242   -SOLR_SELECT_PATH = '/solr/select'
243   -
244   -SOLR_COLAB_URI = 'http://colab.interlegis.leg.br'
245   -SOLR_BASE_QUERY = """
246   - ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *])
247   -"""
248   -
  242 +## Proxy settings
249 243 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/'
250 244 COLAB_CI_URL = 'http://jenkins.interlegis.leg.br:8080/ci/'
251 245  
252 246 REVPROXY_ADD_REMOTE_USER = True
253 247  
  248 +
  249 +## Converse.js settings
254 250 # This URL must use SSL in order to keep chat sessions secure
255 251 CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
256 252  
257 253 CONVERSEJS_AUTO_REGISTER = 'mensageiro.interlegis.gov.br'
258 254  
  255 +
259 256 try:
260 257 from local_settings import *
261 258 except ImportError:
... ...
src/colab/local_settings-dev.py
  Diff comments   View file @cb04d56
... ... @@ -19,6 +19,8 @@ SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'
19 19  
20 20 SITE_URL = 'http://localhost:8000'
21 21  
  22 +ALLOWED_HOSTS = ['*']
  23 +
22 24 INTERNAL_IPS = ('127.0.0.1', )
23 25  
24 26 CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
... ...
src/planet/templates/feedzilla/index.html
  Diff comments   View file @cb04d56
... ... @@ -8,9 +8,11 @@
8 8 <hr>
9 9 {% empty %}
10 10 <h2>{% trans 'There is no RSS registered' %}</h2>
11   - <h3>{% trans 'Please' %}
12   - href="{% url "feedzilla_submit_blog" %}">{% trans 'click here' %}</a>
  11 + <h3>
  12 + {% trans 'Please' %}
  13 + <a href="{% url "feedzilla_submit_blog" %}">{% trans 'click here' %}</a>
13 14 {% trans 'to submit a blog' %}</h3>
  15 + </h3>
14 16 {% endfor %}
15 17  
16 18 {% include "common/pagination.html" %}
... ...