[ckan-changes] [okfn/ckan] a205cd: Merge branch 'master' into feature-1797-webstore-v...

[GitHub]

  Branch: refs/heads/master
  Home:   https://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.


  Commit: 687c5a1e0659caa1f999c97d7e5b8ab0b99fdb95
      https://github.com/okfn/ckan/commit/687c5a1e0659caa1f999c97d7e5b8ab0b99fdb95
  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
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html

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


Compare: https://github.com/okfn/ckan/compare/f25934b...687c5a1