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

GitHub noreply at github.com
Sun May 20 15:58:11 UTC 2012


  Branch: refs/heads/feature-2345-action-api-autodocs
  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: c38ef44ddb1dad67b34412c577990093a1a9e44a
      https://github.com/okfn/ckan/commit/c38ef44ddb1dad67b34412c577990093a1a9e44a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-19 (Thu, 19 Apr 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/054_follower_table.py
    M ckan/model/__init__.py
    A ckan/model/follower.py
    A ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Initial model and api for following feature

Add ckan/model/follower.py with follower_table definition.

Add follower_create logic action and auth functions.

Add default_create_follower_schema.

Add follower_list, user_follower_list and dataset_follower_list logic
action functions.

Add follower_table migration script.

Add incomplete tests in ckan/tests/functional/api/test_follow.py.


  Commit: 56ff7ee5e5ce64f576503315ec8aa792af48266f
      https://github.com/okfn/ckan/commit/56ff7ee5e5ce64f576503315ec8aa792af48266f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.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/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/helpers_clean.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/plugins/__init__.py
    M ckan/plugins/interfaces.py
    A ckan/plugins/toolkit.py
    M ckan/templates/_util.html
    M ckan/templates/facets.html
    M ckan/templates/group/read.html
    M ckan/templates/package/search.html
    M ckan/templates/tag/index.html
    M ckan/templates/tag/read.html
    M ckan/tests/lib/test_dictization.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 doc/api.rst
    M doc/apiv3.rst
    M doc/i18n.rst
    M doc/index.rst
    A doc/multilingual.rst
    M doc/paster.rst
    M doc/post-installation.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2304-follow


  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: 7c7320971d5d5e71916ed952692fe4731ddec2a5
      https://github.com/okfn/ckan/commit/7c7320971d5d5e71916ed952692fe4731ddec2a5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/logic/action/get.py
    M ckan/templates/package/read.html
    M ckan/templates/user/read.html
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Add follower counts to user and dataset pages

