[ckan-changes] [okfn/ckan] c8af25: Remove some lines of code that have somehow crept ...

[GitHub]

  Branch: refs/heads/remove-authz
  Home:   https://github.com/okfn/ckan
  Commit: c8af251922225f8cf2057d1a946e66d4ca898305
      https://github.com/okfn/ckan/commit/c8af251922225f8cf2057d1a946e66d4ca898305
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Remove some lines of code that have somehow crept back in during some merges


  Commit: 586e131d488c8bd662befdf82e4ad8db2bc747dc
      https://github.com/okfn/ckan/commit/586e131d488c8bd662befdf82e4ad8db2bc747dc
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M doc/organizations_and_groups.rst

  Log Message:
  -----------
  Update the org/group doc to be more acurate


  Commit: 331d0586fd0f58abfac65fe3d8fa5778fa0f4a65
      https://github.com/okfn/ckan/commit/331d0586fd0f58abfac65fe3d8fa5778fa0f4a65
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M doc/organizations_and_groups.rst

  Log Message:
  -----------
  Further update the org/group docs


  Commit: 9483817641341262582fd9ce22df309e3973294f
      https://github.com/okfn/ckan/commit/9483817641341262582fd9ce22df309e3973294f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  Minor cleanup of model_dictize.py


  Commit: fc5ec257232bf9f61e0016ecfd463e343bfe579d
      https://github.com/okfn/ckan/commit/fc5ec257232bf9f61e0016ecfd463e343bfe579d
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  Merge pull request #211 from okfn/clean-model-dictize

[Trivial] Minor cleanup of model_dictize.py


  Commit: fe54ab091331894ff38a584e3a9597e78d119439
      https://github.com/okfn/ckan/commit/fe54ab091331894ff38a584e3a9597e78d119439
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M doc/organizations_and_groups.rst

  Log Message:
  -----------
  Merge pull request #208 from okfn/orgs-doc-fix

Orgs doc fix


  Commit: b83207b005c2a54dcb477fc32f8bce0eb10a12f1
      https://github.com/okfn/ckan/commit/b83207b005c2a54dcb477fc32f8bce0eb10a12f1
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-13 (Thu, 13 Dec 2012)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge pull request #207 from okfn/merge-fix

[Trivial] Remove some lines of code that have somehow crept back in during some merges


  Commit: 1b650f4e9e68563035fa1bf6015cf0d5994ad2d9
      https://github.com/okfn/ckan/commit/1b650f4e9e68563035fa1bf6015cf0d5994ad2d9
  Author: kindly <kindly at gmail.com>
  Date:   2012-12-16 (Sun, 16 Dec 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  remove all _context calls and session.removes


  Commit: 94bf606561cdb4a09fb6e0d82068d500064b07f6
      https://github.com/okfn/ckan/commit/94bf606561cdb4a09fb6e0d82068d500064b07f6
  Author: amercader <amercadero at gmail.com>
  Date:   2012-12-17 (Mon, 17 Dec 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/tests/functional/api/model/test_vocabulary.py

  Log Message:
  -----------
  Merge branch 'fix-context-hacks'


  Commit: bbff265b3b296b866202f0d53eda1ba2a4278de6
      https://github.com/okfn/ckan/commit/bbff265b3b296b866202f0d53eda1ba2a4278de6
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-12-18 (Tue, 18 Dec 2012)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M doc/organizations_and_groups.rst

  Log Message:
  -----------
  Merge branch 'master' into remove-authz

Conflicts:
	ckan/lib/dictization/model_dictize.py

    imports


Compare: https://github.com/okfn/ckan/compare/dc2ca3fe7185...bbff265b3b29