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

GitHub noreply at github.com
Tue Oct 22 17:48:32 UTC 2013


  Branch: refs/heads/1251-resource-view
  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: 759c0d86b38cc0c5f921cc38b57d713665c5fe50
      https://github.com/okfn/ckan/commit/759c0d86b38cc0c5f921cc38b57d713665c5fe50
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-12 (Wed, 12 Jun 2013)

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

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


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

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

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

Spaces, not tabs. Also fix random indentation.


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

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

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

This should not have been committed


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

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

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

There's probably a lot more to mention here.


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

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

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


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

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

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

These are needed for the extension to load successfully.


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

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

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

Put it in the same place as example_idatasetform etc.


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

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

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

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


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

  Changed paths:
    M doc/writing-extensions.rst

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


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

  Changed paths:
    R ckanext/examples/__init__.py

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


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

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

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

Lots of minor edits


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

  Changed paths:
    M doc/conf.py

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


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

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

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


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

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

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


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

  Changed paths:
    M doc/writing-extensions.rst

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


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

  Changed paths:
    M doc/writing-extensions.rst

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


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

  Changed paths:
    A .coveragerc
    M .travis.yml
    M bin/travis-build

  Log Message:
  -----------
  Add coverage reports with coveralls


  Commit: 73308db08242a6a2ee72079b6cc87ce4b0705761
      https://github.com/okfn/ckan/commit/73308db08242a6a2ee72079b6cc87ce4b0705761
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    A ckan/new_tests/__init__.py
    A ckan/new_tests/data.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add new_tests dir with first new logic tests

Eventually (before this branch is merged into master) new_tests should
become tests and the current tests should become legacy_tests.


  Commit: 3491cd695ec0c9758586d219c027165256fd7012
      https://github.com/okfn/ckan/commit/3491cd695ec0c9758586d219c027165256fd7012
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add new tests for updating user names and passwords

...and also for what happens when you call user_update without a valid
id.


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

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1117] user_update don't crash on non-string name

Don't crash if the user tries to update their user name to a value that
is not a string (which they can do, using the API)


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

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1117] user_update: don't crash on non-string password

Fix a crash that happens if the user tries to update their password to a
value that isn't a string (which they can do, using the API)


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

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


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

  Changed paths:
    M ckan/new_tests/data.py
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Make various improvements to test_update.py

- Add some notes to the top of test_update.py about what I'm trying to do with
  it, these will end up in the testing guidelines
- Make the static test data read-only
- Rename some of the test methods so that they're all test_user_update_*
- Add test_user_update_activity() test
- Other small tweaks


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add some more user_update invalid password tests


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Fix some bad indentation


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add user_update custom schema test


  Commit: 6276cb2e143bef2e108dc4c612c32832926f9b79
      https://github.com/okfn/ckan/commit/6276cb2e143bef2e108dc4c612c32832926f9b79
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add test for user_update's defer_commit option


  Commit: 482c4969afb32d796c231839d2d794d28daf90ae
      https://github.com/okfn/ckan/commit/482c4969afb32d796c231839d2d794d28daf90ae
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-19 (Fri, 19 Jul 2013)

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py
    A doc/testing-coding-standards.rst

  Log Message:
  -----------
  [#1117] Add draft testing coding standards doc


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

  Changed paths:
    A ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1117] Add a few new-style tests for user_update auth


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

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1117] Never return reset_keys in user dicts

Like the user's password, there's never any reason for a user dict to
contain their reset key (even if the user dict is being generated for
the user herself or for a sysadmin)


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

  Changed paths:
    M ckan/lib/navl/validators.py
    A ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Add docstring and unit tests for ignore_missing validator


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Add another ignore_missing test


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Add some asserts to ignore_missing tests


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Tweak a unit test


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Combine three unit tests into one


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Improve a unit test

Add some more realistic data and check that it doesn't get modified.


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Move some unit test code into helper functions


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Tweak a couple of docstrings


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Move some test comments into asserts

This makes the output when tests fail more useful

Unfortunately I don't see how to do this with assert_raises.


  Commit: 2f8e74a0e2bb39c2fec1bf9604ab6ada764c1f2b
      https://github.com/okfn/ckan/commit/2f8e74a0e2bb39c2fec1bf9604ab6ada764c1f2b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Tweak a docstring

This is easier to read I think


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Make a unit test more realistic

Make it use the _data() and _errors() helper functions to get more
realistic (non-empty) data and errors dicts. This just makes the test a
little more thorough and realistic.


  Commit: 404f06e778c6b9f2de8dea44c241769a598f2e7a
      https://github.com/okfn/ckan/commit/404f06e778c6b9f2de8dea44c241769a598f2e7a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Add new tests and docstring for name_validator()

There are no existing tests for this that I can see.


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Add a valid unicode name to name_validator() test


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Move some validator tests into the right test module

Oops :)


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

  Changed paths:
    M ckan/new_tests/data.py
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Move some helpers into shared test helper data module


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

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Add unit tests for user_name_validator()


  Commit: 807b601f3ade09aac3f0ef0d530e947774e93975
      https://github.com/okfn/ckan/commit/807b601f3ade09aac3f0ef0d530e947774e93975
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Fix user_password validator

Commit f3165ce (user_update: don't crash on non-string password)
unwittingly changed the behavior of user_password_validator(), causing
some legacy tests to fail:

If the given password is Missing or '' user_password_validator() should
*not* raise Invalid.

Fiux user_password_validator to not raise Invalid in these cases, so
that the tests pass again.


  Commit: 51cd5d18c4005f469c6052a6bddc3275b6373cde
      https://github.com/okfn/ckan/commit/51cd5d18c4005f469c6052a6bddc3275b6373cde
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M ckan/new_tests/data.py

  Log Message:
  -----------
  [#1117] Tweak a docstring


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

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#1117] Refactor and add docstring to user_name_validator

- Add docstring

- Use model.User.get() to find whether a user exists, instead of a lot
  of SQLAlchemy in ckan.logic.

  This should make it easier to unit test user_name_validator() in
  isolation, because the tests will only have to mock one method
  ckan.model.User.get() instead of having to mock several things.

  Also SQLAlchemy should just be in the model anyway, not in the logic.

- Refactor and add code comments to clarify the obscure thing that
  user_name_validator() does with context['user_obj'] on user_update()s.

  This was completely obscure before, now hopefully it's clearer.
  (But it's a bad design anyway, user_create and user_update shouldn't
  be sharing the same user_name_validator function.)

I don't *think* I broke anything by refactoring this (tests
are still passing).


  Commit: 93d0d819cc68cc3e84b472eefdf4fa3f26f32c07
      https://github.com/okfn/ckan/commit/93d0d819cc68cc3e84b472eefdf4fa3f26f32c07
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Mock ckan.model in user_name_validator() tests

Now that user_name_validator() has been refactored to call
model.User.get() instead of doing its own SQLAlchemy (commit c6b953),
it's really easy to mock ckan.model in the user_name_validator() unit
tests by just mocking the single method ckan.model.User.get().

This means the user_name_validator() unit tests no longer touch the disk
or db or bring in ckan.model.


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

  Changed paths:
    A ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add factory_boy to action tests

Add a new module ckan.new_tests.factories with (so far) just a User factory
class that uses the factory_boy library to create CKAN users.

Update the ckan.new_tests.logic.action.test_update tests to use this
factory instead of ckan.new_tests.data.

Still need to update the rest of the new tests to use the factory (and
also add factories for other classes such as dataset etc.), then data.py
can be deleted.

Still need to add factory_boy to dev-requirements.txt.


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

  Changed paths:
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1117] Use factory in auth/test_update.py

Instead of data.py.


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

  Changed paths:
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Remove data.py from test_validators.py

Move the helper functions it was using into factories.py and make it use
that instead.


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

  Changed paths:
    R ckan/new_tests/data.py
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Use factories instead of data in navl/test_validators.py

