[ckan-changes] [okfn/ckan] 94f103: Merge branch 'master' into feature-1608-move-stora...

Wed Feb 1 13:53:58 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 94f10371666bf2ca976fe26ce06344b9ed2191b9
      https://github.com/okfn/ckan/commit/94f10371666bf2ca976fe26ce06344b9ed2191b9
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/forms/group.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dumper.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/lib/search/sql.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/star.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_util.html
  A ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  R ckan/templates/package/facets.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/edit.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_relationships.py
  R ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/functional/test_storage.py
  M ckan/tests/functional/test_upload.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  A ckan/tests/lib/test_simple_search.py
  M ckan/tests/lib/test_solr_search_index.py
  A ckan/tests/logic/test_action.py
  A ckan/tests/logic/test_validators.py
  M ckan/tests/test_plugins.py
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/file-upload.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/paster.rst
  M doc/solr-setup.rst
  M doc/theming.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1608-move-storage-to-core


  Commit: a80f50a1e55d464b50aa6686df4d01c093798cbd
      https://github.com/okfn/ckan/commit/a80f50a1e55d464b50aa6686df4d01c093798cbd
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/controllers/storage.py
  M ckan/tests/functional/test_storage.py
  M doc/file-upload.rst

  Log Message:
  -----------
  [#1608,storage][m]: reinstate direct upload to cloud storage.

* Reinstate cloud storage tests
* Also greatly extend docs with existing material from ckanext-storage


  Commit: 3c9ddd31d741eb8ec8c145063ce967e781947a88
      https://github.com/okfn/ckan/commit/3c9ddd31d741eb8ec8c145063ce967e781947a88
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_storage.py

  Log Message:
  -----------
  [#1608,tests][xs]: disable remote storage (GS) test as reqires GS access codes (not generally available).


  Commit: 4488795a54866a02305268d77a2648fa85538ee8
      https://github.com/okfn/ckan/commit/4488795a54866a02305268d77a2648fa85538ee8
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-01 (Wed, 01 Feb 2012)

  Changed paths:
    M ckan/controllers/storage.py
  M ckan/tests/functional/test_storage.py
  M doc/file-upload.rst

  Log Message:
  -----------
  [#1608,merge][s]: Merge branch 'feature-1608-move-storage-to-core'.


Compare: https://github.com/okfn/ckan/compare/64abd2f...4488795