[ckan-changes] [okfn/ckan] bc31e2: Merge branch 'feature-1797-webstore-v2'

Sat Mar 10 20:42:45 UTC 2012

  Branch: refs/heads/feature-1797-webstore-v2
  Home:   https://github.com/okfn/ckan
  Commit: bc31e278cd4072d4872e803510aa2f3f236274cd
      https://github.com/okfn/ckan/commit/bc31e278cd4072d4872e803510aa2f3f236274cd
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-04 (Sun, 04 Mar 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  A ckan/controllers/datastore.py
  R ckan/controllers/webstore.py
  A ckan/tests/functional/test_datastore.py
  R ckan/tests/functional/test_webstore.py
  M doc/datastore.rst
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'feature-1797-webstore-v2'

  Commit: fe07d6f7947084441461c035f713be90a02e8005
      https://github.com/okfn/ckan/commit/fe07d6f7947084441461c035f713be90a02e8005
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-05 (Mon, 05 Mar 2012)

  Changed paths:
    A .gitmodules
  M README.rst
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  A ckan/controllers/datastore.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  R ckan/controllers/webstore.py
  M ckan/lib/helpers.py
  M ckan/lib/plugins.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_util.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/layout.html
  M ckan/tests/functional/api/test_activity.py
  A ckan/tests/functional/test_datastore.py
  R ckan/tests/functional/test_webstore.py
  A doc/_templates/footer.html
  R doc/_templates/layout.html
  A doc/_themes/sphinx-theme-okfn
  M doc/about.rst
  M doc/api.rst
  M doc/conf.py
  A doc/datastore.rst
  M doc/index.rst
  M doc/theming.rst
  R doc/webstore.rst
  M test-core.ini

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

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

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [xs][bugfix] no need to decode CKAN_CURRENT_URL

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

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [xs][bugfix] url encodings now fixed in I18nMiddleware

  Commit: 6a2577f88a93dd95499f60b770e2d1ae5926386b
      https://github.com/okfn/ckan/commit/6a2577f88a93dd95499f60b770e2d1ae5926386b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M ckan/templates/group/layout.html

  Log Message:
  -----------
  [xs] Mislabelled link says Publisher instead of Group

  Commit: 5bb1b181e553bfc96a064a8ecafd16cf71c839d1
      https://github.com/okfn/ckan/commit/5bb1b181e553bfc96a064a8ecafd16cf71c839d1
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-06 (Tue, 06 Mar 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/templates/layout_base.html

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

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

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [xs] make lang cookie a session one

  Commit: a6aca286ce0e65b46a6beed19a7c4cc977c3c623
      https://github.com/okfn/ckan/commit/a6aca286ce0e65b46a6beed19a7c4cc977c3c623
  Author: John Glover <j at johnglover.net>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [xs] tidy up: remove unnecessary code

  Commit: d2cb952ef0e6954cdc8024c791d17963bf7edce3
      https://github.com/okfn/ckan/commit/d2cb952ef0e6954cdc8024c791d17963bf7edce3
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/logic/auth/publisher/get.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  Merge branch 'feature-1607-dgu-maintentance-refactor' of ssh://github.com/okfn/ckan into feature-1607-dgu-maintentance-refactor

  Commit: e41ae7893653af888a1f2c8ca71bc8f14cde147b
      https://github.com/okfn/ckan/commit/e41ae7893653af888a1f2c8ca71bc8f14cde147b
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [logic]: Now when you print exceptions, the error message(s) show. This was hiding a problem with the DGU form api.

  Commit: c28df8d694f78a512ec311e4884edb3c1047d359
      https://github.com/okfn/ckan/commit/c28df8d694f78a512ec311e4884edb3c1047d359
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#1711][helpers] Added function to parse rfc 2822 date strings

  Commit: 81e5fe717a070db41a2f3660e6ff499c053843e2
      https://github.com/okfn/ckan/commit/81e5fe717a070db41a2f3660e6ff499c053843e2
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/public/css/forms.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js

  Log Message:
  -----------
  [#1711] Integrate resource validation into application.js

  Commit: 234b746df285a474062d9d2453a6e2ff5499811b
      https://github.com/okfn/ckan/commit/234b746df285a474062d9d2453a6e2ff5499811b
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/public/css/forms.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge branch 'feature-1711-resource-validation' into feature-1607-dgu-maintentance-refactor

  Commit: 26513fa097b06bd482038623e08f4b1472ad4496
      https://github.com/okfn/ckan/commit/26513fa097b06bd482038623e08f4b1472ad4496
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/logic/__init__.py
  M ckan/logic/auth/publisher/get.py
  M ckan/model/group.py
  M ckan/public/css/forms.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/user/edit_user_form.html
  M ckan/tests/lib/test_helpers.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'feature-1607-dgu-maintentance-refactor' of https://github.com/okfn/ckan into feature-1607-dgu-maintentance-refactor

  Commit: eb173a33d364d00d2885f8d6cc5e3fec06581314
      https://github.com/okfn/ckan/commit/eb173a33d364d00d2885f8d6cc5e3fec06581314
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-07 (Wed, 07 Mar 2012)

  Changed paths:
    M ckan/logic/schema.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  [1607] Fixing the schema so that tests work again

  Commit: 0efe8a7a5a2d74e74ce19ca7c2f626d919485714
      https://github.com/okfn/ckan/commit/0efe8a7a5a2d74e74ce19ca7c2f626d919485714
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-08 (Thu, 08 Mar 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
  M ckan/logic/schema.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M test-core.ini

  Log Message:
  -----------
  [1607] Fixes to tests that were failing because of schema changes

  Commit: 0632a8b0756890c91ab69838f98f5bbe7fd3604e
      https://github.com/okfn/ckan/commit/0632a8b0756890c91ab69838f98f5bbe7fd3604e
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-08 (Thu, 08 Mar 2012)

  Changed paths:
    M ckan/tests/__init__.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [tests]: Fix assert_in and assert_not_in imports - they needs Python 2.7, so have a fallback for Python 2.5 and 2.6.

  Commit: d1ba07ffb1ed7d9d4e5f57a1f88e4298578ddb72
      https://github.com/okfn/ckan/commit/d1ba07ffb1ed7d9d4e5f57a1f88e4298578ddb72
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-08 (Thu, 08 Mar 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/authenticator.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/group.py
  M ckan/model/user.py
  M ckan/public/css/forms.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/facets.html
  M ckan/templates/package/edit.html
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_helpers.py
  M ckanext/publisher_form/forms.py
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'feature-1607-dgu-maintentance-refactor'

Conflicts:
	ckan/controllers/group.py
	ckan/controllers/package.py
	ckan/controllers/user.py
	ckan/lib/alphabet_paginate.py
	ckan/lib/create_test_data.py
	ckan/lib/dictization/model_dictize.py
	ckan/lib/dictization/model_save.py
	ckan/templates/package/edit.html
	ckan/tests/functional/test_group.py
	ckan/tests/lib/test_dictization.py

The source of much conflict was the moving of much code from the
controllers/{package, group}.py modules into lib/plugins.py.  It
turns out there wasn't too much to do there, but it required a
fair bit of checking.

  Commit: c5514945495f366cfd1eca3618f25c4da74f07f4
      https://github.com/okfn/ckan/commit/c5514945495f366cfd1eca3618f25c4da74f07f4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/lib/i18n.py
  M ckan/logic/validators.py

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

  Commit: 2f6ef03c5bc24d55aac0121b0babcf4aa51f674e
      https://github.com/okfn/ckan/commit/2f6ef03c5bc24d55aac0121b0babcf4aa51f674e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M doc/authorization.rst
  M doc/configuration.rst
  A doc/publisher_auth_profile.rst

  Log Message:
  -----------
  Merge branch 'feature-1670-publisher-profile-docs'

  Commit: 62cb81c02caf0c6f411b3f9830857f1d9d303581
      https://github.com/okfn/ckan/commit/62cb81c02caf0c6f411b3f9830857f1d9d303581
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  [xs] Fixing minor flaw with RST that was affecting rendering on github

  Commit: 8de3723539d4cd06c8782f03346dd1b16106075e
      https://github.com/okfn/ckan/commit/8de3723539d4cd06c8782f03346dd1b16106075e
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M README.rst
  M doc/authorization.rst
  M doc/configuration.rst
  A doc/publisher_auth_profile.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'

  Commit: 25b90e6e52d2d84f4258ca111ff998271b757d8a
      https://github.com/okfn/ckan/commit/25b90e6e52d2d84f4258ca111ff998271b757d8a
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/tests/functional/api/test_resource.py
  M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  [tests]: Small test fixes to keep pace with WUI updates.

  Commit: f28e054a43fb72454108547807ddfa5267e456bd
      https://github.com/okfn/ckan/commit/f28e054a43fb72454108547807ddfa5267e456bd
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [nosetests]: Another fix.

  Commit: cd373300cc31a451b25f4b6c651c350c71431ff1
      https://github.com/okfn/ckan/commit/cd373300cc31a451b25f4b6c651c350c71431ff1
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/tests/functional/api/model/test_package.py

  Log Message:
  -----------
  [test]: I did not mean to commit this new test in the last commit.

  Commit: 6ebb538d9e69e8f330ba67fdb00fd84c5bc723b6
      https://github.com/okfn/ckan/commit/6ebb538d9e69e8f330ba67fdb00fd84c5bc723b6
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M README.rst
  M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  M ckan/config/routing.py
  A ckan/controllers/datastore.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  R ckan/controllers/webstore.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/authenticator.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/plugins.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/publisher/get.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/group.py
  M ckan/model/user.py
  M ckan/public/css/forms.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/facets.html
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/test_authz.py
  A ckan/tests/functional/test_datastore.py
  M ckan/tests/functional/test_group.py
  R ckan/tests/functional/test_webstore.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_helpers.py
  M ckanext/publisher_form/forms.py
  M doc/authorization.rst
  M doc/conf.py
  M doc/configuration.rst
  A doc/datastore.rst
  M doc/index.rst
  A doc/publisher_auth_profile.rst
  R doc/webstore.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  [merge conflicts]: DGU refactor touched a lot of frontend code. Hopefully this preserved it.

  Commit: c34d095d9f3ebba156684260ce12288d44269d74
      https://github.com/okfn/ckan/commit/c34d095d9f3ebba156684260ce12288d44269d74
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/package.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/logic/action/get.py
  M ckan/public/css/style.css
  A ckan/public/images/chevron-down.png
  A ckan/public/images/chevron-up.png
  A ckan/public/images/icons/package_add.png
  A ckan/public/images/icons/page_white.png
  A ckan/public/images/icons/page_white_add.png
  A ckan/public/images/icons/page_white_code.png
  A ckan/public/images/icons/page_white_compressed.png
  A ckan/public/images/icons/page_white_cup.png
  A ckan/public/images/icons/page_white_database.png
  A ckan/public/images/icons/page_white_error.png
  A ckan/public/images/icons/page_white_excel.png
  A ckan/public/images/icons/page_white_gear.png
  A ckan/public/images/icons/page_white_link.png
  A ckan/public/images/icons/page_white_text.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/_util.html
  M ckan/templates/facets.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  A ckan/templates/package/editresources.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/api/test_resource.py
  M ckan/tests/functional/test_package.py
  M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  Merge branch 'feature-1506-ux-superticket'

  Commit: 2d469c8be720f955c2f569a4eaa464792a5fa7da
      https://github.com/okfn/ckan/commit/2d469c8be720f955c2f569a4eaa464792a5fa7da
  Author: David Read <david.read at okfn.org>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/tests/__init__.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch 'feature-1607-dgu-maintentance-refactor'

  Commit: a38b0f352d7071b39211ba3790a23641099e3fc6
      https://github.com/okfn/ckan/commit/a38b0f352d7071b39211ba3790a23641099e3fc6
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/package/edit.html

  Log Message:
  -----------
  [1506/merging][s]: Merge tidied & tested. Looks good to me.

  Commit: 45fdc9db7d54b9bb99208082e3107e0134deed03
      https://github.com/okfn/ckan/commit/45fdc9db7d54b9bb99208082e3107e0134deed03
  Author: Tom Rees <zephod at gmail.com>
  Date:   2012-03-09 (Fri, 09 Mar 2012)

  Changed paths:
    M ckan/tests/__init__.py
  M ckan/tests/lib/test_dictization.py

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

  Commit: f8cf90c10e54e7bddce5098d29548d6fb5d740ec
      https://github.com/okfn/ckan/commit/f8cf90c10e54e7bddce5098d29548d6fb5d740ec
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#1506,js,bugfix][xs]: remove minor piece of JS that is no longer needed due to @zephod's changes and is causing JS exception.

* @zephod accidentally merged this back in while doing his merge -- see 6ebb538d9e69e8f330ba67fdb00fd84c5bc723b6. In fact, this code was obsolete as form_errors got removed from resource edit page as part of zephod's refactor.

  Commit: c3014224a69a6b3f76befb4558d84bd6acf3d6fb
      https://github.com/okfn/ckan/commit/c3014224a69a6b3f76befb4558d84bd6acf3d6fb
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1797,resource][s]: minor tweaks to layout of resource read (not related to #1797 really).

  Commit: 96d978d8556aa4c8469e2cc5a991fd2a029899c4
      https://github.com/okfn/ckan/commit/96d978d8556aa4c8469e2cc5a991fd2a029899c4
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1797,resource/view][s]: small tweaks to existing download button and new Data API button.

  Commit: 0d1f8a68d7a040e9363c37b4fc16f13db8fe8787
      https://github.com/okfn/ckan/commit/0d1f8a68d7a040e9363c37b4fc16f13db8fe8787
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
  A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [vendor/jquery][xs]: upgrade to v1.7.1 of jquery in preparation for using bootstrap.

  Commit: ff7e102eb823981c4ac720486419a3cc69264916
      https://github.com/okfn/ckan/commit/ff7e102eb823981c4ac720486419a3cc69264916
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/public/css/bootstrap.css
  M ckan/public/css/style.css
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1797,#2223,css][m]: introduce full bootstrap v2.0.

* As far as I can tell most stuff still just works with some very minor tweaking (though I have put boostrap before blueprint)
* This is needed for use of bootstrap js for modals etc
* TODO: remove blueprint

  Commit: 0dc337098a3a07cb40a0613bf57a9bb061a0f80d
      https://github.com/okfn/ckan/commit/0dc337098a3a07cb40a0613bf57a9bb061a0f80d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [vendor/bootstrap][s]: add bootstrap.js.

  Commit: 1d8e464f8542d4c33286bb93f4de50060665799f
      https://github.com/okfn/ckan/commit/1d8e464f8542d4c33286bb93f4de50060665799f
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/public/scripts/application.js
  A ckan/templates/_snippet/data-api-help.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1797,resource/view][m]: data API help in modal dialog on resource view page.

  Commit: 77eeee7f018d8d497fc3222d7e74a321af8b944a
      https://github.com/okfn/ckan/commit/77eeee7f018d8d497fc3222d7e74a321af8b944a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js

  Log Message:
  -----------
  [#1797,js][xs]: add visualization to resource type list and add placeholder to format field (not really part of #1797).

  Commit: 3f1320cd92ae0e775fde1b5eada156260c55e0a6
      https://github.com/okfn/ckan/commit/3f1320cd92ae0e775fde1b5eada156260c55e0a6
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/templates/js_strings.html

  Log Message:
  -----------
  [#1797,resource/edit][s]: checkbox for datastore enabled in resource form (uses webstore_url field).

  Commit: a8129fe570dba88df0a00a9aaf8cb95ccf1eb910
      https://github.com/okfn/ckan/commit/a8129fe570dba88df0a00a9aaf8cb95ccf1eb910
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M ckan/controllers/datastore.py
  M ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  [#1797,datastore/api][s]: check whether datastore is enabled for a given resource (whether webstore_url is set) and if not return error json.

  Commit: d533064faabdac9c39247752960ea933de9c4a84
      https://github.com/okfn/ckan/commit/d533064faabdac9c39247752960ea933de9c4a84
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-10 (Sat, 10 Mar 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  [#1797,doc/datastore][xs]: correct link for ckanext-datastorer.

Compare: https://github.com/okfn/ckan/compare/432f135...d533064