daily build

profiles/wcm_base/CHANGELOG.txt

+WCM Base 7.x-1.x, 2016-05-06
+----------------------------
+- WCM Base: Updated Panopoly to 1.35.
+- WCM Workbench: Link file names to file download instead of entity page.
+- OCIO Media: Added dotx as allowed file extension.
+- OCIO SimpleSAMLphp Auth: Show user password fields to SimpleSAML users if
+  global setting allows.
+
 WCM Base 7.x-1.x, 2016-05-05
 ----------------------------
-- OCIO SimpleSAMLphp auth: Disallow logging in with or resetting passwords
+- OCIO SimpleSAMLphp Auth: Disallow logging in with or resetting passwords
   for local accounts when auth type is changed to SimpleSAML.
 
 WCM Base 7.x-1.x, 2016-05-04
@@ -8,7 +16,7 @@ WCM Base 7.x-1.x, 2016-05-04
 - WCM Panels Settings: Added link field to image panels panes.
 - OCIO Omega Base:
   - Render link field on image panels panes.
-  - Update user login page to wrap local login within a collapsible div.
+  - Updated user login page to wrap local login within a collapsible div.
 - WCM Base: Updated Fieldable Panes Panes to 1.10 (security release).
 
 WCM Base 7.x-1.x, 2016-04-28

profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.features_overrides.inc

