[ckan-changes] [okfn/ckan] c38ef4: [#2304] Initial model and api for following featur...
GitHub
noreply at github.com
Tue May 15 17:20:38 UTC 2012
Branch: refs/heads/master
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: 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: 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: 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: 82ca43cfa55772530ad95be4a400ec896290a3b2
https://github.com/okfn/ckan/commit/82ca43cfa55772530ad95be4a400ec896290a3b2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
[#2304] Add validation to follower api functions in delete.py and get.py
Commit: dac54a78d1ba3661c875bfca86ac8eb4d533fbaf
https://github.com/okfn/ckan/commit/dac54a78d1ba3661c875bfca86ac8eb4d533fbaf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M ckan/model/follower.py
Log Message:
-----------
[#2304] Set nullable=False on follower db columns
Commit: 4173ecb86bfb88cb3eabecb4ac31e1647d98e71a
https://github.com/okfn/ckan/commit/4173ecb86bfb88cb3eabecb4ac31e1647d98e71a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
[#2304] Add tests for cascading of follower rows
Commit: bec47319ae4c5b496a14535aaaff450326738dca
https://github.com/okfn/ckan/commit/bec47319ae4c5b496a14535aaaff450326738dca
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
A ckan/migration/versions/058_add_follower_tables.py
Log Message:
-----------
[#2304] Add db migration script for follower
Commit: edcd78fe6e43898b2069dda421d840b0160055d2
https://github.com/okfn/ckan/commit/edcd78fe6e43898b2069dda421d840b0160055d2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M doc/using-data-api.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-2304-follow
Commit: 5915152a9e0d2634ca75e4d3ccf06ceb99d72ea8
https://github.com/okfn/ckan/commit/5915152a9e0d2634ca75e4d3ccf06ceb99d72ea8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2304] Fix a couple of bugs in user controller
Commit: 7dcfb175bb3ae52e55f2e8b95e4a18214f40e3f4
https://github.com/okfn/ckan/commit/7dcfb175bb3ae52e55f2e8b95e4a18214f40e3f4
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
A ckan/migration/versions/058_add_follower_tables.py
M ckan/model/follower.py
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_follow.py
M doc/using-data-api.rst
Log Message:
-----------
Merge branch 'feature-2304-follow' of https://github.com/okfn/ckan into feature-2304-follow
Commit: 67b19136cb9814a418f761477982f51bee1637da
https://github.com/okfn/ckan/commit/67b19136cb9814a418f761477982f51bee1637da
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-14 (Mon, 14 May 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[2304] Fixed missing related count
Fix the missing related count on the following page for a given
dataset.
Commit: 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: 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: 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'
Compare: https://github.com/okfn/ckan/compare/0bc06c6...427856e
More information about the ckan-changes
mailing list