[ckan-changes] [okfn/ckan] 05efec: Merge remote-tracking branch 'origin/master'

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 05efec67598339d35844ebd56adc9d85e983163e
      https://github.com/okfn/ckan/commit/05efec67598339d35844ebd56adc9d85e983163e
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-20 (Tue, 20 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/template.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/admin/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/read.html
  M ckan/templates/package/read.rdf
  M ckan/templates/package/resource_read.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/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_dictization.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/linked-data-and-rdf.rst
  M doc/post-installation.rst
  M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: cced74c49a2dbe8c3ffd69b6c7dfaa4ed5f2814e
      https://github.com/okfn/ckan/commit/cced74c49a2dbe8c3ffd69b6c7dfaa4ed5f2814e
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    A doc/commenting.rst
  M doc/index.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


Compare: https://github.com/okfn/ckan/compare/4dae5b4...cced74c