@@ -38,8 +38,9 @@ function ocio_media_features_override_default_overrides() {
   $overrides["file_type.document.disabled"] = FALSE;
   $overrides["file_type.document.mimetypes|10"] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation';
   $overrides["file_type.document.mimetypes|11"] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
-  $overrides["file_type.document.mimetypes|12"] = 'application/acad';
-  $overrides["file_type.document.mimetypes|13"] = 'application/dxf';
+  $overrides["file_type.document.mimetypes|12"] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template';
+  $overrides["file_type.document.mimetypes|13"] = 'application/acad';
+  $overrides["file_type.document.mimetypes|14"] = 'application/dxf';
   $overrides["file_type.document.mimetypes|4"] = 'application/zip';
   $overrides["file_type.document.mimetypes|5"] = 'application/vnd.ms-powerpoint';
   $overrides["file_type.document.mimetypes|6"] = 'application/vnd.oasis.opendocument.text';

profiles/wcm_base/modules/custom/ocio_media/ocio_media.features.inc

@@ -84,8 +84,9 @@ function ocio_media_file_default_types_alter(&$data) {
     $data['document']->disabled = FALSE; /* WAS: '' */
     $data['document']->mimetypes[10] = 'application/vnd.openxmlformats-officedocument.presentationml.presentation'; /* WAS: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document' */
     $data['document']->mimetypes[11] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'; /* WAS: '' */
-    $data['document']->mimetypes[12] = 'application/acad'; /* WAS: '' */
-    $data['document']->mimetypes[13] = 'application/dxf'; /* WAS: '' */
+    $data['document']->mimetypes[12] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.template'; /* WAS: '' */
+    $data['document']->mimetypes[13] = 'application/acad'; /* WAS: '' */
+    $data['document']->mimetypes[14] = 'application/dxf'; /* WAS: '' */
     $data['document']->mimetypes[4] = 'application/zip'; /* WAS: 'application/vnd.ms-powerpoint' */
     $data['document']->mimetypes[5] = 'application/vnd.ms-powerpoint'; /* WAS: 'application/vnd.oasis.opendocument.text' */
     $data['document']->mimetypes[6] = 'application/vnd.oasis.opendocument.text'; /* WAS: 'application/vnd.oasis.opendocument.spreadsheet' */

profiles/wcm_base/modules/custom/ocio_media/ocio_media.info

@@ -74,6 +74,7 @@ features[features_overrides][] = file_type.document.mimetypes|10
 features[features_overrides][] = file_type.document.mimetypes|11
 features[features_overrides][] = file_type.document.mimetypes|12
 features[features_overrides][] = file_type.document.mimetypes|13
+features[features_overrides][] = file_type.document.mimetypes|14
 features[features_overrides][] = file_type.document.mimetypes|4
 features[features_overrides][] = file_type.document.mimetypes|5
 features[features_overrides][] = file_type.document.mimetypes|6

profiles/wcm_base/modules/custom/ocio_media/ocio_media.strongarm.inc

@@ -334,7 +334,7 @@ function ocio_media_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'file_entity_default_allowed_extensions';
-  $strongarm->value = 'jpg jpeg gif png txt doc docx xls xlsx pdf ppt pptx pps ppsx odt ods odp zip dwg dxf';
+  $strongarm->value = 'jpg jpeg gif png txt doc docx xls xlsx pdf ppt pptx pps ppsx odt ods odp zip dwg dxf dotx';
   $export['file_entity_default_allowed_extensions'] = $strongarm;
 
   $strongarm = new stdClass();

profiles/wcm_base/modules/custom/ocio_simplesamlphp_auth/ocio_simplesamlphp_auth.module

@@ -261,8 +261,11 @@ function ocio_simplesamlphp_auth_form_user_profile_form_alter(&$form, &$form_sta
     $form['account']['name']['#description'] = 'Username can not be changed for users authenticating via SimpleSAML.';
     $form['account']['mail']['#disabled'] = TRUE;
     $form['account']['mail']['#description'] = 'Email can not be changed for users authenticating via SimpleSAML.';
-    $form['account']['pass']['#access'] = FALSE;
-    $form['account']['current_pass']['#access'] = FALSE;
+
+    // Allow saml users to set password if global setting allows
+    $password_access = variable_get('simplesamlphp_auth_allowsetdrupalpwd');
+    $form['account']['pass']['#access'] = $password_access;
+    $form['account']['current_pass']['#access'] = $password_access;
   }
 
   // add authentication method option to profile form

profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.info

@@ -10,8 +10,6 @@ dependencies[] = views
 dependencies[] = workbench
 dependencies[] = workbench_media
 dependencies[] = workbench_moderation
-dependencies[] = workbench_moderation
-dependencies[] = workbench_moderation
 features[ctools][] = views:views_default:3.0
 features[features_api][] = api:2
 features[features_override_items][] = views_view.workbench_edited

profiles/wcm_base/modules/custom/wcm_workbench/wcm_workbench.views_default.inc

@@ -128,6 +128,9 @@ function wcm_workbench_views_default_views() {
   $handler->display->display_options['fields']['filename']['id'] = 'filename';
   $handler->display->display_options['fields']['filename']['table'] = 'file_managed';
   $handler->display->display_options['fields']['filename']['field'] = 'filename';
+  $handler->display->display_options['fields']['filename']['alter']['make_link'] = TRUE;
+  $handler->display->display_options['fields']['filename']['alter']['path'] = '[uri]';
+  $handler->display->display_options['fields']['filename']['link_to_file'] = FALSE;
   /* Field: File: Mime type */
   $handler->display->display_options['fields']['filemime']['id'] = 'filemime';
   $handler->display->display_options['fields']['filemime']['table'] = 'file_managed';

profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt

+Panopoly Admin 7.x-1.35, 2016-05-04
+----------------------------
+- No changes since last release.
+
 Panopoly Admin 7.x-1.34, 2016-04-20
 ----------------------------
 - No changes since last release.

profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info

@@ -37,9 +37,9 @@ features[page_manager_pages][] = panopoly_admin_layout_library
 features[page_manager_pages][] = panopoly_admin_page_library
 features[page_manager_pages][] = panopoly_admin_pane_library
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_admin"
-datestamp = "1461203348"
+datestamp = "1462395846"
 

profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt

+Panopoly Core 7.x-1.35, 2016-05-04
+---------------------------
+- Update to Fieldable Panels Panes 1.10 for SA-CONTRIB-2016-025.
+
 Panopoly Core 7.x-1.34, 2016-04-20
 ---------------------------
 - Update Features to 2.10.

profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info

@@ -74,9 +74,9 @@ features[variable][] = panelizer_taxonomy_term:panopoly_categories_allowed_layou
 features[variable][] = panelizer_taxonomy_term:panopoly_categories_allowed_types_default
 features[views_view][] = panopoly_taxonomy
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_core"
-datestamp = "1461203358"
+datestamp = "1462395855"
 

profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.install

@@ -86,6 +86,9 @@ function panopoly_core_update_dependencies() {
   $deps['module_filter'][7200] = array(
     'panopoly_core' => 7105,
   );
+  $deps['fieldable_panels_panes'][7111] = array(
+    'panopoly_core' => 7106,
+  );
   return $deps;
 }
 
@@ -233,3 +236,10 @@ function panopoly_core_update_7104() {
 function panopoly_core_update_7105() {
   registry_rebuild();
 }
+
+/**
+ * Use the new FPP revision locking mode.
+ */
+function panopoly_core_update_7106() {
+  variable_set('fpp_revision_locking', 'lock');
+}

profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.make

@@ -24,7 +24,7 @@ projects[panelizer][subdir] = contrib
 projects[panelizer][patch][1623536] = http://drupal.org/files/issues/array-to-object-on-update-1623536-26.patch
 projects[panelizer][patch][2416505] = http://www.drupal.org/files/issues/panelizer-search_api-2416505-3.patch
 
-projects[fieldable_panels_panes][version] = 1.8
+projects[fieldable_panels_panes][version] = 1.10
 projects[fieldable_panels_panes][subdir] = contrib
 
 projects[pm_existing_pages][version] = 1.4

profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt

+Panopoly Magic 7.x-1.35, 2016-05-04
+----------------------------
+- Title in FPP is double encoded when making a link.
+- Update to Fieldable Panels Panes 1.10 for SA-CONTRIB-2016-025.
+
 Panopoly Magic 7.x-1.34, 2016-04-20
 ----------------------------
 - No changes since last release.

profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info

@@ -15,9 +15,9 @@ stylesheets[all][] = css/panopoly-modal.css
 features[features_api][] = api:2
 files[] = plugins/views/panopoly_magic_plugin_display_panel_pane.inc
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_magic"
-datestamp = "1461203400"
+datestamp = "1462395884"
 

profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.module

@@ -393,6 +393,18 @@ function panopoly_magic_form_alter(&$form, &$form_state, $form_id) {
     if ($form_id == 'fieldable_panels_panes_fieldable_panels_pane_content_type_edit_form') {
       // Hide the revision fieldset.
       $form['revision']['#access'] = FALSE;
+      // Hide the 'Admin' fieldset.
+      $form['admin']['#access'] = FALSE;
+      // Move the 'Admin title' under reusable like in FPP 1.8 and earlier.
+      $form['reusable']['admin_title'] = $form['admin']['admin_title'];
+      $form['reusable']['admin_title']['#states'] = array(
+        'visible' => array(
+          ':input[name="reusable"]' => array('checked' => TRUE),
+        )
+      );
+      unset($form['admin']['admin_title']);
+      // Move the warning down.
+      $form['reusable']['warning']['#weight'] = 100;
 
       // Add our own submit handler ALWAYS, not just when we are generating
       // a preview.
@@ -652,7 +664,7 @@ function panopoly_magic_render_fieldable_panels_pane_preview($type, $subtype, $c
     $block->title = '';
     if (empty($settings['extra_fields']['display']) || !empty($settings['extra_fields']['display']['title']['default']['visible'])) {
       if (!empty($entity->title)) {
-        $block->title = check_plain($entity->title);
+        $block->title = filter_xss_admin($entity->title);
       }
     }
 

profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt

+Panopoly Pages 7.x-1.35, 2016-05-04
+----------------------------
+- No changes since last release.
+
 Panopoly Pages 7.x-1.34, 2016-04-20
 ----------------------------
 - No changes since last release.

profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info

@@ -67,9 +67,9 @@ features[variable][] = panelizer_node:panopoly_page_allowed_layouts_default
 features[variable][] = panelizer_node:panopoly_page_allowed_types_default
 features[variable][] = save_continue_panopoly_page
 
-; Information added by Drupal.org packaging script on 2016-04-21
-version = "7.x-1.34"
+; Information added by Drupal.org packaging script on 2016-05-04
+version = "7.x-1.35"
 core = "7.x"
 project = "panopoly_pages"
-datestamp = "1461203413"
+datestamp = "1462395893"
 

profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt

+Panopoly Search 7.x-1.35, 2016-05-04
+-----------------------------
+- No changes since last release.
+
 Panopoly Search 7.x-1.34, 2016-04-20
 -----------------------------
 - Update to search_api 1.18 for SA-CONTRIB-2016-022.