added new light industriel view and indus. export list for simplenewsletter massive subscription

sites/all/modules/contrib/admin/token/token.pages.inc

@@ -198,6 +198,7 @@ function _token_token_tree_format_row($token, array $token_info, $is_group = FAL
 
   $row = $defaults;
   $row['id'] = _token_clean_css_identifier($token);
+  $row['data']['token'] = array();
   $row['data']['name'] = $token_info['name'];
   $row['data']['description'] = $token_info['description'];
 

sites/all/modules/features/materio_administration/materio_administration.features.menu_links.inc

@@ -85,7 +85,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -48,
+    'weight' => -47,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -308,7 +308,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -45,
+    'weight' => -44,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -383,7 +383,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -46,
+    'weight' => -45,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -442,7 +442,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -40,
+    'weight' => -39,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -462,7 +462,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -38,
+    'weight' => -37,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -505,7 +505,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -44,
+    'weight' => -43,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -585,7 +585,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -42,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1029,7 +1029,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -39,
+    'weight' => -38,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1049,7 +1049,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -41,
+    'weight' => -40,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1070,7 +1070,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -47,
+    'weight' => -46,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,

sites/all/modules/features/materio_content_types/materio_content_types.features.user_permission.inc

@@ -985,9 +985,9 @@ function materio_content_types_user_default_permissions() {
     'roles' => array(
       'Adhérent' => 'Adhérent',
       'Admin showroom' => 'Admin showroom',
-      'Contact opérationnel' => 'Contact opérationnel',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',
       'administrator' => 'administrator',
       'root' => 'root',
     ),
@@ -1117,9 +1117,10 @@ function materio_content_types_user_default_permissions() {
     'name' => 'view field_description',
     'roles' => array(
       'Adhérent' => 'Adhérent',
-      'Contact opérationnel' => 'Contact opérationnel',
+      'Admin showroom' => 'Admin showroom',
       'Premium' => 'Premium',
       'Student' => 'Student',
+      'Translator' => 'Translator',
       'Unverified' => 'Unverified',
       'Utilisateur' => 'Utilisateur',
       'Utilisateur Alpha Tester' => 'Utilisateur Alpha Tester',

sites/all/modules/features/materio_user_profiles/materio_user_profiles.features.field_instance.inc

@@ -1265,7 +1265,7 @@ function materio_user_profiles_field_default_field_instances() {
     'bundle' => 'user',
     'default_value' => NULL,
     'deleted' => 0,
-    'description' => '',
+    'description' => 'Define a company to link with the user (only relevant with "contact operationel")',
     'display' => array(
       'default' => array(
         'label' => 'above',
@@ -1289,7 +1289,12 @@ function materio_user_profiles_field_default_field_instances() {
       'settings' => array(
         'autocomplete_deluxe_path' => 'autocomplete_deluxe/taxonomy',
         'content_taxonomy_autocomplete_new_terms' => 'deny',
+        'delimiter' => '',
+        'limit' => 10,
+        'min_length' => 0,
+        'not_found_message' => 'The term \'@term\' will be added.',
         'size' => 60,
+        'use_synonyms' => 0,
       ),
       'type' => 'autocomplete_deluxe_taxonomy',
       'weight' => 2,
@@ -1337,6 +1342,7 @@ function materio_user_profiles_field_default_field_instances() {
   t('Administrative email');
   t('Adresse');
   t('Company');
+  t('Define a company to link with the user (only relevant with "contact operationel")');
   t('Email');
   t('Employee');
   t('First name');

sites/all/modules/features/showroom/showroom.features.field_instance.inc

@@ -1231,7 +1231,7 @@ function showroom_field_default_field_instances() {
     'bundle' => 'user',
     'default_value' => NULL,
     'deleted' => 0,
-    'description' => '',
+    'description' => 'define a showroom to link with the user (only relevante with "admin showroom" users)',
     'display' => array(
       'default' => array(
         'label' => 'above',
@@ -1271,6 +1271,7 @@ function showroom_field_default_field_instances() {
   t('Phone');
   t('Samples');
   t('Showroom');
+  t('define a showroom to link with the user (only relevante with "admin showroom" users)');
 
   return $field_instances;
 }