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

Thu Mar 22 13:22:50 UTC 2012

  Branch: refs/heads/feature-2255-organizations
  Home:   https://github.com/okfn/ckan
  Commit: f12b1a50d4612c85771a84ef02839c270174d98a
      https://github.com/okfn/ckan/commit/f12b1a50d4612c85771a84ef02839c270174d98a
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/admin.py
  M ckan/controllers/api.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/exceptions.py
  M ckan/lib/base.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/search/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/model/meta.py
  M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_dictization.py

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


  Commit: ee40a6193bb02c761bf33821c1d6646d0228c638
      https://github.com/okfn/ckan/commit/ee40a6193bb02c761bf33821c1d6646d0228c638
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/controllers/template.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_admin.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_mailer.py
  M ckan/tests/misc/test_mock_mail_server.py
  M ckan/tests/mock_mail_server.py
  M ckan/tests/models/test_package.py
  M doc/authorization.rst
  A doc/background-tasks.rst
  M doc/configuration.rst
  A doc/deployment.rst
  M doc/domain-model.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/post-installation.rst
  M test-core.ini

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


  Commit: 1ca51d1cf505a2107c4262e32c63e484f8c7e926
      https://github.com/okfn/ckan/commit/1ca51d1cf505a2107c4262e32c63e484f8c7e926
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/base.py
  M ckan/templates/admin/index.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  A doc/commenting.rst
  M doc/index.rst
  M doc/writing-extensions.rst

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


  Commit: f809cccc1a6523540cd89b193d05c6a08c109e04
      https://github.com/okfn/ckan/commit/f809cccc1a6523540cd89b193d05c6a08c109e04
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/config/routing.py
  A ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore

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


  Commit: 0ec53433c00f4ff23a8b07175352d3721f1bacf3
      https://github.com/okfn/ckan/commit/0ec53433c00f4ff23a8b07175352d3721f1bacf3
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/model/package.py

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


  Commit: cf98d1e04753f8dc59c5c39d2a65cd5d445dc778
      https://github.com/okfn/ckan/commit/cf98d1e04753f8dc59c5c39d2a65cd5d445dc778
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_solr_search_index.py
  M doc/forms.rst
  M doc/paster.rst

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


  Commit: b296bc3c63fcb9db74c922a011b34413e6e33098
      https://github.com/okfn/ckan/commit/b296bc3c63fcb9db74c922a011b34413e6e33098
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M doc/forms.rst

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


  Commit: b3b3b6b6543efa2e7eb87575e1dd4cc834f9ddfa
      https://github.com/okfn/ckan/commit/b3b3b6b6543efa2e7eb87575e1dd4cc834f9ddfa
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-21 (Wed, 21 Mar 2012)

  Changed paths:
    M ckan/lib/plugins.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py

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


  Commit: 9adfb6675a4d1c35626a47f9e976916879c04f27
      https://github.com/okfn/ckan/commit/9adfb6675a4d1c35626a47f9e976916879c04f27
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py

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


  Commit: d5bb1438de718a14954a50d70923818399457233
      https://github.com/okfn/ckan/commit/d5bb1438de718a14954a50d70923818399457233
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/forms/package.py
  M ckan/lib/plugins.py
  M ckan/logic/auth/publisher/create.py
  M ckan/logic/auth/publisher/delete.py
  M ckan/logic/auth/publisher/update.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js
  A ckanext/organizations/__init__.py
  A ckanext/organizations/forms.py
  A ckanext/organizations/templates/organization_form.html
  A ckanext/organizations/templates/organization_index.html
  A ckanext/organizations/templates/organization_layout.html
  A ckanext/organizations/templates/organization_new.html
  A ckanext/organizations/templates/organization_read.html

  Log Message:
  -----------
  [2255] First pass at renaming publisher_form to organizations


Compare: https://github.com/okfn/ckan/compare/f12b1a5^...d5bb143