daily build

profiles/wcm_base/CHANGELOG.txt

+WCM Base 7.x-1.x, 2015-12-09
+----------------------------
+- OCIO Search: Update Apachesolr to 1.8; security update.
+- OCIO Accessibility: Add pathologic settings and update Extlink settings. 
+- OCIO WYSIWYG: Add <br> to available html tags.
+- OCIO Site Info: Add Google+ and Instagram social media options.
+- OCIO Omega Base: 
+	- Update to latest version of FontAwesome.
+	- Fix left margin on ul within accordions.
+	- Adjust row padding on panels.
+	- Add min-height to content region.
+	- Minor spacing adjustments to news page.
+- OCIO Omega 4: 
+	- Remove padding top on l-main (to fix gap above breadcrumbs on many pages).
+	- Minor adjustment to box shadows.
+- WCM User Contact: Update contact views to not link to user profile page.
+
+
 WCM Base 7.x-1.x, 2015-11-24
 ----------------------------
 - OCIO Permissions: Added edit permissions for Editors specific panel types.
@@ -17,7 +35,7 @@ WCM Base 7.x-1.x, 2015-11-10
 ----------------------------
 - WCM Media Gallery: Created image gallery view pane with tag filtering.
 - OCIO News: Add tag filtering to news panes.
-- OCIO Panels Settings: Hide redirect settings on fieldable panel panes.
+- OCIO Panels Settings: Hide redirect settings on fieldible panel panes.
 - OCIO User Config: Replace username filter with real name filter on admin page.
 - WCM Base:
   - Disabled error display on production sites.

profiles/wcm_base/modules/contrib/apachesolr/CHANGELOG.txt

 Apache Solr integration 7.x-1.x, xxxx-xx-xx
 -----------------------------
 
+Apache Solr integration 7.x-1.8, 2015-12-02
+-----------------------------
+SA-CONTRIB-2015-170 by Dave Reid, theapi: fix for anonymous users can delete Solr environments that are not default.
+
 Apache Solr integration 7.x-1.7, 2014-08-29
 -----------------------------
 #2151325 by JulienD: Remove useless files[] directive from .info files.

profiles/wcm_base/modules/contrib/apachesolr/apachesolr.info

@@ -20,9 +20,9 @@ files[] = tests/solr_base_query.test
 files[] = tests/solr_base_subquery.test
 files[] = tests/solr_document.test
 
-; Information added by Drupal.org packaging script on 2014-08-29
-version = "7.x-1.7"
+; Information added by Drupal.org packaging script on 2015-12-02
+version = "7.x-1.8"
 core = "7.x"
 project = "apachesolr"
-datestamp = "1409317099"
+datestamp = "1449085462"
 

profiles/wcm_base/modules/contrib/apachesolr/apachesolr.module

