[ckan-changes] [okfn/ckan] c8815e: Merge branch 'master' into feature-2255-organizati...

[GitHub]

  Branch: refs/heads/feature-2255-organizations
  Home:   https://github.com/okfn/ckan
  Commit: c8815e840cd82f1fdbd36829faa3e0bf02a94ce8
      https://github.com/okfn/ckan/commit/c8815e840cd82f1fdbd36829faa3e0bf02a94ce8
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/recline.js
  A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-2255-organizations


  Commit: bfe7c706922cd244f96e9b81cb47cd17f57700ae
      https://github.com/okfn/ckan/commit/bfe7c706922cd244f96e9b81cb47cd17f57700ae
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  R ckan/public/css/blueprint/ie.css
  R ckan/public/css/blueprint/print.css
  R ckan/public/css/blueprint/screen.css
  R ckan/public/css/bootstrap.css
  A ckan/public/css/bootstrap.min.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  A ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
  M ckan/templates/_snippet/data-api-help.html
  M ckan/templates/_util.html
  M ckan/templates/admin/authz.html
  M ckan/templates/admin/trash.html
  M ckan/templates/authorization_group/edit_form.html
  M ckan/templates/facets.html
  M ckan/templates/group/authz.html
  M ckan/templates/group/edit.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/authz.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/history.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search_form.html
  M ckan/templates/revision/diff.html
  M ckan/templates/revision/list.html
  M ckan/templates/revision/read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.html
  M ckan/templates/user/new_user_form.html
  M ckan/templates/user/perform_reset.html
  M ckan/templates/user/read.html
  M ckan/templates/user/request_reset.html
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  M ckanext/publisher_form/templates/publisher_read.html
  R doc/ckan_form_guidance.doc
  M doc/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: d92e41e973cefdb198a0abb28896516c8925a60e
      https://github.com/okfn/ckan/commit/d92e41e973cefdb198a0abb28896516c8925a60e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py
  R ckan/public/css/blueprint/ie.css
  R ckan/public/css/blueprint/print.css
  R ckan/public/css/blueprint/screen.css
  R ckan/public/css/bootstrap.css
  A ckan/public/css/bootstrap.min.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  R ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
  A ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
  M ckan/templates/_snippet/data-api-help.html
  M ckan/templates/_util.html
  M ckan/templates/admin/authz.html
  M ckan/templates/admin/trash.html
  M ckan/templates/authorization_group/edit_form.html
  M ckan/templates/facets.html
  M ckan/templates/group/authz.html
  M ckan/templates/group/edit.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/group/read.html
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/authz.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/editresources.html
  M ckan/templates/package/history.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search_form.html
  M ckan/templates/revision/diff.html
  M ckan/templates/revision/list.html
  M ckan/templates/revision/read.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.html
  M ckan/templates/user/new_user_form.html
  M ckan/templates/user/perform_reset.html
  M ckan/templates/user/read.html
  M ckan/templates/user/request_reset.html
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckanext/organizations/templates/organization_package_form.html
  M ckanext/publisher_form/templates/dataset_form.html
  M ckanext/publisher_form/templates/publisher_form.html
  M ckanext/publisher_form/templates/publisher_read.html
  R doc/ckan_form_guidance.doc
  M doc/datastore.rst

  Log Message:
  -----------
  Merge from master and new template fields for privacy setting


Compare: https://github.com/okfn/ckan/compare/ad69239...d92e41e