[ckan-changes] [okfn/ckan] 204d80: domain_object fixes

Fri May 11 16:16:24 UTC 2012

  Branch: refs/heads/feature-2304-follow
  Home:   https://github.com/okfn/ckan
  Commit: 204d807b969727a1dd2f547e96eeeefb2b20cee4
      https://github.com/okfn/ckan/commit/204d807b969727a1dd2f547e96eeeefb2b20cee4
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M ckan/lib/search/__init__.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/group_extra.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/task_status.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py

  Log Message:
  -----------
  domain_object fixes

  Commit: 62113e17419a7007912d37496761a1c68d40631c
      https://github.com/okfn/ckan/commit/62113e17419a7007912d37496761a1c68d40631c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M ckan/model/core.py
    M ckan/model/vocabulary.py

  Log Message:
  -----------
  more model import cleans vocab and core

  Commit: 92bb334ff7e4b175cd2e823fb512b7c80bff2aa0
      https://github.com/okfn/ckan/commit/92bb334ff7e4b175cd2e823fb512b7c80bff2aa0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/user.py

  Log Message:
  -----------
  more import cleanups

  Commit: 5c063b1f43314e3fc5be24e81bf7b06ed5f1f89e
      https://github.com/okfn/ckan/commit/5c063b1f43314e3fc5be24e81bf7b06ed5f1f89e
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/activity.py
    M ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/model/group_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/task_status.py

  Log Message:
  -----------
  some more import cleaning

  Commit: d9d6a71a2e588ecb38742434cf9a87d67e5af734
      https://github.com/okfn/ckan/commit/d9d6a71a2e588ecb38742434cf9a87d67e5af734
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/activity.py
    M ckan/model/authz.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/tag.py
    M ckan/model/term_translation.py

  Log Message:
  -----------
  further import cleans for models

  Commit: cb4c4c2c87565ca6db2b66e293118a746971277f
      https://github.com/okfn/ckan/commit/cb4c4c2c87565ca6db2b66e293118a746971277f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/lib/search/__init__.py
    M ckan/model/__init__.py
    M ckan/model/domain_object.py
    M ckan/model/tag.py
    M ckan/model/term_translation.py

  Log Message:
  -----------
  another bunch of import cleans for models

  Commit: f1b8aac2a05ca3e30741c9da9a1a36892fb70dfe
      https://github.com/okfn/ckan/commit/f1b8aac2a05ca3e30741c9da9a1a36892fb70dfe
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  import cleans for model/activity

  Commit: 68594504dd0dde1f1e888f1a5d78a87389409d51
      https://github.com/okfn/ckan/commit/68594504dd0dde1f1e888f1a5d78a87389409d51
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  import cleans for model/user

  Commit: 9fbd51342a0ac450d2557b3053e5a88d643d203c
      https://github.com/okfn/ckan/commit/9fbd51342a0ac450d2557b3053e5a88d643d203c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/authorization_group.py

  Log Message:
  -----------
  import cleans for model/authourization_group

  Commit: 570805427a11e72bb82d9b6b1d9c6ab2accfc01b
      https://github.com/okfn/ckan/commit/570805427a11e72bb82d9b6b1d9c6ab2accfc01b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/authorization_group.py

  Log Message:
  -----------
  more cleans for model/authourization_group

  Commit: d3be023c1f53f9b93e2aec782ad005045b224da9
      https://github.com/okfn/ckan/commit/d3be023c1f53f9b93e2aec782ad005045b224da9
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/authz.py

  Log Message:
  -----------
  more cleans for model/authz

  Commit: 079a0b49f16b675e996385bcc0f09e14ad297c40
      https://github.com/okfn/ckan/commit/079a0b49f16b675e996385bcc0f09e14ad297c40
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/extension.py

  Log Message:
  -----------
  more cleans for model/extensions

  Commit: 25fb6a26cca0486873a6e2cc9f2b4f9b30b59d68
      https://github.com/okfn/ckan/commit/25fb6a26cca0486873a6e2cc9f2b4f9b30b59d68
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/group.py
    M ckan/model/tag.py

  Log Message:
  -----------
  more cleans for model/group

  Commit: 0b4a9007bd5b98882cfb3ccc239a138085cbebb6
      https://github.com/okfn/ckan/commit/0b4a9007bd5b98882cfb3ccc239a138085cbebb6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/group_extra.py

  Log Message:
  -----------
  more cleans for model/group_extra

  Commit: c5f44bc5707268aa58d0c11121147cf661384ee2
      https://github.com/okfn/ckan/commit/c5f44bc5707268aa58d0c11121147cf661384ee2
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  more cleans for model/license

  Commit: 323049f8f0de56d9252a700f237890a79b415e76
      https://github.com/okfn/ckan/commit/323049f8f0de56d9252a700f237890a79b415e76
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/misc.py

  Log Message:
  -----------
  more cleans for model/misc

  Commit: 8406f4ed2c7c0f777aca3db5637ea9623ee40619
      https://github.com/okfn/ckan/commit/8406f4ed2c7c0f777aca3db5637ea9623ee40619
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/modification.py

  Log Message:
  -----------
  more cleans for model/modification

  Commit: 368c5e9ae2b5d60d6d27d5544eb53eafcaf2e961
      https://github.com/okfn/ckan/commit/368c5e9ae2b5d60d6d27d5544eb53eafcaf2e961
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/modification.py
    M ckan/model/package.py

  Log Message:
  -----------
  more cleans for model/package

  Commit: 3e242ea9ec7f2326272e7b0e49befd80544fed66
      https://github.com/okfn/ckan/commit/3e242ea9ec7f2326272e7b0e49befd80544fed66
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/package_extra.py

  Log Message:
  -----------
  more cleans for model/package_extras

  Commit: 7274549108ec75ab7a60ffaf3fd94f890577b8c0
      https://github.com/okfn/ckan/commit/7274549108ec75ab7a60ffaf3fd94f890577b8c0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/package_mapping.py

  Log Message:
  -----------
  more cleans for model/package_mapping

  Commit: 478058d52ad5b25f3faec213a63d58f3682e2afd
      https://github.com/okfn/ckan/commit/478058d52ad5b25f3faec213a63d58f3682e2afd
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/package_relationship.py

  Log Message:
  -----------
  more cleans for model/package_relationship plus __init__

  Commit: caccaea2d7f265c7663475a60226d0b7e05cb921
      https://github.com/okfn/ckan/commit/caccaea2d7f265c7663475a60226d0b7e05cb921
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/rating.py

  Log Message:
  -----------
  more cleans for model/rating

  Commit: 1fa31fe8e564c35203df22cda7d7408eb296b8d5
      https://github.com/okfn/ckan/commit/1fa31fe8e564c35203df22cda7d7408eb296b8d5
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  more cleans for model/resource

  Commit: f6ac49adaddd86450382af0212bbb71d13ff2abb
      https://github.com/okfn/ckan/commit/f6ac49adaddd86450382af0212bbb71d13ff2abb
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/task_status.py

  Log Message:
  -----------
  more cleans for model/task_status

  Commit: 345255f2138d6e2c6b0b91717e4f138fdee18b78
      https://github.com/okfn/ckan/commit/345255f2138d6e2c6b0b91717e4f138fdee18b78
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/vocabulary.py

  Log Message:
  -----------
  more cleans for model/vocabulary

  Commit: 55d0decbb4ff8400311d9508dbf6326d14b13dec
      https://github.com/okfn/ckan/commit/55d0decbb4ff8400311d9508dbf6326d14b13dec
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  more cleans for model/meta

  Commit: 9de3cb89077304043f39b3148d36addfa280931d
      https://github.com/okfn/ckan/commit/9de3cb89077304043f39b3148d36addfa280931d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  cleanups to model/__init__

  Commit: 8dfa64ef14b10f76765a212d802dae609fb27dac
      https://github.com/okfn/ckan/commit/8dfa64ef14b10f76765a212d802dae609fb27dac
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    R MIGRATE.txt
    R RELEASE.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    A ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/forms/authorization_group.py
    M ckan/forms/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.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/field_types.py
    M ckan/lib/helpers.py
    R ckan/lib/helpers_clean.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/schema.py
    M ckan/migration/versions/047_rename_package_group_member.py
    A ckan/migration/versions/052_update_member_capacities.py
    A ckan/migration/versions/053_add_group_logo.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/plugins/__init__.py
    M ckan/plugins/interfaces.py
    A ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
    A ckan/public/scripts/vendor/recline/css/map.css
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/_util.html
    R ckan/templates/_util_activity_div.html
    M ckan/templates/activity_streams/added_tag.html
    M ckan/templates/activity_streams/changed_group.html
    M ckan/templates/activity_streams/changed_package.html
    M ckan/templates/activity_streams/changed_package_extra.html
    M ckan/templates/activity_streams/changed_resource.html
    M ckan/templates/activity_streams/changed_user.html
    M ckan/templates/activity_streams/deleted_group.html
    M ckan/templates/activity_streams/deleted_package.html
    M ckan/templates/activity_streams/deleted_package_extra.html
    M ckan/templates/activity_streams/deleted_resource.html
    M ckan/templates/activity_streams/new_group.html
    M ckan/templates/activity_streams/new_package.html
    M ckan/templates/activity_streams/new_package_extra.html
    M ckan/templates/activity_streams/new_resource.html
    M ckan/templates/activity_streams/new_user.html
    M ckan/templates/activity_streams/removed_tag.html
    M ckan/templates/group/new_group_form.html
    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/editresources.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/snippets/package_list.html
    A ckan/templates/snippets/revision_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/tag/read.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new_user_form.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_member.py
    M ckan_deb/usr/lib/ckan/common.sh
    A ckanext/organizations/__init__.py
    A ckanext/organizations/controllers.py
    A ckanext/organizations/forms.py
    A ckanext/organizations/templates/email/join_publisher_request.txt
    A ckanext/organizations/templates/organization_apply.html
    A ckanext/organizations/templates/organization_apply_form.html
    A ckanext/organizations/templates/organization_form.html
    A ckanext/organizations/templates/organization_history.html
    A ckanext/organizations/templates/organization_index.html
    A ckanext/organizations/templates/organization_layout.html
    A ckanext/organizations/templates/organization_new.html
    A ckanext/organizations/templates/organization_package_form.html
    A ckanext/organizations/templates/organization_read.html
    A ckanext/organizations/templates/organization_users.html
    A ckanext/organizations/templates/organization_users_form.html
    M doc/api-v2.rst
    M doc/configuration.rst
    M doc/forms.rst
    A doc/geospatial.rst
    M doc/index.rst
    M doc/publisher-profile.rst
    A doc/publishing-datasets.rst
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into clean-models

