[ckan-changes] [okfn/ckan] c668b3: [#744] Start writing tests for page-view tracking

GitHub noreply at github.com
Wed Sep 25 01:52:51 UTC 2013


  Branch: refs/heads/1243
  Home:   https://github.com/okfn/ckan
  Commit: c668b36ad05756fd1411f4d25563f1c63abae530
      https://github.com/okfn/ckan/commit/c668b36ad05756fd1411f4d25563f1c63abae530
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    A ckan/tests/functional/test_tracking.py

  Log Message:
  -----------
  [#744] Start writing tests for page-view tracking


  Commit: 2f38cae5833d5dd0341925640ba1ef7c1f3ea6a8
      https://github.com/okfn/ckan/commit/2f38cae5833d5dd0341925640ba1ef7c1f3ea6a8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-09 (Tue, 09 Apr 2013)

  Changed paths:
    M test-core.ini

  Log Message:
  -----------
  [#744] Add tracking_enabled = true to test-core.ini

This makes the test_tracking.py tests pass


  Commit: ddd0151d981b0ae73dd9d1fdb9028e3d0877b6e2
      https://github.com/okfn/ckan/commit/ddd0151d981b0ae73dd9d1fdb9028e3d0877b6e2
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/package_relationship.py
    M ckan/model/tag.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/organization/index.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/tests/functional/test_home.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.css
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M doc/configuration.rst
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/database-dumps.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/legacy-api.rst
    M doc/paster.rst
    M doc/test.rst
    M doc/tracking.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 744-tests-for-page-view-tracking

Conflicts:
	test-core.ini


  Commit: 8d5c326d9b7ec8c7b062dffbf13fd2a8f4c8dcbb
      https://github.com/okfn/ckan/commit/8d5c326d9b7ec8c7b062dffbf13fd2a8f4c8dcbb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-27 (Thu, 27 Jun 2013)

  Changed paths:
    M .gitmodules
    A .pipignore
    M .tx/config
    A CHANGELOG.rst
    R CHANGELOG.txt
    M CONTRIBUTING.rst
    M LICENSE.txt
    M README.rst
    M bin/ckan_edit_local.py
    M bin/travis-build
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    A ckan/config/install.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    A ckan/i18n/dv/LC_MESSAGES/ckan.mo
    A ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    A ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    A ckan/i18n/id/LC_MESSAGES/ckan.mo
    A ckan/i18n/id/LC_MESSAGES/ckan.po
    A ckan/i18n/is/LC_MESSAGES/ckan.mo
    A ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    A ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    A ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    A ckan/i18n/tr/LC_MESSAGES/ckan.mo
    A ckan/i18n/tr/LC_MESSAGES/ckan.po
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    A ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    A ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.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/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/__init__.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
    A ckan/migration/versions/068_add_package_extras_index.py
    R ckan/misc.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.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/main.css
    R ckan/public/base/images/flags.png
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    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/javascript/tracking.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/group.less
    M ckan/public/base/less/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/prose.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/client.spec.js
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/primer.html
    A ckan/templates/development/snippets/actions.html
    A ckan/templates/development/snippets/context.html
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/media_grid.html
    M ckan/templates/development/snippets/nav.html
    M ckan/templates/development/snippets/page_header.html
    R ckan/templates/development/snippets/toolbar.html
    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/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.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/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/read.html
    M ckan/templates/organization/read_base.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/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/data_api_button.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_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/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/revision/read.html
    A ckan/templates/snippets/additional_info.html
    M ckan/templates/snippets/facet_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
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/new_package_form.html
    M ckan/templates_legacy/package/read_core.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_dashboard.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_dictization.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/logic/test_init.py
    M ckan/tests/logic/test_member.py
    M ckan/tests/misc/test_format_text.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    A ckan/tests/test_coding_standards.py
    M ckanext/datastore/commands.py
    A ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    A ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    A 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
    R ckanext/jsonpreview/__init__.py
    R ckanext/jsonpreview/plugin.py
    R ckanext/jsonpreview/tests/__init__.py
    R ckanext/jsonpreview/tests/test_preview.py
    R ckanext/jsonpreview/theme/public/css/json.css
    R ckanext/jsonpreview/theme/public/preview_json.js
    R ckanext/jsonpreview/theme/public/resource.config
    R ckanext/jsonpreview/theme/templates/json.html
    M ckanext/pdfpreview/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
    A ckanext/textpreview/__init__.py
    A ckanext/textpreview/plugin.py
    A ckanext/textpreview/tests/__init__.py
    A ckanext/textpreview/tests/test_preview.py
    A ckanext/textpreview/theme/public/LICENSE
    A ckanext/textpreview/theme/public/css/text.css
    A ckanext/textpreview/theme/public/highlight.pack.js
    A ckanext/textpreview/theme/public/preview_text.js
    A ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/styles/default.css
    A ckanext/textpreview/theme/public/styles/github.css
    A ckanext/textpreview/theme/templates/text.html
    A dev-requirements.txt
    R doc/CHANGELOG.rst
    M doc/_templates/footer.html
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    M doc/apps-ideas.rst
    R doc/architecture.rst
    M doc/authorization.rst
    A doc/ckan-coding-standards.rst
    R doc/ckan.logic.action.create.rst
    R doc/ckan.logic.action.delete.rst
    R doc/ckan.logic.action.get.rst
    R doc/ckan.logic.action.update.rst
    R doc/commenting.rst
    R doc/common-error-messages.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/css-coding-standards.rst
    M doc/data-viewer.rst
    R doc/database-dumps.rst
    R doc/datastore-api.rst
    R doc/datastore-setup.rst
    M doc/datastore.rst
    M doc/deployment.rst
    A doc/documentation-guidelines.rst
    M doc/email-notifications.rst
    R doc/extension-templating.rst
    R doc/extensions.rst
    A doc/features.rst
    R doc/filestore-api.rst
    M doc/filestore.rst
    M doc/form-integration.rst
    M doc/frontend-development.rst
    R doc/frontend-testing.rst
    R doc/geospatial.rst
    A doc/getting-started.rst
    R doc/harvesting.rst
    M doc/i18n.rst
    R doc/images/1.png
    R doc/images/2.png
    R doc/images/3a.png
    R doc/images/3b.png
    R doc/images/4.png
    R doc/images/5.png
    R doc/images/6.png
    R doc/images/7.png
    R doc/images/8.png
    R doc/images/8a.png
    M doc/images/9.png
    A doc/images/admin-page.png
    R doc/images/i1.png
    R doc/images/i2.png
    R doc/images/i3.png
    R doc/images/i4.png
    R doc/images/i5.png
    R doc/images/i6.png
    R doc/images/i7.png
    R doc/images/i8.png
    R doc/images/virtualbox1-package.png
    R doc/images/virtualbox11-ubuntu.png
    R doc/images/virtualbox4-newvm.png
    R doc/images/virtualbox5-vmtype.png
    R doc/images/virtualbox6-vmloc.png
    R doc/images/virtualbox7-startvm.png
    R doc/images/virtualbox8-firstrun.png
    R doc/images/virtualbox9-iso.png
    M doc/index.rst
    R doc/install-from-package-amazon.rst
    R doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    A doc/installing.rst
    M doc/javascript-coding-standards.rst
    M doc/javascript-module-tutorial.rst
    R doc/loading-data.rst
    M doc/multilingual.rst
    R doc/organizations_and_groups.rst
    M doc/paster.rst
    R doc/post-installation.rst
    R doc/publisher-profile.rst
    R doc/publishing-datasets.rst
    M doc/python-coding-standards.rst
    R doc/release-cycle.rst
    A doc/release-process.rst
    M doc/resources.rst
    M doc/solr-setup.rst
    A doc/stats.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/theming.rst
    M doc/toolkit.rst
    M doc/tracking.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
    A doc/upgrading.rst
    M doc/writing-extensions.rst
    M fabfile.py
    R pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 744-tests-for-page-view-tracking


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

  Changed paths:
    M ckan/templates/package/base.html
    M ckan/templates/package/new_resource.html

  Log Message:
  -----------
  [#865] Adds 'Add New Resource' as breadcrumb item at the end of new_resource form breadcrumbs


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

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html

  Log Message:
  -----------
  [#858] Whitespace cleanup on ckan/templates/activity_streams/activity_stream_items.html


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

  Changed paths:
    M ckan/templates/admin/base.html

  Log Message:
  -----------
  [#858] Whitespace cleanup for ckan/templates/admin/base.html


  Commit: 4999722de4706bbaff0086a2dbfd070e808377fa
      https://github.com/okfn/ckan/commit/4999722de4706bbaff0086a2dbfd070e808377fa
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/admin/config.html

  Log Message:
  -----------
  [#858] Whitespace cleanup for ckan/templates/admin/config.html


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

  Changed paths:
    M ckan/templates/dataviewer/base.html

  Log Message:
  -----------
  [#858] Whitespace cleanup for ckan/templates/dataviewer/base.html


  Commit: 1c20c12ff3f9aa5e8b6b9cd6c87ba84c0e164c5f
      https://github.com/okfn/ckan/commit/1c20c12ff3f9aa5e8b6b9cd6c87ba84c0e164c5f
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/dataviewer/snippets/data_preview.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/dataviewer/snippets/data_preview.html


  Commit: 325fb746730a7dc0098f99402e56909a2e4c3293
      https://github.com/okfn/ckan/commit/325fb746730a7dc0098f99402e56909a2e4c3293
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/group/admins.html

  Log Message:
  -----------
  [#858] Whitespace cleanup for ckan/templates/group/admins.html


  Commit: 0a0e3c0d5caf6d598eacc1e7fe7e4a643c6b2778
      https://github.com/okfn/ckan/commit/0a0e3c0d5caf6d598eacc1e7fe7e4a643c6b2778
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/group/base_form_page.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/group/base_form_page.html


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

  Changed paths:
    M ckan/templates/group/confirm_delete.html

  Log Message:
  -----------
  [#858] Whitespace cleanup of ckan/templates/group/confirm_delete.html


  Commit: 21f41c688b658ec2509b8281c50cb9bc85ecff54
      https://github.com/okfn/ckan/commit/21f41c688b658ec2509b8281c50cb9bc85ecff54
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/group/confirm_delete_member.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/group/confirm_delete_member.html


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

  Changed paths:
    M ckan/templates/group/followers.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/group/followers.html


  Commit: 01758564a95f5698108a34ca792ef95e59fd9313
      https://github.com/okfn/ckan/commit/01758564a95f5698108a34ca792ef95e59fd9313
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/group/history.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/group/history.html


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

  Changed paths:
    M ckan/templates/group/index.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/group/index.html


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

  Changed paths:
    M ckan/templates/group/member_new.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/group/member_new.html


  Commit: 461e7d65e27b6daf59cf06a9bdcc9a91dc68ec89
      https://github.com/okfn/ckan/commit/461e7d65e27b6daf59cf06a9bdcc9a91dc68ec89
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/group/new.html

  Log Message:
  -----------
  [#858] Whitespaces cleanup ckan/templates/group/new.html


  Commit: 7e82da910a369b0d2a673a6a19a653806864d967
      https://github.com/okfn/ckan/commit/7e82da910a369b0d2a673a6a19a653806864d967
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/group/read.html

  Log Message:
  -----------
  [#858] Whitespaces cleanup ckan/templates/group/read.html


  Commit: 3b593d8490460ab7f45d8ec08e7f95c81d6cf43f
      https://github.com/okfn/ckan/commit/3b593d8490460ab7f45d8ec08e7f95c81d6cf43f
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/home/index.html

  Log Message:
  -----------
  [#858] Whitespaces cleanup ckan/templates/home/index.html


  Commit: 785c5f4f770f9ad8536d44460a4beba6c85b0bbb
      https://github.com/okfn/ckan/commit/785c5f4f770f9ad8536d44460a4beba6c85b0bbb
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespaces cleanup ckan/templates/macros/autoform.html


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

  Changed paths:
    M ckan/templates/organization/about.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/about.html


  Commit: 39ee2eb23e5db40bdf96fe20f01b0484e5bf6554
      https://github.com/okfn/ckan/commit/39ee2eb23e5db40bdf96fe20f01b0484e5bf6554
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/organization/activity_stream.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/activity_stream.html


  Commit: 4e4c49a2812dc2a2ff87f4c6daf92d0c1170c738
      https://github.com/okfn/ckan/commit/4e4c49a2812dc2a2ff87f4c6daf92d0c1170c738
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/organization/admins.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/admins.html


  Commit: 891e401126b76549339d2873fef02b397374775e
      https://github.com/okfn/ckan/commit/891e401126b76549339d2873fef02b397374775e
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/organization/base_form_page.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/base_form_page.html


  Commit: 99a29e6a9070b95e1f14dae97f23eddf3fc0a39d
      https://github.com/okfn/ckan/commit/99a29e6a9070b95e1f14dae97f23eddf3fc0a39d
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/organization/bulk_process.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/bulk_process.html


  Commit: 6569cbb8341060909acd56c6205f6825801f7a3a
      https://github.com/okfn/ckan/commit/6569cbb8341060909acd56c6205f6825801f7a3a
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/organization/confirm_delete.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/confirm_delete.html


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

  Changed paths:
    M ckan/templates/organization/confirm_delete_member.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/confirm_delete_member.html


  Commit: 3c2fddc5e6476f610d86c634ccd32615c32b92b3
      https://github.com/okfn/ckan/commit/3c2fddc5e6476f610d86c634ccd32615c32b92b3
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/organization/index.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/index.html


  Commit: 1a1cc9b9c8ab49249a9c01a14c36b009520505e6
      https://github.com/okfn/ckan/commit/1a1cc9b9c8ab49249a9c01a14c36b009520505e6
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/organization/members.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/members.html


  Commit: 43fc5a8e313cae21389ddcf39550ca0306ae8a55
      https://github.com/okfn/ckan/commit/43fc5a8e313cae21389ddcf39550ca0306ae8a55
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/organization/read.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/read.html


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

  Changed paths:
    M ckan/templates/organization/read_base.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/organization/read_base.html


  Commit: 8e0254779584af504d282788278eb30d08f1adb1
      https://github.com/okfn/ckan/commit/8e0254779584af504d282788278eb30d08f1adb1
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/footer.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/footer.html


  Commit: 3573376720e060aebee4d3e949710081a3df933c
      https://github.com/okfn/ckan/commit/3573376720e060aebee4d3e949710081a3df933c
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/header.html


  Commit: 75cbb3c1e70b128973c19e62824fd98f50991d49
      https://github.com/okfn/ckan/commit/75cbb3c1e70b128973c19e62824fd98f50991d49
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/package/activity.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/activity.html


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

  Changed paths:
    M ckan/templates/package/activity_stream.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/activity_stream.html


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

  Changed paths:
    M ckan/templates/package/confirm_delete.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/confirm_delete.html


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

  Changed paths:
    M ckan/templates/package/confirm_delete_resource.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/confirm_delete_resource.html


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

  Changed paths:
    M ckan/templates/package/followers.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/followers.html


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

  Changed paths:
    M ckan/templates/package/history.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/history.html


  Commit: 53ef91fc04cc0297a4cca3b3b88475c6b9a1a242
      https://github.com/okfn/ckan/commit/53ef91fc04cc0297a4cca3b3b88475c6b9a1a242
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/read.html


  Commit: 6602a9f9a02bec5842b2acc8ac76ff925f862925
      https://github.com/okfn/ckan/commit/6602a9f9a02bec5842b2acc8ac76ff925f862925
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/package/read_base.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/read_base.html


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

  Changed paths:
    M ckan/templates/package/related_list.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/related_list.html


  Commit: 82677c2be5358e3a5ed6c8ca4554f9381f00b458
      https://github.com/okfn/ckan/commit/82677c2be5358e3a5ed6c8ca4554f9381f00b458
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/search.html


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

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/snippets/additional_info.html


  Commit: 4c2376ad6ecae43b14e40c81ad343fdb2aa6127c
      https://github.com/okfn/ckan/commit/4c2376ad6ecae43b14e40c81ad343fdb2aa6127c
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/snippets/info.html


  Commit: 857a663455d03460cba198de921360abc4dc0277
      https://github.com/okfn/ckan/commit/857a663455d03460cba198de921360abc4dc0277
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/snippets/package_basic_fields.html


  Commit: 945f418814dd7b3a6e70ca8776b5a6a601a7d619
      https://github.com/okfn/ckan/commit/945f418814dd7b3a6e70ca8776b5a6a601a7d619
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/snippets/package_metadata_fields.html


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

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/snippets/resource_form.html


  Commit: 634fc8718119c70b0272f878b49110c7179a3046
      https://github.com/okfn/ckan/commit/634fc8718119c70b0272f878b49110c7179a3046
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/snippets/resources_list.html


  Commit: 2ad1b5969ec93a372b7524f38e5e402c21ecd24d
      https://github.com/okfn/ckan/commit/2ad1b5969ec93a372b7524f38e5e402c21ecd24d
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/package/snippets/revisions_table.html


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

  Changed paths:
    M ckan/templates/page.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/page.html


  Commit: 892ba2ad0734c427395c1bd0169f5e56266e0d08
      https://github.com/okfn/ckan/commit/892ba2ad0734c427395c1bd0169f5e56266e0d08
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/related/base_form_page.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/related/base_form_page.html


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

  Changed paths:
    M ckan/templates/related/confirm_delete.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/related/confirm_delete.html


  Commit: 1508a68da1f84e4633687a318fc4bc5e1a99b077
      https://github.com/okfn/ckan/commit/1508a68da1f84e4633687a318fc4bc5e1a99b077
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/related/edit_form.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/related/edit_form.html


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

  Changed paths:
    M ckan/templates/revision/read.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/revision/read.html


  Commit: 36215a3e4914727cc2650a6bf7a2bb44e286d1b2
      https://github.com/okfn/ckan/commit/36215a3e4914727cc2650a6bf7a2bb44e286d1b2
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/revision/snippets/revisions_list.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/revision/snippets/revisions_list.html


  Commit: 161e4573ca7d8ee0f72ffec15a3ce957a477d6ca
      https://github.com/okfn/ckan/commit/161e4573ca7d8ee0f72ffec15a3ce957a477d6ca
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/snippets/activity_item.html


  Commit: 766a75024a90151ce8291d5bdf5d31c5630ce355
      https://github.com/okfn/ckan/commit/766a75024a90151ce8291d5bdf5d31c5630ce355
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/snippets/context/dataset.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/snippets/context/dataset.html


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

  Changed paths:
    M ckan/templates/snippets/context/group.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/snippets/context/group.html


  Commit: 5a2067732f54ac8208c2457b4b1e81878303d56d
      https://github.com/okfn/ckan/commit/5a2067732f54ac8208c2457b4b1e81878303d56d
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/snippets/context/user.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/snippets/context/user.html


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

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/snippets/disqus_trackback.html


  Commit: 2da8bf6091988d89ffdcd2d17148cadd93b266a7
      https://github.com/okfn/ckan/commit/2da8bf6091988d89ffdcd2d17148cadd93b266a7
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/snippets/follow_button.html


  Commit: 5c75219213964289b597659d92a1cad873edcb94
      https://github.com/okfn/ckan/commit/5c75219213964289b597659d92a1cad873edcb94
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/snippets/license.html


  Commit: 02d5183b4789e9b0780d37fcbb1c7da647530d31
      https://github.com/okfn/ckan/commit/02d5183b4789e9b0780d37fcbb1c7da647530d31
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/snippets/private.html


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

  Changed paths:
    M ckan/templates/tag/index.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/tag/index.html


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

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/activity_stream.html


  Commit: 55646fad517c5ac337426198382194f4c689f594
      https://github.com/okfn/ckan/commit/55646fad517c5ac337426198382194f4c689f594
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/dashboard.html


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

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/edit.html


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

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/followers.html


  Commit: 03781ef72fc673181705997c09fc8a32e6336414
      https://github.com/okfn/ckan/commit/03781ef72fc673181705997c09fc8a32e6336414
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/list.html


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

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/logout_first.html


  Commit: 44ae4a503658fd7fc1663aeb093a45bf8bea6b47
      https://github.com/okfn/ckan/commit/44ae4a503658fd7fc1663aeb093a45bf8bea6b47
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

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

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/read_base.html


  Commit: 1c7880d8eaef35528466c6061e57e0f837d323c0
      https://github.com/okfn/ckan/commit/1c7880d8eaef35528466c6061e57e0f837d323c0
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/user/snippets/followee_dropdown.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/snippets/followee_dropdown.html


  Commit: 293ddf6eda9573096554e9992ac0a292281cc086
      https://github.com/okfn/ckan/commit/293ddf6eda9573096554e9992ac0a292281cc086
  Author: John Martin <me at johnmart.in>
  Date:   2013-08-06 (Tue, 06 Aug 2013)

  Changed paths:
    M ckan/templates/user/snippets/followers.html

  Log Message:
  -----------
  [#858] Whitespace cleanup ckan/templates/user/snippets/followers.html


  Commit: 4ac63579908710d08028ab57060a521e9296bcda
      https://github.com/okfn/ckan/commit/4ac63579908710d08028ab57060a521e9296bcda
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-02 (Mon, 02 Sep 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/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/feed.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/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/navl/dictization_functions.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/066_default_package_type.py
    A ckan/migration/versions/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/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/plugins/interfaces.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/dashboard.less
    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/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.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/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/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    M ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/new.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/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    A ckan/templates/organization/snippets/helper.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/search.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/stages.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/organization.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/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_tag_vocab.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/mock_plugin.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/multilingual/solr/schema.xml
    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/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
    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/install-from-source.rst
    M doc/python-coding-standards.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 pip-requirements-docs.txt
    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' of github.com:okfn/ckan into 744-tests-for-page-view-tracking


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

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

  Log Message:
  -----------
  [#744] Fix package and resource view tracking

An optimization broke the package and resource view tracking. Package
and resource dicts are now sometimes gotten from the Solr cache instead
of dictized each time, but these cached dicts may contain outdated
tracking data.

Add the tracking data to the package and resource dicts in the logic
instead of in the dictization. So the tracking data is now added after
the dictization or Solr cache retrieval, this way the tracking data is
always the latest.


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

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

  Log Message:
  -----------
  [#744] Add some TODOs to page view tracking tests


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

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

  Log Message:
  -----------
  [#714] Add a page view tracking test


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

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

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


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

  Changed paths:
    M ckan/model/package.py

  Log Message:
  -----------
  [#744] Don't add package data in Package's as_dict

This is done in the logic now


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

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  [#744] Don't add tracking data in Resource's as_dict

This is done in the logic now


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

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

  Log Message:
  -----------
  [#744] Update some tests

Now that tracking_summary is done in logic, not dictization


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

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

  Log Message:
  -----------
  [#744] Update an outdated test


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

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

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

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


  Commit: 36459a5063f32a622e44ca3aed26bb8538d5f0ed
      https://github.com/okfn/ckan/commit/36459a5063f32a622e44ca3aed26bb8538d5f0ed
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-03 (Tue, 03 Sep 2013)

  Changed paths:
    M ckan/controllers/admin.py

  Log Message:
  -----------
  [#1217] Fix trash redirect for instances not at /


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

  Changed paths:
    M doc/configuration.rst

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

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


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

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

  Log Message:
  -----------
  [#744] Update an outdated test


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

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

  Log Message:
  -----------
  [#744] Update an outdated test


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

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 744-tests-for-page-view-tracking


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

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/header.html
    M ckan/templates/related/confirm_delete.html

  Log Message:
  -----------
  [#858] Small whitespace tweaks


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

  Changed paths:
    M ckan/lib/helpers.py

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


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

  Changed paths:
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  [#1214] Removed unecessary closed div as it was breaking the templates


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

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

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


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

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

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

resource_delete does not work


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

  Changed paths:
    M doc/configuration.rst

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


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

  Changed paths:
    M ckan/lib/helpers.py

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

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


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

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/solr/schema-2.0.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/validators.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/activity.py
    M ckan/new_authz.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_dump.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/reclinepreview/theme/public/resource.config
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M dev-requirements.txt
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    R doc/toolkit.rst
    M doc/upgrade-source.rst
    R doc/writing-extensions.rst
    A pip-requirements-docs.txt
    A requirements.in
    M requirements.txt
    M setup.py

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


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

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

  Log Message:
  -----------
  [#1236] Changes header on sidebar to be more relevant to content


  Commit: e3c3e23a7e1c8e28fbd776e5d8c26a371ad7c76c
      https://github.com/okfn/ckan/commit/e3c3e23a7e1c8e28fbd776e5d8c26a371ad7c76c
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/plugins.py
    M ckan/logic/__init__.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/validators.py
    M ckan/new_authz.py
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    A ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/user/request_reset.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    A ckanext/example_iauthfunctions/__init__.py
    A ckanext/example_iauthfunctions/plugin.py
    A ckanext/example_iauthfunctions/plugin_v1.py
    A ckanext/example_iauthfunctions/plugin_v2.py
    A ckanext/example_iauthfunctions/plugin_v3.py
    A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M doc/api.rst
    M doc/authorization.rst
    M doc/background-tasks.rst
    M doc/ckan-coding-standards.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/documentation-guidelines.rst
    A doc/extensions/best-practices.rst
    A doc/extensions/converters.rst
    A doc/extensions/index.rst
    A doc/extensions/plugin-interfaces.rst
    A doc/extensions/plugins-toolkit.rst
    A doc/extensions/testing-extensions.rst
    A doc/extensions/tutorial.rst
    A doc/extensions/validators.rst
    M doc/index.rst
    M doc/tag-vocabularies.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 744-tests-for-page-view-tracking


  Commit: b8eecf1967144a218c703853d75d24aaec5d673c
      https://github.com/okfn/ckan/commit/b8eecf1967144a218c703853d75d24aaec5d673c
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/package.py
    M ckan/model/resource.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch '744-tests-for-page-view-tracking'


  Commit: 1f560e98c5f66528b49d74f4bee9d4e048dca76c
      https://github.com/okfn/ckan/commit/1f560e98c5f66528b49d74f4bee9d4e048dca76c
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M ckan/templates/package/base.html
    M ckan/templates/package/new_resource.html

  Log Message:
  -----------
  Merge pull request #865 from okfn/865-add-resource-breadcrumbs

Add resource screen breadcrumb incorrect


  Commit: 490624a752d9aee8c971e009edb017902c24a506
      https://github.com/okfn/ckan/commit/490624a752d9aee8c971e009edb017902c24a506
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-20 (Fri, 20 Sep 2013)

  Changed paths:
    M ckan/controllers/admin.py

  Log Message:
  -----------
  Merge pull request #1217 from okfn/1217-trash-redirect

Trash purge action redirect broken for CKAN instances not at /


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

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.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/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.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/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html

  Log Message:
  -----------
  Merge pull request #858 from okfn/858-template-whitespace-cleanup

Template whitespace cleanup


  Commit: 3d592d3e12b306d0585f8734c098363653e3fba9
      https://github.com/okfn/ckan/commit/3d592d3e12b306d0585f8734c098363653e3fba9
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  Merge pull request #1214 from okfn/1214-add_member_page

Sidebar displaced on Add members page


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

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

  Log Message:
  -----------
  Merge pull request #1236 from okfn/1236-forgotten-password-string-change

Forgotten details or password?


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

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.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/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/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/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1243

Conflicts:
	ckan/tests/logic/test_action.py


Compare: https://github.com/okfn/ckan/compare/21c21df96560...6948349af645


More information about the ckan-changes mailing list