[ckan-changes] [okfn/ckan] 7c3888: PEP8ification of controllers module

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 7c38889103c0b88a7a5bc4b3fb23131cc4f5ed00
      https://github.com/okfn/ckan/commit/7c38889103c0b88a7a5bc4b3fb23131cc4f5ed00
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/authorization_group.py
    M ckan/controllers/datastore.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py

  Log Message:
  -----------
  PEP8ification of controllers module


  Commit: c00f61024e07f2a9af639431f755cd93f31e9da7
      https://github.com/okfn/ckan/commit/c00f61024e07f2a9af639431f755cd93f31e9da7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/lib/accept.py

  Log Message:
  -----------
  PEP8ified


  Commit: d434cc35dd4544ae72e147ca683e23eab003570e
      https://github.com/okfn/ckan/commit/d434cc35dd4544ae72e147ca683e23eab003570e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/lib/celery_app.py

  Log Message:
  -----------
  PEP8ified


  Commit: df89f946a1d50b4bf8af0ccb1ac2c68bece529cb
      https://github.com/okfn/ckan/commit/df89f946a1d50b4bf8af0ccb1ac2c68bece529cb
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/lib/search/__init__.py

  Log Message:
  -----------
  PEP8ified


  Commit: 69ddf00a6bb57d4752dff06335ea30ce58003777
      https://github.com/okfn/ckan/commit/69ddf00a6bb57d4752dff06335ea30ce58003777
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/lib/search/common.py

  Log Message:
  -----------
  PEP8ified


  Commit: 3d239c55a980c33b8404c8e762d86e1e9b53ab8b
      https://github.com/okfn/ckan/commit/3d239c55a980c33b8404c8e762d86e1e9b53ab8b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_versions.py
    M doc/solr-setup.rst

  Log Message:
  -----------
  merge with master branch


  Commit: a78c8275413bba31891cf74bce610053e51847ca
      https://github.com/okfn/ckan/commit/a78c8275413bba31891cf74bce610053e51847ca
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/authorization_group.py
    M ckan/controllers/datastore.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/celery_app.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py

  Log Message:
  -----------
  Merge branch 'enhancement-pep8-controllers'

Conflicts:
	ckan/controllers/package.py
	ckan/controllers/related.py
	ckan/lib/search/__init__.py
minor merge conflicts


  Commit: fa9dc06e1e560946a7840fe6507017524dd1bbe9
      https://github.com/okfn/ckan/commit/fa9dc06e1e560946a7840fe6507017524dd1bbe9
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/config/environment.py

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


Compare: https://github.com/okfn/ckan/compare/75283f65d644...fa9dc06e1e56