Download as
Browse Code »

Commit 2b985c3543c440a16f6b8cb8890c858597f8fa64

Authored by Sergio Oliveira
1 parent 25c7190b
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 settings

Showing 2 changed files with 9 additions and 3 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @2b985c3
... ... @@ -22,6 +22,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
22 22 'south',
23 23 'cliauth',
24 24 'django_browserid',
  25 + 'conversejs',
25 26  
26 27 # Own apps
27 28 'super_archives',
... ... @@ -30,7 +31,6 @@ INSTALLED_APPS = INSTALLED_APPS + (
30 31 'colab.deprecated',
31 32 'planet',
32 33 'accounts',
33   - 'conversejs',
34 34  
35 35 # Feedzilla and deps
36 36 'feedzilla',
... ... @@ -97,7 +97,11 @@ LOGGING = {
97 97 'django_browserid': {
98 98 'handlers': ['sentry', 'console'],
99 99 'level': 'DEBUG',
100   - }
  100 + },
  101 + 'boshclient': {
  102 + 'handlers': ['console'],
  103 + 'level': 'DEBUG',
  104 + },
101 105 }
102 106 }
103 107  
... ... @@ -173,6 +177,8 @@ SOLR_BASE_QUERY = """
173 177  
174 178 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/'
175 179  
  180 +CONVERSEJS_BOSH_SERVICE_URL = 'https://bind.opkode.im'
  181 +
176 182 REVPROXY_ADD_REMOTE_USER = True
177 183  
178 184 try:
... ...
src/colab/urls.py
  Diff comments   View file @2b985c3
... ... @@ -27,7 +27,7 @@ urlpatterns = patterns('',
27 27  
28 28 url(r'^planet/', include('feedzilla.urls')),
29 29  
30   - (r'^browserid/', include('django_browserid.urls')),
  30 + url(r'^browserid/', include('django_browserid.urls')),
31 31  
32 32 # Uncomment the next line to enable the admin:
33 33 url(r'^colab/admin/', include(admin.site.urls)),
... ...