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

Wed Feb 15 10:55:18 UTC 2012

  Branch: refs/heads/feature-1607-dgu-maintentance-refactor
  Home:   https://github.com/okfn/ckan
  Commit: fa8b3e364a33458bfe35c55dcf8df48ff910387e
      https://github.com/okfn/ckan/commit/fa8b3e364a33458bfe35c55dcf8df48ff910387e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/lib/create_test_data.py
  M ckan/lib/search/__init__.py
  M ckan/model/license.py
  M ckan/public/css/style.css
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt

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


  Commit: e135bb0656d3de8f392d6b9f7be3b062f6ab2d47
      https://github.com/okfn/ckan/commit/e135bb0656d3de8f392d6b9f7be3b062f6ab2d47
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/alphabet_paginate.py
  M ckan/logic/auth/publisher/create.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/misc/test_auth_profiles.py

  Log Message:
  -----------
  [1669] Fixes to pass tests in alphabet paging and publisher auth


  Commit: a608d92467a9c2ac689456f73999e7ee079c4672
      https://github.com/okfn/ckan/commit/a608d92467a9c2ac689456f73999e7ee079c4672
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/auth/create.py
  A ckan/logic/auth/publisher/__init__.py
  A ckan/logic/auth/publisher/create.py
  A ckan/logic/auth/publisher/delete.py
  A ckan/logic/auth/publisher/get.py
  A ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/schema.py
  A ckan/migration/versions/0049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/model/user.py
  M ckan/new_authz.py
  A ckan/public/css/chosen.css
  M ckan/public/css/style.css
  A ckan/public/images/chosen-sprite.png
  M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/test_group.py
  A ckan/tests/functional/test_publisher_auth.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/logic/test_action.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.py
  A ckanext/publisher_form/__init__.py
  A ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/dataset_form.html
  A ckanext/publisher_form/templates/publisher_form.html
  M doc/configuration.rst
  M setup.py

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


  Commit: 3d7cbf02f0eb2130c13a67e8a66259701b40cfe5
      https://github.com/okfn/ckan/commit/3d7cbf02f0eb2130c13a67e8a66259701b40cfe5
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#1057][xs] escape pjson callback


  Commit: 9d808a98debd046928031e930167c1fd3bc2d2d2
      https://github.com/okfn/ckan/commit/9d808a98debd046928031e930167c1fd3bc2d2d2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [xs] Minor tweak to how group members are accessed by type in Group model


  Commit: c1e723cfc25efd5994cd4d8edec4f532edf764dc
      https://github.com/okfn/ckan/commit/c1e723cfc25efd5994cd4d8edec4f532edf764dc
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py

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


  Commit: dc5ca52ab053b7d214dc946ccc229990abb91047
      https://github.com/okfn/ckan/commit/dc5ca52ab053b7d214dc946ccc229990abb91047
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [xs] Fix the query to fetch group members of a particular model type


  Commit: 45ac98451800b9be45cfc25a02c48ab20808251c
      https://github.com/okfn/ckan/commit/45ac98451800b9be45cfc25a02c48ab20808251c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckanext/publisher_form/templates/publisher_form.html

  Log Message:
  -----------
  [1794] Reducing the amount of user clutter


  Commit: 643a800bfa7b76074203f332218506d1db3da854
      https://github.com/okfn/ckan/commit/643a800bfa7b76074203f332218506d1db3da854
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  [1794] Added autocomplete for groups


  Commit: 0546a5ed1be7f090d1eb3f8ebeb2071b2f324c10
      https://github.com/okfn/ckan/commit/0546a5ed1be7f090d1eb3f8ebeb2071b2f324c10
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  [1794] Allowing group create/update to optionally add the parent group


  Commit: 64900fae93d617f442b46a250e50d9c083644916
      https://github.com/okfn/ckan/commit/64900fae93d617f442b46a250e50d9c083644916
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    R ckan/migration/versions/0049_add_group_approval_status.py
  A ckan/migration/versions/049_add_group_approval_status.py

  Log Message:
  -----------
  [1794] Fixed dodgy migration name


  Commit: 59b43087227ac073a3866ddb967a2ed4b23f5d7c
      https://github.com/okfn/ckan/commit/59b43087227ac073a3866ddb967a2ed4b23f5d7c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/create_test_data.py
  M ckan/lib/search/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/create.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/model/license.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/misc/test_auth_profiles.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M ckanext/publisher_form/templates/publisher_form.html
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'feature-1794-publisher-changes' into feature-1607-dgu-maintentance-refactor


Compare: https://github.com/okfn/ckan/compare/2a71ef5...59b4308