[ckan-changes] [okfn/ckan] 1ceaba: Update version number

[GitHub]

  Branch: refs/heads/release-v1.8
  Home:   https://github.com/okfn/ckan
  Commit: 1ceaba22e5a01421b5c2440817c3c8fd5e61d7e4
      https://github.com/okfn/ckan/commit/1ceaba22e5a01421b5c2440817c3c8fd5e61d7e4
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number


  Commit: 15f98d083f7cf02439cf4978a40e691c82971a0a
      https://github.com/okfn/ckan/commit/15f98d083f7cf02439cf4978a40e691c82971a0a
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch '2757-source-install-upgrade-docs'


  Commit: cfdeb919f228f917b287eda203e5a5371e0977bc
      https://github.com/okfn/ckan/commit/cfdeb919f228f917b287eda203e5a5371e0977bc
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Fix for relative url being used when doing file upload to local storage


  Commit: 148081c7d579a3ae7cd2f305036bf879b43085b0
      https://github.com/okfn/ckan/commit/148081c7d579a3ae7cd2f305036bf879b43085b0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

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


  Commit: 0bdaf23147f518e45a10bb181b83507ab45f45b1
      https://github.com/okfn/ckan/commit/0bdaf23147f518e45a10bb181b83507ab45f45b1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M ckan/templates/related/add-related.html

  Log Message:
  -----------
  [#2770] Mark strings for translation on add related item form


  Commit: 9acc9ea27723ed4ee90380512652f7c37114b18f
      https://github.com/okfn/ckan/commit/9acc9ea27723ed4ee90380512652f7c37114b18f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/public/scripts/templates.js
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  [i18n] Mark 2 resource form strings for i18n


  Commit: bd860dc58758356f36518586d1b70e1079700ba2
      https://github.com/okfn/ckan/commit/bd860dc58758356f36518586d1b70e1079700ba2
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#2784] Hand control of user's sensitive data to user_dictize.

Only a sysadmin or the owner of the account may view a user's apikey
or reset_key.

This does not change behaviour of the actions; just moves the logic
form the actions to the model dictize layer.


  Commit: 7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
      https://github.com/okfn/ckan/commit/7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/tests/functional/api/test_user.py

  Log Message:
  -----------
  [#2784] Allow users to see their apikey when creating or updating themselves.


  Commit: 21ca66c77e9a618cec24709430e73c4409c1ac2c
      https://github.com/okfn/ckan/commit/21ca66c77e9a618cec24709430e73c4409c1ac2c
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [#2784] User email is treated as sensitive data


  Commit: d7408ff17d167d753b08acd62747d661d664e833
      https://github.com/okfn/ckan/commit/d7408ff17d167d753b08acd62747d661d664e833
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  [#2784] Set user domain object in 'user_obj' in context instead of 'user'


  Commit: a12973769c6320c6ff78201e83231ab4f5ebd4c1
      https://github.com/okfn/ckan/commit/a12973769c6320c6ff78201e83231ab4f5ebd4c1
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  Merge branch '2784-model-dictize-sensitive-data' into release-v1.8

Conflicts:
	ckan/__init__.py
	ckan/controllers/storage.py


  Commit: a26d88cf4ef59980683b594958abe52e1a42c5e5
      https://github.com/okfn/ckan/commit/a26d88cf4ef59980683b594958abe52e1a42c5e5
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#2755] Don't call user_show twice


Compare: https://github.com/okfn/ckan/compare/b7f7a80cf895...a26d88cf4ef5