[ckan-changes] [okfn/ckan] 5f1ba2: [#507] Allow the template cache to be reset

GitHub noreply at github.com
Mon Aug 26 15:00:37 UTC 2013


  Branch: refs/heads/973-datastore-docs-improvements
  Home:   https://github.com/okfn/ckan
  Commit: 5f1ba2b9840a1c02c9b2b91c968ca884f2335d47
      https://github.com/okfn/ckan/commit/5f1ba2b9840a1c02c9b2b91c968ca884f2335d47
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/base.py
    M ckan/lib/render.py

  Log Message:
  -----------
  [#507] Allow the template cache to be reset


  Commit: 331087d35b2db7290f1fb83286d9435e08d88ea6
      https://github.com/okfn/ckan/commit/331087d35b2db7290f1fb83286d9435e08d88ea6
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#547] Rework the plugins and config stuff


  Commit: 5fca5c0fbeab407528ff17c2be9a24526ec7b0dc
      https://github.com/okfn/ckan/commit/5fca5c0fbeab407528ff17c2be9a24526ec7b0dc
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#549] Fix some tests


  Commit: 3fcbcc40f363758c2cbddcc87a5391ce40fe36ae
      https://github.com/okfn/ckan/commit/3fcbcc40f363758c2cbddcc87a5391ce40fe36ae
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py

  Log Message:
  -----------
  [#547] Fix some extension tests


  Commit: c3cae2396f5c6d4d9058abf646831241601b5ab7
      https://github.com/okfn/ckan/commit/c3cae2396f5c6d4d9058abf646831241601b5ab7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-05 (Tue, 05 Mar 2013)

  Changed paths:
    M ckan/plugins/core.py
    M ckanext/pdfpreview/tests/test_preview.py

  Log Message:
  -----------
  [#547] Attempt to fix test via simplified plugins


  Commit: e9f4df5203b7f26efb2b2c6a44d45d41a7a1d5c9
      https://github.com/okfn/ckan/commit/e9f4df5203b7f26efb2b2c6a44d45d41a7a1d5c9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M ckan/plugins/core.py
    M ckanext/pdfpreview/tests/test_preview.py

  Log Message:
  -----------
  Revert "[#547] Attempt to fix test via simplified plugins"

This reverts commit c3cae2396f5c6d4d9058abf646831241601b5ab7.

a commit too far


  Commit: fa137ca86c64b7854d7d601834e72dc46318b2f1
      https://github.com/okfn/ckan/commit/fa137ca86c64b7854d7d601834e72dc46318b2f1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-03-25 (Mon, 25 Mar 2013)

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#547] Resource proxy test changes


  Commit: 5ea2a1dddded74c0ea52c8f17f3680fb6d5656f8
      https://github.com/okfn/ckan/commit/5ea2a1dddded74c0ea52c8f17f3680fb6d5656f8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  Revert "[#547] Resource proxy test changes"

This reverts commit fa137ca86c64b7854d7d601834e72dc46318b2f1.

didn't help


  Commit: d6c3443fcf17e57edde1f377067f6a4307fa82e0
      https://github.com/okfn/ckan/commit/d6c3443fcf17e57edde1f377067f6a4307fa82e0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckanext/jsonpreview/tests/test_preview.py
    M ckanext/pdfpreview/tests/test_preview.py

  Log Message:
  -----------
  [#549] Fix tests due to SingletonPlugin Issues


  Commit: d6ebff78246edb093583491fc6e4a0df23e52cb7
      https://github.com/okfn/ckan/commit/d6ebff78246edb093583491fc6e4a0df23e52cb7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M .travis.yml
    A bin/travis-build
    A ckan/common.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/app_globals.py
    R ckan/lib/authztool.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dumper.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.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/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/misc.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
    R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
    R ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
    R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
    R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
    A ckan/public/base/images/table-seperator.png
    A ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    M ckan/public/base/less/tables.less
    M ckan/public/base/less/variables.less
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/dataviewer/snippets/no_preview.html
    M ckan/templates/development/snippets/page_header.html
    M ckan/templates/error_document_template.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/header.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/home/snippets/about_text.html
    M ckan/templates/organization/about.html
    A ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/edit.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/new_package_metadata.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/search_form.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_form.html
    M ckan/templates/snippets/datapreview_embed_dialog.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/package_item.html
    R ckan/templates/snippets/page_header.html
    M ckan/templates/snippets/popular.html
    M ckan/templates/snippets/related.html
    A ckan/templates/snippets/search_result_text.html
    M ckan/templates/snippets/simple_search.html
    M ckan/templates/snippets/social.html
    M ckan/templates/snippets/subscribe.html
    A ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/new.html
    M ckan/templates/user/perform_reset.html
    M ckan/templates/user/read.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates_legacy/group/layout.html
    M ckan/templates_legacy/layout_base.html
    M ckan/templates_legacy/package/layout.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/revision/layout.html
    M ckan/templates_legacy/user/layout.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_search.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_solr_search_index.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_sync.py
    R ckan/tests/mock_publisher_auth.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_dumper.py
    M ckanext/datastore/bin/set_permissions.sql
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    A ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    A ckanext/example_idatasetform/__init__.py
    A ckanext/example_idatasetform/plugin.py
    A ckanext/example_idatasetform/templates/package/read.html
    A ckanext/example_idatasetform/templates/package/snippets/package_basic_fields.html
    A ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    R ckanext/organizations/__init__.py
    R ckanext/organizations/controllers.py
    R ckanext/organizations/forms.py
    R ckanext/organizations/templates/email/join_publisher_request.txt
    R ckanext/organizations/templates/organization_edit.html
    R ckanext/organizations/templates/organizations/form.html
    R ckanext/organizations/templates/organizations/index.html
    R ckanext/organizations/templates/organizations/new.html
    R ckanext/organizations/templates/organizations/read.html
    R ckanext/organizations/templates/organizations/users.html
    R ckanext/organizations/templates/organizations/users_form.html
    R ckanext/organizations/templates_legacy/organizations/apply.html
    R ckanext/organizations/templates_legacy/organizations/apply_form.html
    R ckanext/organizations/templates_legacy/organizations/email/join_publisher_request.txt
    R ckanext/organizations/templates_legacy/organizations/form.html
    R ckanext/organizations/templates_legacy/organizations/history.html
    R ckanext/organizations/templates_legacy/organizations/index.html
    R ckanext/organizations/templates_legacy/organizations/layout.html
    R ckanext/organizations/templates_legacy/organizations/new.html
    R ckanext/organizations/templates_legacy/organizations/package_form.html
    R ckanext/organizations/templates_legacy/organizations/read.html
    R ckanext/organizations/templates_legacy/organizations/users.html
    R ckanext/organizations/templates_legacy/organizations/users_form.html
    R ckanext/publisher_form/__init__.py
    R ckanext/publisher_form/forms.py
    R ckanext/publisher_form/templates/dataset_form.html
    R ckanext/publisher_form/templates/publisher_form.html
    R ckanext/publisher_form/templates/publisher_index.html
    R ckanext/publisher_form/templates/publisher_layout.html
    R ckanext/publisher_form/templates/publisher_new.html
    R ckanext/publisher_form/templates/publisher_read.html
    R ckanext/resourceproxy/tests/file_server.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/test_tag_vocab_plugin.py
    R doc/about.rst
    R doc/administrative-dashboard.rst
    R doc/api-tutorial.rst
    R doc/api-util.rst
    R doc/api-v2.rst
    M doc/api.rst
    R doc/apiv3.rst
    M doc/architecture.rst
    A doc/ckan.logic.action.create.rst
    A doc/ckan.logic.action.delete.rst
    A doc/ckan.logic.action.get.rst
    A doc/ckan.logic.action.update.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/datastore-api.rst
    A doc/filestore-api.rst
    M doc/filestore.rst
    R doc/forms.rst
    M doc/index.rst
    M doc/install-from-source.rst
    A doc/legacy-api.rst
    M doc/loading-data.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    R doc/user-stories-list.rst
    R doc/user-stories.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: 591297d80132bdd7ea5ed9f217721b2c69acfbe9
      https://github.com/okfn/ckan/commit/591297d80132bdd7ea5ed9f217721b2c69acfbe9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-03 (Wed, 03 Apr 2013)

  Changed paths:
    M ckanext/datastore/tests/test_configure.py

  Log Message:
  -----------
  [#547] Remove test that does not work with Travis as illogical


  Commit: 795e7734e722d60a4ddcb254ec7dbd8444849816
      https://github.com/okfn/ckan/commit/795e7734e722d60a4ddcb254ec7dbd8444849816
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/templates/package/search.html
    M doc/legacy-api.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: efc9c45cc48bc8f8ed0984b8e3f206ce30ba3b11
      https://github.com/okfn/ckan/commit/efc9c45cc48bc8f8ed0984b8e3f206ce30ba3b11
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-04 (Thu, 04 Apr 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#547] Remove surpless code


  Commit: a01bd2137041abd642dab9db9c61ed078e6a7dd1
      https://github.com/okfn/ckan/commit/a01bd2137041abd642dab9db9c61ed078e6a7dd1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#547] Allow IDatasetForm dynamic uploads


  Commit: 2371c05cbacc3aaca5b3bdc386647624638d4dc5
      https://github.com/okfn/ckan/commit/2371c05cbacc3aaca5b3bdc386647624638d4dc5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#547] Refactor and clean plugins.core


  Commit: f871e87e9d26a7e711cdf75d8076f12f26432c48
      https://github.com/okfn/ckan/commit/f871e87e9d26a7e711cdf75d8076f12f26432c48
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/tests/__init__.py
    M ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    M ckan/tests/ckantestplugin/setup.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/mock_plugin.py
    M ckan/tests/test_plugins.py
    M test-core.ini

  Log Message:
  -----------
  [#547] Fix core tests


  Commit: 4fd5d3ac68432d563dd77dedbc927794b3111c99
      https://github.com/okfn/ckan/commit/4fd5d3ac68432d563dd77dedbc927794b3111c99
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckanext/test_tag_vocab_plugin.py

  Log Message:
  -----------
  [#547] Fix test tag vocab plugin


  Commit: 3dae7fed1f72d21e353465ccef67d1e7ad8fb56f
      https://github.com/okfn/ckan/commit/3dae7fed1f72d21e353465ccef67d1e7ad8fb56f
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/plugins/core.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    M setup.py

  Log Message:
  -----------
  [#547] Move test_plugins into ckan proper


  Commit: 15d17bac4e09d2f85f48ea853f6d18cc9838d077
      https://github.com/okfn/ckan/commit/15d17bac4e09d2f85f48ea853f6d18cc9838d077
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

  Changed paths:
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#547] Remove debug print statement


  Commit: 04cebecb53e6cdcc4741904799f92e561cb0a54c
      https://github.com/okfn/ckan/commit/04cebecb53e6cdcc4741904799f92e561cb0a54c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-05 (Fri, 05 Apr 2013)

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

  Log Message:
  -----------
  [#547] Remove extra unused code and fix core test bug


  Commit: 11a924986d231ce4b84fbe02a69b0b491c3f64fa
      https://github.com/okfn/ckan/commit/11a924986d231ce4b84fbe02a69b0b491c3f64fa
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-07 (Sun, 07 Apr 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/tests/ckantestplugins.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#547] Refix main tests after refactor


  Commit: 1b10016071571ccf6be9d34a2432c0a66a9a73c9
      https://github.com/okfn/ckan/commit/1b10016071571ccf6be9d34a2432c0a66a9a73c9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#547] Ckanext test fixes


  Commit: afdd9c8f0b2e007431d1b1d7cce1352f20aa345d
      https://github.com/okfn/ckan/commit/afdd9c8f0b2e007431d1b1d7cce1352f20aa345d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#547] Pep8 fix


  Commit: f6c77958ad3cc702210afb42396a815dce99f958
      https://github.com/okfn/ckan/commit/f6c77958ad3cc702210afb42396a815dce99f958
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-08 (Mon, 08 Apr 2013)

  Changed paths:
    M ckanext/datastore/db.py
    R doc/contrib.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: a0ae6e97ab3776e9946342eb8cf8353ec09c138b
      https://github.com/okfn/ckan/commit/a0ae6e97ab3776e9946342eb8cf8353ec09c138b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/tests/ckantestplugins.py
    M setup.py

  Log Message:
  -----------
  [#547] Add new test plugin


  Commit: a2598d267bf049a0b8bb81ca8204e0ba3cbf8806
      https://github.com/okfn/ckan/commit/a2598d267bf049a0b8bb81ca8204e0ba3cbf8806
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-05-01 (Wed, 01 May 2013)

  Changed paths:
    M ckan/model/extension.py
    M ckan/model/modification.py

  Log Message:
  -----------
  [#547] Improve the notification plugins


  Commit: e5b40802441aff8216b29d5a9662d3311af0f54b
      https://github.com/okfn/ckan/commit/e5b40802441aff8216b29d5a9662d3311af0f54b
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M README.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.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/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/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
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/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
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/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
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A ckan/i18n/ko_KR/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
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A ckan/i18n/my_MM/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
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/render.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/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    R ckan/misc.py
    M ckan/model/__init__.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    M ckan/model/tracking.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/tracking.js
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    A ckan/templates/group/history.html
    M ckan/templates/group/snippets/group_item.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/organization_item.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/data_api_button.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/snippets/sort_by.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    R doc/CHANGELOG.rst
    M doc/_templates/footer.html
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/commenting.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    A doc/contributing.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    A doc/images/popular-dataset.png
    A doc/images/popular-resource.png
    A doc/images/sort-datasets-by-popularity.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    A doc/releases.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    A doc/tracking.rst
    A doc/upgrading-a-package-install.rst
    A doc/upgrading-a-source-install.rst
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love

Conflicts:
	ckan/config/environment.py
	ckanext/pdfpreview/tests/test_preview.py
	ckanext/textpreview/tests/test_preview.py

    trivial merges


  Commit: 6fc6bfdbd13e8756e3c732c6a0498cf3a6262641
      https://github.com/okfn/ckan/commit/6fc6bfdbd13e8756e3c732c6a0498cf3a6262641
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/textpreview/tests/test_preview.py

  Log Message:
  -----------
  [#547] Fix tests affected by merge


  Commit: eeb9ed36792af4e8098a1a21d2e268a57625879c
      https://github.com/okfn/ckan/commit/eeb9ed36792af4e8098a1a21d2e268a57625879c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#547] Fixes to final test fails


  Commit: e4b2c2c5a0d0f03ebbfe6bfda17419a5e484fefe
      https://github.com/okfn/ckan/commit/e4b2c2c5a0d0f03ebbfe6bfda17419a5e484fefe
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-03 (Mon, 03 Jun 2013)

  Changed paths:
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#547] Fix not unloading plugin in legacy modeaw


  Commit: 1e3f7d565847036b450972b23acc1e03ad4aad29
      https://github.com/okfn/ckan/commit/1e3f7d565847036b450972b23acc1e03ad4aad29
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/travis-build
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/__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/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    A ckan/migration/versions/068_add_package_extras_index.py
    R ckan/model/test_user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/templates/group/about.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M doc/upgrading-a-package-install.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love

Conflicts:
	ckan/config/environment.py
	ckan/lib/plugins.py

    trivial fixes


  Commit: 15921a3c18e5b36e0b4d7451e11e96c34bf9e369
      https://github.com/okfn/ckan/commit/15921a3c18e5b36e0b4d7451e11e96c34bf9e369
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckan/plugins/core.py

  Log Message:
  -----------
  [#547] Code cleanups


  Commit: ff1f7cf071a9efacf539eeb1233bd2ddd1d06884
      https://github.com/okfn/ckan/commit/ff1f7cf071a9efacf539eeb1233bd2ddd1d06884
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-11 (Tue, 11 Jun 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#547] Travis fix


  Commit: c36481b4a03013a38ff39543807f1f06addaa0cb
      https://github.com/okfn/ckan/commit/c36481b4a03013a38ff39543807f1f06addaa0cb
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#547] Test fixed


  Commit: 42a09a6abb8050b808258e3355a7e4d043ad56ff
      https://github.com/okfn/ckan/commit/42a09a6abb8050b808258e3355a7e4d043ad56ff
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#547] Fixes to datastore plugin


  Commit: 2c4279111cadb6e660bb17705a82f43af0fd0dec
      https://github.com/okfn/ckan/commit/2c4279111cadb6e660bb17705a82f43af0fd0dec
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#547] Test fixes for datastore


  Commit: 9f6ab9ceda6cc5a81a601a43620e3739a21a22e1
      https://github.com/okfn/ckan/commit/9f6ab9ceda6cc5a81a601a43620e3739a21a22e1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/tests/test_dump.py

  Log Message:
  -----------
  [#547] Fix routes issue and datastore dump


  Commit: 1c8ddf22cd80b61ad89456c912f5ea2c8ffa4eb6
      https://github.com/okfn/ckan/commit/1c8ddf22cd80b61ad89456c912f5ea2c8ffa4eb6
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/api.py
    M ckan/model/meta.py
    M ckan/tests/__init__.py
    M ckanext/datastore/plugin.py
    A doc/changelog.rst
    M doc/conf.py
    M doc/index.rst
    M doc/installing.rst
    M doc/release-process.rst
    R doc/releases.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love

Conflicts:
	ckanext/datastore/plugin.py

    minor change to new_resource_show


  Commit: 6cafd91b9f1c472a261b5b0aef8bbb6b060172cf
      https://github.com/okfn/ckan/commit/6cafd91b9f1c472a261b5b0aef8bbb6b060172cf
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    R build.sh
    R fabfile.py
    R jshint.json
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  [#985] Remove files that are not needed any more from ckan root


  Commit: 8d03df644d331ea4a84d22bcf311a9c5594397d9
      https://github.com/okfn/ckan/commit/8d03df644d331ea4a84d22bcf311a9c5594397d9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Allow users to create a ckan resource and a datastore resource with one call


  Commit: 397507fcb256d4a74fe5c7d2b35aa62b1740fc10
      https://github.com/okfn/ckan/commit/397507fcb256d4a74fe5c7d2b35aa62b1740fc10
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#981] Define datapusher_submit action


  Commit: 701aa743db6674094c66cf4a3e8cdba08b01faa6
      https://github.com/okfn/ckan/commit/701aa743db6674094c66cf4a3e8cdba08b01faa6
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Disable test until #547 resolves issues with routes in plugins


  Commit: 42ef41fd7fb0a85c80b38902033813f26b98a005
      https://github.com/okfn/ckan/commit/42ef41fd7fb0a85c80b38902033813f26b98a005
  Author: kindly <kindly at gmail.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M .gitmodules
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.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/user.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/test_tag_vocab_plugin.py
    M doc/data-viewer.rst
    M doc/paster.rst
    M doc/toolkit.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: 9d4ba31315868b49af315300763b49ece6b2cb54
      https://github.com/okfn/ckan/commit/9d4ba31315868b49af315300763b49ece6b2cb54
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-25 (Tue, 25 Jun 2013)

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

  Log Message:
  -----------
  package_list performance fix


  Commit: c84e9eae14ecfb416125209e1e4a1eb6d73d31ac
      https://github.com/okfn/ckan/commit/c84e9eae14ecfb416125209e1e4a1eb6d73d31ac
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

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

  Log Message:
  -----------
  package_list: return sorted by name


  Commit: fd6e63911f6953b576f2b963a6a12869b3e304c9
      https://github.com/okfn/ckan/commit/fd6e63911f6953b576f2b963a6a12869b3e304c9
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

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

  Log Message:
  -----------
  fix for package_list returning nested list


  Commit: 874abf5ffbbf6a3dddc405a411a35477984862da
      https://github.com/okfn/ckan/commit/874abf5ffbbf6a3dddc405a411a35477984862da
  Author: Ian Ward <ian at excess.org>
  Date:   2013-06-26 (Wed, 26 Jun 2013)

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

  Log Message:
  -----------
  package_list: use context['model'] instead of import, from @tobes


  Commit: 21d88806b15f1f37f2d46331f2eb4cff4237447e
      https://github.com/okfn/ckan/commit/21d88806b15f1f37f2d46331f2eb4cff4237447e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1051] Coding standards: Fix remaining nasty str(..)


  Commit: 95dec8c992d6ce844da4c5ea5fd080bad074c758
      https://github.com/okfn/ckan/commit/95dec8c992d6ce844da4c5ea5fd080bad074c758
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M ckan/lib/navl/__init__.py
    M ckan/tests/test_coding_standards.py

  Log Message:
  -----------
  [#1051] Coding standards: Fix remaining bad spellings


  Commit: 7abd369dee46ecdf2cc02ac61e15e3eb0eb872f7
      https://github.com/okfn/ckan/commit/7abd369dee46ecdf2cc02ac61e15e3eb0eb872f7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M bin/ckan_spam.py
    M ckan/lib/package_saver.py
    M ckan/tests/test_coding_standards.py
    M ckanext/stats/stats.py

  Log Message:
  -----------
  [#1051] Coding standards: Fix some import *


  Commit: 887e50f43b8f1aba642c7f1223d301642c3ea0f5
      https://github.com/okfn/ckan/commit/887e50f43b8f1aba642c7f1223d301642c3ea0f5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

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

  Log Message:
  -----------
  [#818] Try order by id to prevent test fail


  Commit: edfe6146ac5f961dd1a628343c1dff7f56a30c99
      https://github.com/okfn/ckan/commit/edfe6146ac5f961dd1a628343c1dff7f56a30c99
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/package.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.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/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/new.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch 'master' into 1051-code-cleanups-for-2.2


  Commit: b8c1a55570341e47154221d38e097225886a5897
      https://github.com/okfn/ckan/commit/b8c1a55570341e47154221d38e097225886a5897
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

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

  Log Message:
  -----------
  [#1051] Fix tag_create function params


  Commit: d593c6d21e752760161c5954121f1e2d608ce13e
      https://github.com/okfn/ckan/commit/d593c6d21e752760161c5954121f1e2d608ce13e
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

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

  Log Message:
  -----------
  [#1051] Clean calling params to activity_create action


  Commit: 40d41184a9e5093fc3b5958c7e52f8f6437a5db1
      https://github.com/okfn/ckan/commit/40d41184a9e5093fc3b5958c7e52f8f6437a5db1
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

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

  Log Message:
  -----------
  [#1051] Clean calling params to activity_create action


  Commit: 210881329d816f9572ce6df4fff0cd6be78037d4
      https://github.com/okfn/ckan/commit/210881329d816f9572ce6df4fff0cd6be78037d4
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  [#1060] Refactor auth functions holder for more flexibility


  Commit: a84aa816cd8a8168d8c379205863bb09a0e4f69a
      https://github.com/okfn/ckan/commit/a84aa816cd8a8168d8c379205863bb09a0e4f69a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1060] get_action() now audits use of auth function calls


  Commit: 7cef08d29c9c73b5ce3c8c9f15d8ff849d5289a5
      https://github.com/okfn/ckan/commit/7cef08d29c9c73b5ce3c8c9f15d8ff849d5289a5
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

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

  Log Message:
  -----------
  [#1060] Action function updates so using correctly


  Commit: 350698c355aea82ecd85e37048742c36ddb16316
      https://github.com/okfn/ckan/commit/350698c355aea82ecd85e37048742c36ddb16316
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M ckan/migration/versions/066_default_package_type.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1060-action-auth-audit


  Commit: 3e6e19a3b96cdfa84577d6d2162a21533f4967dd
      https://github.com/okfn/ckan/commit/3e6e19a3b96cdfa84577d6d2162a21533f4967dd
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1060] Add a comment


  Commit: e55bfb5f006a9a905ca1feace2dc6c5a9526f4c6
      https://github.com/okfn/ckan/commit/e55bfb5f006a9a905ca1feace2dc6c5a9526f4c6
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/model/package_relationship.py
    M ckan/templates/macros/autoform.html
    M doc/templating.rst

  Log Message:
  -----------
  [#1064] Don't translate empty strings


  Commit: 9eea461444450fe4557a8887130b56eec9d13483
      https://github.com/okfn/ckan/commit/9eea461444450fe4557a8887130b56eec9d13483
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-01 (Mon, 01 Jul 2013)

  Changed paths:
    M .tx/config

  Log Message:
  -----------
  [#1065] Update transifex host in .tx/config

You'll proabably need to update your ~/.transifexrc file as well.


  Commit: fb59183ca47fe4ec1cc11db78658c836838b6348
      https://github.com/okfn/ckan/commit/fb59183ca47fe4ec1cc11db78658c836838b6348
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-02 (Tue, 02 Jul 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1060] Do not audit extensions


  Commit: 773b0e13359922797a25a6a2410b252fd239d460
      https://github.com/okfn/ckan/commit/773b0e13359922797a25a6a2410b252fd239d460
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1067] Resolve issues with % in column names in search


  Commit: cca66d914bf270dd12524b2640778db37cf5c0a7
      https://github.com/okfn/ckan/commit/cca66d914bf270dd12524b2640778db37cf5c0a7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_delete.py

  Log Message:
  -----------
  [#1067] Test % in delete, resolve unicode issues in messages


  Commit: 77c78461bc490fa954453e7000502ba1503cbb6f
      https://github.com/okfn/ckan/commit/77c78461bc490fa954453e7000502ba1503cbb6f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  No need to pass context to action because it is implicitly added


  Commit: fb49b74fff2f10e9061df0a89dc69cfdda9cb906
      https://github.com/okfn/ckan/commit/fb49b74fff2f10e9061df0a89dc69cfdda9cb906
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Revert "No need to pass context to action because it is implicitly added"

This reverts commit 77c78461bc490fa954453e7000502ba1503cbb6f.


  Commit: f39233e80fad842a978eb5c13f9e9ff49a5e8971
      https://github.com/okfn/ckan/commit/f39233e80fad842a978eb5c13f9e9ff49a5e8971
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

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

  Log Message:
  -----------
  [#1081] Remove junk code (unrelated)


  Commit: 50ba9bf6a8cd00ad7055260ea565290db4f7e166
      https://github.com/okfn/ckan/commit/50ba9bf6a8cd00ad7055260ea565290db4f7e166
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  [#1081] Clean model.resource and get now returns Resource


  Commit: fe79fed5782e17e410fbd68f7b9c1309f1f08f86
      https://github.com/okfn/ckan/commit/fe79fed5782e17e410fbd68f7b9c1309f1f08f86
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  [#1081] Add new get_package_id() method to Resource


  Commit: c972c1c02778d484cb22158a0980bf52564a8327
      https://github.com/okfn/ckan/commit/c972c1c02778d484cb22158a0980bf52564a8327
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

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

  Log Message:
  -----------
  [#1081] resource_delete updates the package


  Commit: eb72f9f1d98329cc7bc7014b284cd7bd30d9b3e0
      https://github.com/okfn/ckan/commit/eb72f9f1d98329cc7bc7014b284cd7bd30d9b3e0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  [#1081] Pep8 model.resource


  Commit: 068560134febb3550b656571786e605afdd46819
      https://github.com/okfn/ckan/commit/068560134febb3550b656571786e605afdd46819
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1081] Fix for test


  Commit: 7882f27654cf0d78f25d7a9b6311aee0a7514008
      https://github.com/okfn/ckan/commit/7882f27654cf0d78f25d7a9b6311aee0a7514008
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/resource.config

  Log Message:
  -----------
  [#1082] Upgrade to font-awesome


  Commit: ab2c66e25dd99ce9e152002afdb8d3b909015357
      https://github.com/okfn/ckan/commit/ab2c66e25dd99ce9e152002afdb8d3b909015357
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less

  Log Message:
  -----------
  [#1082] Upgrade bootstrap


  Commit: 27967b6d7c21f4c475cbd907da6ebc77b4c044fc
      https://github.com/okfn/ckan/commit/27967b6d7c21f4c475cbd907da6ebc77b4c044fc
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-03 (Wed, 03 Jul 2013)

  Changed paths:
    M ckan/public/base/vendor/jquery.js

  Log Message:
  -----------
  [#1082] Upgrade to jQuery


  Commit: ea6cdd73d439e5614106f964c5a48ef1e0728c87
      https://github.com/okfn/ckan/commit/ea6cdd73d439e5614106f964c5a48ef1e0728c87
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js

  Log Message:
  -----------
  [#1082] jQuery.browser was removed in 1.9


  Commit: d4639179a9a4b19bbb0a05f1a8109cffa7de033c
      https://github.com/okfn/ckan/commit/d4639179a9a4b19bbb0a05f1a8109cffa7de033c
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#1082] jQuery.ajax.error deprecatedin favour of .fail in jQuery 1.8


  Commit: 05096e995088c9571ea109cfac7c34d0a50d5bac
      https://github.com/okfn/ckan/commit/05096e995088c9571ea109cfac7c34d0a50d5bac
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ckan/templates/ajax_snippets/related-item.html

  Log Message:
  -----------
  [#1082] Fix for undefined variable within mocha tests


  Commit: f9e43bbaad7a9103a2210df62170677a3916bf30
      https://github.com/okfn/ckan/commit/f9e43bbaad7a9103a2210df62170677a3916bf30
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-04 (Thu, 04 Jul 2013)

  Changed paths:
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js

  Log Message:
  -----------
  [#1082] Fix for jQuery.contains as params should be dom elements and not jQuery collections


  Commit: db00f0970c2731d8c096156bb0b7a797c204aaf2
      https://github.com/okfn/ckan/commit/db00f0970c2731d8c096156bb0b7a797c204aaf2
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

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

  Log Message:
  -----------
  [#1078] use SOLR data_dict instead of package_dictize when possible


  Commit: df8cdd08e564e0106b9f3fc00664d2c3c0e257fa
      https://github.com/okfn/ckan/commit/df8cdd08e564e0106b9f3fc00664d2c3c0e257fa
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

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

  Log Message:
  -----------
  [#1078] fall back to package_dictize on SearchError


  Commit: e55380470036ac85c1ff78281835744266363a5e
      https://github.com/okfn/ckan/commit/e55380470036ac85c1ff78281835744266363a5e
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

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

  Log Message:
  -----------
  [#1078] treat socket errors as solr lookup failure


  Commit: c07c79baaee97513234ffcd41c383bffa2c6f87d
      https://github.com/okfn/ckan/commit/c07c79baaee97513234ffcd41c383bffa2c6f87d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

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

  Log Message:
  -----------
  [#1078] don't use cache if schema passed


  Commit: 484947a24d36c4c98e1589e9c2b34c2459133870
      https://github.com/okfn/ckan/commit/484947a24d36c4c98e1589e9c2b34c2459133870
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

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

  Log Message:
  -----------
  [#1078] don't use cache if different revision


  Commit: 879b9376005177e1805ba305a583e771fbe7f17f
      https://github.com/okfn/ckan/commit/879b9376005177e1805ba305a583e771fbe7f17f
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

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

  Log Message:
  -----------
  [#1078] don't use cache when indexing


  Commit: db77781b1ab5bc72f89f3a40d6e2256535e581c3
      https://github.com/okfn/ckan/commit/db77781b1ab5bc72f89f3a40d6e2256535e581c3
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

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

  Log Message:
  -----------
  [#1078] fix for before_view with cached dataset


  Commit: 557b028b08e1054b41d9fbae7550598b08fe5f09
      https://github.com/okfn/ckan/commit/557b028b08e1054b41d9fbae7550598b08fe5f09
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

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

  Log Message:
  -----------
  [#1078] move before_view plugin from dictize to action, feels more consistent


  Commit: 9af97400264eb7030b08733cc76246dfd1d100b9
      https://github.com/okfn/ckan/commit/9af97400264eb7030b08733cc76246dfd1d100b9
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckanext/multilingual/solr/schema.xml

  Log Message:
  -----------
  [#1078] store show_package_schema-validated data_dict in SOLR


  Commit: a00e218c50bf5027de9a4bcaeda1b683094da92f
      https://github.com/okfn/ckan/commit/a00e218c50bf5027de9a4bcaeda1b683094da92f
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

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

  Log Message:
  -----------
  [#1078] package index: treat missing type as default type


  Commit: 458283baf64f510e8391a149e9728849300c520b
      https://github.com/okfn/ckan/commit/458283baf64f510e8391a149e9728849300c520b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

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

  Log Message:
  -----------
  [#1078] validated data dict store missing as null


  Commit: f239d8412a70c7c4bccb7cbeac06648e412874bd
      https://github.com/okfn/ckan/commit/f239d8412a70c7c4bccb7cbeac06648e412874bd
  Author: Ian Ward <ian at excess.org>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

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

  Log Message:
  -----------
  [#1078] data_dict may still be used when schema passed


  Commit: 44139fc6bf57e2fd052ceaaef06bba767d25ebe5
      https://github.com/okfn/ckan/commit/44139fc6bf57e2fd052ceaaef06bba767d25ebe5
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M ckanext/datastore/tests/test_delete.py

  Log Message:
  -----------
  [#1067] Add note about dangerous code to make @tobes happy.


  Commit: f91e7e65a1fa5c6818dd02f3496b0a65a96ab346
      https://github.com/okfn/ckan/commit/f91e7e65a1fa5c6818dd02f3496b0a65a96ab346
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch '1067-datastore-percent-issues'


  Commit: 3fc2bf4c0e120a37ffd19e225de523e577933003
      https://github.com/okfn/ckan/commit/3fc2bf4c0e120a37ffd19e225de523e577933003
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js

  Log Message:
  -----------
  [#801] Upgrade to mocha


  Commit: 13f90eb34162d534887c156f986ac21ade8db9a1
      https://github.com/okfn/ckan/commit/13f90eb34162d534887c156f986ac21ade8db9a1
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#801] Get mocha running within mocha-phantomjs


  Commit: f8a5d32b2fe7ef3df2e54b5cc364eaf4ea1e7d59
      https://github.com/okfn/ckan/commit/f8a5d32b2fe7ef3df2e54b5cc364eaf4ea1e7d59
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Run mocha tests on travis


  Commit: a33cc3ce73cdfa12efd3af8bf3b570cf0839c5d9
      https://github.com/okfn/ckan/commit/a33cc3ce73cdfa12efd3af8bf3b570cf0839c5d9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Run CKAN in background when running mocha tests. Might not work but need to test on travis.


  Commit: 9568bb30408b31a6fabc1c520386bda3e46a8497
      https://github.com/okfn/ckan/commit/9568bb30408b31a6fabc1c520386bda3e46a8497
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  [#1106] Don't accept invalid URLs in resource proxy


  Commit: 9305d5eee71ce2561ba61322e268b83a108f4e25
      https://github.com/okfn/ckan/commit/9305d5eee71ce2561ba61322e268b83a108f4e25
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#1116] Don't demand things that we don't do


  Commit: 709130978a0247ed2c95f14af4c647f35ac72347
      https://github.com/okfn/ckan/commit/709130978a0247ed2c95f14af4c647f35ac72347
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1115] Changes name of parent header block


  Commit: 2f4818c42a1f06f7f0b7a6305c071b2c1f161065
      https://github.com/okfn/ckan/commit/2f4818c42a1f06f7f0b7a6305c071b2c1f161065
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Correct ini file


  Commit: c0d288cee5a32ff84bd827a9c51d2563250f5d73
      https://github.com/okfn/ckan/commit/c0d288cee5a32ff84bd827a9c51d2563250f5d73
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M bin/travis-build
    M ckan/public/base/test/index.html

  Log Message:
  -----------
  [#801] Simplified the logic for running the mocha tests in and out of browser


  Commit: 197bb64d892a58c12c25f6590f020b08ec660db2
      https://github.com/okfn/ckan/commit/197bb64d892a58c12c25f6590f020b08ec660db2
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/templates/ajax_snippets/related-item.html

  Log Message:
  -----------
  [#801] Fix for related-item.html snippet so that all mocha tests pass


  Commit: 1a94014cb546f8b5b01d093822aebf27f260de6c
      https://github.com/okfn/ckan/commit/1a94014cb546f8b5b01d093822aebf27f260de6c
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/templates/package/snippets/stages.html

  Log Message:
  -----------
  [#1091] Text change to the additional data


  Commit: 037a61e62bf8196dcf9bd2d3d698b5d6688ce3d0
      https://github.com/okfn/ckan/commit/037a61e62bf8196dcf9bd2d3d698b5d6688ce3d0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M .tx/config

  Log Message:
  -----------
  Merge branch '1065-update-transifex-host'


  Commit: 0484de2246c9297881493436bd28cc33bc3c17ef
      https://github.com/okfn/ckan/commit/0484de2246c9297881493436bd28cc33bc3c17ef
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

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

  Log Message:
  -----------
  [#1081] Do not actually delete the resource


  Commit: 1a5b63cf2e732a25e2eb89b53c369b295e0aa95a
      https://github.com/okfn/ckan/commit/1a5b63cf2e732a25e2eb89b53c369b295e0aa95a
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Move install of npm deps to before nosetests


  Commit: 5e74df6fa130b866587d28e1080b83c2063320a8
      https://github.com/okfn/ckan/commit/5e74df6fa130b866587d28e1080b83c2063320a8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    A doc/changelog.rst

  Log Message:
  -----------
  Put the changelog symlink back into the docs

not sure how this got removed


  Commit: bf58021ea97dc600644b3a6acafec3f3668f5029
      https://github.com/okfn/ckan/commit/bf58021ea97dc600644b3a6acafec3f3668f5029
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1118] Catch non-integer facet limits


  Commit: f58397694ee5175a1831e70e05003403023852d9
      https://github.com/okfn/ckan/commit/f58397694ee5175a1831e70e05003403023852d9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

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

  Log Message:
  -----------
  [#1114] Do not reuse the variable name as it leaks


  Commit: c6ab247c4035b94acada443b6653e6f5716b0261
      https://github.com/okfn/ckan/commit/c6ab247c4035b94acada443b6653e6f5716b0261
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  Merge branch '1116-branch-standards'


  Commit: 2eb573f2ad08bbeb63d6b50902c3761abb3b38fe
      https://github.com/okfn/ckan/commit/2eb573f2ad08bbeb63d6b50902c3761abb3b38fe
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/forms.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#1089] Add required '*' to forms

* Adds extra params to form macros called `is_required`
* Also adds extra macro for outputting the '* is required field' on the bottom
of forms
* Also adds said params to needed forms


  Commit: 5a0bee09d5a01c0ef6563375ae8debd63dea7c9f
      https://github.com/okfn/ckan/commit/5a0bee09d5a01c0ef6563375ae8debd63dea7c9f
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/templates/header.html
    M ckan/templates/page.html

  Log Message:
  -----------
  [#1115] Change block names within child template and not parent as it could cause block extension issues


  Commit: 624c91bc7212ad6437b6b578279fc3081ccd224c
      https://github.com/okfn/ckan/commit/624c91bc7212ad6437b6b578279fc3081ccd224c
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/templates/snippets/activity_item.html

  Log Message:
  -----------
  [#518] Adds date-time tooltip to the activity time


  Commit: d7b5b3ce1df8c3d6e997acbc151c2a0c1958f8c2
      https://github.com/okfn/ckan/commit/d7b5b3ce1df8c3d6e997acbc151c2a0c1958f8c2
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Moved mocha to before nosetests


  Commit: dd46f25a8c756d2221c8bc8f824e09b3d10005a7
      https://github.com/okfn/ckan/commit/dd46f25a8c756d2221c8bc8f824e09b3d10005a7
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/public/base/test/spec/ckan.spec.js

  Log Message:
  -----------
  [#801] Added deliberate failing test for travis


  Commit: 486a09b1e56bbd7310be59ebd5d45e016dfb322c
      https://github.com/okfn/ckan/commit/486a09b1e56bbd7310be59ebd5d45e016dfb322c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/lib/formatters.py

  Log Message:
  -----------
  [#518] formatter now give x months ago etc


  Commit: 194be7c9750feff5cc442feba8aeb0cfee6e4bd3
      https://github.com/okfn/ckan/commit/194be7c9750feff5cc442feba8aeb0cfee6e4bd3
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#518] Refactor render_datetime


  Commit: 003a2119010130b3fff2cffca97cb1d738ebd3e0
      https://github.com/okfn/ckan/commit/003a2119010130b3fff2cffca97cb1d738ebd3e0
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#518] Add time_ago_from_datestamp() helper


  Commit: 7792e2e6de61d9398f202d68de37723143bca7f2
      https://github.com/okfn/ckan/commit/7792e2e6de61d9398f202d68de37723143bca7f2
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#518] Deprecate time_ago_in_words_from_str() helper


  Commit: b67615d423142b5f7e45b677ad3811a8d668b257
      https://github.com/okfn/ckan/commit/b67615d423142b5f7e45b677ad3811a8d668b257
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M ckan/templates/snippets/activity_item.html

  Log Message:
  -----------
  [#518] Fixes for activity stream item template


  Commit: 7d4f06b8a5ec36140e028883af81c5529ac041fd
      https://github.com/okfn/ckan/commit/7d4f06b8a5ec36140e028883af81c5529ac041fd
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckan/templates/package/snippets/stages.html

  Log Message:
  -----------
  Merge branch '1091-additional-data-info-whatever'


  Commit: 3df0637d6450af2abc57b98fcce1a46fe4e41947
      https://github.com/okfn/ckan/commit/3df0637d6450af2abc57b98fcce1a46fe4e41947
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1119] Text preview was made for XML and Json. Increase their precendence. Also typos.


  Commit: b247bfa72c49318e9c0468436dd06f75aeeb9663
      https://github.com/okfn/ckan/commit/b247bfa72c49318e9c0468436dd06f75aeeb9663
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckan/lib/datapreview.py
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  Merge branch '1119-text-preview-can-preview-xml-and-json'


  Commit: 91c1a980001282c8f6ffe12f99e6b2068d387a95
      https://github.com/okfn/ckan/commit/91c1a980001282c8f6ffe12f99e6b2068d387a95
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1119] Pep 8


  Commit: 84f48d278cf655f6f9356b6462eeb362d711b173
      https://github.com/okfn/ckan/commit/84f48d278cf655f6f9356b6462eeb362d711b173
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1120] Add check for datastore_make_public


  Commit: 6702740876009d73a6a530a41983947826c40937
      https://github.com/okfn/ckan/commit/6702740876009d73a6a530a41983947826c40937
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  [#1120] Tests for make_public added auth function


  Commit: 580bf09308ac2bd3c984f46a38005f3c25f930ba
      https://github.com/okfn/ckan/commit/580bf09308ac2bd3c984f46a38005f3c25f930ba
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckanext/textpreview/plugin.py

  Log Message:
  -----------
  [#1119] This is the PEP8 I meant


  Commit: ef42ca60233c9a00d125c8c85bcb48fd52e1934c
      https://github.com/okfn/ckan/commit/ef42ca60233c9a00d125c8c85bcb48fd52e1934c
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '818-attempt-to-fix-recuring-test-fail'


  Commit: 6c7b1eed6b1f5799a84c088736992cc39ab102b9
      https://github.com/okfn/ckan/commit/6c7b1eed6b1f5799a84c088736992cc39ab102b9
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M bin/ckan_spam.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/package_saver.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/update.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckanext/stats/stats.py

  Log Message:
  -----------
  Merge branch '1051-code-cleanups-for-2.2'


  Commit: 10419c91bb0948bef03d424d02ec84a91f97f4ad
      https://github.com/okfn/ckan/commit/10419c91bb0948bef03d424d02ec84a91f97f4ad
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/ajax_snippets/related-item.html

  Log Message:
  -----------
  Merge branch '1082-upgrade-frontend'


  Commit: ef1f218f93c48d5f64954c071a75f4c12ca5d730
      https://github.com/okfn/ckan/commit/ef1f218f93c48d5f64954c071a75f4c12ca5d730
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    R build.sh
    R fabfile.py
    R jshint.json
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch '985-clean-up-repo'


  Commit: 79241c42d41cc885ea38920e82829a08e5f7510b
      https://github.com/okfn/ckan/commit/79241c42d41cc885ea38920e82829a08e5f7510b
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    R build.sh
    R fabfile.py
    R jshint.json
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch '985-clean-up-repo'


  Commit: 14b50de54d84f024a2938bfef9363ad7764ebcce
      https://github.com/okfn/ckan/commit/14b50de54d84f024a2938bfef9363ad7764ebcce
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M bin/ckan_edit_local.py
    M bin/ckan_spam.py
    R build.sh
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/datapreview.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.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/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/model/license.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/dashboard_datasets.html
    A ckan/templates/user/dashboard_groups.html
    A ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/resource_read.html
    A ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/resourceproxy/controller.py
    M ckanext/stats/stats.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    R fabfile.py
    R jshint.json
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  [399] merge issue


  Commit: 075fde3c818f8a0e7b33b970d07675598196f986
      https://github.com/okfn/ckan/commit/075fde3c818f8a0e7b33b970d07675598196f986
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M ckan/lib/base.py
    M ckanext/datastore/tests/test_dump.py

  Log Message:
  -----------
  fix merge


  Commit: bc4177e4c9e4d2f2bdc8fc49af8708e2b0682f43
      https://github.com/okfn/ckan/commit/bc4177e4c9e4d2f2bdc8fc49af8708e2b0682f43
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/delete.py
    M ckan/model/resource.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge pull request #1081 from okfn/1081-delete-resource-to-update-package

Package index not rebuilt when resources deleted


  Commit: 118c2b62988956b5bc80d42a8a3e12964b3f9543
      https://github.com/okfn/ckan/commit/118c2b62988956b5bc80d42a8a3e12964b3f9543
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/model/package_relationship.py
    M ckan/templates/macros/autoform.html
    M doc/templating.rst

  Log Message:
  -----------
  Merge pull request #1064 from okfn/1064-dont-translate-empty-string

Don't translate empty strings


  Commit: be7e4f6cf16b646e7c3808769bd8248b9949e5f7
      https://github.com/okfn/ckan/commit/be7e4f6cf16b646e7c3808769bd8248b9949e5f7
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

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

  Log Message:
  -----------
  [#1121] Use get_action() in term_translation_update_many()


  Commit: b89ab943d01aa0ab8142ff9bbc8016a08464f5f8
      https://github.com/okfn/ckan/commit/b89ab943d01aa0ab8142ff9bbc8016a08464f5f8
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] a more precise kill and some extra comments


  Commit: ced323274132a9c4f65b30f3988ab762954f25fe
      https://github.com/okfn/ckan/commit/ced323274132a9c4f65b30f3988ab762954f25fe
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Sleep so ckan is up and running


  Commit: 9d0db5b8ed052d009e47b63af73179b085ce9a8d
      https://github.com/okfn/ckan/commit/9d0db5b8ed052d009e47b63af73179b085ce9a8d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Return errors to travis


  Commit: a22375da22d7efd34db5eb1292ac48bc69de34b9
      https://github.com/okfn/ckan/commit/a22375da22d7efd34db5eb1292ac48bc69de34b9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#801] Improve output so fails easier to find


  Commit: 89dd6ec630aa40d6754a5d1886e1938eabe14df9
      https://github.com/okfn/ckan/commit/89dd6ec630aa40d6754a5d1886e1938eabe14df9
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/test/spec/ckan.spec.js

  Log Message:
  -----------
  Revert "[#801] Added deliberate failing test for travis"

fix the mocha test that was made to fail for testing

This reverts commit dd46f25a8c756d2221c8bc8f824e09b3d10005a7.


  Commit: e60c59e8db9510cf9554966e26119388a3aa3dfd
      https://github.com/okfn/ckan/commit/e60c59e8db9510cf9554966e26119388a3aa3dfd
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

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

  Log Message:
  -----------
  fix paster db clean


  Commit: 0a339db6bb17cb9e16eb203def3fc1b8bd540029
      https://github.com/okfn/ckan/commit/0a339db6bb17cb9e16eb203def3fc1b8bd540029
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M bin/travis-build
    M ckan/public/base/test/index.html
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js

  Log Message:
  -----------
  Merge branch '801-travis-run-mocha-tests'


  Commit: 1c3604db32a03180a63259119f8006301a019c38
      https://github.com/okfn/ckan/commit/1c3604db32a03180a63259119f8006301a019c38
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1089] Doc block updates


  Commit: 9e68c7fa9419d8c7b110e4a7e7fa4dac5061eb37
      https://github.com/okfn/ckan/commit/9e68c7fa9419d8c7b110e4a7e7fa4dac5061eb37
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/less/iehacks.less

  Log Message:
  -----------
  [#1124] Fix for IE7+8 language dropdown appearing too far down the page


  Commit: ef5f8da1ebf679183f869608363fa5e48a817f7a
      https://github.com/okfn/ckan/commit/ef5f8da1ebf679183f869608363fa5e48a817f7a
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/forms.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch '1089-required-fields'


  Commit: 8e8e3dcf05596711b0ed4b62b5e46958aeeab3bc
      https://github.com/okfn/ckan/commit/8e8e3dcf05596711b0ed4b62b5e46958aeeab3bc
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile css


  Commit: 9fd0096769713d7831e32589de7a5b0f2bec4f8d
      https://github.com/okfn/ckan/commit/9fd0096769713d7831e32589de7a5b0f2bec4f8d
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/less/iehacks.less

  Log Message:
  -----------
  Merge branch '1124-ie7-language-dropdown-fix'


  Commit: 1468e69f41eac574d7b28beda836af114fd2b66c
      https://github.com/okfn/ckan/commit/1468e69f41eac574d7b28beda836af114fd2b66c
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Recompile css


  Commit: a88506447e924e5f3f49e055947d1f9004f35566
      https://github.com/okfn/ckan/commit/a88506447e924e5f3f49e055947d1f9004f35566
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  [#1127] pass image_url in organization_list_for_user


  Commit: f343d869683643dec14b87d3c047e321567bcaff
      https://github.com/okfn/ckan/commit/f343d869683643dec14b87d3c047e321567bcaff
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  [#1127] pass image_url in group_list_authz


  Commit: 397684ad3374c300dad401f53473f8f6d16ad700
      https://github.com/okfn/ckan/commit/397684ad3374c300dad401f53473f8f6d16ad700
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  Merge pull request #1127 from okfn/1127-org-images-dashboard

Organization images do not display on Organization user dashboard page


  Commit: 5634f9db4dcb6e8cb0d59aad66d2b52dc31dc9cf
      https://github.com/okfn/ckan/commit/5634f9db4dcb6e8cb0d59aad66d2b52dc31dc9cf
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  [#1128] Fix requirements file name in documentation


  Commit: 2be3bcfb05c672f2fd3fcb23b5094961aa71a2b8
      https://github.com/okfn/ckan/commit/2be3bcfb05c672f2fd3fcb23b5094961aa71a2b8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge pull request #1129 from okfn/1128-requirements-filenames-outdated

[#1128] Fix requirements file name in documentation


  Commit: 0d5eb39e19f9ff639b3706797167a401a1c27a1c
      https://github.com/okfn/ckan/commit/0d5eb39e19f9ff639b3706797167a401a1c27a1c
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    A ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py

  Log Message:
  -----------
  [1130] various db upgrades


  Commit: ba9f6058280555ec8680331bac04e546318bb5db
      https://github.com/okfn/ckan/commit/ba9f6058280555ec8680331bac04e546318bb5db
  Author: kindly <kindly at gmail.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M bin/travis-build
    M ckan/controllers/admin.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/logic/test_action.py
    M doc/documentation-guidelines.rst
    M doc/templating.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch 'master' into 547-plugins-love


  Commit: c85ec7a1716c618e0618409ff48a831327a33952
      https://github.com/okfn/ckan/commit/c85ec7a1716c618e0618409ff48a831327a33952
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '1114-fix-delete-vocab-tag'


  Commit: 14458a9823fb03ec5e3eeca70040f09cad0fb090
      https://github.com/okfn/ckan/commit/14458a9823fb03ec5e3eeca70040f09cad0fb090
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M ckan/plugins/core.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  [#1141] Fix bug where we weren't raising Exception when we couldn't find plugin


  Commit: 813c5882cf12e41ae3fc8de75dbd1916872f6b1d
      https://github.com/okfn/ckan/commit/813c5882cf12e41ae3fc8de75dbd1916872f6b1d
  Author: John Martin <me at johnmart.in>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/resource.config

  Log Message:
  -----------
  [#1146] Makes recline preview only use jQuery 1.7.1 for compatibility


  Commit: 4be790c6f60eeb05a0c40ef33fa02572c9fe760a
      https://github.com/okfn/ckan/commit/4be790c6f60eeb05a0c40ef33fa02572c9fe760a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge branch '1120-datastore-make-public'


  Commit: 6f44db77d478a7eed1c3e515dcf95beca7d21cf7
      https://github.com/okfn/ckan/commit/6f44db77d478a7eed1c3e515dcf95beca7d21cf7
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

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


  Commit: 71f0b02281e04ecfc40b63e5c9b8c013af3ac7c9
      https://github.com/okfn/ckan/commit/71f0b02281e04ecfc40b63e5c9b8c013af3ac7c9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M .gitmodules
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M bin/ckan_edit_local.py
    M bin/ckan_spam.py
    M bin/travis-build
    R build.sh
    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/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.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/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/model/extension.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/modification.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/dashboard_datasets.html
    A ckan/templates/user/dashboard_groups.html
    A ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    A ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/mock_plugin.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    M doc/paster.rst
    M doc/templating.rst
    M doc/toolkit.rst
    M doc/upgrade-source.rst
    R fabfile.py
    R jshint.json
    M setup.py
    M test-core.ini
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch 'master' into 981-extend-datastore-create

Conflicts:
	ckanext/datastore/logic/action.py
	ckanext/datastore/plugin.py


  Commit: ad172b52de7116f95e226e4073de105a9e988ef5
      https://github.com/okfn/ckan/commit/ad172b52de7116f95e226e4073de105a9e988ef5
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py

  Log Message:
  -----------
  [#981] Add auth function to datapusher command


  Commit: 24ca402ad105b8d3c0a7db39789d7a6d28a22446
      https://github.com/okfn/ckan/commit/24ca402ad105b8d3c0a7db39789d7a6d28a22446
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

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

  Log Message:
  -----------
  Merge branch '1123-paster-db-clean-fix'

Conflicts:
	ckan/config/environment.py


  Commit: ec41bee8ce2f3af43002ca3f9ead30f242fa2693
      https://github.com/okfn/ckan/commit/ec41bee8ce2f3af43002ca3f9ead30f242fa2693
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  Merge branch '1115-header-block-recursion'


  Commit: f818e1c9edd756a2195cb8094ede7c49b3720dab
      https://github.com/okfn/ckan/commit/f818e1c9edd756a2195cb8094ede7c49b3720dab
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/get.py
    M ckan/templates/header.html
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_search.py

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 981-extend-datastore-create


  Commit: ecd9240745ab16a9c2e95be19f7e8be9092edbf3
      https://github.com/okfn/ckan/commit/ecd9240745ab16a9c2e95be19f7e8be9092edbf3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Use resource instead of package_id


  Commit: ade27e4f20cc8881f26cc9492ebfa731fe049cc3
      https://github.com/okfn/ckan/commit/ade27e4f20cc8881f26cc9492ebfa731fe049cc3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#981] Require latest httpretty


  Commit: 48258b4bf214987d5b0b6e7060717c85d0fd97c1
      https://github.com/okfn/ckan/commit/48258b4bf214987d5b0b6e7060717c85d0fd97c1
  Author: amercader <amercadero at gmail.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M doc/conf.py
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  [#1083] First go at the minor version upgrade


  Commit: ad19d847702fe1268b7449166f06f84e9ef24ae6
      https://github.com/okfn/ckan/commit/ad19d847702fe1268b7449166f06f84e9ef24ae6
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Test whether we properly call the datapusher


  Commit: 10efe1c43062db8c102bb6c0d21baff3abaacf20
      https://github.com/okfn/ckan/commit/10efe1c43062db8c102bb6c0d21baff3abaacf20
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Call datapusher according to API


  Commit: cd23a461c95cd80d1b47aa5b4fc426e8e01065ef
      https://github.com/okfn/ckan/commit/cd23a461c95cd80d1b47aa5b4fc426e8e01065ef
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Add hack to avoid hanging tests in python 2.6


  Commit: 7292794bd3a381ecd80ec9e9287202baa042a6f7
      https://github.com/okfn/ckan/commit/7292794bd3a381ecd80ec9e9287202baa042a6f7
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Log Message:
  -----------
  Merge pull request #1042 from wardi/package_list-performance

speed up package_list action by only retrieving column we need (not whole package) from db


  Commit: f5464e70451d323679d1f56cdcd65c072f8a9ae2
      https://github.com/okfn/ckan/commit/f5464e70451d323679d1f56cdcd65c072f8a9ae2
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/new_authz.py

  Log Message:
  -----------
  Merge pull request #1060 from okfn/1060-action-auth-audit

Action Auth Audit


  Commit: 408a5d6167f5fbe998969ea2b640d44bf6de6c32
      https://github.com/okfn/ckan/commit/408a5d6167f5fbe998969ea2b640d44bf6de6c32
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge pull request #1118 from okfn/1118-error-not-caught

Invalid request causes 500 through ValueError in search facet


  Commit: 1d51b3809e33a4bd732931d1c154e2d60c0e9b3d
      https://github.com/okfn/ckan/commit/1d51b3809e33a4bd732931d1c154e2d60c0e9b3d
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #1121 from okfn/1121-correct-call-in-term_translation_update_many

`term_translation_update_many` doesn't use `get_action`


  Commit: 955e42276e71ab072c27c2fc5cbf3e4c9aee1194
      https://github.com/okfn/ckan/commit/955e42276e71ab072c27c2fc5cbf3e4c9aee1194
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Fix test to use ckan app by @tobes


  Commit: a4b92ce32c300b768f37f30b10186ef4063b980c
      https://github.com/okfn/ckan/commit/a4b92ce32c300b768f37f30b10186ef4063b980c
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  [#1133] Removes hanging closed div that was causing IE8+7 to not render map sidebar contents


  Commit: 9d132f4481afd238efc28019b45e481cb7607e8b
      https://github.com/okfn/ckan/commit/9d132f4481afd238efc28019b45e481cb7607e8b
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [#1095] Changed 'title' to 'name' in group and org form templates


  Commit: 54c1e88aa52b4558936882adb9e3a561bff2f05d
      https://github.com/okfn/ckan/commit/54c1e88aa52b4558936882adb9e3a561bff2f05d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M dev-requirements.txt
    A requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  [#1149] Move minimum requirements into requirements.in and generate a
requirements.txt file from it using pip freeze


  Commit: 495d47386c200d400b7c5c409a44a46bdedd9604
      https://github.com/okfn/ckan/commit/495d47386c200d400b7c5c409a44a46bdedd9604
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1149] Upgrade to latest nosetests


  Commit: b831fd1261e6eab948353ef035e2dd26bb87eaa7
      https://github.com/okfn/ckan/commit/b831fd1261e6eab948353ef035e2dd26bb87eaa7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M bin/travis-build
    M ckan/controllers/feed.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_dump.py

  Log Message:
  -----------
  [#1149] Fix some pep8 issues and problems with pip requirements on travis


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

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1151] Fix to allow wrapped action calls auditing


  Commit: 5d1053d2ebdc96c8bcd79ebafafae4e5ca012794
      https://github.com/okfn/ckan/commit/5d1053d2ebdc96c8bcd79ebafafae4e5ca012794
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M doc/upgrade-package-to-minor-release.rst

  Log Message:
  -----------
  [#1083] Add note about Apache and Nginx files


  Commit: 5cf97f75bb93d9168cfa7a680c8b4a9238296fab
      https://github.com/okfn/ckan/commit/5cf97f75bb93d9168cfa7a680c8b4a9238296fab
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M doc/upgrade-package-to-minor-release.rst

  Log Message:
  -----------
  [#1083] Add note about reenabling extensions


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

  Changed paths:
    M doc/upgrade-package-to-minor-release.rst

  Log Message:
  -----------
  [#1083] Minor edits to package install upgrade docs


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

  Changed paths:
    M doc/conf.py
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch '1083-upgrade-minor-version-instructions'


  Commit: 2d9df9292de6f9d231536869caa1a1ad8dcea92d
      https://github.com/okfn/ckan/commit/2d9df9292de6f9d231536869caa1a1ad8dcea92d
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#1139] Remove moderated option from config docs

It is no longer supported and causes lots of confusion, apart from
issues with dataset updates.


  Commit: 38f43373bc8d88e18152158ba57f9b733e151b05
      https://github.com/okfn/ckan/commit/38f43373bc8d88e18152158ba57f9b733e151b05
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

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

  Log Message:
  -----------
  [#1152] Call check_access in member_roles_list


  Commit: 6d136827edae3c08d48d3ddfe12f1a5f6ca02229
      https://github.com/okfn/ckan/commit/6d136827edae3c08d48d3ddfe12f1a5f6ca02229
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M doc/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  [#1083] Add notes about Apache and extensions to the patch release as well


  Commit: 73e0c9f18d2fcef90cab71af54c82216c76b54e9
      https://github.com/okfn/ckan/commit/73e0c9f18d2fcef90cab71af54c82216c76b54e9
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M doc/upgrade-package-to-minor-release.rst

  Log Message:
  -----------
  [#1083] Add step about upgrading extensions


  Commit: 5ab2273afccfcd1ffe4683792e5cdf5149119ff5
      https://github.com/okfn/ckan/commit/5ab2273afccfcd1ffe4683792e5cdf5149119ff5
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M doc/upgrade-package-to-minor-release.rst

  Log Message:
  -----------
  Merge branch '1083-upgrade-minor-version-instructions' of github.com:okfn/ckan into 1083-upgrade-minor-version-instructions


  Commit: 24763049de7e9882e184ca389f1c5fd830a9d2f3
      https://github.com/okfn/ckan/commit/24763049de7e9882e184ca389f1c5fd830a9d2f3
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M doc/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  [#1083] Need to restart Apache as well on patch upgrades


  Commit: d8fcedf21b99ed6169e1ea22a25a4d97ad489645
      https://github.com/okfn/ckan/commit/d8fcedf21b99ed6169e1ea22a25a4d97ad489645
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-02 (Fri, 02 Aug 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge pull request #1151 from okfn/1151-auth-datastore-fix

Fix for master re datastore and auth audit


  Commit: bb80306ac6d3c3379f48f1c14722835dcf95b58a
      https://github.com/okfn/ckan/commit/bb80306ac6d3c3379f48f1c14722835dcf95b58a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M doc/conf.py
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 1149-pip-requirements


  Commit: 1ef8891cbea896cf690074367861580c1fd6219f
      https://github.com/okfn/ckan/commit/1ef8891cbea896cf690074367861580c1fd6219f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/get.py
    M ckan/new_authz.py
    M doc/conf.py
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 981-extend-datastore-create


  Commit: c5ee465fdcb058b07c2b277de639eb811dbcd2a3
      https://github.com/okfn/ckan/commit/c5ee465fdcb058b07c2b277de639eb811dbcd2a3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Change import, tab -> spaces


  Commit: 26d57553741202bab4b5319154947c018f870e19
      https://github.com/okfn/ckan/commit/26d57553741202bab4b5319154947c018f870e19
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M doc/upgrading.rst

  Log Message:
  -----------
  [#1157] Update release policy. Mention ckan-announce.


  Commit: 1bdb9a776269926f5acde148fe454d5433fec4cf
      https://github.com/okfn/ckan/commit/1bdb9a776269926f5acde148fe454d5433fec4cf
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M doc/upgrading.rst

  Log Message:
  -----------
  Merge pull request #1157 from okfn/1157-update-release-policy

Update release policy


  Commit: 7c9ac6cddf1ce5e6a23ac622cf5e6965fa980774
      https://github.com/okfn/ckan/commit/7c9ac6cddf1ce5e6a23ac622cf5e6965fa980774
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst

  Log Message:
  -----------
  Merge pull request #1154 from okfn/1083-upgrade-minor-version-instructions

1083 upgrade minor version instructions (round 2)


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

  Changed paths:
    M ckan/logic/__init__.py
    M doc/conf.py
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch 'master' into 1139-remove-moderated-from-config-docs


  Commit: 9e01b092b9b72674a5bb811ccb0dbeedbd85eb3f
      https://github.com/okfn/ckan/commit/9e01b092b9b72674a5bb811ccb0dbeedbd85eb3f
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-05 (Mon, 05 Aug 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Merge pull request #1139 from okfn/1139-remove-moderated-from-config-docs

Remove / Deprecate "moderated" option


  Commit: a45616d067a4f9011798085688e5401dc48ddae6
      https://github.com/okfn/ckan/commit/a45616d067a4f9011798085688e5401dc48ddae6
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#1149] Regenerate requirements file with older version of Babel and jinja2 that do not cause errors


  Commit: 02094f50614b66616e3c3458229f5ccb9759dfda
      https://github.com/okfn/ckan/commit/02094f50614b66616e3c3458229f5ccb9759dfda
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#1149] Pin requirements in minimum requirements file as discussed


  Commit: be0faadd7685bc3abafa3baf85f55fda7a9b9222
      https://github.com/okfn/ckan/commit/be0faadd7685bc3abafa3baf85f55fda7a9b9222
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#1149] Typo


  Commit: 3e8628f09af509538ab0a3d95ca1155e2c731bd3
      https://github.com/okfn/ckan/commit/3e8628f09af509538ab0a3d95ca1155e2c731bd3
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#1159] Remove the 'id' from extra_vars


  Commit: 5e1afd7428436bc4d3d669676a1b3115ae0627f5
      https://github.com/okfn/ckan/commit/5e1afd7428436bc4d3d669676a1b3115ae0627f5
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    A ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py

  Log Message:
  -----------
  Merge branch '1130-various-db-upgrades'


  Commit: 605a950026f32096e6abb07cc86f2f106816fe37
      https://github.com/okfn/ckan/commit/605a950026f32096e6abb07cc86f2f106816fe37
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  Merge branch '1159-recently-changed-packages-helper'


  Commit: 54f5e142d5392b2a482f5ec98600c4607007534e
      https://github.com/okfn/ckan/commit/54f5e142d5392b2a482f5ec98600c4607007534e
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M bin/travis-build
    M ckan/controllers/feed.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_dump.py
    M dev-requirements.txt
    A requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch '1149-pip-requirements'


  Commit: 1b20a14e0a7c3a2ef7f3ec78157b20588eb194f7
      https://github.com/okfn/ckan/commit/1b20a14e0a7c3a2ef7f3ec78157b20588eb194f7
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#938] Save the status of the datapusher task


  Commit: 25338eae046a22b93e2c68e238f3fc6649ab831a
      https://github.com/okfn/ckan/commit/25338eae046a22b93e2c68e238f3fc6649ab831a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#938] Don't push jobs to datapusher if datapusher url is not set


  Commit: 7f80d98a53e08d5517fc53cb99142a7afbbeaee7
      https://github.com/okfn/ckan/commit/7f80d98a53e08d5517fc53cb99142a7afbbeaee7
  Author: John Glover <j at johnglover.net>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js

  Log Message:
  -----------
  Merge pull request #1133 from okfn/1133-recline-map-sidebar

Map recline: Sidebar not displayed on IE


  Commit: 7085138a5339255742d77ef50116b8192c97d36b
      https://github.com/okfn/ckan/commit/7085138a5339255742d77ef50116b8192c97d36b
  Author: John Glover <j at johnglover.net>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #1153 from okfn/1152-member-roles-list-check-access

[#1152] Call check_access in member_roles_list


  Commit: f54f8ee6c94ed0ba23adb9a830d6b88aaeede89b
      https://github.com/okfn/ckan/commit/f54f8ee6c94ed0ba23adb9a830d6b88aaeede89b
  Author: Ian Ward <ian at excess.org>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py

  Log Message:
  -----------
  [#1164] add SQL indexes for activity and resource tables


  Commit: bbcbb8ed3f05f7e56ef72386741aa338dc04123a
      https://github.com/okfn/ckan/commit/bbcbb8ed3f05f7e56ef72386741aa338dc04123a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    A ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/1130-various-db-upgrades' into 938-datapusher


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

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

  Log Message:
  -----------
  [#1172] organization_list_for_user and group_list_authz use dictization function


  Commit: 41174250dd4fcffbe20a58736c9ca2a97d2d23bd
      https://github.com/okfn/ckan/commit/41174250dd4fcffbe20a58736c9ca2a97d2d23bd
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#932] Use the url_type to indicate when a resource is a pure datastore resource


  Commit: e74f6404bb35f49a4707527d26828abc91c6751a
      https://github.com/okfn/ckan/commit/e74f6404bb35f49a4707527d26828abc91c6751a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M bin/travis-build
    M ckan/controllers/feed.py
    M ckan/logic/action/get.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst
    M doc/upgrading.rst
    A requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 981-extend-datastore-create

Conflicts:
	dev-requirements.txt


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

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

  Log Message:
  -----------
  [#1172] Fix misleading docstrings


  Commit: 01a3c050a3ffaaf1e3791e50301b6ffb9e5c8568
      https://github.com/okfn/ckan/commit/01a3c050a3ffaaf1e3791e50301b6ffb9e5c8568
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #1172 from okfn/1172-groups-list-use-dictization

Auth aware group and org list action functions should return dictized objects


  Commit: af012e5352c0fa7cbe7b1b71454242d7376de9fa
      https://github.com/okfn/ckan/commit/af012e5352c0fa7cbe7b1b71454242d7376de9fa
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#981] Declare auth function


  Commit: 80496913d4cddaeef940d749ee51f1afa04276a5
      https://github.com/okfn/ckan/commit/80496913d4cddaeef940d749ee51f1afa04276a5
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#940] Add datapusher callback hook


  Commit: bb2e05f8b7091c0a5f7e7c97c9e98c2af7c584bd
      https://github.com/okfn/ckan/commit/bb2e05f8b7091c0a5f7e7c97c9e98c2af7c584bd
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#981] Declare auth function


  Commit: 8dde66ed7dc5ab6a9314407239384a5c92af4c4f
      https://github.com/okfn/ckan/commit/8dde66ed7dc5ab6a9314407239384a5c92af4c4f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#981] Clean up


  Commit: b7f21ed09dadfb27d4535926f5e358bb760ce318
      https://github.com/okfn/ckan/commit/b7f21ed09dadfb27d4535926f5e358bb760ce318
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#940] Set the correct datapusher callback url


  Commit: 13854a272b5abe1d8ef7959a68b41aa2c7d72458
      https://github.com/okfn/ckan/commit/13854a272b5abe1d8ef7959a68b41aa2c7d72458
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Merge branch '940-update-task-status' into 938-datapusher


  Commit: 3c154dd1940dab74a1990c4d4bc5dad0f9130c2a
      https://github.com/okfn/ckan/commit/3c154dd1940dab74a1990c4d4bc5dad0f9130c2a
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-08 (Thu, 08 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  Typo


  Commit: 3a36088468900905f0d8616f19bd0163a6a93a6e
      https://github.com/okfn/ckan/commit/3a36088468900905f0d8616f19bd0163a6a93a6e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    A ckan/tests/models/test_activity.py

  Log Message:
  -----------
  Move logic of getting ActivityDetails' by activity_id to its model


  Commit: 53ab20600c63236bef850e4847959cfbc2855c47
      https://github.com/okfn/ckan/commit/53ab20600c63236bef850e4847959cfbc2855c47
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-09 (Fri, 09 Aug 2013)

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

  Log Message:
  -----------
  Refactor user update logic function


  Commit: cab2d8765bf703ee16b2abadbda8c8cfcd93ca3c
      https://github.com/okfn/ckan/commit/cab2d8765bf703ee16b2abadbda8c8cfcd93ca3c
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

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

  Log Message:
  -----------
  [#1179] add offset/limit to package_list action


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog


  Commit: bc18309f7234fdc1e28ffa23dea0af99c25164dd
      https://github.com/okfn/ckan/commit/bc18309f7234fdc1e28ffa23dea0af99c25164dd
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#938] Automatically push data with datapusher


  Commit: fe0c1751dec057fd25d4a9e5f350d443266611ff
      https://github.com/okfn/ckan/commit/fe0c1751dec057fd25d4a9e5f350d443266611ff
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#938] Don't push private resources automatically


  Commit: c67e2f3611b602167f6762bab9565eb2117902bb
      https://github.com/okfn/ckan/commit/c67e2f3611b602167f6762bab9565eb2117902bb
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#938] Only push certain formats to datapusher


  Commit: 2ce606d2ad9bb6ae88d8f4c9f975e3e5af274fb8
      https://github.com/okfn/ckan/commit/2ce606d2ad9bb6ae88d8f4c9f975e3e5af274fb8
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

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

  Log Message:
  -----------
  [#938] Start documentation about datapusher configuration


  Commit: 8e9238a7f3479e1903cadc3b5769783db6804a96
      https://github.com/okfn/ckan/commit/8e9238a7f3479e1903cadc3b5769783db6804a96
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#938] Raise exception when posting to the datapusher fails


  Commit: 768f9f12ff23327adbc0f47b65fb0d5869131b6f
      https://github.com/okfn/ckan/commit/768f9f12ff23327adbc0f47b65fb0d5869131b6f
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M ckanext/reclinepreview/theme/public/resource.config

  Log Message:
  -----------
  Merge pull request #1146 from okfn/1146-recline-jquery-fix

`reclinepreview` uses global version of jQuery


  Commit: 798a06c5025af282a495852c4a37395dc3a30a77
      https://github.com/okfn/ckan/commit/798a06c5025af282a495852c4a37395dc3a30a77
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py

  Log Message:
  -----------
  Merge pull request #1165 from wardi/1164-add-activity-and-resource-indexes

[#1164] add SQL indexes for activity and resource tables


  Commit: 69dd7e0abedce433056498062aad46df92986a51
      https://github.com/okfn/ckan/commit/69dd7e0abedce433056498062aad46df92986a51
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M .tx/config
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    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
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/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
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/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/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
   Update strings files before CKAN 2.1 call for translations


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

  Changed paths:
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/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/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/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/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Update translations from Transifex


  Commit: 97d5b009c66d5aa58367f2cf3f0d8e647d1a66cb
      https://github.com/okfn/ckan/commit/97d5b009c66d5aa58367f2cf3f0d8e647d1a66cb
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  Refactor user update logic function


  Commit: 7cfadf590746158060e6e31b287470967e7c9659
      https://github.com/okfn/ckan/commit/7cfadf590746158060e6e31b287470967e7c9659
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  Tweak resource query


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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update changelog


  Commit: da177c2b5f3f286776e06fe72241cd985985045d
      https://github.com/okfn/ckan/commit/da177c2b5f3f286776e06fe72241cd985985045d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  [#981] Add before_show from IResourceController interface to package_show as suggested by @kindly


  Commit: b2387881834dbd2780420b6c4979a7c041511f83
      https://github.com/okfn/ckan/commit/b2387881834dbd2780420b6c4979a7c041511f83
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1179] Add test for limit in package_list


  Commit: 0d7470b507ff4a648876b4512b37059c23f98200
      https://github.com/okfn/ckan/commit/0d7470b507ff4a648876b4512b37059c23f98200
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#938] Store job id and job key for datapusher jobs


  Commit: 4f97fc08febe42ecfe853946643a01da4d660f40
      https://github.com/okfn/ckan/commit/4f97fc08febe42ecfe853946643a01da4d660f40
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  [#1182] Add note about changed pip requirements file


  Commit: 9df308d287458910098fae8faefad481563a144c
      https://github.com/okfn/ckan/commit/9df308d287458910098fae8faefad481563a144c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    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
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/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
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/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/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/logic/action/get.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckanext/reclinepreview/theme/public/resource.config
    M doc/install-from-source.rst

  Log Message:
  -----------
  Merge branch '1182-docs-versionchanged'

Conflicts:
	CHANGELOG.rst


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

  Changed paths:
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Add a versionchanged to source upgrade docs


  Commit: 78ccca680b393ee0dc61eb66b596fbe9a3102af2
      https://github.com/okfn/ckan/commit/78ccca680b393ee0dc61eb66b596fbe9a3102af2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/test.rst

  Log Message:
  -----------
  Add a couple of versionchanged's to the docs


  Commit: 7c9509474c2a2fefd6c3d7692f2164d26654b6b4
      https://github.com/okfn/ckan/commit/7c9509474c2a2fefd6c3d7692f2164d26654b6b4
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  [#1179] doc strings for package_list


  Commit: 4bf71bd20af0b1880d3fe4cb0041dd2e11762d88
      https://github.com/okfn/ckan/commit/4bf71bd20af0b1880d3fe4cb0041dd2e11762d88
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/1179-package_list_limit_offset' into 1179-package_list_limit_offset


  Commit: c78557a5c12031b3ba6a02cfa43eebb89b426204
      https://github.com/okfn/ckan/commit/c78557a5c12031b3ba6a02cfa43eebb89b426204
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #1179 from okfn/1179-package_list_limit_offset

add limit/offset to package_list action


  Commit: c5184ee2d290daef4a534534ce9f59dbe99d27a9
      https://github.com/okfn/ckan/commit/c5184ee2d290daef4a534534ce9f59dbe99d27a9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#938] Set url_type if requested


  Commit: 6564b45ed344c1bc3d28a03486f6184cf9933de9
      https://github.com/okfn/ckan/commit/6564b45ed344c1bc3d28a03486f6184cf9933de9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#938] Fix datapusher test


  Commit: b958f93465051cb33b1ab7086c96b1b70aecf109
      https://github.com/okfn/ckan/commit/b958f93465051cb33b1ab7086c96b1b70aecf109
  Author: David Lemayian <dlemayian at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Update copyright year to 2013


  Commit: 2892b66cfd7b62d8bc3e24b7b9c696d21eab1557
      https://github.com/okfn/ckan/commit/2892b66cfd7b62d8bc3e24b7b9c696d21eab1557
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/templates/snippets/activity_item.html

  Log Message:
  -----------
  Merge branch '518-date-time-within-activity-streams'


  Commit: 1337eed8e6b003c4eb7967450e4659a9a2ea35f6
      https://github.com/okfn/ckan/commit/1337eed8e6b003c4eb7967450e4659a9a2ea35f6
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [#1192] ust get to get headers


  Commit: 1268c29d962224d9dd467d4fa3d83ef00d6254b2
      https://github.com/okfn/ckan/commit/1268c29d962224d9dd467d4fa3d83ef00d6254b2
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Merge pull request #981 from okfn/981-extend-datastore-create

Extend `datastore_create` action


  Commit: b6b62d3c44e858bf668e7e0f3781976a0f33f4a8
      https://github.com/okfn/ckan/commit/b6b62d3c44e858bf668e7e0f3781976a0f33f4a8
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  Merge pull request #940 from okfn/940-update-task-status

Update task status on callback (needs #981)


  Commit: c89487c8a9edcb9267315bab0bb1642b9af192f2
      https://github.com/okfn/ckan/commit/c89487c8a9edcb9267315bab0bb1642b9af192f2
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/plugins/core.py
    M ckan/tests/test_plugins.py

  Log Message:
  -----------
  Merge branch '1141-loading-inexistent-plugin-raises-wrong-exception'


  Commit: db39bd5c839e55ff5fb82e5874453dea862b94b2
      https://github.com/okfn/ckan/commit/db39bd5c839e55ff5fb82e5874453dea862b94b2
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py

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


  Commit: a381e98562f2ae990cbb91d2ef2479c622fce7f9
      https://github.com/okfn/ckan/commit/a381e98562f2ae990cbb91d2ef2479c622fce7f9
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    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
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/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
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/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/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/plugins/core.py
    M ckan/templates/snippets/activity_item.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_plugins.py
    M ckanext/reclinepreview/theme/public/resource.config
    M doc/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 938-datapusher


  Commit: fbd6fdcfbec58b063d83f79338a106844123b300
      https://github.com/okfn/ckan/commit/fbd6fdcfbec58b063d83f79338a106844123b300
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  Merge pull request #1192 from okfn/1192-stop-tracking-failure

Stop tracking failing when no lang/encoding headers


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

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

  Log Message:
  -----------
  [#1184] Remove auth_sysadmins_check decorator from package_create

There is no reason why sysadmins should need to use the auth function.


  Commit: 243cd1c68435fe9b121bd3ead3f774bef21dc5c8
      https://github.com/okfn/ckan/commit/243cd1c68435fe9b121bd3ead3f774bef21dc5c8
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#1184] Update user checks in package create and update auth functions

The `auth_is_registered_user` function's name is misleading, as it only checks
if there is a user on the Pylons context object (ie if it is logged in).
It has been renamed to `auth_is_loggedin_user`, keeping the old as
deprecated. The function is not used anymore on the auth functions, as
the user should be always present in the context dict passed to the
functions (The controller sets context['user'] to c.user).


  Commit: 1117ca25e0a675cfc9024165e412899f0615fee0
      https://github.com/okfn/ckan/commit/1117ca25e0a675cfc9024165e412899f0615fee0
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

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

  Log Message:
  -----------
  [#1184] Fix failing test due to not providing the user


  Commit: 11eff7eb3cfe8bc6627a84cdf45170e574a9cdb2
      https://github.com/okfn/ckan/commit/11eff7eb3cfe8bc6627a84cdf45170e574a9cdb2
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#1184] Revert 243cd1c with a better anon user check

Due to how the controllers set up the user in the context it was
impossible with the current logic to identify an anonymous request on
the auth functions.
On ckan/lib/base.py:232 the following are set on the pylons context object
(c):

* Anon request (not logged in):
    c.user = None
    c.author = IP (or 'Unknown IP Address')
* Logged in user:
    c.user = User name
    c.author = User name

Once in the controllers, these are normally used in:

    context = {'user': c.user or c.auhtor}

That means that once in the auth functions we need way to check if
a call is anonymous that works both for requests made via the web
(object c) or called directly from an extension, where the user is
defined directly on the context. The new `auth_is_anon_user` function
does that.

Ideally this should be handled automatically at a higher level, and the
logic layer should always work with users defined on the context object.


  Commit: a52c216f1f5c4cbf3e37b5acba1a3c74b5e49fd4
      https://github.com/okfn/ckan/commit/a52c216f1f5c4cbf3e37b5acba1a3c74b5e49fd4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

  Changed paths:
    M dev-requirements.txt
    A pip-requirements-docs.txt

  Log Message:
  -----------
  [#1197] Add requirements file to fix the docs build on readthedocs


  Commit: 5c5369403e401eb926bf57ab2e9efd31cf55a0ae
      https://github.com/okfn/ckan/commit/5c5369403e401eb926bf57ab2e9efd31cf55a0ae
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1197] Remove duplicate requirement which might prevent builds on rtd


  Commit: d93ae8c4e4bf6aa0c9db9e5b82a77c1af768baef
      https://github.com/okfn/ckan/commit/d93ae8c4e4bf6aa0c9db9e5b82a77c1af768baef
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

  Changed paths:
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  Merge branch '1095-org-names'


  Commit: 7aa597b498aea6fb8f0ca2d7f193ebafbbc7cbb9
      https://github.com/okfn/ckan/commit/7aa597b498aea6fb8f0ca2d7f193ebafbbc7cbb9
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

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

  Log Message:
  -----------
  [#1184] Check if user exists before filling creator_user_id

In some cases, eg anonymous package creation, users won't actually
exist, so we need to avoid a KeyError.


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

  Changed paths:
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py

  Log Message:
  -----------
  Merge branch '1106-catch-invalid-urls'


  Commit: 79bbdb0b15aa37c06dc5bd0f2e12cd3bae8efeb3
      https://github.com/okfn/ckan/commit/79bbdb0b15aa37c06dc5bd0f2e12cd3bae8efeb3
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Merge pull request #1185 from DavidLemayian/patch-1

Update copyright year to 2013 in docs


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

  Changed paths:
    M dev-requirements.txt
    A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge branch '1197-rtd-fix'


  Commit: 8522884222403187b29c417bf70a5eee2b8f0966
      https://github.com/okfn/ckan/commit/8522884222403187b29c417bf70a5eee2b8f0966
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M doc/conf.py

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


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

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1197] Downgrade Sphinx to fix search on RTD

There is a bug on RTD that prevents the search when using Sphinx 1.2b1.

All details here:

https://github.com/rtfd/readthedocs.org/issues/443


  Commit: 306b0fbaad294a403b093e1ec2d3ea74c17e9ee0
      https://github.com/okfn/ckan/commit/306b0fbaad294a403b093e1ec2d3ea74c17e9ee0
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Merge branch '1197-rtd-fix'


  Commit: 9d2f44b2920c7e717042301916e30e3f8ed056d0
      https://github.com/okfn/ckan/commit/9d2f44b2920c7e717042301916e30e3f8ed056d0
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py
    M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  Merge pull request #1184 from okfn/1184-package_create-auth-fixes

Site user can not create datasets


  Commit: 8a928b3a0e855c14dcdfb64e82aea7b7f6fc769a
      https://github.com/okfn/ckan/commit/8a928b3a0e855c14dcdfb64e82aea7b7f6fc769a
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M bin/ckan_spam.py
    M bin/travis-build
    R build.sh
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/feed.py
    M ckan/controllers/package.py
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    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
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/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
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/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/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.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/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    A ckan/migration/versions/069_resource_url_and_metadata_modified.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/extension.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/mock_plugin.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/resource.config
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    A doc/changelog.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst
    M doc/upgrade-source.rst
    M doc/upgrading.rst
    R fabfile.py
    R jshint.json
    A requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch 'master' into 1078-package_show-performance


  Commit: 1871a73cfcc1889768cda6f82cf03b1c46942eda
      https://github.com/okfn/ckan/commit/1871a73cfcc1889768cda6f82cf03b1c46942eda
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

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

  Log Message:
  -----------
  [#1078] metadata_modified matching so that only get out from solr when datetimes are similar and minor exception cleanup


  Commit: e9dc42c85db1cdd4443b2fa8c7eb93fe82660717
      https://github.com/okfn/ckan/commit/e9dc42c85db1cdd4443b2fa8c7eb93fe82660717
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    A pip-requirements-docs.txt

  Log Message:
  -----------
  fix merge conflict


  Commit: 682e6bc0a9fbc0a08448bdf53b793a8c9352916f
      https://github.com/okfn/ckan/commit/682e6bc0a9fbc0a08448bdf53b793a8c9352916f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/model/activity.py
    A ckan/tests/models/test_activity.py

  Log Message:
  -----------
  Merge pull request #1177 from okfn/refactoring_activity_details

Move logic of getting ActivityDetails' by activity_id to its model


  Commit: a14b54a8477156de2e924e58c941522bf374ef01
      https://github.com/okfn/ckan/commit/a14b54a8477156de2e924e58c941522bf374ef01
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckanext/multilingual/solr/schema.xml

  Log Message:
  -----------
  Merge pull request #1078 from okfn/1078-package_show-performance

package_show could be faster


  Commit: d251682c34326bfd91437199dd6cc61dd70a63e7
      https://github.com/okfn/ckan/commit/d251682c34326bfd91437199dd6cc61dd70a63e7
  Author: kindly <kindly at gmail.com>
  Date:   2013-08-22 (Thu, 22 Aug 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M doc/configuration.rst

  Log Message:
  -----------
  Merge pull request #938 from okfn/938-datapusher

Push data to the datastore (includes #940 and #981)


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

  Changed paths:
    M .gitmodules
    A .pipignore
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/ckan_spam.py
    M bin/travis-build
    R build.sh
    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/schema-2.0.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    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
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/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
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/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/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/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/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.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/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/066_default_package_type.py
    A ckan/migration/versions/068_add_package_extras_index.py
    A ckan/migration/versions/069_resource_url_and_metadata_modified.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/activity.py
    M ckan/model/extension.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    R ckan/model/test_user.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/dataset-visibility.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/slug-preview.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/dashboard_datasets.html
    A ckan/templates/user/dashboard_groups.html
    A ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    A ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/mock_plugin.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    A dev-requirements.txt
    M doc/_themes/sphinx-theme-okfn
    A doc/changelog.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst
    R fabfile.py
    R jshint.json
    M pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.in
    A requirements.txt
    M setup.py
    M test-core.ini
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 973-datastore-docs-improvements


  Commit: 4f2d7901a58d35cc07dc5a569b3ef926aeae062a
      https://github.com/okfn/ckan/commit/4f2d7901a58d35cc07dc5a569b3ef926aeae062a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M doc/data-viewer.rst
    M doc/datastore.rst

  Log Message:
  -----------
  Merge branch '973-datastore-docs-improvements' of github.com:okfn/ckan into 973-datastore-docs-improvements


Compare: https://github.com/okfn/ckan/compare/e1ccc77c8701...4f2d7901a58d


More information about the ckan-changes mailing list