[ckan-changes] [okfn/ckan] 3a9f25: Adds follower and activity stream support to orgs

[GitHub]

  Branch: refs/heads/fixes-for-2.0
  Home:   https://github.com/okfn/ckan
  Commit: 3a9f259b702167774c72f16b6f2ebccda69c6984
      https://github.com/okfn/ckan/commit/3a9f259b702167774c72f16b6f2ebccda69c6984
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/plugins.py
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  Adds follower and activity stream support to orgs


  Commit: 046bba77db8f7baf62f07e91b6e9c285a77d8462
      https://github.com/okfn/ckan/commit/046bba77db8f7baf62f07e91b6e9c285a77d8462
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  When the secondary block is empty add .no-nav to .wrapper


  Commit: 9391022d07817d32ecec036aeb62508ebb375f6c
      https://github.com/okfn/ckan/commit/9391022d07817d32ecec036aeb62508ebb375f6c
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/templates/error_document_template.html
    M ckan/templates/home/about.html

  Log Message:
  -----------
  Fixes the 2 current templates with the correct new behaviour for .no-nav


  Commit: 25a79ad92f345e21f435f83a1d37804a290eca6a
      https://github.com/okfn/ckan/commit/25a79ad92f345e21f435f83a1d37804a290eca6a
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

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

  Log Message:
  -----------
  [#552] Adds inner block to user page header tabs

Conflicts:
	ckan/templates/user/read_base.html

    nasty merge conflict


  Commit: 6d78537c2eebfcfbf988189ccb973c09ffbd6f66
      https://github.com/okfn/ckan/commit/6d78537c2eebfcfbf988189ccb973c09ffbd6f66
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/admin/base.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/group/read_base.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/read_base.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/user/edit_base.html

  Log Message:
  -----------
  [#552] Adds page_header_tabs block for extensions to be able to add to tabs

Conflicts:
	ckan/config/routing.py
	ckan/templates/organization/read_base.html
	ckan/templates/user/read_base.html

    conflicts resolved


  Commit: a0aa2ddb2955047f8d51374f0cc92c80aa1cb9e5
      https://github.com/okfn/ckan/commit/a0aa2ddb2955047f8d51374f0cc92c80aa1cb9e5
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

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

  Log Message:
  -----------
  [#552] Adds inner block to user page header tabs

Conflicts:
	ckan/templates/user/read_base.html

    the usual conflict


Compare: https://github.com/okfn/ckan/compare/3a9f259b7021^...a0aa2ddb2955