[ckan-changes] [okfn/ckan] 1eb9d9: [#1011] Fix a 500 to a 404

Wed Nov 20 14:49:21 UTC 2013

  Branch: refs/heads/1030-ui-update
  Home:   https://github.com/okfn/ckan
  Commit: 1eb9d94077bd7d0dc586fefcb0d6b49042606b6c
      https://github.com/okfn/ckan/commit/1eb9d94077bd7d0dc586fefcb0d6b49042606b6c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-06-19 (Wed, 19 Jun 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#1011] Fix a 500 to a 404

Catch Genshi TemplateNotFound errors when rendering the package read
page. This can happen if an IDatasetForm plugin returns a custom package
read template, e.g. 'read.html', but the user has requested the dataset
in RDF format and the plugin does not provide a corresponding 'read.rdf'
template. (CKAN will take the path to read.html, replace the filename
extension with rdf, try to render this non-existing template file, and
crash.)

Replace this crash with a proper 404.

Add to the IDatasetForm docs, explaining how to provide RDF templates
for datasets.

Fixes #1011.

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

  Changed paths:
    M ckan/controllers/package.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [#1011] Refactor an exception raise and catch

Raise and catch a CKAN exception, instead of a Genshi one.

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

  Changed paths:
    M .gitmodules
    M .tx/config
    M CHANGELOG.rst
    M bin/ckan_edit_local.py
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/datapreview.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/plugins.py
    M ckan/lib/repoze_patch.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/model/license.py
    M ckan/model/user.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dashboard.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    A ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/admin/index.html
    M ckan/templates/footer.html
    M ckan/templates/group/about.html
    M ckan/templates/group/activity_stream.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/edit.html
    A ckan/templates/group/edit_base.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/group/read_base.html
    A ckan/templates/group/snippets/helper.html
    A ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/edit_base.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    A ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resources_list.html
    R ckan/templates/package/snippets/search_form.html
    M ckan/templates/package/snippets/tags.html
    M ckan/templates/page.html
    M ckan/templates/snippets/organization.html
    A ckan/templates/snippets/search_form.html
    M ckan/templates/user/dashboard.html
    A ckan/templates/user/dashboard_datasets.html
    A ckan/templates/user/dashboard_groups.html
    A ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/edit_base.html
    M ckan/templates/user/read_base.html
    M ckan/templates_legacy/package/resource_read.html
    A ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_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/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/textpreview/plugin.py
    M ckanext/textpreview/tests/test_preview.py
    M dev-requirements.txt
    R doc/changelog.rst
    M doc/toolkit.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1011-template-not-found

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

  Changed paths:
    M ckan/templates/package/resource_read.html
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1183] Show very simple indicator for job status on resource page

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

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

  Log Message:
  -----------
  [#1183] Fix url

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

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

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

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

  Changed paths:
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    A ckan/templates/snippets/datapusher_status.html

  Log Message:
  -----------
  [#1183] Add snippet for datapusher status indicator

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

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

  Log Message:
  -----------
  [#1183] Clean up template code

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

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

  Log Message:
  -----------
  [#1183] Only show for users who can edit resource

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

  Changed paths:
    M ckan/templates/snippets/datapusher_status.html
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1183] Don't use get_action because it will be deprecated in #1193

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

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

  Log Message:
  -----------
  [#938] Use datapusher_enabled action instead of checking whether it is enabled ourselves

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

  Changed paths:
    A ckanext/datastore/helpers.py

  Log Message:
  -----------
  [#1183] Add file that I forgot

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

  Changed paths:
    A ckanext/datastore/helpers.py

  Log Message:
  -----------
  [#1183] Add file that I forgot

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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/plugin.py
    R ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M setup.py

  Log Message:
  -----------
  [#1196] Move datapusher code into separate extension

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

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M ckan/config/middleware.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/formatters.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/update.py
    A ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/plugins/core.py
    M ckan/templates/snippets/activity_item.html
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_plugins.py
    M ckanext/reclinepreview/theme/public/resource.config
    M doc/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/test.rst
    M doc/upgrade-source.rst

  Log Message:
  -----------
  Merge branch 'master' into 1183-datapusher-status

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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/plugin.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M setup.py

  Log Message:
  -----------
  Merge branch '1196-separate-datapusher' into 1200-datastore-read-only

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

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

  Log Message:
  -----------
  [#938] Validate datapusher_submit with a schema

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

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

  Log Message:
  -----------
  [#1200] Imports and comments clean up

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

  Changed paths:
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/helpers.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

  Log Message:
  -----------
  [#1200] Do not allow writing if url_type != datastore unless force=true is passed

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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckanext/datapusher/logic/action.py
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  [#938] Prepend config option with ckan.

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

  Changed paths:
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.py
    M ckanext/datastore/tests/test_create.py

  Log Message:
  -----------
  [#1196] Move datapusher tests

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

  Changed paths:
    M ckan/templates/package/resource_read.html
    M ckan/templates/snippets/datapusher_status.html
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  [#1183] Remove datapusher_enabled action and move before_show to datstore. Instead of using the action or the template helper, check whether the plugin is enabled. Moved the action so that changing the url works even if the datapusher is disabled.

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

  Changed paths:
    M ckan/config/solr/schema-2.0.xml
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/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/templates/group/snippets/group_form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/tests/functional/test_package.py
    A ckan/tests/models/test_activity.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M dev-requirements.txt
    M doc/conf.py
    A pip-requirements-docs.txt

  Log Message:
  -----------
  Merge branch 'master' into 1200-datastore-read-only

Conflicts:
	ckanext/datastore/tests/test_create.py

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

  Changed paths:
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  PEP8

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

  Changed paths:
    M .tx/config
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M bin/ckan_spam.py
    M bin/travis-build
    R build.sh
    M ckan/config/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
    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/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
    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/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
    R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    R ckan/public/base/vendor/bootstrap/js/.jshintrc
    M ckan/public/base/vendor/bootstrap/js/bootstrap.js
    M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
    M ckan/public/base/vendor/bootstrap/less/bootstrap.less
    M ckan/public/base/vendor/bootstrap/less/dropdowns.less
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
    M ckan/public/base/vendor/font-awesome/css/font-awesome.css
    A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
    M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
    M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
    A ckan/public/base/vendor/font-awesome/less/bootstrap.less
    A ckan/public/base/vendor/font-awesome/less/core.less
    A ckan/public/base/vendor/font-awesome/less/extras.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
    M ckan/public/base/vendor/font-awesome/less/font-awesome.less
    A ckan/public/base/vendor/font-awesome/less/icons.less
    A ckan/public/base/vendor/font-awesome/less/mixins.less
    A ckan/public/base/vendor/font-awesome/less/path.less
    A ckan/public/base/vendor/font-awesome/less/variables.less
    M ckan/public/base/vendor/jquery.js
    M ckan/public/base/vendor/resource.config
    M ckan/templates/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/snippets/activity_item.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_activity.py
    M ckan/tests/functional/api/test_revision_search.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_preview_interface.py
    M ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/mock_plugin.py
    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_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/documentation-guidelines.rst
    M doc/install-from-source.rst
    M doc/templating.rst
    M doc/test.rst
    M doc/upgrade-package-to-minor-release.rst
    M doc/upgrade-package-to-patch-release.rst
    M doc/upgrade-source.rst
    M doc/upgrading.rst
    R fabfile.py
    R jshint.json
    A 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 1011-template-not-found

Conflicts:
	ckan/lib/base.py

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

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  [#1011] Fix a broken import in the package controller

An exception was not getting caught because of the way this import was
done.

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

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#1011] base.py: Explicitly re-raise TemplateNotFound

Functions should not implicitly raise exceptions by failing to catch
exceptions raised by functions that they call, they should explicitly
catch and re-raise the exceptions instead.

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

  Changed paths:
    M ckan/controllers/template.py

  Log Message:
  -----------
  [#1011] Update some exception handling in template.py

Catch the new ckan.lib.render.TemplateNotFound exception that render()
now raises, not the Genshi exception it used to.

  Commit: 52c93774c83b13cbfa98107cba87aed6ad9d1b13
      https://github.com/okfn/ckan/commit/52c93774c83b13cbfa98107cba87aed6ad9d1b13
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-04 (Wed, 04 Sep 2013)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  [#1224] propogate the NotAuthorized exception extra messages to api

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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/auth/create.py
    M ckan/new_authz.py
    M ckan/templates/header.html
    M ckan/templates/user/login.html
    M test-core.ini

  Log Message:
  -----------
  New option to disable user creation via web

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

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Add documentation for new config option

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

  Changed paths:
    M ckan/logic/auth/create.py
    M doc/configuration.rst

  Log Message:
  -----------
  Fix docs, remove deprecated comment

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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/plugins/interfaces.py
    M ckan/tests/logic/test_action.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/plugin.py
    M doc/configuration.rst
    M doc/data-viewer.rst
    M doc/datastore.rst
    M doc/documentation-guidelines.rst
    M doc/python-coding-standards.rst

  Log Message:
  -----------
  1200 fix merge issues with master, plus plugin fix

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

  Changed paths:
    M ckan/model/meta.py
    M ckan/plugins/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  [1200] add defaults and make sure datapusher down does not cause errors

  Commit: 55ed1ef2b6d4eca22c324ddf627eb7fe1e0a4d24
      https://github.com/okfn/ckan/commit/55ed1ef2b6d4eca22c324ddf627eb7fe1e0a4d24
  Author: amercader <amercadero at gmail.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  [#1241] Raise CkanVersionException properly

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

  Changed paths:
    M ckan/config/routing.py
    M ckan/logic/schema.py
    M ckan/templates/package/new_resource.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [#1200] make resource data page for reuploading and make error messages better

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

  Changed paths:
    M ckan/logic/action/get.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/controller.py

  Log Message:
  -----------
  [1200] pep8 and test failure fixups

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

  Changed paths:
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  [1200] fix task_staus in context

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

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    A ckan/lib/uploader.py
    M ckan/logic/schema.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html

  Log Message:
  -----------
  [1262] basic image upload functionality

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

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/uploader.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html

  Log Message:
  -----------
  [#1262] fix how url field is handled

  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: 1b62423d9d013dbc4481bbddd5a1037b49e52529
      https://github.com/okfn/ckan/commit/1b62423d9d013dbc4481bbddd5a1037b49e52529
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-08 (Tue, 08 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [1262] use logic instead of requests

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

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

  Log Message:
  -----------
  1200 make sure all users can submit job

  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: c4d673327c6b83e01ead0091246cecb83875160a
      https://github.com/okfn/ckan/commit/c4d673327c6b83e01ead0091246cecb83875160a
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-10 (Thu, 10 Oct 2013)

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

  Log Message:
  -----------
  [#1262] fix test failures

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

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  [#1267] fix url for by faking routes threadlocal

  Commit: 5023e0c3354ca03475b06ee11a3e47f867adedaf
      https://github.com/okfn/ckan/commit/5023e0c3354ca03475b06ee11a3e47f867adedaf
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-13 (Sun, 13 Oct 2013)

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

  Log Message:
  -----------
  Don't exempt sysadmins

  Commit: 878772cfc37932805cca58439150d702506fe043
      https://github.com/okfn/ckan/commit/878772cfc37932805cca58439150d702506fe043
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-13 (Sun, 13 Oct 2013)

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

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

  Commit: c269023a3fce3e80fcfdc58ea0335d769eb56163
      https://github.com/okfn/ckan/commit/c269023a3fce3e80fcfdc58ea0335d769eb56163
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M ckan/ckan_nose_plugin.py
    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/app_globals.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/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/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/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/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/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:
  -----------
  Merge branch 'master' into 1226-user-create-option

Conflicts:
	ckan/logic/auth/create.py
	ckan/templates/header.html

  Commit: 3273ebf7d0e06dbf3d854a25f701e651fe88bb0b
      https://github.com/okfn/ckan/commit/3273ebf7d0e06dbf3d854a25f701e651fe88bb0b
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-14 (Mon, 14 Oct 2013)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/tests/functional/api/test_user.py

  Log Message:
  -----------
  [#1226] Return the old behaviour for create_user

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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1261] add filesize limit, make storage folder backwards compatable, document a bit more

  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: 3dee85226f1fa6a29a03d598c8c11be1c5dba4ca
      https://github.com/okfn/ckan/commit/3dee85226f1fa6a29a03d598c8c11be1c5dba4ca
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html

  Log Message:
  -----------
  [#1262] First working version of the JS module for image uploading

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js

  Log Message:
  -----------
  [#1262] Adds in doc blocks into the image_upload JS module

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

  Changed paths:
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1262] Adds support for different field names for image upload

  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: 14a3808c013c8654b96a7ee33e4b6c7f5f5a034e
      https://github.com/okfn/ckan/commit/14a3808c013c8654b96a7ee33e4b6c7f5f5a034e
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/config/routing.py
    M ckan/templates/package/base_form_page.html
    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_data.html
    M ckan/templates/package/resource_edit.html
    A ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    M ckanext/datapusher/plugin.py

  Log Message:
  -----------
  [#1200] Quick tidy up of the resource_edit based templates

  Commit: 99a677e952d7272ae4c30d892b5530b205ccba18
      https://github.com/okfn/ckan/commit/99a677e952d7272ae4c30d892b5530b205ccba18
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

  Changed paths:
    M ckan/new_authz.py

  Log Message:
  -----------
  Handle the case where the group doesn't exist

  Commit: 1b451fe28a89e9a8239ad0c7dd0fec800d4508dd
      https://github.com/okfn/ckan/commit/1b451fe28a89e9a8239ad0c7dd0fec800d4508dd
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-15 (Tue, 15 Oct 2013)

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

  Log Message:
  -----------
  [#1257] Check for permissions against owner_org

Fix tests that were passing because they depended on this breakage.

  Commit: 3a60c2e2420350631742f8d0330be2f002d581eb
      https://github.com/okfn/ckan/commit/3a60c2e2420350631742f8d0330be2f002d581eb
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-16 (Wed, 16 Oct 2013)

  Changed paths:
    M .travis.yml
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests

  Log Message:
  -----------
  [#766] Stop Travis build if a dependency install fails

To do so, I needed to split our ./bin/travis-build in two files, one with the
deps install, and one with the test run. Doing so allows me to use the
"install" directive in Travis, and break the build as soon as something fails
with it.

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

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  [#766] Remove redundant datastore_test psql user creation

  Commit: 17ac69c397311a23282a82260215736adc624a70
      https://github.com/okfn/ckan/commit/17ac69c397311a23282a82260215736adc624a70
  Author: Nigel Babu <nigelbabu at gmail.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 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/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/organization/member_new.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 dev-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 1257-package-create

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

  Changed paths:
    M ckan/public/base/javascript/main.js
    M ckan/public/base/less/activity.less
    M ckan/templates/package/resource_data.html

  Log Message:
  -----------
  [#1200] Tidies up the resource data view into something a little nicer

  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: 6cc143f9deec75bf13fe2e517bead4ae90b91b50
      https://github.com/okfn/ckan/commit/6cc143f9deec75bf13fe2e517bead4ae90b91b50
  Author: kindly <kindly at gmail.com>
  Date:   2013-10-17 (Thu, 17 Oct 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1262] make tests pass

  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: e8e3c9829641618184922833723a1bdf7969a704
      https://github.com/okfn/ckan/commit/e8e3c9829641618184922833723a1bdf7969a704
  Author: John Martin <me at johnmart.in>
  Date:   2013-10-17 (Thu, 17 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
    M 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
    M 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:
  -----------
  Merged master

  Commit: 7ab8bd9e9de8ff02a177db571e800d7383816c77
      https://github.com/okfn/ckan/commit/7ab8bd9e9de8ff02a177db571e800d7383816c77
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  pep8

  Commit: 1ca945f79f600d6e4521e04cc5b90a75834dce4b
      https://github.com/okfn/ckan/commit/1ca945f79f600d6e4521e04cc5b90a75834dce4b
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2013-10-18 (Fri, 18 Oct 2013)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Entry points converted to dict

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

  Changed paths:
    M CONTRIBUTING.rst

  Log Message:
  -----------
  [#1155] Document how to upgrade the dependencies

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

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

  Log Message:
  -----------
  Merge pull request #1279 from okfn/1257-package-create

Fix package_create auth function to check for owner_org instead of organization_id

  Commit: 4f6e390e03759aa0333e534ef7e9f521725ec8d9
      https://github.com/okfn/ckan/commit/4f6e390e03759aa0333e534ef7e9f521725ec8d9
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

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

  Log Message:
  -----------
  Create new schema for related update

  Commit: 839a0981d2c92e99b3c08707da147d3116008b47
      https://github.com/okfn/ckan/commit/839a0981d2c92e99b3c08707da147d3116008b47
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

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

  Log Message:
  -----------
  Add tests for related actions

  Commit: 5cc76acca3802922d37db5f341fe72bd4365c60c
      https://github.com/okfn/ckan/commit/5cc76acca3802922d37db5f341fe72bd4365c60c
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Add organizations to the default facet titles

Currently this is only set in the package controller, so on all other pages that display the facets the title is not displayed correctly

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

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Coveralls badge should show coverage default branch in readme

  Commit: 48f5eeb6cda7955bc89aac50ad27969bd5abfe04
      https://github.com/okfn/ckan/commit/48f5eeb6cda7955bc89aac50ad27969bd5abfe04
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M ckan/controllers/organization.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#1281] DefaultOrganizationForm instead of hard-coded values in controller

  Commit: 946744415f93f182ff7e8e88e10cf45f74318f2d
      https://github.com/okfn/ckan/commit/946744415f93f182ff7e8e88e10cf45f74318f2d
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Merge pull request #1287 from okfn/coveralls-master-badge

Coveralls badge should show coverage default branch in readme

  Commit: 8afb07cec6b4e2d55bdb08de4f421dd20ab13a68
      https://github.com/okfn/ckan/commit/8afb07cec6b4e2d55bdb08de4f421dd20ab13a68
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-21 (Mon, 21 Oct 2013)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Forgot to change branch specification in Coveralls' badge

  Commit: a10290369beed68a5be23d406d300b93e18e0aad
      https://github.com/okfn/ckan/commit/a10290369beed68a5be23d406d300b93e18e0aad
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/template.py
    M ckan/lib/base.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Merge branch '1011-template-not-found'

  Commit: 3d36ae18d8df41bc3cee0297c73c6f9af5481c07
      https://github.com/okfn/ckan/commit/3d36ae18d8df41bc3cee0297c73c6f9af5481c07
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Merge branch '1241-fix-CkanVersionException'

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

  Changed paths:
    M ckan/config/routing.py
    M ckan/model/meta.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    R ckanext/datastore/helpers.py

  Log Message:
  -----------
  [#1200] fixes from pull request

  Commit: 4c46078e6737062d9b48c30e82afb5203f02c770
      https://github.com/okfn/ckan/commit/4c46078e6737062d9b48c30e82afb5203f02c770
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M bin/travis-install-dependencies
    M bin/travis-run-tests

  Log Message:
  -----------
  [#766] Move solr configuration to travis-run-tests

I was unable to run Jetty-Solr's configuration on travis-install-dependencies.
Probably something to do with Bash's "set -e", but I was unable to pinpoint
exactly, so I left it into travis-run-tests. No big deal.

  Commit: 852a23cda23a81ddc2374d53f67556d2a700ca7e
      https://github.com/okfn/ckan/commit/852a23cda23a81ddc2374d53f67556d2a700ca7e
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    M bin/travis-run-tests

  Log Message:
  -----------
  [#766] Use /bin/sh instead of /bin/bash

  Commit: 809f6b6816411002c22df09211d0e8834a678d92
      https://github.com/okfn/ckan/commit/809f6b6816411002c22df09211d0e8834a678d92
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-10-22 (Tue, 22 Oct 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M README.rst
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/template.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/logic/auth/create.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/package/base_form_page.html
    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
    M ckan/tests/logic/test_auth.py
    M dev-requirements.txt

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

Conflicts:
	bin/travis-install-dependencies

  Commit: d30986d9f585e5897992ed97146e04672c14d54e
      https://github.com/okfn/ckan/commit/d30986d9f585e5897992ed97146e04672c14d54e
  Author: Stefan Oderbolz <stefan.oderbolz at liip.ch>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckanext/multilingual/plugin.py

  Log Message:
  -----------
  Added IOrganizationController to MultilingualGroup

This ensures that organizations are being translated just like groups

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

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

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

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

  Changed paths:
    M ckan/templates/package/resource_data.html
    M ckanext/datapusher/logic/action.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1200] fix more issues with pull request

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

  Changed paths:
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    A ckan/templates/package/snippets/resource_help.html

  Log Message:
  -----------
  [#1200] Fix for undefined  on new resource form on non-draft datasets

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

  Changed paths:
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py

  Log Message:
  -----------
  [#1224] fix error messages in tests

  Commit: 05c27cefca4983d387ca1e66d0c381b9b9cbabfe
      https://github.com/okfn/ckan/commit/05c27cefca4983d387ca1e66d0c381b9b9cbabfe
  Author: Ian Ward <ian at excess.org>
  Date:   2013-10-23 (Wed, 23 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#1281] call setup_template_variables in group/org read, about and bulk_process

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

  Changed paths:
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  [#1274] Add tests for organization translation

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

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

  Log Message:
  -----------
  [#1200] fix error in getting plugings from config

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

  Changed paths:
    M ckan/public/base/javascript/main.js

  Log Message:
  -----------
  [#1200] Fix for failing mocha test it's because of scoping...

  Commit: cc4330b0c570aee3508131c99dc51b941236d7be
      https://github.com/okfn/ckan/commit/cc4330b0c570aee3508131c99dc51b941236d7be
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-24 (Thu, 24 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/deployment.ini_tmpl
    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/template.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:
  -----------
  Merge branch 'master' into 1224-not-auth-except-msg

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

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

  Log Message:
  -----------
  Merge branch '504-related-update-schema' of github.com:okfn/ckan into 504-related-update-schema

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

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

  Log Message:
  -----------
  [#504] PEP8, and verify that items in original
related_item dict are still present after the
partial update.

  Commit: faf01bcdaad186db98abacd9de0769c2abf61448
      https://github.com/okfn/ckan/commit/faf01bcdaad186db98abacd9de0769c2abf61448
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-10-24 (Thu, 24 Oct 2013)

  Changed paths:
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  [#1224] change tests to check for error type instead of message

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

  Changed paths:
    M ckan/plugins/core.py
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  [#1200] add loaded plugin logic

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

  Changed paths:
    M ckan/public/base/javascript/main.js

  Log Message:
  -----------
  Merge branch '1200-datastore-read-only' of github.com:okfn/ckan into 1200-datastore-read-only

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

  Changed paths:
    M ckan/controllers/api.py
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py

  Log Message:
  -----------
  Merge pull request #1224 from okfn/1224-not-auth-except-msg

propogate NotAuthorized exception message

  Commit: 12b5d386b150b2072dc6680996a11b8b524199fb
      https://github.com/okfn/ckan/commit/12b5d386b150b2072dc6680996a11b8b524199fb
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  [#1294] Update docs theme to latest version

  Commit: 5550a4a34e481441c8cdc2ac6f40ebcbfad95663
      https://github.com/okfn/ckan/commit/5550a4a34e481441c8cdc2ac6f40ebcbfad95663
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

  Changed paths:
    A doc/_static/ckanlogo.png
    M doc/conf.py
    R doc/images/ckan_logo_box.png

  Log Message:
  -----------
  [#1294] Fix logo on docs header bar

The logo needs to be in a _static folder because the sphinx-theme-okfn
hardcodes it there:

https://github.com/okfn/sphinx-theme-okfn/blob/master/layout.html#L18

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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/model/meta.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/main.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    A ckan/templates/snippets/datapusher_status.html
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.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/helpers.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 doc/configuration.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #1200 from okfn/1200-datastore-read-only

Datapusher Core Extension

  Commit: c22b09089682ed547e53b9f7710ff93502d1fcbe
      https://github.com/okfn/ckan/commit/c22b09089682ed547e53b9f7710ff93502d1fcbe
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-25 (Fri, 25 Oct 2013)

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

  Log Message:
  -----------
  [#1295] Don't return private datasets on package_list

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

  Changed paths:
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Merge pull request #1291 from okfn/1274-multilingual-organizations

Multilingual organizations

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

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/controllers/api.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    M ckan/model/meta.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/main.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.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/helpers.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/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M doc/configuration.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 504-related-update-schema

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

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

  Log Message:
  -----------
  Merge pull request #1285 from okfn/504-related-update-schema

Create new schema for related update

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

  Changed paths:
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js

  Log Message:
  -----------
  Default API_URL to SITE_URL if missing

Otherwise file uploads and other calls where broken when using CKAN in
a non-root location.

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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Merge branch '1281-default-organization-form' of git://github.com/wardi/ckan into wardi-1281-default-organization-form

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

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

  Log Message:
  -----------
  [#1298] Fix activity and about organization pages

The controller methods didn't use `self._action` which will use the
appropiate `group_` or `organization_` action depending on the group
type.

The `organization_activity_list_html` action hadn't been used at all
until now, as there was a syntax error.

  Commit: cb00b43eeb8d38527611d9a70d91d0e3c5733dc3
      https://github.com/okfn/ckan/commit/cb00b43eeb8d38527611d9a70d91d0e3c5733dc3
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  Merge branch 'wardi-1281-default-organization-form'

  Commit: 9471b5dfb2565590c9781ed534aaa29181d71a1e
      https://github.com/okfn/ckan/commit/9471b5dfb2565590c9781ed534aaa29181d71a1e
  Author: amercader <amercadero at gmail.com>
  Date:   2013-10-30 (Wed, 30 Oct 2013)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py

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

  Commit: dbc36b688089e78345976a493ce6ca8ce10f4ee3
      https://github.com/okfn/ckan/commit/dbc36b688089e78345976a493ce6ca8ce10f4ee3
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-10-31 (Thu, 31 Oct 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge pull request #1286 from ogdch/fix-org-facet-title

Add "organizations" to the default facet titles

  Commit: 787cb7ae25ce47bfa28b8543c1a7e59a06186fe4
      https://github.com/okfn/ckan/commit/787cb7ae25ce47bfa28b8543c1a7e59a06186fe4
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

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

  Log Message:
  -----------
  Fix a few small mistakes in the tests

  Commit: fcc9d7b20fb909a09698546679cc0a2eee3d4630
      https://github.com/okfn/ckan/commit/fcc9d7b20fb909a09698546679cc0a2eee3d4630
  Author: Samuele Santi <redshadow at hackzine.org>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Cleanup of setup.py

* Some pep8 fixes
* Entry points converted in dictionary format

  Commit: 4f732627fbf515bc7cbe29e84731606409a637b7
      https://github.com/okfn/ckan/commit/4f732627fbf515bc7cbe29e84731606409a637b7
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M ckan/lib/uploader.py

  Log Message:
  -----------
  [#1262] only allow file already exists errors to not raise exception

  Commit: 2ccbea604874a2c7b6c69565479573d2971fa3ba
      https://github.com/okfn/ckan/commit/2ccbea604874a2c7b6c69565479573d2971fa3ba
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M setup.py

  Log Message:
  -----------
  Merge pull request #1282 from rshk/master

Refactoring of setup.py

  Commit: 8c7329c6246c03a965f8284c855c3e538d205a9c
      https://github.com/okfn/ckan/commit/8c7329c6246c03a965f8284c855c3e538d205a9c
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [#1262] only allow file already exists errors to not raise exception for other case

  Commit: 5fd8b7aa52579a5873c1a04f2d5279f13a957111
      https://github.com/okfn/ckan/commit/5fd8b7aa52579a5873c1a04f2d5279f13a957111
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

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

  Log Message:
  -----------
  Merge pull request #1295 from okfn/1295-package_list-private-datasets

package_list should not return private datasets

  Commit: 8c854ad9a0c5b159c1f99488ed44fc77a134a7f5
      https://github.com/okfn/ckan/commit/8c854ad9a0c5b159c1f99488ed44fc77a134a7f5
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/ckan_nose_plugin.py

  Log Message:
  -----------
  [#1304] Clear and keep current database during test runs

Add option '--reset-db' to drop and reinitialize database during test
runs

  Commit: 02057230ab99b10fb7b6d7bc2d4b1771c1c3565b
      https://github.com/okfn/ckan/commit/02057230ab99b10fb7b6d7bc2d4b1771c1c3565b
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/new_tests/helpers.py

  Log Message:
  -----------
  [#1304] change clean_db to rebuild_db in new_test/helpers.py

Otherwise new_tests will drop and recreate database

  Commit: eb1a9e74b93ab675ec568b4b21342d5bbbf9e369
      https://github.com/okfn/ckan/commit/eb1a9e74b93ab675ec568b4b21342d5bbbf9e369
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M doc/test.rst

  Log Message:
  -----------
  [#1304] update docs on 'reset-db' test option

  Commit: ed5ecd2c56d343a110d08d66817e2a5c9a8aa98b
      https://github.com/okfn/ckan/commit/ed5ecd2c56d343a110d08d66817e2a5c9a8aa98b
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M bin/travis-build

  Log Message:
  -----------
  [#1304] make sure database is rebuilt during travis test runs

  Commit: cba4e6ccd350cde453efc5ca958c86b10c9a5d98
      https://github.com/okfn/ckan/commit/cba4e6ccd350cde453efc5ca958c86b10c9a5d98
  Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge pull request #1276 from okfn/1267-fix-urlfor-paster

Make url_for work in paster commands

  Commit: 8b15c7938295f7919d95857975d45282f3daffbe
      https://github.com/okfn/ckan/commit/8b15c7938295f7919d95857975d45282f3daffbe
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/public/base/css/main.css
    M ckan/templates/macros/form.html

  Log Message:
  -----------
  [#1262] fix pull request issues

  Commit: 38ed0ae150f8551b8120b4bc9e9ca73d8436c86a
      https://github.com/okfn/ckan/commit/38ed0ae150f8551b8120b4bc9e9ca73d8436c86a
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/lib/cli.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/test_coding_standards.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 960-dont-use-api_url

  Commit: 04d65785c97a6b8d44d70c8f6bdff4de50caf3b7
      https://github.com/okfn/ckan/commit/04d65785c97a6b8d44d70c8f6bdff4de50caf3b7
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/app_globals.py
    M ckan/public/base/javascript/main.js
    M ckan/templates/base.html
    M doc/configuration.rst
    M doc/legacy-api.rst

  Log Message:
  -----------
  [#960] Remove ckan.api_url completely on 2.2

  Commit: 4d0184ae6ee1af126c3103a4ac4c407c417fa824
      https://github.com/okfn/ckan/commit/4d0184ae6ee1af126c3103a4ac4c407c417fa824
  Author: kindly <kindly at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

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

  Log Message:
  -----------
  [#1262] fix required field in wrong place

  Commit: be38950f69517a5fd528a972f8ca6080a7ab5eef
      https://github.com/okfn/ckan/commit/be38950f69517a5fd528a972f8ca6080a7ab5eef
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M .travis.yml
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests

  Log Message:
  -----------
  Merge pull request #766 from okfn/766-stop-travis-build-when-deps-install-fails

Recurring travis fail `no such option 'with-pylons'`

  Commit: ff7e38e56842d4e20b6846717e61625fbcbe47e2
      https://github.com/okfn/ckan/commit/ff7e38e56842d4e20b6846717e61625fbcbe47e2
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

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

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

  Commit: cf55b02a9d918021b586ad789f9238094c5bf6ad
      https://github.com/okfn/ckan/commit/cf55b02a9d918021b586ad789f9238094c5bf6ad
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-05 (Tue, 05 Nov 2013)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/logic/auth/create.py
    M ckan/new_authz.py
    M ckan/templates/header.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_auth.py
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Merge pull request #1226 from okfn/1226-user-create-option

Disable user registration with a config

  Commit: 85737e8e2d1e1b4184849f278c7e24e501e5e510
      https://github.com/okfn/ckan/commit/85737e8e2d1e1b4184849f278c7e24e501e5e510
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

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

  Log Message:
  -----------
  [#1307] Minor docs correction

  Commit: de166d955c8c682ce94ff794f77962fa3ba558ae
      https://github.com/okfn/ckan/commit/de166d955c8c682ce94ff794f77962fa3ba558ae
  Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

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

  Log Message:
  -----------
  Merge pull request #1307 from okfn/1307-minor-docs-correction

Minor docs correction

  Commit: 7f1327fe010debaee0eed9a5d3c87c119aede52c
      https://github.com/okfn/ckan/commit/7f1327fe010debaee0eed9a5d3c87c119aede52c
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  [#1068] Show 404 instead of login page on user not found

Remove unnecessary auth check, fix redirect

  Commit: c698cdd9565fdfcf7752f1b9d274d0574abab7b1
      https://github.com/okfn/ckan/commit/c698cdd9565fdfcf7752f1b9d274d0574abab7b1
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html

  Log Message:
  -----------
  [#1309] Fix placeholders in non-root locations

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

  Changed paths:
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html

  Log Message:
  -----------
  Merge pull request #1309 from okfn/1309-fix-placeholders-non-root

Placeholder images broken on non-root locations

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

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update CHANGELOG

  Commit: 31f30dc2d9965ef1326051173bc0d7c20a34b270
      https://github.com/okfn/ckan/commit/31f30dc2d9965ef1326051173bc0d7c20a34b270
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-10 (Sun, 10 Nov 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/app_globals.py
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    M ckan/templates/base.html
    M doc/configuration.rst
    M doc/legacy-api.rst

  Log Message:
  -----------
  Merge pull request #960 from okfn/960-dont-use-api_url

api_url needs to default to CKAN's mount URL.

  Commit: ae17348ce8d26d121d65d0688392000ab38dcc3f
      https://github.com/okfn/ckan/commit/ae17348ce8d26d121d65d0688392000ab38dcc3f
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    A .coveragerc
    M .travis.yml
    M CHANGELOG.rst
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    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/template.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/plugins.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/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/meta.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/client.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    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/templates/admin/config.html
    M ckan/templates/base.html
    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/group_item.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/organization/member_new.html
    M ckan/templates/organization/snippets/helper.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base_form_page.html
    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
    A ckan/templates/package/resource_data.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
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    A ckan/templates/package/snippets/resource_help.html
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/facet_list.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/login.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/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.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
    M ckan/tests/logic/test_tag.py
    A ckan/tests/models/test_follower.py
    M ckan/tests/models/test_user.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.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/helpers.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/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M dev-requirements.txt
    M doc/configuration.rst
    M doc/extensions/best-practices.rst
    M doc/i18n.rst
    M doc/legacy-api.rst
    M doc/upgrade-source.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1262-org-group-image-upload

Conflicts:
	ckan/lib/helpers.py
	ckan/logic/action/create.py
	ckan/public/base/css/main.css
	ckan/public/base/less/forms.less
	ckan/templates/group/snippets/group_item.html
	ckan/templates/organization/snippets/organization_item.html

  Commit: 6aa06a2a70c3b74249fbf145f8a4945fad0d997a
      https://github.com/okfn/ckan/commit/6aa06a2a70c3b74249fbf145f8a4945fad0d997a
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/munge.py
    A ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/public/base/css/main.css
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  Merge pull request #1262 from okfn/1262-org-group-image-upload

Upload for group and organization images.

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

  Changed paths:
    M CONTRIBUTING.rst
    A doc/upgrading-dependencies.rst

  Log Message:
  -----------
  [#1155] Tweak upgrading dependencies docs

  Commit: 352b4caaa53385f937b34f73a6d26b39527b867c
      https://github.com/okfn/ckan/commit/352b4caaa53385f937b34f73a6d26b39527b867c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    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/template.py
    M ckan/lib/app_globals.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/munge.py
    M ckan/lib/plugins.py
    A ckan/lib/uploader.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/schema.py
    M ckan/model/meta.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/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/public/base/less/forms.less
    M ckan/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.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/helpers.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/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M doc/configuration.rst
    M doc/legacy-api.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1155-document-upgrading-dependencies

  Commit: 1a188b04f91116beb201eadeb14fe65470e23123
      https://github.com/okfn/ckan/commit/1a188b04f91116beb201eadeb14fe65470e23123
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M doc/upgrading-dependencies.rst

  Log Message:
  -----------
  [#1155] Explain how to pin the latest uncompatible version in requirements.in

  Commit: 4c05807fa10a946d3f2278e3c85db4290cbbb4bf
      https://github.com/okfn/ckan/commit/4c05807fa10a946d3f2278e3c85db4290cbbb4bf
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M doc/upgrading-dependencies.rst

  Log Message:
  -----------
  [#1155] Add a small clarification to the docs

  Commit: aa18dd8994670462ba2b8cb1e663d88880dc20f8
      https://github.com/okfn/ckan/commit/aa18dd8994670462ba2b8cb1e663d88880dc20f8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M CONTRIBUTING.rst
    A doc/upgrading-dependencies.rst

  Log Message:
  -----------
  Merge branch '1155-document-upgrading-dependencies'

  Commit: a3e5289bf247c87aa64341a87f7d26ae44d1e993
      https://github.com/okfn/ckan/commit/a3e5289bf247c87aa64341a87f7d26ae44d1e993
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.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/munge.py
    M ckan/lib/plugins.py
    A ckan/lib/uploader.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/schema.py
    M ckan/model/meta.py
    M ckan/new_authz.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/public/base/less/forms.less
    M ckan/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    A ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/templates/package/snippets/info.html
    A ckan/templates/package/snippets/resource_help.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.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/helpers.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/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M doc/configuration.rst
    M doc/legacy-api.rst
    A doc/upgrading-dependencies.rst
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1294-update-docs-theme

  Commit: a73ee7a305ac2faf714098d4d69b8e88b59f49bc
      https://github.com/okfn/ckan/commit/a73ee7a305ac2faf714098d4d69b8e88b59f49bc
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #1068 from okfn/1068-404-on-user-not-found

Non-existent user profile should give error

  Commit: 7eb2b4faef5d346bb39127dbcf977ce9072c7079
      https://github.com/okfn/ckan/commit/7eb2b4faef5d346bb39127dbcf977ce9072c7079
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M doc/conf.py
    M doc/index.rst

  Log Message:
  -----------
  [#1294] Show table of contents in docs sidebar on front page

  Commit: dde990109336a3014fd918cd81e73de37d8580ff
      https://github.com/okfn/ckan/commit/dde990109336a3014fd918cd81e73de37d8580ff
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1294-update-docs-theme

  Commit: 021988ff7761db36b6045a384d30f785b931c65c
      https://github.com/okfn/ckan/commit/021988ff7761db36b6045a384d30f785b931c65c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    A doc/_static/ckanlogo.png
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    R doc/images/ckan_logo_box.png
    M doc/index.rst

  Log Message:
  -----------
  Merge branch '1294-update-docs-theme'

  Commit: 829f3e4607e3d550d27c1997c355cd2c9ac1ef31
      https://github.com/okfn/ckan/commit/829f3e4607e3d550d27c1997c355cd2c9ac1ef31
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M doc/index.rst

  Log Message:
  -----------
  Remove an unnecessary <hr> from a docs page

  Commit: 39ee86d14f9c36a3c8db84d3bee14885298c1dfd
      https://github.com/okfn/ckan/commit/39ee86d14f9c36a3c8db84d3bee14885298c1dfd
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M doc/_themes/sphinx-theme-okfn

  Log Message:
  -----------
  Update Sphinx theme

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

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/controllers/group.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/munge.py
    A ckan/lib/uploader.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/new_authz.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/forms.less
    M ckan/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/related/snippets/related_item.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_auth.py
    A doc/_static/ckanlogo.png
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    R doc/images/ckan_logo_box.png
    M doc/index.rst
    M doc/legacy-api.rst
    A doc/upgrading-dependencies.rst
    M test-core.ini

  Log Message:
  -----------
  Merge origin/master

  Commit: 35e5729a2444b748830f136ecae0a52e1358e02a
      https://github.com/okfn/ckan/commit/35e5729a2444b748830f136ecae0a52e1358e02a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M doc/conf.py

  Log Message:
  -----------
  Fix documentation title

  Commit: ee8505b1a6f6808f9efdbb9198515652de59ae65
      https://github.com/okfn/ckan/commit/ee8505b1a6f6808f9efdbb9198515652de59ae65
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  Install extra package needed by Jetty

See http://askubuntu.com/questions/377021/solr-jetty-on-ubuntu-12-04-3

  Commit: 4ed553eb2b09a758d678156de745277a4c42e0c9
      https://github.com/okfn/ckan/commit/4ed553eb2b09a758d678156de745277a4c42e0c9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M doc/authorization.rst

  Log Message:
  -----------
  Rename a docs page

  Commit: bc1d27f9ffc5a5f5ad89dbc490d91073e389e79f
      https://github.com/okfn/ckan/commit/bc1d27f9ffc5a5f5ad89dbc490d91073e389e79f
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M bin/travis-install-dependencies

  Log Message:
  -----------
  Merge branch '1323-fix-travis-jetty'

  Commit: c433c0c9b7256a31df7437d7746d8d578cc9db3c
      https://github.com/okfn/ckan/commit/c433c0c9b7256a31df7437d7746d8d578cc9db3c
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M doc/configuration.rst

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

  Commit: 0666cf391065337e6f03ae4ed53642696dd02acc
      https://github.com/okfn/ckan/commit/0666cf391065337e6f03ae4ed53642696dd02acc
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

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

  Log Message:
  -----------
  Rebuild main.css

  Commit: 0e990f6fd8aaf607584e59e334d292a310324582
      https://github.com/okfn/ckan/commit/0e990f6fd8aaf607584e59e334d292a310324582
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M bin/travis-install-dependencies
    M ckan/public/base/css/main.css
    M doc/_themes/sphinx-theme-okfn
    M doc/authorization.rst
    M doc/conf.py
    M doc/configuration.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 1304-reset-db

  Commit: f8edc00aa7a0ee5f2c498b4f2bdf48f0cbb86760
      https://github.com/okfn/ckan/commit/f8edc00aa7a0ee5f2c498b4f2bdf48f0cbb86760
  Author: John Glover <j at johnglover.net>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M bin/travis-run-tests
    M ckan/ckan_nose_plugin.py
    M ckan/new_tests/helpers.py
    M doc/test.rst

  Log Message:
  -----------
  Merge pull request #1304 from okfn/1304-reset-db

'--reset-db' option for when running tests

  Commit: ae93827af880eb7af3d0a36dbb6bcab78e7d56d5
      https://github.com/okfn/ckan/commit/ae93827af880eb7af3d0a36dbb6bcab78e7d56d5
  Author: amercader <amercadero at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  [#1329] Fix wrong solr_url default in docs

  Commit: 356e6dc239bb3b72541f53d02731503dc0ffea8f
      https://github.com/okfn/ckan/commit/356e6dc239bb3b72541f53d02731503dc0ffea8f
  Author: Sean Hammond <seanh at users.noreply.github.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    M doc/configuration.rst

  Log Message:
  -----------
  Merge pull request #1329 from okfn/1329-solr_url-doc

Wrong default value in solr_url documentation

  Commit: f0486e42f10ae2ce13562c48462365489af07e42
      https://github.com/okfn/ckan/commit/f0486e42f10ae2ce13562c48462365489af07e42
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

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

  Log Message:
  -----------
  Merge branch '1298-fix-orgs-activity-about-page'

  Commit: 969ad6da4638c59948c1ab48f8bbe9d163f0ea47
      https://github.com/okfn/ckan/commit/969ad6da4638c59948c1ab48f8bbe9d163f0ea47
  Author: John Martin <me at johnmart.in>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M .travis.yml
    M CHANGELOG.rst
    M CONTRIBUTING.rst
    M README.rst
    R bin/travis-build
    A bin/travis-install-dependencies
    A bin/travis-run-tests
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/routing.py
    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/template.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.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/munge.py
    M ckan/lib/plugins.py
    A ckan/lib/uploader.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/schema.py
    M ckan/model/meta.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/main.js
    A ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/resource.config
    M ckan/public/base/less/activity.less
    M ckan/public/base/less/ckan.less
    A ckan/public/base/less/datapusher.less
    M ckan/public/base/less/forms.less
    M ckan/templates/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/group_item.html
    M ckan/templates/group/snippets/helper.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/macros/form.html
    M 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/package/base_form_page.html
    M ckan/templates/package/edit.html
    M 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
    A ckan/templates/package/resource_data.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
    M ckan/templates/package/snippets/package_form.html
    A ckan/templates/package/snippets/resource_help.html
    A ckan/templates/package/snippets/resource_info.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/related/snippets/related_item.html
    A ckan/templates/snippets/datapusher_status.html
    M ckan/templates/snippets/group.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/organization_item.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/api/model/test_group_and_organization_purge.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/test_coding_standards.py
    A ckanext/datapusher/__init__.py
    A ckanext/datapusher/helpers.py
    A ckanext/datapusher/logic/__init__.py
    A ckanext/datapusher/logic/action.py
    A ckanext/datapusher/logic/auth.py
    A ckanext/datapusher/logic/schema.py
    A ckanext/datapusher/plugin.py
    A ckanext/datapusher/tests/__init__.py
    A ckanext/datapusher/tests/test.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/helpers.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/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    A doc/_static/ckanlogo.png
    M doc/authorization.rst
    M doc/conf.py
    M doc/configuration.rst
    R doc/images/ckan_logo_box.png
    M doc/index.rst
    M doc/legacy-api.rst
    M doc/test.rst
    A doc/upgrading-dependencies.rst
    M setup.py
    M test-core.ini

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

Compare: https://github.com/okfn/ckan/compare/5eb3c4099be0...969ad6da4638