[ckan-changes] [okfn/ckan] 2cdc99: stash apply

Tue Mar 27 10:03:47 UTC 2012

  Branch: refs/heads/enhancement-2257-clean-template-vars
  Home:   https://github.com/okfn/ckan
  Commit: 2cdc9947f83c8a9872525175dea407fe3c488704
      https://github.com/okfn/ckan/commit/2cdc9947f83c8a9872525175dea407fe3c488704
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/config/middleware.py
  M ckan/lib/base.py
  M ckan/lib/helpers.py
  M ckan/templates/layout_base.html
  M test-core.ini

  Log Message:
  -----------
  stash apply

  Commit: ba37da05d8e90ddd0c4b5401622623e1b3b86366
      https://github.com/okfn/ckan/commit/ba37da05d8e90ddd0c4b5401622623e1b3b86366
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  merge fix

  Commit: c91403b4ad5dd01abc1527aec777e8d25897ab3e
      https://github.com/okfn/ckan/commit/c91403b4ad5dd01abc1527aec777e8d25897ab3e
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Revert "merge fix"

This reverts commit ba37da05d8e90ddd0c4b5401622623e1b3b86366.

  Commit: a1edf5aa7b8d565db5bf2732d16ea6b359cee3b6
      https://github.com/okfn/ckan/commit/a1edf5aa7b8d565db5bf2732d16ea6b359cee3b6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/config/environment.py
  M ckan/config/middleware.py
  M ckan/lib/base.py
  M ckan/lib/helpers.py
  M ckan/templates/layout_base.html
  M test-core.ini

  Log Message:
  -----------
  Revert "stash apply"

This reverts commit 2cdc9947f83c8a9872525175dea407fe3c488704.

  Commit: 0e79b2736378eb069685dab2a8ae607e40b87a15
      https://github.com/okfn/ckan/commit/0e79b2736378eb069685dab2a8ae607e40b87a15
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/base.py
  M ckan/lib/helpers.py
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M test-core.ini

  Log Message:
  -----------
  apply stash

  Commit: ac0702761cffab9691687d78004bb9a1848aacbb
      https://github.com/okfn/ckan/commit/ac0702761cffab9691687d78004bb9a1848aacbb
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/lib/helpers.py
  M doc/i18n.rst

  Log Message:
  -----------
  Merge branch 'master' into enhancement-2257-clean-template-vars

  Commit: 31dbe3c597f63268eea61b3d8ec45682dc8d3211
      https://github.com/okfn/ckan/commit/31dbe3c597f63268eea61b3d8ec45682dc8d3211
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  remove unused function

  Commit: 1a9eeb144f3660b52c69265521ba047ebd0de997
      https://github.com/okfn/ckan/commit/1a9eeb144f3660b52c69265521ba047ebd0de997
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  import cleanup

  Commit: 7d068f3130a005609bd22272022a9ba3e6c59ff6
      https://github.com/okfn/ckan/commit/7d068f3130a005609bd22272022a9ba3e6c59ff6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  better exception message

  Commit: c78d93bbc28b93a5fba874918c2b75e431fa4b70
      https://github.com/okfn/ckan/commit/c78d93bbc28b93a5fba874918c2b75e431fa4b70
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  clean auto_log_message()w

Compare: https://github.com/okfn/ckan/compare/2cdc994^...c78d93b