[ckan-changes] [okfn/ckan] ba0789: Limit activity streams to latest 15 activities

Mon Feb 6 13:30:08 UTC 2012

  Branch: refs/heads/feature-1669-publisher-profile
  Home:   https://github.com/okfn/ckan
  Commit: ba07896d8cb9444bfb24348003a8dbdbae82beaf
      https://github.com/okfn/ckan/commit/ba07896d8cb9444bfb24348003a8dbdbae82beaf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-05 (Sun, 05 Feb 2012)

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

  Log Message:
  -----------
  Limit activity streams to latest 15 activities

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

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/_util.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html

  Log Message:
  -----------
  [#1639] Add some basic CSS to activity streams

Just so they look better than being completely unstyled, trying to make
them a little better to scan with the eyes: emphasise the actor, object
and (to a lesser extend) the verb, demphasise the date, and add some
vertical space in-between activities.

Also tidied up the HTML, the CSS classes, and the Genshi macro a little.

  Commit: 2a58612fe19ddfbb85b93ad1453bc51245678013
      https://github.com/okfn/ckan/commit/2a58612fe19ddfbb85b93ad1453bc51245678013
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-05 (Sun, 05 Feb 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/_util.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/removed_tag.html

  Log Message:
  -----------
  Add 'target' arg to activity streams Genshi macro

Brings it inline with the http://activitystrea.ms/ standard: actor,
verb, object, target.

  Commit: 92792e11f42dda9c3c773022f24c312cb3501f3d
      https://github.com/okfn/ckan/commit/92792e11f42dda9c3c773022f24c312cb3501f3d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-05 (Sun, 05 Feb 2012)

  Changed paths:
    M ckan/templates/activity_streams/deleted_package.html

  Log Message:
  -----------
  Fix deleted_package.html activity streams template

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

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

  Log Message:
  -----------
  Correct a typo in a comment

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

  Changed paths:
    A ckan/tests/functional/test_activity.py

  Log Message:
  -----------
  [#1694] Add functional tests for activity streams HTML rendering

  Commit: 1c03f5ba41c1a9a567405c481f8d18d77b0f8b0a
      https://github.com/okfn/ckan/commit/1c03f5ba41c1a9a567405c481f8d18d77b0f8b0a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-05 (Sun, 05 Feb 2012)

  Changed paths:
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Fix a test that was broken by commit a7e49d0

  Commit: 7f0c3d9ef19d027ecd783f2a4864076a3e786861
      https://github.com/okfn/ckan/commit/7f0c3d9ef19d027ecd783f2a4864076a3e786861
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-05 (Sun, 05 Feb 2012)

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

  Log Message:
  -----------
  Remove some unused imports

  Commit: 622a2201fa66d2ea3eaf13a9bc22672a687c88f0
      https://github.com/okfn/ckan/commit/622a2201fa66d2ea3eaf13a9bc22672a687c88f0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-05 (Sun, 05 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py
  M ckan/controllers/authorization_group.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/lib/base.py
  M ckan/lib/helpers.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/model/authorization_group.py
  M ckan/model/authz.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/_util.html
  M ckan/templates/layout_base.html
  M ckan/templates/user/read.html
  M ckan/tests/functional/test_edit_authz.py
  M ckan/tests/functional/test_package_edit_authz.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_helpers.py
  M ckan/tests/logic/test_action.py
  M doc/apiv3.rst

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

Conflicts:
	ckan/controllers/user.py
	ckan/logic/action/get.py
	ckan/templates/user/read.html

  Commit: 49552548101416b2633636c4c0b71b1a464669c2
      https://github.com/okfn/ckan/commit/49552548101416b2633636c4c0b71b1a464669c2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-05 (Sun, 05 Feb 2012)

  Changed paths:
    M ckan/templates/user/read.html

  Log Message:
  -----------
  Fix several tests that were crashing since f93a103

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

  Changed paths:
    M ckan/templates/user/read.html

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

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

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/templates/user/read.html

  Log Message:
  -----------
  Fix some templating bugs

  Commit: 50f09461387cc5f2a171912205de48d692478498
      https://github.com/okfn/ckan/commit/50f09461387cc5f2a171912205de48d692478498
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-05 (Sun, 05 Feb 2012)

  Changed paths:
    M ckan/lib/activity.py
  M ckan/logic/action/create.py
  M ckan/model/tag.py

  Log Message:
  -----------
  Improve some comments and docstrings

  Commit: 90c76b0b006cf505698834e833b548634cf10d17
      https://github.com/okfn/ckan/commit/90c76b0b006cf505698834e833b548634cf10d17
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-06 (Mon, 06 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/style.css
  M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#1719,helpers][xs]: fixes #1719 - broken link for users without a real gravatar.

* Problem: we were providing a default user icon to gravatar (see http://en.gravatar.com/site/implement/images/). However, we were not providing an *absolute* url just the relevative url on the CKAN instance (also weren't url-encoding the link ...). This led to the following 404 url: http://en.gravatar.com/images/icons/user.png
* Fix: use identicon default image from gravatar (no longer provide our own default image).
  * Could have corrected this but felt simpler option from multiple persepectives (code, resource usage, ux) was to do this.

  Commit: e63fbebe879b43c7046fe8f66ebd73f7cfbb0c2a
      https://github.com/okfn/ckan/commit/e63fbebe879b43c7046fe8f66ebd73f7cfbb0c2a
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-06 (Mon, 06 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/authorization_group.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  A ckan/lib/activity.py
  M ckan/lib/base.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  A ckan/migration/versions/048_add_activity_streams_tables.py
  M ckan/model/__init__.py
  A ckan/model/activity.py
  M ckan/model/authorization_group.py
  M ckan/model/authz.py
  M ckan/model/meta.py
  M ckan/model/package.py
  M ckan/model/package_extra.py
  M ckan/model/resource.py
  M ckan/model/tag.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/_util.html
  A ckan/templates/activity_streams/added_tag.html
  A ckan/templates/activity_streams/changed_group.html
  A ckan/templates/activity_streams/changed_package.html
  A ckan/templates/activity_streams/changed_package_extra.html
  A ckan/templates/activity_streams/changed_resource.html
  A ckan/templates/activity_streams/changed_user.html
  A ckan/templates/activity_streams/deleted_group.html
  A ckan/templates/activity_streams/deleted_package.html
  A ckan/templates/activity_streams/deleted_package_extra.html
  A ckan/templates/activity_streams/deleted_resource.html
  A ckan/templates/activity_streams/new_group.html
  A ckan/templates/activity_streams/new_package.html
  A ckan/templates/activity_streams/new_package_extra.html
  A ckan/templates/activity_streams/new_resource.html
  A ckan/templates/activity_streams/new_user.html
  A ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/layout_base.html
  M ckan/templates/user/read.html
  A ckan/tests/functional/api/test_activity.py
  A ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_edit_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package_edit_authz.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_helpers.py
  M ckan/tests/logic/test_action.py
  M doc/apiv3.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1669-publisher-profile

Conflicts:
	ckan/logic/action/create.py

  Commit: 3c0e7bfb15a7f1e1566da41a7a9331a48f6fb5c6
      https://github.com/okfn/ckan/commit/3c0e7bfb15a7f1e1566da41a7a9331a48f6fb5c6
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-06 (Mon, 06 Feb 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [1669] Fixed the get_groups lookup to make sure it works as expected

Compare: https://github.com/okfn/ckan/compare/d0e2c43...3c0e7bf