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

GitHub noreply at github.com
Tue Jul 17 14:58:17 UTC 2012


  Branch: refs/heads/2375-demo-theme-stable
  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: 4439715ff960b49c1d746747156f60624c65e924
      https://github.com/okfn/ckan/commit/4439715ff960b49c1d746747156f60624c65e924
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  [#2375] Update CSS for production


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

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  Update front-end docs


  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: a3d1fe76aa6752246b0abf01214c7a6a9615c73b
      https://github.com/okfn/ckan/commit/a3d1fe76aa6752246b0abf01214c7a6a9615c73b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-12 (Thu, 12 Jul 2012)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  [#2375] don't crash and burn if groups do not exist


  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: d11c94b8c66eb62db54bca81df15a06f9a8e3ccc
      https://github.com/okfn/ckan/commit/d11c94b8c66eb62db54bca81df15a06f9a8e3ccc
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#2375] allow snippet api to accept params


  Commit: 25305c5c1509f4156eef0e7d10add2343c97f3b5
      https://github.com/okfn/ckan/commit/25305c5c1509f4156eef0e7d10add2343c97f3b5
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

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

  Log Message:
  -----------
  [#2375] translate download button


  Commit: 4e1524e5afa1fdd4247c3c6a3306c983f4859f66
      https://github.com/okfn/ckan/commit/4e1524e5afa1fdd4247c3c6a3306c983f4859f66
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html
    A ckan/templates/package/snippets/data-api-button.html

  Log Message:
  -----------
  [#2375] datastore data api button cleanups


  Commit: ec6a185d0fbc8d79a5ce7d8236ceb73cd82880fa
      https://github.com/okfn/ckan/commit/ec6a185d0fbc8d79a5ce7d8236ceb73cd82880fa
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  [#2589] hide draft datasets from non creators


  Commit: b7c59093050af1acbfb369e5250a885a4df2447d
      https://github.com/okfn/ckan/commit/b7c59093050af1acbfb369e5250a885a4df2447d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/logic/auth/get.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#2589] draft dataset auth bugfix


  Commit: d62bc5c5e6617cf108b725dea814f366e613f443
      https://github.com/okfn/ckan/commit/d62bc5c5e6617cf108b725dea814f366e613f443
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#2375] remove prints added in error


  Commit: 6a8e74d0c15763ee41033f6e455322d64f84b955
      https://github.com/okfn/ckan/commit/6a8e74d0c15763ee41033f6e455322d64f84b955
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/templates/package/read.html
    M ckan/templates/snippets/package_list.html

  Log Message:
  -----------
  [#2375] add [Draft] to datasets not completed


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

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

  Log Message:
  -----------
  [#2375] White space fixes


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

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

  Log Message:
  -----------
  [#2667] Add "Edit resource" button with permission check


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

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

  Log Message:
  -----------
  [#2667] Add missing localisation to package_form.html


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

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

  Log Message:
  -----------
  [#2667] Add blocks to resource_form.html


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

  Changed paths:
    A ckan/templates/package/snippets/resource_edit_form.html

  Log Message:
  -----------
  [#2667] Add a new resource_edit_form.html snippet


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

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

  Log Message:
  -----------
  [#2667] Made the resource info module shallow


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

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

  Log Message:
  -----------
  [#2667] Add resource edit form

This still requires the "data" and "errors" variables to be passed
into the template.


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

  Changed paths:
    A ckan/templates/package/base_form_page.html
    R ckan/templates/package/pages/form_page.html

  Log Message:
  -----------
  [#2667] Move generic form template into base package directory

This keeps the folder hierarchy simple.


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

  Changed paths:
    M ckan/templates/package/edit.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/related/edit.html
    M ckan/templates/related/new.html

  Log Message:
  -----------
  [#2667] Update package templates to use new form template


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

  Changed paths:
    A ckan/templates/group/base_form_page.html
    R ckan/templates/group/pages/form_page.html

  Log Message:
  -----------
  [#2667] Move the group form page out of the pages directory


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

  Changed paths:
    M ckan/templates/group/edit.html
    M ckan/templates/group/new.html

  Log Message:
  -----------
  [#2667] Update group forms to use renamed base template


  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


  Commit: a7dd613bd670c36f60fe4cf13d21b013238e1675
      https://github.com/okfn/ckan/commit/a7dd613bd670c36f60fe4cf13d21b013238e1675
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M bin/less

  Log Message:
  -----------
  [#2375] make bin/less path agnostic


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

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  [#2375] Update CSS for file uploads


  Commit: 4166adfbd6161a9277dcafd172f3c96f02137c31
      https://github.com/okfn/ckan/commit/4166adfbd6161a9277dcafd172f3c96f02137c31
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2375] fix add resource stages bar


  Commit: 14630196dc4488c773475f1e89f28bb0915ea169
      https://github.com/okfn/ckan/commit/14630196dc4488c773475f1e89f28bb0915ea169
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/public/base/css/main.css
    A ckan/public/base/images/loading-spinner.gif
    A ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/resource-form.js
    A 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
    A ckan/public/base/javascript/notify.js
    A ckan/public/base/javascript/plugins/jquery.date-helpers.js
    A ckan/public/base/javascript/plugins/jquery.inherit.js
    A ckan/public/base/javascript/plugins/jquery.proxy-all.js
    M ckan/public/base/javascript/sandbox.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/notify.spec.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/public/base/test/vendor/sinon.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    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
    M ckan/templates/base.html
    M ckan/templates/group/pages/form_page.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/pages/form_page.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/page.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of github.com:okfn/ckan into 2375-demo-theme-development


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

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

  Log Message:
  -----------
  [#2375] Add missing data attribute that was lost in merge


  Commit: 319fb436e0ea72fa4e9d0d3f6f8aaca13a681436
      https://github.com/okfn/ckan/commit/319fb436e0ea72fa4e9d0d3f6f8aaca13a681436
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2375] actually show the metadata in edit metadataform


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

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

  Log Message:
  -----------
  [#2648] Add SITE_ROOT and SITE_LOCALE constants to ckan


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

  Changed paths:
    M ckan/templates/base.html

  Log Message:
  -----------
  [#2648] Embed the site root in the body element


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

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

  Log Message:
  -----------
  [#2648] Add url helper to ckan.url()


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

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

  Log Message:
  -----------
  [#2648] Add domain to local urls


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

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

  Log Message:
  -----------
  [#2648] Update new_resource.html to use {% snippet %}


  Commit: 1952700bcd90b1d9932ee831663856883e28a8e3
      https://github.com/okfn/ckan/commit/1952700bcd90b1d9932ee831663856883e28a8e3
  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/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#2648] Revert change to resource_source

This was actually the correct input.


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

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

  Log Message:
  -----------
  [#2648] Update form fields correctly


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

  Changed paths:
    M bin/less
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of github.com:okfn/ckan into 2375-demo-theme-development


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

  Changed paths:
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/resource-form.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/templates/base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/snippets/resource_form.html

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


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

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

  Log Message:
  -----------
  [#2648] Documented the resource JavaScript modules


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

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

  Log Message:
  -----------
  [#2648] Add support for different environments


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

  Changed paths:
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/ckan.spec.js
    A ckan/public/base/test/spec/modules/resource-form.spec.js

  Log Message:
  -----------
  [#2648] Add tests for ckan.url()


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

  Changed paths:
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/notify.spec.js

  Log Message:
  -----------
  [#2648] Add jslint globals to suites


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

  Changed paths:
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/resource-form.spec.js

  Log Message:
  -----------
  [#2648] Add tests for the resource-form module


  Commit: a98a77353223ca558d43cc612b34727eb080f6a1
      https://github.com/okfn/ckan/commit/a98a77353223ca558d43cc612b34727eb080f6a1
  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] Now merging upload form options


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

  Changed paths:
    M ckan/public/base/test/spec/modules/resource-form.spec.js

  Log Message:
  -----------
  [#2648] Clean up resource-form spec


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

  Changed paths:
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.js

  Log Message:
  -----------
  [#2648] Add tests for resource-upload-field module


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

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

  Log Message:
  -----------
  [#2648] Add tests for jQuery.date helpers


  Commit: cd204c92bf74bc020fd71a0b788ae81947da06a0
      https://github.com/okfn/ckan/commit/cd204c92bf74bc020fd71a0b788ae81947da06a0
  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/test/spec/modules/resource-upload-field.spec.js

  Log Message:
  -----------
  [#2375] Improve file upload error messages

The jQuery.fileupload plugin will report a success if Google returns
a 404. We now check to see if there is a result object on the data
before assuming success.


  Commit: d0a8dabc5e16c972f6de1f586c87892b1d0b83b5
      https://github.com/okfn/ckan/commit/d0a8dabc5e16c972f6de1f586c87892b1d0b83b5
  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/test/spec/modules/resource-upload-field.spec.js

  Log Message:
  -----------
  [#2375] Also handle situations where an upload has an error key


  Commit: 79e98c2ad9fb2a88ab8e6c35224b7ccf1764591c
      https://github.com/okfn/ckan/commit/79e98c2ad9fb2a88ab8e6c35224b7ccf1764591c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    A ckan/templates/group/confirm_delete.html
    M ckan/templates/group/new_group_form.html
    M ckan/templates/group/snippets/group_form.html

  Log Message:
  -----------
  [#2680] delete group via group edit


  Commit: 49f6a2aaa30a51dad76f86f97325f10e99c6c6d6
      https://github.com/okfn/ckan/commit/49f6a2aaa30a51dad76f86f97325f10e99c6c6d6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/resource-form.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/plugins/jquery.date-helpers.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/ckan.spec.js
    M ckan/public/base/test/spec/client.spec.js
    A ckan/public/base/test/spec/modules/resource-form.spec.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/spec/notify.spec.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.js

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of github.com:okfn/ckan into 2375-demo-theme-development


  Commit: 7aec1e89c2e6a292b443bdf40214b062b160f9b3
      https://github.com/okfn/ckan/commit/7aec1e89c2e6a292b443bdf40214b062b160f9b3
  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:
  -----------
  [#2375] Check upload result object is a plain object


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

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

  Log Message:
  -----------
  [#2375] Fixed a couple of JavaScript errors


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

  Changed paths:
    A ckan/templates/related/base_form_page.html
    M ckan/templates/related/edit.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/new.html
    R ckan/templates/related/pages/form.html
    R ckan/templates/related/pages/form_page.html
    A ckan/templates/related/snippets/related_form.html

  Log Message:
  -----------
  [#2375] Remove pages directory from templates/related

Moved page_form.html to base_form_page.html and form.html to
snippets/related_form.html


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

  Changed paths:
    M ckan/templates/related/edit_form.html

  Log Message:
  -----------
  [#2675] Update related edit form button text

Seems to have been a regression when the actions were merged.


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

  Changed paths:
    M ckan/templates/related/snippets/related_item.html

  Log Message:
  -----------
  [#2677] Viewing a related item now opens in a new tab


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

  Changed paths:
    M bin/less
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/loading-spinner.gif
    A ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/resource-form.js
    A 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
    A ckan/public/base/javascript/notify.js
    A ckan/public/base/javascript/plugins/jquery.date-helpers.js
    A ckan/public/base/javascript/plugins/jquery.inherit.js
    A ckan/public/base/javascript/plugins/jquery.proxy-all.js
    M ckan/public/base/javascript/sandbox.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/ckan.spec.js
    A ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/resource-form.spec.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public/base/test/spec/notify.spec.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/public/base/test/vendor/sinon.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    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
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-12T17:07:33.684Z/screen-shot-2012-07-12-at-15-43-37-png
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-12T17:10:51.259Z/screen-shot-2012-07-12-at-15-43-37.png
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-12T17:18:52.211Z/screen-shot-2012-07-12-at-15-43-37.png
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:42:47.748Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:43:12.835Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:43:17.944Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:53:45.807Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:55:19.010Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:56:55.845Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:59:21.721Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:59:59.574Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:03:06.850Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:03:34.899Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:39:25.046Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:45:01.657Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:45:59.970Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:47:34.420Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:47:48.684Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:48:29.309Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:57:02.711Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:58:50.146Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T11:09:58.873Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T11:16:28.647Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:40:25.644Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:40:52.249Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:41:20.444Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:42:04.963Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:44:17.338Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:44:39.412Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:22:38.180Z/490c001-rolls-side.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:37:42.171Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:37:49.668Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:37:57.341Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:38:11.855Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:40:11.430Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:43:32.051Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:52:52.198Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:58:11.079Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T16:45:25.251Z/cat.jpg
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/persisted_state.json
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/screen-shot-2012-07-12-at-15-43-37-png
    A ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/tester
    A ckan/public/uploads/pairtree_version0_1
    M ckan/templates/base.html
    M ckan/templates/group/base_form_page.html
    A ckan/templates/group/confirm_delete.html
    M ckan/templates/group/new_group_form.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/page.html
    A ckan/templates/related/base_form_page.html
    M ckan/templates/related/edit.html
    M ckan/templates/related/edit_form.html
    R ckan/templates/related/pages/form.html
    R ckan/templates/related/pages/form_page.html
    A ckan/templates/related/snippets/related_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/scripts.html
    A ckan/vendor/backbone/0.5.1/backbone.js
    A ckan/vendor/bootstrap/2.0.3/bootstrap.min.js
    A ckan/vendor/flot/0.7/jquery.flot.js
    A ckan/vendor/html5shiv/html5.js
    A ckan/vendor/jquery.chosen/0.9.7/chosen.js
    A ckan/vendor/jquery.cookie/jquery.cookie.min.js
    A ckan/vendor/jquery.event.drag/2.0/jquery.event.drag.min.js
    A ckan/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.css
    A ckan/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.js
    A ckan/vendor/jquery.fileupload/20110801/jquery.fileupload.js
    A ckan/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js
    A ckan/vendor/jquery.mustache/jquery.mustache.js
    A ckan/vendor/jquery.placeholder/jquery.placeholder.js
    A ckan/vendor/jquery.tmpl/beta1/jquery.tmpl.js
    A ckan/vendor/jquery/1.7.1/jquery.js
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_0_000_40x100.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_100_000_40x100.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_75_ffffff_40x100.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_100_f0f0f0_1x400.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_65_ffffff_1x400.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_75_dadada_1x400.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_95_fef1ec_1x400.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_highlight-soft_100_f0f0f0_1x100.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_000_256x240.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_222222_256x240.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_2e83ff_256x240.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_444444_256x240.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_888888_256x240.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_b22_256x240.png
    A ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_cd0a0a_256x240.png
    A ckan/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css
    A ckan/vendor/jqueryui/1.8.14/jquery-ui.min.js
    A ckan/vendor/json2.js
    A ckan/vendor/leaflet/0.3.1/images/layers.png
    A ckan/vendor/leaflet/0.3.1/images/marker-shadow.png
    A ckan/vendor/leaflet/0.3.1/images/marker.png
    A ckan/vendor/leaflet/0.3.1/images/popup-close.png
    A ckan/vendor/leaflet/0.3.1/images/zoom-in.png
    A ckan/vendor/leaflet/0.3.1/images/zoom-out.png
    A ckan/vendor/leaflet/0.3.1/leaflet.css
    A ckan/vendor/leaflet/0.3.1/leaflet.ie.css
    A ckan/vendor/leaflet/0.3.1/leaflet.js
    A ckan/vendor/modernizr/1.7/modernizr.min.js
    A ckan/vendor/openid-selector/css/openid.css
    A ckan/vendor/openid-selector/images/aol.gif
    A ckan/vendor/openid-selector/images/blogger.ico
    A ckan/vendor/openid-selector/images/claimid.ico
    A ckan/vendor/openid-selector/images/facebook.gif
    A ckan/vendor/openid-selector/images/flickr.ico
    A ckan/vendor/openid-selector/images/google.gif
    A ckan/vendor/openid-selector/images/livejournal.ico
    A ckan/vendor/openid-selector/images/myopenid.ico
    A ckan/vendor/openid-selector/images/openid-inputicon.gif
    A ckan/vendor/openid-selector/images/openid.gif
    A ckan/vendor/openid-selector/images/technorati.ico
    A ckan/vendor/openid-selector/images/verisign.gif
    A ckan/vendor/openid-selector/images/verisign.ico
    A ckan/vendor/openid-selector/images/vidoop.ico
    A ckan/vendor/openid-selector/images/wordpress.ico
    A ckan/vendor/openid-selector/images/yahoo.gif
    A ckan/vendor/openid-selector/js/jquery-1.2.6.min.js
    A ckan/vendor/openid-selector/js/openid-jquery.js
    A ckan/vendor/recline/css/data-explorer.css
    A ckan/vendor/recline/css/graph.css
    A ckan/vendor/recline/css/grid.css
    A ckan/vendor/recline/css/images/edit-map.png
    A ckan/vendor/recline/css/images/menu-dropdown.png
    A ckan/vendor/recline/css/images/small-spinner.gif
    A ckan/vendor/recline/css/map.css
    A ckan/vendor/recline/recline.js
    A ckan/vendor/slickgrid/images/actions.gif
    A ckan/vendor/slickgrid/images/ajax-loader-small.gif
    A ckan/vendor/slickgrid/images/arrow_redo.png
    A ckan/vendor/slickgrid/images/arrow_right_peppermint.png
    A ckan/vendor/slickgrid/images/arrow_right_spearmint.png
    A ckan/vendor/slickgrid/images/arrow_undo.png
    A ckan/vendor/slickgrid/images/bullet_blue.png
    A ckan/vendor/slickgrid/images/bullet_star.png
    A ckan/vendor/slickgrid/images/bullet_toggle_minus.png
    A ckan/vendor/slickgrid/images/bullet_toggle_plus.png
    A ckan/vendor/slickgrid/images/calendar.gif
    A ckan/vendor/slickgrid/images/collapse.gif
    A ckan/vendor/slickgrid/images/comment_yellow.gif
    A ckan/vendor/slickgrid/images/down.gif
    A ckan/vendor/slickgrid/images/drag-handle.png
    A ckan/vendor/slickgrid/images/editor-helper-bg.gif
    A ckan/vendor/slickgrid/images/expand.gif
    A ckan/vendor/slickgrid/images/header-bg.gif
    A ckan/vendor/slickgrid/images/header-columns-bg.gif
    A ckan/vendor/slickgrid/images/header-columns-over-bg.gif
    A ckan/vendor/slickgrid/images/help.png
    A ckan/vendor/slickgrid/images/info.gif
    A ckan/vendor/slickgrid/images/listview.gif
    A ckan/vendor/slickgrid/images/pencil.gif
    A ckan/vendor/slickgrid/images/row-over-bg.gif
    A ckan/vendor/slickgrid/images/sort-asc.gif
    A ckan/vendor/slickgrid/images/sort-asc.png
    A ckan/vendor/slickgrid/images/sort-desc.gif
    A ckan/vendor/slickgrid/images/sort-desc.png
    A ckan/vendor/slickgrid/images/stripes.png
    A ckan/vendor/slickgrid/images/tag_red.png
    A ckan/vendor/slickgrid/images/tick.png
    A ckan/vendor/slickgrid/images/user_identity.gif
    A ckan/vendor/slickgrid/images/user_identity_plus.gif
    A ckan/vendor/slickgrid/slick.columnpicker.css
    A ckan/vendor/slickgrid/slick.columnpicker.js
    A ckan/vendor/slickgrid/slick.grid.css
    A ckan/vendor/slickgrid/slick.grid.js
    A ckan/vendor/underscore/1.1.6/underscore.js

  Log Message:
  -----------
  Merge branch 2375-demo-theme-development into 2667-edit-resource-form

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


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

  Changed paths:
    R ckan/vendor/backbone/0.5.1/backbone.js
    R ckan/vendor/bootstrap/2.0.3/bootstrap.min.js
    R ckan/vendor/flot/0.7/jquery.flot.js
    R ckan/vendor/html5shiv/html5.js
    R ckan/vendor/jquery.chosen/0.9.7/chosen.js
    R ckan/vendor/jquery.cookie/jquery.cookie.min.js
    R ckan/vendor/jquery.event.drag/2.0/jquery.event.drag.min.js
    R ckan/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.css
    R ckan/vendor/jquery.fileupload/20110801/jquery.fileupload-ui.js
    R ckan/vendor/jquery.fileupload/20110801/jquery.fileupload.js
    R ckan/vendor/jquery.fileupload/20110801/jquery.iframe-transport.js
    R ckan/vendor/jquery.mustache/jquery.mustache.js
    R ckan/vendor/jquery.placeholder/jquery.placeholder.js
    R ckan/vendor/jquery.tmpl/beta1/jquery.tmpl.js
    R ckan/vendor/jquery/1.7.1/jquery.js
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_0_000_40x100.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_100_000_40x100.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_flat_75_ffffff_40x100.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_100_f0f0f0_1x400.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_65_ffffff_1x400.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_75_dadada_1x400.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_glass_95_fef1ec_1x400.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-bg_highlight-soft_100_f0f0f0_1x100.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_000_256x240.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_222222_256x240.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_2e83ff_256x240.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_444444_256x240.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_888888_256x240.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_b22_256x240.png
    R ckan/vendor/jqueryui/1.8.14/css/images/ui-icons_cd0a0a_256x240.png
    R ckan/vendor/jqueryui/1.8.14/css/jquery-ui.custom.css
    R ckan/vendor/jqueryui/1.8.14/jquery-ui.min.js
    R ckan/vendor/json2.js
    R ckan/vendor/leaflet/0.3.1/images/layers.png
    R ckan/vendor/leaflet/0.3.1/images/marker-shadow.png
    R ckan/vendor/leaflet/0.3.1/images/marker.png
    R ckan/vendor/leaflet/0.3.1/images/popup-close.png
    R ckan/vendor/leaflet/0.3.1/images/zoom-in.png
    R ckan/vendor/leaflet/0.3.1/images/zoom-out.png
    R ckan/vendor/leaflet/0.3.1/leaflet.css
    R ckan/vendor/leaflet/0.3.1/leaflet.ie.css
    R ckan/vendor/leaflet/0.3.1/leaflet.js
    R ckan/vendor/modernizr/1.7/modernizr.min.js
    R ckan/vendor/openid-selector/css/openid.css
    R ckan/vendor/openid-selector/images/aol.gif
    R ckan/vendor/openid-selector/images/blogger.ico
    R ckan/vendor/openid-selector/images/claimid.ico
    R ckan/vendor/openid-selector/images/facebook.gif
    R ckan/vendor/openid-selector/images/flickr.ico
    R ckan/vendor/openid-selector/images/google.gif
    R ckan/vendor/openid-selector/images/livejournal.ico
    R ckan/vendor/openid-selector/images/myopenid.ico
    R ckan/vendor/openid-selector/images/openid-inputicon.gif
    R ckan/vendor/openid-selector/images/openid.gif
    R ckan/vendor/openid-selector/images/technorati.ico
    R ckan/vendor/openid-selector/images/verisign.gif
    R ckan/vendor/openid-selector/images/verisign.ico
    R ckan/vendor/openid-selector/images/vidoop.ico
    R ckan/vendor/openid-selector/images/wordpress.ico
    R ckan/vendor/openid-selector/images/yahoo.gif
    R ckan/vendor/openid-selector/js/jquery-1.2.6.min.js
    R ckan/vendor/openid-selector/js/openid-jquery.js
    R ckan/vendor/recline/css/data-explorer.css
    R ckan/vendor/recline/css/graph.css
    R ckan/vendor/recline/css/grid.css
    R ckan/vendor/recline/css/images/edit-map.png
    R ckan/vendor/recline/css/images/menu-dropdown.png
    R ckan/vendor/recline/css/images/small-spinner.gif
    R ckan/vendor/recline/css/map.css
    R ckan/vendor/recline/recline.js
    R ckan/vendor/slickgrid/images/actions.gif
    R ckan/vendor/slickgrid/images/ajax-loader-small.gif
    R ckan/vendor/slickgrid/images/arrow_redo.png
    R ckan/vendor/slickgrid/images/arrow_right_peppermint.png
    R ckan/vendor/slickgrid/images/arrow_right_spearmint.png
    R ckan/vendor/slickgrid/images/arrow_undo.png
    R ckan/vendor/slickgrid/images/bullet_blue.png
    R ckan/vendor/slickgrid/images/bullet_star.png
    R ckan/vendor/slickgrid/images/bullet_toggle_minus.png
    R ckan/vendor/slickgrid/images/bullet_toggle_plus.png
    R ckan/vendor/slickgrid/images/calendar.gif
    R ckan/vendor/slickgrid/images/collapse.gif
    R ckan/vendor/slickgrid/images/comment_yellow.gif
    R ckan/vendor/slickgrid/images/down.gif
    R ckan/vendor/slickgrid/images/drag-handle.png
    R ckan/vendor/slickgrid/images/editor-helper-bg.gif
    R ckan/vendor/slickgrid/images/expand.gif
    R ckan/vendor/slickgrid/images/header-bg.gif
    R ckan/vendor/slickgrid/images/header-columns-bg.gif
    R ckan/vendor/slickgrid/images/header-columns-over-bg.gif
    R ckan/vendor/slickgrid/images/help.png
    R ckan/vendor/slickgrid/images/info.gif
    R ckan/vendor/slickgrid/images/listview.gif
    R ckan/vendor/slickgrid/images/pencil.gif
    R ckan/vendor/slickgrid/images/row-over-bg.gif
    R ckan/vendor/slickgrid/images/sort-asc.gif
    R ckan/vendor/slickgrid/images/sort-asc.png
    R ckan/vendor/slickgrid/images/sort-desc.gif
    R ckan/vendor/slickgrid/images/sort-desc.png
    R ckan/vendor/slickgrid/images/stripes.png
    R ckan/vendor/slickgrid/images/tag_red.png
    R ckan/vendor/slickgrid/images/tick.png
    R ckan/vendor/slickgrid/images/user_identity.gif
    R ckan/vendor/slickgrid/images/user_identity_plus.gif
    R ckan/vendor/slickgrid/slick.columnpicker.css
    R ckan/vendor/slickgrid/slick.columnpicker.js
    R ckan/vendor/slickgrid/slick.grid.css
    R ckan/vendor/slickgrid/slick.grid.js
    R ckan/vendor/underscore/1.1.6/underscore.js

  Log Message:
  -----------
  [#2375] Remove ckan/vendor folder


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

  Changed paths:
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-12T17:07:33.684Z/screen-shot-2012-07-12-at-15-43-37-png
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-12T17:10:51.259Z/screen-shot-2012-07-12-at-15-43-37.png
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-12T17:18:52.211Z/screen-shot-2012-07-12-at-15-43-37.png
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:42:47.748Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:43:12.835Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:43:17.944Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:53:45.807Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:55:19.010Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:56:55.845Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:59:21.721Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T09:59:59.574Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:03:06.850Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:03:34.899Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:39:25.046Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:45:01.657Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:45:59.970Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:47:34.420Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:47:48.684Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:48:29.309Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:57:02.711Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T10:58:50.146Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T11:09:58.873Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T11:16:28.647Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:40:25.644Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:40:52.249Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:41:20.444Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:42:04.963Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:44:17.338Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T12:44:39.412Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:22:38.180Z/490c001-rolls-side.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:37:42.171Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:37:49.668Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:37:57.341Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:38:11.855Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:40:11.430Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:43:32.051Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:52:52.198Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T13:58:11.079Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/2012-07-16T16:45:25.251Z/cat.jpg
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/persisted_state.json
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/screen-shot-2012-07-12-at-15-43-37-png
    R ckan/public/uploads/pairtree_root/up/lo/ad/s/obj/tester
    R ckan/public/uploads/pairtree_version0_1

  Log Message:
  -----------
  [#2375] Remove the upload folder of cats


  Commit: e297284fab7c734b46c96294df2193725cba1775
      https://github.com/okfn/ckan/commit/e297284fab7c734b46c96294df2193725cba1775
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/snippets/package_form.html

  Log Message:
  -----------
  [#2685] delete via form not href


  Commit: ebd83de470a11cfae1ff9fbc6bc317f42389478c
      https://github.com/okfn/ckan/commit/ebd83de470a11cfae1ff9fbc6bc317f42389478c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2661] flash message on delete dataset/group


  Commit: ec4982adf05f244b6bca7015b2e04ef9981f74a3
      https://github.com/okfn/ckan/commit/ec4982adf05f244b6bca7015b2e04ef9981f74a3
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 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
    A ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/new.html
    R ckan/templates/group/pages/form_page.html
    A ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/new_resource.html
    R ckan/templates/package/pages/form_page.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/package_form.html
    A ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    A ckan/templates/related/base_form_page.html
    M ckan/templates/related/edit.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/new.html
    R ckan/templates/related/pages/form.html
    R ckan/templates/related/pages/form_page.html
    A ckan/templates/related/snippets/related_form.html
    M ckan/templates/related/snippets/related_item.html

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of github.com:okfn/ckan into 2375-demo-theme-development


  Commit: cc4641e681f80a9da82143dca759c02095be2a9d
      https://github.com/okfn/ckan/commit/cc4641e681f80a9da82143dca759c02095be2a9d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

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

  Log Message:
  -----------
  [#2375] bugfix


  Commit: 4e58137b98378894024014c9566ac937b2064bc7
      https://github.com/okfn/ckan/commit/4e58137b98378894024014c9566ac937b2064bc7
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2375] better debug ppformated output


  Commit: 135965046960f30f2f856fa3e1bb7c128903279f
      https://github.com/okfn/ckan/commit/135965046960f30f2f856fa3e1bb7c128903279f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/templates/group/snippets/group_form.html

  Log Message:
  -----------
  [#2375] group edit no state change


  Commit: 6ef3122c2e55529830c085244df0fa51fcf6a415
      https://github.com/okfn/ckan/commit/6ef3122c2e55529830c085244df0fa51fcf6a415
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

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

  Log Message:
  -----------
  [#2667] remove unused route


  Commit: be4b6191a3e3c1dc7bdc4ce7400087438f5e0684
      https://github.com/okfn/ckan/commit/be4b6191a3e3c1dc7bdc4ce7400087438f5e0684
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

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

  Log Message:
  -----------
  [#2667] do not override data in template


  Commit: 5c4d0fd008da8045d50e15ad877c29f5aa0f536f
      https://github.com/okfn/ckan/commit/5c4d0fd008da8045d50e15ad877c29f5aa0f536f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2667] remove crufty unused code


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

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

  Log Message:
  -----------
  [#2661] Fix a typo in module.createInstance()


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

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

  Log Message:
  -----------
  [#2661] Add Bootstrap modal plugin


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

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

  Log Message:
  -----------
  [#2661] Added .body, .location and .window to sandbox


  Commit: 9834de8b90a795c72e7995bc7937001c105dda6e
      https://github.com/okfn/ckan/commit/9834de8b90a795c72e7995bc7937001c105dda6e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

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

  Log Message:
  -----------
  [#2667] do not eat errors on edit resource


  Commit: 4f892699832631bf77fe3981e6e4b8c9d4e6d099
      https://github.com/okfn/ckan/commit/4f892699832631bf77fe3981e6e4b8c9d4e6d099
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

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

  Log Message:
  -----------
  [#2667] pass error summary to edit resource


  Commit: bb66f88f86d845704f002da41f2afeb7b45c366c
      https://github.com/okfn/ckan/commit/bb66f88f86d845704f002da41f2afeb7b45c366c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

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

  Log Message:
  -----------
  [#2667] allow different actions on edit resource


  Commit: b04b4da670ba7c6e3bd3a78906c6e0c042e010ae
      https://github.com/okfn/ckan/commit/b04b4da670ba7c6e3bd3a78906c6e0c042e010ae
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/jinja_tags.py

  Log Message:
  -----------
  [#2667] new jinja2 custom filter empty_and_escape


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

  Changed paths:
    A ckan/public/base/javascript/modules/confirm-delete.js
    A ckan/public/base/test/spec/modules/confirm-delete.spec.js

  Log Message:
  -----------
  [#2661] Add a confirm-delete module

This displays a confirmation dialog to the user when clicking a delete
button. If confirmed will then proceed to perform the deletion.


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

  Changed paths:
    M ckan/public/base/test/index.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2661] Implement the confirm delete on the dataset form


  Commit: 55d08d396f1b742c52c309e4f142356e61c56fce
      https://github.com/okfn/ckan/commit/55d08d396f1b742c52c309e4f142356e61c56fce
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2667] edit resource functionality


  Commit: e56dc8160900738fbc4c77d98322dc97de1815b8
      https://github.com/okfn/ckan/commit/e56dc8160900738fbc4c77d98322dc97de1815b8
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#2667] add empty_and_escape to macros/form.html


  Commit: e5ef32a0dbdd99916c6049393a4b2014214fdaf4
      https://github.com/okfn/ckan/commit/e5ef32a0dbdd99916c6049393a4b2014214fdaf4
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/confirm-delete.js
    M ckan/public/base/javascript/sandbox.js
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/confirm-delete.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' of github.com:okfn/ckan into 2375-demo-theme-development


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

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

  Log Message:
  -----------
  [#2667] Add error summary to resource form


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

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

  Log Message:
  -----------
  [#2375] Add jQuery.date.toCKANString()


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

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

  Log Message:
  -----------
  [#2667] Client now provides CKAN friendly timestamps


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

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

  Log Message:
  -----------
  [#2667] Give the file upload inputs a unique id


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

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

  Log Message:
  -----------
  [#2375] Pass error_summary through to resource form


  Commit: 94f77f68a3c149cf8f7b570147936a0f06d46c5a
      https://github.com/okfn/ckan/commit/94f77f68a3c149cf8f7b570147936a0f06d46c5a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M bin/less
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_tags.py
    M ckan/logic/auth/get.py
    M ckan/public/base/css/main.css
    A ckan/public/base/images/loading-spinner.gif
    A ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/confirm-delete.js
    A ckan/public/base/javascript/modules/resource-form.js
    A 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
    A ckan/public/base/javascript/notify.js
    A ckan/public/base/javascript/plugins/jquery.date-helpers.js
    A ckan/public/base/javascript/plugins/jquery.inherit.js
    A ckan/public/base/javascript/plugins/jquery.proxy-all.js
    M ckan/public/base/javascript/sandbox.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/ckan.spec.js
    A ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/confirm-delete.spec.js
    A ckan/public/base/test/spec/modules/resource-form.spec.js
    A ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public/base/test/spec/notify.spec.js
    A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.js
    A ckan/public/base/test/spec/plugins/jquery.inherit.spec.js
    A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/public/base/test/vendor/sinon.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-modal.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.js
    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
    M ckan/templates/base.html
    A ckan/templates/group/base_form_page.html
    A ckan/templates/group/confirm_delete.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/new.html
    M ckan/templates/group/new_group_form.html
    R ckan/templates/group/pages/form_page.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    A ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/new_resource.html
    R ckan/templates/package/pages/form_page.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/package/snippets/data-api-button.html
    M ckan/templates/package/snippets/package_form.html
    A ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/page.html
    A ckan/templates/related/base_form_page.html
    M ckan/templates/related/edit.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/new.html
    R ckan/templates/related/pages/form.html
    R ckan/templates/related/pages/form_page.html
    A ckan/templates/related/snippets/related_form.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/package_list.html
    M ckan/templates/snippets/scripts.html
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch '2375-demo-theme-development' into 2375-demo-theme-stable


Compare: https://github.com/okfn/ckan/compare/c8c64f735b87...94f77f68a3c1


More information about the ckan-changes mailing list