commited features for showroom release

sites/all/modules/features/showroom/showroom.info

@@ -6,15 +6,16 @@ dependencies[] = administerusersbyrole
 dependencies[] = cck_phone
 dependencies[] = ctools
 dependencies[] = email
+dependencies[] = entity
 dependencies[] = features
-dependencies[] = field_collection
+dependencies[] = features_translations
+dependencies[] = field_extrawidgets
 dependencies[] = field_group
 dependencies[] = field_permissions
 dependencies[] = materio_content_types
 dependencies[] = materio_page_title
 dependencies[] = materio_showroom
 dependencies[] = materio_subscriptions
-dependencies[] = materio_user_profiles
 dependencies[] = menu
 dependencies[] = metatag
 dependencies[] = node
@@ -30,17 +31,12 @@ dependencies[] = tode
 features[ctools][] = field_group:field_group:1
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
-features[field_base][] = description_field
+features[field_base][] = field_location
 features[field_base][] = field_showroom
-features[field_base][] = field_showroom_localisation
-features[field_base][] = field_showroom_localisation_loca
-features[field_base][] = field_showroom_localisation_show
 features[field_base][] = field_tode_showroom
 features[field_group][] = group_showroom|node|materiau|form
-features[field_group][] = group_side6|node|materiau|cardmedium
-features[field_instance][] = field_collection_item-field_showroom_localisation-field_showroom_localisation_loca
-features[field_instance][] = field_collection_item-field_showroom_localisation-field_showroom_localisation_show
-features[field_instance][] = node-materiau-field_showroom_localisation
+features[field_instance][] = node-breve-field_showroom
+features[field_instance][] = node-materiau-field_location
 features[field_instance][] = node-showroom-body
 features[field_instance][] = node-showroom-field_memo
 features[field_instance][] = node-showroom-field_public_address
@@ -54,10 +50,9 @@ features[menu_links][] = navigation_showroom:node/add/showroom
 features[node][] = showroom
 features[rules_config][] = rules_auto_tag_news_with_showroom
 features[taxonomy][] = showroom
-features[user_permission][] = assign Showroom role
+features[user_permission][] = assign Admin showroom role
+features[user_permission][] = create field_location
 features[user_permission][] = create field_showroom
-features[user_permission][] = create field_showroom_localisation
-features[user_permission][] = create field_showroom_localisation_show
 features[user_permission][] = create field_tode_showroom
 features[user_permission][] = create showroom content
 features[user_permission][] = delete any showroom content
@@ -65,18 +60,17 @@ features[user_permission][] = delete own showroom content
 features[user_permission][] = delete terms in showroom
 features[user_permission][] = delete users with role 13
 features[user_permission][] = edit any showroom content
+features[user_permission][] = edit field_location
 features[user_permission][] = edit field_showroom
-features[user_permission][] = edit field_showroom_localisation
-features[user_permission][] = edit field_showroom_localisation_show
 features[user_permission][] = edit field_tode_showroom
+features[user_permission][] = edit own field_location
 features[user_permission][] = edit own field_showroom
-features[user_permission][] = edit own field_showroom_localisation
-features[user_permission][] = edit own field_showroom_localisation_show
 features[user_permission][] = edit own field_tode_showroom
 features[user_permission][] = edit own showroom content
 features[user_permission][] = edit terms in showroom
 features[user_permission][] = edit users with role 13
 features[user_permission][] = enter showroom revision log entry
+features[user_permission][] = materio showroom migrate fields
 features[user_permission][] = merge showroom terms
 features[user_permission][] = override showroom authored by option
 features[user_permission][] = override showroom authored on option
@@ -85,15 +79,13 @@ features[user_permission][] = override showroom published option
 features[user_permission][] = override showroom revision option
 features[user_permission][] = override showroom sticky option
 features[user_permission][] = show showroom title
+features[user_permission][] = view field_location
 features[user_permission][] = view field_showroom
