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

Wed Sep 5 11:20:56 UTC 2012

  Branch: refs/heads/2375-demo-organizations
  Home:   https://github.com/okfn/ckan
  Commit: 0bf88cd10a7230ba78c4d80b09cf9315b6d018ff
      https://github.com/okfn/ckan/commit/0bf88cd10a7230ba78c4d80b09cf9315b6d018ff
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M bin/less
    M ckan/lib/cli.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/images/background-tag-ie7.png
    A ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/select-switch.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    A ckan/public/base/less/iehacks.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/profile.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/less/variables.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read.html
    M doc/frontend-development.rst

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


  Commit: e8248279004ab3ee61414f5be0852cdaf3a24871
      https://github.com/okfn/ckan/commit/e8248279004ab3ee61414f5be0852cdaf3a24871
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    A ckan/controllers/organization.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/publisher/__init__.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/public/scripts/application.js
    A ckan/templates/organizations/base_form_page.html
    A ckan/templates/organizations/email/join_publisher_request.txt
    A ckan/templates/organizations/form.html
    A ckan/templates/organizations/index.html
    A ckan/templates/organizations/new.html
    A ckan/templates/organizations/read.html
    A ckan/templates/organizations/snippets/feeds.html
    A ckan/templates/organizations/snippets/organization_form.html
    A ckan/templates/organizations/snippets/organization_item.html
    A ckan/templates/organizations/snippets/organization_list.html
    A ckan/templates/organizations/users.html
    A ckan/templates/organizations/users_form.html
    M ckan/templates_legacy/_util.html
    M ckan/templates_legacy/js_strings.html
    A ckan/templates_legacy/organization/__init__.py
    A ckan/templates_legacy/organization/apply.html
    A ckan/templates_legacy/organization/apply_form.html
    A ckan/templates_legacy/organization/edit.html
    A ckan/templates_legacy/organization/email/join_publisher_request.txt
    A ckan/templates_legacy/organization/history.html
    A ckan/templates_legacy/organization/index.html
    A ckan/templates_legacy/organization/layout.html
    A ckan/templates_legacy/organization/new.html
    A ckan/templates_legacy/organization/organization_form.html
    A ckan/templates_legacy/organization/read.html
    A ckan/templates_legacy/organization/users.html
    A ckan/templates_legacy/organization/users_form.html
    R ckan/tests/misc/test_auth_profiles.py

  Log Message:
  -----------
  Merge from organizations-in-core into new demo branch


  Commit: f5995f179e4e8f55e5fe134f0d0ce9e26f78ab99
      https://github.com/okfn/ckan/commit/f5995f179e4e8f55e5fe134f0d0ce9e26f78ab99
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    A ckan/templates/organization/base_form_page.html
    A ckan/templates/organization/email/join_publisher_request.txt
    A ckan/templates/organization/form.html
    A ckan/templates/organization/index.html
    A ckan/templates/organization/new.html
    A ckan/templates/organization/read.html
    A ckan/templates/organization/snippets/feeds.html
    A ckan/templates/organization/snippets/organization_form.html
    A ckan/templates/organization/snippets/organization_item.html
    A ckan/templates/organization/snippets/organization_list.html
    A ckan/templates/organization/users.html
    A ckan/templates/organization/users_form.html
    R ckan/templates/organizations/base_form_page.html
    R ckan/templates/organizations/email/join_publisher_request.txt
    R ckan/templates/organizations/form.html
    R ckan/templates/organizations/index.html
    R ckan/templates/organizations/new.html
    R ckan/templates/organizations/read.html
    R ckan/templates/organizations/snippets/feeds.html
    R ckan/templates/organizations/snippets/organization_form.html
    R ckan/templates/organizations/snippets/organization_item.html
    R ckan/templates/organizations/snippets/organization_list.html
    R ckan/templates/organizations/users.html
    R ckan/templates/organizations/users_form.html
    A ckan/templates/snippets/organization.html

  Log Message:
  -----------
  Moving around the templates and adding organization for sidebar


  Commit: 0c9045994a3ecbef06ed63af5c3ff44dadcdc4b2
      https://github.com/okfn/ckan/commit/0c9045994a3ecbef06ed63af5c3ff44dadcdc4b2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-09-05 (Wed, 05 Sep 2012)

  Changed paths:
    A ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  Adding organization item template


Compare: https://github.com/okfn/ckan/compare/0bf88cd10a72^...0c9045994a3e