Merge branch 'master' into advanced-search

sites/all/modules/features/mailing/mailing.strongarm.inc

@@ -428,14 +428,14 @@ function mailing_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'simplenews_test_address';
-  $strongarm->value = 'info@materio.com';
+  $strongarm->value = 'info@materio.com, fl@figureslibres.io';
   $export['simplenews_test_address'] = $strongarm;
 
   $strongarm = new stdClass();
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'simplenews_test_address_override';
-  $strongarm->value = 0;
+  $strongarm->value = 1;
   $export['simplenews_test_address_override'] = $strongarm;
 
   $strongarm = new stdClass();

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

@@ -24,7 +24,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -34,
+    'weight' => -33,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -254,7 +254,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 1,
     'expanded' => 0,
-    'weight' => -42,
+    'weight' => -41,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -317,11 +317,11 @@ function materio_administration_menu_default_menu_links() {
       'identifier' => 'navigation_customers:http://www.materio.com/fr/admin/store/customers',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 1,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 1,
+    'weight' => -46,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -429,7 +429,7 @@ function materio_administration_menu_default_menu_links() {
   $menu_links['navigation_feedback:admin/reports/feedback'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'admin/reports/feedback',
-    'router_path' => 'admin/reports/feedback',
+    'router_path' => 'admin/reports',
     'link_title' => 'Feedback',
     'options' => array(
       'identifier' => 'navigation_feedback:admin/reports/feedback',
@@ -487,7 +487,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 1,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -40,
+    'weight' => -39,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -506,7 +506,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -37,
+    'weight' => -36,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -547,7 +547,7 @@ function materio_administration_menu_default_menu_links() {
       'identifier' => 'navigation_industriels-lite:admin/users/industriels2',
     ),
     'module' => 'menu',
-    'hidden' => 0,
+    'hidden' => 1,
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
@@ -601,7 +601,7 @@ function materio_administration_menu_default_menu_links() {
   $menu_links['navigation_industriels:node/add/simplenews/7856'] = array(
     'menu_name' => 'navigation',
     'link_path' => 'node/add/simplenews/7856',
-    'router_path' => 'node/add/simplenews/7856',
+    'router_path' => 'node/add/simplenews',
     'link_title' => 'Industriels',
     'options' => array(
       'identifier' => 'navigation_industriels:node/add/simplenews/7856',
@@ -611,10 +611,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
+    'weight' => -50,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
+    'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews',
   );
   // Exported menu link: navigation_ip-address-tracking:admin/reports/ip_tracking.
@@ -675,7 +675,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -35,
+    'weight' => -34,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -714,10 +714,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
+    'weight' => -47,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
+    'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews',
   );
   // Exported menu link: navigation_members:admin/users/members.
@@ -801,7 +801,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,
@@ -844,7 +844,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,
@@ -978,7 +978,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => -36,
+    'weight' => -35,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1041,7 +1041,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,
@@ -1064,7 +1064,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,
@@ -1184,7 +1184,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 1,
     'expanded' => 0,
-    'weight' => -43,
+    'weight' => -45,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1404,10 +1404,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
+    'weight' => -46,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
+    'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews',
   );
   // Exported menu link: navigation_user-account:user.
@@ -1451,7 +1451,7 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 1,
     'expanded' => 1,
-    'weight' => -44,
+    'weight' => -46,
     'customized' => 1,
     'language' => 'und',
     'menu_links_customized' => 1,
@@ -1493,10 +1493,10 @@ function materio_administration_menu_default_menu_links() {
     'external' => 0,
     'has_children' => 0,
     'expanded' => 0,
-    'weight' => 0,
-    'customized' => 0,
+    'weight' => -48,
+    'customized' => 1,
     'language' => 'und',
-    'menu_links_customized' => 0,
+    'menu_links_customized' => 1,
     'parent_identifier' => 'navigation_simplenews-newsletter:node/add/simplenews',
   );
 

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

@@ -181,7 +181,6 @@ function materio_administration_strongarm() {
   $strongarm->value = array(
     'node' => 'node',
     'taxonomy_term' => 'taxonomy_term',
-    'field_collection_item' => 0,
     'user' => 0,
   );
   $export['entity_translation_entity_types'] = $strongarm;
@@ -345,11 +344,11 @@ function materio_administration_strongarm() {
   $strongarm->api_version = 1;
   $strongarm->name = 'entity_translation_settings_node__breve';
   $strongarm->value = array(
-    'default_language' => 'und',
+    'default_language' => 'xx-et-default',
     'hide_language_selector' => 0,
-    'exclude_language_none' => 0,
-    'lock_language' => 0,
-    'shared_fields_original_only' => 0,
+    'exclude_language_none' => 1,
+    'lock_language' => 1,
+    'shared_fields_original_only' => 1,
   );
   $export['entity_translation_settings_node__breve'] = $strongarm;
 
@@ -410,11 +409,11 @@ function materio_administration_strongarm() {
   $strongarm->api_version = 1;
   $strongarm->name = 'entity_translation_settings_node__materiau';
   $strongarm->value = array(
-    'default_language' => 'und',
+    'default_language' => 'xx-et-default',
     'hide_language_selector' => 0,
-    'exclude_language_none' => 0,
-    'lock_language' => 0,
-    'shared_fields_original_only' => 0,
+    'exclude_language_none' => 1,
+    'lock_language' => 1,
+    'shared_fields_original_only' => 1,
   );
   $export['entity_translation_settings_node__materiau'] = $strongarm;
 

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

@@ -758,6 +758,7 @@ $entity_field[0][\'value\'] = format_date($entity->created, \'breves\');',
         0 => array(
           'vocabulary' => 'tag_libres',
           'parent' => 0,
+          'depth' => '',
         ),
       ),
       'entity_translation_sync' => FALSE,

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

@@ -3620,19 +3620,11 @@ Vous devez avant d\'utiliser un nouveau tag le créer <a href="/admin/structure/
       'active' => 1,
       'module' => 'synonyms',
       'settings' => array(
-        'auto_creation' => 1,
-        '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.',
+        'auto_creation' => 0,
         'size' => 60,
-        'sort' => 'weight',
-        'suggest_only_unique' => FALSE,
+        'suggest_only_unique' => 0,
         'suggestion_size' => 10,
         'synonyms_autocomplete_path' => 'synonyms/autocomplete-taxonomy-term',
-        'use_synonyms' => 1,
       ),
       'type' => 'synonyms_autocomplete_taxonomy_term',
       'weight' => 23,

sites/all/modules/features/materio_search/materio_search.features.inc

@@ -385,13 +385,14 @@ function materio_search_default_search_api_index() {
       "cron_limit" : "50",
       "entity_translation_language" : "en",
       "fields" : {
-        "materio_search_api_term_property_dup_name" : { "type" : "text", "real_type" : "edge_n2_kw_text" },
-        "name" : { "type" : "text", "real_type" : "edge_n2_kw_text" },
+        "description" : { "type" : "text" },
+        "materio_search_api_term_property_dup_name" : { "type" : "text", "real_type" : "edge_n2_kw_mapped_text" },
+        "name" : { "type" : "text" },
         "name_field" : { "type" : "text", "real_type" : "edge_n2_kw_text" },
         "search_api_language" : { "type" : "string" },
         "synonyms" : {
           "type" : "list\\u003Ctext\\u003E",
-          "real_type" : "list\\u003Cedge_n2_kw_text\\u003E"
+          "real_type" : "list\\u003Cedge_n2_kw_mapped_text\\u003E"
         },
         "synonyms_synonym" : {
           "type" : "list\\u003Ctext\\u003E",