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

Fri Sep 11 17:22:52 UTC 2015

  Branch: refs/heads/master
  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: 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


Compare: https://github.com/ckan/ckan/compare/b5b8cc5daeb2...4ca2e6158c40