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

Wed Feb 29 22:37:06 UTC 2012

  Branch: refs/heads/feature-1797-webstore-v2
  Home:   https://github.com/okfn/ckan
  Commit: a054071e2e29e70e7cfa69df8c117ad5d5871a24
      https://github.com/okfn/ckan/commit/a054071e2e29e70e7cfa69df8c117ad5d5871a24
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

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

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

  Commit: 2482d7150d0870cd31cde846c2c5060fe7e2ba94
      https://github.com/okfn/ckan/commit/2482d7150d0870cd31cde846c2c5060fe7e2ba94
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/i18n.py

  Log Message:
  -----------
  [xs] fix the redirect language issues on logging in/out

  Commit: 6a8457244dde05bdfa05a98646b37028a12da526
      https://github.com/okfn/ckan/commit/6a8457244dde05bdfa05a98646b37028a12da526
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/i18n.py

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

  Commit: 46a1cf3a2c2b6930f69b7976912e598bbfada7d7
      https://github.com/okfn/ckan/commit/46a1cf3a2c2b6930f69b7976912e598bbfada7d7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/helpers.py

  Log Message:
  -----------
  lang fixes

  Commit: 0d2c8e8758f915a1a5e0232ec58c1770fdda7675
      https://github.com/okfn/ckan/commit/0d2c8e8758f915a1a5e0232ec58c1770fdda7675
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

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

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

  Commit: c8a32caa3a7bbfd135bcc0afd65d994b305ac3f9
      https://github.com/okfn/ckan/commit/c8a32caa3a7bbfd135bcc0afd65d994b305ac3f9
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/templates/home/index.html

  Log Message:
  -----------
  fix broken template

  Commit: b0b782293fb70618046887c68a9f5210f1705a6a
      https://github.com/okfn/ckan/commit/b0b782293fb70618046887c68a9f5210f1705a6a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  remove useless route

  Commit: 891921399980823e186b7130afd498aec69b9957
      https://github.com/okfn/ckan/commit/891921399980823e186b7130afd498aec69b9957
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [xs][middleware] Bug fix: check that lang list is not empty (old cookie setup will give a server 500 error)

  Commit: 8346d5d57aaa74222eddb500efdf3ac7dcf53070
      https://github.com/okfn/ckan/commit/8346d5d57aaa74222eddb500efdf3ac7dcf53070
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [xs] fix static files using h.url_for_static()

  Commit: da495cfc48bf6b7e706fbfc9f6bcb29336e6dd43
      https://github.com/okfn/ckan/commit/da495cfc48bf6b7e706fbfc9f6bcb29336e6dd43
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/templates/user/login.html

  Log Message:
  -----------
  [xs] fix crazy typo ;)

  Commit: e8a9fa8135bd8371439c654a8130cfac71a1bb7e
      https://github.com/okfn/ckan/commit/e8a9fa8135bd8371439c654a8130cfac71a1bb7e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css

  Log Message:
  -----------
  [css,refactor][s]: move bootstrap css into one dedicated file.

  Commit: 3a94aceaf6d90349698f7ded449ad6075541e839
      https://github.com/okfn/ckan/commit/3a94aceaf6d90349698f7ded449ad6075541e839
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [xs] fix test FakeRequest does not have cookies

  Commit: 1a7db3585cd541cd8e8c89f6c999b778bf75a8e1
      https://github.com/okfn/ckan/commit/1a7db3585cd541cd8e8c89f6c999b778bf75a8e1
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/css/bootstrap.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js

  Log Message:
  -----------
  [#1828,css][s]: change to bootstrap v2.0 alert html and styling and add bootstrap v2.0 pagination.

  Commit: 54e7cc7c4ef43c582c53c968612db1cb14f28f7a
      https://github.com/okfn/ckan/commit/54e7cc7c4ef43c582c53c968612db1cb14f28f7a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [xs]  search to use /dataset not /packages - fixes failing test

  Commit: d8b39b816a08fd411f91c199ce8d01e7af5a742e
      https://github.com/okfn/ckan/commit/d8b39b816a08fd411f91c199ce8d01e7af5a742e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/css/bootstrap.css

  Log Message:
  -----------
  [#1828,css/bootstrap][xs]: add btn stuff.

  Commit: 10ed4a640708f035c1ad498d7a3b258360490a7b
      https://github.com/okfn/ckan/commit/10ed4a640708f035c1ad498d7a3b258360490a7b
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#1828,js][s]: upgrade to recline v0.3.

* still have some imperfect css (button on recline query menu) but could not work out how to fix.

  Commit: e6da48d9337575a83bc6a30896e68d1081b43847
      https://github.com/okfn/ckan/commit/e6da48d9337575a83bc6a30896e68d1081b43847
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  Merge branch 'feature-1828-recline-v0.3'

  Commit: f25934b7ee4eb548ae6303bbbd01772a5e08791d
      https://github.com/okfn/ckan/commit/f25934b7ee4eb548ae6303bbbd01772a5e08791d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py
  M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/test_user.py

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

  Commit: a205cd20078d15c53c33b509a31f89a68e54604b
      https://github.com/okfn/ckan/commit/a205cd20078d15c53c33b509a31f89a68e54604b
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/test_user.py

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

  Commit: 9ab8b0283bb086eb4cd663ff73c27066bdd3c79a
      https://github.com/okfn/ckan/commit/9ab8b0283bb086eb4cd663ff73c27066bdd3c79a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [#1797,js][xs]: switch to elasticsearch for viewing datasets with associated webstore db.

  Commit: eeb8b30829c2165c742bfcd7a1ef79218edeb90e
      https://github.com/okfn/ckan/commit/eeb8b30829c2165c742bfcd7a1ef79218edeb90e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#1797,js/recline][xs]: latest version of recline (minor improvements).

  Commit: 4b45d819c3478b2ea29a4e4196e413807cb46622
      https://github.com/okfn/ckan/commit/4b45d819c3478b2ea29a4e4196e413807cb46622
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [#1797,css][xs]: tidy up css for recline data viewer.

Compare: https://github.com/okfn/ckan/compare/b6a7308...4b45d81