@@ -1279,10 +1279,7 @@ function apachesolr_environment_load($env_id) {
  */
 function apachesolr_environment_delete_page_access($permission, $environment) {
   $is_default = $environment['env_id'] == apachesolr_default_environment();
-  if ($is_default && !user_access($permission)) {
-    return FALSE;
-  }
-  return TRUE;
+  return !$is_default && user_access($permission);
 }
 
 /**

profiles/wcm_base/modules/contrib/apachesolr/apachesolr_access/apachesolr_access.info

@@ -6,9 +6,9 @@ core = 7.x
 
 files[] = tests/apachesolr_access.test
 
-; Information added by Drupal.org packaging script on 2014-08-29
-version = "7.x-1.7"
+; Information added by Drupal.org packaging script on 2015-12-02
+version = "7.x-1.8"
 core = "7.x"
 project = "apachesolr"
-datestamp = "1409317099"
+datestamp = "1449085462"
 

profiles/wcm_base/modules/contrib/apachesolr/apachesolr_search.info

@@ -7,9 +7,9 @@ core = 7.x
 configure = admin/config/search/apachesolr/search-pages
 
 
-; Information added by Drupal.org packaging script on 2014-08-29
-version = "7.x-1.7"
+; Information added by Drupal.org packaging script on 2015-12-02
+version = "7.x-1.8"
 core = "7.x"
 project = "apachesolr"
-datestamp = "1409317099"
+datestamp = "1449085462"
 

profiles/wcm_base/modules/contrib/apachesolr/tests/apachesolr_test/apachesolr_test.info

@@ -5,9 +5,9 @@ core = 7.x
 hidden = TRUE
 dependencies[] = apachesolr
 
-; Information added by Drupal.org packaging script on 2014-08-29
-version = "7.x-1.7"
+; Information added by Drupal.org packaging script on 2015-12-02
+version = "7.x-1.8"
 core = "7.x"
 project = "apachesolr"
-datestamp = "1409317099"
+datestamp = "1449085462"
 

profiles/wcm_base/modules/contrib/date_popup_authored/date_popup_authored.info

@@ -3,4 +3,11 @@ description = "Provides a datepicker for the 'Authored on' field on node forms."
 core = 7.x
 files[] = date_popup_authored.test
 package = Date/Time
-dependencies[] = date_popup
+dependencies[] = date_popup
\ No newline at end of file
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.1+2-dev"
+core = "7.x"
+project = "date_popup_authored"
+datestamp = "1449688885"
+

profiles/wcm_base/modules/contrib/manualcrop/manualcrop.info

@@ -7,3 +7,11 @@ dependencies[] = image (>=7.8)
 dependencies[] = libraries (>=2.1)
 
 files[] = includes/views/manualcrop.views.inc
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.4+109-dev"
+core = "7.x"
+project = "manualcrop"
+datestamp = "1449688773"
+

profiles/wcm_base/modules/contrib/workbench/workbench.info

@@ -4,3 +4,11 @@ package = Workbench
 core = 7.x
 configure = admin/config/workbench/settings
 dependencies[] = views
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.2"
+core = "7.x"
+project = "workbench"
+datestamp = "1449688818"
+

profiles/wcm_base/modules/contrib/workbench_media/workbench_media.info

@@ -4,3 +4,11 @@ package = Workbench
 core = 7.x
 dependencies[] = workbench
 dependencies[] = media
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-2.1"
+core = "7.x"
+project = "workbench_media"
+datestamp = "1449688819"
+

profiles/wcm_base/modules/contrib/workbench_moderation/tests/workbench_moderation_test.info

@@ -3,3 +3,11 @@ description = Test module for Workbench Moderation.
 package = Workbench
 core = 7.x
 hidden = TRUE
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.4+8-dev"
+core = "7.x"
+project = "workbench_moderation"
+datestamp = "1449688820"
+

profiles/wcm_base/modules/contrib/workbench_moderation/workbench_moderation.info

@@ -16,3 +16,11 @@ files[] = workbench_moderation.migrate.inc
 files[] = tests/external_node_update.test
 files[] = tests/workbench_moderation.test
 files[] = tests/workbench_moderation.files.test
+
+
+; Information added by drush on 2015-12-09
+version = "7.x-1.4+8-dev"
+core = "7.x"
+project = "workbench_moderation"
+datestamp = "1449688820"
+

profiles/wcm_base/modules/custom/ocio_accessibility/ocio_accessibility.info

@@ -7,6 +7,7 @@ project = ocio_accessibility
 dependencies[] = ctools
 dependencies[] = extlink
 dependencies[] = features
+dependencies[] = pathologic
 dependencies[] = strongarm
 features[ctools][] = strongarm:strongarm:1
 features[features_api][] = api:2
@@ -21,4 +22,5 @@ features[variable][] = extlink_include
 features[variable][] = extlink_mailto_class
 features[variable][] = extlink_subdomains
 features[variable][] = extlink_target
-
+features[variable][] = pathologic_local_paths
+features[variable][] = pathologic_protocol_style

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

@@ -77,7 +77,7 @@ function ocio_accessibility_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'extlink_subdomains';
-  $strongarm->value = 0;
+  $strongarm->value = 1;
   $export['extlink_subdomains'] = $strongarm;
 
   $strongarm = new stdClass();
@@ -87,5 +87,19 @@ function ocio_accessibility_strongarm() {
   $strongarm->value = '_blank';
   $export['extlink_target'] = $strongarm;
 
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathologic_local_paths';
+  $strongarm->value = '';
+  $export['pathologic_local_paths'] = $strongarm;
+
+  $strongarm = new stdClass();
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
+  $strongarm->name = 'pathologic_protocol_style';
+  $strongarm->value = 'proto-rel';
+  $export['pathologic_protocol_style'] = $strongarm;
+
   return $export;
 }

profiles/wcm_base/modules/custom/ocio_search/ocio_search.make

@@ -6,7 +6,7 @@ core = 7.x
 
 ;modules
 
-projects[apachesolr][version] = 1.7
+projects[apachesolr][version] = 1.8
 projects[apachesolr][subdir] = contrib
 
 projects[apachesolr_file][version] = 1.x-dev

profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.info

 name = OCIO Site Info
-description = "Site information module for the OSU College of Engineering distribution. Provides extended site information that is used in the OSU Omega theme for social media links, site name generation and a contact information area. Adds support for several new Tokens based on additional information fields."
+description = "Site information module for the OCIO WCM distribution. Provides extended site information that is used in the OSU Omega theme for social media links, site name generation and a contact information area. Adds support for several new Tokens based on additional information fields."
 core = 7.x
 package = OCIO
 version = 7.x-1.0

profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.install

@@ -41,7 +41,9 @@ function ocio_siteinfo_install() {
       'twitter' => 'http://twitter.com',
       'youtube' => 'http://youtube.com',
       'linkedin' => 'http://linkedin.com',
+      'googleplus' => 'http://plus.google.com',
       'photos' => 'http://flickr.com',
+      'instagram' => 'http://instagram.com',
     ),
   );
 

profiles/wcm_base/modules/custom/ocio_siteinfo/ocio_siteinfo.module

@@ -221,6 +221,17 @@ function ocio_siteinfo_form($form, &$form_state) {
     '#weight' => '-11',
     '#element_validate' => array('_ocio_siteinfo_validate_url'),
   );
+  
+  $form['ocio_siteinfo']['social']['googleplus'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Google+'),
+    '#default_value' => $ocio_siteinfo['social']['googleplus'],
+    '#size' => '100',
+    '#maxlength' => '150',
+    '#description' => t('Enter the URL to the Google+ profile.'),
+    '#weight' => '-10',
+    '#element_validate' => array('_ocio_siteinfo_validate_url'),
+  );
 
   $form['ocio_siteinfo']['social']['photos'] = array(
     '#type' => 'textfield',
@@ -228,8 +239,19 @@ function ocio_siteinfo_form($form, &$form_state) {
     '#default_value' => $ocio_siteinfo['social']['photos'],
     '#size' => '100',
     '#maxlength' => '150',
-    '#description' => t('Enter the URL to the photo sharing account.'),
-    '#weight' => '-10',
+    '#description' => t('Enter the URL to the photo sharing account (ex. Flickr, Picasa, etc...).'),
+    '#weight' => '-9',
+    '#element_validate' => array('_ocio_siteinfo_validate_url'),
+  );
+  
+  $form['ocio_siteinfo']['social']['instagram'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Instagram'),
+    '#default_value' => $ocio_siteinfo['social']['instagram'],
+    '#size' => '100',
+    '#maxlength' => '150',
+    '#description' => t('Enter the URL to the Instagram profile.'),
+    '#weight' => '-8',
     '#element_validate' => array('_ocio_siteinfo_validate_url'),
   );
 
@@ -359,6 +381,10 @@ function ocio_siteinfo_social_content($location = FALSE) {
         case 'linkedin':
           $title_text = 'LinkedIn';
           break;
+        case 'googleplus':
+          $fa_title = 'google-plus';
+          $title_text = 'Google+';
+          break;
         case 'photos':
           $fa_title = 'camera';
           break;