[ckan-changes] [okfn/ckan] 968c33: Merge branch 'master' of github.com:okfn/ckan into...

[GitHub]

  Branch: refs/heads/feature-1698-tag-taxonomies
  Home:   https://github.com/okfn/ckan
  Commit: 968c331d190f8b8d524e02c89f9eec2e6d9431b0
      https://github.com/okfn/ckan/commit/968c331d190f8b8d524e02c89f9eec2e6d9431b0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/authorization_group.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/controllers/user.py
  A ckan/lib/activity.py
  M ckan/lib/base.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/index.py
  M ckan/lib/search/sql.py
  M ckan/logic/__init__.py
  M ckan/logic/action/__init__.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/schema.py
  M ckan/logic/validators.py
  M ckan/migration/versions/034_resource_group_table.py
  A ckan/migration/versions/048_add_activity_streams_tables.py
  M ckan/model/__init__.py
  A ckan/model/activity.py
  M ckan/model/authorization_group.py
  M ckan/model/authz.py
  M ckan/model/meta.py
  M ckan/model/package.py
  M ckan/model/package_extra.py
  M ckan/model/resource.py
  M ckan/model/tag.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  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/activity_streams/added_tag.html
  A ckan/templates/activity_streams/changed_group.html
  A ckan/templates/activity_streams/changed_package.html
  A ckan/templates/activity_streams/changed_package_extra.html
  A ckan/templates/activity_streams/changed_resource.html
  A ckan/templates/activity_streams/changed_user.html
  A ckan/templates/activity_streams/deleted_group.html
  A ckan/templates/activity_streams/deleted_package.html
  A ckan/templates/activity_streams/deleted_package_extra.html
  A ckan/templates/activity_streams/deleted_resource.html
  A ckan/templates/activity_streams/new_group.html
  A ckan/templates/activity_streams/new_package.html
  A ckan/templates/activity_streams/new_package_extra.html
  A ckan/templates/activity_streams/new_resource.html
  A ckan/templates/activity_streams/new_user.html
  A ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/history.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/edit.html
  M ckan/templates/user/read.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_relationships.py
  R ckan/tests/functional/api/test_action.py
  A ckan/tests/functional/api/test_activity.py
  A ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_edit_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_package_edit_authz.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/functional/test_storage.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_dictization.py
  A ckan/tests/lib/test_hash.py
  M ckan/tests/lib/test_helpers.py
  A ckan/tests/lib/test_simple_search.py
  A ckan/tests/logic/test_action.py
  M doc/apiv3.rst
  M doc/file-upload.rst
  M doc/prepare-extensions.rst
  M doc/solr-setup.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-taxonomies

Conflicts:
	ckan/lib/dictization/model_dictize.py
	ckan/lib/dictization/model_save.py
	ckan/logic/action/create.py
	ckan/logic/action/get.py
	ckan/logic/auth/create.py
	ckan/logic/schema.py
	ckan/logic/validators.py
	ckan/model/__init__.py
	ckan/model/package.py
	ckan/model/tag.py
	ckan/tests/lib/test_dictization.py