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

[GitHub]

  Branch: refs/heads/defect-2385-capacity-in-search-api
  Home:   https://github.com/okfn/ckan
  Commit: 0e9c09ffd8797e0f8045f605bd8aa1b3acf4667c
      https://github.com/okfn/ckan/commit/0e9c09ffd8797e0f8045f605bd8aa1b3acf4667c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
    M .gitattributes
    M .tx/config
    M CHANGELOG.txt
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/model/core.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    R ckan/model/package_mapping.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/related.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/test_user.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    M ckan/templates/_util.html
    M ckan/templates/authorization_group/authz.html
    M ckan/templates/authorization_group/edit.html
    M ckan/templates/authorization_group/index.html
    M ckan/templates/authorization_group/new.html
    M ckan/templates/authorization_group/read.html
    M ckan/templates/group/edit.html
    M ckan/templates/home/index.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/editresources.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new.html
    M ckan/templates/package/related_list.html
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/list.html
    M ckan/tests/__init__.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/pylons_controller.py
    M ckan_deb/usr/bin/ckan-setup-solr
    M ckanext/multilingual/plugin.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/stats.py
    M doc/api-v2.rst
    M doc/background-tasks.rst
    M doc/commenting.rst
    M doc/deployment.rst
    M doc/forms.rst
    M doc/index.rst
    M doc/linked-data-and-rdf.rst
    M doc/publisher-profile.rst
    A doc/tag-vocabularies.rst
    M doc/writing-extensions.rst
    M requires/lucid_missing.txt

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


  Commit: c9615d800c98c156da7d87e3fe14739c6248a687
      https://github.com/okfn/ckan/commit/c9615d800c98c156da7d87e3fe14739c6248a687
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M doc/using-data-api.rst

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


  Commit: 110e36782e5d2f4fd5d3f7f9387e52974022bc6b
      https://github.com/okfn/ckan/commit/110e36782e5d2f4fd5d3f7f9387e52974022bc6b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M ckan/templates/package/read.rdf

  Log Message:
  -----------
  Updated rdf template to show format of resource


  Commit: 49595e43c0559edc24d2148091b37723b5506f5b
      https://github.com/okfn/ckan/commit/49595e43c0559edc24d2148091b37723b5506f5b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-15 (Tue, 15 May 2012)

  Changed paths:
    M ckan/lib/search/query.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [2385] Make sure that the search api removes capacity from any fq component of the search and enforces public if the capacity is present


Compare: https://github.com/okfn/ckan/compare/0e9c09f^...49595e4