[ckan-changes] [okfn/ckan] 1eb9d9: [#1011] Fix a 500 to a 404
GitHub
noreply at github.com
Tue Oct 22 23:22:01 UTC 2013
Branch: refs/heads/766-stop-travis-build-when-deps-install-fails
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: 25c80f16f57ecc34fda2d52bbd8d3a41e0b33d66
https://github.com/okfn/ckan/commit/25c80f16f57ecc34fda2d52bbd8d3a41e0b33d66
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-07-06 (Sat, 06 Jul 2013)
Changed paths:
A .coveragerc
M .travis.yml
M bin/travis-build
Log Message:
-----------
Add coverage reports with coveralls
Commit: 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: 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: 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: 96678854079906a74ce7e7a1ac195b9c18c29a00
https://github.com/okfn/ckan/commit/96678854079906a74ce7e7a1ac195b9c18c29a00
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M CONTRIBUTING.rst
M bin/ckan_spam.py
M bin/travis-build
R build.sh
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/schema-2.0.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
A ckan/i18n/ar/LC_MESSAGES/ckan.mo
A ckan/i18n/ar/LC_MESSAGES/ckan.po
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/dv/LC_MESSAGES/ckan.mo
M ckan/i18n/dv/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/id/LC_MESSAGES/ckan.mo
M ckan/i18n/id/LC_MESSAGES/ckan.po
M ckan/i18n/is/LC_MESSAGES/ckan.mo
M ckan/i18n/is/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/ja/LC_MESSAGES/ckan.mo
M ckan/i18n/ja/LC_MESSAGES/ckan.po
A ckan/i18n/km/LC_MESSAGES/ckan.mo
A ckan/i18n/km/LC_MESSAGES/ckan.po
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/tr/LC_MESSAGES/ckan.mo
M ckan/i18n/tr/LC_MESSAGES/ckan.po
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/datapreview.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/__init__.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/navl/validators.py
M ckan/lib/package_saver.py
M ckan/lib/plugins.py
M ckan/lib/render.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/069_resource_url_and_metadata_modified.py
A ckan/migration/versions/070_add_activity_and_resource_indexes.py
M ckan/model/activity.py
M ckan/model/extension.py
M ckan/model/modification.py
M ckan/model/package.py
M ckan/model/package_relationship.py
M ckan/model/resource.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
R ckan/public/base/less/font-awesome.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/homepage.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/modules/custom-fields.spec.js
M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
M ckan/public/base/test/vendor/mocha.css
M ckan/public/base/test/vendor/mocha.js
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/js/.jshintrc
M ckan/public/base/vendor/bootstrap/js/bootstrap.js
M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
M ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
A ckan/public/base/vendor/font-awesome/less/bootstrap.less
A ckan/public/base/vendor/font-awesome/less/core.less
A ckan/public/base/vendor/font-awesome/less/extras.less
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
A ckan/public/base/vendor/font-awesome/less/icons.less
A ckan/public/base/vendor/font-awesome/less/mixins.less
A ckan/public/base/vendor/font-awesome/less/path.less
A ckan/public/base/vendor/font-awesome/less/variables.less
M ckan/public/base/vendor/jquery.js
M ckan/public/base/vendor/resource.config
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/ajax_snippets/related-item.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/package/snippets/stages.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/__init__.py
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/ckantestplugin/setup.cfg
R ckan/tests/ckantestplugin/setup.py
A ckan/tests/ckantestplugins.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_revision_search.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_preview_interface.py
M ckan/tests/functional/test_tag_vocab.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckan/tests/mock_plugin.py
A ckan/tests/models/test_activity.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_package_relationships.py
M ckan/tests/test_coding_standards.py
M ckan/tests/test_plugins.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_configure.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/multilingual/solr/schema.xml
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
M ckanext/reclinepreview/tests/test_preview.py
M ckanext/reclinepreview/theme/public/resource.config
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/stats/stats.py
M ckanext/test_tag_vocab_plugin.py
M ckanext/textpreview/plugin.py
M ckanext/textpreview/tests/test_preview.py
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M dev-requirements.txt
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
A doc/changelog.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/i18n.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/multilingual.rst
M doc/python-coding-standards.rst
M doc/tag-vocabularies.rst
M doc/templating.rst
M doc/test.rst
A doc/testing-coding-standards.rst
R doc/toolkit.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
M doc/upgrade-source.rst
M doc/upgrading.rst
R doc/writing-extensions.rst
R fabfile.py
R jshint.json
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
A pip-requirements-docs.txt
A requirements.in
M requirements.txt
M setup.py
M test-core.ini
R test_sync.ini
R test_sync2.ini
Log Message:
-----------
Merge branch 'master' into coveralls
Conflicts:
bin/travis-build
Commit: dad667eb4233b00561167db2aff41092afecfd2d
https://github.com/okfn/ckan/commit/dad667eb4233b00561167db2aff41092afecfd2d
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Correct encoding to make coveralls work
Commit: a903ef999d8d67db48118ea8413595707c2e3080
https://github.com/okfn/ckan/commit/a903ef999d8d67db48118ea8413595707c2e3080
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M README.rst
Log Message:
-----------
Add test coverage banner to readme
Commit: 5ad2c9bc8d651c31b302499780b6926b7a798ebc
https://github.com/okfn/ckan/commit/5ad2c9bc8d651c31b302499780b6926b7a798ebc
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M .coveragerc
Log Message:
-----------
Don't cover tests files
Commit: 23cfdbee2fcbc9267f66f06b6ecf9a879c92241f
https://github.com/okfn/ckan/commit/23cfdbee2fcbc9267f66f06b6ecf9a879c92241f
Author: John Martin <me at johnmart.in>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M ckan/config/routing.py
M ckan/templates/package/edit.html
A ckan/templates/package/edit_base.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_edit.html
A ckan/templates/package/resource_edit_base.html
M ckan/templates/package/snippets/info.html
Log Message:
-----------
[#1269] First working version of the proper IA for resources
Commit: 48041a4e40e837f3f84ea9bb4f7cd94918daa21a
https://github.com/okfn/ckan/commit/48041a4e40e837f3f84ea9bb4f7cd94918daa21a
Author: John Martin <me at johnmart.in>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/templates/package/edit.html
M ckan/templates/package/edit_base.html
A ckan/templates/package/new_resource_not_draft.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/resource_edit_base.html
A ckan/templates/package/resources.html
M ckan/templates/package/snippets/resource_item.html
Log Message:
-----------
[#1269] Adds resource listing page within edit dataset section
- Also tidys up the edit dataset templats
- Adds a new state to the new resource action that uses a different
template when dataset is no in draft mode (e.g. it's not part of the
dataset wizard creation any more)
Commit: 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: 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: 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: f75e37dc3cfa2da3948ba1eb4fcf351021c60132
https://github.com/okfn/ckan/commit/f75e37dc3cfa2da3948ba1eb4fcf351021c60132
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M .travis.yml
M dev-requirements.txt
Log Message:
-----------
Move coveralls to dev requirements
Commit: be09f3c08bcd5cc668b16fdb4dea73c1ec8c6134
https://github.com/okfn/ckan/commit/be09f3c08bcd5cc668b16fdb4dea73c1ec8c6134
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M dev-requirements.txt
Log Message:
-----------
[#1266] Pin coveralls version to ==0.3
Commit: 1e5b72fd943e60069d33ceba917e90900b951aa5
https://github.com/okfn/ckan/commit/1e5b72fd943e60069d33ceba917e90900b951aa5
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
A .coveragerc
M .travis.yml
M README.rst
M bin/travis-build
M ckan/config/environment.py
M dev-requirements.txt
Log Message:
-----------
Merge pull request #1266 from okfn/coveralls
Coveralls support
Commit: 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: a077b5897c8caa4b8c46a27281517d5aa7ca6c64
https://github.com/okfn/ckan/commit/a077b5897c8caa4b8c46a27281517d5aa7ca6c64
Author: kindly <kindly at gmail.com>
Date: 2013-10-17 (Thu, 17 Oct 2013)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge pull request #1256 from okfn/1256-fix-create-test-data
create-test-data
Commit: 77e321f884f0a5bd0ca1266c931d7b2fc31bbbcb
https://github.com/okfn/ckan/commit/77e321f884f0a5bd0ca1266c931d7b2fc31bbbcb
Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-10-17 (Thu, 17 Oct 2013)
Changed paths:
M ckan/templates/group/snippets/helper.html
M ckan/templates/organization/snippets/helper.html
M ckan/templates/package/base_form_page.html
Log Message:
-----------
Merge pull request #1092 from okfn/1092-helper-text
'About datasets/orgs/groups' text is dreadful
Commit: b31f8e077c414b40aa7b1eaf35ba7490b1c071a1
https://github.com/okfn/ckan/commit/b31f8e077c414b40aa7b1eaf35ba7490b1c071a1
Author: kindly <kindly at gmail.com>
Date: 2013-10-17 (Thu, 17 Oct 2013)
Changed paths:
A .coveragerc
M .travis.yml
M README.rst
M bin/travis-build
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/mailer.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/schema.py
A ckan/migration/versions/071_add_state_column_to_user_table.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/less/forms.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/module.less
M ckan/public/base/test/spec/modules/autocomplete.spec.js
M ckan/templates/development/snippets/facet.html
M ckan/templates/development/snippets/module.html
M ckan/templates/group/member_new.html
M ckan/templates/group/snippets/helper.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/snippets/helper.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/new_user_form.html
M ckan/templates/user/read_base.html
A ckan/templates/user/snippets/recaptcha.html
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
A ckan/tests/lib/test_authenticator.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
A ckan/tests/models/test_follower.py
M ckan/tests/models/test_user.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/plugin.py
M dev-requirements.txt
M doc/upgrade-source.rst
Log Message:
-----------
Merge branch 'master' into 1269-dataset-and-resource-edit-tweaks
Commit: 5ee2ea17ba025d33b250dd55a00e64613c0ceaf2
https://github.com/okfn/ckan/commit/5ee2ea17ba025d33b250dd55a00e64613c0ceaf2
Author: kindly <kindly at gmail.com>
Date: 2013-10-17 (Thu, 17 Oct 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/templates/package/edit.html
A ckan/templates/package/edit_base.html
M ckan/templates/package/new_resource.html
A ckan/templates/package/new_resource_not_draft.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_edit.html
A ckan/templates/package/resource_edit_base.html
A ckan/templates/package/resources.html
M ckan/templates/package/snippets/info.html
A ckan/templates/package/snippets/resource_info.html
M ckan/templates/package/snippets/resource_item.html
Log Message:
-----------
Merge branch '1269-dataset-and-resource-edit-tweaks'
Commit: 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: 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: 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: 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
Compare: https://github.com/okfn/ckan/compare/852a23cda23a...809f6b681641
More information about the ckan-changes
mailing list