[ckan-changes] [okfn/ckan] d5a71c: genshi hack to allow properties in templates

[GitHub]

  Branch: refs/heads/feature-2375-demo-theme
  Home:   https://github.com/okfn/ckan
  Commit: d5a71cb6aa75b460d969ba3f0bb69334ade8534e
      https://github.com/okfn/ckan/commit/d5a71cb6aa75b460d969ba3f0bb69334ade8534e
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  genshi hack to allow properties in templates


  Commit: c0aa45fea018c32837686f4886471da3b6bd5755
      https://github.com/okfn/ckan/commit/c0aa45fea018c32837686f4886471da3b6bd5755
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  example usage of a property


  Commit: a9defd03757a36a15a06c45042fb8f78046e10ea
      https://github.com/okfn/ckan/commit/a9defd03757a36a15a06c45042fb8f78046e10ea
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  Revert "example usage of a property"

This reverts commit 9d38187aed90e10218fc086e6a72461234e23958.


  Commit: 2542cb3e9db16e595266e806dd85b30ca59c0126
      https://github.com/okfn/ckan/commit/2542cb3e9db16e595266e806dd85b30ca59c0126
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-19 (Tue, 19 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  add copyright notice for genshi code hack


  Commit: d37619608be4898b6aadd37120ce8f7913b76780
      https://github.com/okfn/ckan/commit/d37619608be4898b6aadd37120ce8f7913b76780
  Author: kindly <kindly at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [2571] append only resource create


  Commit: 876ea6535878eba79d3203beda9eac25d8c5fa60
      https://github.com/okfn/ckan/commit/876ea6535878eba79d3203beda9eac25d8c5fa60
  Author: kindly <kindly at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py

  Log Message:
  -----------
  [2571] add basic user auth checks to resource create


  Commit: 4d812a1592bb3f526b56cb7c7ca7b3fd0b687204
      https://github.com/okfn/ckan/commit/4d812a1592bb3f526b56cb7c7ca7b3fd0b687204
  Author: amercader <amercadero at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  [xs] Update CHANGELOG for 1.7.1 release


  Commit: 94c648a83d1328b4050ad9e0b8e6e16f9dabc2fa
      https://github.com/okfn/ckan/commit/94c648a83d1328b4050ad9e0b8e6e16f9dabc2fa
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-2571-add-resource-create


  Commit: 2bf1d3d0f2fd2851433049c6d270468140f1f416
      https://github.com/okfn/ckan/commit/2bf1d3d0f2fd2851433049c6d270468140f1f416
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'feature-2571-add-resource-create'

merge bracnch 2571 resource_create action implemented


  Commit: b48c1aef2ca739673d8babd1fcc41639aeb1916c
      https://github.com/okfn/ckan/commit/b48c1aef2ca739673d8babd1fcc41639aeb1916c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/environment.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'master' into feature-2375-demo-theme

Conflicts:
	ckan/config/environment.py

Fix conflict both branches contained non conflicting new code.


Compare: https://github.com/okfn/ckan/compare/2b3b005ed5ab...b48c1aef2ca7