Download as
Browse Code »

Commit 6a8eb2a4bb54c4effa5bbdf56a96b478d51b1ea1

Authored by Sergio Oliveira
1 parent ee6a8816
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

Using latest django-browserid

Showing 2 changed files with 5 additions and 2 deletions   Show diff stats
requirements.txt
  Diff comments   View file @6a8eb2a
@@ -18,7 +18,6 @@ django-hitcounter==0.1.1 @@ -18,7 +18,6 @@ django-hitcounter==0.1.1
18 Pillow==2.5.1 18 Pillow==2.5.1
19 django-i18n-model==0.0.7 19 django-i18n-model==0.0.7
20 django-tastypie==0.11.0 20 django-tastypie==0.11.0
21 -django-browserid==0.10.1  
22 21
23 gunicorn==19.1.0 22 gunicorn==19.1.0
24 eventlet==0.15.0 23 eventlet==0.15.0
@@ -28,7 +27,10 @@ raven==3.5.2 @@ -28,7 +27,10 @@ raven==3.5.2
28 tornado==3.1.1 27 tornado==3.1.1
29 28
30 # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9 29 # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
31 -# git+https://github.com/mozilla/django-browserid 30 +
  31 +# Release 0.10.1 has a bug already fixed on 55f0b9b0ebc.
  32 +# django-browserid==0.10.1
  33 +-e git+https://github.com/mozilla/django-browserid.git#egg=django-browserid
32 34
33 django-revproxy==0.2.7 35 django-revproxy==0.2.7
34 36
src/colab/local_settings-dev.py
  Diff comments   View file @6a8eb2a
@@ -18,6 +18,7 @@ EMAIL_SUBJECT_PREFIX = '' @@ -18,6 +18,7 @@ EMAIL_SUBJECT_PREFIX = ''
18 SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj' 18 SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'
19 19
20 SITE_URL = 'http://localhost:8000' 20 SITE_URL = 'http://localhost:8000'
  21 +BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
21 22
22 ALLOWED_HOSTS = ['*'] 23 ALLOWED_HOSTS = ['*']
23 24