[ckan-changes] [ckan/ckan] 833abc: add dataset blueprint;

GitHub noreply at github.com
Mon Jul 9 14:57:00 UTC 2018


  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 833abc327f86f960dd3f62efe7a0a151d046a975
      https://github.com/ckan/ckan/commit/833abc327f86f960dd3f62efe7a0a151d046a975
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-03-02 (Fri, 02 Mar 2018)

  Changed paths:
    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_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
    A ckan/views/dataset.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
    M ckanext/example_idatasetform/tests/test_controllers.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

  Log Message:
  -----------
  add dataset blueprint;


  Commit: 8162615c7b9f0cfaeddaf2bd985cfd5b74e157ce
      https://github.com/ckan/ckan/commit/8162615c7b9f0cfaeddaf2bd985cfd5b74e157ce
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/views/dataset.py
    M ckan/views/feed.py
    M ckan/views/resource.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/webpageview/tests/test_view.py

  Log Message:
  -----------
  fix errors


  Commit: 325cae02b1cc9ee03ea0d75e6d3f1bac20146cf7
      https://github.com/ckan/ckan/commit/325cae02b1cc9ee03ea0d75e6d3f1bac20146cf7
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-03-07 (Wed, 07 Mar 2018)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/lib/plugins.py
    M ckan/tests/logic/action/test_get.py
    A ckanext/example_idatasetform/plugin_v5.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M setup.py

  Log Message:
  -----------
  IDatasetForm support


  Commit: 74c2c0b5f70a67dd71bbbab405243879994b286b
      https://github.com/ckan/ckan/commit/74c2c0b5f70a67dd71bbbab405243879994b286b
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-03-11 (Sun, 11 Mar 2018)

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

  Log Message:
  -----------
  rename `_register_package_blueprints`


  Commit: 6f96197adaa0b62029ea70e8978d3bc83872be71
      https://github.com/ckan/ckan/commit/6f96197adaa0b62029ea70e8978d3bc83872be71
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M ckan/__init__.py
    M ckan/authz.py
    R ckan/config/celery-supervisor.conf
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/captcha.py
    R ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/search/common.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/023_add_harvesting.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/public-bs2/base/javascript/modules/resource-view-filters.js
    M ckan/public-bs2/base/javascript/plugins/jquery.masonry.js
    A ckan/public-bs2/base/vendor/select2/CONTRIBUTING.md
    M ckan/public-bs2/base/vendor/select2/LICENSE
    M ckan/public-bs2/base/vendor/select2/README.md
    M ckan/public-bs2/base/vendor/select2/bower.json
    M ckan/public-bs2/base/vendor/select2/component.json
    M ckan/public-bs2/base/vendor/select2/composer.json
    M ckan/public-bs2/base/vendor/select2/package.json
    M ckan/public-bs2/base/vendor/select2/release.sh
    M ckan/public-bs2/base/vendor/select2/select2.css
    M ckan/public-bs2/base/vendor/select2/select2.jquery.json
    M ckan/public-bs2/base/vendor/select2/select2.js
    M ckan/public-bs2/base/vendor/select2/select2.min.js
    M ckan/public-bs2/base/vendor/select2/select2.png
    M ckan/public-bs2/base/vendor/select2/select2_locale_ar.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_az.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_bg.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ca.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_cs.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_da.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_de.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_el.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_en.js.template
    M ckan/public-bs2/base/vendor/select2/select2_locale_es.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_et.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_eu.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_fa.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_fi.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_fr.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_gl.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_he.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_hr.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_hu.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_id.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_is.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_it.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ja.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ka.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ko.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_lt.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_lv.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_mk.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ms.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_nb.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_nl.js
    R ckan/public-bs2/base/vendor/select2/select2_locale_no.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_pl.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_pt-BR.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_pt-PT.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ro.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_rs.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_ru.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_sk.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_sv.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_th.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_tr.js
    A ckan/public-bs2/base/vendor/select2/select2_locale_ug-CN.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_uk.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_vi.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_zh-CN.js
    M ckan/public-bs2/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/public-bs2/base/vendor/select2/select2x2.png
    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/modules/confirm-action.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/less/bootstrap-variables.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/variables.less
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    A ckan/public/base/vendor/select2/CONTRIBUTING.md
    M ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    M ckan/public/base/vendor/select2/bower.json
    M ckan/public/base/vendor/select2/component.json
    M ckan/public/base/vendor/select2/composer.json
    M ckan/public/base/vendor/select2/package.json
    M ckan/public/base/vendor/select2/release.sh
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_az.js
    M ckan/public/base/vendor/select2/select2_locale_bg.js
    M ckan/public/base/vendor/select2/select2_locale_ca.js
    M ckan/public/base/vendor/select2/select2_locale_cs.js
    M ckan/public/base/vendor/select2/select2_locale_da.js
    M ckan/public/base/vendor/select2/select2_locale_de.js
    M ckan/public/base/vendor/select2/select2_locale_el.js
    M ckan/public/base/vendor/select2/select2_locale_en.js.template
    M ckan/public/base/vendor/select2/select2_locale_es.js
    M ckan/public/base/vendor/select2/select2_locale_et.js
    M ckan/public/base/vendor/select2/select2_locale_eu.js
    M ckan/public/base/vendor/select2/select2_locale_fa.js
    M ckan/public/base/vendor/select2/select2_locale_fi.js
    M ckan/public/base/vendor/select2/select2_locale_fr.js
    M ckan/public/base/vendor/select2/select2_locale_gl.js
    M ckan/public/base/vendor/select2/select2_locale_he.js
    M ckan/public/base/vendor/select2/select2_locale_hr.js
    M ckan/public/base/vendor/select2/select2_locale_hu.js
    M ckan/public/base/vendor/select2/select2_locale_id.js
    M ckan/public/base/vendor/select2/select2_locale_is.js
    M ckan/public/base/vendor/select2/select2_locale_it.js
    M ckan/public/base/vendor/select2/select2_locale_ja.js
    M ckan/public/base/vendor/select2/select2_locale_ka.js
    M ckan/public/base/vendor/select2/select2_locale_ko.js
    M ckan/public/base/vendor/select2/select2_locale_lt.js
    M ckan/public/base/vendor/select2/select2_locale_lv.js
    M ckan/public/base/vendor/select2/select2_locale_mk.js
    M ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nb.js
    M ckan/public/base/vendor/select2/select2_locale_nl.js
    R ckan/public/base/vendor/select2/select2_locale_no.js
    M ckan/public/base/vendor/select2/select2_locale_pl.js
    M ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    M ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    M ckan/public/base/vendor/select2/select2_locale_ro.js
    M ckan/public/base/vendor/select2/select2_locale_rs.js
    M ckan/public/base/vendor/select2/select2_locale_ru.js
    M ckan/public/base/vendor/select2/select2_locale_sk.js
    M ckan/public/base/vendor/select2/select2_locale_sv.js
    M ckan/public/base/vendor/select2/select2_locale_th.js
    M ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_ug-CN.js
    M ckan/public/base/vendor/select2/select2_locale_uk.js
    M ckan/public/base/vendor/select2/select2_locale_vi.js
    M ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    M ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/public/base/vendor/select2/select2x2.png
    M ckan/templates-bs2/group/snippets/group_form.html
    M ckan/templates-bs2/organization/snippets/organization_form.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/group_list.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    R ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/test_coding_standards.py
    R ckan/tests/lib/test_celery_app.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/helpers.py
    M ckanext/datastore/tests/test_chained_action.py
    M ckanext/datastore/tests/test_chained_auth_functions.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.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_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatastorebackend/test/test_plugin.py
    M ckanext/example_theme_docs/v10_custom_snippet/templates/snippets/example_theme_most_popular_groups.html
    M ckanext/multilingual/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/textview/theme/public/text_view.js
    M contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-compose.yml
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/theming/templates.rst
    M requirements.in
    M requirements.txt
    A scripts/4042_fix_resource_extras.py
    M setup.py

  Log Message:
  -----------
  conflict with master


  Commit: 3eec3577c3dc05995b57d3b7f74001aea9891c13
      https://github.com/ckan/ckan/commit/3eec3577c3dc05995b57d3b7f74001aea9891c13
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-04-18 (Wed, 18 Apr 2018)

  Changed paths:
    M CHANGELOG.rst
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/tests/controllers/test_package.py
    M ckan/views/dataset.py
    M ckan/views/resource.py

  Log Message:
  -----------
  First review


  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: 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: 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: 39a2c5674d2eeb095b038fef1837f31eec77f5cf
      https://github.com/ckan/ckan/commit/39a2c5674d2eeb095b038fef1837f31eec77f5cf
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M MANIFEST.in
    M ckan/config/routing.py
    R ckan/controllers/storage.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-bs2/base/less/masthead.less
    M ckan/public-bs2/base/less/variables.less
    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/less/variables.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    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 remote-tracking branch 'origin/master' into package-blueprint


  Commit: 2644aba51d2bbaa4eec33355c1a7cb3b0e21b685
      https://github.com/ckan/ckan/commit/2644aba51d2bbaa4eec33355c1a7cb3b0e21b685
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M ckan/model/modification.py
    M ckan/tests/config/test_environment.py

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


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

  Changed paths:
    M ckan/model/modification.py
    M ckan/public-bs2/base/less/masthead.less
    M ckan/public-bs2/base/less/variables.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/variables.less
    M ckan/tests/config/test_environment.py

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


  Commit: e8d73a4e63d206872bc1323e87284b67e2a6cf8e
      https://github.com/ckan/ckan/commit/e8d73a4e63d206872bc1323e87284b67e2a6cf8e
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/routing.py
    M ckan/lib/plugins.py
    M ckan/model/modification.py
    M ckan/tests/logic/action/test_get.py
    M ckan/views/dataset.py

  Log Message:
  -----------
  configure app after environment loads


  Commit: a8b8548e895b1ae039bac2b05a5884028430ede2
      https://github.com/ckan/ckan/commit/a8b8548e895b1ae039bac2b05a5884028430ede2
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/tests/logic/action/test_get.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py

  Log Message:
  -----------
  refix tests


  Commit: 3a61f0f4e4a268a58e317ffaadc3789bb20726a4
      https://github.com/ckan/ckan/commit/3a61f0f4e4a268a58e317ffaadc3789bb20726a4
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-06-12 (Tue, 12 Jun 2018)

  Changed paths:
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  pep8


  Commit: cbe3a8ecee71966f93ef0ea1ec7f67ec508c274a
      https://github.com/ckan/ckan/commit/cbe3a8ecee71966f93ef0ea1ec7f67ec508c274a
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-06-18 (Mon, 18 Jun 2018)

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

  Log Message:
  -----------
  register package plugins during flask stack creation


  Commit: 8209814cbd0db62eeebcbf21bbebf0383e78c5a3
      https://github.com/ckan/ckan/commit/8209814cbd0db62eeebcbf21bbebf0383e78c5a3
  Author: amercader <amercadero at gmail.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/lib/plugins.py
    M ckan/model/modification.py
    M ckan/tests/logic/action/test_get.py
    M ckan/views/dataset.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py

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


  Commit: a5514ac3b495a4e72b07b4e409567014880a98e3
      https://github.com/ckan/ckan/commit/a5514ac3b495a4e72b07b4e409567014880a98e3
  Author: amercader <amercadero at gmail.com>
  Date:   2018-07-05 (Thu, 05 Jul 2018)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/lib/cli.py
    A ckan/migration/versions/087_remove_old_authorization_tables.py
    M ckan/templates-bs2/macros/form.html
    M ckan/templates/macros/form.html
    M ckan/templates/user/new_user_form.html
    M ckan/tests/test_coding_standards.py
    M ckan/views/api.py
    M ckanext/datastore/templates-bs2/ajax_snippets/api_info.html
    M ckanext/datastore/templates/ajax_snippets/api_info.html
    M dev-requirements.txt
    M doc/maintaining/database-management.rst

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


  Commit: 0a9b94bf94f0e3d160ab07980b8b15c68663cafc
      https://github.com/ckan/ckan/commit/0a9b94bf94f0e3d160ab07980b8b15c68663cafc
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/views/__init__.py
    M ckan/views/dataset.py

  Log Message:
  -----------
  add old-style new_resource url


  Commit: a5437ba7209924aaf02a2962a20dc17c60c248eb
      https://github.com/ckan/ckan/commit/a5437ba7209924aaf02a2962a20dc17c60c248eb
  Author: Sergey Motornyuk <sergey.motornyuk at linkdigital.com.au>
  Date:   2018-07-06 (Fri, 06 Jul 2018)

  Changed paths:
    M ckan/views/__init__.py
    M ckan/views/dataset.py

  Log Message:
  -----------
  coding stardards


  Commit: 96097c12fe5f921aa56d87cf9ba823a99f5b2988
      https://github.com/ckan/ckan/commit/96097c12fe5f921aa56d87cf9ba823a99f5b2988
  Author: amercader <amercadero at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M ckan/lib/plugins.py
    M ckan/views/__init__.py
    M ckan/views/dataset.py

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


  Commit: 4b55d5c1ea767920c703ece52e2eb996bd870333
      https://github.com/ckan/ckan/commit/4b55d5c1ea767920c703ece52e2eb996bd870333
  Author: amercader <amercadero at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M ckan/views/dataset.py

  Log Message:
  -----------
  Add a second legacy resource URL


  Commit: d7efea1d0e2729b22dd8377d3fcc9177ae69853b
      https://github.com/ckan/ckan/commit/d7efea1d0e2729b22dd8377d3fcc9177ae69853b
  Author: amercader <amercadero at gmail.com>
  Date:   2018-07-09 (Mon, 09 Jul 2018)

  Changed paths:
    M CHANGELOG.rst
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.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/model/modification.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_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
    M ckan/views/__init__.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 'smotornyuk-package-blueprint'


Compare: https://github.com/ckan/ckan/compare/ff96a5a76adb...d7efea1d0e27
      **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.


More information about the ckan-changes mailing list