[ckan-changes] [okfn/ckan] 940c72: Merge branch '2375-demo-theme-development' of http...

Wed Aug 29 12:47:34 UTC 2012

  Branch: refs/heads/2375-demo-theme-development
  Home:   https://github.com/okfn/ckan
  Commit: 940c726af832765f1665e81ea13a2a836cca22ad
      https://github.com/okfn/ckan/commit/940c726af832765f1665e81ea13a2a836cca22ad
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/helpers.py
    M ckan/templates/admin/config.html
    A ckan/templates/admin/confirm_reset.html
    M ckan/templates/snippets/debug.html

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

  Commit: db28796b61f4eef590d979435521c39bd867668e
      https://github.com/okfn/ckan/commit/db28796b61f4eef590d979435521c39bd867668e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckanext/organizations/controllers.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organizations/form.html
    A ckanext/organizations/templates/organizations/index.html
    A ckanext/organizations/templates/organizations/new.html
    A ckanext/organizations/templates/organizations/read.html
    A ckanext/organizations/templates/organizations/users.html
    A ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organization_apply.html
    R ckanext/organizations/templates_legacy/organization_apply_form.html
    R ckanext/organizations/templates_legacy/organization_form.html
    R ckanext/organizations/templates_legacy/organization_history.html
    R ckanext/organizations/templates_legacy/organization_index.html
    R ckanext/organizations/templates_legacy/organization_layout.html
    R ckanext/organizations/templates_legacy/organization_new.html
    R ckanext/organizations/templates_legacy/organization_package_form.html
    R ckanext/organizations/templates_legacy/organization_read.html
    R ckanext/organizations/templates_legacy/organization_users.html
    R ckanext/organizations/templates_legacy/organization_users_form.html
    A ckanext/organizations/templates_legacy/organizations/apply.html
    A ckanext/organizations/templates_legacy/organizations/apply_form.html
    A ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    A ckanext/organizations/templates_legacy/organizations/form.html
    A ckanext/organizations/templates_legacy/organizations/history.html
    A ckanext/organizations/templates_legacy/organizations/index.html
    A ckanext/organizations/templates_legacy/organizations/layout.html
    A ckanext/organizations/templates_legacy/organizations/new.html
    A ckanext/organizations/templates_legacy/organizations/package_form.html
    A ckanext/organizations/templates_legacy/organizations/read.html
    A ckanext/organizations/templates_legacy/organizations/users.html
    A ckanext/organizations/templates_legacy/organizations/users_form.html

  Log Message:
  -----------
  Tidying up the legacy organization templates, and create skeletons for new templates.

Currently requires user management templates, applying for membership and a plan for how
to integrate the organisation IDatasetForm into the dataset form for auto-adding to group.

Compare: https://github.com/okfn/ckan/compare/61b33f6a5a3f...db28796b61f4