Download as
Browse Code »

Commit c8b1f3b15cb4f03519c733cba9b03733fbc39711

Authored by Charles Oliveira
2 parents a9dd3323 500d829d
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 'noosfero-integration' of beta.softwarepublico.gov.br:softwarepubli… 

…co/colab into noosfero-integration

Conflicts:
	colab/proxy/noosfero/views.py
Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
colab/proxy/noosfero/views.py
  Diff comments   View file @c8b1f3b
@@ -7,3 +7,4 @@ from ..utils.views import ColabProxyView @@ -7,3 +7,4 @@ from ..utils.views import ColabProxyView
7 class NoosferoProxyView(ColabProxyView): 7 class NoosferoProxyView(ColabProxyView):
8 app_label = 'noosfero' 8 app_label = 'noosfero'
9 diazo_theme_template = 'proxy/noosfero.html' 9 diazo_theme_template = 'proxy/noosfero.html'
  10 + login_url = '/social/account/login'