[ckan-changes] [okfn/ckan] 709130: [#1115] Changes name of parent header block

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 709130978a0247ed2c95f14af4c647f35ac72347
      https://github.com/okfn/ckan/commit/709130978a0247ed2c95f14af4c647f35ac72347
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1115] Changes name of parent header block


  Commit: 5a0bee09d5a01c0ef6563375ae8debd63dea7c9f
      https://github.com/okfn/ckan/commit/5a0bee09d5a01c0ef6563375ae8debd63dea7c9f
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/templates/header.html
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1115] Change block names within child template and not parent as it could cause block extension issues


  Commit: ec41bee8ce2f3af43002ca3f9ead30f242fa2693
      https://github.com/okfn/ckan/commit/ec41bee8ce2f3af43002ca3f9ead30f242fa2693
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  Merge branch '1115-header-block-recursion'


Compare: https://github.com/okfn/ckan/compare/24ca402ad105...ec41bee8ce2f