[ckan-changes] [ckan/ckan] 777f3d: Correct msword mimetype. Add alternative mimetypes...

Mon Sep 14 15:44:49 UTC 2015

  Branch: refs/heads/2631-group-purge
  Home:   https://github.com/ckan/ckan
  Commit: 777f3d9e080b74c684c6b3d118971096327507fe
      https://github.com/ckan/ckan/commit/777f3d9e080b74c684c6b3d118971096327507fe
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-07-09 (Thu, 09 Jul 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Correct msword mimetype. Add alternative mimetypes for recognizing Excel files.


  Commit: 010274d847720504bd03e71f38800203b6522d11
      https://github.com/ckan/ckan/commit/010274d847720504bd03e71f38800203b6522d11
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-03 (Thu, 03 Sep 2015)

  Changed paths:
    M CHANGELOG.rst
    M bin/less
    M ckan/config/resource_formats.json
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    A ckan/lib/lazyjson.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/model/__init__.py
    R ckan/model/authz.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/info.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    R ckan/templates/package/read.n3
    R ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.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/test_admin.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/reclineview/theme/templates/recline_map_form.html
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/controller.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/templates_legacy/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/template-blocks.rst
    M doc/contributing/release-process.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/linked-data-and-rdf.rst

  Log Message:
  -----------
  Merge branch 'master' into formats_added

Conflicts:
	ckan/tests/lib/test_helpers.py


  Commit: a9c6c0e62a97675dba8f84a5ee58ae3f7b733824
      https://github.com/ckan/ckan/commit/a9c6c0e62a97675dba8f84a5ee58ae3f7b733824
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    M ckan/model/group.py
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  [#1572] dataset_purge action added


  Commit: 31a28dd62fdd765ac1931463338076758982db9a
      https://github.com/ckan/ckan/commit/31a28dd62fdd765ac1931463338076758982db9a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

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

  Log Message:
  -----------
  [#1572] More tests.


  Commit: 945aad58088bfea8bdeb18ab2b68738ad96e008a
      https://github.com/ckan/ckan/commit/945aad58088bfea8bdeb18ab2b68738ad96e008a
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/delete.py
    A ckan/migration/versions/079_resource_revision_index.py

  Log Message:
  -----------
  [#1572] Fix slow purging using index. Fix CLI.


  Commit: f48a8e67b53933ae3eeab63193b04969587793fc
      https://github.com/ckan/ckan/commit/f48a8e67b53933ae3eeab63193b04969587793fc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M ckan/migration/versions/079_resource_revision_index.py
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  [#1572] Test fixes.


  Commit: b5b8cc5daeb23d432d67ae9defa08bbce06c47ac
      https://github.com/ckan/ckan/commit/b5b8cc5daeb23d432d67ae9defa08bbce06c47ac
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    A ckan/migration/versions/079_resource_revision_index.py
    M ckan/model/group.py
    M ckan/tests/logic/action/test_delete.py

  Log Message:
  -----------
  Merge pull request #2634 from ckan/1572-dataset-purge

dataset_purge


  Commit: 7096d6e979acb20b0a0ec025c6d8c7ac5f329246
      https://github.com/ckan/ckan/commit/7096d6e979acb20b0a0ec025c6d8c7ac5f329246
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/logic/action/delete.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/domain_object.py
    M ckan/tests/logic/action/test_delete.py
    M test-core.ini

  Log Message:
  -----------
  [#1572] Improvements
* no revision is needed when purging the package. The only thing being
  created is a Activity, which is not revisioned.
* no need to explicitly delete an object's revision objects. Despite the
  very old comment, it is clear that this does happen naturally through
  cascades. This is verified in the test and by reading the SQL
  produced.
* Added a resource to the test for fullness.
* Added helpful comments to the test-core.ini to show people how to use
  it to see generated SQL commands.


  Commit: 4ca2e6158c4004482b31f0b80382e338feba56b8
      https://github.com/ckan/ckan/commit/4ca2e6158c4004482b31f0b80382e338feba56b8
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-11 (Fri, 11 Sep 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge pull request #2529 from ckan/formats_added

Add mimetypes to resource_formats.json


  Commit: ed5fe6e86e520800edcf84d37e5f0c1d8a6ef485
      https://github.com/ckan/ckan/commit/ed5fe6e86e520800edcf84d37e5f0c1d8a6ef485
  Author: Ross Jones <ross at mailbolt.com>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M ckan/logic/action/delete.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/domain_object.py
    M ckan/tests/logic/action/test_delete.py
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #2637 from ckan/1572-dataset-purge

dataset_purge improvements


  Commit: 147ebed683398ef6bc9964c8bb543421ae942e7a
      https://github.com/ckan/ckan/commit/147ebed683398ef6bc9964c8bb543421ae942e7a
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-09-14 (Mon, 14 Sep 2015)

  Changed paths:
    M ckan/config/resource_formats.json
    M ckan/lib/cli.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    A ckan/migration/versions/079_resource_revision_index.py
    A ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/model/domain_object.py
    M ckan/model/group.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_delete.py
    M test-core.ini

  Log Message:
  -----------
  Merge with master


Compare: https://github.com/ckan/ckan/compare/7ca003ff0bbd...147ebed68339