[ckan-changes] [okfn/ckan] 2ea20f: [js][s]: Merge pulled files out of sync. Restoring...

[noreply at github.com]

  Branch: refs/heads/release-v1.5.1
  Home:   https://github.com/okfn/ckan

  Commit: 2ea20fd512989b68da1f7e6c2bdebeb1c53e7b35
      https://github.com/okfn/ckan/commit/2ea20fd512989b68da1f7e6c2bdebeb1c53e7b35
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/templates/group/new_group_form.html

  Log Message:
  -----------
  [js][s]: Merge pulled files out of sync. Restoring url slug editor.


  Commit: 9dd930e202524bd161bd1afc7e45ffdc6689cbba
      https://github.com/okfn/ckan/commit/9dd930e202524bd161bd1afc7e45ffdc6689cbba
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-28 (Mon, 28 Nov 2011)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [js,preview][xs]: Old bug needed fixing. Don't set up preview buttons if there are no resources.


Compare: https://github.com/okfn/ckan/compare/db814be...9dd930e