[ckan-changes] [okfn/ckan] 120e9f: Merge from master

Tue Jan 31 15:56:57 UTC 2012

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

  Changed paths:
    M ckan/config/environment.py
  M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/cli.py
  M ckan/lib/dumper.py
  M ckan/lib/hash.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/common.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  M ckan/lib/search/sql.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/migration/versions/034_resource_group_table.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.mustache/jquery.mustache.js
  A ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/graph-flot.css
  A ckan/public/scripts/vendor/recline/css/images/edit-map.png
  A ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
  A ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/edit.html
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_relationships.py
  R ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  A ckan/tests/lib/test_simple_search.py
  M ckan/tests/lib/test_solr_search_index.py
  A ckan/tests/logic/test_action.py
  A ckan/tests/logic/test_validators.py
  M doc/configuration.rst
  M doc/solr-setup.rst

  Log Message:
  -----------
  Merge from master