[ckan-changes] [okfn/ckan] 87d674: [#552] Adds page_header_tabs block for extensions ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 87d6746a57a0c23f005a83f496555e00d9adfe0c
      https://github.com/okfn/ckan/commit/87d6746a57a0c23f005a83f496555e00d9adfe0c
  Author: John Martin <me at johnmart.in>
  Date:   2013-03-05 (Tue, 05 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
    M ckan/templates/user/read_base.html

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


  Commit: 4413a8ed644746dbabf882982a7f2f549132df5c
      https://github.com/okfn/ckan/commit/4413a8ed644746dbabf882982a7f2f549132df5c
  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


  Commit: 38272d782a286e0963652e55a0520b2c02deaab0
      https://github.com/okfn/ckan/commit/38272d782a286e0963652e55a0520b2c02deaab0
  Author: tobes <toby.junk at gmail.com>
  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
    M ckan/templates/user/read_base.html

  Log Message:
  -----------
  Merge branch '552-page-header-tabs'

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

    activity stream rfelated conflicts


Compare: https://github.com/okfn/ckan/compare/876438ae99d5...38272d782a28