[ckan-changes] [okfn/ckan] : Merge branch 'master' of github.com:okfn/ckan into...

[GitHub]

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: 0ec666b32b96ebc7de26030b2e4ae903aa6d48a9
      https://github.com/okfn/ckan/commit/0ec666b32b96ebc7de26030b2e4ae903aa6d48a9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M ckan/lib/app_globals.py
  R ckan/public/images/ckan-features.png
  M ckan/templates/home/about.html
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_home.py
  M doc/configuration.rst

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


  Commit: 07f3d4cc849f5db0ee66cc21ee1ebe6decc452f8
      https://github.com/okfn/ckan/commit/07f3d4cc849f5db0ee66cc21ee1ebe6decc452f8
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [master][noticket][doc][xs]: Note that package_form option is only for formalchemy forms.


  Commit: 863e6ff644283bc8f4f4cf666b64ec9b6f5c3c2b
      https://github.com/okfn/ckan/commit/863e6ff644283bc8f4f4cf666b64ec9b6f5c3c2b
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M ckan/templates/package/edit.html

  Log Message:
  -----------
  [master][#1624][templates]: Fix futher typo.


  Commit: 5b518e58283511453d81aab846f07cb682408d0a
      https://github.com/okfn/ckan/commit/5b518e58283511453d81aab846f07cb682408d0a
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge branch 'feature-1385-postgres-permissions' of ssh://github.com/okfn/ckan


  Commit: dfdc349557d7c8bdd80182f2abbd2a098eaff17a
      https://github.com/okfn/ckan/commit/dfdc349557d7c8bdd80182f2abbd2a098eaff17a
  Author: David Read <david.read at okfn.org>
  Date:   2012-01-10 (Tue, 10 Jan 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [master][noticket][templates][xs]: Change copyright year to 2012.


  Commit: 6fb3dc835105e199d0dde8fb5fa443ca214f4df8
      https://github.com/okfn/ckan/commit/6fb3dc835105e199d0dde8fb5fa443ca214f4df8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

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

  Log Message:
  -----------
  Add tests for user activity stream API call

ckan/tests/models/test_activity.py already tests the logic function for
getting a user's activity stream in detail. I just made it also retrieve
the user's activity stream from the API each time it retrieves it from
the logic function, and check that the API result (after JSON parsing)
is the same as the logic function result.

Removed ckan/tests/functional/api/model/test_activity.py, no longer
needed.


  Commit: 0967960dbf3f9015fdd62ffe54a6972ed81e9767
      https://github.com/okfn/ckan/commit/0967960dbf3f9015fdd62ffe54a6972ed81e9767
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M ckan/logic/action/create.py
  M ckan/tests/models/test_activity.py

  Log Message:
  -----------
  [#1625] Add test for 'new user' activity type


  Commit: c589b07d231dd04c52d6041ac56ba723c2ea48c0
      https://github.com/okfn/ckan/commit/c589b07d231dd04c52d6041ac56ba723c2ea48c0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M ckan/lib/cli.py
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M doc/configuration.rst

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


Compare: https://github.com/okfn/ckan/compare/eb62fb7...c589b07