test the 1.14 upgrade

build-dkan.make

@@ -8,7 +8,4 @@ includes[core] = dkan/drupal-org-core.make
 projects[dkan][type] = profile
 projects[dkan][download][type] = git
 projects[dkan][download][url] = https://github.com/NuCivic/dkan.git
-projects[dkan][download][tag] = 7.x-1.14-RC1
-
-projects[dkan][patch][] = https://patch-diff.githubusercontent.com/raw/NuCivic/dkan/pull/2121.diff
-
+projects[dkan][download][tag] = 7.x-1.14-RC3

dkan/.ahoy/dkan.ahoy.yml

@@ -189,7 +189,7 @@ commands:
       rm -fR dkan-ahoy
       rm -fR dkan/.ahoy
       rm dkan/dkan-init.sh
-      git clone '[email protected]:nucivic/dkan' --depth=1 dkan-ahoy
+      git clone '[email protected]:getdkan/dkan' --depth=1 dkan-ahoy
       cp -r dkan-ahoy/.ahoy dkan/
       cp dkan-ahoy/dkan-init.sh  dkan/
       cp dkan-ahoy/test/behat.docker.yml dkan/test/

dkan/.ahoy/theme.ahoy.yml

@@ -73,7 +73,7 @@ commands:
       ahoy drush pm-enable radix -y
       ahoy drush vset theme_default radix
       ahoy cmd-proxy drush cc drush
-      KIT_URL="https://github.com/NuCivic/radix-kit-nuboot/archive/master.zip"
+      KIT_URL="https://github.com/GetDKAN/radix-kit-nuboot/archive/master.zip"
       if ahoy cmd-proxy wget -q "$KIT_URL"; then
         ahoy cmd-proxy unzip master.zip
         ahoy cmd-proxy rm -rf master.zip

dkan/.github/CONTRIBUTING.md

