[ckan-changes] [okfn/ckan] 7a5b42: Allow legacy templates to use new snippets

GitHub noreply at github.com
Fri Sep 28 11:06:31 UTC 2012 

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 7a5b42588e780664b3e426abb87fb8f079dbcbd5
      https://github.com/okfn/ckan/commit/7a5b42588e780664b3e426abb87fb8f079dbcbd5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M ckan/config/environment.py
    M test-core.ini

  Log Message:
  -----------
  Allow legacy templates to use new snippets


  Commit: 84629c528fbb91a45696b60eebe257d820770b77
      https://github.com/okfn/ckan/commit/84629c528fbb91a45696b60eebe257d820770b77
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/public/base/datapreview/css/datapreview.css
    M ckan/public/base/datapreview/resource.config
    M ckan/public/scripts/application.js
    M ckan/templates/package/resource_read.html
    M ckan/templates_legacy/package/resource_read.html

  Log Message:
  -----------
  Dataviewer as an embed


  Commit: 57251a33d280eafb196a0d55607c4b2afdbd9e62
      https://github.com/okfn/ckan/commit/57251a33d280eafb196a0d55607c4b2afdbd9e62
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    A ckan/public/base/datapreview/outside.js
    A ckan/public/base/datapreview/vendor/resize/resize.js
    A ckan/templates/package/resource_preview.html
    A ckan/templates/package/snippets/data_preview.html
    A ckan/templates_legacy/package/snippets/data_preview.html

  Log Message:
  -----------
  Dataviewer as an embed part 2


  Commit: e0ce612031f8db0e50af08a343cb54545d6011b0
      https://github.com/okfn/ckan/commit/e0ce612031f8db0e50af08a343cb54545d6011b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    R ckan/public/base/datapreview/outside.js
    M ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/resize/resize.js
    A ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/vendor/resize.js
    M ckan/public/base/vendor/resource.config
    A ckan/public/scripts/outside.js
    A ckan/public/scripts/vendor/resize/resize.js
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/data_preview.html
    M ckan/templates_legacy/package/resource_read.html

  Log Message:
  -----------
  Data preview now uses new style module for outer iframe scripts


  Commit: 930e8e1e22200e2d1ff991247027fe8463d6faf0
      https://github.com/okfn/ckan/commit/930e8e1e22200e2d1ff991247027fe8463d6faf0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/recline/css/recline.css
    M ckan/public/base/datapreview/vendor/recline/recline.js

  Log Message:
  -----------
  Update recline .js anc .css


  Commit: f3e85e64398f881d566609816740942b3e3b0a6a
      https://github.com/okfn/ckan/commit/f3e85e64398f881d566609816740942b3e3b0a6a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/datapreview.js

  Log Message:
  -----------
  Stop javascript error


  Commit: 8507d6e98f86110b18c7c71d908d7178b550107b
      https://github.com/okfn/ckan/commit/8507d6e98f86110b18c7c71d908d7178b550107b
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-18 (Tue, 18 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  Revert a change now that I have no idea what is going on


  Commit: 3fca8332702a1f0bf8fe94449d78524d26107267
      https://github.com/okfn/ckan/commit/3fca8332702a1f0bf8fe94449d78524d26107267
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  Issue with firefox and graphs


  Commit: 49cae907296b5edec890cd5efe337a64af68825d
      https://github.com/okfn/ckan/commit/49cae907296b5edec890cd5efe337a64af68825d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/recline/css/recline.css
    M ckan/public/base/datapreview/vendor/recline/recline.js

  Log Message:
  -----------
  Revert "Update recline .js anc .css"

This reverts commit 930e8e1e22200e2d1ff991247027fe8463d6faf0.


  Commit: 13e8739a4974dcacd0b26e42d97b203969e09b26
      https://github.com/okfn/ckan/commit/13e8739a4974dcacd0b26e42d97b203969e09b26
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/datapreview.js
    M ckan/public/base/datapreview/resource.config
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.js
    A ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    A ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/layers.png
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/marker-icon.png
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/marker-shadow.png
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/zoom-in.png
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/zoom-out.png
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
    M ckan/public/base/datapreview/vendor/recline/recline.js

  Log Message:
  -----------
  fix up datapreview in master (integrate latest recline and vendor deps and port fixes from 2733 branch).


  Commit: 8eba5042f8f0a8060bbc0188748f7336b573b1b2
      https://github.com/okfn/ckan/commit/8eba5042f8f0a8060bbc0188748f7336b573b1b2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/datapreview.js

  Log Message:
  -----------
  Fix datapreview to get site url


  Commit: a3e61c1951c609c03ed3a231ea033f1f59d88a29
      https://github.com/okfn/ckan/commit/a3e61c1951c609c03ed3a231ea033f1f59d88a29
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
    A ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_datastore.py
    M doc/datastore.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '2733-feature-datastore' into dataviewer-iframe

Conflicts:
	setup.py


  Commit: 5e95ee73928ab2a23713b42b7105d75ed7bd6964
      https://github.com/okfn/ckan/commit/5e95ee73928ab2a23713b42b7105d75ed7bd6964
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  remove json dump from resource_read


  Commit: 8d28d016b14a2e9f20ad7cc712991db4e065b82b
      https://github.com/okfn/ckan/commit/8d28d016b14a2e9f20ad7cc712991db4e065b82b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch '2733-feature-datastore' into dataviewer-iframe


  Commit: 3c7fbbbb1528e56922a1cda98761e65138530f9a
      https://github.com/okfn/ckan/commit/3c7fbbbb1528e56922a1cda98761e65138530f9a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  enabled recalibration of iframe height


  Commit: 3f1fc3caf15da3f6f1d25b991b8bfa7d9e663f44
      https://github.com/okfn/ckan/commit/3f1fc3caf15da3f6f1d25b991b8bfa7d9e663f44
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  always use data preview if datastore is active


  Commit: 171eed33bc36cbd44405818833e6bc1b95b190e3
      https://github.com/okfn/ckan/commit/171eed33bc36cbd44405818833e6bc1b95b190e3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-19 (Wed, 19 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  use None as implicit False


  Commit: c92f22b4ba934efdfa3214b50440603aa2d8d1d3
      https://github.com/okfn/ckan/commit/c92f22b4ba934efdfa3214b50440603aa2d8d1d3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  fix resource_lower -> format_lower


  Commit: df5ebaf6227145cc58c5dc643297d9e608bd260a
      https://github.com/okfn/ckan/commit/df5ebaf6227145cc58c5dc643297d9e608bd260a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  Move styles into blocks in base.html template


  Commit: 815706515c0be5f2dc1e1d440e92104d8988e59d
      https://github.com/okfn/ckan/commit/815706515c0be5f2dc1e1d440e92104d8988e59d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

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

  Log Message:
  -----------
  Recline now independent of ckan css


  Commit: 8aca2f705177359b601a10d5f1798f58898204f2
      https://github.com/okfn/ckan/commit/8aca2f705177359b601a10d5f1798f58898204f2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch 'dataviewer-iframe' of github.com:okfn/ckan into dataviewer-iframe


  Commit: 7543bef990de0f21c48c20ffd54abd6c48aeb6ee
      https://github.com/okfn/ckan/commit/7543bef990de0f21c48c20ffd54abd6c48aeb6ee
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css

  Log Message:
  -----------
  Add non-minified bootstrap.css


  Commit: e8a1e5e1788eceb0d69e088d7f58f34d7abea199
      https://github.com/okfn/ckan/commit/e8a1e5e1788eceb0d69e088d7f58f34d7abea199
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css

  Log Message:
  -----------
  Remove minified bootstrap.css


  Commit: 22a9a83c2d7d2d4c2acc03b827962ad757ed9d23
      https://github.com/okfn/ckan/commit/22a9a83c2d7d2d4c2acc03b827962ad757ed9d23
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  Bootstrap.css now added in datapreview


  Commit: d6189db66ea6d867aee19f50d10e7fee9b41f697
      https://github.com/okfn/ckan/commit/d6189db66ea6d867aee19f50d10e7fee9b41f697
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png

  Log Message:
  -----------
  Bootstrap images added


  Commit: 20212ea4fad324b93fdaa9182b097ccea0e35924
      https://github.com/okfn/ckan/commit/20212ea4fad324b93fdaa9182b097ccea0e35924
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    A ckan/public/base/datapreview/css/pdfpreview.css
    M ckan/public/base/datapreview/resource.config
    A ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    A ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    A ckan/public/base/datapreview/vendor/webL10n/README.md
    A ckan/public/base/datapreview/vendor/webL10n/l10n.js
    A ckan/public/base/javascript/modules/pdf-viewer.js
    A ckan/templates/package/resource_pdfpreview.html

  Log Message:
  -----------
  Added pdfjs preview (not working yet)


  Commit: 54f94db4242e1619080cfd5bce783c9ca7b18e70
      https://github.com/okfn/ckan/commit/54f94db4242e1619080cfd5bce783c9ca7b18e70
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/templates/base.html
    M ckan/templates/package/resource_preview.html

  Log Message:
  -----------
  Merge branch 'dataviewer-iframe' of github.com:okfn/ckan into dataviewer-iframe


  Commit: b298bc4d0ebce4ac6a72aff1630a38cd8e547ce7
      https://github.com/okfn/ckan/commit/b298bc4d0ebce4ac6a72aff1630a38cd8e547ce7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js

  Log Message:
  -----------
  Use our own build for pdf.js


  Commit: 0ea00bb47433273f079a5920cf5d80c58bcfa774
      https://github.com/okfn/ckan/commit/0ea00bb47433273f079a5920cf5d80c58bcfa774
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    A ckan/public/base/datapreview/pdfpreview.js
    A ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    M ckan/templates/package/resource_pdfpreview.html

  Log Message:
  -----------
  Added missing files


  Commit: 89fa2ba0ffc44397565a90c800f4a3b975049043
      https://github.com/okfn/ckan/commit/89fa2ba0ffc44397565a90c800f4a3b975049043
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js

  Log Message:
  -----------
  make pdfviewer loadable


  Commit: 359d49b52133987218ca9d4e978473bf11a265c4
      https://github.com/okfn/ckan/commit/359d49b52133987218ca9d4e978473bf11a265c4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/pdfpreview.js
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js

  Log Message:
  -----------
  Use ckan viewer module


  Commit: 81ad2aeda7c5ead16c81d1f473056655b500eff0
      https://github.com/okfn/ckan/commit/81ad2aeda7c5ead16c81d1f473056655b500eff0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  Get correct path for pdf.js


  Commit: 5da142abf27c1acefb1dbe3028238d77e19ebbfb
      https://github.com/okfn/ckan/commit/5da142abf27c1acefb1dbe3028238d77e19ebbfb
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/zoom-out.png
    M ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png

  Log Message:
  -----------
  Leaflet fixes for dataviewer


  Commit: 1b3bf107877a583d1a1f8a1b56bb3fc980e2937c
      https://github.com/okfn/ckan/commit/1b3bf107877a583d1a1f8a1b56bb3fc980e2937c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/pdfpreview.js
    M ckan/public/base/datapreview/resource.config
    A ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    M ckan/templates/package/resource_pdfpreview.html

  Log Message:
  -----------
  added locale


  Commit: cd6164b84b986e2b30745858ca717700c5306d1e
      https://github.com/okfn/ckan/commit/cd6164b84b986e2b30745858ca717700c5306d1e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/images/zoom-out.png
    M ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png

  Log Message:
  -----------
  Merge branch 'dataviewer-iframe' of github.com:okfn/ckan into dataviewer-iframe


  Commit: 7130f9a6009b6a7cb38e21e9e75f81b1c4b97e1f
      https://github.com/okfn/ckan/commit/7130f9a6009b6a7cb38e21e9e75f81b1c4b97e1f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/pdfpreview.css
    M ckan/public/base/datapreview/resource.config
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/templates/package/resource_pdfpreview.html

  Log Message:
  -----------
  fixed pdf preview and fixed errors


  Commit: 6d1b7bd7160b8a14afb00ba9782a552e7488494f
      https://github.com/okfn/ckan/commit/6d1b7bd7160b8a14afb00ba9782a552e7488494f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  renamed action to make it more consistent


  Commit: 1ea046c9951cfebc9e48d8d4833f964e95dbdbe7
      https://github.com/okfn/ckan/commit/1ea046c9951cfebc9e48d8d4833f964e95dbdbe7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  Fix iframe resizing


  Commit: 03dcc921594113e1b017cf9c4781d639767813ee
      https://github.com/okfn/ckan/commit/03dcc921594113e1b017cf9c4781d639767813ee
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-20 (Thu, 20 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/pdfpreview.css

  Log Message:
  -----------
  avoid scrollbars in pdf preview


  Commit: b8799e78e8e39a706845a09057bfd380978275db
      https://github.com/okfn/ckan/commit/b8799e78e8e39a706845a09057bfd380978275db
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

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

  Log Message:
  -----------
  Remove unwanted set in template


  Commit: 9e0d72cc9ebbd53f475fb1ab6684813c8811e0ef
      https://github.com/okfn/ckan/commit/9e0d72cc9ebbd53f475fb1ab6684813c8811e0ef
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

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

  Log Message:
  -----------
  Pdf viewer template cleanup of unwanted css/js


  Commit: 66afc06ebca3912682bb1291618bb59a0235b4ca
      https://github.com/okfn/ckan/commit/66afc06ebca3912682bb1291618bb59a0235b4ca
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/datapreview/datapreview.js
    M ckan/public/base/datapreview/pdfpreview.js
    M ckan/templates/package/snippets/data_preview.html

  Log Message:
  -----------
  make decision about preview on the server instead of the client in js


  Commit: 41672f96c76744e7051da0c7b2e81164faf5ae33
      https://github.com/okfn/ckan/commit/41672f96c76744e7051da0c7b2e81164faf5ae33
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    R ckan/public/base/javascript/modules/pdf-viewer.js

  Log Message:
  -----------
  removed unnecessary file


  Commit: dbb3cc41a455b1e75760a5e88cf04c11a2920f5c
      https://github.com/okfn/ckan/commit/dbb3cc41a455b1e75760a5e88cf04c11a2920f5c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.js
    M ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js

  Log Message:
  -----------
  use src version as leaflet.js


  Commit: ceda54bee01431edcb1df5a7ee57524d669c03d9
      https://github.com/okfn/ckan/commit/ceda54bee01431edcb1df5a7ee57524d669c03d9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js

  Log Message:
  -----------
  fix image path in leaflet


  Commit: 091d6a6bd8f8d4df0c49d1f2ae80d75c3e6fc4a1
      https://github.com/okfn/ckan/commit/091d6a6bd8f8d4df0c49d1f2ae80d75c3e6fc4a1
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    A ckan/public/base/javascript/modules/dismiss-alerts.js
    M ckan/templates/package/snippets/data_preview.html

  Log Message:
  -----------
  Dismiss alerts js module


  Commit: fc5b31940a2356e38e87035995974b90b4ead067
      https://github.com/okfn/ckan/commit/fc5b31940a2356e38e87035995974b90b4ead067
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M ckan/controllers/package.py
    A ckan/templates/package/resource_datapreview.html
    R ckan/templates/package/resource_preview.html

  Log Message:
  -----------
  preview -> datapreview


  Commit: 4e03370b4083fcda8093fd9aa92e0481833684be
      https://github.com/okfn/ckan/commit/4e03370b4083fcda8093fd9aa92e0481833684be
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

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

  Log Message:
  -----------
  remove ignored class


  Commit: 86ce9c93f282e6106d7f79fc6987b1b05136d30b
      https://github.com/okfn/ckan/commit/86ce9c93f282e6106d7f79fc6987b1b05136d30b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    A ckan/public/base/datapreview/jsonpreview.js
    M ckan/public/base/datapreview/pdfpreview.js
    M ckan/public/base/datapreview/resource.config
    A ckan/templates/package/resource_jsonpreview.html

  Log Message:
  -----------
  Very basic json(p) preview 


  Commit: 609f3ef8180d8733c9cc4c7f3c7080f81c3c4b8b
      https://github.com/okfn/ckan/commit/609f3ef8180d8733c9cc4c7f3c7080f81c3c4b8b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/jsonpreview.js
    M ckan/templates/package/resource_jsonpreview.html

  Log Message:
  -----------
  removed logging


  Commit: 419df38ab656e982fc8f52e53d5647f3a130943a
      https://github.com/okfn/ckan/commit/419df38ab656e982fc8f52e53d5647f3a130943a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-21 (Fri, 21 Sep 2012)

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

  Log Message:
  -----------
  fixed indention


  Commit: 6ea5421513ef3b9e600906a3e2afb262391d6d5c
      https://github.com/okfn/ckan/commit/6ea5421513ef3b9e600906a3e2afb262391d6d5c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/jsonpreview.js
    M ckan/templates/package/resource_jsonpreview.html

  Log Message:
  -----------
  new module style for json preview


  Commit: 955faa95783f6af1c77ee20f34f029acc079edc7
      https://github.com/okfn/ckan/commit/955faa95783f6af1c77ee20f34f029acc079edc7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  smarter previewer resizing


  Commit: 1eaa73e6c2fecd428d9208c3faae8203013f9eec
      https://github.com/okfn/ckan/commit/1eaa73e6c2fecd428d9208c3faae8203013f9eec
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    A ckan/public/base/datapreview/css/jsonpreview.css
    M ckan/public/base/datapreview/jsonpreview.js
    M ckan/public/base/datapreview/resource.config
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  simple js syntax highlighting


  Commit: d52104fd4bbfcab79c67837f1ec6cdbb8c28f6a2
      https://github.com/okfn/ckan/commit/d52104fd4bbfcab79c67837f1ec6cdbb8c28f6a2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  use outer height for iframe resizing


  Commit: 869c5805f2835d9f55845a7d411c811a5b5e1f6d
      https://github.com/okfn/ckan/commit/869c5805f2835d9f55845a7d411c811a5b5e1f6d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  removed js logging


  Commit: 8f11f34cf7638405e9ae004f36197518e5eb5988
      https://github.com/okfn/ckan/commit/8f11f34cf7638405e9ae004f36197518e5eb5988
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-22 (Sat, 22 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/pdfpreview.js
    M ckan/templates/package/resource_pdfpreview.html

  Log Message:
  -----------
  new style pdf preview module


  Commit: 57d089a7d679755e98412b2cc010bb22d8418e34
      https://github.com/okfn/ckan/commit/57d089a7d679755e98412b2cc010bb22d8418e34
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

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

  Log Message:
  -----------
  Wrap type in code in preview alert


  Commit: cc0bbf072c879a8c19bba036a128e895364d7002
      https://github.com/okfn/ckan/commit/cc0bbf072c879a8c19bba036a128e895364d7002
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/jsonpreview.js

  Log Message:
  -----------
  use provided jquery in json preview


  Commit: 46259c2acbb544f75e7f256c5d6a54d5a483d509
      https://github.com/okfn/ckan/commit/46259c2acbb544f75e7f256c5d6a54d5a483d509
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    A ckan/public/base/javascript/modules/dismiss-alert.js
    R ckan/public/base/javascript/modules/dismiss-alerts.js

  Log Message:
  -----------
  rename dismiss alert and apply only to one element


  Commit: dd8ac29a6cce9b69611b3e0382b8e81de57e209d
      https://github.com/okfn/ckan/commit/dd8ac29a6cce9b69611b3e0382b8e81de57e209d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    A ckan/templates/dataviewer/json.html
    A ckan/templates/dataviewer/pdf.html
    A ckan/templates/dataviewer/recline.html
    A ckan/templates/dataviewer/snippets/data_preview.html
    R ckan/templates/package/resource_datapreview.html
    R ckan/templates/package/resource_jsonpreview.html
    R ckan/templates/package/snippets/data_preview.html

  Log Message:
  -----------
  moved all templates to one directory


  Commit: b232d232c0102f954435213f7341f25f7b73aee2
      https://github.com/okfn/ckan/commit/b232d232c0102f954435213f7341f25f7b73aee2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    A ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/json.html
    M ckan/templates/dataviewer/pdf.html
    M ckan/templates/dataviewer/recline.html

  Log Message:
  -----------
  Base template for previews


  Commit: ca908d3463c34697db6915cce5b9f3d920bc8184
      https://github.com/okfn/ckan/commit/ca908d3463c34697db6915cce5b9f3d920bc8184
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  use generic action for previews


  Commit: 90703496302fb1738663c3f580c228258d75e0de
      https://github.com/okfn/ckan/commit/90703496302fb1738663c3f580c228258d75e0de
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  set minimum preview height


  Commit: d498cfc0c1264b23e6ea91e243c75c4f254eb539
      https://github.com/okfn/ckan/commit/d498cfc0c1264b23e6ea91e243c75c4f254eb539
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/dataviewer/snippets/data_preview.html
    A ckan/templates/dataviewer/snippets/no_preview.html

  Log Message:
  -----------
  template snippet for no preview


  Commit: 2fde258cdcae022c5022fd7f88b2cf71858aa1d2
      https://github.com/okfn/ckan/commit/2fde258cdcae022c5022fd7f88b2cf71858aa1d2
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config
    M ckan/public/base/vendor/resource.config
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/json.html
    M ckan/templates/dataviewer/pdf.html
    M ckan/templates/dataviewer/recline.html

  Log Message:
  -----------
  reorganise resources for previews


  Commit: 45d1c4b4060c331b92f58a405ffade57eda2cd4c
      https://github.com/okfn/ckan/commit/45d1c4b4060c331b92f58a405ffade57eda2cd4c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/lib/fanstatic_resources.py
    R ckan/public/base/datapreview/css/datapreview.css
    A ckan/public/base/datapreview/css/json.css
    R ckan/public/base/datapreview/css/jsonpreview.css
    A ckan/public/base/datapreview/css/pdf.css
    R ckan/public/base/datapreview/css/pdfpreview.css
    A ckan/public/base/datapreview/css/recline.css
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  cleanup css and fix js dependencies


  Commit: 69163c37f2a664227e323693a8961f9b190e61f7
      https://github.com/okfn/ckan/commit/69163c37f2a664227e323693a8961f9b190e61f7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  fix recline preview


  Commit: e39506510a4e2dbfd6116b6d7c8c3f786ba2ec3c
      https://github.com/okfn/ckan/commit/e39506510a4e2dbfd6116b6d7c8c3f786ba2ec3c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Helper function for resource urls


  Commit: 6ccd0782f10539e7526f8a86174682b5783cc353
      https://github.com/okfn/ckan/commit/6ccd0782f10539e7526f8a86174682b5783cc353
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/dataviewer-iframe' into dataviewer-iframe


  Commit: f65fe44d0ac9c5ad0af7e5948efaa612fa7fc523
      https://github.com/okfn/ckan/commit/f65fe44d0ac9c5ad0af7e5948efaa612fa7fc523
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/pdfpreview.js
    M ckan/public/base/datapreview/resource.config
    M ckan/templates/dataviewer/pdf.html

  Log Message:
  -----------
  use h.urls_for_resource


  Commit: 8ca5b502796037b1dde1a3c4d1678cd570002f01
      https://github.com/okfn/ckan/commit/8ca5b502796037b1dde1a3c4d1678cd570002f01
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    R ckan/public/base/datapreview/datapreview.js
    A ckan/public/base/datapreview/json.js
    R ckan/public/base/datapreview/jsonpreview.js
    A ckan/public/base/datapreview/pdf.js
    R ckan/public/base/datapreview/pdfpreview.js
    A ckan/public/base/datapreview/recline.js
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  rename preview js files


  Commit: 64b288125a2861796e9d1cf61b2cc34a7e00be4c
      https://github.com/okfn/ckan/commit/64b288125a2861796e9d1cf61b2cc34a7e00be4c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    R ckan/public/base/javascript/modules/dismiss-alert.js
    M ckan/templates/dataviewer/snippets/no_preview.html

  Log Message:
  -----------
  remove alert dismiss because it's already build-in


  Commit: d988baf218ba7e0d126bb6a3e903b0b4f4a38a28
      https://github.com/okfn/ckan/commit/d988baf218ba7e0d126bb6a3e903b0b4f4a38a28
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/lib/fanstatic_resources.py
    M ckan/public/base/datapreview/resource.config
    M ckan/templates/dataviewer/pdf.html

  Log Message:
  -----------
  Fix ups for dataviewer fanstatic


  Commit: bf4a1988b519e24629bcfc163ec0277450afe41d
      https://github.com/okfn/ckan/commit/bf4a1988b519e24629bcfc163ec0277450afe41d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/lib/fanstatic_resources.py
    M ckan/public/base/datapreview/resource.config
    M ckan/templates/dataviewer/pdf.html

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/dataviewer-iframe' into dataviewer-iframe


  Commit: 8b69e009648dbc172add402043f52d35c3569e9f
      https://github.com/okfn/ckan/commit/8b69e009648dbc172add402043f52d35c3569e9f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/recline.css
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/templates/dataviewer/snippets/data_preview.html

  Log Message:
  -----------
  cleanup


  Commit: 39e2380933580b11101f9deed74f447712d1bf13
      https://github.com/okfn/ckan/commit/39e2380933580b11101f9deed74f447712d1bf13
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  Fix js error in dataviewer


  Commit: bc1950520290275671d706ce0fc5760c2d0f6412
      https://github.com/okfn/ckan/commit/bc1950520290275671d706ce0fc5760c2d0f6412
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/recline.css
    M ckan/public/base/javascript/modules/data-viewer.js
    R ckan/public/base/javascript/modules/dismiss-alert.js
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/dataviewer/snippets/no_preview.html

  Log Message:
  -----------
  Merge branch 'dataviewer-iframe' of github.com:okfn/ckan into dataviewer-iframe


  Commit: 4a064655c493c626fea3b92397e300af4320fe03
      https://github.com/okfn/ckan/commit/4a064655c493c626fea3b92397e300af4320fe03
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    R ckan/templates/package/resource_pdfpreview.html

  Log Message:
  -----------
  delete moved pdfpreview


  Commit: fd7a3ccfdf0d66af75089b5229e931648f836ca6
      https://github.com/okfn/ckan/commit/fd7a3ccfdf0d66af75089b5229e931648f836ca6
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/dataviewer-iframe' into dataviewer-iframe


  Commit: 1c3666b626dcda740f0acc783598647c9cea4f2c
      https://github.com/okfn/ckan/commit/1c3666b626dcda740f0acc783598647c9cea4f2c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/less/module.less
    M ckan/templates/dataviewer/pdf.html
    M ckan/templates/dataviewer/snippets/data_preview.html

  Log Message:
  -----------
  set styles for data preview


  Commit: 3196ceea3b62d8f5892185e78ef946c76f256d9e
      https://github.com/okfn/ckan/commit/3196ceea3b62d8f5892185e78ef946c76f256d9e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  re-add pdf.js to "fix the fix"


  Commit: 7f2884b9e36e624582a0be0e18e2853dedda2b45
      https://github.com/okfn/ckan/commit/7f2884b9e36e624582a0be0e18e2853dedda2b45
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/less/module.less

  Log Message:
  -----------
  Fix height for iframes and avoid resizing.


  Commit: 8c7a6ff6799ad62731e489468330b7180a27821b
      https://github.com/okfn/ckan/commit/8c7a6ff6799ad62731e489468330b7180a27821b
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/data-viewer.js

  Log Message:
  -----------
  Use padding variable


  Commit: a67df63fae0d158ff8ae03061ea19e30cb65f0b3
      https://github.com/okfn/ckan/commit/a67df63fae0d158ff8ae03061ea19e30cb65f0b3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/recline.js
    M ckan/templates/dataviewer/recline.html

  Log Message:
  -----------
  rewrote recline to use the new module style


  Commit: fa12adec5a87567f999e93769b9460fcfa1ff071
      https://github.com/okfn/ckan/commit/fa12adec5a87567f999e93769b9460fcfa1ff071
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/recline.js

  Log Message:
  -----------
  Lighter recline init


  Commit: f296c2b707090d9ccfa02350262b2a166ad9a9b9
      https://github.com/okfn/ckan/commit/f296c2b707090d9ccfa02350262b2a166ad9a9b9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/recline.js

  Log Message:
  -----------
  re-add load embed preview


  Commit: 9e350a8054ad85558d6a33a16dd1ffdd37e1b7b5
      https://github.com/okfn/ckan/commit/9e350a8054ad85558d6a33a16dd1ffdd37e1b7b5
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/recline.js

  Log Message:
  -----------
  extend make embed link (untested)


  Commit: 2d50ff400bac0c61f813faf3f979c567e3137c19
      https://github.com/okfn/ckan/commit/2d50ff400bac0c61f813faf3f979c567e3137c19
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/json.css
    M ckan/templates/dataviewer/json.html
    M ckan/templates/dataviewer/recline.html

  Log Message:
  -----------
  Nicer loading


  Commit: 130daa396e96cd0c095d69da0feec32c2a6bef45
      https://github.com/okfn/ckan/commit/130daa396e96cd0c095d69da0feec32c2a6bef45
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-24 (Mon, 24 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/json.js

  Log Message:
  -----------
  jquery ajax instead of getJson so that we have more flexibility


  Commit: 9a0ff882cb1295b9fbf2868b322b4d86246876e8
      https://github.com/okfn/ckan/commit/9a0ff882cb1295b9fbf2868b322b4d86246876e8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/recline.js

  Log Message:
  -----------
  there should be a space before the params for anonymous functions


  Commit: b9b6c1fb64c83cb20b8dc75032927163aef54665
      https://github.com/okfn/ckan/commit/b9b6c1fb64c83cb20b8dc75032927163aef54665
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/recline.js

  Log Message:
  -----------
  $ -> jQuery


  Commit: 2101d4f3d1b215692e1cdb336c2203254b464188
      https://github.com/okfn/ckan/commit/2101d4f3d1b215692e1cdb336c2203254b464188
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/recline.js

  Log Message:
  -----------
  Use provided selector for all jQuery selections


  Commit: fd435ef34e8a459cf51dbde76b9e3eaba31a0fd6
      https://github.com/okfn/ckan/commit/fd435ef34e8a459cf51dbde76b9e3eaba31a0fd6
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    R ckan/public/base/datapreview/json.js
    R ckan/public/base/datapreview/pdf.js
    A ckan/public/base/datapreview/preview_json.js
    A ckan/public/base/datapreview/preview_pdf.js
    A ckan/public/base/datapreview/preview_recline.js
    R ckan/public/base/datapreview/recline.js
    M ckan/public/base/datapreview/resource.config

  Log Message:
  -----------
  rename preview modules fro clarity


  Commit: 3a65c07e8650ea336a1beb3e6f429a5dd03f55ed
      https://github.com/okfn/ckan/commit/3a65c07e8650ea336a1beb3e6f429a5dd03f55ed
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/resource.config
    M ckan/templates/dataviewer/pdf.html

  Log Message:
  -----------
  fix pdfjs bundling and everything


  Commit: 9449ad7e6ca85e940d0f7a83d293b1e22d14f97a
      https://github.com/okfn/ckan/commit/9449ad7e6ca85e940d0f7a83d293b1e22d14f97a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/preview_recline.js

  Log Message:
  -----------
  remove method from preview_recline that relies on underscore.js and is not needed


  Commit: da593a5a6a33616f2cd36a57cd19ef4a0ec2055a
      https://github.com/okfn/ckan/commit/da593a5a6a33616f2cd36a57cd19ef4a0ec2055a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/css/recline.css
    A ckan/public/base/datapreview/img/ajaxload-circle.gif
    M ckan/templates/dataviewer/recline.html

  Log Message:
  -----------
  use internal ajaxloader gif


  Commit: c9ddecdd46271e98e71f9c456338c21b989f84cb
      https://github.com/okfn/ckan/commit/c9ddecdd46271e98e71f9c456338c21b989f84cb
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/public/base/datapreview/vendor/pdfjs/pdf.js

  Log Message:
  -----------
  Updated to the latest pdf.js version


  Commit: 85f01812e09f7f46e822cb7365f9d97996ccc5be
      https://github.com/okfn/ckan/commit/85f01812e09f7f46e822cb7365f9d97996ccc5be
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-25 (Tue, 25 Sep 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Enable pdf preview for more datatypes as explained in Ticket #2203


  Commit: 0aa35ea77471bdbb4675be107a5c58e8e73ab8cd
      https://github.com/okfn/ckan/commit/0aa35ea77471bdbb4675be107a5c58e8e73ab8cd
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-26 (Wed, 26 Sep 2012)

  Changed paths:
    M ckan/public/base/javascript/resource.config

  Log Message:
  -----------
  don't bundle tracking so that bundling the resources for the datapreview works


  Commit: a50f9998da0534d1458db16f9d5140d396ea2750
      https://github.com/okfn/ckan/commit/a50f9998da0534d1458db16f9d5140d396ea2750
  Author: amercader <amercadero at gmail.com>
  Date:   2012-09-27 (Thu, 27 Sep 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/cli.py
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/authz.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    A ckan/templates/admin/snippets/header.html
    M ckan/templates/base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_read.html
    R ckan/templates/snippets/recline-extra-footer.html
    R ckan/templates/snippets/recline-extra-header.html
    M ckan/templates_legacy/snippets/internal-tracking.html
    M ckan/tests/wsgi_ckanclient.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_datastore.py
    M doc/apiv3.rst
    M doc/datastore.rst
    M doc/using-data-api.rst

  Log Message:
  -----------
  Merge branch 'master' into dataviewer-iframe

Conflicts:
	ckan/public/base/javascript/resource.config
	ckan/templates/package/resource_read.html


  Commit: 8b0975dca9032df151bb2b996cc59872b80642c0
      https://github.com/okfn/ckan/commit/8b0975dca9032df151bb2b996cc59872b80642c0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2012-09-28 (Fri, 28 Sep 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  style->preview_type


  Commit: 5173eca7a3af1cb44a51ce607d148dcd0a3fe813
      https://github.com/okfn/ckan/commit/5173eca7a3af1cb44a51ce607d148dcd0a3fe813
  Author: amercader <amercadero at gmail.com>
  Date:   2012-09-28 (Fri, 28 Sep 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/helpers.py
    R ckan/public/base/datapreview/css/datapreview.css
    A ckan/public/base/datapreview/css/json.css
    A ckan/public/base/datapreview/css/pdf.css
    A ckan/public/base/datapreview/css/recline.css
    R ckan/public/base/datapreview/datapreview.js
    A ckan/public/base/datapreview/img/ajaxload-circle.gif
    A ckan/public/base/datapreview/preview_json.js
    A ckan/public/base/datapreview/preview_pdf.js
    A ckan/public/base/datapreview/preview_recline.js
    M ckan/public/base/datapreview/resource.config
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
    R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.js
    A ckan/public/base/datapreview/vendor/flotr2/excanvas.js
    A ckan/public/base/datapreview/vendor/flotr2/flotr2.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/layers.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
    A ckan/public/base/datapreview/vendor/leaflet/images/layers.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
    A ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
    A ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
    A ckan/public/base/datapreview/vendor/pdfjs/pdf.js
    A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
    A ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
    A ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
    A ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    A ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
    A ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
    M ckan/public/base/datapreview/vendor/recline/recline.js
    A ckan/public/base/datapreview/vendor/webL10n/README.md
    A ckan/public/base/datapreview/vendor/webL10n/l10n.js
    A ckan/public/base/javascript/modules/data-viewer.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/module.less
    A ckan/public/base/vendor/resize.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/scripts/application.js
    A ckan/public/scripts/outside.js
    A ckan/public/scripts/vendor/resize/resize.js
    M ckan/templates/base.html
    A ckan/templates/dataviewer/base.html
    A ckan/templates/dataviewer/json.html
    A ckan/templates/dataviewer/pdf.html
    A ckan/templates/dataviewer/recline.html
    A ckan/templates/dataviewer/snippets/data_preview.html
    A ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/package/resource_read.html
    M ckan/templates_legacy/package/resource_read.html
    A ckan/templates_legacy/package/snippets/data_preview.html
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'dataviewer-iframe'


Compare: https://github.com/okfn/ckan/compare/0e9ff2d7b1b2...5173eca7a3af

More information about the ckan-changes mailing list