More work is needed to place them in a consistent location in the tab
bar (currently they look different on user pages than on dataset pages)


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Change follower_list to return user dicts


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    A ckan/templates/user/followers.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [#2304] Add /user/{id}/followers page with list of user's followers


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/public/scripts/application.js
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2304] Initial implementation of follow button


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

  Changed paths:
    M ckan/ckan_nose_plugin.py
    M ckan/config/environment.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    R ckan/lib/helpers_clean.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/converters.py
    M ckan/model/__init__.py
    M ckan/plugins/toolkit.py
    M ckan/public/scripts/application.js
    M ckan/templates/_snippet/data-api-help.html
    M ckan/tests/functional/test_cors.py
    A ckan/tests/logic/__init__.py
    M ckan/tests/logic/test_action.py
    M doc/_themes/sphinx-theme-okfn
    M doc/apiv3.rst
    M doc/datastore.rst
    M doc/index.rst
    A doc/using-data-api.rst
    M requires/lucid_missing.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2304-follow


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    A ckan/templates/package/followers.html
    M ckan/templates/package/layout.html

  Log Message:
  -----------
  [#2304] Add followers tab to dataset pages


  Commit: 914aba21b02e5d369248e008ded5fbe021357941
      https://github.com/okfn/ckan/commit/914aba21b02e5d369248e008ded5fbe021357941
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

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

  Log Message:
  -----------
  [#2304] Add Followers tab to user pages and hide Follow button

Only show the Follow button when viewing the page of another user and
not on your own page or the login or register pages


  Commit: 147a3e5a38edc86a5a637e7faca9cfafd1146c89
      https://github.com/okfn/ckan/commit/147a3e5a38edc86a5a637e7faca9cfafd1146c89
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M ckan/templates/user/layout.html
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    A doc/contrib.rst
    M doc/index.rst
    M doc/using-data-api.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2304-follow

Conflicts:
	ckan/templates/user/layout.html


  Commit: 82a04c0c44de0419538dce32f48896aee8a59b85
      https://github.com/okfn/ckan/commit/82a04c0c44de0419538dce32f48896aee8a59b85
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

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

  Log Message:
  -----------
  [#2304] Add number of followers into Follow button on dataset pages

num_followers should probably be added to the package dict to avoid
having to add it to the template context in multiple places, but this'll
do for now.


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

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2304] Add number of followers into Follow button on user pages


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2304] Save an unnecessary db access


  Commit: 36fba00c0d93775af9f2371701fbe57f27c5f7a3
      https://github.com/okfn/ckan/commit/36fba00c0d93775af9f2371701fbe57f27c5f7a3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M ckan/public/scripts/application.js
    M ckan/templates/package/layout.html

  Log Message:
  -----------
  [#2304] Add Follow button to dataset pages


  Commit: 8e1211549883d1b8789df40b61d55b5b30ef14e9
      https://github.com/okfn/ckan/commit/8e1211549883d1b8789df40b61d55b5b30ef14e9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

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

  Log Message:
  -----------
  [#2304] Remove follower count from dataset sidebar

It's in the Follow button now


  Commit: 8c188b98812d34f7f16a64388dfb02c3363a870c
      https://github.com/okfn/ckan/commit/8c188b98812d34f7f16a64388dfb02c3363a870c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/migration/versions/054_follower_table.py
    M ckan/model/__init__.py
    M ckan/model/follower.py
    M ckan/public/scripts/application.js
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Refactor the followers backend a bit

..and also add follower_delete and make the Follow buttons turn into
Unfollow buttons when the user is following the object.

It now uses an ORM class Follower, where each follower has follower_id,
follower_type, object_id and object_type (got rid of the word 'followee'
because it was confusing, not that 'object' is very good either).

Got rid of user_follower_list, dataset_follower_list,
user_follower_count, dataset_follower_count, just have follower_list and
follower_count.

Don't bother letting people specify the follower when calling
follower_create or follower_delete just always use the authorized user.

Move some code from logic functions into follower model.


  Commit: 8244875bcabdd94e17d08c242c0cf48963043802
      https://github.com/okfn/ckan/commit/8244875bcabdd94e17d08c242c0cf48963043802
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/auth/create.py
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2304] Don't show Follow button on user pages if not authorized to follow

e.g. if not logged in


  Commit: 95373e587eb6f7f11676b4cb1542def8279c2552
      https://github.com/okfn/ckan/commit/95373e587eb6f7f11676b4cb1542def8279c2552
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

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

  Log Message:
  -----------
  [#2304] Don't show Follow button on dataset pages if not authorised to follow

e.g. if not logged in


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

  Changed paths:
    M ckan/public/scripts/application.js
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2304] Make Follow/Unfollow buttons toggle when clicked

e.g. if you click on a Follow button then (after the ajax request
returns successfully) javascript turns the button into an Unfollow
button without refreshing the page. (Previously the button wouldn't
change to Unfollow until you refreshed the page.)


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

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

  Log Message:
  -----------
  [#2304] Tweak follow buttons and follower tabs style and layout


  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: 5441106e9d80ac3dd8f78bc13784c942d02485ef
      https://github.com/okfn/ckan/commit/5441106e9d80ac3dd8f78bc13784c942d02485ef
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/__init__.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    A ckan/config/solr/schema-1.4.xml
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    A ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/base.py
    M ckan/lib/cli.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/__init__.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/__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/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/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/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/tests/functional/api/base.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/functional/test_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_alphabet_pagination.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/misc/test_auth_profiles.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/organizations/forms.py
    M doc/apiv3.rst
    M doc/index.rst
    M doc/solr-setup.rst
    M doc/using-data-api.rst
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2304-follow

Conflicts:
	ckan/controllers/package.py
	ckan/templates/package/layout.html


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

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2304] follower_create accept either ID or name or user to follow

Add user_id_or_name_exists() validator


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

  Changed paths:
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Test user follow user API by both name and ID


  Commit: 75f866de94af52a8258dee243cc2ef17bd881330
      https://github.com/okfn/ckan/commit/75f866de94af52a8258dee243cc2ef17bd881330
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2304] follower_create accept either ID or name or user to follow


  Commit: 162fcdf2cac3e3a88922b97b3492224a814e40f7
      https://github.com/okfn/ckan/commit/162fcdf2cac3e3a88922b97b3492224a814e40f7
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Tests for starting to follow a user or dataset


  Commit: 215c71a70712dcba194c44558985885535877e7d
      https://github.com/okfn/ckan/commit/215c71a70712dcba194c44558985885535877e7d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2304] follower_create: transform user and dataset names into ids before saving


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

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  [#2304] follower_create: Fail gracefully on requests to create duplicate follower entries


  Commit: 5bc48f0e449b59230d6a781d6fa4fcf17d502c09
      https://github.com/okfn/ckan/commit/5bc48f0e449b59230d6a781d6fa4fcf17d502c09
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2304] follower_create: Don't let a user follow herself


  Commit: 2c13b2b719558d7660e8174570231993ee8b232a
      https://github.com/okfn/ckan/commit/2c13b2b719558d7660e8174570231993ee8b232a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Work on follower API tests


  Commit: 676d7a332824af1e27d433ac455ac507ff0abbaf
      https://github.com/okfn/ckan/commit/676d7a332824af1e27d433ac455ac507ff0abbaf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] More work on follower_create tests

Broke long test methods into lots of smaller ones, and also added in
some test conditions, including testing responses from am_following


  Commit: 1848f0ba1da79b0fda33d0b2a5f9a2df54727cc1
      https://github.com/okfn/ckan/commit/1848f0ba1da79b0fda33d0b2a5f9a2df54727cc1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Add one more test for follower_create


  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: 22347eb1f5d177e317f8316caf0bbe16a61d6977
      https://github.com/okfn/ckan/commit/22347eb1f5d177e317f8316caf0bbe16a61d6977
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-28 (Sat, 28 Apr 2012)

  Changed paths:
    M ckan/logic/action/delete.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Add tests for follower_delete api


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Add a few more follow api tests


  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: 6a279370998fe095acf089d58b390f63fc10b473
      https://github.com/okfn/ckan/commit/6a279370998fe095acf089d58b390f63fc10b473
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2304] Use jQuery .on() and .off() for follow button events


  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: 42c16b54d0b5b758615e2ed99b59d21c1497d7ca
      https://github.com/okfn/ckan/commit/42c16b54d0b5b758615e2ed99b59d21c1497d7ca
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-30 (Mon, 30 Apr 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2304] Javascript code formatting tweaks


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

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2304] Make follow button js a bit more efficient


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

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2304] Change a js == to ===


  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: 9d460be4e398ee3b9ea087688d53e942a3c410b9
      https://github.com/okfn/ckan/commit/9d460be4e398ee3b9ea087688d53e942a3c410b9
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/home.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/model/__init__.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/user/login.html
    M ckan/tests/lib/test_helpers.py
    M doc/configuration.rst

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


  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: 8660c03a554027bc685dd115a19552b462854760
      https://github.com/okfn/ckan/commit/8660c03a554027bc685dd115a19552b462854760
  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: 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: 2f4d2f30e27f59c1d247fbac59d5f5ce54bf4503
      https://github.com/okfn/ckan/commit/2f4d2f30e27f59c1d247fbac59d5f5ce54bf4503
  Author: Ross Jones <rossdjones 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:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  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: bdb5fd54b3fdd39075bd09fda2cbec47886b7e2c
      https://github.com/okfn/ckan/commit/bdb5fd54b3fdd39075bd09fda2cbec47886b7e2c
  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: a09d7b72ec2265e78efb212b49ba3665e32be301
      https://github.com/okfn/ckan/commit/a09d7b72ec2265e78efb212b49ba3665e32be301
  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: 0a935b8c1fd554eac71ef6252a8d56d16aff3bef
      https://github.com/okfn/ckan/commit/0a935b8c1fd554eac71ef6252a8d56d16aff3bef
  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: 13f5a75ced75b953ef8b4ed08db92f781d966b57
      https://github.com/okfn/ckan/commit/13f5a75ced75b953ef8b4ed08db92f781d966b57
  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: 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: 668d4d7b4771762f78cd08ae24fd944dba70db16
      https://github.com/okfn/ckan/commit/668d4d7b4771762f78cd08ae24fd944dba70db16
  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: 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: 817cba888ba5b5d90d583004cd7350365f5b49b4
      https://github.com/okfn/ckan/commit/817cba888ba5b5d90d583004cd7350365f5b49b4
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/base.py
    M ckan/logic/__init__.py
    M ckan/tests/functional/api/test_api.py

  Log Message:
  -----------
  [2330] First stab at making the get.py logic actions GETable


  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: a2fd245719a1224ce58d3af072f7cb146bea2899
      https://github.com/okfn/ckan/commit/a2fd245719a1224ce58d3af072f7cb146bea2899
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/public/css/style.css
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html

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


  Commit: d94f0108a3387ff439d525f0553a5152e6c038d1
      https://github.com/okfn/ckan/commit/d94f0108a3387ff439d525f0553a5152e6c038d1
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [2330] Created a decorator for marking actions as side-effect-free.

