[ckan-changes] [okfn/ckan] f8c807: [#973] Make sure we always talk about datastore re...

• Previous message: [ckan-changes] [okfn/ckan] f8c807: [#973] Make sure we always talk about datastore re...
• Next message: [ckan-changes] [okfn/ckan] 28e6ed: [#1222] Undeprecated extra_template_paths and extr...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/858-template-whitespace-cleanup
  Home:   https://github.com/okfn/ckan
  Commit: f8c807e73bfa9be85100677a19632ae3f85da154
      https://github.com/okfn/ckan/commit/f8c807e73bfa9be85100677a19632ae3f85da154
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-06-04 (Tue, 04 Jun 2013)

  Changed paths:
    M ckanext/datastore/logic/action.py
    M doc/data-viewer.rst
    M doc/datastore.rst

  Log Message:
  -----------
  [#973] Make sure we always talk about datastore resource and not just resources, extend introduction to include motivation for the datastore


  Commit: 759c0d86b38cc0c5f921cc38b57d713665c5fe50
      https://github.com/okfn/ckan/commit/759c0d86b38cc0c5f921cc38b57d713665c5fe50
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

  Changed paths:
    M ckan/plugins/interfaces.py
    A ckanext/examples/iauthfunctions/plugin_1.py
    A ckanext/examples/iauthfunctions/plugin_2.py
    A ckanext/examples/iauthfunctions/plugin_3.py
    M doc/conf.py
    M doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  [#943] First draft if new writing extensions tutorial


  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: 90cf45017b0236ae02e23885120095d680931d34
      https://github.com/okfn/ckan/commit/90cf45017b0236ae02e23885120095d680931d34
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-13 (Thu, 13 Jun 2013)

  Changed paths:
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  [#943] Reformat setup.py_tmpl

Spaces, not tabs. Also fix random indentation.


  Commit: 3c2fda0c48f0d568f646f452da6c8cdf95d0636b
      https://github.com/okfn/ckan/commit/3c2fda0c48f0d568f646f452da6c8cdf95d0636b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M ckanext/examples/iauthfunctions/plugin_3.py

  Log Message:
  -----------
  [#943] Delete an unwanted return

This should not have been committed


  Commit: 5b7b0b466b4e2a40555e0cc984b40494083c2b7a
      https://github.com/okfn/ckan/commit/5b7b0b466b4e2a40555e0cc984b40494083c2b7a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-24 (Mon, 24 Jun 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Add some minimal extension best practices

There's probably a lot more to mention here.


  Commit: cccf5d29c5b832274e5f7daede1c8992bc68afba
      https://github.com/okfn/ckan/commit/cccf5d29c5b832274e5f7daede1c8992bc68afba
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    A ckanext/examples/iauthfunctions/plugin_4.py
    M doc/api.rst
    M doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  [#943] Add tutorial section on error handling in extensions


  Commit: 6f6389fdec7b4966903b562b4583f5a0508f9d6a
      https://github.com/okfn/ckan/commit/6f6389fdec7b4966903b562b4583f5a0508f9d6a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    A ckanext/examples/__init__.py
    A ckanext/examples/iauthfunctions/__init__.py

  Log Message:
  -----------
  [#943] Add __init__.py files to examples/iauthfunctions

These are needed for the extension to load successfully.


  Commit: b5c8b7f7f80b4ae5aedd147050b6de31b66f98d2
      https://github.com/okfn/ckan/commit/b5c8b7f7f80b4ae5aedd147050b6de31b66f98d2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin_1.py
    A ckanext/example_iauthfunctions/plugin_2.py
    A ckanext/example_iauthfunctions/plugin_3.py
    A ckanext/example_iauthfunctions/plugin_4.py
    R ckanext/examples/iauthfunctions/__init__.py
    R ckanext/examples/iauthfunctions/plugin_1.py
    R ckanext/examples/iauthfunctions/plugin_2.py
    R ckanext/examples/iauthfunctions/plugin_3.py
    R ckanext/examples/iauthfunctions/plugin_4.py
    M setup.py

  Log Message:
  -----------
  [#943] Move the example iauthfunctions extension

Put it in the same place as example_idatasetform etc.


  Commit: 53ed705b47f5f184eb5a16a58366a974dec72442
      https://github.com/okfn/ckan/commit/53ed705b47f5f184eb5a16a58366a974dec72442
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    R ckanext/example_iauthfunctions/plugin_1.py
    R ckanext/example_iauthfunctions/plugin_2.py
    R ckanext/example_iauthfunctions/plugin_3.py
    R ckanext/example_iauthfunctions/plugin_4.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/plugin_v4.py
    M setup.py

  Log Message:
  -----------
  [#943] Rename example_iauthfunctions plugin modules

Adding a v makes it clearer that they're successive versions of the same
module.


  Commit: c859782a4bc1bd6c1f57f1b0aaf934415670a780
      https://github.com/okfn/ckan/commit/c859782a4bc1bd6c1f57f1b0aaf934415670a780
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Update includes in writing-extensions docs


  Commit: 79deea80bad7fe4b6996f275fcd2aa44503dce82
      https://github.com/okfn/ckan/commit/79deea80bad7fe4b6996f275fcd2aa44503dce82
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    R ckanext/examples/__init__.py

  Log Message:
  -----------
  [#943] Delete stray __init__.py file


  Commit: 559d41602c30c770b11bf5293c97bd8817712071
      https://github.com/okfn/ckan/commit/559d41602c30c770b11bf5293c97bd8817712071
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Edit the writing extensions tutorial

Lots of minor edits


  Commit: bf1847f7bce694b0f98dc2b6ff27f8e2dc07be0f
      https://github.com/okfn/ckan/commit/bf1847f7bce694b0f98dc2b6ff27f8e2dc07be0f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  [#943] Show .. todo:: items in Sphinx output


  Commit: 75d1eee0b2d3dd473efc66c388435c2bac2d3901
      https://github.com/okfn/ckan/commit/75d1eee0b2d3dd473efc66c388435c2bac2d3901
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    A ckanext/example_iauthfunctions/plugin.py
    R ckanext/example_iauthfunctions/plugin_v4.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M setup.py

  Log Message:
  -----------
  [#943] Add tests for example_iauthfunctions


  Commit: e58153506d463597897b9b7ad8d112f7d7d2828f
      https://github.com/okfn/ckan/commit/e58153506d463597897b9b7ad8d112f7d7d2828f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Add some docs about testing extensions


  Commit: d3bbbe1d85b23ef9114a9ed65c6ac0fecf872290
      https://github.com/okfn/ckan/commit/d3bbbe1d85b23ef9114a9ed65c6ac0fecf872290
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Update some includes in writing extensions docs


  Commit: 22d933a3ed6f16fe3b6a56796c0f1d01257b98a6
      https://github.com/okfn/ckan/commit/22d933a3ed6f16fe3b6a56796c0f1d01257b98a6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-28 (Fri, 28 Jun 2013)

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Add docs on publishing extensions


  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: 0b4bef130b9c9efc1ec57789d9396f8ac55c4a5e
      https://github.com/okfn/ckan/commit/0b4bef130b9c9efc1ec57789d9396f8ac55c4a5e
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#973] Improve references in data viewer docs


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

  Changed paths:
    M doc/datastore.rst

  Log Message:
  -----------
  [#973] Restructured Datastore description. Introduction is much simpler and shorter.


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

  Changed paths:
    M .gitmodules
    A .pipignore
    M CHANGELOG.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/travis-build
    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/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/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.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/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
    M ckan/model/license.py
    M ckan/model/meta.py
    R ckan/model/test_user.py
    M ckan/model/user.py
    M ckan/new_authz.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/modules/autocomplete.js
    M ckan/public/base/javascript/modules/confirm-action.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
    A ckan/public/base/javascript/plugins/jquery.masonry.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
    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/public/base/less/nav.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.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_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/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_item.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.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/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/read_base.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.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/test_package.py
    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/lib/test_helpers.py
    M ckan/tests/logic/test_action.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_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/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/theme/public/preview_recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.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
    M doc/conf.py
    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/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
    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 973-datastore-docs-improvements

Conflicts:
	doc/data-viewer.rst


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

  Changed paths:
    M doc/data-viewer.rst

  Log Message:
  -----------
  [#973] Fix merge


  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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 8d882999a5c8cb3cb4d2cfacbde16da6b0ab7d5b
      https://github.com/okfn/ckan/commit/8d882999a5c8cb3cb4d2cfacbde16da6b0ab7d5b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-12 (Mon, 12 Aug 2013)

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Tweak a TODO in the docs


  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: a72d243bb1c1d26044c58257b5194c6940756e3e
      https://github.com/okfn/ckan/commit/a72d243bb1c1d26044c58257b5194c6940756e3e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/plugin_v3.py

  Log Message:
  -----------
  [#943] Prepopulate context in check_access()

In some cases authorization functions can get called without the basics
(model, session, user) in their context dict. For example this was
happening to the group_create() auth function in the
example_iauthfunctions plugin, but only when it was called via the
templates not via the API.

This commit just changes check_access() to always put model, session and
user into the context if they aren't there already before passing the
context onto an auth function.

get_action() was already doing this for action functions.


  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: 543f4b57b9276f6da897ebb4163c46a688eaf924
      https://github.com/okfn/ckan/commit/543f4b57b9276f6da897ebb4163c46a688eaf924
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

  Log Message:
  -----------
  [#943] Add :raises: to member_list() action


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

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#943] Minor API docs correction


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

  Changed paths:
    M doc/api.rst

  Log Message:
  -----------
  [#943] Add a note about exceptions to API docs

Add a note to the API docs about what the API does when an action
function raises an exception.


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

  Changed paths:
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Add a TODO to the docs


  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: 491c80ddef9990be94c1f9f91eb00c06412506ad
      https://github.com/okfn/ckan/commit/491c80ddef9990be94c1f9f91eb00c06412506ad
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

  Changed paths:
    M ckan/plugins/toolkit.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  [#943] Add ckan.logic.Invalid to the plugins toolkit

This means that extensions that call converter or validator functions
(via the toolkit) don't need to import Invalid directly to catch the
exceptions.


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

  Changed paths:
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  [#943] Don't use `with assert_raises`

It doesn't work in Python 2.6


  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: d4cac8b0b464d2c2675c08587d97177d13bcaba6
      https://github.com/okfn/ckan/commit/d4cac8b0b464d2c2675c08587d97177d13bcaba6
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

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

  Log Message:
  -----------
  [#1180] Raise 404 for org or group if called wrong

Raise a 404 if a group is called by organization_show
and vice versa.


  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: 20d9703d51ce876dbab2c56848ab82e3b7df03bc
      https://github.com/okfn/ckan/commit/20d9703d51ce876dbab2c56848ab82e3b7df03bc
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1195] Also minify css and js in ckanext dir when running `paster front-end-build`


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

  Changed paths:
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js

  Log Message:
  -----------
  [#1195] Reminify pdf.js


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

  Changed paths:
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js

  Log Message:
  -----------
  [#1195] Add minified vendor libraries for pdf preview


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

  Changed paths:
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js

  Log Message:
  -----------
  [#1195] Move highlight.js to vendor directory to avoid minification


  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: 0405c3f868289a768ca2be9cb4db3ab7f9cd54b8
      https://github.com/okfn/ckan/commit/0405c3f868289a768ca2be9cb4db3ab7f9cd54b8
  Author: eraviart <emmanuel at raviart.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

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

  Log Message:
  -----------
  Add missing initialization of existing_org in organizations selector.

Without this initialization the organizations selector doesn't select the current organization.


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

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1199] Make sure we can remove datasets from organizations through the API. The problem was that the validator removed the owner_org from the data dict when it was empty.


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

  Changed paths:
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif

  Log Message:
  -----------
  [#1199] Upgrade select2 to make it possible to select item with empty value.


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

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

  Log Message:
  -----------
  [#1199] Fix the package_update and package_create validator to accept an empty org but not None.


  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: c60cbbe3fe0e2516edf57344fa7ac81d897cd080
      https://github.com/okfn/ckan/commit/c60cbbe3fe0e2516edf57344fa7ac81d897cd080
  Author: amercader <amercadero at gmail.com>
  Date:   2013-08-23 (Fri, 23 Aug 2013)

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/tests/logic/test_init.py

  Log Message:
  -----------
  [#1210] Add auth_user_obj to context in check_access

If not already there or ignore_auth is True, and the context has a user
name, try to see if the user actually exists in the DB, and store the
object (or None if not found) in context['auth_user_obj']. The check if
performed only once per context object.


  Commit: 3b1b86838c4a7101e33c4b5babd059454efb4a70
      https://github.com/okfn/ckan/commit/3b1b86838c4a7101e33c4b5babd059454efb4a70
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  [#1211] Add exception guidelines to Python coding standards


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

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Add logging example to Python coding standards


  Commit: 560f86787d635d1f27169ce3086c428c87178b5c
      https://github.com/okfn/ckan/commit/560f86787d635d1f27169ce3086c428c87178b5c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Correct some Sphinx formatting


  Commit: 79f7deaa73c4dbb8a5a6d5fff8a083e8ebfb769e
      https://github.com/okfn/ckan/commit/79f7deaa73c4dbb8a5a6d5fff8a083e8ebfb769e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Correct some grammar.


  Commit: 6164aea8ddb59d81b16d58d440cca0f9d0016f15
      https://github.com/okfn/ckan/commit/6164aea8ddb59d81b16d58d440cca0f9d0016f15
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Fix the title styles in a docs file


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

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Add docstring guidelines for cross-referencing code objects


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

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Remove formatting cleanups stuff from coding standards

This coding standard was wrong


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

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Reorder some docs subsections


  Commit: 55aa9598641655d9abfb23b4d68a8098de5a3a6f
      https://github.com/okfn/ckan/commit/55aa9598641655d9abfb23b4d68a8098de5a3a6f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Docs: add a bullet-point


  Commit: 700cee77702e0b6a14e241fcc1f130430a212407
      https://github.com/okfn/ckan/commit/700cee77702e0b6a14e241fcc1f130430a212407
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Add a cross-ref in the docs


  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


  Commit: 36f95afb1cd2fc91e2815c8a120d1229e813c9bd
      https://github.com/okfn/ckan/commit/36f95afb1cd2fc91e2815c8a120d1229e813c9bd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#973] Fix a broken Sphinx reference


  Commit: 2787a73722cf26c4b2e4860a9a7d146e7d1e2d37
      https://github.com/okfn/ckan/commit/2787a73722cf26c4b2e4860a9a7d146e7d1e2d37
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.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/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/model/activity.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/templates/snippets/activity_item.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/models/test_activity.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/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge branch '973-datastore-docs-improvements'


  Commit: 3f4db25d3a14ec66db8f0194c2595e725f131237
      https://github.com/okfn/ckan/commit/3f4db25d3a14ec66db8f0194c2595e725f131237
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Fix broken IResourcePreview docstring

Not spell-checked, not following CKAN's docstring guidelines, contained
Sphinx errors. I also rewrote it for clarity.


  Commit: 6e9421d2e3ef5d78febe6e9e67a6363ba205100b
      https://github.com/okfn/ckan/commit/6e9421d2e3ef5d78febe6e9e67a6363ba205100b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Fix a Sphinx warning


  Commit: e91bb956b44c242db2b9125f18a2aef6a82bee1a
      https://github.com/okfn/ckan/commit/e91bb956b44c242db2b9125f18a2aef6a82bee1a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

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

  Log Message:
  -----------
  [#1180] Add tests


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

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

  Log Message:
  -----------
  Correct syntax


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

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

  Log Message:
  -----------
  [#1180] Change typos and get the tests to pass


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

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

  Log Message:
  -----------
  [#1180] *Really* fix tests


  Commit: e6fcf1e15e6c05801c3f5c590a4df8dc0f0802aa
      https://github.com/okfn/ckan/commit/e6fcf1e15e6c05801c3f5c590a4df8dc0f0802aa
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-27 (Tue, 27 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/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
    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
    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/test_coding_standards.py
    M ckan/tests/test_plugins.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
    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 943-writing-extensions-tutorial

Conflicts:
	ckan/logic/__init__.py
	ckan/plugins/toolkit.py
	doc/conf.py


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

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1210] Fix side_effect_free check

It should be in place if it is an action function from get.py and it
hasn't already been set.


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

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#1210] Require a logged in user by default except for get actions

By default, any auth function not in get.py will not allow anonymous
access, ie will require a logged in user to be performed. Core auth
functions are automatically configured when building the `AuthFunctions`
cache, but two decorators are provided to allow defining exceptions
in both cases and extensions to define the behaviour on their own auth
functions. The decoratos are `auth_allow_anonymous_access` and
`auth_disllow_anonymous_access`.

`check_access` will check for the auth_allow_anonymous_access attribute
on the auth function, and if False and there isn't a validated user
object in the context, it will raise a NotAuthorized exception.


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

  Changed paths:
    M ckan/controllers/storage.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/tests/logic/test_init.py

  Log Message:
  -----------
  [#1210] Fix auth tests and tweak auth functions

Add the anon access decorator to some functions as they require it in
some circumstances.

The storage controller was calling `is_authorized_boolean` directly,
which should be never done (same for `is_authorized`).

It would be god to refactor password_reset out of user_update, so
user_update does not require anon access.


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

  Changed paths:
    M ckan/plugins/toolkit.py
    M doc/toolkit.rst

  Log Message:
  -----------
  [#1210] Add decorators to the plugins toolkit


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

  Changed paths:
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py

  Log Message:
  -----------
  [#1210] Yet more tests fixes


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

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1210] Add user object to context in controllers

The base controller already checked whether there was a user object in
the db for the user name provided. If we added it to the context we save
the same check on check_access.


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

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

  Log Message:
  -----------
  Merge pull request #1189 from okfn/1180-groups-orgs-404

[#1180] Raise 404 for org or group if called wrong


  Commit: 6fb6072d1daf3846767124623cab91ab659cd283
      https://github.com/okfn/ckan/commit/6fb6072d1daf3846767124623cab91ab659cd283
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  [#1211] Correct a typo


  Commit: b26147e8889a6c35fd1e063873d6597d855e6286
      https://github.com/okfn/ckan/commit/b26147e8889a6c35fd1e063873d6597d855e6286
  Author: John Glover <j at johnglover.net>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Merge pull request #1211 from okfn/1211-add-exception-guidelines

Add exception guidelines to Python coding standards


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

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/new_authz.py

  Log Message:
  -----------
  [#1210] Minor changes after review


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

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1210] Add some docs


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

  Changed paths:
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M doc/conf.py
    M doc/toolkit.rst
    M doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Autodoc the plugins toolkit

ckan.plugins.toolkit isn't compatible with autodoc. Autodoc supports
modules and classes, but the plugins toolkit is actually an
object-instance masquerading as a module.

Added a Sphinx extension to do what autodoc does for classes and
modules, but for the plugins toolkit object.

Added a custom __dir__() method to the plugins toolkit so that
inspect.getmembers() works as desired for it.


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

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#943] Add some docstrings to lib/base.py

These are functions that are imported into the plugins toolkit, so they
need docstrings.


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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#943] Add a docstrings to lib/cli.py

This class is imported into the plugins toolkit, so it needs a docstring.


  Commit: 758c80e17a944034110d9983c3ce61cc1aa6396f
      https://github.com/okfn/ckan/commit/758c80e17a944034110d9983c3ce61cc1aa6396f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#943] Add some docstrings to helpers.py.

Everything in the template helpers module should have a docstring.


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

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

  Log Message:
  -----------
  [#943] Add a docstring to Invalid exception

This exception is imported into the plugins toolkit so it needs a
docstring.


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

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#943] Improve DefaultDatasetForm's docstring


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

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#943] Add some docstrings to logic/__init__.py

These functions and exceptions are imported into the plugins toolkit, so
they need docstrings.


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

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#943] Add some docstrings to plugins/toolkit.py.

Everything in the plugins toolkit should have a docstring.


  Commit: 3a93c879f7e14eedcd5fc900a957b9c54a317b80
      https://github.com/okfn/ckan/commit/3a93c879f7e14eedcd5fc900a957b9c54a317b80
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/logic/test_action.py
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 943-writing-extensions-tutorial


  Commit: 0f4f730fcbab5ad6f7a600a3d214b04000c7508d
      https://github.com/okfn/ckan/commit/0f4f730fcbab5ad6f7a600a3d214b04000c7508d
  Author: Anton Lundin <anton at dohi.se>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  Add config template stanza for ckan.storage.bucket

This was lost in e0cd7ba46e260b503b4090d1a382c5bc5dcf7db8


  Commit: 69f600e04dbcb5bd63d1b7b97387c9c0f669f880
      https://github.com/okfn/ckan/commit/69f600e04dbcb5bd63d1b7b97387c9c0f669f880
  Author: Anton Lundin <anton at dohi.se>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

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

  Log Message:
  -----------
  Better config stanza and doc for ckan.storage


  Commit: 6c274d35b3b43d9b96842ec6a16e6e10b8a5285a
      https://github.com/okfn/ckan/commit/6c274d35b3b43d9b96842ec6a16e6e10b8a5285a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py

  Log Message:
  -----------
  [#943] Add custom docstrings for some 3rd-party stuff

The plugins toolkit imports some things from 3rd-party libraries, e.g.
the request, response and c objects from Pylons. We want to use our own
docstrings for these rather than having the 3rd-party docstrings appear
in the CKAN docs. Also in some cases the 3rd-psrty function has no
docstring, or introspection would end up with a class docstring where
what we actually want is to document a specific object-instance.

So add custom docstring overrides as a feature implemented in toolkit.py
and toolkit_sphinx_extension.py.


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

  Changed paths:
    M ckan/logic/__init__.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/tutorial.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst

  Log Message:
  -----------
  [#943] Rearrange the writing extensions docs

But the different parts into different pages


  Commit: 216033ab50bf7a6815df55081df67157eca99905
      https://github.com/okfn/ckan/commit/216033ab50bf7a6815df55081df67157eca99905
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  [#943] Add cross-ref from authorization docs to IAuthFunctions


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

  Changed paths:
    M doc/extensions/tutorial.rst

  Log Message:
  -----------
  [#943] Minor tweaks to the writing extensions tutorial


  Commit: 4d287f76ab628005260fb87c04fcb79b3748e45c
      https://github.com/okfn/ckan/commit/4d287f76ab628005260fb87c04fcb79b3748e45c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M doc/extensions/index.rst
    A doc/extensions/publishing-extensions.rst
    A doc/extensions/testing-extensions.rst
    M doc/extensions/tutorial.rst

  Log Message:
  -----------
  [#943] Move some of the writing extensions tutorial sections into separate files


  Commit: 6e1010bba67384fc2fe9065878ef69f6da737058
      https://github.com/okfn/ckan/commit/6e1010bba67384fc2fe9065878ef69f6da737058
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M doc/extensions/index.rst
    R doc/extensions/publishing-extensions.rst

  Log Message:
  -----------
  [#943] Remove the Publishing extensions page from the docs

It wasn't very good


  Commit: 5d9a95c46b4f9ab9626e68c0ef8153c4cf340542
      https://github.com/okfn/ckan/commit/5d9a95c46b4f9ab9626e68c0ef8153c4cf340542
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M doc/extensions/testing-extensions.rst

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


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

  Changed paths:
    M ckan/plugins/interfaces.py
    M doc/extensions/plugin-interfaces.rst

  Log Message:
  -----------
  [#943] Tweak the plugin interfaces reference docs


  Commit: 4adde342af94b39490d17c2272427c246a4b6951
      https://github.com/okfn/ckan/commit/4adde342af94b39490d17c2272427c246a4b6951
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#943] Tweak get_action() docstring


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

  Changed paths:
    M doc/extensions/index.rst
    A doc/extensions/validators.rst

  Log Message:
  -----------
  [#943] Add validator functions reference to docs

These are available to plugins to toolkit.get_validator(), so they need
to be in the docs.


  Commit: 22ae3113d18342e2af26c8e5847e18e00773da55
      https://github.com/okfn/ckan/commit/22ae3113d18342e2af26c8e5847e18e00773da55
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M doc/extensions/plugin-interfaces.rst

  Log Message:
  -----------
  [#943] Tweak plugin interfaces reference docs


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

  Changed paths:
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/plugin_v1.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  [#943] PEP-8


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

  Changed paths:
    M ckan/plugins/toolkit_sphinx_extension.py

  Log Message:
  -----------
  [#943] Delete a done TODO comment


  Commit: 558868108b85d43a10dd16a283cb7acefb93ce75
      https://github.com/okfn/ckan/commit/558868108b85d43a10dd16a283cb7acefb93ce75
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

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

  Log Message:
  -----------
  [#1216] Correct the logic in resource_delete

resource_delete, as it stands, is broken. This fixes the logic and adds tests
for resource_delete. Fixes #1216.


  Commit: 28e6ed78a854f3a4b6f171199d141a00bb0aaf06
      https://github.com/okfn/ckan/commit/28e6ed78a854f3a4b6f171199d141a00bb0aaf06
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#1222] Undeprecated extra_template_paths and extra_public_paths

These config options shouldn't have been marked as deprecated.


  Commit: 2c3d1b5c6dd726cd8c6f37b0cf38492b9b500222
      https://github.com/okfn/ckan/commit/2c3d1b5c6dd726cd8c6f37b0cf38492b9b500222
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/tests/logic/test_action.py
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch 'config_doc'


  Commit: fade3c2bdbf02a243e8d8f8a15a19a31776ffeba
      https://github.com/okfn/ckan/commit/fade3c2bdbf02a243e8d8f8a15a19a31776ffeba
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst

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


  Commit: 642ff4c9b7c3efd39d1dd37b8c9759e7b3cc23e8
      https://github.com/okfn/ckan/commit/642ff4c9b7c3efd39d1dd37b8c9759e7b3cc23e8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

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

  Log Message:
  -----------
  [#1199] Change 'Select an organization' to 'No organization'

When creating or editing a dataset, the dropdown for selecting the
dataset's organization contained an item labelled
'Select an organization...' that, if selected, would set the dataset to
belong to no organization (removing it from any organization it does
belong to). This seems quite confusing, change the label to
'No organization' to make it clear what it does.


  Commit: a3a2698bd0868e15b784b659931f44b7a6d414cb
      https://github.com/okfn/ckan/commit/a3a2698bd0868e15b784b659931f44b7a6d414cb
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M ckan/templates/user/request_reset.html

  Log Message:
  -----------
  Correct breadcumb link in reset password template


  Commit: 9337ab87c9235992ec9857adbddf3988ec82546e
      https://github.com/okfn/ckan/commit/9337ab87c9235992ec9857adbddf3988ec82546e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    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/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/model/activity.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/models/test_activity.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst
    A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1199-fix-package-owner-org-edit


  Commit: d17d095a5fb74caa059de6d85033109b9606db6c
      https://github.com/okfn/ckan/commit/d17d095a5fb74caa059de6d85033109b9606db6c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M doc/extensions/tutorial.rst

  Log Message:
  -----------
  [#943] Add note that extension names must begin with ckanext-


  Commit: feae0ea9d500a186f382efcbe82b0c027fb1db77
      https://github.com/okfn/ckan/commit/feae0ea9d500a186f382efcbe82b0c027fb1db77
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/plugin_v2.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M doc/extensions/tutorial.rst

  Log Message:
  -----------
  [#943] Remove inherit=False from extensions docs

inherit=False is the default behavior anyway, and we're not sure if
inherit=True would actually be much use in CKAN


  Commit: 48031a5607d09d1942952e7abc19bf74ccfb4f71
      https://github.com/okfn/ckan/commit/48031a5607d09d1942952e7abc19bf74ccfb4f71
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M doc/extensions/tutorial.rst

  Log Message:
  -----------
  [#943] Remove Plugin vs SingletonPlugin from the docs

We're not sure what it's for anyway


  Commit: d1d3535e647a4f3f3444238f6e4dc99c5b8bdee5
      https://github.com/okfn/ckan/commit/d1d3535e647a4f3f3444238f6e4dc99c5b8bdee5
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 943-writing-extensions-tutorial


  Commit: d5f80a12563f4cc60452cd1d8963d59f2246be0c
      https://github.com/okfn/ckan/commit/d5f80a12563f4cc60452cd1d8963d59f2246be0c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M doc/extensions/plugin-interfaces.rst

  Log Message:
  -----------
  [#943] Fix a Sphinx error


  Commit: 8de21bd59c1c4d00ada2c2c0bb7fae5c7ab48836
      https://github.com/okfn/ckan/commit/8de21bd59c1c4d00ada2c2c0bb7fae5c7ab48836
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge branch '943-writing-extensions-tutorial'


  Commit: 200587be7e3d89c23069a3831b934e62361bbb06
      https://github.com/okfn/ckan/commit/200587be7e3d89c23069a3831b934e62361bbb06
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

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

  Log Message:
  -----------
  [#1230] add extras block to package/snippets/additional_info.html


  Commit: a1b439def52630909d832c6f112d7d6a5438679f
      https://github.com/okfn/ckan/commit/a1b439def52630909d832c6f112d7d6a5438679f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  [#1231] Make a correction to the docs

Fixes #1231


  Commit: 91b833c9f0bd80f25f76f94827bfb8fa2c402d3c
      https://github.com/okfn/ckan/commit/91b833c9f0bd80f25f76f94827bfb8fa2c402d3c
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  Merge branch '1231-best-practices-for-writing-extensions-mistake'


  Commit: 787b8924936817455edbfc17084741ed4d48032e
      https://github.com/okfn/ckan/commit/787b8924936817455edbfc17084741ed4d48032e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1199-fix-package-owner-org-edit


  Commit: 41ae6b5a85b8e6ea39557fc532b64c5a3b47e86f
      https://github.com/okfn/ckan/commit/41ae6b5a85b8e6ea39557fc532b64c5a3b47e86f
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

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

  Log Message:
  -----------
  Merge pull request #1230 from okfn/1230-additional-info-extras-block

add template block for extras in package/snippets/additional_info.html


  Commit: 74aaea5273363c4ff584a95c39b13978c206333c
      https://github.com/okfn/ckan/commit/74aaea5273363c4ff584a95c39b13978c206333c
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M ckan/templates/user/request_reset.html

  Log Message:
  -----------
  Merge pull request #1225 from okfn/1225-reset-template

Breadcrumbs on password reset page links to register


  Commit: 86b4e89a5cbdb7d1d846d5465f454877b36b540b
      https://github.com/okfn/ckan/commit/86b4e89a5cbdb7d1d846d5465f454877b36b540b
  Author: amercader <amercadero at gmail.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.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/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/solr/schema.xml
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1210-auth-checks-improvements

Conflicts due to changes in the docstrings for #943. Added relevant
missing bits.

Conflicts:
	ckan/logic/__init__.py
	ckan/plugins/interfaces.py
	doc/toolkit.rst


  Commit: e01b8c07aca9efcb5583f6f96a495cccec9e824c
      https://github.com/okfn/ckan/commit/e01b8c07aca9efcb5583f6f96a495cccec9e824c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  [#1210] check_access should always get an action name


  Commit: 452a4c5cd7bfd19b56ade5a38d3eb23747f9c27a
      https://github.com/okfn/ckan/commit/452a4c5cd7bfd19b56ade5a38d3eb23747f9c27a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  [#1210] Fix test in ExampleIAuthFunctions Plugin


  Commit: bd200d09a5709646d33c5894c6926f4db160bf53
      https://github.com/okfn/ckan/commit/bd200d09a5709646d33c5894c6926f4db160bf53
  Author: amercader <amercadero at gmail.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  [#1210] pep8 fix


  Commit: 8dbd071c9e99c9a839b91762efff2419ebdc1de1
      https://github.com/okfn/ckan/commit/8dbd071c9e99c9a839b91762efff2419ebdc1de1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/logic/validators.py
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch '1199-fix-package-owner-org-edit'


  Commit: e2d9ce5c3c22941a4f7c5633c3da3bbdd8e79f21
      https://github.com/okfn/ckan/commit/e2d9ce5c3c22941a4f7c5633c3da3bbdd8e79f21
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  Merge pull request #1210 from okfn/1210-auth-checks-improvements

Auth checks improvements for logged in users


  Commit: 847320bad8d0ef91e930d090f04b0640c4719e52
      https://github.com/okfn/ckan/commit/847320bad8d0ef91e930d090f04b0640c4719e52
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1238] Correctly closes the span on


  Commit: a514fa1e98d6603be5e70e0d9bbd5841968d5ef5
      https://github.com/okfn/ckan/commit/a514fa1e98d6603be5e70e0d9bbd5841968d5ef5
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M ckan/lib/cli.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js

  Log Message:
  -----------
  Merge pull request #1195 from okfn/1195-minification-fixes

Minification fixes


  Commit: 34e73caa8aabb3aa35c3fcea46c1e8ac41599f77
      https://github.com/okfn/ckan/commit/34e73caa8aabb3aa35c3fcea46c1e8ac41599f77
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

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

  Log Message:
  -----------
  Don't modify the list that's being iterated


  Commit: c43c3fbe4c23968767260d1e2b68a9459dc013be
      https://github.com/okfn/ckan/commit/c43c3fbe4c23968767260d1e2b68a9459dc013be
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-16 (Mon, 16 Sep 2013)

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

  Log Message:
  -----------
  Merge pull request #1216 from okfn/1216-fix-resource-delete

resource_delete does not work


  Commit: ba560b99c30097f888acb3726fa73bfd4a727c6b
      https://github.com/okfn/ckan/commit/ba560b99c30097f888acb3726fa73bfd4a727c6b
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-17 (Tue, 17 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch '1222-undeprecate-extra-template-and-public-paths'


  Commit: 4699c6476d27fc91f938abcf139434734dc71e5f
      https://github.com/okfn/ckan/commit/4699c6476d27fc91f938abcf139434734dc71e5f
  Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #1238 from okfn/1238-number_span-span-fix

`h.SI_number_span` doesn't close `<span />` correctly


  Commit: 37bbf267401390183874c1e68d411f287dd2f54a
      https://github.com/okfn/ckan/commit/37bbf267401390183874c1e68d411f287dd2f54a
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.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/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/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/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/formatters.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/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/update.py
    M ckan/logic/validators.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/activity.py
    M ckan/new_authz.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/test_plugins.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_create.py
    M ckanext/datastore/tests/test_dump.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.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
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M dev-requirements.txt
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    R doc/toolkit.rst
    M doc/upgrade-source.rst
    R doc/writing-extensions.rst
    A pip-requirements-docs.txt
    A requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge master


Compare: https://github.com/okfn/ckan/compare/67a12a750321...37bbf2674013

• Previous message: [ckan-changes] [okfn/ckan] f8c807: [#973] Make sure we always talk about datastore re...
• Next message: [ckan-changes] [okfn/ckan] 28e6ed: [#1222] Undeprecated extra_template_paths and extr...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]