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

• Previous message: [ckan-changes] [okfn/ckan] 1fce2c: [#847] More work on the new theming docs
• Next message: [ckan-changes] [okfn/ckan] f8c807: [#973] Make sure we always talk about datastore re...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/847-new-theming-docs
  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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 7c9509474c2a2fefd6c3d7692f2164d26654b6b4
      https://github.com/okfn/ckan/commit/7c9509474c2a2fefd6c3d7692f2164d26654b6b4
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-13 (Tue, 13 Aug 2013)

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

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


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

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

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


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

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

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

add limit/offset to package_list action


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

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

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


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

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

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


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

  Changed paths:
    M doc/conf.py

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


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

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

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

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


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

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

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

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


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

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

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


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

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

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

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

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

Once in the controllers, these are normally used in:

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

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

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


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

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

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


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

  Changed paths:
    M dev-requirements.txt

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


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

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

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


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

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

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

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


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

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

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


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

  Changed paths:
    M doc/conf.py

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

Update copyright year to 2013 in docs


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

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

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


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

  Changed paths:
    M doc/conf.py

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


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

  Changed paths:
    M dev-requirements.txt

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

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

All details here:

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


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

  Changed paths:
    M dev-requirements.txt

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


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

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

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

Site user can not create datasets


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

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

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


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

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

  Log Message:
  -----------
  [#1078] metadata_modified matching so that only get out from solr when datetimes are similar and minor exception cleanup


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

  Changed paths:
    M ckan/config/middleware.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    A pip-requirements-docs.txt

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


  Commit: 682e6bc0a9fbc0a08448bdf53b793a8c9352916f
      https://github.com/okfn/ckan/commit/682e6bc0a9fbc0a08448bdf53b793a8c9352916f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

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

  Log Message:
  -----------
  Merge pull request #1177 from okfn/refactoring_activity_details

Move logic of getting ActivityDetails' by activity_id to its model


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

  Changed paths:
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/get.py
    M ckanext/multilingual/solr/schema.xml

  Log Message:
  -----------
  Merge pull request #1078 from okfn/1078-package_show-performance

package_show could be faster


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M doc/configuration.rst

  Log Message:
  -----------
  Merge pull request #938 from okfn/938-datapusher

Push data to the datastore (includes #940 and #981)


  Commit: 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: 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: decc420532ffadfb55c6cc3116eaf89916c96e1b
      https://github.com/okfn/ckan/commit/decc420532ffadfb55c6cc3116eaf89916c96e1b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-04 (Wed, 04 Sep 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
    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 847-new-theming-docs


Compare: https://github.com/okfn/ckan/compare/1fce2cc1d499...decc420532ff

• Previous message: [ckan-changes] [okfn/ckan] 1fce2c: [#847] More work on the new theming docs
• Next message: [ckan-changes] [okfn/ckan] f8c807: [#973] Make sure we always talk about datastore re...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]