[ckan-changes] [okfn/ckan] 61eab2: Merge branch 'master' into feature-1669-publisher-...

Wed Feb 8 16:27:22 UTC 2012

  Branch: refs/heads/feature-1669-publisher-profile
  Home:   https://github.com/okfn/ckan
  Commit: 61eab28296c48dfda1bf15231d4b9c3cb2f28a68
      https://github.com/okfn/ckan/commit/61eab28296c48dfda1bf15231d4b9c3cb2f28a68
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

  Changed paths:
    M ckan/controllers/user.py
  M ckan/lib/base.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/logic/validators.py
  M ckan/public/css/style.css
  M ckan/templates/_util.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/package/history.html
  M ckan/templates/package/read.html
  M ckan/templates/user/read.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_package.py
  A ckan/tests/lib/test_hash.py
  M ckan/tests/lib/test_helpers.py
  M doc/apiv3.rst
  M doc/prepare-extensions.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-1669-publisher-profile