Conflicts:
	ckan/model/__init__.py
	ckan/model/group.py
	ckan/model/license.py
	ckan/model/package.py

  Commit: 8bdff050fb867335c39780be4c1cf33a2263d113
      https://github.com/okfn/ckan/commit/8bdff050fb867335c39780be4c1cf33a2263d113
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  add fns to model to fix failing tests

  Commit: 736ab989b303fb7ce225cd54dcf334097d6de70d
      https://github.com/okfn/ckan/commit/736ab989b303fb7ce225cd54dcf334097d6de70d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    A ckan/config/solr/schema-1.4.xml
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    A ckan/controllers/related.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.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/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.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/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    A ckan/migration/versions/054_add_resource_created_date.py
    A ckan/migration/versions/055_update_user_and_activity_detail.py
    A ckan/migration/versions/056_add_related_table.py
    A ckan/migration/versions/057_tracking.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    A ckan/model/related.py
    M ckan/model/resource.py
    A ckan/model/tracking.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    A ckan/public/images/photo-placeholder.png
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph-flot.css
    A ckan/public/scripts/vendor/recline/css/graph.css
    A ckan/public/scripts/vendor/recline/css/grid.css
    M ckan/public/scripts/vendor/recline/css/map.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/templates/_snippet/add-related.html
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/_util.html
    M ckan/templates/facets.html
    M ckan/templates/group/read.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/layout.html
    A ckan/templates/package/related_list.html
    A ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html
    A ckan/templates/snippets/data-viewer-embed-branded-link.html
    A ckan/templates/snippets/data-viewer-embed-dialog.html
    M ckan/templates/tag/index.html
    M ckan/templates/tag/read.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/test_cors.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_pagination.py
    A ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_resource_search.py
    A ckan/tests/logic/__init__.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_auth_profiles.py
    A ckanext/multilingual/plugin.py
    A ckanext/multilingual/solr/dutch_stop.txt
    A ckanext/multilingual/solr/english_stop.txt
    A ckanext/multilingual/solr/fr_elision.txt
    A ckanext/multilingual/solr/french_stop.txt
    A ckanext/multilingual/solr/german_stop.txt
    A ckanext/multilingual/solr/greek_stopwords.txt
    A ckanext/multilingual/solr/italian_stop.txt
    A ckanext/multilingual/solr/polish_stop.txt
    A ckanext/multilingual/solr/portuguese_stop.txt
    A ckanext/multilingual/solr/romanian_stop.txt
    A ckanext/multilingual/solr/schema.xml
    A ckanext/multilingual/solr/spanish_stop.txt
    A ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/forms.py
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    M doc/apiv3.rst
    A doc/contrib.rst
    M doc/datastore.rst
    M doc/i18n.rst
    M doc/index.rst
    A doc/multilingual.rst
    M doc/paster.rst
    M doc/post-installation.rst
    A doc/using-data-api.rst
    M requires/lucid_missing.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into clean-models

