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

Wed Jul 31 15:03:10 UTC 2013

  Branch: refs/heads/981-extend-datastore-create
  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: f58397694ee5175a1831e70e05003403023852d9
      https://github.com/okfn/ckan/commit/f58397694ee5175a1831e70e05003403023852d9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  [#1114] Do not reuse the variable name as it leaks


  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: 84f48d278cf655f6f9356b6462eeb362d711b173
      https://github.com/okfn/ckan/commit/84f48d278cf655f6f9356b6462eeb362d711b173
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1120] Add check for datastore_make_public


  Commit: 6702740876009d73a6a530a41983947826c40937
      https://github.com/okfn/ckan/commit/6702740876009d73a6a530a41983947826c40937
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1120] Tests for make_public added auth function


  Commit: e60c59e8db9510cf9554966e26119388a3aa3dfd
      https://github.com/okfn/ckan/commit/e60c59e8db9510cf9554966e26119388a3aa3dfd
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  fix paster db clean


  Commit: c85ec7a1716c618e0618409ff48a831327a33952
      https://github.com/okfn/ckan/commit/c85ec7a1716c618e0618409ff48a831327a33952
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Merge branch '1114-fix-delete-vocab-tag'


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

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch '1120-datastore-make-public'


  Commit: 6f44db77d478a7eed1c3e515dcf95beca7d21cf7
      https://github.com/okfn/ckan/commit/6f44db77d478a7eed1c3e515dcf95beca7d21cf7
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: 24ca402ad105b8d3c0a7db39789d7a6d28a22446
      https://github.com/okfn/ckan/commit/24ca402ad105b8d3c0a7db39789d7a6d28a22446
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch '1123-paster-db-clean-fix'

Conflicts:
	ckan/config/environment.py


  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'


  Commit: f818e1c9edd756a2195cb8094ede7c49b3720dab
      https://github.com/okfn/ckan/commit/f818e1c9edd756a2195cb8094ede7c49b3720dab
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/get.py
    M ckan/templates/header.html
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 981-extend-datastore-create


Compare: https://github.com/okfn/ckan/compare/ad172b52de71...f818e1c9edd7