@@ -76,7 +76,7 @@ ref: NuCivic/[repo]/[issue#]
 
 Please use a reasonably descriptive *title* as well. "Updating drupal-org.make" is not a helpful title; "Add views patch to drupal-org.make to address argument bug" is a helpful title!
 
-[See this pull request for an example](https://github.com/NuCivic/dkan/pull/629).
+[See this pull request for an example](https://github.com/GetDKAN/dkan/pull/629).
 
 If a pull request is simply being created for QA purposes or should for some other reason NOT be merged, explain this in the description and add a "don't merge" tag.
 

dkan/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,16 +1,12 @@
-Issue: link_to_jira_github_issue
-
-## Description
-
-Please write any background information about this PR you think is useful for the product team. 
+Description. Please write any background information about this PR you think is useful for the product team. Use any of the items below that are relevant to this pull request, and delete any that are not.
 
 ## User story
 
 If this PR introduces new functionality, include a user story or stories describing what this pull request is intended for.
 
 ## How to reproduce
 
-1.  If the PR fixes a bug, include instructions for reproducing the bug on a current DKAN release.
+1.  If the PR fixes a bug, include step-by-step instructions for reproducing the bug on a current DKAN release.
 
 ## QA Steps
 
@@ -21,6 +17,7 @@ If this PR introduces new functionality, include a user story or stories describ
 - [ ] Note if there is a special sequence for merging (such as PRs on other repos that need to be merged first) or other abnormalities to look out for.
 
 ## Reminders
+
 - [ ] There is test for the issue.
 - [ ] CHANGELOG updated.
 - [ ] Coding standards checked.

dkan/CHANGELOG.txt

@@ -1,5 +1,24 @@
-7.x-1.14.x
-----------
+7.x-1.14
+--------
+ - #2208 Fix access to groups field when adding a resource inside the dataset form.
+ - #2188 Move DKAN repository to GetDKAN organization in Github 
+ - #2033 Remove "author" facet from search page (generally never relevant information)
+ - #2205 Update docs files with organization changes (NuCivic to GetDKAN)
+ - #2206 Update autocomplete_deluxe, better_exposed_filters, file_entity, media, media_youtube, tablefield and views to latest version
+ - #2189 #2190 Documentation updates (Add help, license, dkan sites pages. Update site manager guide. Update dkan README.)
+ - #2186 Move the 'back to dataset' local task position so that the 'revisions' link position matches the standard location.
+ - #1979 Allow users to set Groups on standalone resources.
+ - #2151 Adding print styling so that images, table rows, and charts work with page breaks.
+ - #2141 Exclude header search form from printed output
+ - #2174 Fix access to revisions for anonymous users when dkan_workflow is enabled.
+ - #2175 Removed video content from the About page. Removed or replaced references to Granicus.
+ - #2075 DKAN Harvest: Modified batch process to split harvest migrations in chunks.
+ - #2145 Front page hero image no longer requests empty URL if variable empty.
+ - #2124 Add results count and increase results per page on the harvest dashboard view.
+ - #2082 Add UI for generating ODSM file caches.
+ - #2058 Improve messages displayed when creating a harvest source.
+ - #2058 Fix harvest bug when filtering by a key that has 0 matches.
+ - #2102 Hide toggle buttons inside preview embeds.
  - #1946 Fix Datastore API limit not applying consistently.
  - #2109 Fix ODSM language token to solve validation errors.
  - #2019 DKAN Workflow: Fix 'My Drafts' view to restore content to original user after rejection.
@@ -15,18 +34,18 @@
  - #1955 Update ahoy docker tooling for local environment usecase.
  - #1903 Add support for tab-delimited files (TSV) in resources/recline preview.
  - #2001 Improve REST API documentation.
- - #1991 Fix host IP replacement on script used to recconect the MySQL container. 
+ - #1991 Fix host IP replacement on script used to recconect the MySQL container.
  - #1942 DevOps: Restore drush commands to deal with orphaned resources.
  - #1943 Update tests to be more compatible with client sites, multiple testing and devops improvements.
  - #1962 Recline.view.nvd3.js: Fixed display of data with zero as values.
  - #1888 Added validation on axis tick settings on visualization_entity.
  - #1725 Fix `ahoy dkan uli` output login link.
- - #1881 Fix yaml syntaxt to make it standard. 
+ - #1881 Fix yaml syntaxt to make it standard.
  - #1853 Update chart documentation.
  - #1839 Add help text and improve UI on the chart form for better clarity.
- - #1827 Remove option to import TABed CSV files into datastore. 
+ - #1827 Remove option to import TABed CSV files into datastore.
  - #1807 Add admin_views module for enhanced content and file filtering.
- - #1990 DevOps: Automatically populate required fields when running behat tests. 
+ - #1990 DevOps: Automatically populate required fields when running behat tests.
  - #1938 DevOps: Allow behat tests to be skipped in circle.
  - #1842 Add help text to explain the pager on data previews.
  - #1542 Creates migration on harvest source import.
@@ -38,12 +57,6 @@
  - #2060 Update tests to adjust to client customizations.
  - #2060 Removed unused modules menu_token and remote_file_source from drupal-org.make
 
-7.x-1.13.8
-----------
- - #2058 Improve messages displayed when creating a harvest source.
- - #2058 Fix harvest bug when filtering by a key that has 0 matches.
- - #2102 Hide toggle buttons inside preview embeds.
-
 7.x-1.13.7 2017-08-22
 ---------------------
  - #2064 Update entityreference to 1.15
@@ -113,7 +126,7 @@
  - #1876 Removed hard coded colors in the menu.scss file.
  - #1825 Adapt the 'dataQuality' input value druing POD harvest.
  - #1817 Load empty cells as null in fast import.
- - #1846 Adds a hook_update to exclude the data dictionary field from using the markdown toolbar. 
+ - #1846 Adds a hook_update to exclude the data dictionary field from using the markdown toolbar.
  - #1813 Update the groups page view to sort alphabetically rather than by post date.
  - NuCivic/recline#89 Only load previews for resources using files; API/website links should always display iframe.
  - #1841 Fixed mis-named function on dkan_dataset_content_types.api.php
@@ -124,14 +137,14 @@
  - #1828 Field Frequency Harvest POD integration is missing support for "irregular" value.
  - #1820 Use "accessURL" during resources harvest if "downloadURL" field is not available.
  - #1852 Allow the use of multi-polygonal data for Dataset Spatial field.
- - #1857 Fixed publishing options not accessible when dkan_workflow is enabled. 
+ - #1857 Fixed publishing options not accessible when dkan_workflow is enabled.
  - #1932 Fix windows delimiter for datastore_fast_import.
 
 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. 
+ - #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.

dkan/README.md

@@ -1,16 +1,32 @@
-# DKAN Open Data Portal
+# DKAN Open Data Platform
 
-[![DKAN Sitewide Build Status](https://circleci.com/gh/NuCivic/dkan.svg?style=svg)](https://circleci.com/gh/NuCivic/dkan)
+DKAN is an open source open data platform with a full suite of cataloging, publishing and visualization features that allow organizations to easily publish data to the public.
 
-[![Join the chat at https://gitter.im/NuCivic/dkan](https://badges.gitter.im/NuCivic/dkan.svg)](https://gitter.im/NuCivic/dkan?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+*  [ Official website ](https://getdkan.org)
+*  [ Demo ](http://demo.getdkan.com/)
+*  [ Documetation ](http://docs.getdkan.com/)
 
-DKAN is a Drupal-based open data tool with a full suite of cataloging, publishing and visualization features that allows governments, nonprofits and universities to easily publish data to the public. It is inspired by the [CKAN project](https://github.com/ckan/ckan) and maintained by [Granicus Data](http://getdkan.com/contact).
+## Community
+
+Join the [DKAN Slack community](https://dkansignup.herokuapp.com/).
+
+## Connect
 
-[![DKAN](docs/images/dkan-front-page.png)](http://getdkan.com)
+* [ Subscribe ](http://eepurl.com/c01YS1)
+* [ Slack ](https://dkan.slack.com/)
+* [ Blog ](https://medium.com/dkan-blog)
+* [ Twitter ](https://twitter.com/getdkan)
+* [ GitHub ](https://github.com/getdkan)
+* [ YouTube ](https://www.youtube.com/channel/UCl7qFUCkyh32lss4EjQEUXg)
+* [ Drupal ](https://www.drupal.org/project/dkan)
+* [ Eventbrite ](https://www.eventbrite.com/o/dkan-14793986036)
+* [ RSS ](https://medium.com/feed/dkan-blog)
 
-*  [ Live demo » ](http://demo.getdkan.com/)
-*  [ Full Documetation » ](http://docs.getdkan.com/)
-*  [ Open data portals using DKAN » ](https://github.com/NuCivic/dkan-sites)
+## Help
+
+* General: [DKAN documentation](http://docs.getdkan.com)
+* Developers: Submit a [Github issue](https://github.com/nucivic/dkan/issues) or post to [ #dev ](https://dkan.slack.com/messages/C4BEVFDKJ/) channel in [ DKAN Slack ](https://dkan.slack.com)
+* Bugs: Submit a [Github issue](https://github.com/nucivic/dkan/issues)
 
 ## Features
 
@@ -20,7 +36,6 @@ DKAN is a Drupal-based open data tool with a full suite of cataloging, publishin
 *   Customize your own metadata fields, themes and branding
 *   Store data within DKAN or on external (e.g. departmental) sites
 *   Manage access control, version history with rollback, RDF support, user analytics
-*   Supported enterprise-quality commercial support and FISMA-certified cloud hosting options available
 
 ### For data users
 
@@ -30,27 +45,19 @@ DKAN is a Drupal-based open data tool with a full suite of cataloging, publishin
 *   Manage access control, version history with rollback, INSPIRE/RDF support, user analytics
 *   Extend and leverage the full universe of more than 18,000 freely available Drupal modules
 
-## Hosting and support
-
-Granicus [Data](http://getdkan.com/) platform offers 24/7, secure, cloud-based DKAN hosting and support services.
-
 ## Installation
 
-Please see the ["Installation" section of the DKAN Documentation](http://docs.getdkan.com/en/latest/introduction/installation.html).
+Please see the [Installation](http://docs.getdkan.com/en/latest/introduction/installation.html) section of the DKAN Documentation.
 
 ### Upgrading DKAN
 
-Please see the ["Updating and Maintaining DKAN" section of the DKAN Documentation](http://docs.getdkan.com/en/latest/introduction/maintaining.html) for general upgrade information.
+Please see the [Updating and Maintaining DKAN](http://docs.getdkan.com/en/latest/introduction/maintaining.html) section of the DKAN Documentation for general upgrade information.
 
 ## Releases
 
-Check the [releases page](https://github.com/NuCivic/dkan/releases) for latest DKAN Version. 7.x-1.x is the development branch.
+Check the [releases page](https://github.com/GetDKAN/dkan/releases) for latest DKAN Version. 7.x-1.x is the development branch.
 
-Contact us if you want to get involved!
-
-DKAN development is a sponsored by NuCivic. For more information about hosting and professional support options for DKAN, see http://getdkan.com/contact
-
-### Releases and Release Candidates
+### Releases and release candidates
 
 DKAN follows a modified semantic versioning convention, and has _major_, _point_ (also known as _minor_), and _patch_ releases.
 
@@ -64,47 +71,24 @@ _Patch_ releases, introduced after the release of DKAN 7.x-1.12, occur much more
 
 After a _point_ release comes out, we create a _release branch_, on which we do any work intended for future _patch_ releases on that version of DKAN. The _release branch_ for version 7.x-1.12 development, for instance, is `release-1-12`. New features and other work destined for the next _point release_ continues on the main development branch, `7.x-1.x`.
 
-We keep the DKAN profile (this project), [DKAN Dataset](https://github.com/NuCivic/dkan_dataset), [DKAN Datastore](https://github.com/NuCivic/dkan_datastore), [DKAN Workflow](https://github.com/NuCivic/dkan_workflow) and [Recline](https://github.com/NuCivic/recline) versioning in sync. Other depdendencies that we maintain, incuding [Open Data Schema Map](https://github.com/NuCivic/open_data_schema_map) and [Visualization Entity](https://github.com/NuCivic/visualization_entity) follow their own, separate release cycle.
-
-## Getting Help with DKAN
-
-Have a question, found a bug, or need help with DKAN? Check our [documentation](http://docs.getdkan.com) first. In addition:
-
-### General questions as a developer or site builder
+We keep the DKAN profile (this project), [DKAN Dataset](https://github.com/GetDKAN/dkan_dataset), [DKAN Datastore](https://github.com/GetDKAN/dkan_datastore), [DKAN Workflow](https://github.com/GetDKAN/dkan_workflow) and [Recline](https://github.com/GetDKAN/recline) versioning in sync. Other depdendencies that we maintain, incuding [Open Data Schema Map](https://github.com/GetDKAN/open_data_schema_map) and [Visualization Entity](https://github.com/GetDKAN/visualization_entity) follow their own, separate release cycle.
 
-Please post a question on our [Developer list](https://groups.google.com/forum/?hl=en#!forum/dkan-dev).
-
-### Bugs and issues
-
-Please post it to our [Github issue queue](https://github.com/nucivic/dkan/issues).
-
-### I would like to purchase Granicus support or hosting
-
-[Please contact us for a consultation](https://granicus.com/contact-us/).
-
-## Community
-
-While the GovDelivery Open Data team leads the DKAN project, there is a worldwide community behind it contributing ideas and code. You are welcome to join the discussion:
+## License
 
-* [The DKAN Developers mailing list](https://groups.google.com/forum/?hl=en#!forum/dkan-dev)
-* [Our Gitter channel](https://gitter.im/NuCivic/dkan)
+DKAN and related modules are freely-available under the [ GPLv2 (or later) ](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html) license.
 
 ## Contributing
 
-Please file all tickets for DKAN [in this issue queue](https://github.com/NuCivic/dkan/issues). We have several labels in place for you to tag the issue with and identify it with the proper component.
+Please file all tickets for DKAN [in this issue queue](https://github.com/GetDKAN/dkan/issues). We have several labels in place for you to tag the issue with and identify it with the proper component.
 
-Please follow the [Ticket Template](https://github.com/NuCivic/dkan/blob/7.x-1.x/.github/CONTRIBUTING.md#new-feature-template) when creating new tickets.
+Please follow the [Ticket Template](https://github.com/GetDKAN/dkan/blob/7.x-1.x/.github/CONTRIBUTING.md#new-feature-template) when creating new tickets.
 
 Also, please remember to reference the issue across repositories in order for maintainers to pick up commits and pull requests looking at the issue. You can do that for commits like this:
 
 ```bash
 git commit -m "Issue NuCivic/dkan#<issue_number>: ..."
 ```
 
-Just replace **<issue_number>** with the actual issue number. You can reference pull requests exactly like that if you add the same text **"NuCivic/dkan#&lt;issue_number&gt;"** in a comment. 
+Just replace **<issue_number>** with the actual issue number. You can reference pull requests exactly like that if you add the same text **"NuCivic/dkan#&lt;issue_number&gt;"** in a comment.
 
-This really help us detecting changes and pulling them in in faster.
-
-## License
-
-DKAN is licensed on the same terms as Drupal, under GPLv2 or later. If you have any questions about the license a good place to start is to look at the Drupal Licensing [FAQ](https://www.drupal.org/about/licensing#q1). The DKAN license also covers the related modules such as recline, open data scheme map, visualization entity feeds flat processor, and the taxonomy features. 
+This helps us with detecting changes and pulling them in faster.

dkan/dkan-init.sh

@@ -237,7 +237,7 @@ if [ ! "$SKIP_INIT" ]; then
   if [ "$MODULE_NAME" != "dkan" ]; then
     echo "Cloning dkan.."
     # switched to https because ssh keys may not exist in all environments (Probo)
-    git clone https://github.com/NuCivic/dkan.git --branch $BRANCH
+    git clone https://github.com/GetDKAN/dkan.git --branch $BRANCH
   fi
 
   if [ -f dkan/.ahoy/starter.ahoy.yml ]; then

dkan/dkan.info

@@ -124,3 +124,7 @@ dependencies[] = dkan_datastore
 dependencies[] = dkan_datastore_api
 dependencies[] = open_data_schema_map_dkan
 dependencies[] = visualization_entity_charts_dkan
+
+; Information added by DKAN release script on 11/2/2017
+version = 7.x-1.14-RC3
+project = dkan

dkan/dkan.install

@@ -413,3 +413,21 @@ function dkan_update_7023() {
 function dkan_update_7024(&$context) {
   dkan_misc_variables_set($context);
 }
+
+/**
+ * Update copyright information.
+ */
+function dkan_update_7025() {
+  $settings = variable_get('theme_nuboot_radix_settings', array());
+  if ($settings['copyright']['value'] == 'Powered by <a href="http://getdkan.com/">DKAN</a>, a project of <a href="http://granicus.com">Granicus</a>') {
+    $settings['copyright']['value'] = t('Powered by <a href="http://getdkan.org/">DKAN</a>');
+    variable_set('theme_nuboot_radix_settings', $settings);
+  }
+}
+
+/**
+ * Revert content types dataset to revert og_group_ref on resources.
+ */
+function dkan_update_7026() {
+  features_revert(array('dkan_dataset_content_types' => array('field_base', 'field_instance')));
+}