[ckan-changes] [okfn/ckan] 5f5e91: [#2648] Add jQuery.fileupload plugin

Mon Jul 16 11:31:05 UTC 2012

  Branch: refs/heads/2375-demo-theme-development
  Home:   https://github.com/okfn/ckan
  Commit: 5f5e911bc9692082b95bb147a94c681cc200889e
      https://github.com/okfn/ckan/commit/5f5e911bc9692082b95bb147a94c681cc200889e
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload-ui.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload.js
    A ckan/public/base/vendor/jquery-fileupload/jquery.iframe-transport.js
    A ckan/public/base/vendor/jquery.ui.widget.js

  Log Message:
  -----------
  [#2648] Add jQuery.fileupload plugin

  Commit: 5b228283b994d6e52d15b85f37bc669513141ac6
      https://github.com/okfn/ckan/commit/5b228283b994d6e52d15b85f37bc669513141ac6
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

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

  Log Message:
  -----------
  [#2648] Localise new resource type labels

  Commit: 9f9643d5b65de39422cd05e9a74f58308dd929d8
      https://github.com/okfn/ckan/commit/9f9643d5b65de39422cd05e9a74f58308dd929d8
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    A ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/less/forms.less
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#2648] Add field for uploading new resources

  Commit: 1bae4d9375dd148200de756097c677bcf201472d
      https://github.com/okfn/ckan/commit/1bae4d9375dd148200de756097c677bcf201472d
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    A ckan/public/base/javascript/plugins/jquery.inherit.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.js

  Log Message:
  -----------
  [#2648] Add jQuery.inherit as a helper for simple inheritance

  Commit: 0e41c653381ac87b75357997692b3c089c131bbb
      https://github.com/okfn/ckan/commit/0e41c653381ac87b75357997692b3c089c131bbb
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/sandbox.js
    M ckan/public/base/test/spec/sandbox.spec.js

  Log Message:
  -----------
  [#2648] Update ckan.sandbox() and unit tests

Sandbox now has nothing but helper functions.

  Commit: b764bbf8568b43f61ed37396d68641896d86d362
      https://github.com/okfn/ckan/commit/b764bbf8568b43f61ed37396d68641896d86d362
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M ckan/public/base/test/vendor/sinon.js

  Log Message:
  -----------
  [#2648] Update sinon to 1.4.0

  Commit: 6d101d4328c62a767af901e9121afac24392a4f5
      https://github.com/okfn/ckan/commit/6d101d4328c62a767af901e9121afac24392a4f5
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#2648] Move sinon above mocha

This fixes a bug in sinon that misinterprets a stubbed process object
created by mocha for the node environment.

  Commit: f4ead2014360b901e149bb65c18d62abd9c1a4b8
      https://github.com/okfn/ckan/commit/f4ead2014360b901e149bb65c18d62abd9c1a4b8
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js
    M ckan/public/base/test/spec/module.spec.js

  Log Message:
  -----------
  [#2648] Refactor ckan.module() to create instances

This is much more efficient than creating new objects each time and
also allows setup and teardown functionality.

  Commit: a5d237cca264df0e87c0d9f510c984785375cd41
      https://github.com/okfn/ckan/commit/a5d237cca264df0e87c0d9f510c984785375cd41
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2648] Update the scripts to include new modules

  Commit: d7c8193e12bea90dc921be65a400b6aef05336c0
      https://github.com/okfn/ckan/commit/d7c8193e12bea90dc921be65a400b6aef05336c0
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/select-switch.js
    M ckan/public/base/javascript/modules/slug-preview.js

  Log Message:
  -----------
  [#2648] Update modules to new syntax

  Commit: ccaa43133ee16411691bda9d115b967e645b239e
      https://github.com/okfn/ckan/commit/ccaa43133ee16411691bda9d115b967e645b239e
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    A ckan/public/base/javascript/client.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/client.spec.js

  Log Message:
  -----------
  [#2648] Add a client object to talk to the API

This is available to modules on the sandbox object and should
be used in preference to jQuery.ajax().

  Commit: a39b45560bd554190a73d37f2ddf90b0b905f4c0
      https://github.com/okfn/ckan/commit/a39b45560bd554190a73d37f2ddf90b0b905f4c0
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    M ckan/templates/group/pages/form_page.html
    M ckan/templates/package/pages/form_page.html
    M ckan/templates/package/search.html
    M ckan/templates/page.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2648] Add scripts globally

  Commit: 4bf1fe09170ddca6a1ab67e62b7ec1134b18817d
      https://github.com/okfn/ckan/commit/4bf1fe09170ddca6a1ab67e62b7ec1134b18817d
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js

  Log Message:
  -----------
  [#2648] Add Bootstrap jQuery plugins

  Commit: e28011ead8c04e73aa3897e068589d2de0cc2649
      https://github.com/okfn/ckan/commit/e28011ead8c04e73aa3897e068589d2de0cc2649
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-11 (Wed, 11 Jul 2012)

  Changed paths:
    A ckan/public/base/javascript/notify.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/notify.spec.js

  Log Message:
  -----------
  [#2648] Add a ckan.notify() function

This can be used to display alert messages to the user and is made available
to modules via the sandbox.notify() method.

Usage:

  sandbox.notify('An error occurred', 'unable to download file');

  Commit: fa1b1e9b90a59d902bf0f8420a9af33baf63b087
      https://github.com/okfn/ckan/commit/fa1b1e9b90a59d902bf0f8420a9af33baf63b087
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-upload-field.js

  Log Message:
  -----------
  [#2648] Re-jig resource upload module to use new syntax

  Commit: 5302ce9ce6bc1bf060ad16bd83632b02dd55bcd1
      https://github.com/okfn/ckan/commit/5302ce9ce6bc1bf060ad16bd83632b02dd55bcd1
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2648] sort quotes on script include

  Commit: 706d34439eaf4991219c2b8a00c1a2ba3a1dd0f5
      https://github.com/okfn/ckan/commit/706d34439eaf4991219c2b8a00c1a2ba3a1dd0f5
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2648] fix template comment

  Commit: 6419e2867248bb4be1c7fa97ced049571f216ee6
      https://github.com/okfn/ckan/commit/6419e2867248bb4be1c7fa97ced049571f216ee6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#2648] fix multiple script issue

  Commit: f7be6f09fb2abad28721fe16ed35a92b7a6f3973
      https://github.com/okfn/ckan/commit/f7be6f09fb2abad28721fe16ed35a92b7a6f3973
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    A ckan/public/base/javascript/plugins/jquery.proxy-all.js
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.js
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2648] Add a jQuery.proxyAll() helper function

  Commit: a1712a8f3de3c214d2ae9def2cc0cd6666951450
      https://github.com/okfn/ckan/commit/a1712a8f3de3c214d2ae9def2cc0cd6666951450
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js
    M ckan/public/base/test/spec/module.spec.js

  Log Message:
  -----------
  [#2648] Update ckan.module() to accept functions

  Commit: a5e58413a9cb0620b5ca1be6cc0e40a1ef3b10f3
      https://github.com/okfn/ckan/commit/a5e58413a9cb0620b5ca1be6cc0e40a1ef3b10f3
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js

  Log Message:
  -----------
  [#2648] Begin the $ purge and replace occurrences with jQuery

  Commit: 70ed6ed691645b64c313cc345cc60d3b240c97c7
      https://github.com/okfn/ckan/commit/70ed6ed691645b64c313cc345cc60d3b240c97c7
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    A ckan/public/base/javascript/plugins/jquery.date-helpers.js

  Log Message:
  -----------
  [#2648] Add jQuery.date helper methods

  Commit: 5ab882ada36b6a7e0b4b9445628c93c336a99002
      https://github.com/okfn/ckan/commit/5ab882ada36b6a7e0b4b9445628c93c336a99002
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/client.js

  Log Message:
  -----------
  [#2648] Add client.getStorageMetadata()

  Commit: 277d8b2d5edd6a4ba36fc9ff1cc3650f9d399efc
      https://github.com/okfn/ckan/commit/277d8b2d5edd6a4ba36fc9ff1cc3650f9d399efc
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#2648] Fix duplicated script tags

  Commit: 1f986fdf59ddf91d535cc56e0732b210d069851a
      https://github.com/okfn/ckan/commit/1f986fdf59ddf91d535cc56e0732b210d069851a
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-upload-field.js

  Log Message:
  -----------
  [#2648] Get file upload working whoop!

  Commit: 43ff8701db6e46b51d48747b2e55501c64fe09b4
      https://github.com/okfn/ckan/commit/43ff8701db6e46b51d48747b2e55501c64fe09b4
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2648] Add date helpers to scripts

  Commit: 2f0993c5d6a63cc97bb2ffcfa2d3a8792c8ff31b
      https://github.com/okfn/ckan/commit/2f0993c5d6a63cc97bb2ffcfa2d3a8792c8ff31b
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-upload-field.js

  Log Message:
  -----------
  [#2648] Only start upload when a file has been selected

  Commit: c2f739aae965897159ef80391a06ad4902fa4ed1
      https://github.com/okfn/ckan/commit/c2f739aae965897159ef80391a06ad4902fa4ed1
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#2648] Add the additional resource fields to the form

  Commit: a92e17b29a98b5b1e3418a7698a3c64b94191da0
      https://github.com/okfn/ckan/commit/a92e17b29a98b5b1e3418a7698a3c64b94191da0
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js

  Log Message:
  -----------
  [#2648] Rename Module#$()

  Commit: f331b59bfdf803f9a2e4f16ea0a79f3e21f8b060
      https://github.com/okfn/ckan/commit/f331b59bfdf803f9a2e4f16ea0a79f3e21f8b060
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/client.js

  Log Message:
  -----------
  [#2648] Client now guesses format and filename

  Commit: 7e094fc376c0065667664868dc6b0bdf5986ef55
      https://github.com/okfn/ckan/commit/7e094fc376c0065667664868dc6b0bdf5986ef55
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-upload-field.js

  Log Message:
  -----------
  [#2648] File upload now has radio input

  Commit: dca8d5f67e89499d71085854d5ffe179a003337e
      https://github.com/okfn/ckan/commit/dca8d5f67e89499d71085854d5ffe179a003337e
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    A ckan/public/base/javascript/modules/resource-form.js

  Log Message:
  -----------
  [#2648] Load the newly uploaded file into the form

  Commit: 6262f722e559124bb260e180a1ef357cd8b270fa
      https://github.com/okfn/ckan/commit/6262f722e559124bb260e180a1ef357cd8b270fa
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    A ckan/public/base/images/loading-spinner.gif

  Log Message:
  -----------
  [#2648] Add a loading spinner image

  Commit: 60d7dd0db3ea32b3330352c5e7c47d77ed24f2b7
      https://github.com/okfn/ckan/commit/60d7dd0db3ea32b3330352c5e7c47d77ed24f2b7
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  [#2648] Show a loading spinner while uploading a file

  Commit: dc0f874a7864d1544a3a8468093aaaa387d5f02c
      https://github.com/okfn/ckan/commit/dc0f874a7864d1544a3a8468093aaaa387d5f02c
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/logic/auth/get.py
    M ckan/public/base/css/main.css
    M ckan/public/base/datapreview/css/datapreview.css
    R ckan/public/base/datapreview/css/datapreview.table-view.css
    R ckan/public/base/datapreview/css/leaflet.css
    R ckan/public/base/datapreview/css/leaflet.ie.css
    R ckan/public/base/datapreview/css/recline.graph.css
    R ckan/public/base/datapreview/css/recline.grid.css
    R ckan/public/base/datapreview/css/recline.map.css
    R ckan/public/base/datapreview/css/slick.columnpicker.css
    R ckan/public/base/datapreview/css/slick.grid.css
    A ckan/public/base/datapreview/datapreview.js
    R ckan/public/base/datapreview/images/icon-sprite.png
    R ckan/public/base/datapreview/images/leaflet/layers.png
    R ckan/public/base/datapreview/images/leaflet/marker-shadow.png
    R ckan/public/base/datapreview/images/leaflet/marker.png
    R ckan/public/base/datapreview/images/leaflet/popup-close.png
    R ckan/public/base/datapreview/images/leaflet/zoom-in.png
    R ckan/public/base/datapreview/images/leaflet/zoom-out.png
    R ckan/public/base/datapreview/images/loading.gif
    R ckan/public/base/datapreview/images/recline/edit-map.png
    R ckan/public/base/datapreview/images/recline/menu-dropdown.png
    R ckan/public/base/datapreview/images/recline/small-spinner.gif
    R ckan/public/base/datapreview/images/slickgrid/actions.gif
    R ckan/public/base/datapreview/images/slickgrid/ajax-loader-small.gif
    R ckan/public/base/datapreview/images/slickgrid/arrow_redo.png
    R ckan/public/base/datapreview/images/slickgrid/arrow_right_peppermint.png
    R ckan/public/base/datapreview/images/slickgrid/arrow_right_spearmint.png
    R ckan/public/base/datapreview/images/slickgrid/arrow_undo.png
    R ckan/public/base/datapreview/images/slickgrid/bullet_blue.png
    R ckan/public/base/datapreview/images/slickgrid/bullet_star.png
    R ckan/public/base/datapreview/images/slickgrid/bullet_toggle_minus.png
    R ckan/public/base/datapreview/images/slickgrid/bullet_toggle_plus.png
    R ckan/public/base/datapreview/images/slickgrid/calendar.gif
    R ckan/public/base/datapreview/images/slickgrid/collapse.gif
    R ckan/public/base/datapreview/images/slickgrid/comment_yellow.gif
    R ckan/public/base/datapreview/images/slickgrid/down.gif
    R ckan/public/base/datapreview/images/slickgrid/drag-handle.png
    R ckan/public/base/datapreview/images/slickgrid/editor-helper-bg.gif
    R ckan/public/base/datapreview/images/slickgrid/expand.gif
    R ckan/public/base/datapreview/images/slickgrid/header-bg.gif
    R ckan/public/base/datapreview/images/slickgrid/header-columns-bg.gif
    R ckan/public/base/datapreview/images/slickgrid/header-columns-over-bg.gif
    R ckan/public/base/datapreview/images/slickgrid/help.png
    R ckan/public/base/datapreview/images/slickgrid/info.gif
    R ckan/public/base/datapreview/images/slickgrid/listview.gif
    R ckan/public/base/datapreview/images/slickgrid/pencil.gif
    R ckan/public/base/datapreview/images/slickgrid/row-over-bg.gif
    R ckan/public/base/datapreview/images/slickgrid/sort-asc.gif
    R ckan/public/base/datapreview/images/slickgrid/sort-asc.png
    R ckan/public/base/datapreview/images/slickgrid/sort-desc.gif
    R ckan/public/base/datapreview/images/slickgrid/sort-desc.png
    R ckan/public/base/datapreview/images/slickgrid/stripes.png
    R ckan/public/base/datapreview/images/slickgrid/tag_red.png
    R ckan/public/base/datapreview/images/slickgrid/tick.png
    R ckan/public/base/datapreview/images/slickgrid/user_identity.gif
    R ckan/public/base/datapreview/images/slickgrid/user_identity_plus.gif
    R ckan/public/base/datapreview/javascript/datapreview.js
    R ckan/public/base/datapreview/javascript/table-view-template.js
    R ckan/public/base/datapreview/javascript/table-view.js
    R ckan/public/base/datapreview/javascript/table-view.ui.js
    R ckan/public/base/datapreview/javascript/vendor/backbone.js
    R ckan/public/base/datapreview/javascript/vendor/jquery.event.drag.js
    R ckan/public/base/datapreview/javascript/vendor/jquery.flot.js
    R ckan/public/base/datapreview/javascript/vendor/jquery.mustache.js
    R ckan/public/base/datapreview/javascript/vendor/leaflet.js
    R ckan/public/base/datapreview/javascript/vendor/recline.js
    R ckan/public/base/datapreview/javascript/vendor/slick.columnpicker.js
    R ckan/public/base/datapreview/javascript/vendor/slick.grid.js
    R ckan/public/base/datapreview/javascript/vendor/underscore.js
    A ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.js
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings-white.png
    A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings.png
    A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.js
    A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.js
    A ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.js
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/layers.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker-shadow.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/popup-close.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-in.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-out.png
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.css
    A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.js
    A ckan/public/base/datapreview/vendor/moment/1.6.2/moment.js
    A ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.js
    A ckan/public/base/datapreview/vendor/recline/css/recline.css
    A ckan/public/base/datapreview/vendor/recline/recline.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
    A ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/forms.less
    R ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph.css
    R ckan/public/scripts/vendor/recline/css/grid.css
    R ckan/public/scripts/vendor/recline/css/images/edit-map.png
    R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
    R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
    R ckan/public/scripts/vendor/recline/css/map.css
    R ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/group/new_group_form.html
    R ckan/templates/group/pages/form.html
    M ckan/templates/group/read.html
    A ckan/templates/group/snippets/group_form.html
    A ckan/templates/package/confirm_delete.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/new_resource.html
    R ckan/templates/package/pages/form.html
    M ckan/templates/package/pages/form_page.html
    M ckan/templates/package/read.html
    A ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    A ckan/templates/package/snippets/data-api-button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    A ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/snippets/debug.html
    M ckan/templates/snippets/package_list.html
    M ckan/tests/lib/test_helpers.py
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch 2375-demo-theme-development into 2648-demo-file-upload

Conflicts:
	ckan/templates/package/snippets/resource_form.html

Compare: https://github.com/okfn/ckan/compare/03e46f4c38ef...dc0f874a7864