Conflicts:
	ckan/model/__init__.py
	ckan/model/resource.py

  Commit: 1487690df9cf154d1e7437be764f7702e7f5cca3
      https://github.com/okfn/ckan/commit/1487690df9cf154d1e7437be764f7702e7f5cca3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  merge fix

  Commit: c78a6d3df705e9e47c3104d2132e269405f44a8d
      https://github.com/okfn/ckan/commit/c78a6d3df705e9e47c3104d2132e269405f44a8d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/model/tracking.py

  Log Message:
  -----------
  cleanup model/tracking.py

  Commit: 6a728d6334ef4a1fa03e1307fb0f73b280c1bdc6
      https://github.com/okfn/ckan/commit/6a728d6334ef4a1fa03e1307fb0f73b280c1bdc6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/related.py

  Log Message:
  -----------
  fixup related model

  Commit: eedae4f6cc4b2b16af227d338bc5b0aeb600377b
      https://github.com/okfn/ckan/commit/eedae4f6cc4b2b16af227d338bc5b0aeb600377b
  Author: amercader <amercadero at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/__init__.py
    M pip-requirements.txt

  Log Message:
  -----------
  [release-v1.7] Update version numbers

  Commit: fc58cb03376954cb16d350c43665c625f2270346
      https://github.com/okfn/ckan/commit/fc58cb03376954cb16d350c43665c625f2270346
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  minor import cleanup meta.py

  Commit: b73e1ccd963a6e3d425168d0bc7704c92731fb74
      https://github.com/okfn/ckan/commit/b73e1ccd963a6e3d425168d0bc7704c92731fb74
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/__init__.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/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/modification.py
    M ckan/model/package_relationship.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/tracking.py
    M ckan/model/types.py

  Log Message:
  -----------
  more model cleanups

  Commit: 70876ee31356a44d322d2af4afc053ad2fe13cd9
      https://github.com/okfn/ckan/commit/70876ee31356a44d322d2af4afc053ad2fe13cd9
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    A doc/data-viewer.rst
    M doc/index.rst

  Log Message:
  -----------
  [docs] A doc page for the data-viewer.

  Commit: 70a96a37d7d4d5bb0f7349bec088c70f7eda8577
      https://github.com/okfn/ckan/commit/70a96a37d7d4d5bb0f7349bec088c70f7eda8577
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/templates/home/index.html

  Log Message:
  -----------
  Fix a couple of strings that are causing a problem with Transifex

  Commit: 5ffe44bac28923fb85938f5ccdfd40c75336ecaa
      https://github.com/okfn/ckan/commit/5ffe44bac28923fb85938f5ccdfd40c75336ecaa
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/authz.py
    M ckan/model/package.py
    R ckan/model/package_mapping.py
    M ckan/model/tag.py

  Log Message:
  -----------
  kill package_mapping module

  Commit: 0aad92d53805b9926f2e06e1a984e63f5511bb54
      https://github.com/okfn/ckan/commit/0aad92d53805b9926f2e06e1a984e63f5511bb54
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/package.py
    M ckan/model/tag.py

  Log Message:
  -----------
  more model fixups

  Commit: b7b4a5e697e972b7f44c0b2425c058ca961ff64f
      https://github.com/okfn/ckan/commit/b7b4a5e697e972b7f44c0b2425c058ca961ff64f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [xs,bug] Fixed the non appearance of current related item count on resource pages

  Commit: a99df118842cbff468cb08b92b6b5d8b46609f51
      https://github.com/okfn/ckan/commit/a99df118842cbff468cb08b92b6b5d8b46609f51
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    A doc/data-viewer.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'release-v1.7' of https://github.com/okfn/ckan into release-v1.7

  Commit: 6c429da6eecfbefe59e2073b6aa81117db864e15
      https://github.com/okfn/ckan/commit/6c429da6eecfbefe59e2073b6aa81117db864e15
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  fix missing param in _create_license_list

  Commit: 382cb33726cf08a925a00fb677acd3b2dac208e9
      https://github.com/okfn/ckan/commit/382cb33726cf08a925a00fb677acd3b2dac208e9
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  make license_url optional

  Commit: a55724f81a219a0c398cad08d269d2fd1e88c061
      https://github.com/okfn/ckan/commit/a55724f81a219a0c398cad08d269d2fd1e88c061
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  model.license clean whitespace

  Commit: 14f4b14bbfad9b24452c0553fdcf32ec04cd474c
      https://github.com/okfn/ckan/commit/14f4b14bbfad9b24452c0553fdcf32ec04cd474c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/test_user.py

  Log Message:
  -----------
  remove unused imports

  Commit: 71757b2c00fc884decaf3f8882a4cdd4b37986b8
      https://github.com/okfn/ckan/commit/71757b2c00fc884decaf3f8882a4cdd4b37986b8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/core.py

  Log Message:
  -----------
  pep8 model.core

  Commit: 5decd98d6ece0cc5dfcc450d253262e8c03daace
      https://github.com/okfn/ckan/commit/5decd98d6ece0cc5dfcc450d253262e8c03daace
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  actually update version table

  Commit: 9308856023e3dc42d7138b6aef5ff5547a9b0799
      https://github.com/okfn/ckan/commit/9308856023e3dc42d7138b6aef5ff5547a9b0799
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M .tx/config
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    R ckan/i18n/lt/LC_MESSAGES/ckan.mo
    R ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Sync with Transifex ahead of 1.7 release

