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

Thu May 24 10:18:47 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: f59be8ad78450879bed5e5a7ddb2c73cb3d0fa6b
      https://github.com/okfn/ckan/commit/f59be8ad78450879bed5e5a7ddb2c73cb3d0fa6b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/public/css/style.css
    M ckan/templates/home/index.html
    M doc/index.rst
    A doc/user-stories-list.rst
    A doc/user-stories.rst

  Log Message:
  -----------
  Merge branch 'master' of 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: 21372fa69f75f07e92b912addfba764ffd8ae16a
      https://github.com/okfn/ckan/commit/21372fa69f75f07e92b912addfba764ffd8ae16a
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-15 (Tue, 15 May 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [2385] Moved capacity check for search to package_search


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

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/api/test_api.py
    M doc/api.rst
    M doc/apiv3.rst

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


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

  Changed paths:
    M ckan/lib/authztool.py
    M ckan/lib/create_test_data.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/get.py
    M ckan/tests/__init__.py
    A ckan/tests/lib/test_authztool.py
    M ckan/tests/logic/test_action.py

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


  Commit: 2fc0651838ab8f43bcabf2009969b058a4b02e23
      https://github.com/okfn/ckan/commit/2fc0651838ab8f43bcabf2009969b058a4b02e23
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/058_add_follower_tables.py
    M ckan/model/__init__.py
    A ckan/model/follower.py
    M ckan/model/package.py
    M ckan/public/scripts/application.js
    A ckan/templates/package/followers.html
    M ckan/templates/package/layout.html
    A ckan/templates/user/followers.html
    M ckan/templates/user/layout.html
    M ckan/templates/user/login.html
    M ckan/templates/user/read.html
    M ckan/tests/__init__.py
    A ckan/tests/functional/api/test_follow.py
    A ckan/tests/functional/test_follow.py
    M setup.py

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


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

  Changed paths:
    A Coding_Standards.rst
    M ckan/controllers/api.py
    M ckan/controllers/home.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M doc/apiv3.rst
    M profile_tests.py
    M setup.py

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


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

  Changed paths:
    M ckan/controllers/package.py
    R ckan/tests/functional/test_autoneg.py
    M requires/lucid_missing.txt

  Log Message:
  -----------
  2413 Removes autoneg from dependencies and traces of it from code.


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

  Changed paths:
    M ckan/controllers/package.py
    A ckan/lib/accept.py
    A ckan/tests/lib/test_accept.py

  Log Message:
  -----------
  Fixed merge conflict


Compare: https://github.com/okfn/ckan/compare/952c90c...b7e235a