Download as
Browse Code »

Commit 212286ef4b21a11a4c5591b2146e9cc1c3886a48

Authored by Marco
2 parents 39d8d0d9 3bce4297
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 https://github.com/interlegis/colab

Showing 3 changed files with 5 additions and 3 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @212286e
... ... @@ -313,7 +313,7 @@ DPASTE_EXPIRE_CHOICES = (
313 313 ('never', _(u'Never')),
314 314 )
315 315 DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]
316   -DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab'
  316 +DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis'
317 317 DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
318 318  
319 319 try:
... ...
src/colab/urls.py
  Diff comments   View file @212286e
... ... @@ -26,6 +26,8 @@ urlpatterns = patterns('',
26 26 url(r'^signup/', include('accounts.urls')), # (same here) TODO: move to nginx
27 27 url(r'^account/', include('accounts.urls')),
28 28  
  29 + url(r'', include('django_browserid.urls')),
  30 +
29 31 url(r'^planet/', include('feedzilla.urls')),
30 32  
31 33 url(r'paste/', include('dpaste.urls.dpaste')),
... ...
src/templates/dpaste/snippet_details.html
  Diff comments   View file @212286e
... ... @@ -74,8 +74,8 @@
74 74 <span class="glyphicon glyphicon-share"></span>
75 75 </i> {% trans "Gist" %}
76 76 </a>
77   - <a href="/pastebin" class="btn btn-primary">
78   - New snippet
  77 + <a href="/paste" class="btn btn-primary">
  78 + New snippet
79 79 <span class="glyphicon glyphicon-arrow-right"></span>
80 80 </a>
81 81 </div>
... ...