[ckan-changes] [okfn/ckan] c0aaa3: [merge] Merge branch 'feature-1453-flexible-tag-na...

Wed Nov 23 14:28:02 UTC 2011

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan

  Commit: c0aaa31c4b7ded54d5cf97d0e8c3065856b6424b
      https://github.com/okfn/ckan/commit/c0aaa31c4b7ded54d5cf97d0e8c3065856b6424b
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M .gitignore
  M ckan/controllers/package.py
  M ckan/forms/common.py
  M ckan/forms/package.py
  M ckan/forms/package_dict.py
  M ckan/lib/create_test_data.py
  M ckan/lib/munge.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/query.py
  M ckan/logic/action/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/misc.py
  A ckan/model/misc.py
  M ckan/model/package.py
  M ckan/public/scripts/application.js
  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_package.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/test_package.py
  M ckan/tests/functional/test_tag.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_tag_search.py
  M ckan/tests/misc/test_format_text.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
  M ckan/tests/test_dumper.py
  M doc/api.rst

  Log Message:
  -----------
  [merge] Merge branch 'feature-1453-flexible-tag-names' into master

Conflicts:
	ckan/logic/validators.py
	ckan/model/package.py

Also updated 'ckan/tests/schema/test_schema.py:TestPackage.test_name_validation()' to include
the extra validation error messages.

Merge included renaming PACKAGE_{NAME,VERSION}_{MIN,MAX}_LENGTH constants to
{MIN,MAX}_PACKAGE_{NAME,VERSION}_LENGTH as the branch and master had slightly
different nameing conventions.  Picked one and stuck to it.