Followed the release process:

http://wiki.ckan.org/Release_process

1. Updated pot file with new strings from soure code
(python setup.py extract_messages)

2. Updated po files with latest CKAN 1.6 translations from Transifex
(tx pull --all --force)

3. Updated Transifex resource number in .tx/config to 1.7.

4. Updated po files with new strings from pot file
(python setup.py update_catalog --no-fuzzy-matching)

5. Deleted some empty translation files that Transifex wouldn't accept:
lt, zh_TW

6. Pushed the updated pot/po files to new 1.7 resource on Transifex
(tx push --source --translations --force)

7. Updated mo files from po files
(python setup.py compile_catalog)

  Commit: a7541d2cbe808ef2eb04dbdd5d8300f0f44e2255
      https://github.com/okfn/ckan/commit/a7541d2cbe808ef2eb04dbdd5d8300f0f44e2255
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/controllers/package.py
    A doc/data-viewer.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'release-v1.7' of github.com:okfn/ckan into release-v1.7

  Commit: 96cfa71d9c4b8046adb4e621634cd9ea407c32b8
      https://github.com/okfn/ckan/commit/96cfa71d9c4b8046adb4e621634cd9ea407c32b8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  some pep8 model/__init__.py

  Commit: ca1560540f1ed374f079df4ad9c6690abe76249c
      https://github.com/okfn/ckan/commit/ca1560540f1ed374f079df4ad9c6690abe76249c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/templates/_util.html
    M ckan/templates/package/related_list.html

  Log Message:
  -----------
  Fix for a bug related to deleting related items

  Commit: 4955b0a20dcb61ea89cc51b62842107b75344934
      https://github.com/okfn/ckan/commit/4955b0a20dcb61ea89cc51b62842107b75344934
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M .tx/config
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    R ckan/i18n/lt/LC_MESSAGES/ckan.mo
    R ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/templates/home/index.html

  Log Message:
  -----------
  Merge branch 'release-v1.7' of https://github.com/okfn/ckan into release-v1.7

  Commit: 705398096ae242d9db8524362760a970843cd7f2
      https://github.com/okfn/ckan/commit/705398096ae242d9db8524362760a970843cd7f2
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/__init__.py
    M ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/schema-1.4.xml
    M ckan/controllers/package.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    M ckan/public/scripts/vendor/recline/css/graph.css
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/_util.html
    M ckan/templates/package/related_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_alphabet_pagination.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckanext/multilingual/solr/schema.xml
    M doc/index.rst
    M doc/solr-setup.rst
    M doc/using-data-api.rst
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into clean-models

  Commit: c8d614d687e8397a7da0a8980755e4f4415bff9c
      https://github.com/okfn/ckan/commit/c8d614d687e8397a7da0a8980755e4f4415bff9c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

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

  Log Message:
  -----------
  [doc/using-dat-api][s]: some improvements based on @seanh's feedback.

  Commit: 4d86346c8c1cec608ef6c631816fd6edf36adab6
      https://github.com/okfn/ckan/commit/4d86346c8c1cec608ef6c631816fd6edf36adab6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [docs][solr] Upgrade solr setup docs schema-1.3.xml -> schema-1.4.xml

  Commit: 4ce167c9601087326d6cae52e0fccb084a97346b
      https://github.com/okfn/ckan/commit/4ce167c9601087326d6cae52e0fccb084a97346b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

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

  Log Message:
  -----------
  Merge branch 'release-v1.7' of https://github.com/okfn/ckan into release-v1.7

  Commit: ae5ad352a66e60fa455203d71730e811fcf0d883
      https://github.com/okfn/ckan/commit/ae5ad352a66e60fa455203d71730e811fcf0d883
  Author: kindly <kindly at gmail.com>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M ckan/logic/converters.py
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  [multilingual] fix errors in multilingual extenstion

  Commit: 7b62e56fda36a33ef8d2f0d5df7c41ca84c02ecb
      https://github.com/okfn/ckan/commit/7b62e56fda36a33ef8d2f0d5df7c41ca84c02ecb
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-04-27 (Fri, 27 Apr 2012)

  Changed paths:
    M ckan/templates/_snippet/data-api-help.html

  Log Message:
  -----------
  [doc,bugfix][xs]: correct erroneous link to help docs in data api modal.

  Commit: f4f549c15c69093dfd4d31d93ebb81d5e26b6b4e
      https://github.com/okfn/ckan/commit/f4f549c15c69093dfd4d31d93ebb81d5e26b6b4e
  Author: kindly <kindly at gmail.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  [2318] jsonify js strings so they are escaped in javascript and look nicer

  Commit: ccd89d8ee86e262d5412724c4503836b63e29a8b
      https://github.com/okfn/ckan/commit/ccd89d8ee86e262d5412724c4503836b63e29a8b
  Author: amercader <amercadero at gmail.com>
  Date:   2012-04-29 (Sun, 29 Apr 2012)

  Changed paths:
    M doc/solr-setup.rst

  Log Message:
  -----------
  [doc][xs] Nicer fix for SOLR JDK startup issue

  Commit: 7a0039be4fde8787cbe2c12124102eb2f5278d04
      https://github.com/okfn/ckan/commit/7a0039be4fde8787cbe2c12124102eb2f5278d04
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/logic/converters.py
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/js_strings.html
    M ckanext/multilingual/plugin.py
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'release-v1.7' of https://github.com/okfn/ckan into release-v1.7

  Commit: c0ad052f4f311ccf53ba94c0eac6da61c8f0d22d
      https://github.com/okfn/ckan/commit/c0ad052f4f311ccf53ba94c0eac6da61c8f0d22d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckanext/organizations/forms.py
    M ckanext/organizations/templates/organization_package_form.html

  Log Message:
  -----------
  Update to fix organization dataset form and resource upload

  Commit: 879c91c97244f6df7ac85620fca8d63a5cb94ce5
      https://github.com/okfn/ckan/commit/879c91c97244f6df7ac85620fca8d63a5cb94ce5
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/templates/package/layout.html

  Log Message:
  -----------
  Moving links about

  Commit: 89812cc00c39d17b8e69c1b57748b0616f3b8199
      https://github.com/okfn/ckan/commit/89812cc00c39d17b8e69c1b57748b0616f3b8199
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M .gitattributes
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Pull updated CKAN 1.7 translations from Transifex

