[ckan-changes] [okfn/ckan] 222ad7: Merge branch 'master' of https://github.com/okfn/c...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 222ad71bc590821742b3fc8b79430ce831bd4c3c
      https://github.com/okfn/ckan/commit/222ad71bc590821742b3fc8b79430ce831bd4c3c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    R MIGRATE.txt
    R RELEASE.txt
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/forms/authorization_group.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/lib/package_saver.py
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    M ckan/templates/_util.html
    R ckan/templates/_util_activity_div.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/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/search.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new_user_form.html
    M ckan/tests/functional/test_activity.py
    M doc/api-v2.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 7c134352baf4592e96a1c94e310b0b95216f7d61
      https://github.com/okfn/ckan/commit/7c134352baf4592e96a1c94e310b0b95216f7d61
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-12 (Thu, 12 Apr 2012)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    A ckan/migration/versions/052_update_member_capacities.py

  Log Message:
  -----------
  [bug] Added missing public/private migration and updated membership_list_save to default to the correct capacity


Compare: https://github.com/okfn/ckan/compare/2005336...7c13435