[ckan-changes] [okfn/ckan] 47a5c7: Merge branch 'master' into feature-1450-dataset-vi...

Tue Dec 6 14:50:57 UTC 2011

  Branch: refs/heads/feature-1450-dataset-view
  Home:   https://github.com/okfn/ckan

  Commit: 47a5c7330d37ac20beecbff05028dc066d14bc3f
      https://github.com/okfn/ckan/commit/47a5c7330d37ac20beecbff05028dc066d14bc3f
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M .gitignore
  M bin/copy-ckan-2-ckan.py
  R ckan/config/celeryconfig.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/config/schema.xml
  M ckan/controllers/api.py
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/package.py
  M ckan/forms/package_dict.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/base.py
  M ckan/lib/cli.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/package_saver.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/query.py
  M ckan/logic/action/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  A ckan/migration/versions/046_drop_changesets.py
  M ckan/misc.py
  M ckan/model/__init__.py
  R ckan/model/changeset.py
  A ckan/model/misc.py
  M ckan/model/package.py
  M ckan/model/types.py
  M ckan/model/user.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/group/new_group_form.html
  M ckan/templates/js_strings.html
  M ckan/templates/package/new_package_form.html
  M ckan/tests/__init__.py
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/model/test_licenses.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_ratings.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/api/model/test_revisions.py
  M ckan/tests/functional/api/model/test_tag.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/api/test_misc.py
  M ckan/tests/functional/api/test_package_search.py
  M ckan/tests/functional/api/test_resource_search.py
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_package.py
  A ckan/tests/functional/test_pagination.py
  M ckan/tests/functional/test_tag.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/__init__.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/lib/test_solr_package_search_synchronous_update.py
  M ckan/tests/lib/test_tag_search.py
  M ckan/tests/misc/test_format_text.py
  R ckan/tests/models/test_changeset.py
  M ckan/tests/models/test_misc.py
  M ckan/tests/models/test_package.py
  M ckan/tests/pylons_controller.py
  A ckan/tests/schema/__init__.py
  A ckan/tests/schema/test_schema.py
  R ckan/tests/test_changes.py
  M ckan/tests/test_dumper.py
  M doc/api.rst
  M doc/apiv3.rst
  M doc/buildbot.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/i18n.rst
  M doc/loading_data.rst
  M doc/plugins.rst
  M doc/prepare-extensions.rst
  M doc/test.rst
  M doc/theming.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into feature-1450-dataset-view


  Commit: 438ee5cf405d9e5b70dedd3b8788c268b2808b55
      https://github.com/okfn/ckan/commit/438ee5cf405d9e5b70dedd3b8788c268b2808b55
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [tests,fix][s]: Adjusted some new code to pass tests.


Compare: https://github.com/okfn/ckan/compare/2e1961f...438ee5c