[ckan-changes] [okfn/ckan] a175d2: Refactoring auth profiles into known folders, depr...

[GitHub]

  Branch: refs/heads/2375-demo-organizations
  Home:   https://github.com/okfn/ckan
  Commit: a175d2be62ea0d0b5a81a45afad57791e44d5188
      https://github.com/okfn/ckan/commit/a175d2be62ea0d0b5a81a45afad57791e44d5188
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    R ckan/logic/auth/create.py
    R ckan/logic/auth/delete.py
    A ckan/logic/auth/deprecated/__init__.py
    A ckan/logic/auth/deprecated/create.py
    A ckan/logic/auth/deprecated/delete.py
    A ckan/logic/auth/deprecated/get.py
    A ckan/logic/auth/deprecated/update.py
    R ckan/logic/auth/get.py
    A ckan/logic/auth/organization/__init__.py
    A ckan/logic/auth/organization/create.py
    A ckan/logic/auth/organization/delete.py
    A ckan/logic/auth/organization/get.py
    A ckan/logic/auth/organization/update.py
    R ckan/logic/auth/publisher/__init__.py
    R ckan/logic/auth/publisher/create.py
    R ckan/logic/auth/publisher/delete.py
    R ckan/logic/auth/publisher/get.py
    R ckan/logic/auth/publisher/update.py
    R ckan/logic/auth/update.py
    M ckan/new_authz.py
    A ckan/templates/organization/edit.html
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_publisher_auth.py
    M ckan/tests/mock_publisher_auth.py

  Log Message:
  -----------
  Refactoring auth profiles into known folders, deprecated and organization.

Fixes the auth profiles into directories so that the config setting can be used
to load a specific profile, defaulting to organization.


  Commit: 472e84f13cd2a81f64fbccacaa12ac6ff7366cc6
      https://github.com/okfn/ckan/commit/472e84f13cd2a81f64fbccacaa12ac6ff7366cc6
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/logic/__init__.py
    M ckan/logic/auth/organization/create.py
    M ckan/logic/auth/organization/delete.py
    M ckan/logic/auth/organization/update.py
    M ckan/tests/functional/api/model/test_group.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_relationships.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/mock_publisher_auth.py

  Log Message:
  -----------
  Merge branch '2375-demo-organizations' of https://github.com/okfn/ckan into 2375-demo-organizations

Conflicts:
	ckan/logic/auth/organization/delete.py


  Commit: 95e515bb487168268b5555f2a235c179bd32853d
      https://github.com/okfn/ckan/commit/95e515bb487168268b5555f2a235c179bd32853d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-06 (Thu, 06 Sep 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_authz.py

  Log Message:
  -----------
  Fix merge nastiness


Compare: https://github.com/okfn/ckan/compare/36d6edf0e627...95e515bb4871