[ckan-changes] [okfn/ckan] fb86d6: Merge branch 'master' of https://github.com/okfn/c...

Mon Jun 25 13:35:02 UTC 2012

  Branch: refs/heads/feature-2375-demo-theme
  Home:   https://github.com/okfn/ckan
  Commit: fb86d64cb1484291eb4b1c0634b8ea8c27abac32
      https://github.com/okfn/ckan/commit/fb86d64cb1484291eb4b1c0634b8ea8c27abac32
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M doc/coding-standards.rst
    M doc/install-from-package.rst

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

  Commit: c7cd7a1e0740ed8983d868804989779b29a740a4
      https://github.com/okfn/ckan/commit/c7cd7a1e0740ed8983d868804989779b29a740a4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/logic/__init__.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [2500] get_action now raises an exception on missing action

Previously get_action returned None for missing actions, but this led
to opaque errors in templates whereas now it raises an exception which is
clear in describing the problem.

Also lots of PEP8 cleanup of the non-test code.

  Commit: 62e4d53230a1069a1fd5c988d23998dcdeb434ec
      https://github.com/okfn/ckan/commit/62e4d53230a1069a1fd5c988d23998dcdeb434ec
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/logic/__init__.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'defect-2500-get-action-missing'

  Commit: 3b7ff6c2e9eaa2bb21567525fd9df0fcde330816
      https://github.com/okfn/ckan/commit/3b7ff6c2e9eaa2bb21567525fd9df0fcde330816
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Fix a test that was broken with sqlite

If you do CreateTestData.create() and then do setup_test_search_index()
in a setup_class() method then setup_test_search_index() causes the
entire test class to be skipped when tests are run with sqlite, and the
teardown_class() method is not run, so you have created test data but
not deleted it, and the next test classes will crash when they try to
create the test data. Instead call setup_test_search_index() before you
create test data.

  Commit: a68431aa331c361e55905ec461cbc1028279ec36
      https://github.com/okfn/ckan/commit/a68431aa331c361e55905ec461cbc1028279ec36
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/tests/test_versions.py

  Log Message:
  -----------
  Workaround for broken Pylons version test

test_pylons() was failing when the right version of Pylons is installed
into a virtualenv with pip rather than installed system-wide. Looks like
a bug in the Pylons code when it reports its version number.  Changed
the test to get the version from pip freeze instead.

  Commit: 73976a3c6a8e5ee11899771ae7947d489147401a
      https://github.com/okfn/ckan/commit/73976a3c6a8e5ee11899771ae7947d489147401a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2569] allow resources to have dataset info

  Commit: 410c485a69555844ad6eaeabbdf787100c3dbc73
      https://github.com/okfn/ckan/commit/410c485a69555844ad6eaeabbdf787100c3dbc73
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M ckan/public/base/less/forms.less
    R ckan/templates/package/edit_form.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/pages/form.html
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme

  Commit: 1500e7e2fa57c36bd793b17fa8bba2e2def15c1a
      https://github.com/okfn/ckan/commit/1500e7e2fa57c36bd793b17fa8bba2e2def15c1a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M ckan/templates/package/snippets/resources.html

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme

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

  Changed paths:
    M ckan/controllers/api.py
    M ckan/logic/__init__.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_versions.py

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

  Commit: 1864c7f2fad71e81a6c69e84f808149b2850f6f6
      https://github.com/okfn/ckan/commit/1864c7f2fad71e81a6c69e84f808149b2850f6f6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2591] fix postgresql 9.1.4 unicode issue

sqlalchemy gets confused over unicode encoding in postgresql v9.1.4
we get utf-8 data but we can think that we are getting SQL_ASCII
this patch forces sqlalchemy to use utf-8 which will make things easier
as all ckan data should be treated as utf-8

  Commit: 40aac7a8d67095d2e062cc403c1f13dae38a1618
      https://github.com/okfn/ckan/commit/40aac7a8d67095d2e062cc403c1f13dae38a1618
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Merge branch 'defect-2591-postgresql-unicode' into feature-2375-demo-theme

I need this commit to use ckan

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

  Changed paths:
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/snippets/facet_list.html
    A ckan/templates/user/edit.html
    A ckan/templates/user/edit_user_form.html
    A ckan/templates/user/snippets/back_to_user_action.html

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme

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

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2591] only enforce unicode for postgresql

sqlite databases do not want to be affected

  Commit: 02d62b213dd3685bb7df563f1839e1e707cc56e3
      https://github.com/okfn/ckan/commit/02d62b213dd3685bb7df563f1839e1e707cc56e3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Merge branch 'defect-2591-postgresql-unicode' into feature-2375-demo-theme

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

  Changed paths:
    M ckan/templates/group/read.html
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  [#2375] fix facet list for group pages

need to send group id to facet list

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

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/toolbar.less

  Log Message:
  -----------
  Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme

Compare: https://github.com/okfn/ckan/compare/ea336abb0908...e3035ffafba4