-features[user_permission][] = view field_showroom_localisation
-features[user_permission][] = view field_showroom_localisation_show
 features[user_permission][] = view field_tode_showroom
+features[user_permission][] = view own field_location
 features[user_permission][] = view own field_showroom
-features[user_permission][] = view own field_showroom_localisation
-features[user_permission][] = view own field_showroom_localisation_show
 features[user_permission][] = view own field_tode_showroom
-features[user_role][] = Showroom
+features[user_role][] = Admin showroom
 features[variable][] = additional_settings__active_tab_showroom
 features[variable][] = ant_pattern_showroom
 features[variable][] = ant_php_showroom
@@ -106,11 +98,16 @@ features[variable][] = diff_show_preview_changes_node_showroom
 features[variable][] = diff_view_mode_preview_node_showroom
 features[variable][] = entity_translation_hide_translation_links_showroom
 features[variable][] = entity_translation_node_metadata_showroom
-features[variable][] = field_bundle_settings_field_collection_item__field_showroom_localisation
+features[variable][] = entity_translation_settings_node__showroom
 features[variable][] = field_bundle_settings_node__showroom
 features[variable][] = i18n_node_extended_showroom
 features[variable][] = i18n_node_options_showroom
 features[variable][] = language_content_type_showroom
+features[variable][] = materio_showroom_migrate_default_term
+features[variable][] = materio_showroom_migrate_node_type
+features[variable][] = materio_showroom_migrate_source_field
+features[variable][] = materio_showroom_migrate_target_field
+features[variable][] = materio_showroom_migrate_vocabulary
 features[variable][] = menu_options_showroom
 features[variable][] = menu_parent_showroom
 features[variable][] = metatag_enable_node__showroom
@@ -128,4 +125,32 @@ features[variable][] = unique_field_comp_showroom
 features[variable][] = unique_field_fields_showroom
 features[variable][] = unique_field_scope_showroom
 features[variable][] = unique_field_show_matches_showroom
+features[variable][] = workflow_showroom
+features_exclude[field_base][field_memo] = field_memo
+features_exclude[field_base][field_public_phone] = field_public_phone
+features_exclude[field_base][field_public_address] = field_public_address
+features_exclude[field_base][field_public_email] = field_public_email
+features_exclude[field_base][name_field] = name_field
+features_exclude[field_base][description_field] = description_field
+features_exclude[user_permission][create field_memo] = create field_memo
+features_exclude[user_permission][edit own field_memo] = edit own field_memo
+features_exclude[user_permission][edit field_memo] = edit field_memo
+features_exclude[user_permission][view own field_memo] = view own field_memo
+features_exclude[user_permission][view field_memo] = view field_memo
+features_exclude[user_permission][create field_public_phone] = create field_public_phone
+features_exclude[user_permission][edit own field_public_phone] = edit own field_public_phone
+features_exclude[user_permission][edit field_public_phone] = edit field_public_phone
+features_exclude[user_permission][view own field_public_phone] = view own field_public_phone
+features_exclude[user_permission][view field_public_phone] = view field_public_phone
+features_exclude[user_permission][create field_public_address] = create field_public_address
+features_exclude[user_permission][edit own field_public_address] = edit own field_public_address
+features_exclude[user_permission][edit field_public_address] = edit field_public_address
+features_exclude[user_permission][view own field_public_address] = view own field_public_address
+features_exclude[user_permission][view field_public_address] = view field_public_address
+features_exclude[user_permission][create field_public_email] = create field_public_email
+features_exclude[user_permission][edit own field_public_email] = edit own field_public_email
+features_exclude[user_permission][edit field_public_email] = edit field_public_email
+features_exclude[user_permission][view own field_public_email] = view own field_public_email
+features_exclude[user_permission][view field_public_email] = view field_public_email
+features_exclude[field_group][group_htabs|node|materiau|form] = group_htabs|node|materiau|form
 project path = sites/all/modules/features