[ckan-changes] [okfn/ckan] 8a0133: [#2536] refactor of activity stream output

GitHub noreply at github.com
Tue Sep 11 09:08:29 UTC 2012


  Branch: refs/heads/2750-add-docs-and-examples-for-idatasetform-and-igroupform
  Home:   https://github.com/okfn/ckan
  Commit: 8a0133ec90038bcf36217b74b4375a77b37040f2
      https://github.com/okfn/ckan/commit/8a0133ec90038bcf36217b74b4375a77b37040f2
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-06-15 (Fri, 15 Jun 2012)

  Changed paths:
    M ckan/logic/action/get.py
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_resource.html
    A ckan/templates/activity_streams/general.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html

  Log Message:
  -----------
  [#2536] refactor of activity stream output


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

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#2536] fix test fail due to refactor


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/templates/activity_streams/general.html
    M ckan/tests/functional/test_activity.py

  Log Message:
  -----------
  [#2536] general code cleanup


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

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

  Log Message:
  -----------
  [#2536] remove some debugging code added in error


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

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

  Log Message:
  -----------
  move activity_info to the correct place so that locale is correctly used


  Commit: 7172a9ec277d41c5c73b23e8276decd449e21140
      https://github.com/okfn/ckan/commit/7172a9ec277d41c5c73b23e8276decd449e21140
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/controllers/group.py

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


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

  Changed paths:
    M ckan/public/scripts/application.js
    A ckan/public/scripts/vendor/moment/1.6.2/moment.js
    A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph.css
    R ckan/public/scripts/vendor/recline/css/grid.css
    R ckan/public/scripts/vendor/recline/css/images/edit-map.png
    R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
    R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
    R ckan/public/scripts/vendor/recline/css/map.css
    A ckan/public/scripts/vendor/recline/css/recline.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/slickgrid/images/actions.gif
    R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
    R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
    R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
    R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
    R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
    R ckan/public/scripts/vendor/slickgrid/images/down.gif
    R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
    R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/expand.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/help.png
    R ckan/public/scripts/vendor/slickgrid/images/info.gif
    R ckan/public/scripts/vendor/slickgrid/images/listview.gif
    R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
    R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
    R ckan/public/scripts/vendor/slickgrid/images/stripes.png
    R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
    R ckan/public/scripts/vendor/slickgrid/images/tick.png
    R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
    R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
    R ckan/public/scripts/vendor/slickgrid/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/slick.grid.js
    M ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/snippets/recline-extra-footer.html
    M ckan/templates/snippets/recline-extra-header.html

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


  Commit: a88f79add4767700b633567c50db5280de11b0bb
      https://github.com/okfn/ckan/commit/a88f79add4767700b633567c50db5280de11b0bb
  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 for release 1.8 beta


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

  Changed paths:
    M ckan/__init__.py

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


  Commit: 71a3d203efb0777f55ad48ceb11c21ef9c6dd227
      https://github.com/okfn/ckan/commit/71a3d203efb0777f55ad48ceb11c21ef9c6dd227
  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' into release-v1.8


  Commit: 6d92712cf9338ddd7d93eb3e3348f8440faf1b7f
      https://github.com/okfn/ckan/commit/6d92712cf9338ddd7d93eb3e3348f8440faf1b7f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M CHANGELOG.txt
    M LICENSE.txt
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/schema-1.4.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.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/group.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/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/maintain.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.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/create.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/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/model/authz.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/related.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    A ckan/public/scripts/vendor/flot/0.7/excanvas.js
    M ckan/public/scripts/vendor/html5shiv/html5.js
    A ckan/public/scripts/vendor/moment/1.6.2/moment.js
    A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph.css
    R ckan/public/scripts/vendor/recline/css/grid.css
    R ckan/public/scripts/vendor/recline/css/images/edit-map.png
    R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
    R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
    R ckan/public/scripts/vendor/recline/css/map.css
    A ckan/public/scripts/vendor/recline/css/recline.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/slickgrid/images/actions.gif
    R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
    R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
    R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
    R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
    R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
    R ckan/public/scripts/vendor/slickgrid/images/down.gif
    R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
    R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/expand.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/help.png
    R ckan/public/scripts/vendor/slickgrid/images/info.gif
    R ckan/public/scripts/vendor/slickgrid/images/listview.gif
    R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
    R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
    R ckan/public/scripts/vendor/slickgrid/images/stripes.png
    R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
    R ckan/public/scripts/vendor/slickgrid/images/tick.png
    R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
    R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
    R ckan/public/scripts/vendor/slickgrid/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/slick.grid.js
    R ckan/templates/_snippet/add-related.html
    M ckan/templates/_util.html
    A ckan/templates/activity_streams/deleted_related_item.html
    A ckan/templates/activity_streams/follow_dataset.html
    A ckan/templates/activity_streams/follow_user.html
    A ckan/templates/activity_streams/new_related_item.html
    M ckan/templates/facets.html
    M ckan/templates/group/read.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/read.html
    R ckan/templates/package/related_list.html
    M ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/related/add-related.html
    A ckan/templates/related/dashboard.html
    A ckan/templates/related/related_list.html
    A ckan/templates/snippets/follow_button.html
    A ckan/templates/snippets/internal-tracking.html
    A ckan/templates/snippets/recline-extra-footer.html
    A ckan/templates/snippets/recline-extra-header.html
    A ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/layout.html
    M ckan/templates/user/read.html
    M ckan/tests/forms/test_authz.py
    M ckan/tests/forms/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/functional/test_publisher_auth.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_tag_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_plugins.py
    M ckan/tests/test_versions.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/controllers.py
    M ckanext/organizations/forms.py
    M ckanext/organizations/templates/organization_layout.html
    M ckanext/organizations/templates/organization_package_form.html
    M ckanext/publisher_form/forms.py
    M ckanext/publisher_form/templates/publisher_read.html
    M ckanext/stats/controller.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/test_tag_vocab_plugin.py
    M doc/apiv3.rst
    A doc/apps-ideas.rst
    M doc/coding-standards.rst
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/index.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/paster.rst
    A doc/release-cycle.rst
    M doc/solr-setup.rst
    M doc/test.rst
    A doc/toolkit.rst
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    R requires/lucid_conflict.txt
    R requires/lucid_missing.txt
    R requires/lucid_present.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into feature-2536-clean-activity-stream

Conflicts:
	ckan/logic/action/get.py


  Commit: af3df9262613df992d4c18297804b460ba07f0ff
      https://github.com/okfn/ckan/commit/af3df9262613df992d4c18297804b460ba07f0ff
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/templates/activity_streams/follow_dataset.html

  Log Message:
  -----------
  [2536] use consistent naming in activity streams


  Commit: 23ab84eca01d4792f35f03258e609b41d235b7ca
      https://github.com/okfn/ckan/commit/23ab84eca01d4792f35f03258e609b41d235b7ca
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_related_item.html

  Log Message:
  -----------
  [2536] move new activity streams to new model


  Commit: 2e127514fc4c80d816364e1550daa145892f1593
      https://github.com/okfn/ckan/commit/2e127514fc4c80d816364e1550daa145892f1593
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

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

  Log Message:
  -----------
  Revert "[2536] use consistent naming in activity streams"

This reverts commit af3df9262613df992d4c18297804b460ba07f0ff.

Conflicts:
	ckan/templates/activity_streams/follow_dataset.html


  Commit: 31beffeb64a8ade68d8a02841511f808895cca1f
      https://github.com/okfn/ckan/commit/31beffeb64a8ade68d8a02841511f808895cca1f
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

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

  Log Message:
  -----------
  [#2536] fix dataset snippet for follow_dataset


  Commit: d62120843ca7777feb2a5046450dfb74a2d10390
      https://github.com/okfn/ckan/commit/d62120843ca7777feb2a5046450dfb74a2d10390
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    A ckan/lib/activity_streams.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2536] move snippets into separate lib


  Commit: be28a2475e728d44ffd68e2ca9f666798955d5bb
      https://github.com/okfn/ckan/commit/be28a2475e728d44ffd68e2ca9f666798955d5bb
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#2536] Move activity stream stings into lib.activity_streams


  Commit: 0659029942a0ffbfc9c89a36027052ebbb5d1b80
      https://github.com/okfn/ckan/commit/0659029942a0ffbfc9c89a36027052ebbb5d1b80
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  [#2536] fix long line


  Commit: 8799b16a5eccd3d359e0206bf1dc4b0b7d71a214
      https://github.com/okfn/ckan/commit/8799b16a5eccd3d359e0206bf1dc4b0b7d71a214
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  [#2536] rename some functions and slight refactoring


  Commit: 89498827274fda959a6b2ef0e24f01c02a32b679
      https://github.com/okfn/ckan/commit/89498827274fda959a6b2ef0e24f01c02a32b679
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2536] fixups


  Commit: 548de8ee761a49f6e4753a23c6c930be9e0ff113
      https://github.com/okfn/ckan/commit/548de8ee761a49f6e4753a23c6c930be9e0ff113
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-30 (Mon, 30 Jul 2012)

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  [#2536] fix some errors


  Commit: cc79d77f6ded1f10cfe6bec9012c190743703e97
      https://github.com/okfn/ckan/commit/cc79d77f6ded1f10cfe6bec9012c190743703e97
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

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

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


  Commit: 6fc2a136a2d5382649a3367cbf7b0253ee3a887e
      https://github.com/okfn/ckan/commit/6fc2a136a2d5382649a3367cbf7b0253ee3a887e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-31 (Tue, 31 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: e8a1467965a3d3fa852eb49b84917992d10a1cf5
      https://github.com/okfn/ckan/commit/e8a1467965a3d3fa852eb49b84917992d10a1cf5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

  Changed paths:
    M .tx/config
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Update i18n for CKAN 1.8

Downloaded the latest strings from the CKAN 1.7 resource on Transifex
into the po files

Locked the CKAN 1.7 resource on Transifex

Updated the version number in .tx/config from 1.7 to 1.8

Extracted the latest strings from the CKAN source code into the pot and
po files

Recompiled the mo files

Created the new CKAN 1.8 resource on Transifex from the pot and po files
in this commit


  Commit: 613322a3cbb0041815fb9118b372cd9404c2e1a4
      https://github.com/okfn/ckan/commit/613322a3cbb0041815fb9118b372cd9404c2e1a4
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-31 (Tue, 31 Jul 2012)

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

  Log Message:
  -----------
  [#2777] Use user_list_dictize


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

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

  Log Message:
  -----------
  Merge branch '2777-defect-user-show'


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

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

  Log Message:
  -----------
  [#2777] Use user_list_dictize


  Commit: 85097d9e881f9f0dfe1870fe59e681f099b3623d
      https://github.com/okfn/ckan/commit/85097d9e881f9f0dfe1870fe59e681f099b3623d
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Some pep8 fixes for lib.helpers


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

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Be more careful when prepending site_url


  Commit: 3c0df274329d4b234863803f31dd0276c13b3ed4
      https://github.com/okfn/ckan/commit/3c0df274329d4b234863803f31dd0276c13b3ed4
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

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


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

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Be more careful when prepending site_url


  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: 99adf3dddb4ef78b34d128e3a5f9031643e8b0e9
      https://github.com/okfn/ckan/commit/99adf3dddb4ef78b34d128e3a5f9031643e8b0e9
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

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

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


  Commit: 6640521baf54432c247b4cff568ae1bd61f69b20
      https://github.com/okfn/ckan/commit/6640521baf54432c247b4cff568ae1bd61f69b20
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-01 (Wed, 01 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/storage.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/public/scripts/templates.js
    M ckan/templates/js_strings.html
    M ckan/templates/related/add-related.html
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

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


  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: b04aa652d235bd88e37e07c9652a08c144c41176
      https://github.com/okfn/ckan/commit/b04aa652d235bd88e37e07c9652a08c144c41176
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-03 (Fri, 03 Aug 2012)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Fix a db_to_form_package_schema() crash

When db_to_form_package_schema() was in use (e.g. when an IDatasetForm
plugin with a db_to_form_schema() method based on
db_to_form_package_schema() was active) then try to edit a package that
has some resources would crash with a 400 Bad Request.

Extremely difficult to debug.

This seems to fix it.


  Commit: 1593e75f8702d1152460a21ec2b6e5082fd78ec4
      https://github.com/okfn/ckan/commit/1593e75f8702d1152460a21ec2b6e5082fd78ec4
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-05 (Sun, 05 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/storage.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/scripts/templates.js
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  Merge branch 'master' into feature-2536-clean-activity-stream


  Commit: 1fd98fc3e4fac2a559b8b50499829ed8da3844b7
      https://github.com/okfn/ckan/commit/1fd98fc3e4fac2a559b8b50499829ed8da3844b7
  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'


  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: f67c571be2c0653a9ae3d67a9a35e61a7329541e
      https://github.com/okfn/ckan/commit/f67c571be2c0653a9ae3d67a9a35e61a7329541e
  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


  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


  Commit: 57b308e54268456ff375d4dd7bdc404bbad9a901
      https://github.com/okfn/ckan/commit/57b308e54268456ff375d4dd7bdc404bbad9a901
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    A ckan/templates/activity_streams/activity_stream_item.html
    R ckan/templates/activity_streams/general.html

  Log Message:
  -----------
  [#2536] Minor activity streams tidying

For any activity with one activity detail the detail will be
rendered instead of the activity, not just changed packages.

Some comments and PEP8 tidy up.

Rename general.html to activity_stream_item.html


  Commit: 1763a8363f27924ee0f389a395c8102587a9b589
      https://github.com/okfn/ckan/commit/1763a8363f27924ee0f389a395c8102587a9b589
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-06 (Mon, 06 Aug 2012)

  Changed paths:
    R ckan/lib/activity.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/model/meta.py

  Log Message:
  -----------
  Rename activity.py -> activity_streams_session_extension.py

To make it clear what the difference is between lib/activity_streams.py
and lib/activity_streams_session_extension.py (previously
lib/activity.py)


  Commit: 388063f2003e275aea6ffa2227478319db80335f
      https://github.com/okfn/ckan/commit/388063f2003e275aea6ffa2227478319db80335f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-07 (Tue, 07 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/logic/schema.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py

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


  Commit: 9966615969fa2aa4823fc6d3455528b194136255
      https://github.com/okfn/ckan/commit/9966615969fa2aa4823fc6d3455528b194136255
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-09 (Thu, 09 Aug 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/domain_object.py

  Log Message:
  -----------
  [#2816] Re-add some items to model.__init__


  Commit: 1ae2c22c3caebe9c282157b602f1f92153e268d9
      https://github.com/okfn/ckan/commit/1ae2c22c3caebe9c282157b602f1f92153e268d9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-09 (Thu, 09 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 'master' of github.com:okfn/ckan into feature-2536-clean-activity-stream


  Commit: c1ee1e995ef7481cd40b9fb3221db1b681293f92
      https://github.com/okfn/ckan/commit/c1ee1e995ef7481cd40b9fb3221db1b681293f92
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2750] Fix group controller using wrong schema

Fix group controller calling form_to_db_schema() from IGroupForm plugin
when it should be using db_to_form_schema()


  Commit: 5d80f7fc5d41225c79625a8dcadd64148d8adc76
      https://github.com/okfn/ckan/commit/5d80f7fc5d41225c79625a8dcadd64148d8adc76
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Refactor DefaultGroupForm's form_to_db_schema_options()

The form_to_db_schema() methods of IGroupForm plugins were not being
called if those plugins inherited from DefaultGroupForm. Refactor it in
the same way as DefaultDatasetForm's form_to_db_schema_options() method
was recently refactored.  Make it call self.form_to_db_schema so that
the form_to_db_schema() methods of IGroupForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.


  Commit: 8938352c1add570f5dabe67167907edb1167392e
      https://github.com/okfn/ckan/commit/8938352c1add570f5dabe67167907edb1167392e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

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

  Log Message:
  -----------
  [#2570] Fix IGroupForm check_data_dict not being called

Make group_create() and group_update() call the check_data_dict()
methods of IGroupForm plugins, like package_create() and
package_update() do with IDatasetForm plugins.


  Commit: 5d30fdbc718e2d423b53fdaee1fdf9d22aaa8524
      https://github.com/okfn/ckan/commit/5d30fdbc718e2d423b53fdaee1fdf9d22aaa8524
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  Fix a db_to_form_package_schema() crash

When db_to_form_package_schema() was in use (e.g. when an IDatasetForm
plugin with a db_to_form_schema() method based on
db_to_form_package_schema() was active) then try to edit a package that
has some resources would crash with a 400 Bad Request.

Extremely difficult to debug.

This seems to fix it.


  Commit: 3aa964db2218ad4a55c591fe78ab6b5a3f06d477
      https://github.com/okfn/ckan/commit/3aa964db2218ad4a55c591fe78ab6b5a3f06d477
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-10 (Fri, 10 Aug 2012)

  Changed paths:
    M ckan/lib/activity_streams.py
    R ckan/templates/activity_streams/activity_stream_item.html
    A ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#2536] rename activity stream template


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

  Changed paths:
    M ckan/lib/activity_streams.py

  Log Message:
  -----------
  [#2536] Only check for details if certain activity type


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

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Minor bugfix


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2722] fix group dataset sort


  Commit: a89c8d6dd4764b859fec3a41089a6e9547898072
      https://github.com/okfn/ckan/commit/a89c8d6dd4764b859fec3a41089a6e9547898072
  Author: Aron Carroll <self at aroncarroll.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2722] Add c.sort_by_selected to group read template


  Commit: fa3ca5bef30b17c2da74653748934407d538c3fb
      https://github.com/okfn/ckan/commit/fa3ca5bef30b17c2da74653748934407d538c3fb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Make relevance the default sort order on group pages

If not sort order is specified, group controller passes None to
package_search, same as the package controller does, then package_search
defaults to 'score desc, name asc'


  Commit: deedb787786e74888d56e6515bdeb6c7bb37f504
      https://github.com/okfn/ckan/commit/deedb787786e74888d56e6515bdeb6c7bb37f504
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  Add group read sort ordering to changelog


  Commit: db6ab9e188c091ea894cce3766f029cc0e101535
      https://github.com/okfn/ckan/commit/db6ab9e188c091ea894cce3766f029cc0e101535
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch 'allow-group-read-sort' into release-v1.8


  Commit: 0d0e5a09eddf54544a1737fa45b248532ac7c875
      https://github.com/okfn/ckan/commit/0d0e5a09eddf54544a1737fa45b248532ac7c875
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-13 (Mon, 13 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/controllers/group.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge branch 'allow-group-read-sort'


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

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

  Log Message:
  -----------
  [#2844] actually use simple-search config option


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

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

  Log Message:
  -----------
  [#2844] Fix error in simple search


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

  Changed paths:
    M ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  [#2844] fix test


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

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

  Log Message:
  -----------
  [#2844] actually use simple-search config option


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

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

  Log Message:
  -----------
  [#2844] Fix error in simple search


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

  Changed paths:
    M ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  [#2844] fix test


  Commit: ef5e4a0693254984e52ea052524d523b28123f55
      https://github.com/okfn/ckan/commit/ef5e4a0693254984e52ea052524d523b28123f55
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py

  Log Message:
  -----------
  [doc/theme][xs]: update to latest version of sphinx okfn theme with fixes for first heading and support for localtoc.


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

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/sql.py
    M ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  Merge branch '2844-re-enable-simple-search'


  Commit: 7830d19e4282d0cca8038bf7c4a6e78b8bb0b3c5
      https://github.com/okfn/ckan/commit/7830d19e4282d0cca8038bf7c4a6e78b8bb0b3c5
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  Fix typo in datastore docs


  Commit: 1eb959b172c1aef0038f940f89056979cb5524ed
      https://github.com/okfn/ckan/commit/1eb959b172c1aef0038f940f89056979cb5524ed
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  Fix typo in datastore docs


  Commit: 59440982da8e6665a88a6097ed79aebe3a21a81b
      https://github.com/okfn/ckan/commit/59440982da8e6665a88a6097ed79aebe3a21a81b
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/sql.py
    M ckan/tests/lib/test_simple_search.py

  Log Message:
  -----------
  Merge branch '2844-re-enable-simple-search-for-1.8' into release-v1.8


  Commit: 72b0e9fcab4f99c5f20102981496ed18b31ae787
      https://github.com/okfn/ckan/commit/72b0e9fcab4f99c5f20102981496ed18b31ae787
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-14 (Tue, 14 Aug 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/domain_object.py

  Log Message:
  -----------
  Merge branch '2816-re-add-model-bits' into release-v1.8


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

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

  Log Message:
  -----------
  Avoid unnecessary commit request

The commit can be sent on the same request with the dict to index


  Commit: 7b65a54088db9f8ed0511aa200a6409ebe223392
      https://github.com/okfn/ckan/commit/7b65a54088db9f8ed0511aa200a6409ebe223392
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/tests/lib/test_cli.py

  Log Message:
  -----------
  Commit only once at the end of a search index rebuild

Commiting changes in the Solr search index is a heavy task that takes
significant time. We are currently commiting changes after each update,
which is probably fine for individual updated (ie users editing or
creating a dataset), but when rebuilding the whole index it is
unnecessary. A single commit at the end of the process is needed, and
that speeds the reindexing about a 85%.

A flag has been added (`-e` or `--commit-each`) to allow the old
behaviour (commiting after each edit).


  Commit: 8473cd8bcb15d88805a309470129ed10fe8ba522
      https://github.com/okfn/ckan/commit/8473cd8bcb15d88805a309470129ed10fe8ba522
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Allow not returning the package dict when creating or updating

This avoids calling package_show


  Commit: 74f12575b32922c92b0f607c809692911ef641e1
      https://github.com/okfn/ckan/commit/74f12575b32922c92b0f607c809692911ef641e1
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Return dataset id if 'return_pacakge_dict' is False


  Commit: 4006757ba6a6ead21c3deb17427fd6176b481ec2
      https://github.com/okfn/ckan/commit/4006757ba6a6ead21c3deb17427fd6176b481ec2
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Use return_id_only instead of return_package_dict

Suggested by @tobes, as it is more backwards compatible


  Commit: 088c170c114f2ada971d4db3f0e9c39d298b81b9
      https://github.com/okfn/ckan/commit/088c170c114f2ada971d4db3f0e9c39d298b81b9
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Quick fix for deprecated


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

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Proper fix of deprecated_context_item


  Commit: 489717f0d20d22455d9fb6d701f8b1280bf614d2
      https://github.com/okfn/ckan/commit/489717f0d20d22455d9fb6d701f8b1280bf614d2
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  some documentation


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

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Add the warning again


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

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Store the message plus better names


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

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Fix the original deprecate_context_item function.


  Commit: 46ea2590653e0a9d4cc714ecd429532e4753360e
      https://github.com/okfn/ckan/commit/46ea2590653e0a9d4cc714ecd429532e4753360e
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Revert "Fix the original deprecate_context_item function."

This reverts commit 3ae477bfa84e62a6bdb5fa4f99e9800c007fb681.

thread unsafe


  Commit: 35168a5a3bcb710cb633c7fb1f3f7003312839b0
      https://github.com/okfn/ckan/commit/35168a5a3bcb710cb633c7fb1f3f7003312839b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Fix up as suggested by kindly


  Commit: 227d8e5bb409fcfb68e94408eb7ac57aa61af334
      https://github.com/okfn/ckan/commit/227d8e5bb409fcfb68e94408eb7ac57aa61af334
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/tests/lib/test_cli.py

  Log Message:
  -----------
  Merge branch 'release-v1.8' of github.com:okfn/ckan into release-v1.8


  Commit: 9e348cdc7e30689fd7ee83952270a4608b8f83c6
      https://github.com/okfn/ckan/commit/9e348cdc7e30689fd7ee83952270a4608b8f83c6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  [i18n] Pull final translations for CKAN 1.8 from Transifex

Pulled the po files from Transifex, checked them, and compiled them to
create the mo files.


  Commit: efad575c6e76b18afac4463c541039bb330aa37f
      https://github.com/okfn/ckan/commit/efad575c6e76b18afac4463c541039bb330aa37f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Remove zh_TW translation from CKAN 1.8

It has 0% translations


  Commit: 1de3d7c0048d57bc6239e8dc2f895803fc0316ef
      https://github.com/okfn/ckan/commit/1de3d7c0048d57bc6239e8dc2f895803fc0316ef
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Avoid unnecessary commit request

The commit can be sent on the same request with the dict to index


  Commit: 302042a46a8a7e0e9d907180b9a9702ef7c68981
      https://github.com/okfn/ckan/commit/302042a46a8a7e0e9d907180b9a9702ef7c68981
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/tests/lib/test_cli.py

  Log Message:
  -----------
  Commit only once at the end of a search index rebuild

Commiting changes in the Solr search index is a heavy task that takes
significant time. We are currently commiting changes after each update,
which is probably fine for individual updated (ie users editing or
creating a dataset), but when rebuilding the whole index it is
unnecessary. A single commit at the end of the process is needed, and
that speeds the reindexing about a 85%.

A flag has been added (`-e` or `--commit-each`) to allow the old
behaviour (commiting after each edit).


  Commit: 6e43373acc4cdfb98bf12048f6df6f527b3d9847
      https://github.com/okfn/ckan/commit/6e43373acc4cdfb98bf12048f6df6f527b3d9847
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Allow not returning the package dict when creating or updating

This avoids calling package_show


  Commit: 5ec22a75e63cf416ab6c1124958e632ab531d468
      https://github.com/okfn/ckan/commit/5ec22a75e63cf416ab6c1124958e632ab531d468
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Return dataset id if 'return_pacakge_dict' is False


  Commit: 8f7baad5636c4352d7626ccbfb90c1d91e25262a
      https://github.com/okfn/ckan/commit/8f7baad5636c4352d7626ccbfb90c1d91e25262a
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

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

  Log Message:
  -----------
  Use return_id_only instead of return_package_dict

Suggested by @tobes, as it is more backwards compatible


  Commit: 63b92ce7e779b77fa0d8ee56184f927f680d278a
      https://github.com/okfn/ckan/commit/63b92ce7e779b77fa0d8ee56184f927f680d278a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/lib/maintain.py

  Log Message:
  -----------
  Merge branch 'release-v1.8' of github.com:okfn/ckan into release-v1.8


  Commit: 2f7a60dbbf937cc1a5787b1d6988bcd7d4ccdc70
      https://github.com/okfn/ckan/commit/2f7a60dbbf937cc1a5787b1d6988bcd7d4ccdc70
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Update CKAN's default list of language options


  Commit: ad08763e03177cc3bf253de078e1899c08355fa5
      https://github.com/okfn/ckan/commit/ad08763e03177cc3bf253de078e1899c08355fa5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckan/plugins/interfaces.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html

  Log Message:
  -----------
  [#2843] Remove 'Add Existing Datasets' option from organization edit

The link wasn't working, and this option doesn't make any sense when
organizations is enabled, because every dataset must belong to one and
only one organization anyway.

This commit simply removes the link from the organization edit page,
making it consistent with the other organization pages (read etc.)

It was necessary to add the ability to override the group/edit.html
template to the IGroupForm plugin to do this.


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

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/meta.py
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/deleted_resource.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_related_item.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_simple_search.py
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' into pep8-lib-helpers

Conflicts:
	ckan/lib/helpers.py

    trivial merge


  Commit: 7fe68d24ff22945b2dbf6fbaf0a5cde653d6f03f
      https://github.com/okfn/ckan/commit/7fe68d24ff22945b2dbf6fbaf0a5cde653d6f03f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/validators.py
    M ckan/model/meta.py
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/deleted_resource.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_related_item.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_simple_search.py
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/datastore.rst

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


  Commit: 18f95bfb26c1d71a4bc790224d4bd543a56fa39b
      https://github.com/okfn/ckan/commit/18f95bfb26c1d71a4bc790224d4bd543a56fa39b
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch 'pep8-lib-helpers'


  Commit: 483c9402e75f5b10317cbe5180c733ed921644b0
      https://github.com/okfn/ckan/commit/483c9402e75f5b10317cbe5180c733ed921644b0
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [#2856] Fix 500 error in related controller


  Commit: 84c4cbf74e4cb4bd450c082595e4edb8480656df
      https://github.com/okfn/ckan/commit/84c4cbf74e4cb4bd450c082595e4edb8480656df
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Remove 'Other (Open)' from multilingual test data

This fixes a multilingual extension test that was failing. Seems this
string is getting translated by normal gettext interface translation now


  Commit: 32ceeaedb50b74a008116ec728658438e27fb573
      https://github.com/okfn/ckan/commit/32ceeaedb50b74a008116ec728658438e27fb573
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  2869 Fixes problem with invalid data being passed to solr.

The feeds take a page number from the query string and use it to determine the
start position in the list.  Occassionally this is 0 and code around line 441
then decrement and then multiply this number, generating a start number less than
0 which solr chokes on.


  Commit: 0425e9caf785dd17fbc0b6af1092d4115cfab076
      https://github.com/okfn/ckan/commit/0425e9caf785dd17fbc0b6af1092d4115cfab076
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

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

  Log Message:
  -----------
  Test for 2868


  Commit: 0ae66717eda4249500a227db32b7fd302bb75fd6
      https://github.com/okfn/ckan/commit/0ae66717eda4249500a227db32b7fd302bb75fd6
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

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

  Log Message:
  -----------
  Merge branch '2868-feed-search-error'


  Commit: 5e338d9aba56eb4685b015392ed084fc01c80633
      https://github.com/okfn/ckan/commit/5e338d9aba56eb4685b015392ed084fc01c80633
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  2866 Missing key results in strip() being called on None

When no reset key is present then None is used to verify the key
and it is strip()ed first, resulting in an error.


  Commit: c73b6f00c16f526015a903642618806a4c642d72
      https://github.com/okfn/ckan/commit/c73b6f00c16f526015a903642618806a4c642d72
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  2867 Fixes a problem with passing unicode to url_for

Forces the file_url to be ascii as it appears that for some reason, and only
occassionally OFS returns unicode instead of str.  We don't want to fix OFS
as it is scheduled for removal and we can fix routes as it is already out of
date.


  Commit: aa710e43529f1f12b4d8c993e2e18409f3199c60
      https://github.com/okfn/ckan/commit/aa710e43529f1f12b4d8c993e2e18409f3199c60
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  Fix for non-open licenses appearing open

The 'This dataset is openly licensed' icon was appearing next to
non-open datasets as well. The problem was that DefaultLicense was
returning u"False" (a string) for boolean attributes such as
is_okd_compliant. Change the class so it no longer turns non-string
attributes into unicode strings when you access them.


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

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Merge branch '2866-missing-reset-key'


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

  Changed paths:
    M ckan/model/license.py

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


  Commit: 85df0117cc85416f134084b3a2a1f5e8b51aec92
      https://github.com/okfn/ckan/commit/85df0117cc85416f134084b3a2a1f5e8b51aec92
  Author: amercader <amercadero at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Merge branch '2867-unicode-error-url-for'


  Commit: 9af067196ef12830a82a5b011eaf43d0f5313d37
      https://github.com/okfn/ckan/commit/9af067196ef12830a82a5b011eaf43d0f5313d37
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#2639,js/recline][xs]: re-insert support for serializing all dataset info into state (and vice-versa) which means format is preserved for dataproxy.


  Commit: fd1abd9d5701b4addf7e709c1766d6ffed1bb8bf
      https://github.com/okfn/ckan/commit/fd1abd9d5701b4addf7e709c1766d6ffed1bb8bf
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#2639,bugfix][xs]: bugfix for minor issue with backwards compatibility in embed urls.

* Bug: previous recline setup used elasticsearch_url in recline 'state' (dataset part) when generating embed_url for dataset. But recline no longer supports this. Fixed by moving elasticsearch_urlmoving to url attribute of dataset attribute of state.


  Commit: 48530a360b4b73cdbf4ecf29b84e9a9de017a8b6
      https://github.com/okfn/ckan/commit/48530a360b4b73cdbf4ecf29b84e9a9de017a8b6
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#2639,bugfix][xs]: remove reference to recline.Model.Dataset.restore (has been removed from recline) and do the dataset restore by hand (trivial).


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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/public/scripts/application.js
    M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  Merge branch '2639-update-recline-for-1.8-release'


  Commit: 23b5039085ab9e528f5c340249cffec98a9a72fa
      https://github.com/okfn/ckan/commit/23b5039085ab9e528f5c340249cffec98a9a72fa
  Author: James McKinney <james at slashpoundbang.com>
  Date:   2012-08-18 (Sat, 18 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Add FileStore configuration settings to deployment.ini_tmpl


  Commit: a84d5fe6d4f8239c65df5e708f475b6c0d5c0145
      https://github.com/okfn/ckan/commit/a84d5fe6d4f8239c65df5e708f475b6c0d5c0145
  Author: James McKinney <james at slashpoundbang.com>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

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

  Log Message:
  -----------
  Add note about setting ckan.site_url when using local file storage


  Commit: 20858553ab168eb19e8cad56d81dc99e41aebfed
      https://github.com/okfn/ckan/commit/20858553ab168eb19e8cad56d81dc99e41aebfed
  Author: James McKinney <james at slashpoundbang.com>
  Date:   2012-08-19 (Sun, 19 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Fix e2073a37 which caused double slashes to occur


  Commit: 3cdc23921f6f25d2c60655a52c56462a0fec0718
      https://github.com/okfn/ckan/commit/3cdc23921f6f25d2c60655a52c56462a0fec0718
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Fix to documentation of file upload parameters


  Commit: 0d316e506e833f3d02e48ad52b3c5e8f07acd4a1
      https://github.com/okfn/ckan/commit/0d316e506e833f3d02e48ad52b3c5e8f07acd4a1
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/lib/create_test_data.py
    M ckan/lib/mailer.py
    M ckan/model/license.py
    M ckan/public/scripts/application.js
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

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


  Commit: c465dd525b12a688013c45d72a8d7b32cdce436f
      https://github.com/okfn/ckan/commit/c465dd525b12a688013c45d72a8d7b32cdce436f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Merge pull request #105 from okfn/file-upload-doc-file

[doc] File upload doc fix.


  Commit: d8a2b5f53c76649abde1f1dc12d3538b76daff72
      https://github.com/okfn/ckan/commit/d8a2b5f53c76649abde1f1dc12d3538b76daff72
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M doc/configuration.rst

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


  Commit: c2c70802dbefdaa9f73c61aa50c989621fc78c66
      https://github.com/okfn/ckan/commit/c2c70802dbefdaa9f73c61aa50c989621fc78c66
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/templates/package/read.rdf

  Log Message:
  -----------
  [xs] Fixing the RDF template


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

  Changed paths:
    M ckan/templates/package/read.rdf

  Log Message:
  -----------
  Merge branch 'rdf-template-fix'


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

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

  Log Message:
  -----------
  [#2844] fix simple search for db clean


  Commit: 5f414d0de77148fe73e8004e898fecbabf6ef562
      https://github.com/okfn/ckan/commit/5f414d0de77148fe73e8004e898fecbabf6ef562
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Merge pull request #104 from jpmckinney/no_double_slashes

Fix e2073a37 which caused double slashes to occur


  Commit: c7cdab4b2b8d81a48dd3d37e5bf0f1709cf45346
      https://github.com/okfn/ckan/commit/c7cdab4b2b8d81a48dd3d37e5bf0f1709cf45346
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

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

  Log Message:
  -----------
  Merge pull request #102 from jpmckinney/master

Add FileStore configuration settings to deployment.ini_tmpl


  Commit: 58d276987e159b2da113f666b20d3f9643d16409
      https://github.com/okfn/ckan/commit/58d276987e159b2da113f666b20d3f9643d16409
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/storage.py
    M ckan/lib/search/__init__.py
    M ckan/templates/package/read.rdf
    M doc/filestore.rst

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


  Commit: 00037246c7cf1615aec377fbcf2f83530f56e2c6
      https://github.com/okfn/ckan/commit/00037246c7cf1615aec377fbcf2f83530f56e2c6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_save.py

  Log Message:
  -----------
  Enable allow_partial_update for group update

Listen to allow_partial_update in the context when saving a group, and
use it in the group controller. This fixes issue #2854 where all an
organizations datasets were being removed on updating an organization
(with the organizations plugins enabled)


  Commit: e432ac566eb5dac8ea2cf39b3235be72e204e827
      https://github.com/okfn/ckan/commit/e432ac566eb5dac8ea2cf39b3235be72e204e827
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

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

  Log Message:
  -----------
  Apply allow_partial_update to all group fields

Make 'allow_partial_update': True in the context apply to multiple group
fields: packages, users, groups, tags and extras, when updating a group,
so you can pass a group dict with e.g. no 'packages' key and this will
update the group but will not change the group's packages.  Previously
allow_partial_update only affected packages and extras.


  Commit: 99a7aef666ff2fc387b5aa73a2fe4e8d73fabbe5
      https://github.com/okfn/ckan/commit/99a7aef666ff2fc387b5aa73a2fe4e8d73fabbe5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

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

  Log Message:
  -----------
  Allow passing empty lists to group_update

If, for example, a group dict with a 'packages' key with an empty list
as the value is passed to group_update, then set the group's packages to
an empty list (i.e. remove any packages from the group), even if
'allow_partial_update': True was specified in the context (previously
such an empty list would be ignored and the group's packages would not
change). Also applies to other group fields e.g. tags, users, groups, etc.


  Commit: cdc02db465a4698adaa13268cde435f687b0a772
      https://github.com/okfn/ckan/commit/cdc02db465a4698adaa13268cde435f687b0a772
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_save.py

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


  Commit: 7041f22239f654dd0ee52be643e55cb367f797ab
      https://github.com/okfn/ckan/commit/7041f22239f654dd0ee52be643e55cb367f797ab
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/group.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/model/__init__.py
    M ckan/model/domain_object.py
    M ckan/plugins/interfaces.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html

  Log Message:
  -----------
  Merge branch '2843-cannot-add-existing-datasets-to-organizations'


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

  Changed paths:
    M ckan/controllers/home.py
    M ckan/i18n/check_po_files.py
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Fix unicode formatting bug


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

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

  Log Message:
  -----------
  Fix error on unicode related title


  Commit: 45c31815ea3282d185bde284788baf5da1b1749d
      https://github.com/okfn/ckan/commit/45c31815ea3282d185bde284788baf5da1b1749d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    R ckan/templates/authorization_group/__init__.py
    R ckan/templates/authorization_group/authz.html
    R ckan/templates/authorization_group/edit.html
    R ckan/templates/authorization_group/edit_form.html
    R ckan/templates/authorization_group/index.html
    R ckan/templates/authorization_group/layout.html
    R ckan/templates/authorization_group/new.html
    R ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py

  Log Message:
  -----------
  Removed auth groups from tests, controller, model and logic


  Commit: 2b59d11ad63eab0e2c251ac3b08bfe87a7771451
      https://github.com/okfn/ckan/commit/2b59d11ad63eab0e2c251ac3b08bfe87a7771451
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [xs] Minor fix for accept header handling on package


  Commit: f5d3ac2d66f7239535c0c609162e7e59bf289b91
      https://github.com/okfn/ckan/commit/f5d3ac2d66f7239535c0c609162e7e59bf289b91
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 2366-remove-authorization-groups


  Commit: 8996a68ed85b96507e7ec25432d62d3b5934d3a2
      https://github.com/okfn/ckan/commit/8996a68ed85b96507e7ec25432d62d3b5934d3a2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    R ckan/templates/authorization_group/__init__.py
    R ckan/templates/authorization_group/authz.html
    R ckan/templates/authorization_group/edit.html
    R ckan/templates/authorization_group/edit_form.html
    R ckan/templates/authorization_group/index.html
    R ckan/templates/authorization_group/layout.html
    R ckan/templates/authorization_group/new.html
    R ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py

  Log Message:
  -----------
  Merge branch '2366-remove-authorization-groups'


  Commit: 1090eadef7542ab9307dbfbbbac0dbb74229007c
      https://github.com/okfn/ckan/commit/1090eadef7542ab9307dbfbbbac0dbb74229007c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-09-11 (Tue, 11 Sep 2012)

  Changed paths:
    M .tx/config
    M CHANGELOG.txt
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    R ckan/controllers/authorization_group.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/forms/__init__.py
    M ckan/forms/authorization_group.py
    M ckan/forms/authz.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    A ckan/i18n/ja/LC_MESSAGES/ckan.mo
    A ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    R ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    R ckan/lib/activity.py
    A ckan/lib/activity_streams.py
    A ckan/lib/activity_streams_session_extension.py
    M ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.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/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/sql.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/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/model/__init__.py
    R ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/plugins/interfaces.py
    R ckan/public/images/icons/authorization_group.png
    R ckan/public/images/icons/authorization_group_add.png
    R ckan/public/images/icons/authorization_group_edit.png
    A ckan/public/images/icons/followers.png
    M ckan/public/scripts/application.js
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/_util.html
    A ckan/templates/activity_streams/activity_stream_items.html
    R ckan/templates/activity_streams/added_tag.html
    R ckan/templates/activity_streams/changed_group.html
    R ckan/templates/activity_streams/changed_package.html
    R ckan/templates/activity_streams/changed_package_extra.html
    R ckan/templates/activity_streams/changed_resource.html
    R ckan/templates/activity_streams/changed_user.html
    R ckan/templates/activity_streams/deleted_group.html
    R ckan/templates/activity_streams/deleted_package.html
    R ckan/templates/activity_streams/deleted_package_extra.html
    R ckan/templates/activity_streams/deleted_related_item.html
    R ckan/templates/activity_streams/deleted_resource.html
    R ckan/templates/activity_streams/follow_dataset.html
    R ckan/templates/activity_streams/follow_user.html
    R ckan/templates/activity_streams/new_group.html
    R ckan/templates/activity_streams/new_package.html
    R ckan/templates/activity_streams/new_package_extra.html
    R ckan/templates/activity_streams/new_related_item.html
    R ckan/templates/activity_streams/new_resource.html
    R ckan/templates/activity_streams/new_user.html
    R ckan/templates/activity_streams/removed_tag.html
    M ckan/templates/admin/authz.html
    R ckan/templates/authorization_group/__init__.py
    R ckan/templates/authorization_group/authz.html
    R ckan/templates/authorization_group/edit.html
    R ckan/templates/authorization_group/edit_form.html
    R ckan/templates/authorization_group/index.html
    R ckan/templates/authorization_group/layout.html
    R ckan/templates/authorization_group/new.html
    R ckan/templates/authorization_group/read.html
    M ckan/templates/group/authz.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/read.rdf
    M ckan/templates/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/functional/api/test_authorization_group.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_authorization_group.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package_edit_authz.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_simple_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_authz.py
    M ckan/tests/models/test_repo.py
    M ckan/tests/test_authz.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/forms.py
    A ckanext/organizations/templates/organization_edit.html
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/filestore.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 2750-add-docs-and-examples-for-idatasetform-and-igroupform


Compare: https://github.com/okfn/ckan/compare/025c1ebb51d1...1090eadef754


More information about the ckan-changes mailing list