[ckan-changes] [ckan/ckan] 3a53ab: [2939] & [1651] How to solr-jetty JSP support

GitHub noreply at github.com
Fri May 12 15:50:58 UTC 2017


  Branch: refs/heads/3196-common-url_for
  Home:   https://github.com/ckan/ckan
  Commit: 3a53ab291f338c911a1ce4bcf6a8ed7ce92aeb53
      https://github.com/ckan/ckan/commit/3a53ab291f338c911a1ce4bcf6a8ed7ce92aeb53
  Author: Mitchell Stanton-Cook <mitchell.stantoncook at xvt.com.au>
  Date:   2016-04-18 (Mon, 18 Apr 2016)

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

  Log Message:
  -----------
  [2939] & [1651] How to solr-jetty JSP support

There are still issues with solr-jetty. The documentation additions here
provide a recipe to handle/fix the 'HTTP ERROR 500... JSP support not
configured' error.


  Commit: 80b9c6e86a7c22b5efa56741a3ab80a4041892ba
      https://github.com/ckan/ckan/commit/80b9c6e86a7c22b5efa56741a3ab80a4041892ba
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#3384] factor load_config() out of CkanCommand class


  Commit: d0f99dbeb9c8d240bb406e57148fbc03e845f56b
      https://github.com/ckan/ckan/commit/d0f99dbeb9c8d240bb406e57148fbc03e845f56b
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M ckanext/datastore/commands.py
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  [#3384] docopt and simple function for datastore cli


  Commit: c2950187501f802b254eb60370c9d3fdfa9de9e3
      https://github.com/ckan/ckan/commit/c2950187501f802b254eb60370c9d3fdfa9de9e3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  [#3384] pep8


  Commit: e94354a55a513c72e70db7d6162b241ee74139ed
      https://github.com/ckan/ckan/commit/e94354a55a513c72e70db7d6162b241ee74139ed
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-02 (Mon, 02 Jan 2017)

  Changed paths:
    M ckanext/datastore/commands.py
    M ckanext/datastore/set_permissions.sql

  Log Message:
  -----------
  [#3384] use datastore.helpers.identifier to format sql safely


  Commit: fe1c98364d153935dd96baf8b7ec3a9405eef805
      https://github.com/ckan/ckan/commit/fe1c98364d153935dd96baf8b7ec3a9405eef805
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-07 (Sat, 07 Jan 2017)

  Changed paths:
    M ckanext/datastore/commands.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#3384] use click instead of docopt


  Commit: 584b22bbec94e2b8f1a094022689555a3dad960b
      https://github.com/ckan/ckan/commit/584b22bbec94e2b8f1a094022689555a3dad960b
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-08 (Sun, 08 Jan 2017)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datastore/commands.py
    M setup.py

  Log Message:
  -----------
  [#3384] factor out paster_click_group wrapper


  Commit: a840886bbaf2cbd1900ba30b1d9e086fabd39eb3
      https://github.com/ckan/ckan/commit/a840886bbaf2cbd1900ba30b1d9e086fabd39eb3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-08 (Sun, 08 Jan 2017)

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  [#3384] literal string style


  Commit: 0d37eff0bc4c32974064f6bbb4cb5b5d181c8a9f
      https://github.com/ckan/ckan/commit/0d37eff0bc4c32974064f6bbb4cb5b5d181c8a9f
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-08 (Sun, 08 Jan 2017)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#3384] fix prog_name, help_option_names


  Commit: 1103a45f46ef55a77fdf8f967004ffaea65fb811
      https://github.com/ckan/ckan/commit/1103a45f46ef55a77fdf8f967004ffaea65fb811
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-12 (Thu, 12 Jan 2017)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#3384] fix for paster_click_group


  Commit: 2ae626c7c234d2401b7c1612141364d0837751fb
      https://github.com/ckan/ckan/commit/2ae626c7c234d2401b7c1612141364d0837751fb
  Author: Ian Ward <ian at excess.org>
  Date:   2017-01-13 (Fri, 13 Jan 2017)

  Changed paths:
    M .circleci-matrix.yml
    A .travis.yml
    M CHANGELOG.rst
    M Dockerfile
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/model/dashboard.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
    M ckan/plugins/interfaces.py
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    M ckan/templates/user/dashboard_organizations.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/helpers.py
    M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_base.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/test_common.py
    A ckan/views/__init__.py
    A ckan/views/api.py
    M ckanext/datastore/controller.py
    A ckanext/datastore/writer.py
    A ckanext/example_flask_iblueprint/__init__.py
    A ckanext/example_flask_iblueprint/plugin.py
    A ckanext/example_flask_iblueprint/templates/about.html
    A ckanext/example_flask_iblueprint/templates/about_base.html
    A ckanext/example_flask_iblueprint/tests/__init__.py
    A ckanext/example_flask_iblueprint/tests/test_routes.py
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M ckanext/test_tag_vocab_plugin.py
    A contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-cloud.yml
    M contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3384-datastore-cli


  Commit: c7bd2ab4aa7f11655838fd7946706085c7d1ac02
      https://github.com/ckan/ckan/commit/c7bd2ab4aa7f11655838fd7946706085c7d1ac02
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-03 (Fri, 03 Feb 2017)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/datastore/commands.py

  Log Message:
  -----------
  [#3384] paster->click adapter fix for -c before subcommand


  Commit: fb5cef3c10f6001fb0b684789f5c75b5537136f6
      https://github.com/ckan/ckan/commit/fb5cef3c10f6001fb0b684789f5c75b5537136f6
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-06 (Mon, 06 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  [#3428] replace db._get_engine with db.get_(read|write)_engine


  Commit: 361acc14ba743c04c134cbc36369ef4cfbabe0e5
      https://github.com/ckan/ckan/commit/361acc14ba743c04c134cbc36369ef4cfbabe0e5
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M ckanext/datapusher/tests/test_interfaces.py

  Log Message:
  -----------
  [#3428] one more db._get_engine replacement


  Commit: 7cc6c377353c518b673483316d1e1bbbfa270575
      https://github.com/ckan/ckan/commit/7cc6c377353c518b673483316d1e1bbbfa270575
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-07 (Tue, 07 Feb 2017)

  Changed paths:
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  [#3428] one more db._get_engine replacement


  Commit: 7cda59279c87497963c72a9fd489aaaac99453b0
      https://github.com/ckan/ckan/commit/7cda59279c87497963c72a9fd489aaaac99453b0
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    R ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit_base.html
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    A ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/package/resource_edit_base.html
    M ckanext/datastore/templates/package/resource_read.html

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/3414-datastore-info' into 3428-datastore-triggers


  Commit: c58d70f5690721a9b49e853f2f0636797d879cf5
      https://github.com/ckan/ckan/commit/c58d70f5690721a9b49e853f2f0636797d879cf5
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-13 (Mon, 13 Feb 2017)

  Changed paths:
    M ckan/lib/navl/validators.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#3428] datastore_function actions


  Commit: 24e8169cae103e383eefdb1d4e2905d10d4aa330
      https://github.com/ckan/ckan/commit/24e8169cae103e383eefdb1d4e2905d10d4aa330
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-16 (Thu, 16 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#3428] working triggers (exceptions not handled yet)


  Commit: 487d5fa26643823272b6671cb3aef05fe2f7185d
      https://github.com/ckan/ckan/commit/487d5fa26643823272b6671cb3aef05fe2f7185d
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-02-20 (Mon, 20 Feb 2017)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#3071] Regenerating API Key fails for users missing required columns (ex: email)


  Commit: e60c204ca9961ef0ecefd03db2996be9134fe218
      https://github.com/ckan/ckan/commit/e60c204ca9961ef0ecefd03db2996be9134fe218
  Author: Gleb <gleb.rudenko at linkdigital.com.au>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  #3028 / UI labels for the last_modified and revision_timestamp fields


  Commit: 18f0d58f5df4adc355640c1b2b8e736320065212
      https://github.com/ckan/ckan/commit/18f0d58f5df4adc355640c1b2b8e736320065212
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-23 (Thu, 23 Feb 2017)

  Changed paths:
    M ckan/tests/helpers.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#3428] start of function create tests


  Commit: 2324fe9ec8daff9dbf4a4cdb54b30b102755b223
      https://github.com/ckan/ckan/commit/2324fe9ec8daff9dbf4a4cdb54b30b102755b223
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#3428] properly clear functions in datastore tests


  Commit: d644cc8133c97f088c721f556c7519eb471b0aa6
      https://github.com/ckan/ckan/commit/d644cc8133c97f088c721f556c7519eb471b0aa6
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-27 (Mon, 27 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#3428] test redefinition and or_replace


  Commit: a4423c05502039c8f46e9532d2f597ac9df8713c
      https://github.com/ckan/ckan/commit/a4423c05502039c8f46e9532d2f597ac9df8713c
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#3428] test datastore_create with missing function


  Commit: f1b1a93b7b553eb25aa24f408d4f177bc6c2d1b3
      https://github.com/ckan/ckan/commit/f1b1a93b7b553eb25aa24f408d4f177bc6c2d1b3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#3428] test triggers apply to _create and _upsert


  Commit: 39832485604399cadaaf8033e32eb714c90be055
      https://github.com/ckan/ckan/commit/39832485604399cadaaf8033e32eb714c90be055
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#3428] trigger exceptions raise ValidationErrors


  Commit: e0d3f056457730343e3d628885ba764bdd109913
      https://github.com/ckan/ckan/commit/e0d3f056457730343e3d628885ba764bdd109913
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_delete.py

  Log Message:
  -----------
  [#3428] fix datastore_function_delete


  Commit: d2ef4cdec8513fbf594d3d5aa480b622f32a3be4
      https://github.com/ckan/ckan/commit/d2ef4cdec8513fbf594d3d5aa480b622f32a3be4
  Author: Ian Ward <ian at excess.org>
  Date:   2017-02-28 (Tue, 28 Feb 2017)

  Changed paths:
    A .editorconfig
    M CHANGELOG.rst
    M ckan/common.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.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/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/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/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/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/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/fanstatic_resources.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/templates/group/members.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resources.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    A ckan/templates/tests/flash_messages.html
    A ckan/tests/config/test_sessions.py
    M ckan/tests/legacy/lib/test_i18n.py
    A ckan/tests/lib/test_celery_app.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_delete.py
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3428-datastore-triggers


  Commit: 927d729b084424458db3a342fc4b296ddcca5914
      https://github.com/ckan/ckan/commit/927d729b084424458db3a342fc4b296ddcca5914
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_dump.py

  Log Message:
  -----------
  nested columns serialized with json instead of python str representation


  Commit: fe968a99dbac23506aad76d857135e6a7b9d5083
      https://github.com/ckan/ckan/commit/fe968a99dbac23506aad76d857135e6a7b9d5083
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/writer.py

  Log Message:
  -----------
  move dump function to writers


  Commit: ea7b59055606dc1d269e6a858d4193755c30fa61
      https://github.com/ckan/ckan/commit/ea7b59055606dc1d269e6a858d4193755c30fa61
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M ckanext/datastore/writer.py

  Log Message:
  -----------
  unicode literals


  Commit: bf0f683d48a31e3b82d4cc2fb35c36f4ce3849d7
      https://github.com/ckan/ckan/commit/bf0f683d48a31e3b82d4cc2fb35c36f4ce3849d7
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-21 (Tue, 21 Mar 2017)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  support chained action in plugins


  Commit: b78c85cddc392e5fcac8295d2f91d9f2d3061e0c
      https://github.com/ckan/ckan/commit/b78c85cddc392e5fcac8295d2f91d9f2d3061e0c
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-27 (Mon, 27 Mar 2017)

  Changed paths:
    M ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  change test name to ExampleDataStoreDeletedWithCountPlugin


  Commit: 225003f339e1fed7e1514a5572d1b4ee33d49af1
      https://github.com/ckan/ckan/commit/225003f339e1fed7e1514a5572d1b4ee33d49af1
  Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
  Date:   2017-03-27 (Mon, 27 Mar 2017)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Use def user_add for paster user add and sysadmin add


  Commit: 8b015ad921d3a24ea60f31256360ff1c0bef1fe6
      https://github.com/ckan/ckan/commit/8b015ad921d3a24ea60f31256360ff1c0bef1fe6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M doc/maintaining/installing/install-from-source.rst
    M setup.py

  Log Message:
  -----------
  [3513] setuptools version checked in setup.py


  Commit: ae2588fd1e0ab33717334833d54f6ab147385206
      https://github.com/ckan/ckan/commit/ae2588fd1e0ab33717334833d54f6ab147385206
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  [3513] Fix version expression to cope with e.g. 2.2. Clearer text.


  Commit: 61f9a44cb65daf39d5c37842c291bb067a1ba4e3
      https://github.com/ckan/ckan/commit/61f9a44cb65daf39d5c37842c291bb067a1ba4e3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckanext/datastore/controller.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/writer.py

  Log Message:
  -----------
  Merge pull request #3487 from smotornyuk/3477-datastore-dump-of-nested-json

Nested columns serialized with json.dumps instead of python str representation


  Commit: 949c657c62eb8446c7e2523a467f0bb316b227c4
      https://github.com/ckan/ckan/commit/949c657c62eb8446c7e2523a467f0bb316b227c4
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge pull request #3455 from gleb-rudenko/ui-labels-for-the-last_modified-and-revision_timestamp-fields

#3028 / UI labels for the last_modified and revision_timestamp fields


  Commit: 5d4d5891810fab886c4ec26ac2cfabca6c01cf94
      https://github.com/ckan/ckan/commit/5d4d5891810fab886c4ec26ac2cfabca6c01cf94
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckanext/datastore/tests/test_chained_action.py

  Log Message:
  -----------
  fix test case for chained_action


  Commit: f9f70173da31548a70aa39975bbd8959d1005401
      https://github.com/ckan/ckan/commit/f9f70173da31548a70aa39975bbd8959d1005401
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-28 (Tue, 28 Mar 2017)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckanext/datastore/tests/test_chained_action.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #3494 from fanjinfei/ckanmaster

support chained action in plugins


  Commit: a83c314dcf831c530a9c98f40b4ff46a62838491
      https://github.com/ckan/ckan/commit/a83c314dcf831c530a9c98f40b4ff46a62838491
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-29 (Wed, 29 Mar 2017)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  [3513] Specify particular version of setuptools, rather than just the latest. Moved import upwards.


  Commit: b5071c0bb854cdfa6af06c3ba12c8c0ab964f165
      https://github.com/ckan/ckan/commit/b5071c0bb854cdfa6af06c3ba12c8c0ab964f165
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-29 (Wed, 29 Mar 2017)

  Changed paths:
    M doc/maintaining/installing/install-from-source.rst
    A requirement-setuptools.txt
    M setup.py

  Log Message:
  -----------
  [3513] Recommended version is now 20.4 and in its own requirements file.


  Commit: f46a01e356e93a395c0d020e1624c2b3edbabdf2
      https://github.com/ckan/ckan/commit/f46a01e356e93a395c0d020e1624c2b3edbabdf2
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

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

  Log Message:
  -----------
  [3513] Move setuptools upgrade forward, else ckan will not install.


  Commit: d1b1f0a2d099ae49d7de0005ff6d4392c7933a3a
      https://github.com/ckan/ckan/commit/d1b1f0a2d099ae49d7de0005ff6d4392c7933a3a
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckan/tests/legacy/ckantestplugins.py
    M doc/extensions/plugin-interfaces.rst

  Log Message:
  -----------
  Updated documentation of interfaces

* Removed authz_add/remove_role from IPackageController, IOrganizationController and IGroupController
* Added docstrings to undocumented methods
* Now sphinx shows all, even undocumented classes and interfaces from `ckan.plugins.interfaces`


  Commit: 60f871ad67e864a6ab0191a88b81d4e87de3a347
      https://github.com/ckan/ckan/commit/60f871ad67e864a6ab0191a88b81d4e87de3a347
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Re-enable use of the CKAN_INI environment variable. Improve error message when there is no config specified.


  Commit: c676647b031e002b42f5f65c737bf10c0b99a462
      https://github.com/ckan/ckan/commit/c676647b031e002b42f5f65c737bf10c0b99a462
  Author: amercader <amercadero at gmail.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3520] Import DebugToolbar only in debug mode


  Commit: ebb4d22d6571b0daba9c9cc1be4a9e13eae4d3b5
      https://github.com/ckan/ckan/commit/ebb4d22d6571b0daba9c9cc1be4a9e13eae4d3b5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#3520] Also mention that dev-requirements.txt is required for running ckan in debug mode.


  Commit: 3560b6a367f217d3655af46d2d770d7e773b7da3
      https://github.com/ckan/ckan/commit/3560b6a367f217d3655af46d2d770d7e773b7da3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-30 (Thu, 30 Mar 2017)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #3521 from ckan/3520-flask-debugtoolbar

[#3520] Import DebugToolbar only in debug mode


  Commit: e09ef9b54af6a2fc840cffe75824c6fb2b22d429
      https://github.com/ckan/ckan/commit/e09ef9b54af6a2fc840cffe75824c6fb2b22d429
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    A .editorconfig
    M CHANGELOG.rst
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/middleware/pylons_app.py
    M ckan/config/routing.py
    M ckan/controllers/admin.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/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/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/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/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/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/email_notifications.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jobs.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/activity.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
    M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    R ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
    M ckan/public/base/vendor/font-awesome/less/core.less
    M ckan/public/base/vendor/font-awesome/less/extras.less
    A ckan/public/base/vendor/font-awesome/less/fixed-width.less
    R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    M ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/larger.less
    A ckan/public/base/vendor/font-awesome/less/list.less
    M ckan/public/base/vendor/font-awesome/less/mixins.less
    M ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
    A ckan/public/base/vendor/font-awesome/less/spinning.less
    A ckan/public/base/vendor/font-awesome/less/stacked.less
    M ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/admin/trash.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/primer.html
    M ckan/templates/development/snippets/actions.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/list.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/development/snippets/simple-input.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/info.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/edit_view.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    R ckan/templates/package/resource_data.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/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_help.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/view_form_filters.html
    M ckan/templates/package/snippets/view_help.html
    M ckan/templates/package/view_edit_base.html
    M ckan/templates/revision/read.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    M ckan/templates/tag/index.html
    A ckan/templates/tests/flash_messages.html
    M ckan/templates/user/dashboard_datasets.html
    M ckan/templates/user/dashboard_groups.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/user_search.html
    A ckan/tests/config/test_sessions.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/logic/test_action.py
    A ckan/tests/lib/test_celery_app.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    A ckanext/datapusher/templates/datapusher/resource_data.html
    A ckanext/datapusher/templates/package/resource_edit_base.html
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/templates/datastore/dictionary.html
    A ckanext/datastore/templates/package/resource_edit_base.html
    M ckanext/datastore/templates/package/resource_read.html
    M ckanext/datastore/templates/package/snippets/data_api_button.html
    A ckanext/datastore/tests/test_chained_action.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/writer.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
    M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
    M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/textview/plugin.py
    M dev-requirements.txt
    M doc/_templates/footer.html
    M doc/images/exploring_datasets.jpg
    M doc/maintaining/installing/install-from-source.rst
    M doc/user-guide.rst
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3384-datastore-cli


  Commit: d163c22c3871539f491281be8abb1e44b134939c
      https://github.com/ckan/ckan/commit/d163c22c3871539f491281be8abb1e44b134939c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M bin/travis-install-dependencies
    M circle.yml

  Log Message:
  -----------
  [3513] Sort autobuild hopefully.


  Commit: c1132574ef974b797aef8653a15fc87f43c9bd2d
      https://github.com/ckan/ckan/commit/c1132574ef974b797aef8653a15fc87f43c9bd2d
  Author: Ian Ward <ian at excess.org>
  Date:   2017-03-31 (Fri, 31 Mar 2017)

  Changed paths:
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#3384] datastore dump cli command


  Commit: 2ab3573212e3aa24a392525eec5834b6975265ae
      https://github.com/ckan/ckan/commit/2ab3573212e3aa24a392525eec5834b6975265ae
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-03 (Mon, 03 Apr 2017)

  Changed paths:
    M ckan/plugins/interfaces.py
    M ckan/tests/legacy/ckantestplugins.py
    M doc/extensions/plugin-interfaces.rst

  Log Message:
  -----------
  Merge pull request #3519 from smotornyuk/document-interfaces

Updated documentation of interfaces


  Commit: 1c40b381ccbfab7756c01d986fd80092e0d7ca5b
      https://github.com/ckan/ckan/commit/1c40b381ccbfab7756c01d986fd80092e0d7ca5b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-03 (Mon, 03 Apr 2017)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #3522 from ckan/ini-env-variable

Re-enable use of the CKAN_INI environment variable.


  Commit: 7bccc514b2c0689f1b6618faecdf50ed9971358a
      https://github.com/ckan/ckan/commit/7bccc514b2c0689f1b6618faecdf50ed9971358a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-03 (Mon, 03 Apr 2017)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Add command-line option to avoid typing y.


  Commit: dae77efe78f2c25fb5a78f189e9f0778bddffb98
      https://github.com/ckan/ckan/commit/dae77efe78f2c25fb5a78f189e9f0778bddffb98
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-03 (Mon, 03 Apr 2017)

  Changed paths:
    M ckanext/datapusher/templates/datapusher/resource_data.html

  Log Message:
  -----------
  Display multiline logs properly in datapusher output.


  Commit: 3a862e078c20d68d6db211169e48aa8164a53d43
      https://github.com/ckan/ckan/commit/3a862e078c20d68d6db211169e48aa8164a53d43
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  [#2334] Avoid duplicate Datapusher jobs for a resource. Thanks @clementmouchet.


  Commit: 5b52ca4b3d806d49e067c03cebd2c78f5f9f1f7e
      https://github.com/ckan/ckan/commit/5b52ca4b3d806d49e067c03cebd2c78f5f9f1f7e
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M ckanext/datapusher/templates/datapusher/resource_data.html

  Log Message:
  -----------
  Merge pull request #3525 from ckan/multiline-datapusher-output

Datapusher output - display multiline logs properly


  Commit: 6c8a17876a8483961259f346fec0843e9b58c3fb
      https://github.com/ckan/ckan/commit/6c8a17876a8483961259f346fec0843e9b58c3fb
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M ckanext/datapusher/cli.py

  Log Message:
  -----------
  Merge pull request #3524 from ckan/datapusher-yes

Datapusher CLI - bypass typing y


  Commit: 2668cd5a2924a5369b212d59178059fa667fe0b3
      https://github.com/ckan/ckan/commit/2668cd5a2924a5369b212d59178059fa667fe0b3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/plugins/interfaces.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/templates/datapusher/resource_data.html
    M doc/extensions/plugin-interfaces.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3384-datastore-cli


  Commit: 175b2752072027c62be12d9ee19cde45b0346744
      https://github.com/ckan/ckan/commit/175b2752072027c62be12d9ee19cde45b0346744
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckanext/datapusher/logic/action.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#2334] Added option ckan.datapusher.assume_task_stale_after.


  Commit: f3a5da6e3043bf0e5d3dd7a8ea6229e9d15b4b19
      https://github.com/ckan/ckan/commit/f3a5da6e3043bf0e5d3dd7a8ea6229e9d15b4b19
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M ckanext/datapusher/tests/test_action.py

  Log Message:
  -----------
  [#2334] Added test from @smotornyuk


  Commit: f2d5dbaf9924df394225c0b5b7bd7163c9ebb28d
      https://github.com/ckan/ckan/commit/f2d5dbaf9924df394225c0b5b7bd7163c9ebb28d
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#3384] add load_config to plugins.toolkit


  Commit: cc96c0b8204f503913207996e15c3b83acdc6d99
      https://github.com/ckan/ckan/commit/cc96c0b8204f503913207996e15c3b83acdc6d99
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#3384] pin click version


  Commit: 20785b9ddb2d2a6eedb9c8d6e55f449e8f57d515
      https://github.com/ckan/ckan/commit/20785b9ddb2d2a6eedb9c8d6e55f449e8f57d515
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Fix typo, nothing is new


  Commit: 9db60058394569c232dde3b002d3768cedea45ff
      https://github.com/ckan/ckan/commit/9db60058394569c232dde3b002d3768cedea45ff
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/plugins/toolkit.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/set_permissions.sql
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge pull request #3384 from ckan/3384-datastore-cli

datastore cli: add dump command


  Commit: 5e93231cddc19cb048f728182bf181d99ee469de
      https://github.com/ckan/ckan/commit/5e93231cddc19cb048f728182bf181d99ee469de
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M doc/contributing/test.rst

  Log Message:
  -----------
  Add notes on running tests multicore.


  Commit: 41f77cbe7040452a140fdc67349987cc31be9a65
      https://github.com/ckan/ckan/commit/41f77cbe7040452a140fdc67349987cc31be9a65
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-04 (Tue, 04 Apr 2017)

  Changed paths:
    M doc/contributing/test.rst

  Log Message:
  -----------
  Multicore tests - added step to fix your solr_url in your main ini.


  Commit: 40e49bd886a31a15e46e3a878f370e839237b076
      https://github.com/ckan/ckan/commit/40e49bd886a31a15e46e3a878f370e839237b076
  Author: Jared Smith <jared.smith.jrod at gmail.com>
  Date:   2017-04-05 (Wed, 05 Apr 2017)

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet.js

  Log Message:
  -----------
  Updating leaflet.js to version 0.7.7


  Commit: ef893419a5ff994ce5000c07aec4bbc0ec5b920a
      https://github.com/ckan/ckan/commit/ef893419a5ff994ce5000c07aec4bbc0ec5b920a
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet.js

  Log Message:
  -----------
  Merge pull request #3534 from HighwayThree/update-leaflet-to-0.7.7

Updating leaflet.js to version 0.7.7


  Commit: ee4621b1823018e96e73a99bdf3fc2d114dd8d5c
      https://github.com/ckan/ckan/commit/ee4621b1823018e96e73a99bdf3fc2d114dd8d5c
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-06 (Thu, 06 Apr 2017)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge pull request #3526 from ckan/2334-dedupe-datapusher-jobs

Avoid duplicate Datapusher jobs


  Commit: 4e62c62a7d5d0ce627488a5c3ae7b614fa02aa9e
      https://github.com/ckan/ckan/commit/4e62c62a7d5d0ce627488a5c3ae7b614fa02aa9e
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M doc/contributing/test.rst

  Log Message:
  -----------
  Merge pull request #3529 from ckan/test-multicore

Add notes on running tests with Solr multicore


  Commit: bd361dcceeec1a1329dcfb3550c199806047659c
      https://github.com/ckan/ckan/commit/bd361dcceeec1a1329dcfb3550c199806047659c
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #3445 from wildcatzita/3071-fix-regenerating-api-key-fails

[#3071] Regenerating API Key fails for users missing required columns(ex: email)


  Commit: 34eb1e86dd8603e27f8cea7dfed28e9e2943a35a
      https://github.com/ckan/ckan/commit/34eb1e86dd8603e27f8cea7dfed28e9e2943a35a
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  fix organization members translation


  Commit: 3c3dae19a2b99dea3066a848c2918c0ace81f9d2
      https://github.com/ckan/ckan/commit/3c3dae19a2b99dea3066a848c2918c0ace81f9d2
  Author: Jinfei Fan <fanjinfei at hotmail.com>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  use name placeholder, do not translate twice


  Commit: dc70b211a3969a1b8068db74e167895de2ff94d1
      https://github.com/ckan/ckan/commit/dc70b211a3969a1b8068db74e167895de2ff94d1
  Author: Justin Clift <justin at postgresql.org>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M doc/maintaining/installing/index.rst

  Log Message:
  -----------
  Trivial typo fix


  Commit: 9c1ec8b4f7971310d19955ad8ab0085578f65ff6
      https://github.com/ckan/ckan/commit/9c1ec8b4f7971310d19955ad8ab0085578f65ff6
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-04-07 (Fri, 07 Apr 2017)

  Changed paths:
    M doc/maintaining/installing/index.rst

  Log Message:
  -----------
  Merge pull request #3538 from justinclift/patch-1

Trivial typo fix


  Commit: 1bd499e18f31205589694374e9e44a375cab596e
      https://github.com/ckan/ckan/commit/1bd499e18f31205589694374e9e44a375cab596e
  Author: amercader <amercadero at gmail.com>
  Date:   2017-04-10 (Mon, 10 Apr 2017)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/flask_app.py
    M ckan/lib/cli.py
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/package/resource_read.html
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/templates/datapusher/resource_data.html
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/set_permissions.sql
    A ckanext/datastore/tests/test_chained_action.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/writer.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet.js
    M dev-requirements.txt
    M doc/contributing/test.rst
    M doc/extensions/plugin-interfaces.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/index.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-url_for


  Commit: 2ffba46b05165b41026fbbbc3fd6b2f1bc796e21
      https://github.com/ckan/ckan/commit/2ffba46b05165b41026fbbbc3fd6b2f1bc796e21
  Author: amercader <amercadero at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  [#2334] Perform DataPusher timestamp check using UTC

Task timestamps are stored in UTC but the check was done against .now(),
causing a test failure locally (Summer saving time)


  Commit: eee6decdbab330e0926942a0299754f33fceaa79
      https://github.com/ckan/ckan/commit/eee6decdbab330e0926942a0299754f33fceaa79
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-04-11 (Tue, 11 Apr 2017)

  Changed paths:
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  Merge pull request #3537 from fanjinfei/master

fix organization members translation


  Commit: 90756afcb8b8710792c306344452f83b3cf1c7e3
      https://github.com/ckan/ckan/commit/90756afcb8b8710792c306344452f83b3cf1c7e3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py

  Log Message:
  -----------
  [#3428] create_function: allow arguments+return types


  Commit: 63e7c138c944f035ecdbbe1bd7c6a75dff55a692
      https://github.com/ckan/ckan/commit/63e7c138c944f035ecdbbe1bd7c6a75dff55a692
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-14 (Fri, 14 Apr 2017)

  Changed paths:
    M doc/conf.py
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/installing/solr.rst

  Log Message:
  -----------
  [#3543] Install from source now works with 16.04


  Commit: 903b857307f096da25896fe1eca5103902f31181
      https://github.com/ckan/ckan/commit/903b857307f096da25896fe1eca5103902f31181
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-16 (Sun, 16 Apr 2017)

  Changed paths:
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/installing/solr.rst

  Log Message:
  -----------
  [#3543] Remove references to 12.04 from source install, because it is EOL this month.


  Commit: 402de205eecf33c585ac2e5a698518fb07fccd17
      https://github.com/ckan/ckan/commit/402de205eecf33c585ac2e5a698518fb07fccd17
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-17 (Mon, 17 Apr 2017)

  Changed paths:
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  Merge pull request #3541 from ckan/2334-date-check-utcnow

[#2334] Perform DataPusher timestamp check using UTC


  Commit: 5e5f337addfec7e0fdb993cc0d31ffb6171cdc52
      https://github.com/ckan/ckan/commit/5e5f337addfec7e0fdb993cc0d31ffb6171cdc52
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#3428] factor out ProgrammingError summarization


  Commit: 6bb499f40c7af55893d6df19126a6a60ca0ecb28
      https://github.com/ckan/ckan/commit/6bb499f40c7af55893d6df19126a6a60ca0ecb28
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#3428] catch errors on upsert + update as well


  Commit: c936de81c961afead0834c2a99431c40343c2d06
      https://github.com/ckan/ckan/commit/c936de81c961afead0834c2a99431c40343c2d06
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#3428] fix typo


  Commit: 8b19afad8348274ef255aeefa57c7922636a5b48
      https://github.com/ckan/ckan/commit/8b19afad8348274ef255aeefa57c7922636a5b48
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M README.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/flask_app.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/cli.py
    M ckan/lib/mailer.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/model/activity.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/package/resource_read.html
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/templates/datapusher/resource_data.html
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/set_permissions.sql
    A ckanext/datastore/tests/test_chained_action.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/writer.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.7/leaflet.js
    M dev-requirements.txt
    M doc/contributing/test.rst
    M doc/extensions/plugin-interfaces.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 3428-datastore-triggers


  Commit: 8f205ea8e80e2ff659b8e4684cb4c374d82d72b9
      https://github.com/ckan/ckan/commit/8f205ea8e80e2ff659b8e4684cb4c374d82d72b9
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-20 (Thu, 20 Apr 2017)

  Changed paths:
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  [#3428] datastore docs: trigger feature paragraph


  Commit: 49ed61273dc30eedd19753b70e8121837a2a9e5b
      https://github.com/ckan/ckan/commit/49ed61273dc30eedd19753b70e8121837a2a9e5b
  Author: Harald von Waldow <harald.vonwaldow at eawag.ch>
  Date:   2017-04-20 (Thu, 20 Apr 2017)

  Changed paths:
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  download icon for no_view


  Commit: e2c35e6aa62737df69776a09f213c4e34abfbb1f
      https://github.com/ckan/ckan/commit/e2c35e6aa62737df69776a09f213c4e34abfbb1f
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-26 (Wed, 26 Apr 2017)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [#3543] Fix test


  Commit: 3eb7cc2b364d7b25fe479346f279f47ad9691fe1
      https://github.com/ckan/ckan/commit/3eb7cc2b364d7b25fe479346f279f47ad9691fe1
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-04-26 (Wed, 26 Apr 2017)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
    M ckan/tests/lib/navl/test_dictization_functions.py

  Log Message:
  -----------
  DictizationErrors print better.


  Commit: b5d56fbefd020caf758d6b04508bb8b5b74256e6
      https://github.com/ckan/ckan/commit/b5d56fbefd020caf758d6b04508bb8b5b74256e6
  Author: Ian Ward <ian at excess.org>
  Date:   2017-04-27 (Thu, 27 Apr 2017)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
    M ckan/tests/lib/navl/test_dictization_functions.py

  Log Message:
  -----------
  Merge pull request #3551 from ckan/dictization-error-unicode2

DictizationErrors print better


  Commit: deda5b73ba16da25f3cb769a8774ef61863a4a30
      https://github.com/ckan/ckan/commit/deda5b73ba16da25f3cb769a8774ef61863a4a30
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/auth/update.py

  Log Message:
  -----------
  Restrict access to `members` and `bulk_actions`

After this fix only users with permission `bulk_update_public` will
be able to visit `bulc_process` page and only those who have
`group_edit_permissions' will be able to visit `members` page


  Commit: 5dfcef6c72198ec7dfce7d3d43920c178872d318
      https://github.com/ckan/ckan/commit/5dfcef6c72198ec7dfce7d3d43920c178872d318
  Author: Matt Fullerton <mattfullerton at users.noreply.github.com>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Remove exposed ports

No need to expose ports externally when using the container names already provides the necessary access to the ports internally from the containers.


  Commit: 6e6394423a9c5856dbc1f1ae54fe33c0c12e0882
      https://github.com/ckan/ckan/commit/6e6394423a9c5856dbc1f1ae54fe33c0c12e0882
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/auth/update.py

  Log Message:
  -----------
  test fixes


  Commit: aeb7b9d7cb64e6ef940bd836075076c37f11f4c3
      https://github.com/ckan/ckan/commit/aeb7b9d7cb64e6ef940bd836075076c37f11f4c3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Merge pull request #3553 from mattfullerton/patch-6

Remove exposed ports


  Commit: f992189d0e3557a66bb39a81802a08b2c385ffd3
      https://github.com/ckan/ckan/commit/f992189d0e3557a66bb39a81802a08b2c385ffd3
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M ckan/tests/controllers/test_group.py

  Log Message:
  -----------
  fixes in controller tests


  Commit: 3b1794f445b7e6ce9400ed0265dd47bac947fde3
      https://github.com/ckan/ckan/commit/3b1794f445b7e6ce9400ed0265dd47bac947fde3
  Author: Ian Ward <ian at excess.org>
  Date:   2017-05-02 (Tue, 02 May 2017)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/auth/update.py
    M ckan/tests/controllers/test_group.py

  Log Message:
  -----------
  Merge pull request #3552 from smotornyuk/restrict-access-to-org-management-pages

Restrict access to `members` and `bulk_actions`


  Commit: 7602ecebc162cb1036bbe8c3e42217cd871b547b
      https://github.com/ckan/ckan/commit/7602ecebc162cb1036bbe8c3e42217cd871b547b
  Author: Sergey <tonnydexter at gmail.com>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  Merge pull request #3549 from eawag-rdm/download_button_no_views

download icon for no_view


  Commit: 3cffff2ec3c7ea6c3056ab0bf1acb16bb863a8fe
      https://github.com/ckan/ckan/commit/3cffff2ec3c7ea6c3056ab0bf1acb16bb863a8fe
  Author: Sergey <tonnydexter at gmail.com>
  Date:   2017-05-04 (Thu, 04 May 2017)

  Changed paths:
    M doc/conf.py
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/installing/solr.rst

  Log Message:
  -----------
  Merge pull request #3544 from ckan/ubuntu-16.04

Tweak docs for Ubuntu 16.04


  Commit: bfc5fbd8406fb6b29e0e9bbd2c729082ab4cddea
      https://github.com/ckan/ckan/commit/bfc5fbd8406fb6b29e0e9bbd2c729082ab4cddea
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-05-09 (Tue, 09 May 2017)

  Changed paths:
    M bin/travis-install-dependencies
    M circle.yml
    M doc/maintaining/installing/install-from-source.rst
    A requirement-setuptools.txt
    M setup.py

  Log Message:
  -----------
  Merge pull request #3514 from ckan/require-setuptools-version

[3513] minimum setuptools version


  Commit: a8e974507ac60639f05af9b1b41442d058cb8eac
      https://github.com/ckan/ckan/commit/a8e974507ac60639f05af9b1b41442d058cb8eac
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-05-11 (Thu, 11 May 2017)

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

  Log Message:
  -----------
  Move troubleshooting tip to the bottom


  Commit: 28afb7eec7de7db9a165b5c81def78403a4a08d9
      https://github.com/ckan/ckan/commit/28afb7eec7de7db9a165b5c81def78403a4a08d9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2017-05-11 (Thu, 11 May 2017)

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

  Log Message:
  -----------
  Readd blank line


  Commit: cd72b43195174c03a8ce9544d1369437dc8b31da
      https://github.com/ckan/ckan/commit/cd72b43195174c03a8ce9544d1369437dc8b31da
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-05-11 (Thu, 11 May 2017)

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

  Log Message:
  -----------
  Merge pull request #3562 from ckan/mstantoncook-docs-solr-ubuntu-14.04-fix

Fix solr-jetty 'JSP support' during install on 14.04


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

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#3428] datastore_create: more trigger docs


  Commit: 784a6e17fdf5f7e4056c3193ce1f2ee769f4d564
      https://github.com/ckan/ckan/commit/784a6e17fdf5f7e4056c3193ce1f2ee769f4d564
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2017-05-11 (Thu, 11 May 2017)

  Changed paths:
    M ckan/lib/navl/validators.py
    M ckan/tests/helpers.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge pull request #3428 from ckan/3428-datastore-triggers

datastore triggers


  Commit: fd71b1ee69094c8335b5f4573cf57ab09e0adf7d
      https://github.com/ckan/ckan/commit/fd71b1ee69094c8335b5f4573cf57ab09e0adf7d
  Author: amercader <amercadero at gmail.com>
  Date:   2017-05-12 (Fri, 12 May 2017)

  Changed paths:
    M bin/travis-install-dependencies
    M circle.yml
    M ckan/controllers/group.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/logic/auth/update.py
    M ckan/templates/organization/members.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/helpers.py
    M ckan/tests/lib/navl/test_dictization_functions.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M contrib/docker/docker-compose.yml
    M doc/conf.py
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/installing/solr.rst
    A requirement-setuptools.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-url_for


Compare: https://github.com/ckan/ckan/compare/da2dcdd623e3...fd71b1ee6909


More information about the ckan-changes mailing list