tx pull --all --force
python setup.py compile_catalog

  Commit: 50f7475f3f6a56ed340102a69ed88abc5a6b5b45
      https://github.com/okfn/ckan/commit/50f7475f3f6a56ed340102a69ed88abc5a6b5b45
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/templates/package/layout.html

  Log Message:
  -----------
  Merge branch 'release-v1.7' of github.com:okfn/ckan into release-v1.7

  Commit: b74a85f94febb964480e94f3b368720a8e6770bd
      https://github.com/okfn/ckan/commit/b74a85f94febb964480e94f3b368720a8e6770bd
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  [xs] Removed unused route

  Commit: 807e503502850aa361ffd2a737f0071c6b3d23d3
      https://github.com/okfn/ckan/commit/807e503502850aa361ffd2a737f0071c6b3d23d3
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M .gitattributes
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge branch 'release-v1.7' of https://github.com/okfn/ckan into release-v1.7

  Commit: 9af01954e812047fac5f362aa49448e8322d15ed
      https://github.com/okfn/ckan/commit/9af01954e812047fac5f362aa49448e8322d15ed
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/css/graph.css
    M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [master,vendor/recline][s]: latest version of recline including fixes for recline:#75 (time series data) and recline:#85 (graph UI fixes).

  Commit: 9a15502e2f036751efa0b49e27e25e7517dbb880
      https://github.com/okfn/ckan/commit/9a15502e2f036751efa0b49e27e25e7517dbb880
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/templates/facets.html

  Log Message:
  -----------
  facets.html make comments template only

  Commit: 3fb1a29b8e77842a38cbee0b6fb9f040641d3fc7
      https://github.com/okfn/ckan/commit/3fb1a29b8e77842a38cbee0b6fb9f040641d3fc7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  fix js strings to use dump_json()

  Commit: 742fa614745618689476103120b36a8900adbfd6
      https://github.com/okfn/ckan/commit/742fa614745618689476103120b36a8900adbfd6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  fix 404 tracking error

  Commit: 01ca09436d5dcbf8feace0bd5d9ab48905c0f9f9
      https://github.com/okfn/ckan/commit/01ca09436d5dcbf8feace0bd5d9ab48905c0f9f9
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/helpers.py
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  make tracking optional via config options

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

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/helpers.py
    M ckan/public/scripts/vendor/recline/css/graph.css
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/facets.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  Merge branch 'release-v1.7' of https://github.com/okfn/ckan into release-v1.7

  Commit: e64a803d4aa0dfa19b56ad9dc2d305542d8ccd5a
      https://github.com/okfn/ckan/commit/e64a803d4aa0dfa19b56ad9dc2d305542d8ccd5a
  Author: John Glover <j at johnglover.net>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    A ckanext/multilingual/__init__.py

  Log Message:
  -----------
  [xs][multilingual] bug fix: add missing __init__.py file to ckanext/multilingual extension

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

  Changed paths:
    A ckanext/multilingual/__init__.py

  Log Message:
  -----------
  Merge branch 'release-v1.7' of https://github.com/okfn/ckan into release-v1.7

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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/group.py

  Log Message:
  -----------
  Fix counts that are including private datasets

  Commit: c6f7dd7349a354aa181a365b4c480c26638a8003
      https://github.com/okfn/ckan/commit/c6f7dd7349a354aa181a365b4c480c26638a8003
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2332] Align group logo to top of heading text

  Commit: f77c323e338492ea77361dd35142522ab585ff11
      https://github.com/okfn/ckan/commit/f77c323e338492ea77361dd35142522ab585ff11
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2332] Fix indented headings on groups page

  Commit: 34eac7199934e03b5a7a5db65d1229e034c84e52
      https://github.com/okfn/ckan/commit/34eac7199934e03b5a7a5db65d1229e034c84e52
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2332] Fix width of navigation on resources page

