Integration 1.14.3 (#2378)

* New release replacements on makefiles and info files

* Add custom css to docs (#2293)

* Add custom css to docs

* Change title to DKAN Docs

* Removes version information from all modules .info files.

* Pegs the versions of some external modules in accordance to their new release schemes.

* Fixing linting issues with .info files.

* Remove redundant debug output. (#2332)

* Pin sphinx to 1.5.6 (#2337)

* Add results count to dkan admin views (#2327)

* Add results count to dkan admin views

* Restore blank line on line 2

* Update @resource_all_09 scenario (#2321)

* Moving the "Adding New Content" page to main admin doc tree (#2347)

"Adding New Content" is vital but was previously buried two levels in; page deserves to be accessible in main admin doc tree

* Site Manager Monthly Maintenance checklist (#2345)

See #2313

* Remove out-dated owners.md file

* Updated Help page; can add your company to listing (#2346)

* Updated Help page; can add your company to listing

See #2306

* Adding Kim's comment to the "Add Your Business" page

* Patch features to add new line after <?php (#2370)

* Modifies curl settings so url headers and info can be properly acquired with curl (#2341)

* Modifies curl settings so url headers and info can be properly acquired with curl.

* Fixing linting issues with .info files.

* Update file name on getRemoteFileInfoTest.php

* Update test file

* Upgrade filefield_sources to 1.11 (#2359)

* Changelog for the 1.14.2 patch release. (#2371)

* Security update for Entity API (#2377)

* Changelog for the 1.14.3 patch release

* Fix linting issues

CHANGELOG.txt

@@ -2,6 +2,24 @@
 --------
  - #2290 Add Extended Metadata Field for Datasets
 
+7.x-1.14.3
+----------
+ - #2377 Upgrade entity to 1.9
+
+7.x-1.14.2
+----------
+ - #2359 Upgrade filefield_sources to 1.11
+ - #2341 Modifies curl settings so url headers and info can be properly acquired with curl
+ - #2370 Patch features to add new line after <?php
+ - #2346 Updated Help page; can add your company to listing
+ - Remove out-dated owners.md file
+ - #2345 Site Manager Monthly Maintenance checklist
+ - #2347 Moving the "Adding New Content" page to main admin doc tree
+ - #2321 Update @resource_all_09 scenario
+ - #2327 Add results count to dkan admin views
+ - #2337 Pin sphinx to 1.5.6
+ - #2332 Remove redundant debug output
+
 7.x-1.14.1
 ----------
  - #2280 Fix contextual filter on list_of_users_groups view

docs/_static/css/custom.css

@@ -0,0 +1,20 @@
+h1, h2, h3, h4, h5, h6 {
+  font-family: 'Lato', sans-serif;
+  font-weight: 900;
+}
+.wy-nav-side {
+  background: #212121;
+}
+.wy-nav-content {
+  color: #212121;
+}
+.wy-nav-content a,
+.wy-nav-content a:visited {
+  color: #0071BC;
+}
+.wy-side-nav-search {
+  background-color: #0071BC;
+}
+.wy-side-nav-search>div.version {
+  color: #eee;
+}

docs/admin/index.rst

@@ -35,8 +35,10 @@ Appearance
    :maxdepth: 1
 
    account_access_and_setup
+   adding_new_content
+   admin_menu
    appearance
    data_and_content/index
    people/index
    structure
-   admin_menu
+

docs/admin/sitemanagermaintenance

@@ -0,0 +1,47 @@
+# Site Manager Monthly Maintenance Checklist
+
+
+### Content
+*(Accessible via the “Content” tab on the black site administration toolbar)*
+
+- Check the “Content” list for an overview of the content currently hosted on your site. 
+
+- Is there any content that needs to be published or unpublished? Are there duplicates? If so, take a moment to clean up your content.
+
+### Groups
+*(Accessible via the “Groups” button on the main site navigation bar)*
+
+- Is the Groups list up to date? 
+
+- Does each Group have an appropriate image and description?
+
+### Tags and Taxonomies
+*(Mouse over Site Configuration on the black site administration toolbar, then click “Taxonomy”)*
+
+- Check your site’s list of Tags, located in the Taxonomy menu. To view a list of all Tags on the site, click “List terms.” 
+
+- Are there any misspelled tags? Are there any duplicate tags? If so, take a moment to clean up your tags.
+
+### User management
+*(Accessible via the “People” tab on the black site administration toolbar)*
+
+- Is the user list up to date? For site security, always double-check that there aren’t any accounts accessible to users who have left your organization. If this is the case, their accounts should be canceled or blocked.
+
+- Do all of the users in your organization have the proper site roles? (Site Manager, Editor, Content Creator.)
+
+### Workbench (Optional, if the Workbench/Workflow Modules have been enabled)
+*(Accessible via the “My Workbench” tab in the site administration bar)*
+
+- Workbench moderation queue tasks - check each of these tabs:
+
+**My drafts**
+- Are there any drafts that ought to be pushed to “Published” or “Needs Review”?
+
+**Needs review**
+- Are there any items under review that ought to be pushed back to “Draft” or published?
+
+**Stale drafts**
+- These are drafts that have been unmoderated for over 72 hours. Make sure content doesn’t build up under this queue!
+
+**Stale reviews**
+- These are items under review that have been unmoderated for over 72 hours.

docs/community/help.rst

@@ -7,3 +7,13 @@ For professional DKAN development services and support:
 - `Angry Cactus <http://www.angrycactus.biz/>`_
 - `National Democratic Institute <https://www.nditech.org/project/dkan>`_
 - `Annai <http://landing.dkan.annai.co.jp/>`_
+
+Add your company
+=================
+
+If you provide DKAN development and/or support services, here's how to add your company to business directory:
+
+- Create a /dkan page on your website (ex: https://civicactions.com/dkan/)
+- Create a [new issue](https://github.com/GetDKAN/dkan/issues/new) and include logo, company name, link to /dkan page, brief description of services with respect to DKAN
+
+Someone on the DKAN team will review your request and add your company if it's appropriate for the DKAN community.

docs/conf.py

@@ -19,13 +19,13 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'DKAN'
+project = u'DKAN Docs'
 copyright = u'2017'
 author = u'DKAN Team'
 
 
-version = '1.13'
-release = '1.13'
+version = '1.14'
+release = '1.14'
 
 language = 'en'
 
@@ -214,6 +214,7 @@
 
 github_doc_root = 'https://github.com/GetDKAN/dkan/tree/rtd/docs/'
 def setup(app):
+    app.add_stylesheet( "css/custom.css" )
     app.add_config_value('recommonmark_config', {
             'url_resolver': lambda url: github_doc_root + url,
             'auto_toc_tree_section': 'Contents',

docs/requirements.txt

@@ -1,4 +1,4 @@
-sphinx>=1.5.2
+sphinx==1.5.6
 sphinx-rtd-theme>=0.2.4
 recommonmark==0.4.0
 # sphinxcontrib-httpdomain==1.5.0

drupal-org.make

@@ -1,21 +1,22 @@
+---
 api: '2'
 core: 7.x
 includes:
-  - "https://raw.githubusercontent.com/NuCivic/visualization_entity/7.x-1.x/visualization_entity.make"
-  - "https://raw.githubusercontent.com/NuCivic/open_data_schema_map/7.x-1.x/open_data_schema_map.make"
-  - "https://raw.githubusercontent.com/NuCivic/leaflet_draw_widget/master/leaflet_widget.make"
-  - "https://raw.githubusercontent.com/NuCivic/recline/7.x-1.x/recline.make"
+- https://raw.githubusercontent.com/NuCivic/visualization_entity/7.x-2.0/visualization_entity.make
+- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/7.x-2.0/open_data_schema_map.make
+- https://raw.githubusercontent.com/NuCivic/leaflet_draw_widget/5a5f8faf664aeca02371f6692307580d9fab9116/leaflet_widget.make
+- https://raw.githubusercontent.com/NuCivic/recline/7.x-2.0/recline.make
 projects:
   admin_menu:
-    version: '3.0-rc5'
+    version: 3.0-rc5
   admin_menu_source:
     version: '1.1'
     patch:
-      2441283: 'https://www.drupal.org/files/issues/allow_ordering_of_the-2441283-5.patch'
+      2441283: https://www.drupal.org/files/issues/allow_ordering_of_the-2441283-5.patch
   admin_views:
     version: '1.6'
     patch:
-      1780004: 'https://www.drupal.org/files/issues/admin_views-duplicate_system_path-1780004-54.patch'
+      1780004: https://www.drupal.org/files/issues/admin_views-duplicate_system_path-1780004-54.patch
   adminrole:
     version: '1.1'
   autocomplete_deluxe:
@@ -60,7 +61,7 @@ projects:
   date:
     version: '2.10'
   defaultconfig:
-    version: '1.0-alpha11'
+    version: 1.0-alpha11
   devel:
     version: '1.5'
   diff:
@@ -76,7 +77,7 @@ projects:
     version: '2.1'
   entity:
     download:
-      full_version: 7.x-1.8
+      full_version: 7.x-1.9
     patch:
       2341611: https://www.drupal.org/files/issues/entity-multivalue-token-replacement-fix-2341611-0.patch
       2564119: https://www.drupal.org/files/issues/Use-array-in-foreach-statement-2564119-1.patch
@@ -98,6 +99,8 @@ projects:
     version: '1.4'
   features:
     version: '2.10'
+    patch:
+      2765721: https://www.drupal.org/files/issues/features-blank-line-after-php-tag-2765721-0.patch
   features_roles_permissions:
     version: '1.2'
   feeds:
@@ -120,8 +123,8 @@ projects:
   feeds_flatstore_processor:
     download:
       type: git
-      url: 'https://github.com/GetDKAN/feeds_flatstore_processor.git'
-      branch: master
+      url: https://github.com/GetDKAN/feeds_flatstore_processor.git
+      revision: 82b2a05bd133dbf870bdf09f1c0a45711f1432e3
   field_group:
     version: '1.5'
     patch:
@@ -150,7 +153,7 @@ projects:
       url: https://git.drupal.org/project/file_resup.git
       revision: 6cf030c2c139374c75527221775965ff0242df15
   filefield_sources:
-    version: '1.10'
+    version: '1.11'
   font_icon_select:
     download:
       type: git
@@ -191,8 +194,8 @@ projects:
   leaflet_draw_widget:
     download:
       type: git
-      url: 'https://github.com/GetDKAN/leaflet_draw_widget.git'
-      branch: 'master'
+      url: https://github.com/GetDKAN/leaflet_draw_widget.git
+      revision: 5a5f8faf664aeca02371f6692307580d9fab9116
   libraries:
     version: '2.3'
   link:
@@ -250,7 +253,7 @@ projects:
     download:
       type: git
       url: https://github.com/GetDKAN/open_data_schema_map.git
-      branch: 7.x-1.x
+      tag: 7.x-2.0
   panelizer:
     version: '3.4'
   panels:
@@ -283,8 +286,8 @@ projects:
   recline:
     download:
       type: git
-      url: 'https://github.com/GetDKAN/recline.git'
-      branch: 7.x-1.x
+      url: https://github.com/GetDKAN/recline.git
+      tag: 7.x-2.0
   ref_field:
     download:
       type: git
@@ -296,7 +299,7 @@ projects:
     download:
       type: git
       url: https://github.com/GetDKAN/remote_stream_wrapper.git
-      branch: 7.x-1.x
+      revision: 20311eee8f0ba87cbb7e48788b176c34e0313a78
   replicate:
     version: '1.2'
   replicate_paragraphs:
@@ -338,8 +341,8 @@ projects:
   taxonomy_fixtures:
     download:
       type: git
-      url: 'https://github.com/GetDKAN/taxonomy_fixtures.git'
-      branch: 7.x-1.x
+      url: https://github.com/GetDKAN/taxonomy_fixtures.git
+      revision: efabb2362509f80c40084109456c7483b5452b0a
   token:
     version: '1.7'
   token_tweaks:
@@ -361,7 +364,7 @@ projects:
     download:
       type: git
       url: https://github.com/GetDKAN/visualization_entity.git
-      branch: 7.x-1.x
+      tag: 7.x-2.0
     type: module
   workbench:
     version: '1.2'