[ckan-changes] [okfn/ckan] c38ef4: [#2304] Initial model and api for following featur...

GitHub noreply at github.com
Fri May 25 12:01:06 UTC 2012


  Branch: refs/heads/feature-2375-demo-theme
  Home:   https://github.com/okfn/ckan
  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: 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: 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: 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: 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: 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: 6d0bf37f6bb1bd6688e2f8cac386b563f34b3a29
      https://github.com/okfn/ckan/commit/6d0bf37f6bb1bd6688e2f8cac386b563f34b3a29
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-02 (Wed, 02 May 2012)

  Changed paths:
    M ckan/logic/action/get.py
    A doc/api-ref.rst

  Log Message:
  -----------
  [#2345] Beginning of autodoc API reference


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

  Changed paths:
    M ckan/logic/action/get.py
    M doc/api-ref.rst

  Log Message:
  -----------
  [#2345] Little more work on autodoc action API ref


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

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

  Log Message:
  -----------
  [doc] Tweak some docstrings in logic/action/get.py

Make first lines shorter


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

  Changed paths:
    M ckan/logic/action/create.py
    M doc/api-ref.rst

  Log Message:
  -----------
  [#2345] Add autodocs to a couple of functions in action/create.py


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

  Changed paths:
    M doc/api-ref.rst

  Log Message:
  -----------
  [#2345] Add update and delete modules to action api autodoc ref


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

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#2345] Correct a comment in schema.py


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

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

  Log Message:
  -----------
  [#2345] Finish up a few more action/get.py docstrings

these were the low-hanging fruit


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

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

  Log Message:
  -----------
  Fix a bug with the limit argument to current_package_list_with_resources


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

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

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


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

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

  Log Message:
  -----------
  [#2345] Sphinxify action/get.py:member_list() docstring


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


  Commit: 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


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

  Changed paths:
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#2345] Add docstrings to ckan/logic/update.py and delete.py


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

  Changed paths:
    R doc/api-ref.rst
    M doc/apiv3.rst

  Log Message:
  -----------
  [#2345] Replace action API ref with new autodoc one


  Commit: 131c0f4fe30902bdfd0547dc2e8cf33038b997bf
      https://github.com/okfn/ckan/commit/131c0f4fe30902bdfd0547dc2e8cf33038b997bf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-05-20 (Sun, 20 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
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M doc/apiv3.rst

  Log Message:
  -----------
  Merge branch 'feature-2345-action-api-autodocs'


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

  Changed paths:
    A Coding_Standards.rst

  Log Message:
  -----------
  Add Coding_Standards.rst file

Only contains CKAN Docstring Standards so far.


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

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

  Log Message:
  -----------
  Remove some unwanted docstrings


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

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

  Log Message:
  -----------
  [#2345] Docstring for package_search action.


  Commit: c07fc16fab72dbedfe8139b9c4fcc61b6c3655fa
      https://github.com/okfn/ckan/commit/c07fc16fab72dbedfe8139b9c4fcc61b6c3655fa
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-05-21 (Mon, 21 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/auth/delete.py
    M ckan/logic/auth/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
    R doc/api-ref.rst
    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 remote-tracking branch 'origin/feature-2345-action-api-autodocs' into feature-2345-action-api-autodocs

Conflicts:
	ckan/logic/action/get.py


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

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

  Log Message:
  -----------
  Tidying package_search docstring


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

  Changed paths:
    M doc/apiv3.rst

  Log Message:
  -----------
  Moved section about GETable actions


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

  Changed paths:
    M ckan/logic/action/get.py
    M doc/apiv3.rst

  Log Message:
  -----------
  Merge branch 'feature-2345-action-api-autodocs'


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

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

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


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

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

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


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

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

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


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py

  Log Message:
  -----------
  2322 Added some simple convenience urls

Added changes to routes for cosmetically improved urls with a
redirect for the API call, a new package controller function for
redirecting to the actual resource url if it exists.

The /dataset/id/resource/id/viewer url uses the existing embed url
with an improved default that more closely matches the screen size
although doesn't change the embed code to use % instead of px.


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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  2322 - Removed unnecessary whitespace


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #11 from okfn/enhancement-2322-convenience-urls

[2322] Merge added some simple convenience urls


  Commit: 82e1bd27ad45e5f4096cab63fbfcdc29a8a2ca66
      https://github.com/okfn/ckan/commit/82e1bd27ad45e5f4096cab63fbfcdc29a8a2ca66
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    A ckan/lib/maintain.py

  Log Message:
  -----------
  2420 add @deprecated decorator


  Commit: 0f3f6c94f7501bf82c6e213eb234dc26533e4f20
      https://github.com/okfn/ckan/commit/0f3f6c94f7501bf82c6e213eb234dc26533e4f20
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-25 (Fri, 25 May 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  2420 mark some helper functions as deprecated


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

  Changed paths:
    M ckan/lib/helpers.py
    A ckan/lib/maintain.py

  Log Message:
  -----------
  Merge pull request #13 from okfn/feature-2420-deprecated

Merge pull request #13 from okfn/feature-2420-deprecated


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

  Changed paths:
    A Coding_Standards.rst
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    A ckan/lib/accept.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
    A ckan/lib/maintain.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/auth/delete.py
    M ckan/logic/auth/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
    A ckan/model/follower.py
    M ckan/model/package.py
    M ckan/plugins/interfaces.py
    M ckan/public/scripts/application.js
    A ckan/templates/package/followers.html
    A ckan/templates/user/followers.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read.rdf
    M ckan/templates_legacy/user/layout.html
    M ckan/templates_legacy/user/login.html
    M ckan/templates_legacy/user/read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_api.py
    A ckan/tests/functional/api/test_follow.py
    R ckan/tests/functional/test_autoneg.py
    A ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_accept.py
    A ckan/tests/lib/test_authztool.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/pylons_controller.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/stats.py
    M doc/api.rst
    M doc/apiv3.rst
    M doc/using-data-api.rst
    M profile_tests.py
    M requires/lucid_missing.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into feature-2375-demo-theme

Conflicts:
	ckan/lib/helpers.py
trivial merge of new imports in both branches


Compare: https://github.com/okfn/ckan/compare/1934615...ee885db


More information about the ckan-changes mailing list