[ckan-changes] [okfn/ckan] 60d61d: [#3009] Fix dashboard activity stream auth
GitHub
noreply at github.com
Fri Nov 30 18:51:59 UTC 2012
Branch: refs/heads/2961-pluggable-previews
Home: https://github.com/okfn/ckan
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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: e000e0b859ba8cbce7b2aa968f69e573f6e41654
https://github.com/okfn/ckan/commit/e000e0b859ba8cbce7b2aa968f69e573f6e41654
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 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/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/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/logic/auth/publisher/get.py
A ckan/migration/versions/062_add_dashboard_table.py
M ckan/model/__init__.py
M ckan/model/activity.py
A ckan/model/dashboard.py
M ckan/model/group.py
M ckan/public/base/css/main.css
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
A ckan/templates/package/activity.html
M ckan/templates/package/read.html
M ckan/templates/snippets/activity_item.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
A 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 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/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/python-coding-standards.rst
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' into 2961-pluggable-previews
Conflicts:
ckan/config/deployment.ini_tmpl
Compare: https://github.com/okfn/ckan/compare/c6d5389be492...e000e0b859ba
More information about the ckan-changes
mailing list