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

[noreply at github.com]

  Branch: refs/heads/feature-1450-dataset-view
  Home:   https://github.com/okfn/ckan

  Commit: fadda1738399ab2755468d627cc30126fe95a7d9
      https://github.com/okfn/ckan/commit/fadda1738399ab2755468d627cc30126fe95a7d9
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-22 (Tue, 22 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: e54b089f6e24a3d27704b1df0005b72e31da5720
      https://github.com/okfn/ckan/commit/e54b089f6e24a3d27704b1df0005b72e31da5720
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-22 (Tue, 22 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.


  Commit: 358b9d309e0daab8b697e8aadb5e4d3251ec1f06
      https://github.com/okfn/ckan/commit/358b9d309e0daab8b697e8aadb5e4d3251ec1f06
  Author: Tom Rees <zephod at gmail.com>
  Date:   2011-11-22 (Tue, 22 Nov 2011)

  Log Message:
  -----------
  Merge branch '1348'


  Commit: 88e88380f61965f58fb105095e76a78673ce3e2c
      https://github.com/okfn/ckan/commit/88e88380f61965f58fb105095e76a78673ce3e2c
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/templates/group/new_group_form.html
  M ckan/templates/package/new_package_form.html

  Log Message:
  -----------
  [xs] Bug fix: fix problem with auto url generation
in new packages/groups. Templates needed to be
updated after map.explicit was changed to True in 
our routing.py file


  Commit: fb0728d0cb12edd7ad8d2365336b70bea4a9e4c7
      https://github.com/okfn/ckan/commit/fb0728d0cb12edd7ad8d2365336b70bea4a9e4c7
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/lib/munge.py
  M ckan/logic/validators.py
  M ckan/model/package.py
  M ckan/model/tag.py
  M ckan/public/scripts/application.js
  M ckan/templates/group/new_group_form.html
  M ckan/templates/package/new_package_form.html
  R ckan/tests/functional/api/test_ajax.py
  A ckan/tests/functional/api/test_util.py
  M ckan/tests/lib/test_munge.py
  M doc/api.rst

  Log Message:
  -----------
  Merge branch 'master' into feature-1450-dataset-view


  Commit: fd118821e16957574cfe0c3dfe17d07b0a4fb38e
      https://github.com/okfn/ckan/commit/fd118821e16957574cfe0c3dfe17d07b0a4fb38e
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

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

  Log Message:
  -----------
  [ux, dataset-view] tidy up JS slightly


  Commit: b62437c075d9ea9a49288315684bc5ad7799615c
      https://github.com/okfn/ckan/commit/b62437c075d9ea9a49288315684bc5ad7799615c
  Author: John Glover <glover.john at gmail.com>
  Date:   2011-11-23 (Wed, 23 Nov 2011)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js

  Log Message:
  -----------
  [ux, dataset-view] fix expandable notes field


Compare: https://github.com/okfn/ckan/compare/7f5f8a6...b62437c