[ckan-changes] [okfn/ckan] 684730: [1669] Merge from master

Thu Jan 26 09:40:39 UTC 2012

  Branch: refs/heads/feature-1669-publisher-profile
  Home:   https://github.com/okfn/ckan
  Commit: 684730343cbfce7770493c3ba431b367939b81fd
      https://github.com/okfn/ckan/commit/684730343cbfce7770493c3ba431b367939b81fd
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-26 (Thu, 26 Jan 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/forms/group.py
  M ckan/lib/cli.py
  M ckan/lib/helpers.py
  M ckan/lib/search/index.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  M ckan/logic/schema.py
  M ckan/model/package.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/star.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/_util.html
  A ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/layout_base.html
  R ckan/templates/package/facets.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/test_plugins.py
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/file-upload.rst
  M doc/index.rst
  M doc/paster.rst
  M doc/theming.rst

  Log Message:
  -----------
  [1669] Merge from master