[ckan-changes] [okfn/ckan] 373b05: [#2375] Add missing data attribute that was lost i...

[GitHub]

  Branch: refs/heads/2375-demo-theme-development
  Home:   https://github.com/okfn/ckan
  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: 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


Compare: https://github.com/okfn/ckan/compare/319fb436e0ea...c09d8e36539b