For use by users defining their own actions through the IActions interface.


  Commit: fd49c456c75e7cabb9e9fc7a7591a07379996914
      https://github.com/okfn/ckan/commit/fd49c456c75e7cabb9e9fc7a7591a07379996914
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-03 (Thu, 03 May 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [2330] Only load functions from the action module.

We were loading every public object in the module as an action.  Whilst not perfect, this at least
ensures that only functions are loaded, and not things like get.log


  Commit: e2af388a0a91e3258f537cb6f5bce79fa4c526d5
      https://github.com/okfn/ckan/commit/e2af388a0a91e3258f537cb6f5bce79fa4c526d5
  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: 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: 55d8ea418b94a9cedab3f95e4c50b929f2f527d1
      https://github.com/okfn/ckan/commit/55d8ea418b94a9cedab3f95e4c50b929f2f527d1
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/tests/functional/api/test_api.py

  Log Message:
  -----------
  [2330] Some comments


  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: d22c05fee2e114a4c5d8a9b921d5e38e1649b5e0
      https://github.com/okfn/ckan/commit/d22c05fee2e114a4c5d8a9b921d5e38e1649b5e0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

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

  Log Message:
  -----------
  [xs] Fix the RDF alternative rep of the page, and make the atom url absolute


  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: c8239b42de7e4a08e946d1421e9aac2d21845e7f
      https://github.com/okfn/ckan/commit/c8239b42de7e4a08e946d1421e9aac2d21845e7f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/templates/package/read.html
    M ckan/templates/package/read.n3
    M ckan/templates/package/read.rdf
    M ckan/templates/package/resource_read.html
    M ckanext/organizations/templates/email/join_publisher_request.txt

  Log Message:
  -----------
  [xs] Adding qualified=True to urls using h.url_for instead of prepending with g.site_url


  Commit: 3bd5b89b9a44372fe37e10edb67a6e7910ab141a
      https://github.com/okfn/ckan/commit/3bd5b89b9a44372fe37e10edb67a6e7910ab141a
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [2330] Ensured that only action functions (in get.py) are turned into actions by the actin API

 - renamed functions not being exported by the module to have an underscore
   prefix, ensuring that they are then not exposed as actions in the action
   API.
 - fixed sqlalchemy imports


  Commit: c4a0d488302bb6d5083c479ffd0b18f85c20ae07
      https://github.com/okfn/ckan/commit/c4a0d488302bb6d5083c479ffd0b18f85c20ae07
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M doc/apiv3.rst

  Log Message:
  -----------
  [2330] Docs


  Commit: fa0bc04210c8dadce2bc1269788b16f12f4d8f24
      https://github.com/okfn/ckan/commit/fa0bc04210c8dadce2bc1269788b16f12f4d8f24
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

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

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

Cherry-pick of 70876ee31356a44d322d2af4afc053ad2fe13cd9 which was made on
the release-v1.7 branch.


  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: 336e23dd66306d4dea05e5e980201312d8a4cbc5
      https://github.com/okfn/ckan/commit/336e23dd66306d4dea05e5e980201312d8a4cbc5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [xs] Typos.


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

  Changed paths:
    M ckan/controllers/api.py
    M ckan/model/group.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  [#2373]: Fix for group autocomplete for multiple words.


  Commit: 52e1c1eb46b7da5a5ec761f560e6e9f5bd74a0eb
      https://github.com/okfn/ckan/commit/52e1c1eb46b7da5a5ec761f560e6e9f5bd74a0eb
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

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

  Log Message:
  -----------
  [2330] Use get_or_bust in the actions layer.

This function raises a ValidationError if the key doesn't exist in the given
(data_)dict.  This means better error messages for the user.


  Commit: f2ddf0dfb5c31018d2e4e03fd7522d54bc9de930
      https://github.com/okfn/ckan/commit/f2ddf0dfb5c31018d2e4e03fd7522d54bc9de930
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [2330] Small fix to get_or_bust() function.

It should only raise a ValidationError if the key cannot be found.  And not
if the value is false-y.


  Commit: aa1a09b9878060fbe21ee78038bb9c3f8def8a3f
      https://github.com/okfn/ckan/commit/aa1a09b9878060fbe21ee78038bb9c3f8def8a3f
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  [2330] Ensure that only action functions in the action modules are exposed through the action API


  Commit: c943549cda5cf8d57a11d11565d4664805d2a4ee
      https://github.com/okfn/ckan/commit/c943549cda5cf8d57a11d11565d4664805d2a4ee
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-04 (Fri, 04 May 2012)

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

  Log Message:
  -----------
  Merge branch 'feature-2285-embeddable-data-viewer'


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

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

  Log Message:
  -----------
  [#2374] Made tag search pageable. Moved logic tag tests into its own file. Centralised related testing fixtures.


  Commit: 79c8b5f57ecf1bc48f34a47914bab4d1f5cb8f99
      https://github.com/okfn/ckan/commit/79c8b5f57ecf1bc48f34a47914bab4d1f5cb8f99
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [2330] Allow the passing of the data_dict through the GET request's body


  Commit: 8947302696498fd99ea304edbb898a56f793f998
      https://github.com/okfn/ckan/commit/8947302696498fd99ea304edbb898a56f793f998
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/base.py
    M ckan/templates/admin/authz.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html

  Log Message:
  -----------
  [#2366] Only display authz options for Authz Groups if there are some.


  Commit: 7a73126e1b0f572790483febff747ae30ae1ff59
      https://github.com/okfn/ckan/commit/7a73126e1b0f572790483febff747ae30ae1ff59
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    M doc/filestore.rst

  Log Message:
  -----------
  [docs] Clarify where to put filestore config lines in ini file


  Commit: 5c1dc6f1f14f935f3ce8e7d4c52ec996d30cb8f3
      https://github.com/okfn/ckan/commit/5c1dc6f1f14f935f3ce8e7d4c52ec996d30cb8f3
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-07 (Mon, 07 May 2012)

  Changed paths:
    M ckan/authz.py

  Log Message:
  -----------
  [xs]: More flexible args for is_sysadmin so that it can run quicker.


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

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [xs] Fixing problem with 404 when requesting related items


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

  Changed paths:
    M ckan/authz.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/logic/action/get.py
    M ckan/model/group.py
    M ckan/plugins/toolkit.py
    M ckan/templates/admin/authz.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_group.py
    A doc/data-viewer.rst
    M doc/filestore.rst
    M doc/index.rst

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


  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: 99d1f424e328fed6333a1d3eeb62796948a0a646
      https://github.com/okfn/ckan/commit/99d1f424e328fed6333a1d3eeb62796948a0a646
  Author: Sean Hammond <seanhammond at lavabit.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/model/__init__.py
    M ckan/model/group.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.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/_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/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' of github.com:okfn/ckan into feature-2304-follow

Conflicts:
	ckan/templates/package/layout.html


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

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

  Log Message:
  -----------
  Update homepage boxes to always wrap contents

This will not ensure that the boxes are always the same height.
JavaScript will be required if that is the case.


  Commit: 1fc2357571891e394dbf8a2e648ba53280820b40
      https://github.com/okfn/ckan/commit/1fc2357571891e394dbf8a2e648ba53280820b40
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/related.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/model/group.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    M ckan/templates/admin/authz.html
    M ckan/templates/group/authz.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read.n3
    M ckan/templates/package/read.rdf
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search_form.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_util.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
    M ckanext/organizations/templates/email/join_publisher_request.txt
    A doc/data-viewer.rst
    M doc/filestore.rst
    M doc/index.rst

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


  Commit: b2e896e27029121e3b9edbc763ccdb23509e80d7
      https://github.com/okfn/ckan/commit/b2e896e27029121e3b9edbc763ccdb23509e80d7
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M doc/index.rst
    A doc/user-stories-list.rst
    A doc/user-stories.rst

  Log Message:
  -----------
  [doc/user-stories][s]: add user stories from wiki.


  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: c33113beb98481ba74be49fecd3ea5b10168c16f
      https://github.com/okfn/ckan/commit/c33113beb98481ba74be49fecd3ea5b10168c16f
  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: 014e5de73a3c5762d55636255f4aa812bb95d3f3
      https://github.com/okfn/ckan/commit/014e5de73a3c5762d55636255f4aa812bb95d3f3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2304] Small user controller refactoring

Move initialisation of a few more template variables into
_setup_template_variables(), and change read(), edit(), and followers()
to use it. This removes some code duplication and fixes issues with the
followers count and follow button not being initialisd on all user
controller pages.

Change new() to _not_ use _setup_template_variables() as it only needs
c.is_sysadmin and not the rest.

Also fix templates/user/layout.html so that the Followers tab appears on
both your own user page (when logged in) and on other user's pages.


  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: f01cc89569b76839935a87cb31920d8ceda173e8
      https://github.com/okfn/ckan/commit/f01cc89569b76839935a87cb31920d8ceda173e8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckan/public/scripts/application.js
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2304] Refactor follow button js


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2304] Fix dataset follower count on resource read page


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

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

  Log Message:
  -----------
  [#2304] Remove duplicate history tab from dataset page

Looks like a merge effect


  Commit: f094b1600202e9b05f33b48a23d6fca045608fdb
      https://github.com/okfn/ckan/commit/f094b1600202e9b05f33b48a23d6fca045608fdb
  Author: Sean Hammond <seanhammond at lavabit.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/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
    M doc/index.rst
    A doc/user-stories-list.rst
    A doc/user-stories.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2304-follow


  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: 53951fc8b2d98ad5ba4e7c03d14640561fc700f2
      https://github.com/okfn/ckan/commit/53951fc8b2d98ad5ba4e7c03d14640561fc700f2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-09 (Wed, 09 May 2012)

  Changed paths:
    M ckan/public/scripts/application.js
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2304] Tidy up follow button attributes

Use HTML5 data- attributes


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

  Changed paths:
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py

  Log Message:
  -----------
  [#2304] Fix auth count


  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: 5119a7fd7eba629c3df02d76dfc38df7873b2610
      https://github.com/okfn/ckan/commit/5119a7fd7eba629c3df02d76dfc38df7873b2610
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-11 (Fri, 11 May 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/__init__.py
    M ckan/model/follower.py
    M ckan/public/scripts/application.js
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Refactor the follower model

Now uses two many-many relationship tables UserFollowingUser and
UserFollowingDataset instead of one Follower table, so the user IDs and
dataset
IDs can now be foreign keys with on update cascade and on delete
cascade.

default_create_follower_schema() becomes default_follow_user_schema()
and
default_follow_dataset_schema().

follower_dictize() becomes user_following_user_dictize() and
user_following_dataset_dictize().

follower_dict_save() becomes user_following_user_dict_save() and
user_following_dataset_dict_save().

follower_create() becomes follow_user() and follow_dataset().

follower_delete() becomes unfollow_user() and unfollow_dataset().

follower_count() becomes user_follower_count() and
dataset_follower_count().

follower_list() becomes user_follower_list() and
dataset_follower_list().

am_following() becomes am_following_user() and am_following_dataset().

Removed the follower_create() and follower_delete() auth functions,
anyone can
follow or unfollow anything as long as they're logged in.

Follower specific validation functions aren't needed anymore.


  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


  Commit: 2bab7cbd89cd6a710057c7a75c00d8afdff31332
      https://github.com/okfn/ckan/commit/2bab7cbd89cd6a710057c7a75c00d8afdff31332
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-05-12 (Sat, 12 May 2012)

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

  Log Message:
  -----------
  [doc/using-data-api][s]: geospatial query example.


  Commit: d542a2ddc7cfee561dd179a5585066887ee1ae12
      https://github.com/okfn/ckan/commit/d542a2ddc7cfee561dd179a5585066887ee1ae12
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-05-12 (Sat, 12 May 2012)

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

  Log Message:
  -----------
  [doc/using-data-api][xs]: micro correction to geospatial query.


  Commit: 82ca43cfa55772530ad95be4a400ec896290a3b2
      https://github.com/okfn/ckan/commit/82ca43cfa55772530ad95be4a400ec896290a3b2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Add validation to follower api functions in delete.py and get.py


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

  Changed paths:
    M ckan/model/follower.py

  Log Message:
  -----------
  [#2304] Set nullable=False on follower db columns


  Commit: 4173ecb86bfb88cb3eabecb4ac31e1647d98e71a
      https://github.com/okfn/ckan/commit/4173ecb86bfb88cb3eabecb4ac31e1647d98e71a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_follow.py

  Log Message:
  -----------
  [#2304] Add tests for cascading of follower rows


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

  Changed paths:
    A ckan/migration/versions/058_add_follower_tables.py

  Log Message:
  -----------
  [#2304] Add db migration script for follower


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

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2304-follow


  Commit: 5915152a9e0d2634ca75e4d3ccf06ceb99d72ea8
      https://github.com/okfn/ckan/commit/5915152a9e0d2634ca75e4d3ccf06ceb99d72ea8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#2304] Fix a couple of bugs in user controller


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

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    A ckan/migration/versions/058_add_follower_tables.py
    M ckan/model/follower.py
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_follow.py
    M doc/using-data-api.rst

  Log Message:
  -----------
  Merge branch 'feature-2304-follow' of https://github.com/okfn/ckan into feature-2304-follow


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [2304] Fixed missing related count

Fix the missing related count on the following page for a given
dataset.


  Commit: 54e67cfcebafc3ffff3b0310576f17c912f033cd
      https://github.com/okfn/ckan/commit/54e67cfcebafc3ffff3b0310576f17c912f033cd
  Author: kindly <kindly at gmail.com>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [doc] add java client to docs


  Commit: 7bc2a6ebd9ec61af1b2d3dfead1e0eeed33dbab2
      https://github.com/okfn/ckan/commit/7bc2a6ebd9ec61af1b2d3dfead1e0eeed33dbab2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#2304] Fix bug in user controller followers page


  Commit: 5fbe4258358ba2429e9f8a4cea246320ea4dd5ac
      https://github.com/okfn/ckan/commit/5fbe4258358ba2429e9f8a4cea246320ea4dd5ac
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    A ckan/tests/functional/test_follow.py

  Log Message:
  -----------
  [#2304] Add wui tests for follow feature


  Commit: 33ba385bb5182ed989b6fddfd669c6ac33ce6913
      https://github.com/okfn/ckan/commit/33ba385bb5182ed989b6fddfd669c6ac33ce6913
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M ckan/lib/base.py
    M ckan/tests/functional/api/test_api.py
    M doc/apiv3.rst

  Log Message:
  -----------
  [2330] Simplified passing of GETable action's paramters.

 - Removed ability to pass in arguments in the GET request's body.
 - Removed ability to pass in a nested, json-encoded data_dict in the
   'data_dict' url parameter.

Decided that these two methods just made for an unecessary complexity and
unclarity for users of the api.


  Commit: 4e522324d3617693f3a2d25685008ab5be4e6745
      https://github.com/okfn/ckan/commit/4e522324d3617693f3a2d25685008ab5be4e6745
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-14 (Mon, 14 May 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [2330] Extended allowable argument types of "term_translation_show" action.

Extended the `terms` and (optional) `lang_codes` arguments to accept a
string in lieu of a unit-length list of strings.  This ensures compatibility
with access to this action via a GET request where the arguments are
constructed from URL parameters.


  Commit: 62030d76940de644ad5ac953d58e78b9689ac592
      https://github.com/okfn/ckan/commit/62030d76940de644ad5ac953d58e78b9689ac592
  Author: Ian Murray <ian.murray at okfn.org>
  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/apiv3.rst

  Log Message:
  -----------
  Merge branch 'feature-2330-make-api-read-actions-GETable' into master.

Conflicts:
	ckan/logic/action/create.py
	ckan/logic/action/delete.py
	ckan/logic/action/get.py


  Commit: dff616746cc02965ff46b2d54de5f72bfa2a35da
      https://github.com/okfn/ckan/commit/dff616746cc02965ff46b2d54de5f72bfa2a35da
  Author: Sean Hammond <seanhammond at lavabit.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 github.com:okfn/ckan into feature-2304-follow


  Commit: 82eb14c4a9d6baf7e25269f44acf4ae11cdddf5d
      https://github.com/okfn/ckan/commit/82eb14c4a9d6baf7e25269f44acf4ae11cdddf5d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-15 (Tue, 15 May 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Fix some validate -> _validate


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

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Fix some more validate -> _validate


  Commit: 90af2abadc860434a462d6b4c2de78190b9d5f17
      https://github.com/okfn/ckan/commit/90af2abadc860434a462d6b4c2de78190b9d5f17
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-15 (Tue, 15 May 2012)

  Changed paths:
    M ckan/tests/functional/test_follow.py

  Log Message:
  -----------
  Small correction to test_follow.py


  Commit: d1c2ed08c90c2d94e1b2ced86e8758208a61ee96
      https://github.com/okfn/ckan/commit/d1c2ed08c90c2d94e1b2ced86e8758208a61ee96
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-15 (Tue, 15 May 2012)

  Changed paths:
    M ckan/lib/create_test_data.py

  Log Message:
  -----------
  [#2390] create_test_data for multiple users, rights


  Commit: 0bc06c6495c749d6b481164d59cceeca873acefb
      https://github.com/okfn/ckan/commit/0bc06c6495c749d6b481164d59cceeca873acefb
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-15 (Tue, 15 May 2012)

  Changed paths:
    M ckan/lib/authztool.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:
  -----------
  [#2384] Rights tool factored out of CLI. (cherry pick)


  Commit: 7d02ca90c78200f9dacf41f0a6a5c6116507e34f
      https://github.com/okfn/ckan/commit/7d02ca90c78200f9dacf41f0a6a5c6116507e34f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-15 (Tue, 15 May 2012)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Fix error_summary -> _error_summary


  Commit: 223b9e7507fd8e198282ccb6e9f2bdf871547f66
      https://github.com/okfn/ckan/commit/223b9e7507fd8e198282ccb6e9f2bdf871547f66
  Author: Sean Hammond <seanhammond at lavabit.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 github.com:okfn/ckan into feature-2304-follow


  Commit: 427856ed7741fcd57960df9f6b512a572a68af21
      https://github.com/okfn/ckan/commit/427856ed7741fcd57960df9f6b512a572a68af21
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-15 (Tue, 15 May 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.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/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/read.html
    M ckan/tests/__init__.py
    A ckan/tests/functional/api/test_follow.py
    A ckan/tests/functional/test_follow.py

  Log Message:
  -----------
  Merge branch 'feature-2304-follow'


  Commit: b486244e12d2d8183826fc80046b7fc1247fc56d
      https://github.com/okfn/ckan/commit/b486244e12d2d8183826fc80046b7fc1247fc56d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-16 (Wed, 16 May 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M setup.py

  Log Message:
  -----------
  [#2394] Separate off CLI of create_test_data to help imports, logging and ease deriving from CreateTestData.
(cherry pick of cee29590064a4395e32f1692b40f3eeb9331a984 and 5ee7607b2c4bbabb3314f5f03129af8b78e97520)


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

  Changed paths:
    M ckan/templates/user/login.html

  Log Message:
  -----------
  [xs] fix password request


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

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
    M ckan/model/package.py

  Log Message:
  -----------
  [xs] Turn off eagerload as it slows down package getting hugely if there are lots of resources or lots of tags


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

  Changed paths:
    M ckan/templates/user/login.html

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


  Commit: 968690e5fd3d7bfeff6fa09a7cff09e2ecd98a61
      https://github.com/okfn/ckan/commit/968690e5fd3d7bfeff6fa09a7cff09e2ecd98a61
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  Don't dictize each tags packages on tag index page

This makes the tag index page load much faster when there are a large
number of tags.

tag_list() logic action function calls tag_list_dicitize() instead of
tag_dictize(), the difference is that tag_list_dicitize() doesn't
dictize all of the tag's packages as well. Extended tag_list_dicitize()
to have some of tag_dictize()'s features that it was missing.


  Commit: 112e405d0116bdcf196062520e3474e231337996
      https://github.com/okfn/ckan/commit/112e405d0116bdcf196062520e3474e231337996
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/lib/cli.py
    M profile_tests.py
    M setup.py

  Log Message:
  -----------
  [#2401]: Add CLI for time/speed profiling of requests.


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

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [xs] take out set_trace!


  Commit: 522adf60dd059d253d6920402bca28cb61984eb6
      https://github.com/okfn/ckan/commit/522adf60dd059d253d6920402bca28cb61984eb6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

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


  Commit: ac8f0c9fe03f14d2cd7f2b336415d8f22377b438
      https://github.com/okfn/ckan/commit/ac8f0c9fe03f14d2cd7f2b336415d8f22377b438
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-05-17 (Thu, 17 May 2012)

  Changed paths:
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [xs]: Fix Genshi test failure seen on newer machines - kindly and I had it.


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

  Changed paths:
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [2402] search result speedup


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

  Changed paths:
    M ckan/lib/cli.py
    M ckan/tests/functional/test_user.py
    M profile_tests.py
    M setup.py

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


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

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

  Log Message:
  -----------
  [2403] home page speed improvments


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

  Changed paths:
    M .gitattributes
    M .tx/config
    M CHANGELOG.txt
    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/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/authztool.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/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__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/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/058_add_follower_tables.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
    A 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/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.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/authz.html
    M ckan/templates/group/edit.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/editresources.html
    A ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new.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/revision/diff.html
    M ckan/templates/revision/list.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
    M ckan/tests/functional/api/test_api.py
    A ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_util.py
    A ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authztool.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_group.py
    M ckan/tests/pylons_controller.py
    M ckan_deb/usr/bin/ckan-setup-solr
    M ckanext/multilingual/plugin.py
    M ckanext/organizations/templates/email/join_publisher_request.txt
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/stats.py
    M doc/api-v2.rst
    M doc/api.rst
    M doc/apiv3.rst
    M doc/background-tasks.rst
    M doc/commenting.rst
    A doc/data-viewer.rst
    M doc/deployment.rst
    M doc/filestore.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/using-data-api.rst
    M doc/writing-extensions.rst
    M profile_tests.py
    M requires/lucid_missing.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-2345-action-api-autodocs

Conflicts:
	ckan/logic/action/create.py
	ckan/logic/action/delete.py
	ckan/logic/action/get.py


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

  Changed paths:
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  [#2345] Update some tests


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

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2345] More work on logic/action/get.py docstrings


  Commit: 8971a99d99f57b31b9a37a289bd64a483c58516a
      https://github.com/okfn/ckan/commit/8971a99d99f57b31b9a37a289bd64a483c58516a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-19 (Sat, 19 May 2012)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  [#2345] Docstring for package_create


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

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  [#2345] More logic/action/create.py docstrings


  Commit: 3637049383aa478063534ce1509263b6606f2b6e
      https://github.com/okfn/ckan/commit/3637049383aa478063534ce1509263b6606f2b6e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 May 2012)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  [#2345] Finish logic/action/create.py docstrings


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

  Changed paths:
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  [#2345] Fix some tests that were failing

due to changes in logic api docstrings


Compare: https://github.com/okfn/ckan/compare/e8b4e14...ab390da


More information about the ckan-changes mailing list