This was actually an issue with the rest of the page being wider than
the all the others making the navigation look narrower. I've reduced
the width to 940px, this was originally set to 950px by Rufus as a fix
to #1396 but change does not seem to affect the page.

  Commit: 3228ef76969c0c0a47f0b9e753ec859b59f6efa0
      https://github.com/okfn/ckan/commit/3228ef76969c0c0a47f0b9e753ec859b59f6efa0
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [2332] Update Bootstrap to 2.0.3

  Commit: 02ee2939821dfd323ca683e92cbdba086790f85f
      https://github.com/okfn/ckan/commit/02ee2939821dfd323ca683e92cbdba086790f85f
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [2332] Normalise the margins on the homepage heading

  Commit: 3b189b037cf06be009a47f2301b32a3f340fd27b
      https://github.com/okfn/ckan/commit/3b189b037cf06be009a47f2301b32a3f340fd27b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [2332] Tweak the spacing in the header

Gave the login text a little more space between it and the line height
and added a bit more padding to the bottom.

  Commit: 81db6bb54a9e67e9d515074ecc0c29d019faa93b
      https://github.com/okfn/ckan/commit/81db6bb54a9e67e9d515074ecc0c29d019faa93b
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-01 (Tue, 01 May 2012)

  Changed paths:
    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/layout_base.html

  Log Message:
  -----------
  [2366] Removed Auth groups link from footer and added deprecation notice

  Commit: 4f809ba573a72feff7af6161f5e21f31eb98c462
      https://github.com/okfn/ckan/commit/4f809ba573a72feff7af6161f5e21f31eb98c462
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  allow unselected_facet_items() in helpers

  Commit: 01ba1e70c5580e3506682e8a25f42293c6ac6d30
      https://github.com/okfn/ckan/commit/01ba1e70c5580e3506682e8a25f42293c6ac6d30
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [xs] fix tracking js error

  Commit: db95e2f615300fc38e84d58d89e2ff753e54c923
      https://github.com/okfn/ckan/commit/db95e2f615300fc38e84d58d89e2ff753e54c923
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M doc/commenting.rst
    M doc/deployment.rst
    M doc/forms.rst
    M doc/linked-data-and-rdf.rst
    M doc/publisher-profile.rst

  Log Message:
  -----------
  [doc] Bump 1.6.1 mentions

  Commit: 9a83d86c673200ef79eb097acdcc71c75e74dda6
      https://github.com/okfn/ckan/commit/9a83d86c673200ef79eb097acdcc71c75e74dda6
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M doc/forms.rst
    M doc/index.rst
    A doc/tag-vocabularies.rst

  Log Message:
  -----------
  [doc] Move and update tag vocabularies docs from the wiki

  Commit: 11e0b50f5bb258da58dea18b391fcbbed8a93a89
      https://github.com/okfn/ckan/commit/11e0b50f5bb258da58dea18b391fcbbed8a93a89
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [2314] Fix broken parse_rfc_2822 helper function.

  Commit: b9d6d42cc200452fedd482cd450c7625c3379bca
      https://github.com/okfn/ckan/commit/b9d6d42cc200452fedd482cd450c7625c3379bca
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Pull translations from Transifex

