[ckan-changes] [okfn/ckan] e155d9: [2911] initial draft
GitHub
noreply at github.com
Tue Dec 4 10:58:29 UTC 2012
Branch: refs/heads/3012-dg-auth
Home: https://github.com/okfn/ckan
Commit: e155d9ae67a7095d788b236ff749b4f52005372a
https://github.com/okfn/ckan/commit/e155d9ae67a7095d788b236ff749b4f52005372a
Author: kindly <kindly at gmail.com>
Date: 2012-09-06 (Thu, 06 Sep 2012)
Changed paths:
A doc/oranization_group_auth.rst
Log Message:
-----------
[2911] initial draft
Commit: a76dcab9f0472715d29e7d786beced107d7a5abc
https://github.com/okfn/ckan/commit/a76dcab9f0472715d29e7d786beced107d7a5abc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Fleshing out Organizations and Groups spec
Adding more detail from my own thoughts, the pull request, and Ross's
Google Doc
Commit: 5e2f6facc94f467bc112f0c7cfc90eccff05ce00
https://github.com/okfn/ckan/commit/5e2f6facc94f467bc112f0c7cfc90eccff05ce00
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Add a comment to Organizations and Groups spec
Commit: c3c67d87d2a585e407f9556af7999d00f4d937fa
https://github.com/okfn/ckan/commit/c3c67d87d2a585e407f9556af7999d00f4d937fa
Author: kindly <kindly at gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
[2911] Answer seans questions in doc
Commit: fcd5861939b49ef08509da72ae24bc1dbbc04417
https://github.com/okfn/ckan/commit/fcd5861939b49ef08509da72ae24bc1dbbc04417
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Fix typos and wrapping in Groups and Organizations spec
Commit: 12f00213a0b66c0a44c016a90a0e67b1f7e07bd5
https://github.com/okfn/ckan/commit/12f00213a0b66c0a44c016a90a0e67b1f7e07bd5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Clarify that sysadmins can edit organization metadata
In Groups and Organizations spec
Commit: 5e469854039074c2ae18f73bdb98d38b3b48306c
https://github.com/okfn/ckan/commit/5e469854039074c2ae18f73bdb98d38b3b48306c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Add a little explanation of groups vs organizations
... at the top of the Groups and Organizations spec
Commit: 63ef8eaaf7688d960b3ddb7f985303eb7a64bca1
https://github.com/okfn/ckan/commit/63ef8eaaf7688d960b3ddb7f985303eb7a64bca1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Add a bit about groups vs tags to groups and organizations spec
Commit: 10f09824ee32a2f941966e744d5eb3bf17909623
https://github.com/okfn/ckan/commit/10f09824ee32a2f941966e744d5eb3bf17909623
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-17 (Mon, 17 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Clarify groups 'orthogonal collaboration' in Groups & Orgs spec
Commit: d7863bee7c211507edbb68f6431da444bfe86e87
https://github.com/okfn/ckan/commit/d7863bee7c211507edbb68f6431da444bfe86e87
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-17 (Mon, 17 Sep 2012)
Changed paths:
R doc/oranization_group_auth.rst
A doc/organizations_and_groups.rst
Log Message:
-----------
renamed: doc/oranization_group_auth.rst -> doc/organizations_and_groups.rst
Commit: 86372c55d1ae532e4fe8235ab59b32934fd96545
https://github.com/okfn/ckan/commit/86372c55d1ae532e4fe8235ab59b32934fd96545
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-20 (Thu, 20 Sep 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
[#2911] Add transition plans phase 1
Commit: 005ab3ee50c22d2a26162cb4ceabd516876ee359
https://github.com/okfn/ckan/commit/005ab3ee50c22d2a26162cb4ceabd516876ee359
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-21 (Fri, 21 Sep 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
[#2911] Updates to orgs doc
Commit: 2a3eea182d787dde2a10bd60cdb45a55f021036d
https://github.com/okfn/ckan/commit/2a3eea182d787dde2a10bd60cdb45a55f021036d
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-21 (Fri, 21 Sep 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
{#2911] Style fixes
Commit: c49c3d7a6e6a635ceecd796b55a679f519242830
https://github.com/okfn/ckan/commit/c49c3d7a6e6a635ceecd796b55a679f519242830
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-21 (Fri, 21 Sep 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
[#2911] New tables
Commit: 4145f00a4a046ad321183140d2c75fac0b55c651
https://github.com/okfn/ckan/commit/4145f00a4a046ad321183140d2c75fac0b55c651
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-10-23 (Tue, 23 Oct 2012)
Changed paths:
M ckan/lib/activity_streams.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/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/061_add_follower__group_table.py
M ckan/model/__init__.py
M ckan/model/follower.py
Log Message:
-----------
[#3005] Add model and API for following groups
This implements everything required at the model and API level for following
and unfollowing of groups, getting a group's number of followers or a list of a
group's followers, and getting the number of groups that a user follows or a
list of the groups that a user follows.
Tests need to be added.
Frontend for following groups needs to be added.
+ Add UserFollowingGroup model class and user_following_group_dictize().
+ Add "{actor} started following {group}" activity stream activity.
+ Refactor user_following_user_dict_save() and
user_following_dataset_dict_save(), replace with a single
follower_dict_save() that can be used for UserFollowingUser,
UserFollowingDataset, or UserFollowingGroup.
+ Add follow_group() and unfollow_group() logic action functions in create.py
and delete.py.
+ Add group_follower_count(), group_follower_list(), am_following_group(),
group_followee_count() and group_followee_list() logic action functions in
get.py.
Also refactor some code in logic/action/get.py to remove duplication between
follower functions.
+ Add convert_group_name_or_id_to_id() converter function
+ Add default_follow_group_schema()
+ Add migration script
Commit: 21429c6b7a10c31e0ea0be4c378e7c496b534d73
https://github.com/okfn/ckan/commit/21429c6b7a10c31e0ea0be4c378e7c496b534d73
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-10-23 (Tue, 23 Oct 2012)
Changed paths:
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
[#3005] Add tests for follow group API
Also refactored some test methods to remove code duplication between
user, dataset and group follower tests.
I started getting DetachedInstanceErrors from SQLAlchemy. It happens
because the tests access the model directly and retain references to
model objects. No idea why it started happening now but wasn't happening
before. I've added an AttributeDict hack at the top of the file to
remove this without introducing too much noise in the diff. Will remove
the hack and fix it properly in a separate commit.
Commit: ee9eb3d98374b40c310459bb30216be48744896f
https://github.com/okfn/ckan/commit/ee9eb3d98374b40c310459bb30216be48744896f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-10-24 (Wed, 24 Oct 2012)
Changed paths:
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
[#3005] Remove retained model objects from test_follow.py
This removes the AttributeDict hack introduced in the previous commit
(21429c6) and replaces retained model objects in the test module with
dicts so we don't DetachedInstanceErrors from SQLAlchemy.
Commit: e55ca20ddf0068e7fb8d2a639cf406f14d0fa848
https://github.com/okfn/ckan/commit/e55ca20ddf0068e7fb8d2a639cf406f14d0fa848
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-10-24 (Wed, 24 Oct 2012)
Changed paths:
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
[#3005] Add tests for group following on delete cascade
Commit: bc3ac6a1b4fe5787ed2100021d8b215d317fd083
https://github.com/okfn/ckan/commit/bc3ac6a1b4fe5787ed2100021d8b215d317fd083
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-10-24 (Wed, 24 Oct 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
A ckan/templates/group/followers.html
Log Message:
-----------
[#3005] Add group follow, unfollow and followers pages
These are not properly integrated into the frontend yet: no
follow/unfollow buttons on the group pages, no link to group followers
page, group followers page does not look right. But they work.
Commit: beb1542b3cbf41c147dcbde8bd47c6d4a69c7889
https://github.com/okfn/ckan/commit/beb1542b3cbf41c147dcbde8bd47c6d4a69c7889
Author: John Martin <me at johnmart.in>
Date: 2012-10-26 (Fri, 26 Oct 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/templates/ajax_snippets/popover-context-group.html
A ckan/templates/group/admins.html
M ckan/templates/group/followers.html
M ckan/templates/group/read.html
M ckan/templates/user/read.html
Log Message:
-----------
Added UI for the following/unfollowing of groups
Commit: 61dc97b5367d58379bec6ca6baf2783575f669b2
https://github.com/okfn/ckan/commit/61dc97b5367d58379bec6ca6baf2783575f669b2
Author: John Martin <me at johnmart.in>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/logic/action/get.py
M ckan/public/base/css/main.css
R ckan/public/base/less/disqus.less
A ckan/templates/group/activity_stream.html
M ckan/templates/package/snippets/resource_item.html
M ckan/tests/functional/api/test_activity.py
M doc/_themes/sphinx-theme-okfn
R doc/howto-editing-database-ownership.rst
M doc/paster.rst
Log Message:
-----------
Merged master
Commit: 88166e86e33887320e7ce2be12f6bd3dbc10cc47
https://github.com/okfn/ckan/commit/88166e86e33887320e7ce2be12f6bd3dbc10cc47
Author: John Martin <me at johnmart.in>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix after incorrect merge
Commit: eaef0364f32f18413dafe6a5d2a55338c06e0262
https://github.com/okfn/ckan/commit/eaef0364f32f18413dafe6a5d2a55338c06e0262
Author: John Martin <me at johnmart.in>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Changed paths:
M ckan/templates/group/activity_stream.html
M ckan/templates/group/read.html
Log Message:
-----------
Added activity stream to group front end
Commit: 35903c6477253962c3fb622399622601ebc248a0
https://github.com/okfn/ckan/commit/35903c6477253962c3fb622399622601ebc248a0
Author: John Martin <me at johnmart.in>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Changed paths:
M ckan/templates/group/activity_stream.html
Log Message:
-----------
Added page title to the group activity stream page
Commit: 60d61d894606345198989bfea20ecc347e116252
https://github.com/okfn/ckan/commit/60d61d894606345198989bfea20ecc347e116252
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
[#3009] Fix dashboard activity stream auth
This is necessary groundwork for implementing #3009 (new activity
notifications).
Make dashboard_activity_list() return the dashboard activity stream of
the logged in user, rather than accepting the user id as a param and
letting anyone (even not logged in users) view anyone else's private
activity streams!
Lots of fixing up of test_activity.py to take account of this:
Commit: 3d0361c74f2b79fd9dadac83a53ad280636386b4
https://github.com/okfn/ckan/commit/3d0361c74f2b79fd9dadac83a53ad280636386b4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/public/base/javascript/modules/popover-context.js
Log Message:
-----------
[#3005] Add num_followers to group_dict returned by group_read
So that templates can access a group's number of followers without
having to make another API call.
Commit: be2505cf67fce6f374f56de07126422d1cc816c6
https://github.com/okfn/ckan/commit/be2505cf67fce6f374f56de07126422d1cc816c6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Fix a broken activity streams test
Commit: 5a66e8c018c6eae6e429de0eb30ef4e2d5a0106b
https://github.com/okfn/ckan/commit/5a66e8c018c6eae6e429de0eb30ef4e2d5a0106b
Author: John Martin <me at johnmart.in>
Date: 2012-11-05 (Mon, 05 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/lib/activity_streams.py
A ckan/templates/group/about.html
M ckan/templates/group/read.html
Log Message:
-----------
Added about page to groups and fixed the truncate error on group/read.html
Commit: a9696042653da977e7f813c91ffa85faac55aa3e
https://github.com/okfn/ckan/commit/a9696042653da977e7f813c91ffa85faac55aa3e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-06 (Tue, 06 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/lib/activity_streams.py
A ckan/templates/group/about.html
M ckan/templates/group/read.html
Log Message:
-----------
Merge branch 'feature-3005-add-following-of-groups' of github.com:okfn/ckan into feature-3005-add-following-of-groups
Commit: 115e70326ff2eef3f42b33c79b77ad55866ef5cf
https://github.com/okfn/ckan/commit/115e70326ff2eef3f42b33c79b77ad55866ef5cf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-06 (Tue, 06 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#3005] Add back c.group_admins on group read teamplate
It's used by the legacy templates to show a list of the group's admins
in the sidebar. Legacy templates do not support the new group admins
page. This fixes a frontend test that was failing while testing the
legacy templates.
Commit: 2398b28ba8162a88f2301249a7c439f8883e1e16
https://github.com/okfn/ckan/commit/2398b28ba8162a88f2301249a7c439f8883e1e16
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-06 (Tue, 06 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/__init__.py
A ckan/model/dashboard.py
A ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#3009] Initial implementation of activity streams on-site notification API
Commit: af1e3fc9c6eb974cd48146204c87fc8fe1e2a78c
https://github.com/okfn/ckan/commit/af1e3fc9c6eb974cd48146204c87fc8fe1e2a78c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-06 (Tue, 06 Nov 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
[#3009] Add c.new_activities to every page when logged in
Not sure if this is the best way to do this
Commit: 7202c928175f8eb8e2b046102cd302aab1bacdbe
https://github.com/okfn/ckan/commit/7202c928175f8eb8e2b046102cd302aab1bacdbe
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-06 (Tue, 06 Nov 2012)
Changed paths:
A ckan/migration/versions/061_add_dashboard_table.py
Log Message:
-----------
[#3009] Add dashboard table migration script
Commit: a91b625202b4410b1237a4106cae382cc42af90d
https://github.com/okfn/ckan/commit/a91b625202b4410b1237a4106cae382cc42af90d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-06 (Tue, 06 Nov 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#3009] Mark activities as read on loading dashboard page
Commit: f440d8d19a4bdbdd091c3a7b9ce96bcb65882800
https://github.com/okfn/ckan/commit/f440d8d19a4bdbdd091c3a7b9ce96bcb65882800
Author: John Martin <me at johnmart.in>
Date: 2012-11-07 (Wed, 07 Nov 2012)
Changed paths:
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
Simple dashboard notifications style
Commit: 0c9a31a51bdb6593f78f7c4bdc993544533b6a7d
https://github.com/okfn/ckan/commit/0c9a31a51bdb6593f78f7c4bdc993544533b6a7d
Author: John Martin <me at johnmart.in>
Date: 2012-11-07 (Wed, 07 Nov 2012)
Changed paths:
M ckan/public/base/javascript/resource.config
Log Message:
-----------
Fixed broken removed resource
Commit: 6c18d71e345b1ab33d6856770765d628d8daadb3
https://github.com/okfn/ckan/commit/6c18d71e345b1ab33d6856770765d628d8daadb3
Author: John Martin <me at johnmart.in>
Date: 2012-11-07 (Wed, 07 Nov 2012)
Changed paths:
M ckan/public/base/less/footer.less
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
Major header CSS re-write including a better notifications style
Commit: 1b0d24c6352b46857c6f53b3e3350893ff38c82c
https://github.com/okfn/ckan/commit/1b0d24c6352b46857c6f53b3e3350893ff38c82c
Author: John Martin <me at johnmart.in>
Date: 2012-11-07 (Wed, 07 Nov 2012)
Changed paths:
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
Final tweaks for notifications UI
Commit: 819d192a6fabdb4463498b8ce8ecce4ef055c59b
https://github.com/okfn/ckan/commit/819d192a6fabdb4463498b8ce8ecce4ef055c59b
Author: John Martin <me at johnmart.in>
Date: 2012-11-08 (Thu, 08 Nov 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/logic/action/get.py
A ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/public/base/less/dashboard.less
M ckan/public/base/less/iehacks.less
M ckan/templates/snippets/activity_item.html
M ckan/templates/user/dashboard.html
Log Message:
-----------
The dashboard now displays which items are actually new and which ones aren't now
Commit: be08fbf7f0122c591faf2ebfcf21403d5398065b
https://github.com/okfn/ckan/commit/be08fbf7f0122c591faf2ebfcf21403d5398065b
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2012-11-10 (Sat, 10 Nov 2012)
Changed paths:
M doc/common-error-messages.rst
Log Message:
-----------
Restructured doc to improve display with latest doc theme
Commit: 984d49ebf0a1dc8f881fcbfeaf0f876b4a0c6547
https://github.com/okfn/ckan/commit/984d49ebf0a1dc8f881fcbfeaf0f876b4a0c6547
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-12 (Mon, 12 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#3005] Remove some unnecessary default param values
Commit: fddde4300dcc157daa1a9ac6d1e1cf0744cb6ba3
https://github.com/okfn/ckan/commit/fddde4300dcc157daa1a9ac6d1e1cf0744cb6ba3
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
A ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] the start of adding tests
Commit: 22389d96c24dc64dc70fdd00b719a2400f910da4
https://github.com/okfn/ckan/commit/22389d96c24dc64dc70fdd00b719a2400f910da4
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] make sure config is updated in tests
Commit: cdcc0cbe4c5b96e221b95219fdf815d841f131f0
https://github.com/okfn/ckan/commit/cdcc0cbe4c5b96e221b95219fdf815d841f131f0
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Minor fix up remove is_org=True
Commit: 4a788ead201beff255be23d3a03f57777cd27b6d
https://github.com/okfn/ckan/commit/4a788ead201beff255be23d3a03f57777cd27b6d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
[#3012] Fix template broken in merge
Commit: 2754b346fa77c3a08cb432645f7ba5a919fe4304
https://github.com/okfn/ckan/commit/2754b346fa77c3a08cb432645f7ba5a919fe4304
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] add auth check for package_owner_org_update
Commit: d60e11bc289eb3bf1ad365fabfaa5387657e07c1
https://github.com/okfn/ckan/commit/d60e11bc289eb3bf1ad365fabfaa5387657e07c1
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[2939] fix so that users can not create dataset if belong to no org
Commit: ba8db22d293813eaec9837558aabd7e1aa94022b
https://github.com/okfn/ckan/commit/ba8db22d293813eaec9837558aabd7e1aa94022b
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] clean up tests
Commit: 1d3356d68e9232888687b8444c3a8e26d5f0aad6
https://github.com/okfn/ckan/commit/1d3356d68e9232888687b8444c3a8e26d5f0aad6
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] make sure old permissions get reset after test fininsh
Commit: 521607e870ba33ebd8c2932f769066d633f9254e
https://github.com/okfn/ckan/commit/521607e870ba33ebd8c2932f769066d633f9254e
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] add tests to check adding of datasets
Commit: e96d97959c942f91fbab69e4849cc5f2ec7ffa0d
https://github.com/okfn/ckan/commit/e96d97959c942f91fbab69e4849cc5f2ec7ffa0d
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/templates/package/read.html
Log Message:
-----------
Merge branch '2939-orgs' of github.com:okfn/ckan into 2939-orgs
Commit: 5ea6c0192d3e6e53fe56c2f831888a950c115aa9
https://github.com/okfn/ckan/commit/5ea6c0192d3e6e53fe56c2f831888a950c115aa9
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] add more testing
Commit: 8cdd117bb1ba22e7e9fa962ed9aea8152edae424
https://github.com/okfn/ckan/commit/8cdd117bb1ba22e7e9fa962ed9aea8152edae424
Author: John Martin <me at johnmart.in>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/public/base/less/iehacks.less
Log Message:
-----------
Couple of minor IE hack CSS tweaks to 2.0 theme
Commit: f6026f9c9d5c6d82e41aa58af71453b9df0cdf04
https://github.com/okfn/ckan/commit/f6026f9c9d5c6d82e41aa58af71453b9df0cdf04
Author: John Martin <me at johnmart.in>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/lib/activity_streams.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/061_add_follower__group_table.py
M ckan/model/__init__.py
M ckan/model/follower.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/iehacks.less
A ckan/templates/ajax_snippets/popover-context-group.html
A ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
A ckan/templates/group/admins.html
A ckan/templates/group/followers.html
M ckan/templates/group/read.html
M ckan/templates/user/read.html
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Merge master
Commit: ac6d81fb37bae61911ecb839c9c46c42449dde18
https://github.com/okfn/ckan/commit/ac6d81fb37bae61911ecb839c9c46c42449dde18
Author: John Martin <me at johnmart.in>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/public/base/less/iehacks.less
Log Message:
-----------
IE fixes for top account dropdown
Commit: 7a353d0a3f1705c8c3a56d1da087f79eb4f48269
https://github.com/okfn/ckan/commit/7a353d0a3f1705c8c3a56d1da087f79eb4f48269
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/lib/activity_streams.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/061_add_follower__group_table.py
M ckan/model/__init__.py
M ckan/model/follower.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/iehacks.less
A ckan/templates/ajax_snippets/popover-context-group.html
A ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
A ckan/templates/group/admins.html
A ckan/templates/group/followers.html
M ckan/templates/group/read.html
M ckan/templates/user/read.html
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 3009-on-site-notification-of-new-activity
Conflicts:
ckan/public/base/less/iehacks.less
Commit: 04d32acf204476709e0aeda9a19855ebb0c58e4d
https://github.com/okfn/ckan/commit/04d32acf204476709e0aeda9a19855ebb0c58e4d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/public/base/less/iehacks.less
Log Message:
-----------
Merge branch '3009-on-site-notification-of-new-activity' of github.com:okfn/ckan into 3009-on-site-notification-of-new-activity
Conflicts:
ckan/public/base/less/iehacks.less
Commit: 367aee938d9efdd0841cfb903de0a3fb53525108
https://github.com/okfn/ckan/commit/367aee938d9efdd0841cfb903de0a3fb53525108
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
R ckan/migration/versions/061_add_dashboard_table.py
A ckan/migration/versions/062_add_dashboard_table.py
Log Message:
-----------
[#3009] Rename migration script
Clashed with another branch
Commit: cb3984e594768ecef113517a168b8b42f631df24
https://github.com/okfn/ckan/commit/cb3984e594768ecef113517a168b8b42f631df24
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/activity.py
Log Message:
-----------
[#3009] Refactor activity streams SQLAlchemy queries
This is necessary so that we can get the number of new activities in the
user's dashboard activity stream, not counting activities from the user
herself.
Rewrite the activity streams queries in a building blocks fashion. For
example:
_user_activity_query(user_id)
Returns a query for all activities from or about a given user, used for
the user's public activity stream.
_activities_from_everything_followed_by_user_query(user_id)
Returns a query from all activities from everything the given user
follows.
_dashboard_activity_query(user_id)
Used for the user's dashboard, returns the union of
_user_activity_query(user_id) and
_activities_from_everything_followed_by_user_query(user_id).
Now we can call _dashboard_activity_query(user_id) to get the activities
for the user's dashboard, and we can call
_activities_from_everything_followed_by_user_query(user_id) to get the
number of new activities on the user's dashboard, not counting the
activities from the user herself.
Also move all the activity streams SQLAlchemy queries out of
logic/action/get.py (except for the group's activity stream which is
problematic) and into model/activity.py, because I want to encapsulate
SQLAlchemy in the model and avoid using it from the logic.
This also groups all the activity streams queries together in the code
and makes them easier to understand and build on.
Commit: 73fe090f22e0414e987c229d8b4f5b95118fa60b
https://github.com/okfn/ckan/commit/73fe090f22e0414e987c229d8b4f5b95118fa60b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
Log Message:
-----------
[#3009] Refactor dashboard_activity_list() auth
Add auth functions for dashboard_activity_list and
dashboard_new_activities_count.
Commit: 1cb7b539fcbdfe53c153c97f651deef44b7395e9
https://github.com/okfn/ckan/commit/1cb7b539fcbdfe53c153c97f651deef44b7395e9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#3009] Don't notify a user about her own activities
Commit: 8469a508a6add6a8bae578e273cdf64cef8b2fdf
https://github.com/okfn/ckan/commit/8469a508a6add6a8bae578e273cdf64cef8b2fdf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#3009] Use is_authorized not check_access to wrap auth function
I think this is the right way to do it
Commit: eb086d5da0ccbe7ea46b6f2bb70aafc0474dd748
https://github.com/okfn/ckan/commit/eb086d5da0ccbe7ea46b6f2bb70aafc0474dd748
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/get.py
Log Message:
-----------
[#3009] Don't mark the user's own activities as new on her dashboard
Commit: 8eff1125162479458166c830fd767fd5c72b3a00
https://github.com/okfn/ckan/commit/8eff1125162479458166c830fd767fd5c72b3a00
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M doc/common-error-messages.rst
Log Message:
-----------
Put the common error messages in a semantically correct dd/dt. Thanks to @seanh for pointing it out.
Commit: fc626a5caf1d0ade528aae527f2efef7482aebca
https://github.com/okfn/ckan/commit/fc626a5caf1d0ade528aae527f2efef7482aebca
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/logic/auth/publisher/get.py
Log Message:
-----------
[#3009] Add new auth functions to publisher auth profile
This fixes a publisher auth test that was failing.
Commit: 8ea022a01f5578ddbf418e9c10d7d03c5f57fc32
https://github.com/okfn/ckan/commit/8ea022a01f5578ddbf418e9c10d7d03c5f57fc32
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
[#3009] Fix some broken activity streams tests
These were all broken by the addition of 'is_new' to activity stream
dicts in dashboard_activity_list.
I removed one broken test that didn't seem to be testing what it thought
it was testing.
Commit: e61501202500810c380e4580279e1546d76e4526
https://github.com/okfn/ckan/commit/e61501202500810c380e4580279e1546d76e4526
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M doc/common-error-messages.rst
Log Message:
-----------
Merge branch '3013-common-error-messages-doc-fix'
Commit: 81385c76c3f69bd2f252bc588bb9178a9141adcb
https://github.com/okfn/ckan/commit/81385c76c3f69bd2f252bc588bb9178a9141adcb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/public/base/less/iehacks.less
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: ce3bade026814e24c612038766e8a56b500a484a
https://github.com/okfn/ckan/commit/ce3bade026814e24c612038766e8a56b500a484a
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Fix test 5
Commit: 2bfde7c1411e609c09e2443b9bd1439473f42900
https://github.com/okfn/ckan/commit/2bfde7c1411e609c09e2443b9bd1439473f42900
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#3009] Better tests for on-site activity stream notifications API
Test both the dashboard_new_activities_count and the marking of new
activities with 'is_new': True in dashboard_activity_list, and test that
the user's own activities are not counted as new but activities from
things she follows are.
Commit: 78cbd6228c41d7b7abe333bb9bcb511e310664fe
https://github.com/okfn/ckan/commit/78cbd6228c41d7b7abe333bb9bcb511e310664fe
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#3009] Delete an unnecessary comment
Commit: 79e28c0485b039831fa3812bea3637b272d6afbc
https://github.com/okfn/ckan/commit/79e28c0485b039831fa3812bea3637b272d6afbc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#3009] Delete an unnecessary line
Commit: af925e247f8c224662f17202926541938e39031b
https://github.com/okfn/ckan/commit/af925e247f8c224662f17202926541938e39031b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#3009] Delete an unused function
Commit: aed806f72134f728af7eee468f695bc6f5fbcfd4
https://github.com/okfn/ckan/commit/aed806f72134f728af7eee468f695bc6f5fbcfd4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#3009] Mark new activities terminology consistent
Always use new/old activities, don't mix in other terms like
read/unread, seen/unseen.
Commit: 3007c853ae90b7317bff955cd5837d58d59cfded
https://github.com/okfn/ckan/commit/3007c853ae90b7317bff955cd5837d58d59cfded
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/logic/auth/publisher/get.py
Log Message:
-----------
[#3009] Fix auth for dashboard_mark_all_new_activities_as_old
I think this is the correct way to do it, so that the auth function can
be overridden by IAuth plugins.
Commit: 9a36d04e17c288f0e546f0286b6b2d6fce3e82fa
https://github.com/okfn/ckan/commit/9a36d04e17c288f0e546f0286b6b2d6fce3e82fa
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/auth/create.py
M ckan/new_authz.py
Log Message:
-----------
[#2939] Fix misnamed function
Commit: 231ec96529d1b462694a25c555302baf7de8defe
https://github.com/okfn/ckan/commit/231ec96529d1b462694a25c555302baf7de8defe
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Fix comment typo
Commit: 50b16cf5fddb2e278ecf8b73eb992c679881a87d
https://github.com/okfn/ckan/commit/50b16cf5fddb2e278ecf8b73eb992c679881a87d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Add owner_org validator
Commit: 4009b4af58d46b83c42483dc3a9a4d33b388a313
https://github.com/okfn/ckan/commit/4009b4af58d46b83c42483dc3a9a4d33b388a313
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Fix owner_org validator
Commit: af95d0d1e8041e3c37fd397608e033bced1b9b6e
https://github.com/okfn/ckan/commit/af95d0d1e8041e3c37fd397608e033bced1b9b6e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/model/user.py
Log Message:
-----------
[#2939] Fix user is in group
Commit: 1f710a90846a238bbb92f04839eee63442e6bef9
https://github.com/okfn/ckan/commit/1f710a90846a238bbb92f04839eee63442e6bef9
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Need to set user org without admin checks
Commit: 4714acb5d55927869c9061fbfabeac0f745ad435
https://github.com/okfn/ckan/commit/4714acb5d55927869c9061fbfabeac0f745ad435
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Need to set user org without admin checks in update
Commit: 0f525d4ff5f92c3de2206594727e5431461a1214
https://github.com/okfn/ckan/commit/0f525d4ff5f92c3de2206594727e5431461a1214
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#2939] Schema change for update
Commit: 99ac4d762021da6789d32327fe1dbd0ed6795dee
https://github.com/okfn/ckan/commit/99ac4d762021da6789d32327fe1dbd0ed6795dee
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] tests expect 409 not 403
Commit: 893fdd0942cbe7d87a1aee83586e1096035f38e4
https://github.com/okfn/ckan/commit/893fdd0942cbe7d87a1aee83586e1096035f38e4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/validators.py
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] New config option
Commit: 11be4834e86228987b763249521c7e931dee2d4d
https://github.com/okfn/ckan/commit/11be4834e86228987b763249521c7e931dee2d4d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#3009] Add max. num. new activities test
Commit: 36c33efc2b6e8fab0ecf9326100d0fbe85a7086d
https://github.com/okfn/ckan/commit/36c33efc2b6e8fab0ecf9326100d0fbe85a7086d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M doc/common-error-messages.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 3009-on-site-notification-of-new-activity
Commit: 729ff6464e57c0e7e77017ef194fd4675ec5def2
https://github.com/okfn/ckan/commit/729ff6464e57c0e7e77017ef194fd4675ec5def2
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Move org chooser to stage one of add dataset
Commit: be4ed0e392ffb834b4287ed5937748908f91885e
https://github.com/okfn/ckan/commit/be4ed0e392ffb834b4287ed5937748908f91885e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/public/base/less/iehacks.less
M doc/common-error-messages.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-3005-add-following-of-groups
Commit: 1dd0f03acdb7119ffdae48fa3345d36a47760611
https://github.com/okfn/ckan/commit/1dd0f03acdb7119ffdae48fa3345d36a47760611
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Merge branch 'feature-3005-add-following-of-groups'
Commit: d917e738abcd22918a13e3b1f4c228d187f111d1
https://github.com/okfn/ckan/commit/d917e738abcd22918a13e3b1f4c228d187f111d1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/templates/user/dashboard.html
Log Message:
-----------
Don't show "Add Dataset" on dash if user cannot
Only show the "Add new dataset" button on the user's dashboard if the
user has permission to add new datasets.
Commit: 200c243681bce88c2ae6f55c074a0c9f253cbaab
https://github.com/okfn/ckan/commit/200c243681bce88c2ae6f55c074a0c9f253cbaab
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/templates/user/dashboard.html
Log Message:
-----------
Change "Add new dataset" to "Add Dataset"
Text on button on user's dashboard. Make it match "Add Dataset" link in
site header, "Add Dataset" and "Add Dataset to Group" buttons on group
pages, etc.
Commit: 1208e1688563b4774d99761e1522baf67f63a82b
https://github.com/okfn/ckan/commit/1208e1688563b4774d99761e1522baf67f63a82b
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] group tests and cleanup
Commit: 14d5f4ca1922f85a8301aec7ee67e80267481c3a
https://github.com/okfn/ckan/commit/14d5f4ca1922f85a8301aec7ee67e80267481c3a
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
Log Message:
-----------
[#2939] make sure organizations are not getting indexed within org
Commit: df57f8a05b6aab789061dbf5555528870c527d58
https://github.com/okfn/ckan/commit/df57f8a05b6aab789061dbf5555528870c527d58
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
A doc/organizations_and_groups.rst
Log Message:
-----------
Merge branch '2911-internal-doc-of-org-group-auth' into 2939-orgs
Commit: 01343feb9f2844f9d4146374d8882bb211dd8f4e
https://github.com/okfn/ckan/commit/01343feb9f2844f9d4146374d8882bb211dd8f4e
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] merge in user story branch
Commit: 187faa16309dc8f3e1754459204112564338d0d8
https://github.com/okfn/ckan/commit/187faa16309dc8f3e1754459204112564338d0d8
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] test rename org admin
Commit: 9601e41edc7609b70c79bb794c78074c90a96842
https://github.com/okfn/ckan/commit/9601e41edc7609b70c79bb794c78074c90a96842
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2939] make sure user created in sysadmin cli
Commit: d326da5fb42617a6a5282f6ac87bbbb8e8613752
https://github.com/okfn/ckan/commit/d326da5fb42617a6a5282f6ac87bbbb8e8613752
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/lib/activity_streams.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/061_add_follower__group_table.py
M ckan/model/__init__.py
M ckan/model/follower.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/iehacks.less
A ckan/templates/ajax_snippets/popover-context-group.html
A ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
A ckan/templates/group/admins.html
A ckan/templates/group/followers.html
M ckan/templates/group/read.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/read.html
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M doc/common-error-messages.rst
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/controllers/group.py
ckan/logic/action/create.py
ckan/logic/action/delete.py
ckan/logic/schema.py
ckan/logic/validators.py
ckan/templates/group/read.html
trivial merges
Commit: a58b54fed8bdc57246cc0fae36450cd55b9f6884
https://github.com/okfn/ckan/commit/a58b54fed8bdc57246cc0fae36450cd55b9f6884
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
R ckan/migration/versions/061_org_changes.py
A ckan/migration/versions/062_org_changes.py
Log Message:
-----------
[#2939] rename migrate to avoid conflict with master
Commit: 5c948ff5b81fac18745041626543d30c78798982
https://github.com/okfn/ckan/commit/5c948ff5b81fac18745041626543d30c78798982
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Fix test test_04_modify_group
Commit: c2361489d47cd4dc927842aa1b0d49b133695e5b
https://github.com/okfn/ckan/commit/c2361489d47cd4dc927842aa1b0d49b133695e5b
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Fix test test_03_add_dataset_to_group
Commit: f114c2d0b944f5c3e2dc8779ce0af4c9eb0da1c5
https://github.com/okfn/ckan/commit/f114c2d0b944f5c3e2dc8779ce0af4c9eb0da1c5
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/logic/auth/delete.py
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Fix group/org delete permissions
Commit: 120149b28de737546093b24db6e6b032ee29eae4
https://github.com/okfn/ckan/commit/120149b28de737546093b24db6e6b032ee29eae4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Clean logic auth tests
Commit: 27235310947e0849967317c779491556b663d92f
https://github.com/okfn/ckan/commit/27235310947e0849967317c779491556b663d92f
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Logic auth_test nicer api call fn name
Commit: a408ed5816164defb60f9dde11fa80871757176f
https://github.com/okfn/ckan/commit/a408ed5816164defb60f9dde11fa80871757176f
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
[#2939] io not require owner_org in package data
Commit: 293534b408be6eaf800551ee4e42794f8aaaf65c
https://github.com/okfn/ckan/commit/293534b408be6eaf800551ee4e42794f8aaaf65c
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Fix group controller for auth changesw
Commit: 0635ad1bac0feea0dcbd9c7d0a6b7094588036ae
https://github.com/okfn/ckan/commit/0635ad1bac0feea0dcbd9c7d0a6b7094588036ae
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/logic/action/delete.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
[#2939] Fix follow tests
Commit: cb128801c78ccc1ad445c1e8dd8f07ad734295c9
https://github.com/okfn/ckan/commit/cb128801c78ccc1ad445c1e8dd8f07ad734295c9
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Prevent version *.pyc conflicts
Commit: 326a7c02001d5f0871b9c578021056eff593d57f
https://github.com/okfn/ckan/commit/326a7c02001d5f0871b9c578021056eff593d57f
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/templates/user/dashboard.html
Log Message:
-----------
Merge branch 'master' into 3009-on-site-notification-of-new-activity
Commit: 391403305cf7d6417a0904605200508806cdf20e
https://github.com/okfn/ckan/commit/391403305cf7d6417a0904605200508806cdf20e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/base.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
A ckan/migration/versions/062_add_dashboard_table.py
R ckan/migration/versions/062_org_changes.py
A ckan/migration/versions/063_org_changes.py
M ckan/model/__init__.py
M ckan/model/activity.py
A ckan/model/dashboard.py
A ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/public/base/less/dashboard.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/user/dashboard.html
M ckan/tests/functional/api/test_activity.py
A ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/logic/auth/get.py
ckan/logic/auth/publisher/get.py
ckan/templates/header.html
ckan/tests/functional/api/test_activity.py
simple enough merge conflicts
Commit: d1acb58f2e4b094c04d5461d63ca24dabc23e4ff
https://github.com/okfn/ckan/commit/d1acb58f2e4b094c04d5461d63ca24dabc23e4ff
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
fix sa warning in tests/functional/api/test_activity.py:TestActivity.test_create_group
Commit: 85be1a7c41f3e0c854eff6e3a925226cc1e6b70a
https://github.com/okfn/ckan/commit/85be1a7c41f3e0c854eff6e3a925226cc1e6b70a
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2939] Fix errors on dashboard re undefined activity icon
Commit: bd6f86612cf657e8dd8a862fa738e49f0bdeec1d
https://github.com/okfn/ckan/commit/bd6f86612cf657e8dd8a862fa738e49f0bdeec1d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#2939] update main.css
Commit: c18deb524b6de84925811525da9012c377b71caf
https://github.com/okfn/ckan/commit/c18deb524b6de84925811525da9012c377b71caf
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2939] Proper activity stream fix
Commit: 257a9cb68d1b2e13bc0efeb28a6903c11b195ec4
https://github.com/okfn/ckan/commit/257a9cb68d1b2e13bc0efeb28a6903c11b195ec4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/public/base/less/activity.less
Log Message:
-----------
[#2939] Undefined activities now neutral colour
Commit: c1cd8fa4989f072513572aa2ee1e571bb54d4ba0
https://github.com/okfn/ckan/commit/c1cd8fa4989f072513572aa2ee1e571bb54d4ba0
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#2939] Css update
Commit: bcae651ed0d4ba7f78f29a5262dd96db2a18f18e
https://github.com/okfn/ckan/commit/bcae651ed0d4ba7f78f29a5262dd96db2a18f18e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/fuchsia.min.css
M ckan/public/base/css/green.css
M ckan/public/base/css/green.min.css
M ckan/public/base/css/main.min.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/maroon.min.css
M ckan/public/base/css/red.css
M ckan/public/base/css/red.min.css
M ckan/public/base/datapreview/css/recline.min.css
M ckan/public/base/datapreview/preview_recline.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
M ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
M ckan/public/base/datapreview/vendor/recline/css/recline.min.css
M ckan/public/base/datapreview/vendor/recline/recline.min.js
M ckan/public/base/javascript/client.min.js
M ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/dashboard.min.js
M ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/follow.min.js
A ckan/public/base/javascript/modules/popover-context.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
Log Message:
-----------
[#2939] Minified files
Commit: b61100b36b3ca168a5ad38fe0b0b4bcf43bc6eab
https://github.com/okfn/ckan/commit/b61100b36b3ca168a5ad38fe0b0b4bcf43bc6eab
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Tweak 'Feature Branches' coding standards
Commit: c79a4e5865b4305189cc132cac85d29f39d7f17a
https://github.com/okfn/ckan/commit/c79a4e5865b4305189cc132cac85d29f39d7f17a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Collect How to Contribute notes into one place
Collect notes about how to contribute to CKAN (github fork, feature
branches, commit messages, pull requests & code review, merging) from
different parts of the Coding Standards docs page and the Submitting a
code patch and Becoming a CKAN Developer pages on the old wiki.ckan.org.
Put them all together at the top of the coding standards.
Removed the section about submitting code patches by email.
Commit: de978e225e42623d6ecff25936cd2338a777596e
https://github.com/okfn/ckan/commit/de978e225e42623d6ecff25936cd2338a777596e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Clarify import standards
Commit: 312485717b222d11da119a66145cf9f3ac5d6ded
https://github.com/okfn/ckan/commit/312485717b222d11da119a66145cf9f3ac5d6ded
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Tweak logging standards
Link to the Python docs not a blog that paraphrases them, and no need to
copy-paste the log levels table into our docs.
Commit: 993e6c0ed318ef0f732dab94624a97532e672319
https://github.com/okfn/ckan/commit/993e6c0ed318ef0f732dab94624a97532e672319
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Coding standards: use str.format() everywhere not just in i18n strings
Commit: 0d57e5a862b18a9cffb5efea5df0ec363e80d0c6
https://github.com/okfn/ckan/commit/0d57e5a862b18a9cffb5efea5df0ec363e80d0c6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Docs: clarify "PEP 257" section title
Commit: 5a78896edd8023301c9ae0d2acb278fc920172b6
https://github.com/okfn/ckan/commit/5a78896edd8023301c9ae0d2acb278fc920172b6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Docs: tweak docstring standards
Commit: 39cf032397f7d7c3856e4d7e2df4f1807bb2d342
https://github.com/okfn/ckan/commit/39cf032397f7d7c3856e4d7e2df4f1807bb2d342
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Fix section title hierarchy
The section title styles used in the coding standards page were
inconsistent and some of the titles were not being rendered as a result
Commit: 3abe61de7c83cf8dd3d0170a193cd2bd5bee15ff
https://github.com/okfn/ckan/commit/3abe61de7c83cf8dd3d0170a193cd2bd5bee15ff
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Add section about keeping up with master
Commit: 72d6421f1efc6cc90c34c15f0b589698e15c71c0
https://github.com/okfn/ckan/commit/72d6421f1efc6cc90c34c15f0b589698e15c71c0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Docs: updates code quality links
Commit: 0a4dcca1ae172db1c4f8e26c68cd534b98d6b9e6
https://github.com/okfn/ckan/commit/0a4dcca1ae172db1c4f8e26c68cd534b98d6b9e6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
Add some details to CKAN Code Architecture section
Commit: a0c1e38d323b3a85f79e2d3cb49ef7771545e873
https://github.com/okfn/ckan/commit/a0c1e38d323b3a85f79e2d3cb49ef7771545e873
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
A doc/architecture.rst
R doc/coding-standards.rst
A doc/contributing.rst
A doc/css-coding-standards.rst
A doc/html-coding-standards.rst
M doc/index.rst
A doc/javascript-coding-standards.rst
A doc/python-coding-standards.rst
Log Message:
-----------
Split coding standards into separate files
Commit: cfbcfd1e5c4a89d662c2eab7ed9f9812eb111d4e
https://github.com/okfn/ckan/commit/cfbcfd1e5c4a89d662c2eab7ed9f9812eb111d4e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
R doc/buildbot.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
M doc/index.rst
Log Message:
-----------
Remove old docs about the domain model and buildbot
These are all out of date and incomplete
Commit: a826eb662941fc031684967aa7bf7e1253137dc0
https://github.com/okfn/ckan/commit/a826eb662941fc031684967aa7bf7e1253137dc0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
A doc/contributing-docs.rst
M doc/index.rst
Log Message:
-----------
Docs: add how to contribute to docs docs
Commit: d49dea43775560b25338a76c47c6a2e4213d9f12
https://github.com/okfn/ckan/commit/d49dea43775560b25338a76c47c6a2e4213d9f12
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/architecture.rst
A doc/migration.rst
Log Message:
-----------
Docs: Code archotecture tidy up
Add a couple of tips to the CKAN Code Architecture docs and tidy it up a
bit, including moving the Creating a new migration script section into
its own page.
Commit: 4c7d7aff6f57286f84e14fecf65d5a08beda32d9
https://github.com/okfn/ckan/commit/4c7d7aff6f57286f84e14fecf65d5a08beda32d9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/python-coding-standards.rst
Log Message:
-----------
Docs: don't repeat parts of PEP 8
Don't repeat parts of PEP 8 in the Python Coding Standards docs, just
link to it once.
Commit: ea22435b43d608005504508a252c2b9f4c6bb50d
https://github.com/okfn/ckan/commit/ea22435b43d608005504508a252c2b9f4c6bb50d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M doc/python-coding-standards.rst
Log Message:
-----------
Docs: add a couple of Python code style links
Commit: a14db47c4598f827423087cc9362f40ef2ae5b59
https://github.com/okfn/ckan/commit/a14db47c4598f827423087cc9362f40ef2ae5b59
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan_deb/usr/lib/ckan/common.sh
M doc/datastore-setup.rst
M doc/install-from-source.rst
Log Message:
-----------
Make sure database encoding is utf-8
Commit: 18f306c39f12daf211eb7fa72b69155d45a09c5a
https://github.com/okfn/ckan/commit/18f306c39f12daf211eb7fa72b69155d45a09c5a
Author: John Martin <me at johnmart.in>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Re-compiled main.css
Commit: 7875f3e466ba648e57d29884d19f430e849b70d2
https://github.com/okfn/ckan/commit/7875f3e466ba648e57d29884d19f430e849b70d2
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2939] Improve the markdown_extract function
Commit: 2940296a7ade46f1e533fa9ed4f72030dea083d1
https://github.com/okfn/ckan/commit/2940296a7ade46f1e533fa9ed4f72030dea083d1
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/templates/snippets/group.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
[#2939] template fixes for org/group snippet
Commit: 90a342c53e6940de3bec59c207e9da96c22939cd
https://github.com/okfn/ckan/commit/90a342c53e6940de3bec59c207e9da96c22939cd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge branch 'remove-migrate-versions-on-clean'
Commit: 0326af359aaf6a85eb0f047f7113aca34e9b7365
https://github.com/okfn/ckan/commit/0326af359aaf6a85eb0f047f7113aca34e9b7365
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
PEP8
Commit: 611b87ad94feaca192c09b18c05b03a4b92720d4
https://github.com/okfn/ckan/commit/611b87ad94feaca192c09b18c05b03a4b92720d4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Fix a crash in dashboard_activity_list auth
Fix the dashboard_activity_list auth function to not crash when no user
is logged in, and add some tests for this case.
Commit: 9c5f314efcccc90f1980ce8a0ea807f81de17a38
https://github.com/okfn/ckan/commit/9c5f314efcccc90f1980ce8a0ea807f81de17a38
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
Add a couple of FIXMEs that should be done after 2939-orgs is merged
Commit: 996d1b27bec65a9209538d2fd4c44a06d602f1a7
https://github.com/okfn/ckan/commit/996d1b27bec65a9209538d2fd4c44a06d602f1a7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/logic/auth/get.py
M ckan/public/base/css/main.css
M ckan/tests/functional/api/test_dashboard.py
M ckan_deb/usr/lib/ckan/common.sh
A doc/architecture.rst
R doc/buildbot.rst
R doc/coding-standards.rst
A doc/contributing-docs.rst
A doc/contributing.rst
A doc/css-coding-standards.rst
M doc/datastore-setup.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
A doc/html-coding-standards.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-coding-standards.rst
A doc/migration.rst
A doc/python-coding-standards.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into fix-SA-warning
Commit: a8de2f027371b6a08b68b1ce890840fca5e57a6a
https://github.com/okfn/ckan/commit/a8de2f027371b6a08b68b1ce890840fca5e57a6a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch 'fix-SA-warning'
Commit: a6392b5ba64e5fa91fffeefc28e0974a028a3dda
https://github.com/okfn/ckan/commit/a6392b5ba64e5fa91fffeefc28e0974a028a3dda
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
Add a FIXME for an unhandled case
Commit: b0f19c95209e61057e93b78e20cc50ae5b45ae63
https://github.com/okfn/ckan/commit/b0f19c95209e61057e93b78e20cc50ae5b45ae63
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Merge branch 'bug-dashboard-activity-list-auth'
Commit: 9ed808b81c908775b9c6e7b9c570707cdc97d5d1
https://github.com/okfn/ckan/commit/9ed808b81c908775b9c6e7b9c570707cdc97d5d1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
Add a step to the source install docs
It seems it's sometimes necessary to deactivate and reactivate your
virtualenv after installing everything, to get the copy of paster right.
Commit: e28ed887185326511aeccaf8b80b06976d8bc013
https://github.com/okfn/ckan/commit/e28ed887185326511aeccaf8b80b06976d8bc013
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/lib/app_globals.py
M ckan/templates/header.html
Log Message:
-----------
Config option to show hide header config info
Commit: 239fb1555f9c738fdb4b3cdc957394571316948d
https://github.com/okfn/ckan/commit/239fb1555f9c738fdb4b3cdc957394571316948d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/public/base/less/masthead.less
Log Message:
-----------
Move header debug info back into the header
Commit: 3bffcb8d426e43de2fec160c22405bd9e69454f0
https://github.com/okfn/ckan/commit/3bffcb8d426e43de2fec160c22405bd9e69454f0
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
M doc/install-from-source.rst
Log Message:
-----------
Merge branch 'master' into debug-header-info
Commit: a1f8c1c622a81a611ccd91cbdf6f304f6311967d
https://github.com/okfn/ckan/commit/a1f8c1c622a81a611ccd91cbdf6f304f6311967d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
M ckan_deb/usr/lib/ckan/common.sh
A doc/architecture.rst
R doc/buildbot.rst
R doc/coding-standards.rst
A doc/contributing-docs.rst
A doc/contributing.rst
A doc/css-coding-standards.rst
M doc/datastore-setup.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
A doc/html-coding-standards.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-coding-standards.rst
A doc/migration.rst
A doc/python-coding-standards.rst
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/logic/auth/get.py
dashboard authorizations FIXMEs amended otherwise non-issue
Commit: c5a66fd60eb5971464e375c6a7fa5c83439e9d56
https://github.com/okfn/ckan/commit/c5a66fd60eb5971464e375c6a7fa5c83439e9d56
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M README.rst
Log Message:
-----------
Update the README
Added links to how to contribute and coding standards sections in docs, IRC channel, updated wiki link, etc.
Commit: 7406c83785ec8ac5eab40a48c0b6dff0f406f1f2
https://github.com/okfn/ckan/commit/7406c83785ec8ac5eab40a48c0b6dff0f406f1f2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M README.rst
Log Message:
-----------
Add heading to README and tweak intro text
Commit: 79edb76ebb307a0edead05edfd4c84226497d71e
https://github.com/okfn/ckan/commit/79edb76ebb307a0edead05edfd4c84226497d71e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M README.rst
Log Message:
-----------
README: Add link to CKAN tag on Stack Overflow
Commit: c81ee8f9642e00a456d5c871f3c46c3c22ed3cee
https://github.com/okfn/ckan/commit/c81ee8f9642e00a456d5c871f3c46c3c22ed3cee
Author: John Martin <me at johnmart.in>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/lib/app_globals.py
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
Merge pull request #181 from okfn/debug-header-info
Debug header info
Commit: 3c274b9623ed2730011c3adf4d629037a6b4339d
https://github.com/okfn/ckan/commit/3c274b9623ed2730011c3adf4d629037a6b4339d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2839] Fix group controller for group display pages
Commit: 091228f605003c868b0e8434e03632b1b80811cb
https://github.com/okfn/ckan/commit/091228f605003c868b0e8434e03632b1b80811cb
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Allow get_group_or_org_admin_ids() to accept name or id
Commit: 2fb4797bf329a47953db6cfe68f8885d19a4dede
https://github.com/okfn/ckan/commit/2fb4797bf329a47953db6cfe68f8885d19a4dede
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/templates/user/snippets/followers.html
Log Message:
-----------
[#2939] Hack follower snippet for group admins
Commit: 6e03d1a0d42a6381d5e80f7b4c21bc3ed41bf473
https://github.com/okfn/ckan/commit/6e03d1a0d42a6381d5e80f7b4c21bc3ed41bf473
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/lib/app_globals.py
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Commit: 3a22c90824427ffb90f5a6359ae0d7d7eb3299f6
https://github.com/okfn/ckan/commit/3a22c90824427ffb90f5a6359ae0d7d7eb3299f6
Author: John Martin <me at johnmart.in>
Date: 2012-11-23 (Fri, 23 Nov 2012)
Changed paths:
A doc/frontend-testing.rst
Log Message:
-----------
First version of the suggested front end testing document
Commit: 4b2b0f6d3171291f5dea9decabd1894430086a5f
https://github.com/okfn/ckan/commit/4b2b0f6d3171291f5dea9decabd1894430086a5f
Author: John Martin <me at johnmart.in>
Date: 2012-11-23 (Fri, 23 Nov 2012)
Changed paths:
M doc/frontend-testing.rst
Log Message:
-----------
Final tweaks to front end testing doc
Commit: f0669af5071080742ca80663fcd0e221f4ae44e6
https://github.com/okfn/ckan/commit/f0669af5071080742ca80663fcd0e221f4ae44e6
Author: John Martin <me at johnmart.in>
Date: 2012-11-23 (Fri, 23 Nov 2012)
Changed paths:
M doc/frontend-testing.rst
Log Message:
-----------
Clarified browser stats and added some code samples
Commit: 1625ecf2e4552e82222b9bc65e03ffd0070fd5fe
https://github.com/okfn/ckan/commit/1625ecf2e4552e82222b9bc65e03ffd0070fd5fe
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-23 (Fri, 23 Nov 2012)
Changed paths:
M doc/frontend-testing.rst
Log Message:
-----------
Minor doc tweeks
Commit: 77f8224a16bf861a058ee81302f8df6f5a39c448
https://github.com/okfn/ckan/commit/77f8224a16bf861a058ee81302f8df6f5a39c448
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-25 (Sun, 25 Nov 2012)
Changed paths:
M doc/python-coding-standards.rst
Log Message:
-----------
Clarify single-quotes rule in Python coding standards
Commit: 24b94da868b702d15acfc55fbf11861387223e2f
https://github.com/okfn/ckan/commit/24b94da868b702d15acfc55fbf11861387223e2f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-25 (Sun, 25 Nov 2012)
Changed paths:
M doc/contributing.rst
Log Message:
-----------
Add CHANGELOG and docs to pull review process
Commit: 2317da3f745753d875a1e4876c045898a7fecb8b
https://github.com/okfn/ckan/commit/2317da3f745753d875a1e4876c045898a7fecb8b
Author: John Martin <me at johnmart.in>
Date: 2012-11-25 (Sun, 25 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/organization.py
M ckan/lib/plugins.py
A ckan/templates/organization/admins.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
A ckan/templates/organization/read_base.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
Few UX tweaks to the org pages
Commit: 8e07b4cb4e8ddaf0060b73c0e68f01a85a349a7d
https://github.com/okfn/ckan/commit/8e07b4cb4e8ddaf0060b73c0e68f01a85a349a7d
Author: John Martin <me at johnmart.in>
Date: 2012-11-25 (Sun, 25 Nov 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/public/base/less/activity.less
M ckan/public/base/less/variables.less
Log Message:
-----------
Dashboard icons and colors for activity streams
Commit: 7f630a9c497a62e991bc237c42570abad77b171b
https://github.com/okfn/ckan/commit/7f630a9c497a62e991bc237c42570abad77b171b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-26 (Mon, 26 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/templates/user/dashboard.html
M ckan/tests/functional/test_user.py
Log Message:
-----------
Move URL /user/dashboard to /dashboard
We decided this makes more sense
Commit: 9bc76a0eed3f0318a85ec8771b6224e8ddb4aeb7
https://github.com/okfn/ckan/commit/9bc76a0eed3f0318a85ec8771b6224e8ddb4aeb7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
A ckan/templates/package/activity.html
M ckan/templates/package/read.html
Log Message:
-----------
Add activity stream tab to dataset page
Commit: 0594077936740949f9875766f14365bc0363fd6e
https://github.com/okfn/ckan/commit/0594077936740949f9875766f14365bc0363fd6e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/tests/functional/api/__init__.py
Log Message:
-----------
Fix some PEP8 issues
Commit: b1f46c40298e741c3d6c2b01b14ef7eabc010192
https://github.com/okfn/ckan/commit/b1f46c40298e741c3d6c2b01b14ef7eabc010192
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/tests/functional/api/__init__.py
Log Message:
-----------
Tidy a couple of docstrings
Commit: 3b84c92210aa3aaf761d3f03bea6a94f0f929038
https://github.com/okfn/ckan/commit/3b84c92210aa3aaf761d3f03bea6a94f0f929038
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/tests/functional/api/__init__.py
Log Message:
-----------
Delete a commented-out set_trace()
Commit: eb55a659db75a21803a0a9bf66d50e6918152c87
https://github.com/okfn/ckan/commit/eb55a659db75a21803a0a9bf66d50e6918152c87
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
Refactor dashboard activity stream tests
- Move tests for contents of dashboard activity stream out of test_activity.py,
this test module was way too long and confusing, leave it for testing the
public activity streams only. Add a docstring to the module saying so.
- Add a docstring to test_follow.py explaining that it tests the follower
functions only (follow, unfollow, etc.) and not the contents of the dashboard
activity stream that is generated from what you're folllowing.
- Add new tests for the contents of the dashboard activity stream in
test_dashboard.py along with other dashboard tests.
Currently some of these tests are failing because activities from followed
groups are not appearing in the dashboard.
Commit: 0235f1a812cd879c3f540807afb6a462f3ccecf3
https://github.com/okfn/ckan/commit/0235f1a812cd879c3f540807afb6a462f3ccecf3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Add activities from followed groups to dashboard activity stream
Add activities from groups that a user is following (e.g. when someone
updates a group) to the user's dashboard activity stream.
There are still some test_dashboard.py tests failing because activities
from datasets belonging to followed groups dob't appear in the dashboard
yet.
Commit: 5847bd00065b4fc92121432d57a002fc1fd688dd
https://github.com/okfn/ckan/commit/5847bd00065b4fc92121432d57a002fc1fd688dd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/group.py
Log Message:
-----------
Move group_package_show SQLAlchemy into model
Move the SQLAlchemy query that the group_package_show() action function
uses into the model. I need this for architectural reasons for upcoming
commits, and we're supposed to encapsulate SQLAlchemy in the model
anyway.
I made the new model function support the 'return_query' option but note
that there are no tests covering this, all the tests pass even without
this option.
Commit: 8f5c897c06633b1f2e7cb7d7cd78573fac5fb57d
https://github.com/okfn/ckan/commit/8f5c897c06633b1f2e7cb7d7cd78573fac5fb57d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
Remove group.members_of_type()
Remove group.members_of_type() and related code. It isn't used anywhere
except in the old publisher and organizations extensions which are to be
replaced by a new organizations implementation in CKAN core. Also it
duplicates functionality provided by group.active_packages().
Commit: bdc72d7abd41fbdad5a5a30c8468ce6ea370ebc1
https://github.com/okfn/ckan/commit/bdc72d7abd41fbdad5a5a30c8468ce6ea370ebc1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/model/group.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/models/test_group.py
Log Message:
-----------
Remove duplicate methods to get a group's packages
Refactor active_packages() and get_package_revisions(), both of which
return a group's packages (but in slightly different ways), replace with
just one method packages().
We now have just one way to get a group's packages, the packages()
method of the group model. The group_package_show() action function
calls it.
Commit: e9a55a11c26e037da62b4230d54ee11611a431e4
https://github.com/okfn/ckan/commit/e9a55a11c26e037da62b4230d54ee11611a431e4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Fix following of groups
Add activities from the datasets of followed groups into the user's
dashboard activity stream. All the test_dashboard.py tests now pass.
Move SQLAlchemy from group_activity_list() into model, alongside the SQLAlchemy
queries for the other types of activity stream.
Change the SQLAlchemy in activities_from_groups_followed_by_user() to be the
union of group_activity_list() for each of the followed groups.
Update some tests.
Commit: 8e2f2a0baa703998337e3f035ab97064341cca4d
https://github.com/okfn/ckan/commit/8e2f2a0baa703998337e3f035ab97064341cca4d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Add docstring to group_activity_list()
Commit: 3a8c37c41efa548a0f59f475e01c748a3a0669d6
https://github.com/okfn/ckan/commit/3a8c37c41efa548a0f59f475e01c748a3a0669d6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Add some docstrings to model/activity.py
Commit: a96757e1cd082f6c449ec5cb9eb4a60c4b610d84
https://github.com/okfn/ckan/commit/a96757e1cd082f6c449ec5cb9eb4a60c4b610d84
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/model/activity.py
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Fix dashboard activity stream from followed groups
It was returning all activities from the entire site, fix to return
activities from followed groups only.
The tests didn't catch this error because they didn't test doing random
activities that should _not_ appear in the user's dashboard and
asserting that they don't.
Add a quick test that catches this.
This is probably a problem for the other activity streams tests in
test_activity.py as well.
Commit: 15bb5058d8fdeb1d8c5922516bee7142f9b6f5fe
https://github.com/okfn/ckan/commit/15bb5058d8fdeb1d8c5922516bee7142f9b6f5fe
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/controllers/group.py
A ckan/public/base/images/editing.png
M ckan/public/base/less/profile.less
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/edit.html
A ckan/templates/organization/edit_base.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/info.html
M ckan/templates/organization/snippets/organization_form.html
Log Message:
-----------
Tweaks Organizations work-flow
Commit: e51e9146508fd6da27be6d662d603db2295d6c03
https://github.com/okfn/ckan/commit/e51e9146508fd6da27be6d662d603db2295d6c03
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/organization.py
M ckan/public/base/less/profile.less
A ckan/templates/organization/about.html
M ckan/templates/organization/read_base.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
Text overflow fix for organization description
Commit: 69bd94d7053cae16b4820f1de65b0305ce78eb38
https://github.com/okfn/ckan/commit/69bd94d7053cae16b4820f1de65b0305ce78eb38
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
Fix for allowing the title to be sent through to the facet list
Commit: b4b1eb640b52d37e0d4c03e28b9d8c88b18e45f4
https://github.com/okfn/ckan/commit/b4b1eb640b52d37e0d4c03e28b9d8c88b18e45f4
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
Fix for pre-filled organizations in package create form
Commit: bd08b6d093a006546626d2f5237c6fcad42a9e5b
https://github.com/okfn/ckan/commit/bd08b6d093a006546626d2f5237c6fcad42a9e5b
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Re-built main.css
Commit: 8bd1579eacf27f8a4e2b3cf1c827fca9bd4a4a41
https://github.com/okfn/ckan/commit/8bd1579eacf27f8a4e2b3cf1c827fca9bd4a4a41
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/public/base/javascript/client.js
Log Message:
-----------
Fix for user dropdown autocomplete
Commit: bc179530aa05f3aa8ff6927f31ba298234093085
https://github.com/okfn/ckan/commit/bc179530aa05f3aa8ff6927f31ba298234093085
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/model/group.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/models/test_group.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 6dea0a8b2ebb87c0ed5cfe0821d9ff6d43644b37
https://github.com/okfn/ckan/commit/6dea0a8b2ebb87c0ed5cfe0821d9ff6d43644b37
Author: John Martin <me at johnmart.in>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/public/base/less/group.less
M ckan/templates/snippets/group_item.html
Log Message:
-----------
Fix for group images overflowing on the homepage
Commit: ad691fb0316ade5f29296cd0bc10a07f4a097182
https://github.com/okfn/ckan/commit/ad691fb0316ade5f29296cd0bc10a07f4a097182
Author: John Martin <me at johnmart.in>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Re-compiled main.css
Commit: afcce35935daa0ce4136d41bfbc66c496e46cba3
https://github.com/okfn/ckan/commit/afcce35935daa0ce4136d41bfbc66c496e46cba3
Author: amercader <amercadero at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Add requests to core requirements
Commit: aeddf425583e58d72f3ab3259ff0c4347f2a7903
https://github.com/okfn/ckan/commit/aeddf425583e58d72f3ab3259ff0c4347f2a7903
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Fix an activity streams crash
It seems that _group_activity_query() can sometimes be called for a
group that doesn't exist (though I'm not sure exactly how this happens).
A test was failing. Not sure how this crept into master. Fix it to
handle this case.
Commit: 81a471c5e58436ce27931916ae6fd4e928d737cf
https://github.com/okfn/ckan/commit/81a471c5e58436ce27931916ae6fd4e928d737cf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 5ec66fdab016bdbbedeb3ced0cf6f47329042912
https://github.com/okfn/ckan/commit/5ec66fdab016bdbbedeb3ced0cf6f47329042912
Author: John Martin <me at johnmart.in>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/public/base/css/main.min.css
M ckan/public/base/javascript/client.min.js
Log Message:
-----------
Added minified files, maybe for the last time ;p
Commit: dcdb61323ace0d31009246a696334d930f62c05e
https://github.com/okfn/ckan/commit/dcdb61323ace0d31009246a696334d930f62c05e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/templates/organization/edit_base.html
Log Message:
-----------
[#2939] Fix org template to allow add org
Commit: 03bcbca3205227e325224dca326c4febd12cc268
https://github.com/okfn/ckan/commit/03bcbca3205227e325224dca326c4febd12cc268
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/public/base/css/main.min.css
M ckan/public/base/javascript/client.min.js
Log Message:
-----------
Merge branch '2939-orgs' of github.com:okfn/ckan into 2939-orgs
Commit: e21dac144c4c172959e3ddbf1eb5fc6728146384
https://github.com/okfn/ckan/commit/e21dac144c4c172959e3ddbf1eb5fc6728146384
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/templates/organization/edit_base.html
Log Message:
-----------
[#2939] Fix org template to allow org members
Commit: 07b4fa52af35191601b7e7a762aa1ac65ae4e372
https://github.com/okfn/ckan/commit/07b4fa52af35191601b7e7a762aa1ac65ae4e372
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Only show members not orgs in org member list
Commit: e4f38380deab1ec8711ffd8b0fe5b69091782752
https://github.com/okfn/ckan/commit/e4f38380deab1ec8711ffd8b0fe5b69091782752
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/tests/mock_publisher_auth.py
Log Message:
-----------
Fix a crash in mock_publisher_auth
mock_publisher_auth uses `log` but doesn't initialise it. Import logging
and initialise log.
Commit: 6aad4b8aa4549d613769ac57896773532287172f
https://github.com/okfn/ckan/commit/6aad4b8aa4549d613769ac57896773532287172f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/tests/mock_publisher_auth.py
Log Message:
-----------
Delete an unused import
Commit: 53013843af361b7310a6418b3609c2ff1fc0378e
https://github.com/okfn/ckan/commit/53013843af361b7310a6418b3609c2ff1fc0378e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/tests/mock_publisher_auth.py
Log Message:
-----------
PEP8 fixes
Commit: 3ea18168e62ae887d38a2d46948434d8b60ebe66
https://github.com/okfn/ckan/commit/3ea18168e62ae887d38a2d46948434d8b60ebe66
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-29 (Thu, 29 Nov 2012)
Changed paths:
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
Add test helper function for posting to CKAN API
Add ckan.tests.post(), a helper function for posting to CKAN's action API and
getting the result, that handles forming the correct action API URL, converting
the apikey to a string and putting it in a headers dict like TestApp expects,
collecting params into a dict and dumping them to a JSON string, and checking
the 'success' field of the response.
This can save a lot of lines of code and make tests more readable. I've
converted test_follow.py as an example of how much can be saved.
Similar savings could be made in many other test modules:
ckan/tests/functional/api/model/test_vocabulary.py,
ckan/tests/functional/api/model/test_group.py,
ckan/tests/functional/api/test_dashboard.py,
ckan/tests/functional/api/test_activity.py,
ckan/tests/functional/test_follow.py,
ckan/tests/functional/test_tag_vocab.py,
ckan/tests/functional/test_related.py,
ckan/tests/logic/test_action.py
ckan/tests/logic/test_tag.py.
ckan/tests/functional/api/model/test_package.py could also be changed to use
this function. It currently uses a similar function defined in
ckan.tests.functional.api.base:ApiTestCase.
Commit: 740a0d887021abad60324ad421f06c36ffaa6f93
https://github.com/okfn/ckan/commit/740a0d887021abad60324ad421f06c36ffaa6f93
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-11-29 (Thu, 29 Nov 2012)
Changed paths:
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
Rename post -> call_action_api
More descriptive name
Commit: 0429cb92b3d9d4676a201412be661d20eab9e2e1
https://github.com/okfn/ckan/commit/0429cb92b3d9d4676a201412be661d20eab9e2e1
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-29 (Thu, 29 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/model/group.py
A ckan/templates/package/activity.html
M ckan/templates/package/read.html
M ckan/templates/user/dashboard.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/__init__.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/mock_publisher_auth.py
M ckan/tests/models/test_group.py
M doc/contributing.rst
A doc/frontend-testing.rst
M doc/python-coding-standards.rst
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/lib/dictization/model_dictize.py
ckan/model/group.py
ckan/tests/functional/api/test_follow.py
ckan/tests/functional/test_group.py
Commit: 2a756aa62cd8584d35df8b9bad47d72b4693c8df
https://github.com/okfn/ckan/commit/2a756aa62cd8584d35df8b9bad47d72b4693c8df
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-29 (Thu, 29 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#2939] Fix tests due to creation rights issue
Commit: 01d1718f2452018fb4e97be93639a81fc8174ae7
https://github.com/okfn/ckan/commit/01d1718f2452018fb4e97be93639a81fc8174ae7
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 2012)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#2939] Fix package edit to show org on edit
Commit: e993a52e9aac4d680d00140bccfb73586bd0bb6e
https://github.com/okfn/ckan/commit/e993a52e9aac4d680d00140bccfb73586bd0bb6e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/logic/action/update.py
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
[#2939] Do not allow update of group dataset for new templates
Commit: c2269cbbe4aac607229c4d5f25ff90a293adefb8
https://github.com/okfn/ckan/commit/c2269cbbe4aac607229c4d5f25ff90a293adefb8
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 2012)
Changed paths:
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
[#2939] Unbreak group edit template
Commit: 34ae5ff27ad0df2b7be4888704f531ac70c3c057
https://github.com/okfn/ckan/commit/34ae5ff27ad0df2b7be4888704f531ac70c3c057
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 2012)
Changed paths:
M ckan/templates_legacy/package/new_package_form.html
Log Message:
-----------
[#2939] Show group memberships in legacy templates
Commit: 0a3ffe0850f8ed290b3f66049b08178dbec9804e
https://github.com/okfn/ckan/commit/0a3ffe0850f8ed290b3f66049b08178dbec9804e
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
Log Message:
-----------
[#2939] Only update datasets group if we have permission for that group
Commit: df4d4db47996e1b4e4b98a675588e6179d7db01a
https://github.com/okfn/ckan/commit/df4d4db47996e1b4e4b98a675588e6179d7db01a
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Add group info to dataset metadata form
Commit: 7c4ee6bc765b04639403397160702d809bb2f36d
https://github.com/okfn/ckan/commit/7c4ee6bc765b04639403397160702d809bb2f36d
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#2939] Simpler group dataset query
Commit: 33b58100ad245065b78b3b3e1cff2507a7529b70
https://github.com/okfn/ckan/commit/33b58100ad245065b78b3b3e1cff2507a7529b70
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.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/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/create.py
M ckan/logic/auth/delete.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/061_add_follower__group_table.py
R ckan/migration/versions/061_org_changes.py
A ckan/migration/versions/062_add_dashboard_table.py
A ckan/migration/versions/063_org_changes.py
M ckan/model/__init__.py
M ckan/model/activity.py
A ckan/model/dashboard.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/fuchsia.min.css
M ckan/public/base/css/green.css
M ckan/public/base/css/green.min.css
M ckan/public/base/css/main.css
M ckan/public/base/css/main.min.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/maroon.min.css
M ckan/public/base/css/red.css
M ckan/public/base/css/red.min.css
M ckan/public/base/datapreview/css/recline.min.css
M ckan/public/base/datapreview/preview_recline.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
M ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
M ckan/public/base/datapreview/vendor/recline/css/recline.min.css
M ckan/public/base/datapreview/vendor/recline/recline.min.js
A ckan/public/base/images/editing.png
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/client.min.js
M ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/dashboard.js
A ckan/public/base/javascript/modules/dashboard.min.js
M ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/follow.min.js
M ckan/public/base/javascript/modules/popover-context.js
A ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/public/base/less/dashboard.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/group.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
A ckan/templates/ajax_snippets/popover-context-group.html
A ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
A ckan/templates/group/admins.html
A ckan/templates/group/followers.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
A ckan/templates/organization/about.html
A ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/edit.html
A ckan/templates/organization/edit_base.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
A ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/info.html
M ckan/templates/organization/snippets/organization_form.html
A ckan/templates/package/activity.html
M ckan/templates/package/read.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/read.html
M ckan/templates/user/snippets/followers.html
M ckan/templates_legacy/package/new_package_form.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/__init__.py
M ckan/tests/functional/api/test_activity.py
A ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
A ckan/tests/logic/test_auth.py
M ckan/tests/mock_publisher_auth.py
M ckan/tests/models/test_group.py
M ckan_deb/usr/lib/ckan/common.sh
A doc/architecture.rst
R doc/buildbot.rst
R doc/coding-standards.rst
M doc/common-error-messages.rst
A doc/contributing-docs.rst
A doc/contributing.rst
A doc/css-coding-standards.rst
M doc/datastore-setup.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
A doc/frontend-testing.rst
A doc/html-coding-standards.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-coding-standards.rst
A doc/migration.rst
A doc/organizations_and_groups.rst
A doc/python-coding-standards.rst
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merge branch '2939-orgs' into 3012-dg-auth
Conflicts:
ckan/lib/app_globals.py
ckan/templates/header.html
trivial merges (I hope)
Commit: 3087f576d8ade9345c13b039f21aec42709f7b73
https://github.com/okfn/ckan/commit/3087f576d8ade9345c13b039f21aec42709f7b73
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
Changed paths:
M ckan/templates/header.html
Log Message:
-----------
Actually do the merge properly
Commit: fcabe807928d73134804d644993a98784e7b8830
https://github.com/okfn/ckan/commit/fcabe807928d73134804d644993a98784e7b8830
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
Changed paths:
R ckan/migration/versions/062_dg_auth.py
A ckan/migration/versions/064_dg_auth.py
Log Message:
-----------
[#3012] Move migration script
Commit: 2274d63e5710d4fe81822df944203df8435c235f
https://github.com/okfn/ckan/commit/2274d63e5710d4fe81822df944203df8435c235f
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/user.py
M ckan/logic/auth/get.py
A ckan/templates/user/list_authorizations.html
M ckan/templates/user/read.html
Log Message:
-----------
[#3012] Shell list authorizations template
Commit: 1f7d541b70a1c0cfc767c2e246d0ce2afb158a4e
https://github.com/okfn/ckan/commit/1f7d541b70a1c0cfc767c2e246d0ce2afb158a4e
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/logic/action/get.py
M ckan/templates/user/list_authorizations.html
Log Message:
-----------
[#3012] Show listing of unauthorized users
Compare: https://github.com/okfn/ckan/compare/e99058595fe6...1f7d541b70a1
More information about the ckan-changes
mailing list