[ckan-changes] [ckan/ckan] 039f77: [#4162] view filter: use plain queries when requir...

Fri Jun 8 11:31:23 UTC 2018

  Branch: refs/heads/package-blueprint-tests
  Home:   https://github.com/ckan/ckan
  Commit: 039f7755467fd7b4cbfb0dd10b6082288b18e2c6
      https://github.com/ckan/ckan/commit/039f7755467fd7b4cbfb0dd10b6082288b18e2c6
  Author: Ian Ward <ian at excess.org>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/modules/resource-view-filters.js

  Log Message:
  -----------
  [#4162] view filter: use plain queries when required

  Commit: c152675a4690476ee39fef358b133b8024e318ba
      https://github.com/ckan/ckan/commit/c152675a4690476ee39fef358b133b8024e318ba
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-04-30 (Mon, 30 Apr 2018)

  Changed paths:
    M Dockerfile
    M ckan/config/environment.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    A ckan/public-bs2/base/javascript/plugins/jquery.images-loaded.js
    M ckan/public-bs2/base/javascript/resource.config
    A ckan/public/base/javascript/plugins/jquery.images-loaded.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/bootstrap.less
    M ckan/templates-bs2/group/snippets/feeds.html
    M ckan/templates-bs2/group/snippets/group_form.html
    M ckan/templates-bs2/organization/snippets/feeds.html
    M ckan/templates-bs2/organization/snippets/organization_form.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base.html
    M ckan/tests/controllers/test_home.py
    M ckan/tests/test_none_root.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M doc/api/legacy-api.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst

  Log Message:
  -----------
  Merge branch 'master' into package-blueprint

  Commit: cdc5e58f23f2eaf2abb42a85dd3052eae1971163
      https://github.com/ckan/ckan/commit/cdc5e58f23f2eaf2abb42a85dd3052eae1971163
  Author: Ian Ward <ian at excess.org>
  Date:   2018-05-06 (Sun, 06 May 2018)

  Changed paths:
    M ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/modules/resource-view-filters.js

  Log Message:
  -----------
  [#4162] view filter: fix endless querying due to incorrect total

  Commit: 774f31e51c13e82574baa53d58d64dfe18d1159b
      https://github.com/ckan/ckan/commit/774f31e51c13e82574baa53d58d64dfe18d1159b
  Author: Ian Ward <ian at excess.org>
  Date:   2018-05-06 (Sun, 06 May 2018)

  Changed paths:
    M ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/modules/resource-view-filters.js

  Log Message:
  -----------
  [#4162] view filter: faster query without total calc

  Commit: fb18b400ae5db85bad60b75ebf9da35e87d2826e
      https://github.com/ckan/ckan/commit/fb18b400ae5db85bad60b75ebf9da35e87d2826e
  Author: Ian Ward <ian at excess.org>
  Date:   2018-05-11 (Fri, 11 May 2018)

  Changed paths:
    M ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/modules/resource-view-filters.js

  Log Message:
  -----------
  [#4162] IE compatibility

  Commit: babb752050cb271489cc1f58df22d675fa5f8184
      https://github.com/ckan/ckan/commit/babb752050cb271489cc1f58df22d675fa5f8184
  Author: Harald von Waldow <harald.vonwaldow at eawag.ch>
  Date:   2018-05-11 (Fri, 11 May 2018)

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  autocomplete tagsep - fix

  Commit: 56b35b894997527cdae047eeddb86090fa69c6e5
      https://github.com/ckan/ckan/commit/56b35b894997527cdae047eeddb86090fa69c6e5
  Author: Harald von Waldow <harald.vonwaldow at eawag.ch>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  separation tags as chars from str.split()

  Commit: c8c06c7dab35c503d6e7720699eabd1beb177627
      https://github.com/ckan/ckan/commit/c8c06c7dab35c503d6e7720699eabd1beb177627
  Author: Harald von Waldow <harald.vonwaldow at eawag.ch>
  Date:   2018-05-17 (Thu, 17 May 2018)

  Changed paths:
    M ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  adapted test

  Commit: ce829fa6c34c2670c1df7004cd349cd42459d9b7
      https://github.com/ckan/ckan/commit/ce829fa6c34c2670c1df7004cd349cd42459d9b7
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M ckan/views/admin.py

  Log Message:
  -----------
  Get file from request.files

  Commit: 9c03d1a81ec8372e40ab25d47e447d7788ae5e1a
      https://github.com/ckan/ckan/commit/9c03d1a81ec8372e40ab25d47e447d7788ae5e1a
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-05-23 (Wed, 23 May 2018)

  Changed paths:
    M ckan/views/admin.py

  Log Message:
  -----------
  remove wrongly added condition

  Commit: f8a8d7420552628c016eabd717f461b5466894a0
      https://github.com/ckan/ckan/commit/f8a8d7420552628c016eabd717f461b5466894a0
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-05-24 (Thu, 24 May 2018)

  Changed paths:
    M ckan/views/admin.py

  Log Message:
  -----------
  merge request dicts

  Commit: f6af3c633f06d5e7f69b307c1a3ded7bed4ebd5e
      https://github.com/ckan/ckan/commit/f6af3c633f06d5e7f69b307c1a3ded7bed4ebd5e
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2018-05-25 (Fri, 25 May 2018)

  Changed paths:
    M ckan/views/admin.py

  Log Message:
  -----------
  Merge pull request #4265 from tino097/4262-fix-upload-logo

Upload logo fix

  Commit: 9c6a2d037dd98179a23b71ada08726efb83502de
      https://github.com/ckan/ckan/commit/9c6a2d037dd98179a23b71ada08726efb83502de
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog

  Commit: fbf364d973527aa576364543aba21877e23e621d
      https://github.com/ckan/ckan/commit/fbf364d973527aa576364543aba21877e23e621d
  Author: amercader <amercadero at gmail.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Changelog tweaks

  Commit: f81bdfcd3c4af734bd49ce823b706fdac76eeab5
      https://github.com/ckan/ckan/commit/f81bdfcd3c4af734bd49ce823b706fdac76eeab5
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  update changelog

  Commit: 76b993b84cfc16473a49d645e7fce0cce76f0603
      https://github.com/ckan/ckan/commit/76b993b84cfc16473a49d645e7fce0cce76f0603
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog dev-v2.6

  Commit: 6be86af59046cffc2b6fbf6b6a2f06700a6950d8
      https://github.com/ckan/ckan/commit/6be86af59046cffc2b6fbf6b6a2f06700a6950d8
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog for release-v.2.5.9

  Commit: 7a8d37dd6c7018dd8b612805326beb770b85678a
      https://github.com/ckan/ckan/commit/7a8d37dd6c7018dd8b612805326beb770b85678a
  Author: Sergey <tonnydexter at gmail.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  Merge pull request #4250 from eawag-rdm/autocomplete_tagsep

autocomplete tagsep - fix

  Commit: dbd7460554a17c7e0f0e694960890224135a1f50
      https://github.com/ckan/ckan/commit/dbd7460554a17c7e0f0e694960890224135a1f50
  Author: Sergey <tonnydexter at gmail.com>
  Date:   2018-05-30 (Wed, 30 May 2018)

  Changed paths:
    M ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/modules/resource-view-filters.js

  Log Message:
  -----------
  Merge pull request #4201 from ckan/4162-add-filter-performance

[#4162] view filter: use plain queries when required

  Commit: affd4fcbc5638023ec7f219e3ba0a31ca76c0566
      https://github.com/ckan/ckan/commit/affd4fcbc5638023ec7f219e3ba0a31ca76c0566
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-05-31 (Thu, 31 May 2018)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/middleware/flask_app.py
    M ckan/controllers/error.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mk/LC_MESSAGES/ckan.mo
    M ckan/i18n/mk/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tl/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/app_globals.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/get.py
    M ckan/public-bs2/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/resource-view.less
    M ckan/templates-bs2/error_document_template.html
    M ckan/templates/error_document_template.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    R ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckan/views/admin.py
    M ckan/views/dataset.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    A doc/_static/css/custom.css
    A doc/_templates/layout.html
    M doc/conf.py
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-package.rst

  Log Message:
  -----------
  conflict

  Commit: feaf3d339bad976f607558ea516cb0dc4cc79853
      https://github.com/ckan/ckan/commit/feaf3d339bad976f607558ea516cb0dc4cc79853
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M doc/conf.py
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  use current version for older releases

  Commit: d3ad3bc74573965268539be1710e7f9b6ddfb0c6
      https://github.com/ckan/ckan/commit/d3ad3bc74573965268539be1710e7f9b6ddfb0c6
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-05 (Tue, 05 Jun 2018)

  Changed paths:
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  Set tag with variable

  Commit: 5a306eda067116376b7fa9706b4642811398f8a8
      https://github.com/ckan/ckan/commit/5a306eda067116376b7fa9706b4642811398f8a8
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2018-06-06 (Wed, 06 Jun 2018)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Include requirement-setuptools.txt in manifest

When attempting to `pip install ckan` it fails as the setup.py requires
the requirement-setuptools.txt to be present, and it is not.  This
change makes sure that the pip install will not fail due to the absence
of this file.

This PR does not include the requirements.txt as this would likely
require further discussion about how requirements are loaded.

Fixes #4271

  Commit: 3c7ad610cba7e9db8ea9a8467af516826773542d
      https://github.com/ckan/ckan/commit/3c7ad610cba7e9db8ea9a8467af516826773542d
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2018-06-06 (Wed, 06 Jun 2018)

  Changed paths:
    M MANIFEST.in

  Log Message:
  -----------
  Merge pull request #4275 from servercode/fix-4271-cannot-pip-install

Include requirement-setuptools.txt in manifest

  Commit: 87ab28d0f75732914ca6e5575822d8df504b948d
      https://github.com/ckan/ckan/commit/87ab28d0f75732914ca6e5575822d8df504b948d
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-06 (Wed, 06 Jun 2018)

  Changed paths:
    M ckan/templates-bs2/snippets/license.html
    M ckan/templates/snippets/license.html

  Log Message:
  -----------
  fix icon

  Commit: af9afa90579f22b2a27520e619f0d84ad3adaf8c
      https://github.com/ckan/ckan/commit/af9afa90579f22b2a27520e619f0d84ad3adaf8c
  Author: Goce Mitevski <goce.mitevski at keitaro.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  Fix issue #4273

  Commit: 1b9f5655de08e059ecaea67e916ddb6f8d2acb2c
      https://github.com/ckan/ckan/commit/1b9f5655de08e059ecaea67e916ddb6f8d2acb2c
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/storage.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  remove storage controller

  Commit: 1ca5becb28d28517d99a57244f1a44079c10e264
      https://github.com/ckan/ckan/commit/1ca5becb28d28517d99a57244f1a44079c10e264
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  small fix for #3991

  Commit: 5fc41ad2453628e79cacd2bb58199014e682da77
      https://github.com/ckan/ckan/commit/5fc41ad2453628e79cacd2bb58199014e682da77
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M doc/conf.py
    M doc/maintaining/installing/install-from-docker-compose.rst

  Log Message:
  -----------
  Merge pull request #4274 from tino097/4255-docs-use-current-verion

[#4255] docs use current version

  Commit: 8d1f0d75a46b7184009b7418861067f4a466588a
      https://github.com/ckan/ckan/commit/8d1f0d75a46b7184009b7418861067f4a466588a
  Author: Ian Ward <ian at excess.org>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/storage.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #4282 from tino097/remove-storage-controller

Remove storage controller

  Commit: 1ed813a3ee3a3376e0a298ce08a8cdd7a344fd9b
      https://github.com/ckan/ckan/commit/1ed813a3ee3a3376e0a298ce08a8cdd7a344fd9b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M ckan/templates-bs2/snippets/license.html
    M ckan/templates/snippets/license.html

  Log Message:
  -----------
  Merge pull request #4276 from tino097/4272-license-icon-fix

[#4272]fix icon

  Commit: 23ca1d7b05b086abdfdbbca9011c6d38bdf6f2cd
      https://github.com/ckan/ckan/commit/23ca1d7b05b086abdfdbbca9011c6d38bdf6f2cd
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M ckan/public/base/less/masthead.less

  Log Message:
  -----------
  Merge pull request #4281 from gocemitevski/site-search-input-border

Remove overly-specific .site-search input border

  Commit: 716a1ea652d4fcd00ea777825a6c98f6b916eadc
      https://github.com/ckan/ckan/commit/716a1ea652d4fcd00ea777825a6c98f6b916eadc
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2018-06-07 (Thu, 07 Jun 2018)

  Changed paths:
    M doc/api/index.rst
    M doc/contributing/documentation.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M doc/maintaining/stats.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Replace HTTPIE examples with CURL examples

As per #2293 we replace the httpie examples with the equivalent in curl.
It appears that the examples were using http and therefore were getting
a 302 to the https url, and as we all know to our pain, POST data
doesn't follow redirects and so the examples weren't always working.
Have changes some occurrences of http://demo.ckan.org to
https://demo.ckan.org

  Commit: 37fb5bc9be2d81dcfa2a2ae42bc532b7a2c61e02
      https://github.com/ckan/ckan/commit/37fb5bc9be2d81dcfa2a2ae42bc532b7a2c61e02
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M doc/api/index.rst

  Log Message:
  -----------
  Fix a missing http->https change

  Commit: 61a8b199e8b9403831dfa1937353f24a2a5499ef
      https://github.com/ckan/ckan/commit/61a8b199e8b9403831dfa1937353f24a2a5499ef
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M doc/api/index.rst
    M doc/contributing/documentation.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M doc/maintaining/stats.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge pull request #4286 from servercode/fix-2293

[#2293] Replace httpie doc examples with CURL examples

  Commit: b788193d623d031f908b5270431c6496b41e58dd
      https://github.com/ckan/ckan/commit/b788193d623d031f908b5270431c6496b41e58dd
  Author: amercader <amercadero at gmail.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M CHANGELOG.rst
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/controllers/tag.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/templates-bs2/admin/trash.html
    M ckan/templates-bs2/dataviewer/base.html
    M ckan/templates-bs2/header.html
    M ckan/templates-bs2/home/snippets/search.html
    M ckan/templates-bs2/home/snippets/stats.html
    M ckan/templates-bs2/organization/bulk_process.html
    M ckan/templates-bs2/organization/read.html
    M ckan/templates-bs2/package/activity.html
    M ckan/templates-bs2/package/base.html
    M ckan/templates-bs2/package/base_form_page.html
    M ckan/templates-bs2/package/confirm_delete.html
    M ckan/templates-bs2/package/confirm_delete_resource.html
    M ckan/templates-bs2/package/edit.html
    M ckan/templates-bs2/package/edit_base.html
    M ckan/templates-bs2/package/edit_view.html
    M ckan/templates-bs2/package/followers.html
    M ckan/templates-bs2/package/group_list.html
    M ckan/templates-bs2/package/new_package_form.html
    M ckan/templates-bs2/package/new_view.html
    M ckan/templates-bs2/package/read_base.html
    M ckan/templates-bs2/package/resource_edit.html
    M ckan/templates-bs2/package/resource_edit_base.html
    M ckan/templates-bs2/package/resource_read.html
    M ckan/templates-bs2/package/resource_views.html
    M ckan/templates-bs2/package/resources.html
    M ckan/templates-bs2/package/search.html
    M ckan/templates-bs2/package/snippets/new_package_breadcrumb.html
    M ckan/templates-bs2/package/snippets/package_basic_fields.html
    R ckan/templates-bs2/package/snippets/package_context.html
    M ckan/templates-bs2/package/snippets/package_form.html
    M ckan/templates-bs2/package/snippets/resource_form.html
    M ckan/templates-bs2/package/snippets/resource_item.html
    M ckan/templates-bs2/package/snippets/resource_view.html
    M ckan/templates-bs2/package/snippets/resource_views_list.html
    M ckan/templates-bs2/package/snippets/resource_views_list_item.html
    M ckan/templates-bs2/package/snippets/resources.html
    M ckan/templates-bs2/package/snippets/resources_list.html
    M ckan/templates-bs2/package/snippets/revisions_table.html
    M ckan/templates-bs2/package/snippets/stages.html
    M ckan/templates-bs2/package/view_edit_base.html
    M ckan/templates-bs2/revision/diff.html
    M ckan/templates-bs2/revision/read.html
    M ckan/templates-bs2/revision/snippets/revisions_list.html
    M ckan/templates-bs2/snippets/facet_list.html
    M ckan/templates-bs2/snippets/package_item.html
    M ckan/templates-bs2/snippets/tag_list.html
    M ckan/templates-bs2/tag/index.html
    M ckan/templates-bs2/user/dashboard_datasets.html
    M ckan/templates-bs2/user/read.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/group_list.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/new_package_breadcrumb.html
    M ckan/templates/package/snippets/package_basic_fields.html
    R ckan/templates/package/snippets/package_context.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/add_dataset.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/tag_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/read.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_get.py
    A ckan/views/dataset.py
    M ckan/views/feed.py
    A ckan/views/resource.py
    M ckanext/datastore/templates-bs2/package/resource_read.html
    M ckanext/datastore/templates-bs2/package/snippets/data_api_button.html
    A ckanext/example_idatasetform/plugin_v5.py
    M ckanext/example_idatasetform/templates/package/search.html
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_theme_docs/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/imageview/tests/test_view.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/template-tutorial.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'package-blueprint' of https://github.com/smotornyuk/ckan into smotornyuk-package-blueprint

  Commit: f27179a2375181604e617d71217f54259ca9a1c7
      https://github.com/ckan/ckan/commit/f27179a2375181604e617d71217f54259ca9a1c7
  Author: amercader <amercadero at gmail.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M ckan/config/routing.py
    R ckan/controllers/storage.py
    M ckan/public/base/less/masthead.less
    M ckan/templates-bs2/snippets/license.html
    M ckan/templates/snippets/license.html
    M ckan/tests/test_coding_standards.py
    M doc/api/index.rst
    M doc/conf.py
    M doc/contributing/documentation.rst
    M doc/maintaining/installing/install-from-docker-compose.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M doc/maintaining/stats.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' into smotornyuk-package-blueprint

  Commit: 0ac7f5bcac92ce5973d2205dfb4090bd2627a485
      https://github.com/ckan/ckan/commit/0ac7f5bcac92ce5973d2205dfb4090bd2627a485
  Author: amercader <amercadero at gmail.com>
  Date:   2018-06-08 (Fri, 08 Jun 2018)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/config/routing.py
    R ckan/controllers/storage.py
    M ckan/lib/helpers.py
    M ckan/public-bs2/base/javascript/modules/resource-view-filters-form.js
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/resource-view-filters-form.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/less/masthead.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates-bs2/snippets/license.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/snippets/license.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckan/views/admin.py
    M ckan/views/dataset.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M doc/api/index.rst
    M doc/conf.py
    M doc/contributing/documentation.rst
    M doc/maintaining/installing/install-from-docker-compose.rst
    M doc/maintaining/linked-data-and-rdf.rst
    M doc/maintaining/stats.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'smotornyuk-package-blueprint' into package-blueprint-tests

Compare: https://github.com/ckan/ckan/compare/6da371bd5e8f...0ac7f5bcac92
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.