`tx pull --all --force` and `python setup.py compile_catalog`

  Commit: 84817a91cf57d94c2612d8d5a188ac53b20ea81f
      https://github.com/okfn/ckan/commit/84817a91cf57d94c2612d8d5a188ac53b20ea81f
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [xs] make sure tracking summary does not get shown on edit of resources

  Commit: 916c67f5e98973d6bd164a4aa4105f4550d3f410
      https://github.com/okfn/ckan/commit/916c67f5e98973d6bd164a4aa4105f4550d3f410
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [css][xs] Fix vertical alignment of small logos on footer

  Commit: 9ed0853547f88c90074efed4075f6fccdecb8e3c
      https://github.com/okfn/ckan/commit/9ed0853547f88c90074efed4075f6fccdecb8e3c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [xs] fix minor issue with sidebar in search results

  Commit: da85dbfbc1d032b5e0beb9d67c1ce81d8388de59
      https://github.com/okfn/ckan/commit/da85dbfbc1d032b5e0beb9d67c1ce81d8388de59
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [xs] pkg_dict should be created from database not repopulated data

  Commit: 07182719c6bb1f0a2fcdbae190d6345ca24f697c
      https://github.com/okfn/ckan/commit/07182719c6bb1f0a2fcdbae190d6345ca24f697c
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [xs] Change mentions to the Open Data Manual to Handbook

  Commit: 07f78e18bff068d9e9172b686692f8f9bcd89e53
      https://github.com/okfn/ckan/commit/07f78e18bff068d9e9172b686692f8f9bcd89e53
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/templates/package/search_form.html

  Log Message:
  -----------
  Move the search button inline with input

This has restructured the HTML used in the search_form.html which may
break extensions. Particularly the spacial extension which uses this
hook.

  Commit: dfadd64584695415b7961b93ae3690549fbd6faf
      https://github.com/okfn/ckan/commit/dfadd64584695415b7961b93ae3690549fbd6faf
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  [release-v1.7] Update CHANGELOG

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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/tests/logic/test_member.py

  Log Message:
  -----------
  [bug] Fix to extraneous fields in context for member api

  Commit: bf4735f52c2a7050d038af6d9bc33ab491a1adbd
      https://github.com/okfn/ckan/commit/bf4735f52c2a7050d038af6d9bc33ab491a1adbd
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M doc/api-v2.rst
    M doc/background-tasks.rst
    M doc/publisher-profile.rst
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [doc][xs] Minor cleaning up of the docs

  Commit: 9de8f8f4fe293c445fa920bd9b7480b19bf88ac0
      https://github.com/okfn/ckan/commit/9de8f8f4fe293c445fa920bd9b7480b19bf88ac0
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Update Finnish translation

  Commit: e0cb4c72239622fecf35967cff939d6d5b558f37
      https://github.com/okfn/ckan/commit/e0cb4c72239622fecf35967cff939d6d5b558f37
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  [release]: Version number updated for release

  Commit: 006c7dce7ae3be78378691208d7ef77b9adbf906
      https://github.com/okfn/ckan/commit/006c7dce7ae3be78378691208d7ef77b9adbf906
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan_deb/usr/bin/ckan-setup-solr

  Log Message:
  -----------
  [deb] Update schema version on SOLR setup script

  Commit: 36ba5e685d91611fd6d7e547f32b52044dd9409e
      https://github.com/okfn/ckan/commit/36ba5e685d91611fd6d7e547f32b52044dd9409e
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.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/converters.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    M ckan/public/scripts/application.js
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    M ckan/templates/facets.html
    M ckan/templates/group/authz.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read.n3
    M ckan/templates/package/read.rdf
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html
    M ckan/templates/user/login.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_group.py
    A ckanext/multilingual/__init__.py
    M ckanext/multilingual/plugin.py
    M ckanext/organizations/forms.py
    M ckanext/organizations/templates/email/join_publisher_request.txt
    M ckanext/organizations/templates/organization_package_form.html
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    A doc/data-viewer.rst
    M doc/filestore.rst
    M doc/index.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'master' into clean-models

Conflicts:
	ckan/model/__init__.py
	ckan/model/group.py

  Commit: 6c59c033af9620e88ea3dbfe98d8aef6d5231c51
      https://github.com/okfn/ckan/commit/6c59c033af9620e88ea3dbfe98d8aef6d5231c51
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Remove no "no-sidebar" translations from all languages

