[ckan-changes] [okfn/ckan] 6f39f8: [#2375] Fix spec clobbering jQuery.fn.on()

GitHub noreply at github.com
Wed Jul 25 09:24:41 UTC 2012


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

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

  Log Message:
  -----------
  [#2375] Fix spec clobbering jQuery.fn.on()


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

  Changed paths:
    M ckan/public/base/test/spec/plugins/jquery.slug.spec.js

  Log Message:
  -----------
  [#2684] Tidy up assertions in jQuery.slug spec


  Commit: e73a45b9d1561e2712b6c56aed263f31d95eb0fc
      https://github.com/okfn/ckan/commit/e73a45b9d1561e2712b6c56aed263f31d95eb0fc
  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:
  -----------
  [#2684] Allow more than one module to be defined per element


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

  Changed paths:
    A ckan/public/base/javascript/modules/basic-form.js
    A ckan/public/base/javascript/plugins/jquery.form-warning.js
    A ckan/public/base/test/spec/modules/basic-form.spec.js

  Log Message:
  -----------
  [#2684] Add basic form module for shared form functionality

We currently only display a message when the user navigates away with
a modified form.


  Commit: 8836592a4391e3a48b3afa9d4b8912b12bb3f505
      https://github.com/okfn/ckan/commit/8836592a4391e3a48b3afa9d4b8912b12bb3f505
  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/resource_form.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2684] Add basic form module to resource form


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

  Changed paths:
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/related/snippets/related_form.html

  Log Message:
  -----------
  [#2684] Show warning when leaving page with modified fields


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

  Changed paths:
    M ckan/public/base/less/dataset.less
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [#2692] Fix link to create new dataset on search page


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

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  [#2690] Improve alignment of slug button


  Commit: 43b7493260e2309c62711813a4627cec364aa9e5
      https://github.com/okfn/ckan/commit/43b7493260e2309c62711813a4627cec364aa9e5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

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

  Log Message:
  -----------
  [#2691] fix 404 and stage issues on add dataset


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

  Changed paths:
    R ckan/public/base/css/vendor/font-awesome-ie7.css
    R ckan/public/base/fonts/fontawesome-webfont.eot
    R ckan/public/base/fonts/fontawesome-webfont.svg
    R ckan/public/base/fonts/fontawesome-webfont.ttf
    R ckan/public/base/fonts/fontawesome-webfont.woff
    R ckan/public/base/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/images/bootstrap-glyphicons-halflings.png
    R ckan/public/base/javascript/vendor/bootstrap.js
    R ckan/public/base/javascript/vendor/html5.js
    R ckan/public/base/javascript/vendor/jquery.js
    M ckan/public/base/less/main.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/less/vendor/bootstrap/accordion.less
    R ckan/public/base/less/vendor/bootstrap/alerts.less
    R ckan/public/base/less/vendor/bootstrap/bootstrap.less
    R ckan/public/base/less/vendor/bootstrap/breadcrumbs.less
    R ckan/public/base/less/vendor/bootstrap/button-groups.less
    R ckan/public/base/less/vendor/bootstrap/buttons.less
    R ckan/public/base/less/vendor/bootstrap/carousel.less
    R ckan/public/base/less/vendor/bootstrap/close.less
    R ckan/public/base/less/vendor/bootstrap/code.less
    R ckan/public/base/less/vendor/bootstrap/component-animations.less
    R ckan/public/base/less/vendor/bootstrap/dropdowns.less
    R ckan/public/base/less/vendor/bootstrap/forms.less
    R ckan/public/base/less/vendor/bootstrap/grid.less
    R ckan/public/base/less/vendor/bootstrap/hero-unit.less
    R ckan/public/base/less/vendor/bootstrap/labels-badges.less
    R ckan/public/base/less/vendor/bootstrap/layouts.less
    R ckan/public/base/less/vendor/bootstrap/mixins.less
    R ckan/public/base/less/vendor/bootstrap/modals.less
    R ckan/public/base/less/vendor/bootstrap/navbar.less
    R ckan/public/base/less/vendor/bootstrap/navs.less
    R ckan/public/base/less/vendor/bootstrap/pager.less
    R ckan/public/base/less/vendor/bootstrap/pagination.less
    R ckan/public/base/less/vendor/bootstrap/popovers.less
    R ckan/public/base/less/vendor/bootstrap/progress-bars.less
    R ckan/public/base/less/vendor/bootstrap/reset.less
    R ckan/public/base/less/vendor/bootstrap/responsive-1200px-min.less
    R ckan/public/base/less/vendor/bootstrap/responsive-767px-max.less
    R ckan/public/base/less/vendor/bootstrap/responsive-768px-979px.less
    R ckan/public/base/less/vendor/bootstrap/responsive-navbar.less
    R ckan/public/base/less/vendor/bootstrap/responsive-utilities.less
    R ckan/public/base/less/vendor/bootstrap/responsive.less
    R ckan/public/base/less/vendor/bootstrap/scaffolding.less
    R ckan/public/base/less/vendor/bootstrap/sprites.less
    R ckan/public/base/less/vendor/bootstrap/tables.less
    R ckan/public/base/less/vendor/bootstrap/thumbnails.less
    R ckan/public/base/less/vendor/bootstrap/tooltip.less
    R ckan/public/base/less/vendor/bootstrap/type.less
    R ckan/public/base/less/vendor/bootstrap/utilities.less
    R ckan/public/base/less/vendor/bootstrap/variables.less
    R ckan/public/base/less/vendor/bootstrap/wells.less
    R ckan/public/base/less/vendor/font-awesome/font-awesome-ie7.less
    R ckan/public/base/less/vendor/font-awesome/font-awesome.less
    A ckan/public/base/vendor/bootstrap.js
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/less/accordion.less
    A ckan/public/base/vendor/bootstrap/less/alerts.less
    A ckan/public/base/vendor/bootstrap/less/bootstrap.less
    A ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    A ckan/public/base/vendor/bootstrap/less/button-groups.less
    A ckan/public/base/vendor/bootstrap/less/buttons.less
    A ckan/public/base/vendor/bootstrap/less/carousel.less
    A ckan/public/base/vendor/bootstrap/less/close.less
    A ckan/public/base/vendor/bootstrap/less/code.less
    A ckan/public/base/vendor/bootstrap/less/component-animations.less
    A ckan/public/base/vendor/bootstrap/less/dropdowns.less
    A ckan/public/base/vendor/bootstrap/less/forms.less
    A ckan/public/base/vendor/bootstrap/less/grid.less
    A ckan/public/base/vendor/bootstrap/less/hero-unit.less
    A ckan/public/base/vendor/bootstrap/less/labels-badges.less
    A ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/mixins.less
    A ckan/public/base/vendor/bootstrap/less/modals.less
    A ckan/public/base/vendor/bootstrap/less/navbar.less
    A ckan/public/base/vendor/bootstrap/less/navs.less
    A ckan/public/base/vendor/bootstrap/less/pager.less
    A ckan/public/base/vendor/bootstrap/less/pagination.less
    A ckan/public/base/vendor/bootstrap/less/popovers.less
    A ckan/public/base/vendor/bootstrap/less/progress-bars.less
    A ckan/public/base/vendor/bootstrap/less/reset.less
    A ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    A ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    A ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    A ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    A ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    A ckan/public/base/vendor/bootstrap/less/responsive.less
    A ckan/public/base/vendor/bootstrap/less/scaffolding.less
    A ckan/public/base/vendor/bootstrap/less/sprites.less
    A ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/thumbnails.less
    A ckan/public/base/vendor/bootstrap/less/tooltip.less
    A ckan/public/base/vendor/bootstrap/less/type.less
    A ckan/public/base/vendor/bootstrap/less/utilities.less
    A ckan/public/base/vendor/bootstrap/less/variables.less
    A ckan/public/base/vendor/bootstrap/less/wells.less
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/html5.js
    A ckan/public/base/vendor/jquery.js
    M ckan/templates/base.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2375] Move all vendor libs into the vendor directory

Originally vendor libraries were split into file types, images, CSS
and JavaScript etc. However this adds a maintenance overhead and it's
simpler to just keep them in a separate folder as packaged by the
original developer.


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

  Changed paths:
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.js

  Log Message:
  -----------
  [#2375] Add some basic tests for jquery.form-warning.js


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

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

  Log Message:
  -----------
  [#2375] Add bootstrap tag plugin


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

  Changed paths:
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/profile.less
    M ckan/templates/snippets/scripts.html
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [#2375] Add some JavaScript to the profile page


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

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

  Log Message:
  -----------
  [#2375] Remove the data modal attribute from the API button


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

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

  Log Message:
  -----------
  [#2375] Add space around attributes in form macros


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

  Changed paths:
    R ckan/public/base/css/vendor/font-awesome-ie7.css
    R ckan/public/base/fonts/fontawesome-webfont.eot
    R ckan/public/base/fonts/fontawesome-webfont.svg
    R ckan/public/base/fonts/fontawesome-webfont.ttf
    R ckan/public/base/fonts/fontawesome-webfont.woff
    R ckan/public/base/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/images/bootstrap-glyphicons-halflings.png
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/basic-form.js
    A ckan/public/base/javascript/plugins/jquery.form-warning.js
    R ckan/public/base/javascript/vendor/bootstrap.js
    R ckan/public/base/javascript/vendor/html5.js
    R ckan/public/base/javascript/vendor/jquery.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/less/vendor/bootstrap/accordion.less
    R ckan/public/base/less/vendor/bootstrap/alerts.less
    R ckan/public/base/less/vendor/bootstrap/bootstrap.less
    R ckan/public/base/less/vendor/bootstrap/breadcrumbs.less
    R ckan/public/base/less/vendor/bootstrap/button-groups.less
    R ckan/public/base/less/vendor/bootstrap/buttons.less
    R ckan/public/base/less/vendor/bootstrap/carousel.less
    R ckan/public/base/less/vendor/bootstrap/close.less
    R ckan/public/base/less/vendor/bootstrap/code.less
    R ckan/public/base/less/vendor/bootstrap/component-animations.less
    R ckan/public/base/less/vendor/bootstrap/dropdowns.less
    R ckan/public/base/less/vendor/bootstrap/forms.less
    R ckan/public/base/less/vendor/bootstrap/grid.less
    R ckan/public/base/less/vendor/bootstrap/hero-unit.less
    R ckan/public/base/less/vendor/bootstrap/labels-badges.less
    R ckan/public/base/less/vendor/bootstrap/layouts.less
    R ckan/public/base/less/vendor/bootstrap/mixins.less
    R ckan/public/base/less/vendor/bootstrap/modals.less
    R ckan/public/base/less/vendor/bootstrap/navbar.less
    R ckan/public/base/less/vendor/bootstrap/navs.less
    R ckan/public/base/less/vendor/bootstrap/pager.less
    R ckan/public/base/less/vendor/bootstrap/pagination.less
    R ckan/public/base/less/vendor/bootstrap/popovers.less
    R ckan/public/base/less/vendor/bootstrap/progress-bars.less
    R ckan/public/base/less/vendor/bootstrap/reset.less
    R ckan/public/base/less/vendor/bootstrap/responsive-1200px-min.less
    R ckan/public/base/less/vendor/bootstrap/responsive-767px-max.less
    R ckan/public/base/less/vendor/bootstrap/responsive-768px-979px.less
    R ckan/public/base/less/vendor/bootstrap/responsive-navbar.less
    R ckan/public/base/less/vendor/bootstrap/responsive-utilities.less
    R ckan/public/base/less/vendor/bootstrap/responsive.less
    R ckan/public/base/less/vendor/bootstrap/scaffolding.less
    R ckan/public/base/less/vendor/bootstrap/sprites.less
    R ckan/public/base/less/vendor/bootstrap/tables.less
    R ckan/public/base/less/vendor/bootstrap/thumbnails.less
    R ckan/public/base/less/vendor/bootstrap/tooltip.less
    R ckan/public/base/less/vendor/bootstrap/type.less
    R ckan/public/base/less/vendor/bootstrap/utilities.less
    R ckan/public/base/less/vendor/bootstrap/variables.less
    R ckan/public/base/less/vendor/bootstrap/wells.less
    R ckan/public/base/less/vendor/font-awesome/font-awesome-ie7.less
    R ckan/public/base/less/vendor/font-awesome/font-awesome.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/basic-form.spec.js
    M ckan/public/base/test/spec/modules/confirm-delete.spec.js
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.js
    M ckan/public/base/test/spec/plugins/jquery.slug.spec.js
    A ckan/public/base/vendor/bootstrap.js
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    A ckan/public/base/vendor/bootstrap/less/accordion.less
    A ckan/public/base/vendor/bootstrap/less/alerts.less
    A ckan/public/base/vendor/bootstrap/less/bootstrap.less
    A ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    A ckan/public/base/vendor/bootstrap/less/button-groups.less
    A ckan/public/base/vendor/bootstrap/less/buttons.less
    A ckan/public/base/vendor/bootstrap/less/carousel.less
    A ckan/public/base/vendor/bootstrap/less/close.less
    A ckan/public/base/vendor/bootstrap/less/code.less
    A ckan/public/base/vendor/bootstrap/less/component-animations.less
    A ckan/public/base/vendor/bootstrap/less/dropdowns.less
    A ckan/public/base/vendor/bootstrap/less/forms.less
    A ckan/public/base/vendor/bootstrap/less/grid.less
    A ckan/public/base/vendor/bootstrap/less/hero-unit.less
    A ckan/public/base/vendor/bootstrap/less/labels-badges.less
    A ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/mixins.less
    A ckan/public/base/vendor/bootstrap/less/modals.less
    A ckan/public/base/vendor/bootstrap/less/navbar.less
    A ckan/public/base/vendor/bootstrap/less/navs.less
    A ckan/public/base/vendor/bootstrap/less/pager.less
    A ckan/public/base/vendor/bootstrap/less/pagination.less
    A ckan/public/base/vendor/bootstrap/less/popovers.less
    A ckan/public/base/vendor/bootstrap/less/progress-bars.less
    A ckan/public/base/vendor/bootstrap/less/reset.less
    A ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    A ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    A ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    A ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    A ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    A ckan/public/base/vendor/bootstrap/less/responsive.less
    A ckan/public/base/vendor/bootstrap/less/scaffolding.less
    A ckan/public/base/vendor/bootstrap/less/sprites.less
    A ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/thumbnails.less
    A ckan/public/base/vendor/bootstrap/less/tooltip.less
    A ckan/public/base/vendor/bootstrap/less/type.less
    A ckan/public/base/vendor/bootstrap/less/utilities.less
    A ckan/public/base/vendor/bootstrap/less/variables.less
    A ckan/public/base/vendor/bootstrap/less/wells.less
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/html5.js
    A ckan/public/base/vendor/jquery.js
    M ckan/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/data-api-button.html
    M 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/related/snippets/related_form.html
    M ckan/templates/snippets/scripts.html
    M ckan/templates/user/read.html

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


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

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

  Log Message:
  -----------
  [#2375] Update documentation for attributes macro


  Commit: 754e15fa39e43b27f7b53127d62ccb9b60c0c269
      https://github.com/okfn/ckan/commit/754e15fa39e43b27f7b53127d62ccb9b60c0c269
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

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

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


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

  Changed paths:
    M ckan/templates/package/resource_read.html
    A ckan/templates/package/snippets/data_api_button.html

  Log Message:
  -----------
  [#2375] Update snippet filenames to use underscores


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

  Changed paths:
    R ckan/templates/package/snippets/data-api-button.html

  Log Message:
  -----------
  [#2375] Remove duped template


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

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

  Log Message:
  -----------
  [#2703] Wrap stages in add resource form in conditional

If an empty array is provided then the stages will be omitted.


  Commit: 38340aef926fef0dec147592d1da446b373547e5
      https://github.com/okfn/ckan/commit/38340aef926fef0dec147592d1da446b373547e5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

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

  Log Message:
  -----------
  [#2375] ckan jinja2 truncate filter override


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

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

  Log Message:
  -----------
  [#2375] rename jinja2 lib


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

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

  Log Message:
  -----------
  [#2375] Add Bootstrap button plugin


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

  Changed paths:
    A ckan/public/base/javascript/modules/api-info.js
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2375] Show API info in a lightbox


  Commit: 8052b6c6daccbfeab4c843901d511cd0f3785e0f
      https://github.com/okfn/ckan/commit/8052b6c6daccbfeab4c843901d511cd0f3785e0f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  auto summary in validationError

Conflicts:
	ckan/templates/package/new_package_form.html


  Commit: 193bc5a3518984c26a947f5610a06b38cc3e8f8a
      https://github.com/okfn/ckan/commit/193bc5a3518984c26a947f5610a06b38cc3e8f8a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  ValidationError more cleanups


  Commit: 92cf369d41ad41b1a857a116e619ab8156890b8b
      https://github.com/okfn/ckan/commit/92cf369d41ad41b1a857a116e619ab8156890b8b
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  fix some other silly lines


  Commit: 3352c4c67e454a22ebe8f9839e566bac31eaa6b7
      https://github.com/okfn/ckan/commit/3352c4c67e454a22ebe8f9839e566bac31eaa6b7
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  clean the validation errors in logic action


  Commit: 00573a7c751ddc7d2dfe2df9440fbf190a7b8e1a
      https://github.com/okfn/ckan/commit/00573a7c751ddc7d2dfe2df9440fbf190a7b8e1a
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-18 (Wed, 18 Jul 2012)

  Changed paths:
    M ckan/controllers/home.py

  Log Message:
  -----------
  [#2694] fix 500 error on home page


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

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

  Log Message:
  -----------
  [#2712] fix group delete


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

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

  Log Message:
  -----------
  [#2712] fix package delete


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    A ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#2712] resource delete part one


  Commit: 094af11a887f3e5af331e2c76f433c35c794ae9c
      https://github.com/okfn/ckan/commit/094af11a887f3e5af331e2c76f433c35c794ae9c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  [#2712] group delete confirm dialog added


  Commit: 30c2742c4e3317e0d245dc3a471acf335fe1b51c
      https://github.com/okfn/ckan/commit/30c2742c4e3317e0d245dc3a471acf335fe1b51c
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  [#2375] fix missing stages on add resource 3 part form


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

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

  Log Message:
  -----------
  [#2712] delete resource button show only on edit form


  Commit: 15e4880704801c35473b14e3a0a376c4999c5b63
      https://github.com/okfn/ckan/commit/15e4880704801c35473b14e3a0a376c4999c5b63
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/related.py
    A ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/snippets/related_form.html

  Log Message:
  -----------
  [#2712] delete related item functionality


  Commit: 8f902ef1ad832f3cd278092b3a9bf42a3f03f9c6
      https://github.com/okfn/ckan/commit/8f902ef1ad832f3cd278092b3a9bf42a3f03f9c6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  [#2703] allow add new resource to existing dataset


  Commit: 9a165da79c575eb2e05de303ee84af4f1808b938
      https://github.com/okfn/ckan/commit/9a165da79c575eb2e05de303ee84af4f1808b938
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/templates/package/snippets/resource_form.html

  Log Message:
  -----------
  [#2712] delete resource logic function added


  Commit: 2f20fd87e6fc40c7d8a7d7dd59fb01fa6b3b526d
      https://github.com/okfn/ckan/commit/2f20fd87e6fc40c7d8a7d7dd59fb01fa6b3b526d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2375] fix 500 on edit none existant resource


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

  Changed paths:
    A ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2695] Add Bootstrap typeahead plugin


  Commit: 6964480e200b766c0cf071b1fcf32b26d6b51c08
      https://github.com/okfn/ckan/commit/6964480e200b766c0cf071b1fcf32b26d6b51c08
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M .gitignore
    M ckan/lib/cli.py
    M ckan/public/base/less/ckan.less
    M setup.py

  Log Message:
  -----------
  [#2302] Crazy colours for demo theme


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

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

  Log Message:
  -----------
  [#2706] hide mime type etc in resource edit


  Commit: 452e6fb3baaad0c815866dd6257e76786feb9524
      https://github.com/okfn/ckan/commit/452e6fb3baaad0c815866dd6257e76786feb9524
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

  Changed paths:
    M ckan/public/base/javascript/modules/confirm-delete.js

  Log Message:
  -----------
  [#2661] confirm delete working as form submit


  Commit: 97df280dcb9f17e3ee8bc8856861d7a3a6aa33fb
      https://github.com/okfn/ckan/commit/97df280dcb9f17e3ee8bc8856861d7a3a6aa33fb
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-19 (Thu, 19 Jul 2012)

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

  Log Message:
  -----------
  [#2716] truncate resource title


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

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

  Log Message:
  -----------
  [#2695] Add tests for BaseModule()


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

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

  Log Message:
  -----------
  [#2695] Add BaseModule#i18n() helper and tests

This allows you to quickly grab localised strings passed into the
object as options.


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

  Changed paths:
    M ckan/public/base/less/main.less
    A ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.js
    A ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/spinner.gif

  Log Message:
  -----------
  [#2695] Add select2 jQuery plugin

Provides nice autocomplete and select box functionality in the same
vein as chosen. This better supports customisation and loading of
remote data.


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

  Changed paths:
    A ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  [#2695] Add a basic working autocomplete plugin for tags


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

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2695] Add tag autocomplete to new dataset page

Needs cleaning up and unit tests.


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

  Changed paths:
    M ckan/templates/error_document_template.html

  Log Message:
  -----------
  [#2493] 404 cleanup


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

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

  Log Message:
  -----------
  [#2700] auto submit language picker


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

  Changed paths:
    M ckan/public/base/javascript/modules/select-switch.js
    M ckan/public/base/less/forms.less
    M ckan/templates/package/search.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/sort_by.html

  Log Message:
  -----------
  hide non js required elements on render


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

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  improve the css for aron


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

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

  Log Message:
  -----------
  [#2722] disable sort on group search


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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/public/base/less/nav.less
    M ckan/templates/package/snippets/resources.html

  Log Message:
  -----------
  [#2727] fix for too long resource names


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

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

  Log Message:
  -----------
  [#2695] Add support for autocomplete endpoints to Client


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

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  [#2695] Update autocomplete module to use Client


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

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

  Log Message:
  -----------
  [#2695] Client extends the ajax request with the piped promise

This allows us to use the original jqXHR methods but with the new
piped result stream.


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

  Changed paths:
    M ckan/public/base/test/spec/modules/basic-form.spec.js
    M ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.js

  Log Message:
  -----------
  [#2695] Restore jQuery plugin after stubbing it


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

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

  Log Message:
  -----------
  [#2375] change case in template boolean


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

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js
    A ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  [#2695] Refactor and tested the autocomplete module


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

  Changed paths:
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/test/index.html
    A ckan/public/base/vendor/jed.js
    M ckan/templates/snippets/scripts.html

  Log Message:
  -----------
  [#2695] Add Jed for handling the localisations


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

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  [#2695] Re jig the .lookup() autocomplete method


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

  Changed paths:
    M .gitignore
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/public/base/javascript/modules/confirm-delete.js
    M ckan/public/base/javascript/modules/select-switch.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/nav.less
    M ckan/templates/error_document_template.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/confirm_delete.html
    A ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/search_form.html
    A ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/sort_by.html
    M setup.py

  Log Message:
  -----------
  Merge branch 2375-demo-theme-development into 2695-demo-tag-autocomplete


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

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

  Log Message:
  -----------
  [#2375] Update the CSS to include the select2 styles


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

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

  Log Message:
  -----------
  [#2375] Improve tag handling of comma seperated values


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

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

  Log Message:
  -----------
  [#2696] Form attrs macro now supports boolean attributes

Also added spacing in between the elements.


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

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

  Log Message:
  -----------
  [#2696] module.extractOptions() now parses boolean attrs


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

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

  Log Message:
  -----------
  [#2696] Add support for format autocomplete to Client


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

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

  Log Message:
  -----------
  [#2696] Add autocomplete support for non-tag fields

Tag fields now require the data-module-tags attribute to tell the
module to allow multiple entries.


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

  Changed paths:
    M ckan/public/base/less/forms.less

  Log Message:
  -----------
  [#2696] Add some basic styling for format autocomplete field


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

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

  Log Message:
  -----------
  [#2696] Implement the format auto complete


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

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

  Log Message:
  -----------
  [#2375] Update CSS for resource autocomplete


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

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

  Log Message:
  -----------
  [#2375] add span around tags to catch overlong ones and minor refactor


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

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

  Log Message:
  -----------
  [#2375] make wording more acurate in facet list


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

  Changed paths:
    A ckan/templates/admin/authz.html
    A ckan/templates/admin/index.html

  Log Message:
  -----------
  [#2375] start of admin template fixes


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

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

  Log Message:
  -----------
  [#2734] resource edit error fixed


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

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  Treat commas in tags as returns

This allows the user to create a new tag when pressing comma.


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

  Changed paths:
    A jshint.json

  Log Message:
  -----------
  [#2695] Add a jshint.json with project specific settings


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

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  [#2695] Improve reliability of autocomplete module


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

  Changed paths:
    M ckan/public/base/test/spec/modules/autocomplete.spec.js

  Log Message:
  -----------
  [#2695] Update unit tests for autocomplete  _onKeydown() handler


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/templates/group/read.html
    M ckan/templates/package/snippets/package_basic_fields.html

  Log Message:
  -----------
  [#2743] add dataset to group functionality


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

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

  Log Message:
  -----------
  [#2695] Update the select2 styles


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

  Changed paths:
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html

  Log Message:
  -----------
  [#2695] Add select2 to all resource select boxes


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

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

  Log Message:
  -----------
  [#2695] Allow autocomplete module to be loaded on select boxes


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

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

  Log Message:
  -----------
  [#2737] Update placeholder text in resource format form


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

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

  Log Message:
  -----------
  [#2375] Fix tag field height


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

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

  Log Message:
  -----------
  [#2740] better breadcrumb on add resource to dataset


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

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  [#2695] Improve responsiveness of tag form


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

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

  Log Message:
  -----------
  [#2375] set default license to not specified


  Commit: 0a2d59846db229668c0a57c6ce013c359cb55bb7
      https://github.com/okfn/ckan/commit/0a2d59846db229668c0a57c6ce013c359cb55bb7
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M .gitignore
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    A ckan/lib/jinja_extensions.py
    R ckan/lib/jinja_tags.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/update.py
    M ckan/public/base/css/main.css
    R ckan/public/base/css/vendor/font-awesome-ie7.css
    R ckan/public/base/fonts/fontawesome-webfont.eot
    R ckan/public/base/fonts/fontawesome-webfont.svg
    R ckan/public/base/fonts/fontawesome-webfont.ttf
    R ckan/public/base/fonts/fontawesome-webfont.woff
    R ckan/public/base/images/bootstrap-glyphicons-halflings-white.png
    R ckan/public/base/images/bootstrap-glyphicons-halflings.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/module.js
    A ckan/public/base/javascript/modules/api-info.js
    A ckan/public/base/javascript/modules/autocomplete.js
    A ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-delete.js
    M ckan/public/base/javascript/modules/select-switch.js
    A ckan/public/base/javascript/plugins/jquery.form-warning.js
    R ckan/public/base/javascript/vendor/bootstrap.js
    R ckan/public/base/javascript/vendor/html5.js
    R ckan/public/base/javascript/vendor/jquery.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/variables.less
    R ckan/public/base/less/vendor/bootstrap/accordion.less
    R ckan/public/base/less/vendor/bootstrap/alerts.less
    R ckan/public/base/less/vendor/bootstrap/bootstrap.less
    R ckan/public/base/less/vendor/bootstrap/breadcrumbs.less
    R ckan/public/base/less/vendor/bootstrap/button-groups.less
    R ckan/public/base/less/vendor/bootstrap/buttons.less
    R ckan/public/base/less/vendor/bootstrap/carousel.less
    R ckan/public/base/less/vendor/bootstrap/close.less
    R ckan/public/base/less/vendor/bootstrap/code.less
    R ckan/public/base/less/vendor/bootstrap/component-animations.less
    R ckan/public/base/less/vendor/bootstrap/dropdowns.less
    R ckan/public/base/less/vendor/bootstrap/forms.less
    R ckan/public/base/less/vendor/bootstrap/grid.less
    R ckan/public/base/less/vendor/bootstrap/hero-unit.less
    R ckan/public/base/less/vendor/bootstrap/labels-badges.less
    R ckan/public/base/less/vendor/bootstrap/layouts.less
    R ckan/public/base/less/vendor/bootstrap/mixins.less
    R ckan/public/base/less/vendor/bootstrap/modals.less
    R ckan/public/base/less/vendor/bootstrap/navbar.less
    R ckan/public/base/less/vendor/bootstrap/navs.less
    R ckan/public/base/less/vendor/bootstrap/pager.less
    R ckan/public/base/less/vendor/bootstrap/pagination.less
    R ckan/public/base/less/vendor/bootstrap/popovers.less
    R ckan/public/base/less/vendor/bootstrap/progress-bars.less
    R ckan/public/base/less/vendor/bootstrap/reset.less
    R ckan/public/base/less/vendor/bootstrap/responsive-1200px-min.less
    R ckan/public/base/less/vendor/bootstrap/responsive-767px-max.less
    R ckan/public/base/less/vendor/bootstrap/responsive-768px-979px.less
    R ckan/public/base/less/vendor/bootstrap/responsive-navbar.less
    R ckan/public/base/less/vendor/bootstrap/responsive-utilities.less
    R ckan/public/base/less/vendor/bootstrap/responsive.less
    R ckan/public/base/less/vendor/bootstrap/scaffolding.less
    R ckan/public/base/less/vendor/bootstrap/sprites.less
    R ckan/public/base/less/vendor/bootstrap/tables.less
    R ckan/public/base/less/vendor/bootstrap/thumbnails.less
    R ckan/public/base/less/vendor/bootstrap/tooltip.less
    R ckan/public/base/less/vendor/bootstrap/type.less
    R ckan/public/base/less/vendor/bootstrap/utilities.less
    R ckan/public/base/less/vendor/bootstrap/variables.less
    R ckan/public/base/less/vendor/bootstrap/wells.less
    R ckan/public/base/less/vendor/font-awesome/font-awesome-ie7.less
    R ckan/public/base/less/vendor/font-awesome/font-awesome.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/module.spec.js
    A ckan/public/base/test/spec/modules/autocomplete.spec.js
    A ckan/public/base/test/spec/modules/basic-form.spec.js
    M ckan/public/base/test/spec/modules/confirm-delete.spec.js
    A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.js
    M ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.js
    M ckan/public/base/test/spec/plugins/jquery.slug.spec.js
    A ckan/public/base/vendor/bootstrap.js
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/images/bootstrap-glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/js/bootstrap-button.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-tab.js
    A ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.js
    A ckan/public/base/vendor/bootstrap/less/accordion.less
    A ckan/public/base/vendor/bootstrap/less/alerts.less
    A ckan/public/base/vendor/bootstrap/less/bootstrap.less
    A ckan/public/base/vendor/bootstrap/less/breadcrumbs.less
    A ckan/public/base/vendor/bootstrap/less/button-groups.less
    A ckan/public/base/vendor/bootstrap/less/buttons.less
    A ckan/public/base/vendor/bootstrap/less/carousel.less
    A ckan/public/base/vendor/bootstrap/less/close.less
    A ckan/public/base/vendor/bootstrap/less/code.less
    A ckan/public/base/vendor/bootstrap/less/component-animations.less
    A ckan/public/base/vendor/bootstrap/less/dropdowns.less
    A ckan/public/base/vendor/bootstrap/less/forms.less
    A ckan/public/base/vendor/bootstrap/less/grid.less
    A ckan/public/base/vendor/bootstrap/less/hero-unit.less
    A ckan/public/base/vendor/bootstrap/less/labels-badges.less
    A ckan/public/base/vendor/bootstrap/less/layouts.less
    A ckan/public/base/vendor/bootstrap/less/mixins.less
    A ckan/public/base/vendor/bootstrap/less/modals.less
    A ckan/public/base/vendor/bootstrap/less/navbar.less
    A ckan/public/base/vendor/bootstrap/less/navs.less
    A ckan/public/base/vendor/bootstrap/less/pager.less
    A ckan/public/base/vendor/bootstrap/less/pagination.less
    A ckan/public/base/vendor/bootstrap/less/popovers.less
    A ckan/public/base/vendor/bootstrap/less/progress-bars.less
    A ckan/public/base/vendor/bootstrap/less/reset.less
    A ckan/public/base/vendor/bootstrap/less/responsive-1200px-min.less
    A ckan/public/base/vendor/bootstrap/less/responsive-767px-max.less
    A ckan/public/base/vendor/bootstrap/less/responsive-768px-979px.less
    A ckan/public/base/vendor/bootstrap/less/responsive-navbar.less
    A ckan/public/base/vendor/bootstrap/less/responsive-utilities.less
    A ckan/public/base/vendor/bootstrap/less/responsive.less
    A ckan/public/base/vendor/bootstrap/less/scaffolding.less
    A ckan/public/base/vendor/bootstrap/less/sprites.less
    A ckan/public/base/vendor/bootstrap/less/tables.less
    A ckan/public/base/vendor/bootstrap/less/thumbnails.less
    A ckan/public/base/vendor/bootstrap/less/tooltip.less
    A ckan/public/base/vendor/bootstrap/less/type.less
    A ckan/public/base/vendor/bootstrap/less/utilities.less
    A ckan/public/base/vendor/bootstrap/less/variables.less
    A ckan/public/base/vendor/bootstrap/less/wells.less
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
    A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    A ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/html5.js
    A ckan/public/base/vendor/jed.js
    A ckan/public/base/vendor/jquery.js
    A ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.js
    A ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/spinner.gif
    A ckan/templates/admin/authz.html
    A ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    M ckan/templates/error_document_template.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/confirm_delete.html
    A ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    R ckan/templates/package/snippets/data-api-button.html
    A ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/package_metadata_form.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources.html
    M ckan/templates/package/snippets/search_form.html
    A ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/language_selector.html
    M ckan/templates/snippets/scripts.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates/user/read.html
    A jshint.json
    M setup.py

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

Conflicts:
	ckan/templates/ajax_snippets/api_info.html
	ckan/templates/package/snippets/data_api_button.html

minor changes should all be fine :)


Compare: https://github.com/okfn/ckan/compare/e90bd04d76c7...0a2d59846db2


More information about the ckan-changes mailing list