[ckan-changes] [okfn/ckan] e18640: Merge branch 'master' into feature-1781-add-term-t...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: e1864007a058e493c2e12f42c6eb726f0a39faf4
      https://github.com/okfn/ckan/commit/e1864007a058e493c2e12f42c6eb726f0a39faf4
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/helpers.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  R ckan/migration/versions/0049_add_group_approval_status.py
  A ckan/migration/versions/049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/test_group.py
  M ckanext/publisher_form/templates/publisher_form.html

  Log Message:
  -----------
  Merge branch 'master' into feature-1781-add-term-translation-table


  Commit: 6acb26385688367e86af0a37c905cc4e61c660d0
      https://github.com/okfn/ckan/commit/6acb26385688367e86af0a37c905cc4e61c660d0
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [1781]  add api and tests


  Commit: 669a8e9f7a768b147b1668940842b72b2a302088
      https://github.com/okfn/ckan/commit/669a8e9f7a768b147b1668940842b72b2a302088
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  A ckan/migration/versions/050_term_translation_table.py
  M ckan/model/__init__.py
  A ckan/model/term_translation.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'feature-1781-add-term-translation-table'


Compare: https://github.com/okfn/ckan/compare/d59cd9c...669a8e9