Change was made on Transifex and pulled into git

  Commit: c7cfe88b732f7448cc6a114ca8ffdde3adf05461
      https://github.com/okfn/ckan/commit/c7cfe88b732f7448cc6a114ca8ffdde3adf05461
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/tests/logic/test_action.py
    M requires/lucid_missing.txt

  Log Message:
  -----------
  [1.7] remove celery as dependancy

  Commit: 7da177f666f509d5b84c3385fa0c0e6f3ea892bf
      https://github.com/okfn/ckan/commit/7da177f666f509d5b84c3385fa0c0e6f3ea892bf
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge branch 'release-v1.7' of github.com:okfn/ckan into release-v1.7

  Commit: fb8fb4eab5caeaec7fcef07cbbfd09a86c24db6b
      https://github.com/okfn/ckan/commit/fb8fb4eab5caeaec7fcef07cbbfd09a86c24db6b
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  [xs 1.7] check for longs and not just ints for translations

  Commit: e77b6893b9880d86ee17f61c9d949927ff7ee1da
      https://github.com/okfn/ckan/commit/e77b6893b9880d86ee17f61c9d949927ff7ee1da
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckan/templates/group/edit.html
    M ckan/templates/home/index.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/revision/diff.html
    M ckan/templates/revision/list.html

  Log Message:
  -----------
  fix no-sidebar class being localised

  Commit: aa3e06033c00b0780ddad0e5104b8dddc3986c1e
      https://github.com/okfn/ckan/commit/aa3e06033c00b0780ddad0e5104b8dddc3986c1e
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  [doc][xs] Update release date

  Commit: b9ee2fae0fa0f51ba1812e7492d4809d3d890955
      https://github.com/okfn/ckan/commit/b9ee2fae0fa0f51ba1812e7492d4809d3d890955
  Author: amercader <amercadero at gmail.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M .gitattributes
    M .tx/config
    M CHANGELOG.txt
    M ckan/config/middleware.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.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/layout_base.html
    M ckan/templates/package/related_list.html
    M ckan/tests/logic/test_action.py
    M ckan_deb/usr/bin/ckan-setup-solr
    M ckanext/multilingual/plugin.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] from release-v1.7

  Commit: 6ce9a0a961bce251fa946a7af4294b3b1c6a93f3
      https://github.com/okfn/ckan/commit/6ce9a0a961bce251fa946a7af4294b3b1c6a93f3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  remove lib.helper dependency for model

  Commit: e132d9c6d1c390462e99e2b26039db0881a6e71b
      https://github.com/okfn/ckan/commit/e132d9c6d1c390462e99e2b26039db0881a6e71b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  clean the imports in model/__init__.py

  Commit: 7a822bc382da45c0ea4e2dcd70ca257c1672b648
      https://github.com/okfn/ckan/commit/7a822bc382da45c0ea4e2dcd70ca257c1672b648
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  more cleaning model/__init__.py

  Commit: aae1765fdfa07bcdac450a8a1842efa0fd9ae546
      https://github.com/okfn/ckan/commit/aae1765fdfa07bcdac450a8a1842efa0fd9ae546
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  bug fix model group

  Commit: cca7b08da6b1b831f051ab752e67c67250c62580
      https://github.com/okfn/ckan/commit/cca7b08da6b1b831f051ab752e67c67250c62580
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/vocabulary.py

  Log Message:
  -----------
  pep8 model.vocabulary

  Commit: e97546abbddbd6f24ad90e119018fa0ddff5bcb7
      https://github.com/okfn/ckan/commit/e97546abbddbd6f24ad90e119018fa0ddff5bcb7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  better import in model.user

  Commit: 1ce3225dd6b77266902dccdccf3eb3d0d1535308
      https://github.com/okfn/ckan/commit/1ce3225dd6b77266902dccdccf3eb3d0d1535308
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  pep8 model.user

  Commit: 1565758d4a58e36124280d5f44394840aec1d9c8
      https://github.com/okfn/ckan/commit/1565758d4a58e36124280d5f44394840aec1d9c8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  fix model import in lib helpers

  Commit: e445eb7bd3952ade3de12d783877691f712fef83
      https://github.com/okfn/ckan/commit/e445eb7bd3952ade3de12d783877691f712fef83
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M .gitattributes
    M .tx/config
    M CHANGELOG.txt
    M ckan/config/middleware.py
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/public/css/style.css
    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/logic/test_action.py
    M ckan_deb/usr/bin/ckan-setup-solr
    M ckanext/multilingual/plugin.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
    A doc/user-stories-list.rst
    A doc/user-stories.rst
    M doc/writing-extensions.rst
    M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into clean-models

Conflicts:
	ckan/model/__init__.py

  Commit: 8ec502604cf9b4dcb819c50925bb0203bf8a0764
      https://github.com/okfn/ckan/commit/8ec502604cf9b4dcb819c50925bb0203bf8a0764
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  model.__init__ needs meta imported

  Commit: 4204b3fc463017627e03f15d2d0ec746fa41022f
      https://github.com/okfn/ckan/commit/4204b3fc463017627e03f15d2d0ec746fa41022f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  restrict template vars by default

  Commit: 373d34bd67d8b1ccc863666cce2ff71324754257
      https://github.com/okfn/ckan/commit/373d34bd67d8b1ccc863666cce2ff71324754257
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/stats.py

  Log Message:
  -----------
  [stats] bugfixes following model cleanup

  Commit: 975eb63a7e7adc1f6a0c4f1a47d27cc82aaa543d
      https://github.com/okfn/ckan/commit/975eb63a7e7adc1f6a0c4f1a47d27cc82aaa543d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
    M ckan/tests/pylons_controller.py

  Log Message:
  -----------
  Extend test pylons environment to cope with DGU tests.

  Commit: 19900730d8b0d0c08aefb870eb0660ed05af9af5
      https://github.com/okfn/ckan/commit/19900730d8b0d0c08aefb870eb0660ed05af9af5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
    M ckan/tests/__init__.py

  Log Message:
  -----------
  [xs]: assert_in needs msg argument for dgu tests.

  Commit: ca388f06e871f90ec0a3df72c0cbd700fd4a1971
      https://github.com/okfn/ckan/commit/ca388f06e871f90ec0a3df72c0cbd700fd4a1971
  Author: Sean Hammond <seanhammond at lavabit.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/follower.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/layout_base.html
    M ckan/templates/package/related_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 github.com:okfn/ckan into feature-2304-follow

Conflicts:
	ckan/model/__init__.py

Compare: https://github.com/okfn/ckan/compare/5119a7f...ca388f0