Merge pull request #55 from NuCivic/proposed_release_for_tag_1492541016

1492541016: Proposed release for 7.x-1.13.3

profiles/dkan/.ahoy/.docker/etc/mysql/my.cnf

@@ -17,4 +17,5 @@ max_allowed_packet = 128M
 long_query_time=1
 slow_query_log=1
 slow_query_log_file=slow.log
+local_infile=1
 ###############################

profiles/dkan/.ahoy/.scripts/drupal-rebuild.sh

@@ -14,3 +14,6 @@ drush --root=docroot  make --concurrency=$concurrency --prepare-install dkan/dru
 
 drush --root=docroot -y --verbose $root si minimal --sites-subdir=default --account-pass='admin' --db-url=$1 install_configure_form.update_status_module='array(false,false)' &&
   ln -s ../../dkan docroot/profiles/dkan
+chmod +w docroot/sites/default/settings.php
+printf "// DKAN Datastore Fast Import options.\n\$databases['default']['default']['pdo'] = array(\n  PDO::MYSQL_ATTR_LOCAL_INFILE => 1,\n  PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => 1,\n);" >> docroot/sites/default/settings.php
+chmod -w docroot/sites/default/settings.php

profiles/dkan/.ahoy/docker-compose.yml

@@ -38,6 +38,8 @@ db:
      - "./.docker/etc/mysql/my.cnf:/etc/mysql/conf.d/z_my.cnf"
      # Permanent DB data storage
      - /var/lib/mysql
+     # Project root folder mapping
+     - *project_root
 
 # CLI node
 # Used for all console commands and tools.

profiles/dkan/.docker/etc/mysql/my.cnf

@@ -1,5 +1,6 @@
 [mysqld]
 ###############################
+local_infile=1
 # Acquia DD settings
 #set innodb as default
 default-storage-engine=InnoDB
@@ -17,4 +18,5 @@ max_allowed_packet = 128M
 long_query_time=1
 slow_query_log=1
 slow_query_log_file=slow.log
+
 ###############################

profiles/dkan/.github/PULL_REQUEST_TEMPLATE.md

@@ -24,3 +24,4 @@ If this PR introduces new functionality, include a user story or stories describ
 - [ ] There is test for the issue.
 - [ ] CHANGELOG updated.
 - [ ] Coding standards checked.
+- [ ] Review docs.getdkan.com (or in /docs) to see if it still covers the scope of the PR and update if needed.

profiles/dkan/CHANGELOG.txt

@@ -1,6 +1,25 @@
+7.x-1.13.3 2017-04-18
+---------------------
+ - #1863 Update restws module to v2.7
+ - #1859 Fixed update hooks to correctly set jquery version and remove old modified source date field
+ - #1864 Update media to 2.0 and remove patch 2534724. 
+ - #1829 Fixed missing properties on warning message during datajson harvest cache.
+ - #1802 Better support for Issued and Updated dataset properties from harvested sources.
+ - #1821 Remove redundant CSS load in dkan_dataset.
+ - #1726 Fixed broken links in search results to nodes without aliases
+ - #1792 Remove Windows reserved characters from default content filenames for better Windows support
+ - #1815 Support importing Temporal Coverage during POD Harvest.
+ - #1785 Fix error messages when installing DKAN with the UI.
+ - #1786 Remove horizontal tab field from the group content type, fix margin on group block.
+ - #1786 Add hook to auto-assign editors the og administrator role.
+ - #1752 Added option for using quote delimiters when fast import is enabled for dkan datastore. Fixed error message when an import fails on DKAN Datastore Fast Import.
+ - #1703 Refactor Datastore API module, fixing some caching issues and improving joins
+ - #1804 Add project = dkan to dkan_sitewide.info to fix errors on update screen.
+ - #1811 Apply patches to the rules module that can prevent unnecessary DB lockouts.
+
 7.x-1.13.2 2017-03-16
 ----------------------
- - #1803 Fix broken access to featured groups sort order view. 
+ - #1803 Fix broken access to featured groups sort order view.
  - #1796 Fix Harvest support for contact name and contact email.
  - #1795 Update front page test on topics.feature with @customizable.
  - #1783 Update services to 3.19

profiles/dkan/circle.yml

@@ -28,6 +28,12 @@ checkout:
     # Remove the extra composer stuff that circleci loads and that is causing conflicts with drush.
     - rm -rf ~/.composer
 
+## Unset secure_file_priv on mysql.
+database:
+  pre:
+    - echo -e 'secure_file_priv = ""' | sudo sh -c "cat >> /etc/mysql/my.cnf"
+    - sudo /usr/sbin/service mysql restart
+
 ## Customize dependencies
 dependencies:
 

profiles/dkan/dkan.info

@@ -30,8 +30,8 @@ dependencies[] = ctools
 dependencies[] = date
 dependencies[] = date_api
 dependencies[] = date_popup
+dependencies[] = date_views
 dependencies[] = diff
-dependencies[] = date
 dependencies[] = double_field
 dependencies[] = entity
 dependencies[] = entity_token
@@ -124,4 +124,7 @@ dependencies[] = dkan_datastore
 dependencies[] = dkan_datastore_api
 dependencies[] = open_data_schema_map_dkan
 dependencies[] = visualization_entity_charts_dkan
-version = 7.x-1.13.2
+
+; Information added by DKAN release script on 4/18/2017
+version = 7.x-1.13.3
+project = dkan

profiles/dkan/dkan.install

@@ -251,3 +251,23 @@ function dkan_update_7013() {
   drush_delete_dir('profiles/dkan/themes/contrib/nuboot_radix');
   drush_delete_dir('profiles/dkan/themes/contrib/omega');
 }
+
+/**
+* Drop the 'field_modified_source_date' field.
+*/
+function dkan_update_7014() {
+  // Mark the field for deletion.
+  field_delete_field('field_modified_source_date');
+  // Run the batch process to actually delete the field.
+  $batch_size = 1;
+  field_purge_batch($batch_size);
+}
+
+/**
+ * Update the default jquery library to 1.10 (again).
+ */
+function dkan_update_7015() {
+  if (version_compare(variable_get('jquery_update_jquery_version'), '1.10', '<')) {
+    variable_set('jquery_update_jquery_version', '1.10');
+  }
+}

profiles/dkan/dkan.profile

@@ -266,6 +266,7 @@ function dkan_add_default_menu_links(&$context) {
  *   Batch context.
  */
 function dkan_build_menu_links(&$context) {
+  module_load_include('inc', 'features', 'features.export');
   $context['message'] = t('Building menu links and assigning custom admin menus to roles');
   $menu_links = features_get_default('menu_links', 'dkan_sitewide_menu');
   menu_links_features_rebuild_ordered($menu_links, TRUE);