Download as
Browse Code »

Commit e35b38bef9bb80dcf4e756234ece292858d4d2c2

Authored by Gustavo Jaruga Cruz
2 parents 3ab32308 1326ae47
Exists in master and in 52 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_members_pagination, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_block_migration, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, kalibro-processor-package, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, review_message, signals_user_noosfero, sisp_catalog_header, sisp_dev_master, software_as_organization, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories, update_softwares_boxes

Merge branch 'removing_namespace' into 'master' 

Removing namespace from plugins settings

See merge request !81
Showing 4 changed files with 2 additions and 4 deletions   Show diff stats
src/colab-spb-plugin/src/colab_spb/apps.py
  Diff comments   View file @e35b38b
... ... @@ -5,3 +5,4 @@ from django.apps import AppConfig
5 5 class SpbAppConfig(AppConfig):
6 6 name = 'colab_spb'
7 7 verbose_name = 'SPB'
  8 + namespace = 'spb'
... ...
src/colab-spb-plugin/tests/plugins.d/gitlab.py
  Diff comments   View file @e35b38b
... ... @@ -14,7 +14,6 @@ upstream = 'localhost'
14 14  
15 15 urls = {
16 16 'include': 'colab_gitlab.urls',
17   - 'namespace': 'gitlab', # TODO: do not allow to change namespace
18 17 'prefix': 'gitlab',
19 18 }
20 19  
... ...
src/colab-spb-plugin/tests/plugins.d/noosfero.py
  Diff comments   View file @e35b38b
... ... @@ -14,7 +14,6 @@ upstream = 'localhost'
14 14  
15 15 urls = {
16 16 'include': 'colab_noosfero.urls',
17   - 'namespace': 'noosfero', # TODO: do not allow to change namespace
18 17 'prefix': 'social',
19 18 }
20 19  
... ...
src/colab-spb-plugin/tests/plugins.d/spb.py
  Diff comments   View file @e35b38b
... ... @@ -6,7 +6,6 @@ verbose_name = "SPB Plugin"
6 6 middlewares = ['colab_spb.middleware.ForceLangMiddleware']
7 7  
8 8 urls = {"include": "colab_spb.urls",
9   - "prefix": '^spb/',
10   - "namespace": "colab_spb"}
  9 + "prefix": '^spb/',}
11 10  
12 11 url = colab_url_factory('colab_spb')
... ...