[ckan-changes] [okfn/ckan] 984430: [bugfix, doc/install-from-source.rst][s]: refactor ...

Thu Feb 16 13:57:21 UTC 2012

  Branch: refs/heads/feature-1741-add-datasetview-extension
  Home:   https://github.com/okfn/ckan
  Commit: 9844308e75259f98876c1d9afa5865b0be54c581
      https://github.com/okfn/ckan/commit/9844308e75259f98876c1d9afa5865b0be54c581
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-08 (Wed, 08 Feb 2012)

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

  Log Message:
  -----------
  [bugfix,doc/install-from-source.rst][s]: refactor and fix bug whereby we pointed to v1.5 for source install and that does not work because v1.5 requires vdm in bitbucket.

  Commit: 08c21df25270842fed9990cea75583aafe80c6a6
      https://github.com/okfn/ckan/commit/08c21df25270842fed9990cea75583aafe80c6a6
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-09 (Thu, 09 Feb 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [master,css][xs]: nicer gravatar styling.

  Commit: 73f2b028531f2167b897e5c7fd6da44fb14a0453
      https://github.com/okfn/ckan/commit/73f2b028531f2167b897e5c7fd6da44fb14a0453
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M ckan/logic/auth/publisher/get.py

  Log Message:
  -----------
  [1669] Fix to the package show logic for deleted packages

  Commit: 495be3eb8a8f19cc5a083fb0f7c9fe2ace12af56
      https://github.com/okfn/ckan/commit/495be3eb8a8f19cc5a083fb0f7c9fe2ace12af56
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

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

  Log Message:
  -----------
  [xs] Change the building of search indices to only pull active packages

  Commit: 059040f71dbe09bae27c42ba771ccd0c994f241a
      https://github.com/okfn/ckan/commit/059040f71dbe09bae27c42ba771ccd0c994f241a
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    R doc/plugins.rst
  A doc/writing-extensions.rst

  Log Message:
  -----------
  [release-v1.6][[doc]: Renamed doc to be more helpful.

  Commit: e9c315f289f513125a102f6711dee407ff52ffa3
      https://github.com/okfn/ckan/commit/e9c315f289f513125a102f6711dee407ff52ffa3
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M doc/common-error-messages.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/prepare-extensions.rst

  Log Message:
  -----------
  [release-v1.6][doc]: Update docs generally.

  Commit: 241687f5735c159bc66b97e95f570a47986db187
      https://github.com/okfn/ckan/commit/241687f5735c159bc66b97e95f570a47986db187
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-10 (Fri, 10 Feb 2012)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  [master][version]: Increment version now we have branched for release-v1.6.

  Commit: d3cd286aeba98fdee58abf8fdc56c459a13a0161
      https://github.com/okfn/ckan/commit/d3cd286aeba98fdee58abf8fdc56c459a13a0161
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/logic/auth/publisher/get.py
  M ckan/logic/auth/publisher/update.py

  Log Message:
  -----------
  [1669] Allow ignore_auth to be specified in context for package_show

  Commit: 55c8ff6f108a1b9706b01ea68d875042639bfa9e
      https://github.com/okfn/ckan/commit/55c8ff6f108a1b9706b01ea68d875042639bfa9e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
  M ckan/model/license.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M requires/lucid_missing.txt

  Log Message:
  -----------
  [#1359,licenses][s]: refactor to remove dependency on external licenses package.

* Inline list of default licenses (those from http://licenses.opendefinition.org/licenses/groups/ckan.json)
* Minor refactoring on initialization of LicenseRegister to support dicts or lists or licenses
* Fix up tests (now that we do not have gpl in our default lists of licenses)

  Commit: 19fc61ac56826407965438bdc5d973e20dc00dc0
      https://github.com/okfn/ckan/commit/19fc61ac56826407965438bdc5d973e20dc00dc0
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/tests/forms/test_package.py

  Log Message:
  -----------
  [#1359,tests][xs]: fix up one test missed in previous commit (gpl -> odc-by for demo license).

  Commit: 8b89ced1da1e4a3126cc052dd339c74a090dd194
      https://github.com/okfn/ckan/commit/8b89ced1da1e4a3126cc052dd339c74a090dd194
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M doc/configuration.rst

  Log Message:
  -----------
  [#1359,doc][xs]: minor updates to docs re license_group_url to reflect new setup.

  Commit: a8b0e3b0cd453c2440e7dff5d82feab62e22057c
      https://github.com/okfn/ckan/commit/a8b0e3b0cd453c2440e7dff5d82feab62e22057c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  [#1359,licenses][xs]: remove unused method get_by_title on LicenseRegister.

  Commit: 2f789700af9ba20ed2970674c6504be8a33401d9
      https://github.com/okfn/ckan/commit/2f789700af9ba20ed2970674c6504be8a33401d9
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/lib/create_test_data.py
  M ckan/model/license.py
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M doc/configuration.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  [#1359,merge][s]: Merge branch 'feature-1359-license-choice-simplify' thereby fixes #1359.

  Commit: c99ff1bee53cf16e33800c131951afd11fa961c2
      https://github.com/okfn/ckan/commit/c99ff1bee53cf16e33800c131951afd11fa961c2
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    A ckan/migration/versions/049_term_translation_table.py
  M ckan/model/__init__.py
  A ckan/model/term_translation.py

  Log Message:
  -----------
  [1781] add migration and tables

  Commit: 0decb55af51e6abebbde6e3a5ba19026153af86b
      https://github.com/okfn/ckan/commit/0decb55af51e6abebbde6e3a5ba19026153af86b
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/controllers/user.py
  M ckan/lib/base.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/search/__init__.py
  M ckan/logic/validators.py
  M ckan/model/license.py
  M ckan/public/css/style.css
  M ckan/templates/_util.html
  M ckan/templates/activity_streams/added_tag.html
  M ckan/templates/activity_streams/changed_group.html
  M ckan/templates/activity_streams/changed_package.html
  M ckan/templates/activity_streams/changed_package_extra.html
  M ckan/templates/activity_streams/changed_resource.html
  M ckan/templates/activity_streams/changed_user.html
  M ckan/templates/activity_streams/deleted_group.html
  M ckan/templates/activity_streams/deleted_package.html
  M ckan/templates/activity_streams/deleted_package_extra.html
  M ckan/templates/activity_streams/deleted_resource.html
  M ckan/templates/activity_streams/new_group.html
  M ckan/templates/activity_streams/new_package.html
  M ckan/templates/activity_streams/new_package_extra.html
  M ckan/templates/activity_streams/new_resource.html
  M ckan/templates/activity_streams/new_user.html
  M ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/package/history.html
  M ckan/templates/package/read.html
  M ckan/templates/user/read.html
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_package.py
  A ckan/tests/lib/test_hash.py
  M ckan/tests/lib/test_helpers.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M doc/apiv3.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-1781-add-term-translation-table

  Commit: fa8b3e364a33458bfe35c55dcf8df48ff910387e
      https://github.com/okfn/ckan/commit/fa8b3e364a33458bfe35c55dcf8df48ff910387e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/lib/create_test_data.py
  M ckan/lib/search/__init__.py
  M ckan/model/license.py
  M ckan/public/css/style.css
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-1669-publisher-profile

  Commit: e135bb0656d3de8f392d6b9f7be3b062f6ab2d47
      https://github.com/okfn/ckan/commit/e135bb0656d3de8f392d6b9f7be3b062f6ab2d47
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/lib/alphabet_paginate.py
  M ckan/logic/auth/publisher/create.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/misc/test_auth_profiles.py

  Log Message:
  -----------
  [1669] Fixes to pass tests in alphabet paging and publisher auth

  Commit: a608d92467a9c2ac689456f73999e7ee079c4672
      https://github.com/okfn/ckan/commit/a608d92467a9c2ac689456f73999e7ee079c4672
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/auth/create.py
  A ckan/logic/auth/publisher/__init__.py
  A ckan/logic/auth/publisher/create.py
  A ckan/logic/auth/publisher/delete.py
  A ckan/logic/auth/publisher/get.py
  A ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/schema.py
  A ckan/migration/versions/0049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/model/user.py
  M ckan/new_authz.py
  A ckan/public/css/chosen.css
  M ckan/public/css/style.css
  A ckan/public/images/chosen-sprite.png
  M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/test_group.py
  A ckan/tests/functional/test_publisher_auth.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/logic/test_action.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.py
  A ckanext/publisher_form/__init__.py
  A ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/dataset_form.html
  A ckanext/publisher_form/templates/publisher_form.html
  M doc/configuration.rst
  M setup.py

  Log Message:
  -----------
  Merge branch 'feature-1669-publisher-profile'

  Commit: 3d7cbf02f0eb2130c13a67e8a66259701b40cfe5
      https://github.com/okfn/ckan/commit/3d7cbf02f0eb2130c13a67e8a66259701b40cfe5
  Author: Toby <toby at potatolondon.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#1057][xs] escape pjson callback

  Commit: 9d808a98debd046928031e930167c1fd3bc2d2d2
      https://github.com/okfn/ckan/commit/9d808a98debd046928031e930167c1fd3bc2d2d2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [xs] Minor tweak to how group members are accessed by type in Group model

  Commit: c1e723cfc25efd5994cd4d8edec4f532edf764dc
      https://github.com/okfn/ckan/commit/c1e723cfc25efd5994cd4d8edec4f532edf764dc
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py

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

  Commit: dc5ca52ab053b7d214dc946ccc229990abb91047
      https://github.com/okfn/ckan/commit/dc5ca52ab053b7d214dc946ccc229990abb91047
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  [xs] Fix the query to fetch group members of a particular model type

  Commit: 45ac98451800b9be45cfc25a02c48ab20808251c
      https://github.com/okfn/ckan/commit/45ac98451800b9be45cfc25a02c48ab20808251c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckanext/publisher_form/templates/publisher_form.html

  Log Message:
  -----------
  [1794] Reducing the amount of user clutter

  Commit: db71e3072786a6718ecbe28130d89165aa96513e
      https://github.com/okfn/ckan/commit/db71e3072786a6718ecbe28130d89165aa96513e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/lib/alphabet_paginate.py

  Log Message:
  -----------
  [xs] Fix for alpha pagination when using strings rather than objects

  Commit: c26a74186a7a1290abd976d80696c75e58152433
      https://github.com/okfn/ckan/commit/c26a74186a7a1290abd976d80696c75e58152433
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/auth/create.py
  A ckan/logic/auth/publisher/__init__.py
  A ckan/logic/auth/publisher/create.py
  A ckan/logic/auth/publisher/delete.py
  A ckan/logic/auth/publisher/get.py
  A ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/schema.py
  A ckan/migration/versions/0049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/model/user.py
  M ckan/new_authz.py
  A ckan/public/css/chosen.css
  M ckan/public/css/style.css
  A ckan/public/images/chosen-sprite.png
  M ckan/public/scripts/application.js
  A ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/test_group.py
  A ckan/tests/functional/test_publisher_auth.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/logic/test_action.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.py
  A ckanext/publisher_form/__init__.py
  A ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/dataset_form.html
  A ckanext/publisher_form/templates/publisher_form.html
  M doc/configuration.rst
  M setup.py

  Log Message:
  -----------
  Merge branch 'master' into feature-1781-add-term-translation-table

  Commit: fb967293b5935671c32e93a557a4b42dbeead865
      https://github.com/okfn/ckan/commit/fb967293b5935671c32e93a557a4b42dbeead865
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    R ckan/migration/versions/049_term_translation_table.py
  A ckan/migration/versions/050_term_translation_table.py

  Log Message:
  -----------
  [1781] change migration number due to merge

  Commit: 7f029ce19b619b103104a646d84b52dbf9ca8f88
      https://github.com/okfn/ckan/commit/7f029ce19b619b103104a646d84b52dbf9ca8f88
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Code (whitespace) cleanup

  Commit: 643a800bfa7b76074203f332218506d1db3da854
      https://github.com/okfn/ckan/commit/643a800bfa7b76074203f332218506d1db3da854
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  [1794] Added autocomplete for groups

  Commit: 0546a5ed1be7f090d1eb3f8ebeb2071b2f324c10
      https://github.com/okfn/ckan/commit/0546a5ed1be7f090d1eb3f8ebeb2071b2f324c10
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  [1794] Allowing group create/update to optionally add the parent group

  Commit: 64900fae93d617f442b46a250e50d9c083644916
      https://github.com/okfn/ckan/commit/64900fae93d617f442b46a250e50d9c083644916
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-14 (Tue, 14 Feb 2012)

  Changed paths:
    R ckan/migration/versions/0049_add_group_approval_status.py
  A ckan/migration/versions/049_add_group_approval_status.py

  Log Message:
  -----------
  [1794] Fixed dodgy migration name

  Commit: 718d0f79aa12ce5e5926eb2d9b82d846b65d1599
      https://github.com/okfn/ckan/commit/718d0f79aa12ce5e5926eb2d9b82d846b65d1599
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  R ckan/migration/versions/0049_add_group_approval_status.py
  A ckan/migration/versions/049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js

  Log Message:
  -----------
  Merge branch 'feature-1794-publisher-changes'

  Commit: 00c071ff8cb972201e582ca98e99a4f2f948750e
      https://github.com/okfn/ckan/commit/00c071ff8cb972201e582ca98e99a4f2f948750e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  [xs] Fixing publisher group test that had not run under sqlite

  Commit: 91e9a2d44ad4c33f5cac6626ea49609401c94637
      https://github.com/okfn/ckan/commit/91e9a2d44ad4c33f5cac6626ea49609401c94637
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1608,bugfix][xs]: minor, but important bugfix for blob storage.

* Bug: we had merged ckanext-storage into core as part of #1608 but the JS was checking CKAN.Plugins list in javascript (build from ckan.plugins in config) when determining whether to show Upload button. Thus new users would not have known how to enable uploading.
* Fixed this by adding 'storage' to CKAN.Plugins in JS if ckan.storage.bucket config option is set.

  Commit: d59cd9c9d9fa406b6cec091d1699f0a7c62a9d50
      https://github.com/okfn/ckan/commit/d59cd9c9d9fa406b6cec091d1699f0a7c62a9d50
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-15 (Wed, 15 Feb 2012)

  Changed paths:
    M ckan/templates/package/edit.html
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [bugfix,js][xs]: make sure we do *not* genshi HTML escape json package and resource data we are inserting into pages (dataset edit and resource read).

* Had run into this via an odd bug whereby a resource url that was an html page was not previewing and reason was & had been converted to &

  Commit: e1864007a058e493c2e12f42c6eb726f0a39faf4
      https://github.com/okfn/ckan/commit/e1864007a058e493c2e12f42c6eb726f0a39faf4
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/helpers.py
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  R ckan/migration/versions/0049_add_group_approval_status.py
  A ckan/migration/versions/049_add_group_approval_status.py
  M ckan/model/group.py
  M ckan/public/scripts/application.js
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/functional/test_group.py
  M ckanext/publisher_form/templates/publisher_form.html

  Log Message:
  -----------
  Merge branch 'master' into feature-1781-add-term-translation-table

  Commit: 6acb26385688367e86af0a37c905cc4e61c660d0
      https://github.com/okfn/ckan/commit/6acb26385688367e86af0a37c905cc4e61c660d0
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [1781]  add api and tests

  Commit: 669a8e9f7a768b147b1668940842b72b2a302088
      https://github.com/okfn/ckan/commit/669a8e9f7a768b147b1668940842b72b2a302088
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  A ckan/migration/versions/050_term_translation_table.py
  M ckan/model/__init__.py
  A ckan/model/term_translation.py
  M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'feature-1781-add-term-translation-table'

  Commit: a4aa80529e8b962b766427739bc581535ce0577a
      https://github.com/okfn/ckan/commit/a4aa80529e8b962b766427739bc581535ce0577a
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/authorization_group.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  A ckan/lib/activity.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/base.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/__init__.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  A ckan/logic/auth/publisher/__init__.py
  A ckan/logic/auth/publisher/create.py
  A ckan/logic/auth/publisher/delete.py
  A ckan/logic/auth/publisher/get.py
  A ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  A ckan/migration/versions/048_add_activity_streams_tables.py
  A ckan/migration/versions/049_add_group_approval_status.py
  A ckan/migration/versions/050_term_translation_table.py
  M ckan/model/__init__.py
  A ckan/model/activity.py
  M ckan/model/authorization_group.py
  M ckan/model/authz.py
  M ckan/model/group.py
  M ckan/model/license.py
  M ckan/model/meta.py
  M ckan/model/package.py
  M ckan/model/package_extra.py
  M ckan/model/resource.py
  M ckan/model/tag.py
  A ckan/model/term_translation.py
  M ckan/model/user.py
  M ckan/new_authz.py
  A ckan/public/css/chosen.css
  M ckan/public/css/style.css
  A ckan/public/images/chosen-sprite.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
  M ckan/templates/_util.html
  A ckan/templates/activity_streams/added_tag.html
  A ckan/templates/activity_streams/changed_group.html
  A ckan/templates/activity_streams/changed_package.html
  A ckan/templates/activity_streams/changed_package_extra.html
  A ckan/templates/activity_streams/changed_resource.html
  A ckan/templates/activity_streams/changed_user.html
  A ckan/templates/activity_streams/deleted_group.html
  A ckan/templates/activity_streams/deleted_package.html
  A ckan/templates/activity_streams/deleted_package_extra.html
  A ckan/templates/activity_streams/deleted_resource.html
  A ckan/templates/activity_streams/new_group.html
  A ckan/templates/activity_streams/new_package.html
  A ckan/templates/activity_streams/new_package_extra.html
  A ckan/templates/activity_streams/new_resource.html
  A ckan/templates/activity_streams/new_user.html
  A ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/group/layout.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/history.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/read.html
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/api/base.py
  A ckan/tests/functional/api/test_activity.py
  A ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_edit_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_package_edit_authz.py
  A ckan/tests/functional/test_publisher_auth.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  A ckan/tests/lib/test_hash.py
  M ckan/tests/lib/test_helpers.py
  M ckan/tests/logic/test_action.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  A ckanext/publisher_form/__init__.py
  A ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/dataset_form.html
  A ckanext/publisher_form/templates/publisher_form.html
  M doc/apiv3.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt
  M setup.py

  Log Message:
  -----------
  Merge branch 'master' into feature-1741-add-datasetview-extension

  Commit: 7825caed3361e88a245b5dd2f946da8bedb160e0
      https://github.com/okfn/ckan/commit/7825caed3361e88a245b5dd2f946da8bedb160e0
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-16 (Thu, 16 Feb 2012)

  Changed paths:
    M ckan/controllers/group.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/plugins/interfaces.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/lib/test_dictization.py

  Log Message:
  -----------
  [1741] add group view, fix tests

Compare: https://github.com/okfn/ckan/compare/2d4cc50...7825cae