So data.py is now unused and we can remove it.


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

  Changed paths:
    M ckan/public/base/less/homepage.less
    M ckan/templates/home/index.html
    A ckanext/homepage/__init__.py
    A ckanext/homepage/plugin.py
    A ckanext/homepage/theme/templates/home/index.html
    A ckanext/homepage/theme/templates/home/snippets/featured_group.html
    A ckanext/homepage/theme/templates/home/snippets/featured_organization.html
    A ckanext/homepage/theme/templates/home/snippets/promoted.html
    A ckanext/homepage/theme/templates/home/snippets/search.html
    M setup.py

  Log Message:
  -----------
  [#1126] First run at new homepage modules core extension


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

  Changed paths:
    M ckan/templates/admin/config.html
    A ckanext/homepage/theme/templates/admin/config.html

  Log Message:
  -----------
  [#1126] Added config for sysadmin area


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

  Changed paths:
    M ckan/public/base/less/homepage.less
    M ckan/templates/home/index.html
    M ckanext/homepage/theme/templates/home/index.html
    M ckanext/homepage/theme/templates/home/snippets/featured_group.html
    M ckanext/homepage/theme/templates/home/snippets/featured_organization.html
    M ckanext/homepage/theme/templates/home/snippets/promoted.html
    M ckanext/homepage/theme/templates/home/snippets/search.html

  Log Message:
  -----------
  [#1126] Simplified snippets and added temporary homepage layour variable


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

  Changed paths:
    M ckan/controllers/home.py
    M ckan/public/base/less/homepage.less
    R ckanext/homepage/theme/templates/home/index.html
    A ckanext/homepage/theme/templates/home/layout1.html
    A ckanext/homepage/theme/templates/home/layout2.html

  Log Message:
  -----------
  [#1126] Simplified templates for new homepage modules


  Commit: 8481935e46dd473a64d9770b7c080be2edeb979f
      https://github.com/okfn/ckan/commit/8481935e46dd473a64d9770b7c080be2edeb979f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Add some helper decorators to validators tests

Add a bunch of helper decorators at the top of the file, and change the
test methods below to use them.


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

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Add some helper decorators to validators tests

Add a bunch of helper decorators at the top of the file, and change the
test methods below to use them.


  Commit: 1f9540162c1dee8609f49fb853601d4d712ee80a
      https://github.com/okfn/ckan/commit/1f9540162c1dee8609f49fb853601d4d712ee80a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    R ckan/new_tests/data.py
    A ckan/new_tests/factories.py
    M ckan/new_tests/lib/navl/test_validators.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  Merge branch '1117-factory_boy' into 1117-start-new-test-suite


  Commit: 782fc4b166fb48e8ea1e8c5e7236e88b53950df0
      https://github.com/okfn/ckan/commit/782fc4b166fb48e8ea1e8c5e7236e88b53950df0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Remove duplicated helper decorators :/


  Commit: 1bb66d777326e9ca965c4d28bf87f35da8a97df6
      https://github.com/okfn/ckan/commit/1bb66d777326e9ca965c4d28bf87f35da8a97df6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M .tx/config
    M CONTRIBUTING.rst
    M bin/ckan_spam.py
    M bin/travis-build
    R build.sh
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/model/extension.py
    M ckan/model/modification.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    M ckan/plugins/core.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/mock_plugin.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    A doc/changelog.rst
    M doc/documentation-guidelines.rst
    M doc/templating.rst
    M doc/upgrade-source.rst
    R fabfile.py
    R jshint.json
    M setup.py
    M test-core.ini
    R test_sync.ini
    R test_sync2.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite


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

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  [#1117] Remove SQLite from testing docs


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

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  [#1117] Minor edits to testing docs


  Commit: 7a9d31a14a271d75153a0fad2dec0d21b3571c0d
      https://github.com/okfn/ckan/commit/7a9d31a14a271d75153a0fad2dec0d21b3571c0d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1117] Add mock and factory-boy to dev-requirements.txt


  Commit: 1267791442003c995110abb4b15792db9f2cbb94
      https://github.com/okfn/ckan/commit/1267791442003c995110abb4b15792db9f2cbb94
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Merge branch '1117-start-new-test-suite' of github.com:okfn/ckan into 1117-start-new-test-suite


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

  Changed paths:
    M ckan/new_tests/factories.py
    M ckan/new_tests/lib/navl/test_validators.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] PEP8 fixes

Make the PEP8 tests happy


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

  Changed paths:
    A __init__.py b/ckan/new_tests/lib/__init__.py
    A ckan/new_tests/logic/auth/__init__.py
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  [#1117] Add __init__.py files to new_tests subdirs

This means that nosetests finds the test modules when given a directory
as argument (and not just when you tell it the exact test file)


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Remove uses of assert_raises as context manager

Using assert_raises as a context manager isn't supported in Python 2.6.
Tests were failing on Travis when run with Python 2.6. Hopefully this
fixes them.


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

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_update.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Remove setup db stuff from some new test classes

Only test classes that use the db (which should be few of them) need to
do things like cleaning and initing the db. This makes the tests much
faster.


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Always use `as context` when doing `with nose.tools.assert_raises`

It looks like `with nose.tools.assert_raises:` without the `as context`
doesn't work in Python 2.6. In commit 135c59b3de2d518643d94ea I thought
it was the other way round. Hopefully *this* fixes the tests with Python
2.6.


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Don't use `with nose.tools.assert_raises`

Third attempt to fix the new tests in Python 2.6. Looks like using
assert_raises as a context manager doesn't work in Python 2.6 at all.
Just use nose.tools.assert_raises(...) normally instead.


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

  Changed paths:
    M ckan/ckan_nose_plugin.py

  Log Message:
  -----------
  [#1117] Skip ckan_nose_plugin's db stuff for new tests


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

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

  Log Message:
  -----------
  [#1117] Remove a legacy test for ignore_missing

ignore_missing() unit tests in ckan/new_tests/ have replaced this now.


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add a new test for updating multiple user attributes at once


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add another condition to a user_update test


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add a test for user_update's annoying email behavior


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Add tests that user_update doesn't return password, apikey, etc.


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

  Changed paths:
    M ckan/new_tests/logic/action/test_update.py

  Log Message:
  -----------
  [#1117] Fix silly test class name


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

  Changed paths:
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1117] Remove legacy user_update tests

These have been replaced by new-style tests in ckan/new_tests/


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

  Changed paths:
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1117] Add mocking to user_update auth tests

These tests now run without touching the model.

Also added one extra test case.


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

  Changed paths:
    M ckan/new_tests/helpers.py
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1117] Move call_auth() into test helpers

Where other auth test modules can use it.

Also add a complete docstring.


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

  Changed paths:
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1117] Check error messages in user_update auth tests


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

  Changed paths:
    M ckan/new_tests/helpers.py

  Log Message:
  -----------
  [#1117] Optimize the reset_db() test helper function

This version is faster. Code from @joetsoi


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

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Remove an unused import


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Add helper decorators to navl/test_validators.py


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

  Changed paths:
    M CONTRIBUTING.rst
    A ckan/new_tests/controllers/__init__.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    M ckan/new_tests/lib/__init__.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/__init__.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M doc/multilingual.rst
    M doc/testing-coding-standards.rst

  Log Message:
  -----------
  [#1117] Lots of work on the testing coding standards


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

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

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite


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

  Changed paths:
    M ckan/new_tests/logic/auth/__init__.py

  Log Message:
  -----------
  [#1117] PEP8


  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: 669aefb71e7d4c5b72366c5dbae60d4f45bf313a
      https://github.com/okfn/ckan/commit/669aefb71e7d4c5b72366c5dbae60d4f45bf313a
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-08-11 (Sun, 11 Aug 2013)

  Changed paths:
    M ckan/new_tests/helpers.py

  Log Message:
  -----------
  [#1117] use model.repo.delete_all() in test helpers


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

  Changed paths:
    M doc/writing-extensions.rst

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


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

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

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

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

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

get_action() was already doing this for action functions.


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

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

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


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

  Changed paths:
    M doc/api.rst

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


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

  Changed paths:
    M doc/api.rst

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

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


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

  Changed paths:
    M doc/writing-extensions.rst

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


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

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

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

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


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

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

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

It doesn't work in Python 2.6


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

  Changed paths:
    M ckan/lib/cli.py

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


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

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

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


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

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

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


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

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

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


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/delete.py
    A ckan/migration/versions/070_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  [#1163] Users can be deleted

To do this, I've configured the User model to be stateful using vdm.sqlalchemy.
Right now, there're two states: active and deleted. If a user is deleted, he
can't login, and is unauthorized to do anything. She also doesn't appear in the
user's list anymore, but you can still access her profile page, if you know her
username.

If she was logged in when her user was deleted, the next time she goes into
CKAN, she'll be logged off. Unfortunately, there's not a useful message like
"Your user has been deleted." Yet.

There's no way to undelete a user, but it should be simply creating an
action to set her state to active.


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/migration/versions/070_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py

  Log Message:
  -----------
  [#1163] Use ckan.model.State instead of vdm.sqlalchemy.State

This makes us a bit less tied to vdm.


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

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/migration/versions/070_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py

  Log Message:
  -----------
  [#1163] Use ckan.model.core.State instead of ckan.model.State

With this change, we're able to avoid having to load ckan.model inside methods,
to avoid circular dependencies.


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

  Changed paths:
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/tests/lib/test_authenticator.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  [#1178] Add PENDING state to User


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

  Changed paths:
    M ckan/controllers/user.py
    M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [#1178] The user is activated when it performs the reset password


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

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M dev-requirements.txt

  Log Message:
  -----------
  [#1178] Admins can invite users

The invited user starts in pending state, with the password reset key set. We
still have to send an email to the user telling him/her to change the password
and log in.

I had to change authorization code to only automatically unauthorize deleted
users, not pending. This was because the users needs to be able to perform the
password reset when pending, to be able to become active.


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

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1178] perform_reset uses the received id as the context's user

When performing a password reset, the user is probably (always?) not logged in.
So c.user is an empty string. So, the auth functions have no way to tell which
user is trying to reset his/her password.

This worked fine before, because everyone was able to reset the password. But
now that we've got users in DELETED state, it's not the case anymore.


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

  Changed paths:
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1178] Send email to the invited user

I removed the time.sleep(0.1) on TestMailer. Looking through the code, I
couldn't find anywhere where a timer looked needed. And I ran these tests a
hundred times without the timer to see if I could make them fail, but no. So, I
guess they're not needed anymore.

I also had to move the RESET_LINK_MESSAGE inside get_reset_link_body(). This
was because, when importing ckan.lib.mailer in ckan.logic.action.create.py, I
got:

    TypeError: No object (name: translator) has been registered for this thread

This seems to be because we were using _() before pylons had a change to set up
the translator. Moving it inside the method solves this.


  Commit: f2f9095926e143ef7a1fe46f613c88bbf1096478
      https://github.com/okfn/ckan/commit/f2f9095926e143ef7a1fe46f613c88bbf1096478
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-20 (Tue, 20 Aug 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/model/user.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py

  Log Message:
  -----------
  [#1178] Adds user to organization when inviting, and only org admins can invite


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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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


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

  Changed paths:
    M .gitmodules
    A .pipignore
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M LICENSE.txt
    M bin/ckan_edit_local.py
    M bin/ckan_spam.py
    M bin/travis-build
    R build.sh
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema-2.0.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    A ckan/i18n/ar/LC_MESSAGES/ckan.mo
    A ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    A ckan/i18n/km/LC_MESSAGES/ckan.mo
    A ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/activity_streams.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/066_default_package_type.py
    A ckan/migration/versions/068_add_package_extras_index.py
    A ckan/migration/versions/069_resource_url_and_metadata_modified.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/activity.py
    M ckan/model/extension.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_relationship.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    A ckan/public/base/javascript/modules/dataset-visibility.js
    A ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/related-item.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/slug-preview.js
    A ckan/public/base/javascript/plugins/jquery.masonry.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/ajax_snippets/related-item.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/group_list.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/stages.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/related/dashboard.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/related/snippets/related_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/dashboard_datasets.html
    A ckan/templates/user/dashboard_groups.html
    A ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/resource_read.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    A ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_email_notifications.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/mock_plugin.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_package_relationships.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/plugin.py
    M ckanext/pdfpreview/tests/test_preview.py
    M ckanext/pdfpreview/theme/public/resource.config
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ar/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ca/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/cs/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/da/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/de/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/el/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/en-US/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/es/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/fr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/he/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/it/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ja/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ko/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/locale.properties.js
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/lt/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/nl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pl/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/pt-BR/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ro/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/ru/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/sv/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/tr/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/vi/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-CN/viewer.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/chrome.properties
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/metadata.inc
    A ckanext/pdfpreview/theme/public/vendor/l10n/zh-TW/viewer.properties
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/debugger.min.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/loading-small.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/shadow.png
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/locale.properties.js
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.css
    M ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    M ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    M ckanext/pdfpreview/theme/templates/pdf.html
    M ckanext/reclinepreview/tests/test_preview.py
    M ckanext/reclinepreview/theme/public/preview_recline.js
    M ckanext/reclinepreview/theme/public/resource.config
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
    M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/test_tag_vocab_plugin.py
    M ckanext/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    A dev-requirements.txt
    A doc/changelog.rst
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/installing.rst
    M doc/paster.rst
    M doc/release-process.rst
    R doc/releases.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/toolkit.rst
    A doc/upgrade-package-ckan-1-to-2.rst
    A doc/upgrade-package-to-minor-release.rst
    A doc/upgrade-package-to-patch-release.rst
    A doc/upgrade-source.rst
    R doc/upgrading-a-package-install.rst
    R doc/upgrading-a-source-install.rst
    A doc/upgrading.rst
    R fabfile.py
    R jshint.json
    M pip-requirements-docs.txt
    R pip-requirements-test.txt
    R pip-requirements.txt
    A requirements.in
    A requirements.txt
    M setup.py
    M test-core.ini
    R test_sync.ini
    R test_sync2.ini

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

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


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

  Changed paths:
    M ckan/logic/__init__.py

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

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


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

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

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

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

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


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

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

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

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

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

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


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

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

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


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

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

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


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

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

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

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


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

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

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


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

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

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


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

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

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

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

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

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


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

  Changed paths:
    M ckan/lib/base.py

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

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


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

  Changed paths:
    M ckan/lib/cli.py

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

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


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

  Changed paths:
    M ckan/lib/helpers.py

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

Everything in the template helpers module should have a docstring.


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

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

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

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


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

  Changed paths:
    M ckan/lib/plugins.py

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


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

  Changed paths:
    M ckan/logic/__init__.py

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

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


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

  Changed paths:
    M ckan/plugins/toolkit.py

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

Everything in the plugins toolkit should have a docstring.


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

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

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


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

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

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

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

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


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

  Changed paths:
    M ckanext/homepage/plugin.py
    M ckanext/homepage/theme/templates/home/snippets/featured_group.html
    M ckanext/homepage/theme/templates/home/snippets/featured_organization.html

  Log Message:
  -----------
  [#1126] Brings featured groups/orgs from from be06121 into this branch

It's just a slightly edited version of
https://github.com/okfn/ckan/blob/be06121/ckanext/featured/plugin.py as now
the helpers are returning data and not data+html.


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

  Changed paths:
    M .tx/config
    M CHANGELOG.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/feed.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/dictization/model_dictize.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    A ckan/migration/versions/069_resource_url_and_metadata_modified.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/activity.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/snippets/activity_item.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/models/test_package.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
    M ckanext/multilingual/solr/schema.xml
    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 dev-requirements.txt
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-source.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
    A pip-requirements-docs.txt
    A requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 1117-start-new-test-suite


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

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

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

But the different parts into different pages


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

  Changed paths:
    M doc/authorization.rst

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


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

  Changed paths:
    M doc/extensions/tutorial.rst

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


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

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

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


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

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

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

It wasn't very good


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

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

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


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

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

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


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

  Changed paths:
    M ckan/logic/__init__.py

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


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

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

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

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


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

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

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


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

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

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


  Commit: b75524ee9b74166428555c6c5f76db7f58c67f14
      https://github.com/okfn/ckan/commit/b75524ee9b74166428555c6c5f76db7f58c67f14
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-29 (Thu, 29 Aug 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/model/user.py
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py

  Log Message:
  -----------
  [#1178] Invite user on add member to organization/group

I've added an "Email" field to the "Add Member" to Organization/Group page. If
you add an e-mail there, we'll create a new user and invite her (doesn't matter
if there's already a user with the same email).

I still need to change the template and add help texts.


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

  Changed paths:
    M ckan/plugins/toolkit_sphinx_extension.py

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


  Commit: 1503ffa654d2d09dfe7de9333622c9e1edd9564a
      https://github.com/okfn/ckan/commit/1503ffa654d2d09dfe7de9333622c9e1edd9564a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-31 (Sat, 31 Aug 2013)

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/solr/schema-2.0.xml
    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/dictization/model_dictize.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/model/activity.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/snippets/activity_item.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/reclinepreview/theme/public/resource.config
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/python-coding-standards.rst
    M doc/test.rst
    M doc/upgrade-source.rst
    A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 1178-users-invitations


  Commit: 89db2ed23ca5cb0136a44d2829f2e713f2b2558d
      https://github.com/okfn/ckan/commit/89db2ed23ca5cb0136a44d2829f2e713f2b2558d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-08-31 (Sat, 31 Aug 2013)

  Changed paths:
    R ckan/migration/versions/070_add_state_column_to_user_table.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py

  Log Message:
  -----------
  [#1178] Move migration from 070 to 071, as we have a new 070


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

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

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

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


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

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

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


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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/model/activity.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/logic/test_action.py
    A ckan/tests/models/test_activity.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst
    A pip-requirements-docs.txt

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


  Commit: 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: bf28f1a1a1a0b05fb17f4e8b3e5684f199120709
      https://github.com/okfn/ckan/commit/bf28f1a1a1a0b05fb17f4e8b3e5684f199120709
  Author: kindly <kindly at gmail.com>
  Date:   2013-09-05 (Thu, 05 Sep 2013)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/templates/admin/config.html
    M ckanext/homepage/plugin.py
    R ckanext/homepage/theme/templates/admin/config.html

  Log Message:
  -----------
  add stats and make homepage_style config option


  Commit: 87d0b8b520e1f4860bec04b2a6e5edd67a40b33e
      https://github.com/okfn/ckan/commit/87d0b8b520e1f4860bec04b2a6e5edd67a40b33e
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-06 (Fri, 06 Sep 2013)

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

  Log Message:
  -----------
  [#1228] strip whitespace from title in model_dictize.package_dictize


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

  Changed paths:
    M doc/extensions/tutorial.rst

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


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

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

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

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


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

  Changed paths:
    M doc/extensions/tutorial.rst

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

We're not sure what it's for anyway


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

Fixes #1231


  Commit: 40397fe5c9bd0e2703f0d4e26227863c6cbc6b4a
      https://github.com/okfn/ckan/commit/40397fe5c9bd0e2703f0d4e26227863c6cbc6b4a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  [#1178] Add help text to the add member forms


  Commit: 08c45188a91f64d121f0d7ed753e461de7df277d
      https://github.com/okfn/ckan/commit/08c45188a91f64d121f0d7ed753e461de7df277d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

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

  Log Message:
  -----------
  Merge branch 'master' into 1178-users-invitations


  Commit: 0f710ac9888b83977641d082eddf59be97023592
      https://github.com/okfn/ckan/commit/0f710ac9888b83977641d082eddf59be97023592
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

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

  Log Message:
  -----------
  Merge branch 'master' into 1178-users-invitations


  Commit: 2adda64767ea178e558ccd6844b84efe267a6dcf
      https://github.com/okfn/ckan/commit/2adda64767ea178e558ccd6844b84efe267a6dcf
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M ckan/migration/versions/071_add_state_column_to_user_table.py

  Log Message:
  -----------
  [#1178] Fix typo exeecute -> execute in migration


  Commit: 6327e2454ae5a98df9e71ecd27725aa0ea9f2e2d
      https://github.com/okfn/ckan/commit/6327e2454ae5a98df9e71ecd27725aa0ea9f2e2d
  Author: Ian Ward <ian at excess.org>
  Date:   2013-09-09 (Mon, 09 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#772] explaion plugin loading order


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

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

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


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

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

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


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

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

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

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


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

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

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

Breadcrumbs on password reset page links to register


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

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/controllers/home.py
    M ckan/public/base/less/homepage.less
    M ckanext/homepage/theme/templates/home/layout2.html
    A ckanext/homepage/theme/templates/home/layout3.html
    A ckanext/homepage/theme/templates/home/snippets/stats.html

  Log Message:
  -----------
  [#1126] Added stats and new layouts 2 and 3 for homepage


  Commit: 569987d68ef1d4c63d71e48eb12a798cac57a59f
      https://github.com/okfn/ckan/commit/569987d68ef1d4c63d71e48eb12a798cac57a59f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

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

  Log Message:
  -----------
  [#1235] Add image block to be able to replace only the image easily


  Commit: 50acd34cb95d73adb7213d2c6be54fe4ff71e2a0
      https://github.com/okfn/ckan/commit/50acd34cb95d73adb7213d2c6be54fe4ff71e2a0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  [#1235] Add block for content of container to allow people to add something to the left of the account block


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

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

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

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

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


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

  Changed paths:
    M ckan/logic/__init__.py

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


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

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

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


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

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

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


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

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

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


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

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

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

Auth checks improvements for logged in users


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

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

  Log Message:
  -----------
  [#1237] Improve facet.limit search option

A negative value should be allowed if you don't want to limit the facet
values, but the search params schema didn't allow it. Also mention in
the docs that this can be set via configuration and that the default is
50. Added some tests.


  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: 2d76140db869595b83d2d501380bbe9f248192f5
      https://github.com/okfn/ckan/commit/2d76140db869595b83d2d501380bbe9f248192f5
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-11 (Wed, 11 Sep 2013)

  Changed paths:
    M ckan/public/base/less/forms.less
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  [#1178] Small CSS tweaks and fix for premature closing div


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

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

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

Minification fixes


  Commit: 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: fea743c9289371ecbbb9c2d013d8f176ed8f4b27
      https://github.com/okfn/ckan/commit/fea743c9289371ecbbb9c2d013d8f176ed8f4b27
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

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

  Log Message:
  -----------
  Fix bug in (group|organization)_member_create

According to the documentation, the "username" parameter accepts either name or
id, but the code only accepted name. I've fixed it to accept both.


  Commit: f03e409b6e8eed6633cf530ff8cf08b882d1b726
      https://github.com/okfn/ckan/commit/f03e409b6e8eed6633cf530ff8cf08b882d1b726
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#848] Fix configuration name search.facet.limits -> search.facet.limit


  Commit: 43afc32641e9d09293ebb5276f1098598770ff3a
      https://github.com/okfn/ckan/commit/43afc32641e9d09293ebb5276f1098598770ff3a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#848] extra_template_paths and extra_public_paths aren't deprecated


  Commit: fca56dceb35bae9889b2b017af0a8b38afddec15
      https://github.com/okfn/ckan/commit/fca56dceb35bae9889b2b017af0a8b38afddec15
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#848] ckan.template_footer_end is deprecated


  Commit: 2994a3c3232a8134746337ff528ff613c1844565
      https://github.com/okfn/ckan/commit/2994a3c3232a8134746337ff528ff613c1844565
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#848] Reorganize and add examples of FileStore's configuration parameters


  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: 5813ae1f4b3dd0acde1e78a21b13cc533388e8e3
      https://github.com/okfn/ckan/commit/5813ae1f4b3dd0acde1e78a21b13cc533388e8e3
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-18 (Wed, 18 Sep 2013)

  Changed paths:
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/base_form_page.html

  Log Message:
  -----------
  [#1092] Updates helper text for orgs, groups and datasets


  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: d1e8b9d40e864520ad26425eada1a7af0595390b
      https://github.com/okfn/ckan/commit/d1e8b9d40e864520ad26425eada1a7af0595390b
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

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

  Log Message:
  -----------
  [#1187] Adds source URL and version to package form


  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: 736a614980f6876d632e0724434d77f93dc7e00a
      https://github.com/okfn/ckan/commit/736a614980f6876d632e0724434d77f93dc7e00a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-09-23 (Mon, 23 Sep 2013)

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

  Log Message:
  -----------
  [#1117] Remove testing guidelines about assert messages

This is unnecessary in most cases, should be clear from the test name
(or else the test may be doing too much)


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

  Changed paths:
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/auth/test_update.py

  Log Message:
  -----------
  [#1117] Add factories.MockUser class


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Remove an unnecessary deepcopy


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Simplify a test decorator


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

  Changed paths:
    M ckan/new_tests/lib/navl/test_validators.py

  Log Message:
  -----------
  [#1117] Simplify some more test decorators


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

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Simplify some more test decorators

And also remove some duplicated test decorators


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

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/config/deployment.ini_tmpl
    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/dictization/model_dictize.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/model/package.py
    M ckan/model/resource.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/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/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/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.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 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/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    R doc/toolkit.rst
    R doc/writing-extensions.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite


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

  Changed paths:
    M ckan/new_tests/helpers.py

  Log Message:
  -----------
  [#1117] Tests use clean_db() not delete_all()

This fixes crashes when the database was not initialized or was only
partially initialized


  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: 21c21df965609e9dbfd1a20d1e01dc5d44807f34
      https://github.com/okfn/ckan/commit/21c21df965609e9dbfd1a20d1e01dc5d44807f34
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

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

  Log Message:
  -----------
  [#1243] Add tests to group_member_create.


  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


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

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

  Log Message:
  -----------
  Merge pull request #1243 from okfn/1243

(group|organization)_member_create only accepts username (and not id)


  Commit: e7db320c5f514048f18e892e3158bfe0c4c83c1f
      https://github.com/okfn/ckan/commit/e7db320c5f514048f18e892e3158bfe0c4c83c1f
  Author: Guy Sheffer <guysoft at gmail.com>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M doc/i18n.rst

  Log Message:
  -----------
  Add notes and changes to new language submission, since pull requests are not accepted anymore


  Commit: 2d46b36aa53cb96ca37c4040b514935e9abe5ced
      https://github.com/okfn/ckan/commit/2d46b36aa53cb96ca37c4040b514935e9abe5ced
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Correct typo in CHANGELOG, forntend -> frontend.


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

  Changed paths:
    M CHANGELOG.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/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.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
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.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/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 ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    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/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Merged master


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

  Changed paths:
    M ckan/templates/header.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  Merge pull request #1235 from okfn/1235-new-template-blocks

Additional template blocks needed


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

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

  Log Message:
  -----------
  [#1221] use write url for search as this uses correct priviledges


  Commit: 708da6f5979e4973113f904ad98900aeea4acbc6
      https://github.com/okfn/ckan/commit/708da6f5979e4973113f904ad98900aeea4acbc6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/logic/action/create.py
    M ckan/templates/header.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/login.html
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite


  Commit: 9147540ab8e381a41ab849239b919c19a2641a35
      https://github.com/okfn/ckan/commit/9147540ab8e381a41ab849239b919c19a2641a35
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M ckan/new_tests/controllers/__init__.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_update.py
    M doc/testing-coding-standards.rst

  Log Message:
  -----------
  [#1117] Discourage overuse of mocking

Tweak the testing guidelines to discourage overuse of mocking.


  Commit: 098ac5de1ece4a5851a2ee4cd4290847f3472aeb
      https://github.com/okfn/ckan/commit/098ac5de1ece4a5851a2ee4cd4290847f3472aeb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

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

  Log Message:
  -----------
  [#1117] Add another example to testing guidelines


  Commit: af2ed73934b49cece0920266d0dba3b025ac114e
      https://github.com/okfn/ckan/commit/af2ed73934b49cece0920266d0dba3b025ac114e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M ckan/new_tests/helpers.py
    M doc/testing-coding-standards.rst

  Log Message:
  -----------
  [#1117] Testing guidelines small tweaks


  Commit: 841ab9d9a88b70523a3cd0fad7275d0c225ab67f
      https://github.com/okfn/ckan/commit/841ab9d9a88b70523a3cd0fad7275d0c225ab67f
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-01 (Tue, 01 Oct 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/environment.py
    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/dictization/model_save.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/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.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/package.py
    M ckan/model/resource.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/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/group/snippets/group_form.html
    M ckan/templates/header.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/organization/snippets/organization_form.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/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/organization.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/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_package.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 ckan/tests/logic/test_init.py
    A ckan/tests/models/test_activity.py
    M ckan/tests/models/test_package.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
    M ckanext/datastore/tests/test_search.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-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst
    M doc/upgrade-source.rst
    M doc/upgrading.rst
    R doc/writing-extensions.rst
    A pip-requirements-docs.txt
    A requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merged master


  Commit: 7e61b82eac629c92ba04e0d9567e96b7c709f49b
      https://github.com/okfn/ckan/commit/7e61b82eac629c92ba04e0d9567e96b7c709f49b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Fix a Sphinx error


  Commit: 3fbe844985a00aee1450fd7235ba61bcf293623b
      https://github.com/okfn/ckan/commit/3fbe844985a00aee1450fd7235ba61bcf293623b
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M ckanext/homepage/plugin.py

  Log Message:
  -----------
  [#1126] Removed  because it's not used


  Commit: e7d295d27b56f3ab5252f2e090927c0a3e57ea1e
      https://github.com/okfn/ckan/commit/e7d295d27b56f3ab5252f2e090927c0a3e57ea1e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    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/dictization/model_dictize.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/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
    M ckan/model/package.py
    M ckan/model/resource.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/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/organization.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/request_reset.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 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
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1228-dictize-whitespace


  Commit: 66645627a9ac2a23cc0335e4ae3766d60e0aedc3
      https://github.com/okfn/ckan/commit/66645627a9ac2a23cc0335e4ae3766d60e0aedc3
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M ckan/new_tests/logic/test_validators.py

  Log Message:
  -----------
  [#1117] Fix an import (PEP8)


  Commit: ad55287efb4a706ad4e957bc43cf7b019ad3b3c6
      https://github.com/okfn/ckan/commit/ad55287efb4a706ad4e957bc43cf7b019ad3b3c6
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M ckan/controllers/home.py
    M ckan/lib/app_globals.py
    M ckan/lib/helpers.py
    M ckan/templates/home/index.html
    A ckan/templates/home/index_base.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    R ckanext/homepage/__init__.py
    R ckanext/homepage/plugin.py
    R ckanext/homepage/theme/templates/home/layout1.html
    R ckanext/homepage/theme/templates/home/layout2.html
    R ckanext/homepage/theme/templates/home/layout3.html
    R ckanext/homepage/theme/templates/home/snippets/featured_group.html
    R ckanext/homepage/theme/templates/home/snippets/featured_organization.html
    R ckanext/homepage/theme/templates/home/snippets/promoted.html
    R ckanext/homepage/theme/templates/home/snippets/search.html
    R ckanext/homepage/theme/templates/home/snippets/stats.html
    M doc/configuration.rst
    M setup.py

  Log Message:
  -----------
  [1126] move homepage modules into core and fix tests


  Commit: f1616290b2f96c1c5cb5ad98d3ccdfbc3e9be492
      https://github.com/okfn/ckan/commit/f1616290b2f96c1c5cb5ad98d3ccdfbc3e9be492
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M ckan/templates/home/index.html
    R ckan/templates/home/index_base.html
    M ckan/templates/home/layout1.html
    M ckan/templates/home/layout2.html
    M ckan/templates/home/layout3.html

  Log Message:
  -----------
  [#1126] Removed index_base.html and changed layouts into snippets


  Commit: 4e6625afd9890c25990cdf012d69006a74ea7f63
      https://github.com/okfn/ckan/commit/4e6625afd9890c25990cdf012d69006a74ea7f63
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/navl/validators.py
    M ckan/logic/validators.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  Merge branch '1117-start-new-test-suite'


  Commit: c339162836695677f02e9090f2ce40f6a65ad194
      https://github.com/okfn/ckan/commit/c339162836695677f02e9090f2ce40f6a65ad194
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/auth/delete.py
    M ckan/model/follower.py

  Log Message:
  -----------
  [#1178] PEP8 (and correct a comment)


  Commit: 2e0266f12003244bc32795e82a9825574b93bf72
      https://github.com/okfn/ckan/commit/2e0266f12003244bc32795e82a9825574b93bf72
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-02 (Wed, 02 Oct 2013)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/public/base/less/forms.less
    M ckan/templates/user/new_user_form.html
    A ckan/templates/user/snippets/recaptcha.html

  Log Message:
  -----------
  [#1070] Makes recaptcha work with the jinja2 templates


  Commit: 4ee4ddb84f6c4f34adfa9783e7ee531c9664a8b3
      https://github.com/okfn/ckan/commit/4ee4ddb84f6c4f34adfa9783e7ee531c9664a8b3
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#1126] PEP8 and fix typo


  Commit: c82d8e55fd8549cd5ee9c8c2d66b10de586193b6
      https://github.com/okfn/ckan/commit/c82d8e55fd8549cd5ee9c8c2d66b10de586193b6
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/helpers.py
    M ckan/public/base/less/homepage.less
    M ckan/templates/admin/config.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M doc/configuration.rst

  Log Message:
  -----------
  Merge pull request #1126 from okfn/1126-homepage-module

Homepage modules


  Commit: ae5a51c6d1765bf2d8271fa4c67a4a79ed5d8451
      https://github.com/okfn/ckan/commit/ae5a51c6d1765bf2d8271fa4c67a4a79ed5d8451
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    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

  Log Message:
  -----------
  [#1126] Update css after merge


  Commit: afc80ed59d6173a96980576fc4760702413ac8dc
      https://github.com/okfn/ckan/commit/afc80ed59d6173a96980576fc4760702413ac8dc
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  [#1259] Fixes a JS error with autocomplete module and improves UX

1. Basically adds an extra check to make sure that 'abort()' is
defined
2. Then changes the module to behave a little nicer when inbetween
ajax requests


  Commit: dcfe82da0c458870089a0b7e0e40ae60167ee273
      https://github.com/okfn/ckan/commit/dcfe82da0c458870089a0b7e0e40ae60167ee273
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.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/less/homepage.less
    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
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.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/organization.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
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.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_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into '1187-source-url-and-version-added-to-package-form'


  Commit: eddd6610e24e29a508d0f3439921d4d129540742
      https://github.com/okfn/ckan/commit/eddd6610e24e29a508d0f3439921d4d129540742
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-03 (Thu, 03 Oct 2013)

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

  Log Message:
  -----------
  Merge pull request #1187 from okfn/1187-source-url-and-version-added-to-package-form

Dataset Source (url) and Version fields missing


  Commit: 50f0d989dcae4b2f9c3ba4b24211eea0f8caed1c
      https://github.com/okfn/ckan/commit/50f0d989dcae4b2f9c3ba4b24211eea0f8caed1c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/validators.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.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/less/homepage.less
    M ckan/templates/admin/config.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1228-dictize-whitespace


  Commit: 59504d7f38e6ef35a2681451ccdaaa99de42b541
      https://github.com/okfn/ckan/commit/59504d7f38e6ef35a2681451ccdaaa99de42b541
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

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

  Log Message:
  -----------
  Merge branch '1228-dictize-whitespace'


  Commit: 958027dfd182bfaff874aff1ce1f973bf29fc016
      https://github.com/okfn/ckan/commit/958027dfd182bfaff874aff1ce1f973bf29fc016
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.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/less/homepage.less
    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
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.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/organization.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
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.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_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 848-finishing-configuration-docs


  Commit: 23ab179467aebd0c98b843b293622715c78b794f
      https://github.com/okfn/ckan/commit/23ab179467aebd0c98b843b293622715c78b794f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Merge branch '848-finishing-configuration-docs'


  Commit: 11ff9097f9bca2bbc3bf4e280f6134e477944738
      https://github.com/okfn/ckan/commit/11ff9097f9bca2bbc3bf4e280f6134e477944738
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    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/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.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
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/homepage.less
    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/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
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.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/organization.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/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.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_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    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 dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 772-document-plugin-load-order


  Commit: 70bff16b4408e614933cfaf42fdbf4d2a774ad94
      https://github.com/okfn/ckan/commit/70bff16b4408e614933cfaf42fdbf4d2a774ad94
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

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

  Log Message:
  -----------
  [#772] Clarify plugin-loading order and best practice


  Commit: 09364bedc0dd84239865befbb92805a97cd67909
      https://github.com/okfn/ckan/commit/09364bedc0dd84239865befbb92805a97cd67909
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

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

  Log Message:
  -----------
  Merge branch '772-document-plugin-load-order'


  Commit: e0e0fb5c2562ef021038cedb84aab42d89911659
      https://github.com/okfn/ckan/commit/e0e0fb5c2562ef021038cedb84aab42d89911659
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/lib/app_globals.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.py
    M ckan/logic/action/create.py
    M ckan/logic/validators.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.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/less/homepage.less
    M ckan/templates/admin/config.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/test_action.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into translation-doc-deprecated


  Commit: b6f1ff3f220b5e2198d2441261854fb398412cbc
      https://github.com/okfn/ckan/commit/b6f1ff3f220b5e2198d2441261854fb398412cbc
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M doc/i18n.rst

  Log Message:
  -----------
  Merge branch 'translation-doc-deprecated'


  Commit: 4b2c46b59bd6cb5ed1235b60e1555d776c5456b2
      https://github.com/okfn/ckan/commit/4b2c46b59bd6cb5ed1235b60e1555d776c5456b2
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

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

  Log Message:
  -----------
  [#1265] Keep visibility value on form errors

The wrong value was checked to choose the selected option.


  Commit: 96678854079906a74ce7e7a1ac195b9c18c29a00
      https://github.com/okfn/ckan/commit/96678854079906a74ce7e7a1ac195b9c18c29a00
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 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/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema-2.0.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/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/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/create.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.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
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.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/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/plugins/jquery.slug-preview.js
    R ckan/public/base/less/font-awesome.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/icons.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/test/index.html
    M ckan/public/base/test/spec/modules/custom-fields.spec.js
    M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
    M ckan/public/base/test/vendor/mocha.css
    M ckan/public/base/test/vendor/mocha.js
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/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/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/ajax_snippets/related-item.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/group/snippets/group_form.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/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/organization/snippets/organization_form.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/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/package/snippets/stages.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/organization.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/edit_user_form.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/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
    R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
    R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
    R ckan/tests/ckantestplugin/setup.cfg
    R ckan/tests/ckantestplugin/setup.py
    A ckan/tests/ckantestplugins.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_user.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
    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_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.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
    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/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfpreview/tests/test_preview.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
    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
    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
    A doc/changelog.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/i18n.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/multilingual.rst
    M doc/python-coding-standards.rst
    M doc/tag-vocabularies.rst
    M doc/templating.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    R doc/toolkit.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 doc/writing-extensions.rst
    R fabfile.py
    R jshint.json
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    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' into coveralls

Conflicts:
	bin/travis-build


  Commit: dad667eb4233b00561167db2aff41092afecfd2d
      https://github.com/okfn/ckan/commit/dad667eb4233b00561167db2aff41092afecfd2d
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  Correct encoding to make coveralls work


  Commit: a903ef999d8d67db48118ea8413595707c2e3080
      https://github.com/okfn/ckan/commit/a903ef999d8d67db48118ea8413595707c2e3080
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Add test coverage banner to readme


  Commit: 5ad2c9bc8d651c31b302499780b6926b7a798ebc
      https://github.com/okfn/ckan/commit/5ad2c9bc8d651c31b302499780b6926b7a798ebc
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-07 (Mon, 07 Oct 2013)

  Changed paths:
    M .coveragerc

  Log Message:
  -----------
  Don't cover tests files


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

  Changed paths:
    M doc/upgrade-source.rst

  Log Message:
  -----------
  [#1268] Add 'python setup.py develop' step to source upgrade instructions


  Commit: 23cfdbee2fcbc9267f66f06b6ecf9a879c92241f
      https://github.com/okfn/ckan/commit/23cfdbee2fcbc9267f66f06b6ecf9a879c92241f
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    A ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html

  Log Message:
  -----------
  [#1269] First working version of the proper IA for resources


  Commit: 48041a4e40e837f3f84ea9bb4f7cd94918daa21a
      https://github.com/okfn/ckan/commit/48041a4e40e837f3f84ea9bb4f7cd94918daa21a
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    A ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resources.html
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  [#1269] Adds resource listing page within edit dataset section

- Also tidys up the edit dataset templats
- Adds a new state to the new resource action that uses a different
template when dataset is no in draft mode (e.g. it's not part of the
dataset wizard creation any more)


  Commit: e7266eb1854a62c88414e1b412a9ae3304b7c6a1
      https://github.com/okfn/ckan/commit/e7266eb1854a62c88414e1b412a9ae3304b7c6a1
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

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

  Log Message:
  -----------
  Merge pull request #1265 from okfn/1265-visibility-field-errors

Visibility field value not kept if there are errors on the form


  Commit: 485f681f6f5d5fe890dc339d57a8563844e2fde2
      https://github.com/okfn/ckan/commit/485f681f6f5d5fe890dc339d57a8563844e2fde2
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1272] prevent keyerror when looking up 'url_type' in datastore before_show


  Commit: a8ac4a6d955fa796bdd603efa7e3768f44758431
      https://github.com/okfn/ckan/commit/a8ac4a6d955fa796bdd603efa7e3768f44758431
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-09 (Wed, 09 Oct 2013)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge pull request #1272 from okfn/1272-datastore-key-error

fix possible KeyError in before_show of datastore plugin


  Commit: b2182944f4a56d78b5942461e8d25ab4d7c18c09
      https://github.com/okfn/ckan/commit/b2182944f4a56d78b5942461e8d25ab4d7c18c09
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

  Changed paths:
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge pull request #1268 from okfn/1268-add-step-upgrade-source

Add "python setup.py develop" step to source upgrade instructions


  Commit: 16924d937af4207a585fd34eaf2be083bcc2d6d2
      https://github.com/okfn/ckan/commit/16924d937af4207a585fd34eaf2be083bcc2d6d2
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M ckan/migration/versions/071_add_state_column_to_user_table.py

  Log Message:
  -----------
  [#1178] Remove backward migrations, as we don't support it


  Commit: 0bd163e75eacc65fee0546fa356f195f1e109713
      https://github.com/okfn/ckan/commit/0bd163e75eacc65fee0546fa356f195f1e109713
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Fix repeated test name


  Commit: d073ce7f6b56361cf8c5452c2f969e4d45356437
      https://github.com/okfn/ckan/commit/d073ce7f6b56361cf8c5452c2f969e4d45356437
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Use the data returned by validate, instead of the one passed as param


  Commit: 1da817c40b59d7dfa866abd9e68ed844442f34d4
      https://github.com/okfn/ckan/commit/1da817c40b59d7dfa866abd9e68ed844442f34d4
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Move user_invite_schema to ckan.logic.schema


  Commit: c2e4f767eed6485383a7ef2efd40a8e990d0a623
      https://github.com/okfn/ckan/commit/c2e4f767eed6485383a7ef2efd40a8e990d0a623
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Refactor user name creation

I've isolated the loop where it needs to be. This makes the code clearer, but
makes it susceptible to errors. For example, after the random name was
generated but before the user is created, another user with the same name might
be created, breaking our code.

This should be rare enough to bother us.


  Commit: dfd8ae9fb07ff551707bdc08c6e23bd424c7335c
      https://github.com/okfn/ckan/commit/dfd8ae9fb07ff551707bdc08c6e23bd424c7335c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-11 (Fri, 11 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#1178] Simplify "if" expression, removing redundancy


  Commit: bae4d47c3227bd5f7581ac5859edcb9badd027c0
      https://github.com/okfn/ckan/commit/bae4d47c3227bd5f7581ac5859edcb9badd027c0
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py

  Log Message:
  -----------
  [#1178] Use model.State instead of core.State


  Commit: 31d64f3a1145894033da3061a826cbe42337d64c
      https://github.com/okfn/ckan/commit/31d64f3a1145894033da3061a826cbe42337d64c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-12 (Sat, 12 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    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/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/navl/validators.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/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/less/homepage.less
    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/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
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.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/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/organization.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/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.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_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/example_iauthfunctions/plugin.py
    M 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 dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/i18n.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    M doc/upgrade-source.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1178-users-invitations

Conflicts:
	ckan/controllers/user.py
	ckan/templates/group/member_new.html
	ckan/tests/logic/test_action.py
	dev-requirements.txt


  Commit: 3218b581443ad07cd09a93d364bf5085fb0f7884
      https://github.com/okfn/ckan/commit/3218b581443ad07cd09a93d364bf5085fb0f7884
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

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

  Log Message:
  -----------
  [#1237] Fix docstring


  Commit: 8c70cefc139df2572e72c3f24d16e2bb37a06e03
      https://github.com/okfn/ckan/commit/8c70cefc139df2572e72c3f24d16e2bb37a06e03
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

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

  Log Message:
  -----------
  Merge branch '1221-preview-fails-private-datasets'


  Commit: e6d2c45c7f34b2ec5faf8fca619f90b53449a9a2
      https://github.com/okfn/ckan/commit/e6d2c45c7f34b2ec5faf8fca619f90b53449a9a2
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

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

  Log Message:
  -----------
  Merge pull request #1237 from okfn/1237-facet.limit_improvements

'facet.limit' in package_search wrongly handled


  Commit: f5d168cd9018d68868644188dded4dd2b6b01f36
      https://github.com/okfn/ckan/commit/f5d168cd9018d68868644188dded4dd2b6b01f36
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1256] Don't load the synchronous_search plugin on cli

It is already loaded on startup


  Commit: 6431ba3dc6a117926101a97ae859132a906cf0f2
      https://github.com/okfn/ckan/commit/6431ba3dc6a117926101a97ae859132a906cf0f2
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1178] Add auth_user_obj back to context in
User controller methods.


  Commit: 4ac411b61cfae7048cdc6cc5cace42aec20a13e9
      https://github.com/okfn/ckan/commit/4ac411b61cfae7048cdc6cc5cace42aec20a13e9
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Fix typo in org member_new template


  Commit: 0f8727a31f26069561352017064c7febd9b48b2a
      https://github.com/okfn/ckan/commit/0f8727a31f26069561352017064c7febd9b48b2a
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/snippets/resource_info.html

  Log Message:
  -----------
  [#1269] Tweaks to the templates to make them better


  Commit: 322149c6934a574589f37ffe8317c444ad0885ff
      https://github.com/okfn/ckan/commit/322149c6934a574589f37ffe8317c444ad0885ff
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  [#1178] Constrain number of attempts to generate
a random user name in user_invite


  Commit: a480ace5ae73532627ad9b04cc3416f855373fc6
      https://github.com/okfn/ckan/commit/a480ace5ae73532627ad9b04cc3416f855373fc6
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  [#1178] handle edge case where _get_random_username_from_email
fails by returning the cleaned local part of the
email address. This is expected to fail
validation in user_create.


  Commit: 971026bf286aee490e8080bab715870d65b84cf7
      https://github.com/okfn/ckan/commit/971026bf286aee490e8080bab715870d65b84cf7
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  [#1263] Remove the 'clear all' from the faceter on the left nav


  Commit: db86eacac53575aade586bf3338effb852f0edf8
      https://github.com/okfn/ckan/commit/db86eacac53575aade586bf3338effb852f0edf8
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  [#1259] Remove redundant callback definition


  Commit: 306ef40efc5a29c84377e1aacbc0c77c2d758081
      https://github.com/okfn/ckan/commit/306ef40efc5a29c84377e1aacbc0c77c2d758081
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/public/base/javascript/modules/autocomplete.js

  Log Message:
  -----------
  Merge pull request #1259 from okfn/1259-autocomplete-fixes

Autocomplete JS module issues


  Commit: 3d4040da6702c8eefeecf8b77c65a1c267d262c8
      https://github.com/okfn/ckan/commit/3d4040da6702c8eefeecf8b77c65a1c267d262c8
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/public/base/less/forms.less
    M ckan/templates/group/member_new.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  Merge pull request #1178 from okfn/1178-users-invitations

Users invitations


  Commit: 31ccd35da1000e00a9ca819be7080809ea735ca9
      https://github.com/okfn/ckan/commit/31ccd35da1000e00a9ca819be7080809ea735ca9
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    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

  Log Message:
  -----------
  [#1178] Updating style (paster less) after merge


  Commit: 33c4bd5a511d60e6771523b9025f003f69ae0a70
      https://github.com/okfn/ckan/commit/33c4bd5a511d60e6771523b9025f003f69ae0a70
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#1070] Removed privatekey from app_globals


  Commit: b83048cc8958c46db04da82758d3ddf541572cfd
      https://github.com/okfn/ckan/commit/b83048cc8958c46db04da82758d3ddf541572cfd
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.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/modules/autocomplete.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/templates/admin/config.html
    M ckan/templates/group/member_new.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/i18n.rst
    M doc/multilingual.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    M doc/upgrade-source.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py

  Log Message:
  -----------
  Merged master


  Commit: d0920e946fbbf6e31241391d85bb48b7063c8687
      https://github.com/okfn/ckan/commit/d0920e946fbbf6e31241391d85bb48b7063c8687
  Author: John Glover <j at johnglover.net>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/lib/app_globals.py
    M ckan/public/base/less/forms.less
    M ckan/templates/user/new_user_form.html
    A ckan/templates/user/snippets/recaptcha.html

  Log Message:
  -----------
  Merge pull request #1070 from okfn/1070-recaptcha

Recaptcha not working in CKAN 2.0 (jinja templates)


  Commit: bf4c8e715fa7db2a3211e80a1e1e2e2f785bb54b
      https://github.com/okfn/ckan/commit/bf4c8e715fa7db2a3211e80a1e1e2e2f785bb54b
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

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

  Log Message:
  -----------
  Fix the automodule.js tests


  Commit: df45a9bc61795eaf906705a6cd195c567138b573
      https://github.com/okfn/ckan/commit/df45a9bc61795eaf906705a6cd195c567138b573
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

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

  Log Message:
  -----------
  setupAutocomplete() before testing autocomplete.lookup()


  Commit: 10d495e046adce891451821bfc7e6e52189c3ed1
      https://github.com/okfn/ckan/commit/10d495e046adce891451821bfc7e6e52189c3ed1
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

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

  Log Message:
  -----------
  Fix wrong call in autocomplete tests


  Commit: 383ab7765783661137f5ef2a89c94e48fb5f2a2c
      https://github.com/okfn/ckan/commit/383ab7765783661137f5ef2a89c94e48fb5f2a2c
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/snippets/facet_list.html

  Log Message:
  -----------
  Merge branch '1263'


  Commit: 2ce216488ab95be47ad6fbb661d349801323b2fb
      https://github.com/okfn/ckan/commit/2ce216488ab95be47ad6fbb661d349801323b2fb
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    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

  Log Message:
  -----------
  Recompile *.less files


  Commit: f75e37dc3cfa2da3948ba1eb4fcf351021c60132
      https://github.com/okfn/ckan/commit/f75e37dc3cfa2da3948ba1eb4fcf351021c60132
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M .travis.yml
    M dev-requirements.txt

  Log Message:
  -----------
  Move coveralls to dev requirements


  Commit: be09f3c08bcd5cc668b16fdb4dea73c1ec8c6134
      https://github.com/okfn/ckan/commit/be09f3c08bcd5cc668b16fdb4dea73c1ec8c6134
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  [#1266] Pin coveralls version to ==0.3


  Commit: 1e5b72fd943e60069d33ceba917e90900b951aa5
      https://github.com/okfn/ckan/commit/1e5b72fd943e60069d33ceba917e90900b951aa5
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M README.rst
    M bin/travis-build
    M ckan/config/environment.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #1266 from okfn/coveralls

Coveralls support


  Commit: a077b5897c8caa4b8c46a27281517d5aa7ca6c64
      https://github.com/okfn/ckan/commit/a077b5897c8caa4b8c46a27281517d5aa7ca6c64
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #1256 from okfn/1256-fix-create-test-data

create-test-data


  Commit: 77e321f884f0a5bd0ca1266c931d7b2fc31bbbcb
      https://github.com/okfn/ckan/commit/77e321f884f0a5bd0ca1266c931d7b2fc31bbbcb
  Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/base_form_page.html

  Log Message:
  -----------
  Merge pull request #1092 from okfn/1092-helper-text

'About datasets/orgs/groups' text is dreadful


  Commit: b31f8e077c414b40aa7b1eaf35ba7490b1c071a1
      https://github.com/okfn/ckan/commit/b31f8e077c414b40aa7b1eaf35ba7490b1c071a1
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M README.rst
    M bin/travis-build
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/mailer.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/schema.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    M ckan/templates/development/snippets/facet.html
    M ckan/templates/development/snippets/module.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    A ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M dev-requirements.txt
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch 'master' into 1269-dataset-and-resource-edit-tweaks


  Commit: 5ee2ea17ba025d33b250dd55a00e64613c0ceaf2
      https://github.com/okfn/ckan/commit/5ee2ea17ba025d33b250dd55a00e64613c0ceaf2
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_edit.html
    A ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resources.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html

  Log Message:
  -----------
  Merge branch '1269-dataset-and-resource-edit-tweaks'


  Commit: 0762a102c5aec61b67f8e6c6a0478036b92baa57
      https://github.com/okfn/ckan/commit/0762a102c5aec61b67f8e6c6a0478036b92baa57
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    M bin/travis-build
    M ckan/ckan_nose_plugin.py
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.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/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/__init__.py
    A ckan/new_tests/controllers/__init__.py
    A ckan/new_tests/factories.py
    A ckan/new_tests/helpers.py
    A ckan/new_tests/lib/__init__.py
    A ckan/new_tests/lib/navl/test_validators.py
    A ckan/new_tests/logic/__init__.py
    A ckan/new_tests/logic/action/__init__.py
    A ckan/new_tests/logic/action/test_update.py
    A ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_schema.py
    A ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/migration/__init__.py
    A ckan/new_tests/model/__init__.py
    A ckan/new_tests/plugins/__init__.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/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/module.less
    M ckan/public/base/test/spec/modules/autocomplete.spec.js
    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/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/development/snippets/facet.html
    M ckan/templates/development/snippets/module.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/group/snippets/helper.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    A ckan/templates/home/layout1.html
    A ckan/templates/home/layout2.html
    A ckan/templates/home/layout3.html
    A ckan/templates/home/snippets/featured_group.html
    A ckan/templates/home/snippets/featured_organization.html
    A ckan/templates/home/snippets/promoted.html
    A ckan/templates/home/snippets/search.html
    A ckan/templates/home/snippets/stats.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/organization/snippets/helper.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/edit.html
    A ckan/templates/package/edit_base.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/new_resource_not_draft.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
    A ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/resources.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
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.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/facet_list.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.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/edit_user_form.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/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/request_reset.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_authenticator.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_init.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.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 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/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/i18n.rst
    M doc/index.rst
    M doc/multilingual.rst
    M doc/tag-vocabularies.rst
    M doc/test.rst
    A doc/testing-coding-standards.rst
    R doc/toolkit.rst
    M doc/upgrade-source.rst
    R doc/writing-extensions.rst
    A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
    M setup.py
    M test-core.ini

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


Compare: https://github.com/okfn/ckan/compare/bbb0aed11684...0762a102c5ae


More information about the ckan-changes mailing list