[ckan-changes] [okfn/ckan] 4749d2: Merge branch 'master' into feature-1515-activity-s...

[noreply at github.com]

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan

  Commit: 4749d22d2e6fb6ecff26ae7714ee6738168cdc7d
      https://github.com/okfn/ckan/commit/4749d22d2e6fb6ecff26ae7714ee6738168cdc7d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    A .gitattributes
  M ckan/controllers/group.py
  M ckan/logic/action/get.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/group.py
  M ckan/templates/layout_base.html
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_cors.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_dictization.py
  M doc/common-error-messages.rst
  M doc/test.rst
  M pip-requirements-test.txt
  M test-core.ini
  M test.ini

  Log Message:
  -----------
  Merge branch 'master' into feature-1515-activity-streams


  Commit: 3f50cced1b129f0c479ebb528c426e53bc08055e
      https://github.com/okfn/ckan/commit/3f50cced1b129f0c479ebb528c426e53bc08055e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-06 (Fri, 06 Jan 2012)

  Changed paths:
    M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_resource.html

  Log Message:
  -----------
  [#1494][#1496] Tweak activity streams templates

They were showing the gravatars twice


Compare: https://github.com/okfn/ckan/compare/3026499...3f50cce