[ckan-changes] [okfn/ckan] ba439e: Add resource-url-analytics CSS class to 'Raw Data'...

Fri Nov 16 23:00:30 UTC 2012

  Branch: refs/heads/2961-pluggable-previews
  Home:   https://github.com/okfn/ckan
  Commit: ba439ef8b0a3339ff05e0f7f1571a05731b5c526
      https://github.com/okfn/ckan/commit/ba439ef8b0a3339ff05e0f7f1571a05731b5c526
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-19 (Fri, 19 Oct 2012)

  Changed paths:
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  Add resource-url-analytics CSS class to 'Raw Data' links

ckanext-googleanalytics uses the resource-url-analytics CSS class to
find links to add Google Analytics Event Tracking to. The Download links
on resource read pages already have this class. Add it to the Raw Data
links next to the resources on dataset read pages as well.

  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: fd37c90e614c75f1d874f38e2733586e4ca93214
      https://github.com/okfn/ckan/commit/fd37c90e614c75f1d874f38e2733586e4ca93214
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  [#1664] Make group activity streams smarter

Make group_activity_list() return all activities where the object of the
activity is either the group or any of the group's datasets, instead of just
the group as before.

Also check that the user has 'group_show' access to the group before returning
the activity stream, this plugs an access leak where a user who did not have
'group_show' access could still get the group's activity stream.

Update some existing tests that were broken by the new permission check.

Tests for the new group activity stream content need to be added.

  Commit: 9cc0f849b32301be98669d5b725ebc48b305b7f1
      https://github.com/okfn/ckan/commit/9cc0f849b32301be98669d5b725ebc48b305b7f1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    A ckan/templates/group/activity_stream.html

  Log Message:
  -----------
  [#1664] Add group activity stream page

You can now see a group's activity stream at /group/activity/GROUP_NAME.

This page is not integrated into the rest of the group pages yet like
the user activity stream page is with the user pages, but can be in
future if we want.

Also remove c.group_activity_stream from the group read context as it's
not used so no need to compute it.

  Commit: 8facd097f6f98cff9f0a448d19e5e29fc747a173
      https://github.com/okfn/ckan/commit/8facd097f6f98cff9f0a448d19e5e29fc747a173
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  Remove direct logic function access from test_activity.py

Make functional/api/test_activity.py post to the API whenever it wants
to create, update or delete users, packages, groups, etc.

Also gets rid of the need to access resource_list_dictize() directly.

  Commit: c4240fbd72a8c953487ed46f951866c90fbbae7b
      https://github.com/okfn/ckan/commit/c4240fbd72a8c953487ed46f951866c90fbbae7b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  Remove direct model access from test_activity.py

Import ckan.model only where needed and don't retain model objects, in
many cases replace accessing the model with going through the API

  Commit: 7ebf0c1e4ecc48661e39e13c18dc8125f39f016e
      https://github.com/okfn/ckan/commit/7ebf0c1e4ecc48661e39e13c18dc8125f39f016e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  Fix an import in test_activity.py

Follow the CKAN Coding Standards for imports

  Commit: e5039423d1ba9e34dddb9387efc645c2be9cd892
      https://github.com/okfn/ckan/commit/e5039423d1ba9e34dddb9387efc645c2be9cd892
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  test_activity.py PEP8 fixes

  Commit: 306d9c37d582f7b2d1e0101bb259d7971837d2db
      https://github.com/okfn/ckan/commit/306d9c37d582f7b2d1e0101bb259d7971837d2db
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-26 (Fri, 26 Oct 2012)

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

  Log Message:
  -----------
  Remove some commented-out tests

  Commit: 952ec8efbfb9da6cab6efdb9f43661b5776d9a42
      https://github.com/okfn/ckan/commit/952ec8efbfb9da6cab6efdb9f43661b5776d9a42
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

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

  Log Message:
  -----------
  [#1664] Convert group names to ids in group_activity_list()

This fixes a bug where calling group_activity_list with the group's name
as the id parameter would return less results than if you called it with
the group's id.

  Commit: 5d926d91d00075ff144c56c3bb8af3308803f64d
      https://github.com/okfn/ckan/commit/5d926d91d00075ff144c56c3bb8af3308803f64d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

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

  Log Message:
  -----------
  [#1664] Add some tests for group activity streams

Add some tests for the new smarter group activity streams. There were
already tests that changes to the group itself (created, updated or
deleted group) appear in the group's activity stream, now add some tests
that changes to the group's packages appear in the group's activity
stream.

These tests are not ideal, test_activity.py needs refactoring it's too
complicated.

  Commit: 22b5ff34dbb0a0456bba5988b6e9aacba627d5e2
      https://github.com/okfn/ckan/commit/22b5ff34dbb0a0456bba5988b6e9aacba627d5e2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

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

  Log Message:
  -----------
  Add auth checks to activity streams API functions

  Commit: 1c64b4cf756fc879272b0ec8b8b30f45721beaf2
      https://github.com/okfn/ckan/commit/1c64b4cf756fc879272b0ec8b8b30f45721beaf2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-10-29 (Mon, 29 Oct 2012)

  Changed paths:
    R doc/howto-editing-database-ownership.rst
    M doc/paster.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1664-smarter-group-activity-streams

  Commit: f88ed2ed0ee6c159465ddf14c80a961829e7b945
      https://github.com/okfn/ckan/commit/f88ed2ed0ee6c159465ddf14c80a961829e7b945
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-30 (Tue, 30 Oct 2012)

  Changed paths:
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  Merge pull request #163 from okfn/add-analytics-class-to-resource-links

Add resource-url-analytics CSS class to 'Raw Data' links

  Commit: 594b70b6f3cd95722d7a7092a833eb0432c9b6df
      https://github.com/okfn/ckan/commit/594b70b6f3cd95722d7a7092a833eb0432c9b6df
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Re-ran production less compilation to keep it up to date

  Commit: ec893c36fca0cf22365bfe641c22d7a9fcc231b3
      https://github.com/okfn/ckan/commit/ec893c36fca0cf22365bfe641c22d7a9fcc231b3
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M ckan/public/base/less/ckan.less

  Log Message:
  -----------
  Removed uneeded disqus.less empty file that was causing LESS compilation problems

  Commit: c04db955d7611d2847eaee227b0e241b955ee80a
      https://github.com/okfn/ckan/commit/c04db955d7611d2847eaee227b0e241b955ee80a
  Author: John Martin <me at johnmart.in>
  Date:   2012-10-31 (Wed, 31 Oct 2012)

  Changed paths:
    M ckan/public/base/css/main.css
    R ckan/public/base/less/disqus.less

  Log Message:
  -----------
  Re-ran ./bin/less and re-compiled main.css

  Commit: 9ebc00217997acb6505a4e18e62bd45a3a595407
      https://github.com/okfn/ckan/commit/9ebc00217997acb6505a4e18e62bd45a3a595407
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#1664] Use field name in internationalized error.

  Commit: 97eb5f89e0db128dae729ead7d94a357386ca1f6
      https://github.com/okfn/ckan/commit/97eb5f89e0db128dae729ead7d94a357386ca1f6
  Author: Ian Murray <ian.c.murray at gmail.com>
  Date:   2012-11-02 (Fri, 02 Nov 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/logic/action/get.py
    A ckan/templates/group/activity_stream.html
    M ckan/tests/functional/api/test_activity.py

  Log Message:
  -----------
  Merge branch 'feature-1664-smarter-group-activity-streams'

  Commit: c59b304cb6b8a6dce09b8e9f708f9cb4d684cab4
      https://github.com/okfn/ckan/commit/c59b304cb6b8a6dce09b8e9f708f9cb4d684cab4
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-11-03 (Sat, 03 Nov 2012)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [doc/theme][xs]: update to latest version of the doc theme.

  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: 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: 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: 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: 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: 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: 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: 909d29526f33af139e1ec6952a6be1ac2d8ddb90
      https://github.com/okfn/ckan/commit/909d29526f33af139e1ec6952a6be1ac2d8ddb90
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-11-16 (Fri, 16 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/css/main.css
    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
    R ckan/public/base/less/disqus.less
    M ckan/public/base/less/iehacks.less
    A ckan/templates/ajax_snippets/popover-context-group.html
    A ckan/templates/group/about.html
    A 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/package/snippets/resource_item.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M doc/_themes/sphinx-theme-okfn
    M doc/common-error-messages.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 2961-pluggable-previews

  Commit: 84973d2fe347a7198b48266fdf15ae1f4ee6d602
      https://github.com/okfn/ckan/commit/84973d2fe347a7198b48266fdf15ae1f4ee6d602
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  kill file serve in proxy test

  Commit: 2792859cbe1cccb4de283edf70cf9630120fffa4
      https://github.com/okfn/ckan/commit/2792859cbe1cccb4de283edf70cf9630120fffa4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-11-16 (Fri, 16 Nov 2012)

  Changed paths:
    M ckanext/resourceproxy/plugin.py
    M doc/writing-extensions.rst

  Log Message:
  -----------
  Docs on the resource proxy

Compare: https://github.com/okfn/ckan/compare/7bb24b2dd86d...2792859cbe1c