[ckan-changes] [okfn/ckan] 1eb9d9: [#1011] Fix a 500 to a 404
GitHub
noreply at github.com
Thu Nov 28 18:53:46 UTC 2013
Branch: refs/heads/1102-dataset-group-add
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: 73308db08242a6a2ee72079b6cc87ce4b0705761
https://github.com/okfn/ckan/commit/73308db08242a6a2ee72079b6cc87ce4b0705761
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
A ckan/new_tests/__init__.py
A ckan/new_tests/data.py
A ckan/new_tests/helpers.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add new_tests dir with first new logic tests
Eventually (before this branch is merged into master) new_tests should
become tests and the current tests should become legacy_tests.
Commit: 3491cd695ec0c9758586d219c027165256fd7012
https://github.com/okfn/ckan/commit/3491cd695ec0c9758586d219c027165256fd7012
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add new tests for updating user names and passwords
...and also for what happens when you call user_update without a valid
id.
Commit: bc3baa951de74a61a96c10c2726b991d7ee88894
https://github.com/okfn/ckan/commit/bc3baa951de74a61a96c10c2726b991d7ee88894
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1117] user_update don't crash on non-string name
Don't crash if the user tries to update their user name to a value that
is not a string (which they can do, using the API)
Commit: f3165ce46cf2c2f16a79013fb23f79bdd821ca90
https://github.com/okfn/ckan/commit/f3165ce46cf2c2f16a79013fb23f79bdd821ca90
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1117] user_update: don't crash on non-string password
Fix a crash that happens if the user tries to update their password to a
value that isn't a string (which they can do, using the API)
Commit: 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: 41a1a727cbecfa8331b45b16bd2570c11b98af07
https://github.com/okfn/ckan/commit/41a1a727cbecfa8331b45b16bd2570c11b98af07
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Typo
Commit: 6d9f3b0ff9c2b2509cbdfb088fb76a5d161eba7e
https://github.com/okfn/ckan/commit/6d9f3b0ff9c2b2509cbdfb088fb76a5d161eba7e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/data.py
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Make various improvements to test_update.py
- Add some notes to the top of test_update.py about what I'm trying to do with
it, these will end up in the testing guidelines
- Make the static test data read-only
- Rename some of the test methods so that they're all test_user_update_*
- Add test_user_update_activity() test
- Other small tweaks
Commit: 683852c555928f1cff99e5863e63d8568f93a9e9
https://github.com/okfn/ckan/commit/683852c555928f1cff99e5863e63d8568f93a9e9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add some more user_update invalid password tests
Commit: df72fcbd336e29f3efa3b2d221dcd439c183762e
https://github.com/okfn/ckan/commit/df72fcbd336e29f3efa3b2d221dcd439c183762e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Fix some bad indentation
Commit: 7d1bdc511058e19f61080593f26a04b06f86bb43
https://github.com/okfn/ckan/commit/7d1bdc511058e19f61080593f26a04b06f86bb43
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add user_update custom schema test
Commit: 6276cb2e143bef2e108dc4c612c32832926f9b79
https://github.com/okfn/ckan/commit/6276cb2e143bef2e108dc4c612c32832926f9b79
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add test for user_update's defer_commit option
Commit: 482c4969afb32d796c231839d2d794d28daf90ae
https://github.com/okfn/ckan/commit/482c4969afb32d796c231839d2d794d28daf90ae
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
A doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Add draft testing coding standards doc
Commit: dab8d49e6d9a89df4e940cbed4282ab5d7698576
https://github.com/okfn/ckan/commit/dab8d49e6d9a89df4e940cbed4282ab5d7698576
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
A ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Add a few new-style tests for user_update auth
Commit: 19b0b016d5acb3162bb7fbaf40fc9c4320f384e8
https://github.com/okfn/ckan/commit/19b0b016d5acb3162bb7fbaf40fc9c4320f384e8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1117] Never return reset_keys in user dicts
Like the user's password, there's never any reason for a user dict to
contain their reset key (even if the user dict is being generated for
the user herself or for a sysadmin)
Commit: a956b1f7de469cf89a36441c2b11d12bb5fadcc7
https://github.com/okfn/ckan/commit/a956b1f7de469cf89a36441c2b11d12bb5fadcc7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/lib/navl/validators.py
A ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add docstring and unit tests for ignore_missing validator
Commit: ca16b016287d013f41abd033cb95085762ac96ca
https://github.com/okfn/ckan/commit/ca16b016287d013f41abd033cb95085762ac96ca
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add another ignore_missing test
Commit: 0365a9599e3050256879f982d5edeade1d0f3a83
https://github.com/okfn/ckan/commit/0365a9599e3050256879f982d5edeade1d0f3a83
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add some asserts to ignore_missing tests
Commit: 262adf316d0ac4131341fbd07e4cade16531d36d
https://github.com/okfn/ckan/commit/262adf316d0ac4131341fbd07e4cade16531d36d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Tweak a unit test
Commit: 69ea1ad0ca2c0d9a4ee1faf95c25e28b64d4cfe6
https://github.com/okfn/ckan/commit/69ea1ad0ca2c0d9a4ee1faf95c25e28b64d4cfe6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Combine three unit tests into one
Commit: e7d5c9d08ddf3153c08ee3e96ee8e6b956db7523
https://github.com/okfn/ckan/commit/e7d5c9d08ddf3153c08ee3e96ee8e6b956db7523
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Improve a unit test
Add some more realistic data and check that it doesn't get modified.
Commit: 476b8ff944eeab40f6c98a5334df69b6d6787332
https://github.com/okfn/ckan/commit/476b8ff944eeab40f6c98a5334df69b6d6787332
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Move some unit test code into helper functions
Commit: 854407ae96b0722a874dcceb14192b28eb7ffe1e
https://github.com/okfn/ckan/commit/854407ae96b0722a874dcceb14192b28eb7ffe1e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Tweak a couple of docstrings
Commit: ed12fa0f61a555baa33ef762085df2b214dd46dc
https://github.com/okfn/ckan/commit/ed12fa0f61a555baa33ef762085df2b214dd46dc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Move some test comments into asserts
This makes the output when tests fail more useful
Unfortunately I don't see how to do this with assert_raises.
Commit: 2f8e74a0e2bb39c2fec1bf9604ab6ada764c1f2b
https://github.com/okfn/ckan/commit/2f8e74a0e2bb39c2fec1bf9604ab6ada764c1f2b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Tweak a docstring
This is easier to read I think
Commit: e5d37e1d6543522aebd58ec9bcd1ef825179d0d2
https://github.com/okfn/ckan/commit/e5d37e1d6543522aebd58ec9bcd1ef825179d0d2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Make a unit test more realistic
Make it use the _data() and _errors() helper functions to get more
realistic (non-empty) data and errors dicts. This just makes the test a
little more thorough and realistic.
Commit: 404f06e778c6b9f2de8dea44c241769a598f2e7a
https://github.com/okfn/ckan/commit/404f06e778c6b9f2de8dea44c241769a598f2e7a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/logic/validators.py
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add new tests and docstring for name_validator()
There are no existing tests for this that I can see.
Commit: a0a3d93ca87df5c2af629dde365fe872c4c248d9
https://github.com/okfn/ckan/commit/a0a3d93ca87df5c2af629dde365fe872c4c248d9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add a valid unicode name to name_validator() test
Commit: f3d0de6208486528f0e08f7edcbba70faea2dd86
https://github.com/okfn/ckan/commit/f3d0de6208486528f0e08f7edcbba70faea2dd86
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Move some validator tests into the right test module
Oops :)
Commit: f234745c5f034ce59fb919dcf5536688a664bb88
https://github.com/okfn/ckan/commit/f234745c5f034ce59fb919dcf5536688a664bb88
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/data.py
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Move some helpers into shared test helper data module
Commit: a3485a1fa4a872abc3d29f382069f34785f72f1e
https://github.com/okfn/ckan/commit/a3485a1fa4a872abc3d29f382069f34785f72f1e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Add unit tests for user_name_validator()
Commit: 807b601f3ade09aac3f0ef0d530e947774e93975
https://github.com/okfn/ckan/commit/807b601f3ade09aac3f0ef0d530e947774e93975
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/logic/validators.py
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Fix user_password validator
Commit f3165ce (user_update: don't crash on non-string password)
unwittingly changed the behavior of user_password_validator(), causing
some legacy tests to fail:
If the given password is Missing or '' user_password_validator() should
*not* raise Invalid.
Fiux user_password_validator to not raise Invalid in these cases, so
that the tests pass again.
Commit: 51cd5d18c4005f469c6052a6bddc3275b6373cde
https://github.com/okfn/ckan/commit/51cd5d18c4005f469c6052a6bddc3275b6373cde
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/data.py
Log Message:
-----------
[#1117] Tweak a docstring
Commit: c6b953496177ca795ac9347eaf7986edb3049ed7
https://github.com/okfn/ckan/commit/c6b953496177ca795ac9347eaf7986edb3049ed7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1117] Refactor and add docstring to user_name_validator
- Add docstring
- Use model.User.get() to find whether a user exists, instead of a lot
of SQLAlchemy in ckan.logic.
This should make it easier to unit test user_name_validator() in
isolation, because the tests will only have to mock one method
ckan.model.User.get() instead of having to mock several things.
Also SQLAlchemy should just be in the model anyway, not in the logic.
- Refactor and add code comments to clarify the obscure thing that
user_name_validator() does with context['user_obj'] on user_update()s.
This was completely obscure before, now hopefully it's clearer.
(But it's a bad design anyway, user_create and user_update shouldn't
be sharing the same user_name_validator function.)
I don't *think* I broke anything by refactoring this (tests
are still passing).
Commit: 93d0d819cc68cc3e84b472eefdf4fa3f26f32c07
https://github.com/okfn/ckan/commit/93d0d819cc68cc3e84b472eefdf4fa3f26f32c07
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Mock ckan.model in user_name_validator() tests
Now that user_name_validator() has been refactored to call
model.User.get() instead of doing its own SQLAlchemy (commit c6b953),
it's really easy to mock ckan.model in the user_name_validator() unit
tests by just mocking the single method ckan.model.User.get().
This means the user_name_validator() unit tests no longer touch the disk
or db or bring in ckan.model.
Commit: eb6fd0a5ab53f60b0a43a797abcd62a8a45d84f0
https://github.com/okfn/ckan/commit/eb6fd0a5ab53f60b0a43a797abcd62a8a45d84f0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
A ckan/new_tests/factories.py
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add factory_boy to action tests
Add a new module ckan.new_tests.factories with (so far) just a User factory
class that uses the factory_boy library to create CKAN users.
Update the ckan.new_tests.logic.action.test_update tests to use this
factory instead of ckan.new_tests.data.
Still need to update the rest of the new tests to use the factory (and
also add factories for other classes such as dataset etc.), then data.py
can be deleted.
Still need to add factory_boy to dev-requirements.txt.
Commit: c556fabfd5c43b3ff0e775462b0831f1d59cee99
https://github.com/okfn/ckan/commit/c556fabfd5c43b3ff0e775462b0831f1d59cee99
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Use factory in auth/test_update.py
Instead of data.py.
Commit: a5fe9e6e231dbc64f729427323c677d415c60744
https://github.com/okfn/ckan/commit/a5fe9e6e231dbc64f729427323c677d415c60744
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Remove data.py from test_validators.py
Move the helper functions it was using into factories.py and make it use
that instead.
Commit: fe8eec0f4bde1f4b23d71d49584e434c78148d91
https://github.com/okfn/ckan/commit/fe8eec0f4bde1f4b23d71d49584e434c78148d91
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
R ckan/new_tests/data.py
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Use factories instead of data in navl/test_validators.py
So data.py is now unused and we can remove it.
Commit: 3e7f6900882804a1a0b9560333654306f4e8cee1
https://github.com/okfn/ckan/commit/3e7f6900882804a1a0b9560333654306f4e8cee1
Author: John Martin <me at johnmart.in>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/public/base/less/homepage.less
M ckan/templates/home/index.html
A ckanext/homepage/__init__.py
A ckanext/homepage/plugin.py
A ckanext/homepage/theme/templates/home/index.html
A ckanext/homepage/theme/templates/home/snippets/featured_group.html
A ckanext/homepage/theme/templates/home/snippets/featured_organization.html
A ckanext/homepage/theme/templates/home/snippets/promoted.html
A ckanext/homepage/theme/templates/home/snippets/search.html
M setup.py
Log Message:
-----------
[#1126] First run at new homepage modules core extension
Commit: 7910f78ce23a049eb5cdd53efa1f2f117f65b0b9
https://github.com/okfn/ckan/commit/7910f78ce23a049eb5cdd53efa1f2f117f65b0b9
Author: John Martin <me at johnmart.in>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/templates/admin/config.html
A ckanext/homepage/theme/templates/admin/config.html
Log Message:
-----------
[#1126] Added config for sysadmin area
Commit: a957533216a07e6e03daabb4a78cdd0a17f6695f
https://github.com/okfn/ckan/commit/a957533216a07e6e03daabb4a78cdd0a17f6695f
Author: John Martin <me at johnmart.in>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/public/base/less/homepage.less
M ckan/templates/home/index.html
M ckanext/homepage/theme/templates/home/index.html
M ckanext/homepage/theme/templates/home/snippets/featured_group.html
M ckanext/homepage/theme/templates/home/snippets/featured_organization.html
M ckanext/homepage/theme/templates/home/snippets/promoted.html
M ckanext/homepage/theme/templates/home/snippets/search.html
Log Message:
-----------
[#1126] Simplified snippets and added temporary homepage layour variable
Commit: c3c39ea055dba142228e31e63991c3bd96edbbc4
https://github.com/okfn/ckan/commit/c3c39ea055dba142228e31e63991c3bd96edbbc4
Author: John Martin <me at johnmart.in>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/controllers/home.py
M ckan/public/base/less/homepage.less
R ckanext/homepage/theme/templates/home/index.html
A ckanext/homepage/theme/templates/home/layout1.html
A ckanext/homepage/theme/templates/home/layout2.html
Log Message:
-----------
[#1126] Simplified templates for new homepage modules
Commit: 8481935e46dd473a64d9770b7c080be2edeb979f
https://github.com/okfn/ckan/commit/8481935e46dd473a64d9770b7c080be2edeb979f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Add some helper decorators to validators tests
Add a bunch of helper decorators at the top of the file, and change the
test methods below to use them.
Commit: d8dfa43664dab6d19031aee990815951c15f09f4
https://github.com/okfn/ckan/commit/d8dfa43664dab6d19031aee990815951c15f09f4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Add some helper decorators to validators tests
Add a bunch of helper decorators at the top of the file, and change the
test methods below to use them.
Commit: 1f9540162c1dee8609f49fb853601d4d712ee80a
https://github.com/okfn/ckan/commit/1f9540162c1dee8609f49fb853601d4d712ee80a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
R ckan/new_tests/data.py
A ckan/new_tests/factories.py
M ckan/new_tests/lib/navl/test_validators.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/auth/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
Merge branch '1117-factory_boy' into 1117-start-new-test-suite
Commit: 782fc4b166fb48e8ea1e8c5e7236e88b53950df0
https://github.com/okfn/ckan/commit/782fc4b166fb48e8ea1e8c5e7236e88b53950df0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Remove duplicated helper decorators :/
Commit: 1bb66d777326e9ca965c4d28bf87f35da8a97df6
https://github.com/okfn/ckan/commit/1bb66d777326e9ca965c4d28bf87f35da8a97df6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M .tx/config
M CONTRIBUTING.rst
M bin/ckan_spam.py
M bin/travis-build
R build.sh
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/lib/base.py
M ckan/lib/datapreview.py
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/__init__.py
M ckan/lib/package_saver.py
M ckan/lib/plugins.py
M ckan/lib/render.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/model/extension.py
M ckan/model/modification.py
M ckan/model/package_relationship.py
M ckan/model/resource.py
M ckan/plugins/core.py
M ckan/public/base/css/main.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
R ckan/public/base/less/font-awesome.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/modules/custom-fields.spec.js
M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
M ckan/public/base/test/vendor/mocha.css
M ckan/public/base/test/vendor/mocha.js
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/js/.jshintrc
M ckan/public/base/vendor/bootstrap/js/bootstrap.js
M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
M ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
A ckan/public/base/vendor/font-awesome/less/bootstrap.less
A ckan/public/base/vendor/font-awesome/less/core.less
A ckan/public/base/vendor/font-awesome/less/extras.less
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
A ckan/public/base/vendor/font-awesome/less/icons.less
A ckan/public/base/vendor/font-awesome/less/mixins.less
A ckan/public/base/vendor/font-awesome/less/path.less
A ckan/public/base/vendor/font-awesome/less/variables.less
M ckan/public/base/vendor/jquery.js
M ckan/public/base/vendor/resource.config
M ckan/templates/ajax_snippets/related-item.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/stages.html
M ckan/templates/user/edit_user_form.html
M ckan/tests/__init__.py
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/ckantestplugin/setup.cfg
R ckan/tests/ckantestplugin/setup.py
A ckan/tests/ckantestplugins.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/test_revision_search.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_preview_interface.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/mock_plugin.py
M ckan/tests/models/test_package_relationships.py
M ckan/tests/test_coding_standards.py
M ckan/tests/test_plugins.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_configure.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/reclinepreview/tests/test_preview.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/stats/stats.py
M ckanext/test_tag_vocab_plugin.py
M ckanext/textpreview/plugin.py
M ckanext/textpreview/tests/test_preview.py
A doc/changelog.rst
M doc/documentation-guidelines.rst
M doc/templating.rst
M doc/upgrade-source.rst
R fabfile.py
R jshint.json
M setup.py
M test-core.ini
R test_sync.ini
R test_sync2.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: a541fc56c36c2df9a7f1aaee72915880a70dd748
https://github.com/okfn/ckan/commit/a541fc56c36c2df9a7f1aaee72915880a70dd748
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M doc/test.rst
Log Message:
-----------
[#1117] Remove SQLite from testing docs
Commit: a87c0ba85c8fa3777c4761fa1a2483a217210548
https://github.com/okfn/ckan/commit/a87c0ba85c8fa3777c4761fa1a2483a217210548
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M doc/test.rst
Log Message:
-----------
[#1117] Minor edits to testing docs
Commit: 7a9d31a14a271d75153a0fad2dec0d21b3571c0d
https://github.com/okfn/ckan/commit/7a9d31a14a271d75153a0fad2dec0d21b3571c0d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M dev-requirements.txt
Log Message:
-----------
[#1117] Add mock and factory-boy to dev-requirements.txt
Commit: 1267791442003c995110abb4b15792db9f2cbb94
https://github.com/okfn/ckan/commit/1267791442003c995110abb4b15792db9f2cbb94
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M dev-requirements.txt
Log Message:
-----------
Merge branch '1117-start-new-test-suite' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: 3a0bb7658395b17f60c4ee57e16866e4609c80a1
https://github.com/okfn/ckan/commit/3a0bb7658395b17f60c4ee57e16866e4609c80a1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckan/new_tests/lib/navl/test_validators.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/auth/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] PEP8 fixes
Make the PEP8 tests happy
Commit: 282545ca9ece66eba8da9078de012ded815d2e00
https://github.com/okfn/ckan/commit/282545ca9ece66eba8da9078de012ded815d2e00
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
A __init__.py b/ckan/new_tests/lib/__init__.py
A ckan/new_tests/logic/auth/__init__.py
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
[#1117] Add __init__.py files to new_tests subdirs
This means that nosetests finds the test modules when given a directory
as argument (and not just when you tell it the exact test file)
Commit: 135c59b3de2d518643d94ea5faaa033801135792
https://github.com/okfn/ckan/commit/135c59b3de2d518643d94ea5faaa033801135792
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Remove uses of assert_raises as context manager
Using assert_raises as a context manager isn't supported in Python 2.6.
Tests were failing on Travis when run with Python 2.6. Hopefully this
fixes them.
Commit: b705361263ce686bebbb107dbc8bbecde5f7abf1
https://github.com/okfn/ckan/commit/b705361263ce686bebbb107dbc8bbecde5f7abf1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/auth/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Remove setup db stuff from some new test classes
Only test classes that use the db (which should be few of them) need to
do things like cleaning and initing the db. This makes the tests much
faster.
Commit: a0a2f699b156f9a5bec0e545ba5b3e51e93aabcd
https://github.com/okfn/ckan/commit/a0a2f699b156f9a5bec0e545ba5b3e51e93aabcd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Always use `as context` when doing `with nose.tools.assert_raises`
It looks like `with nose.tools.assert_raises:` without the `as context`
doesn't work in Python 2.6. In commit 135c59b3de2d518643d94ea I thought
it was the other way round. Hopefully *this* fixes the tests with Python
2.6.
Commit: cbd8d8910727bc1d0d26e06048b50096537e746e
https://github.com/okfn/ckan/commit/cbd8d8910727bc1d0d26e06048b50096537e746e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Don't use `with nose.tools.assert_raises`
Third attempt to fix the new tests in Python 2.6. Looks like using
assert_raises as a context manager doesn't work in Python 2.6 at all.
Just use nose.tools.assert_raises(...) normally instead.
Commit: 6195c2935f27a588d215d4aa3514bb75d0b74f97
https://github.com/okfn/ckan/commit/6195c2935f27a588d215d4aa3514bb75d0b74f97
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/ckan_nose_plugin.py
Log Message:
-----------
[#1117] Skip ckan_nose_plugin's db stuff for new tests
Commit: 8bcccd2b7f4637f0fb0b0fd055254feb30258a05
https://github.com/okfn/ckan/commit/8bcccd2b7f4637f0fb0b0fd055254feb30258a05
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/tests/lib/test_navl.py
Log Message:
-----------
[#1117] Remove a legacy test for ignore_missing
ignore_missing() unit tests in ckan/new_tests/ have replaced this now.
Commit: e947f4aa3c4d1c5eeed58f4bf1775ac2f8e51999
https://github.com/okfn/ckan/commit/e947f4aa3c4d1c5eeed58f4bf1775ac2f8e51999
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add a new test for updating multiple user attributes at once
Commit: 650807ecfa05e62cd34193672206b18e2329cef6
https://github.com/okfn/ckan/commit/650807ecfa05e62cd34193672206b18e2329cef6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add another condition to a user_update test
Commit: bdc088497a22120fbbdaccb1b97fe1f6d889b0a2
https://github.com/okfn/ckan/commit/bdc088497a22120fbbdaccb1b97fe1f6d889b0a2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add a test for user_update's annoying email behavior
Commit: 3baf152cb7af29789512d33490ccb7b77ee3c1ea
https://github.com/okfn/ckan/commit/3baf152cb7af29789512d33490ccb7b77ee3c1ea
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add tests that user_update doesn't return password, apikey, etc.
Commit: 0eb154830f122819e4f896338a4b4cc38008ab04
https://github.com/okfn/ckan/commit/0eb154830f122819e4f896338a4b4cc38008ab04
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Fix silly test class name
Commit: ccc47e015be43128b8b557cb3fa41979cc1e920b
https://github.com/okfn/ckan/commit/ccc47e015be43128b8b557cb3fa41979cc1e920b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1117] Remove legacy user_update tests
These have been replaced by new-style tests in ckan/new_tests/
Commit: 4f341650cb2f6ce173d17434a1fbcb025ff70f46
https://github.com/okfn/ckan/commit/4f341650cb2f6ce173d17434a1fbcb025ff70f46
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Add mocking to user_update auth tests
These tests now run without touching the model.
Also added one extra test case.
Commit: 081e1262e064d14f887ef121c439adb8507977c9
https://github.com/okfn/ckan/commit/081e1262e064d14f887ef121c439adb8507977c9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Move call_auth() into test helpers
Where other auth test modules can use it.
Also add a complete docstring.
Commit: f61f31910831d76b2dbff875e789ea22c201c822
https://github.com/okfn/ckan/commit/f61f31910831d76b2dbff875e789ea22c201c822
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Check error messages in user_update auth tests
Commit: 15daad72548844234704b34a99b99dfabaac9064
https://github.com/okfn/ckan/commit/15daad72548844234704b34a99b99dfabaac9064
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1117] Optimize the reset_db() test helper function
This version is faster. Code from @joetsoi
Commit: 2f85e0bc7e45963e10b5d780df9bc3c39816464f
https://github.com/okfn/ckan/commit/2f85e0bc7e45963e10b5d780df9bc3c39816464f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Remove an unused import
Commit: 17626e4172d335e84d436c974015ee0b67c774ee
https://github.com/okfn/ckan/commit/17626e4172d335e84d436c974015ee0b67c774ee
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add helper decorators to navl/test_validators.py
Commit: 8feecf5d4819d610dd62617b8cad8d941cef57e2
https://github.com/okfn/ckan/commit/8feecf5d4819d610dd62617b8cad8d941cef57e2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M CONTRIBUTING.rst
A ckan/new_tests/controllers/__init__.py
M ckan/new_tests/factories.py
M ckan/new_tests/helpers.py
M ckan/new_tests/lib/__init__.py
M ckan/new_tests/logic/action/__init__.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/auth/__init__.py
M ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
M ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M doc/multilingual.rst
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Lots of work on the testing coding standards
Commit: b16f6fe07003a5d2e3f9f95aea64a14e60a6665b
https://github.com/okfn/ckan/commit/b16f6fe07003a5d2e3f9f95aea64a14e60a6665b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/get.py
M ckan/new_authz.py
M doc/conf.py
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: 1b73733cdf5aa4a490bd4407159afbe4bddf64c9
https://github.com/okfn/ckan/commit/1b73733cdf5aa4a490bd4407159afbe4bddf64c9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/logic/auth/__init__.py
Log Message:
-----------
[#1117] PEP8
Commit: 669aefb71e7d4c5b72366c5dbae60d4f45bf313a
https://github.com/okfn/ckan/commit/669aefb71e7d4c5b72366c5dbae60d4f45bf313a
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-08-11 (Sun, 11 Aug 2013)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1117] use model.repo.delete_all() in test helpers
Commit: 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: 7c60ba441dcbdb309e82344a6a981b87243a20a3
https://github.com/okfn/ckan/commit/7c60ba441dcbdb309e82344a6a981b87243a20a3
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/user.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/create_test_data.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/auth/delete.py
A ckan/migration/versions/070_add_state_column_to_user_table.py
M ckan/model/follower.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read_base.html
M ckan/tests/functional/test_user.py
A ckan/tests/lib/test_authenticator.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
A ckan/tests/models/test_follower.py
M ckan/tests/models/test_user.py
Log Message:
-----------
[#1163] Users can be deleted
To do this, I've configured the User model to be stateful using vdm.sqlalchemy.
Right now, there're two states: active and deleted. If a user is deleted, he
can't login, and is unauthorized to do anything. She also doesn't appear in the
user's list anymore, but you can still access her profile page, if you know her
username.
If she was logged in when her user was deleted, the next time she goes into
CKAN, she'll be logged off. Unfortunately, there's not a useful message like
"Your user has been deleted." Yet.
There's no way to undelete a user, but it should be simply creating an
action to set her state to active.
Commit: ad2de00a4e2c2772d1e59faee26ca818731168c9
https://github.com/okfn/ckan/commit/ad2de00a4e2c2772d1e59faee26ca818731168c9
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/migration/versions/070_add_state_column_to_user_table.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/user.py
Log Message:
-----------
[#1163] Use ckan.model.State instead of vdm.sqlalchemy.State
This makes us a bit less tied to vdm.
Commit: d6fde48e5cd73a2d0754b3ceb9fe6319deedaa20
https://github.com/okfn/ckan/commit/d6fde48e5cd73a2d0754b3ceb9fe6319deedaa20
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/migration/versions/070_add_state_column_to_user_table.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/user.py
Log Message:
-----------
[#1163] Use ckan.model.core.State instead of ckan.model.State
With this change, we're able to avoid having to load ckan.model inside methods,
to avoid circular dependencies.
Commit: 89a38101afe7b1415d431cdffc013e45bf90bf67
https://github.com/okfn/ckan/commit/89a38101afe7b1415d431cdffc013e45bf90bf67
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/tests/lib/test_authenticator.py
M ckan/tests/logic/test_auth.py
M ckan/tests/models/test_user.py
Log Message:
-----------
[#1178] Add PENDING state to User
Commit: c0c6803b574d48016af6185fd0a2a71605567a77
https://github.com/okfn/ckan/commit/c0c6803b574d48016af6185fd0a2a71605567a77
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M ckan/controllers/user.py
M ckan/tests/functional/test_user.py
Log Message:
-----------
[#1178] The user is activated when it performs the reset password
Commit: 74f649c9e3eb0690f5e48f939b4546b415b0777b
https://github.com/okfn/ckan/commit/74f649c9e3eb0690f5e48f939b4546b415b0777b
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M ckan/controllers/user.py
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/logic/schema.py
M ckan/new_authz.py
M ckan/tests/functional/test_user.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
M dev-requirements.txt
Log Message:
-----------
[#1178] Admins can invite users
The invited user starts in pending state, with the password reset key set. We
still have to send an email to the user telling him/her to change the password
and log in.
I had to change authorization code to only automatically unauthorize deleted
users, not pending. This was because the users needs to be able to perform the
password reset when pending, to be able to become active.
Commit: 31523cd27a35958c2f0660a2762bcfd0274c8006
https://github.com/okfn/ckan/commit/31523cd27a35958c2f0660a2762bcfd0274c8006
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1178] perform_reset uses the received id as the context's user
When performing a password reset, the user is probably (always?) not logged in.
So c.user is an empty string. So, the auth functions have no way to tell which
user is trying to reset his/her password.
This worked fine before, because everyone was able to reset the password. But
now that we've got users in DELETED state, it's not the case anymore.
Commit: e5890740164c38ca0ebf10bf25a297b0b634e204
https://github.com/okfn/ckan/commit/e5890740164c38ca0ebf10bf25a297b0b634e204
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-16 (Fri, 16 Aug 2013)
Changed paths:
M ckan/lib/mailer.py
M ckan/logic/action/create.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1178] Send email to the invited user
I removed the time.sleep(0.1) on TestMailer. Looking through the code, I
couldn't find anywhere where a timer looked needed. And I ran these tests a
hundred times without the timer to see if I could make them fail, but no. So, I
guess they're not needed anymore.
I also had to move the RESET_LINK_MESSAGE inside get_reset_link_body(). This
was because, when importing ckan.lib.mailer in ckan.logic.action.create.py, I
got:
TypeError: No object (name: translator) has been registered for this thread
This seems to be because we were using _() before pylons had a change to set up
the translator. Moving it inside the method solves this.
Commit: 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: f2f9095926e143ef7a1fe46f613c88bbf1096478
https://github.com/okfn/ckan/commit/f2f9095926e143ef7a1fe46f613c88bbf1096478
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/model/user.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#1178] Adds user to organization when inviting, and only org admins can invite
Commit: 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: 6b1b6f082a402a43815565a82ba407caeb07edcd
https://github.com/okfn/ckan/commit/6b1b6f082a402a43815565a82ba407caeb07edcd
Author: John Martin <me at johnmart.in>
Date: 2013-08-29 (Thu, 29 Aug 2013)
Changed paths:
M ckanext/homepage/plugin.py
M ckanext/homepage/theme/templates/home/snippets/featured_group.html
M ckanext/homepage/theme/templates/home/snippets/featured_organization.html
Log Message:
-----------
[#1126] Brings featured groups/orgs from from be06121 into this branch
It's just a slightly edited version of
https://github.com/okfn/ckan/blob/be06121/ckanext/featured/plugin.py as now
the helpers are returning data and not data+html.
Commit: 8bd5d35fc29ccf539dcee78979b80329f04bf664
https://github.com/okfn/ckan/commit/8bd5d35fc29ccf539dcee78979b80329f04bf664
Author: amercader <amercadero at gmail.com>
Date: 2013-08-29 (Thu, 29 Aug 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/config/solr/schema-2.0.xml
M ckan/controllers/feed.py
A ckan/i18n/ar/LC_MESSAGES/ckan.mo
A ckan/i18n/ar/LC_MESSAGES/ckan.po
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/dv/LC_MESSAGES/ckan.mo
M ckan/i18n/dv/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/id/LC_MESSAGES/ckan.mo
M ckan/i18n/id/LC_MESSAGES/ckan.po
M ckan/i18n/is/LC_MESSAGES/ckan.mo
M ckan/i18n/is/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/ja/LC_MESSAGES/ckan.mo
M ckan/i18n/ja/LC_MESSAGES/ckan.po
A ckan/i18n/km/LC_MESSAGES/ckan.mo
A ckan/i18n/km/LC_MESSAGES/ckan.po
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/tr/LC_MESSAGES/ckan.mo
M ckan/i18n/tr/LC_MESSAGES/ckan.po
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/dictization/model_dictize.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
A ckan/migration/versions/069_resource_url_and_metadata_modified.py
A ckan/migration/versions/070_add_activity_and_resource_indexes.py
M ckan/model/activity.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/templates/group/snippets/group_form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/snippets/activity_item.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
A ckan/tests/models/test_activity.py
M ckan/tests/models/test_package.py
M ckan/tests/test_plugins.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_dump.py
M ckanext/multilingual/solr/schema.xml
M ckanext/reclinepreview/theme/public/resource.config
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M dev-requirements.txt
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
M doc/install-from-source.rst
M doc/test.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
M doc/upgrade-source.rst
M doc/upgrading.rst
A pip-requirements-docs.txt
A requirements.in
M requirements.txt
M setup.py
Log Message:
-----------
Merge branch 'master' into 1117-start-new-test-suite
Commit: b75524ee9b74166428555c6c5f76db7f58c67f14
https://github.com/okfn/ckan/commit/b75524ee9b74166428555c6c5f76db7f58c67f14
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-29 (Thu, 29 Aug 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/model/user.py
M ckan/templates/group/member_new.html
M ckan/templates/organization/member_new.html
M ckan/tests/functional/test_group.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#1178] Invite user on add member to organization/group
I've added an "Email" field to the "Add Member" to Organization/Group page. If
you add an e-mail there, we'll create a new user and invite her (doesn't matter
if there's already a user with the same email).
I still need to change the template and add help texts.
Commit: 1503ffa654d2d09dfe7de9333622c9e1edd9564a
https://github.com/okfn/ckan/commit/1503ffa654d2d09dfe7de9333622c9e1edd9564a
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-31 (Sat, 31 Aug 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/config/solr/schema-2.0.xml
A ckan/i18n/ar/LC_MESSAGES/ckan.mo
A ckan/i18n/ar/LC_MESSAGES/ckan.po
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/dv/LC_MESSAGES/ckan.mo
M ckan/i18n/dv/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/id/LC_MESSAGES/ckan.mo
M ckan/i18n/id/LC_MESSAGES/ckan.po
M ckan/i18n/is/LC_MESSAGES/ckan.mo
M ckan/i18n/is/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/ja/LC_MESSAGES/ckan.mo
M ckan/i18n/ja/LC_MESSAGES/ckan.po
A ckan/i18n/km/LC_MESSAGES/ckan.mo
A ckan/i18n/km/LC_MESSAGES/ckan.po
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/tr/LC_MESSAGES/ckan.mo
M ckan/i18n/tr/LC_MESSAGES/ckan.po
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/dictization/model_dictize.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
A ckan/migration/versions/070_add_activity_and_resource_indexes.py
M ckan/model/activity.py
M ckan/new_authz.py
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/templates/group/snippets/group_form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/snippets/activity_item.html
M ckan/tests/functional/test_package.py
M ckan/tests/logic/test_action.py
A ckan/tests/models/test_activity.py
M ckan/tests/test_plugins.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/multilingual/solr/schema.xml
M ckanext/reclinepreview/theme/public/resource.config
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M dev-requirements.txt
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
M doc/install-from-source.rst
M doc/python-coding-standards.rst
M doc/test.rst
M doc/upgrade-source.rst
A pip-requirements-docs.txt
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into 1178-users-invitations
Commit: 89db2ed23ca5cb0136a44d2829f2e713f2b2558d
https://github.com/okfn/ckan/commit/89db2ed23ca5cb0136a44d2829f2e713f2b2558d
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-08-31 (Sat, 31 Aug 2013)
Changed paths:
R ckan/migration/versions/070_add_state_column_to_user_table.py
A ckan/migration/versions/071_add_state_column_to_user_table.py
Log Message:
-----------
[#1178] Move migration from 070 to 071, as we have a new 070
Commit: 7b57f322c21b175e2f13035b68367171e65bdde7
https://github.com/okfn/ckan/commit/7b57f322c21b175e2f13035b68367171e65bdde7
Author: amercader <amercadero at gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#1218] Ignore __extras on package_show extras
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: bf28f1a1a1a0b05fb17f4e8b3e5684f199120709
https://github.com/okfn/ckan/commit/bf28f1a1a1a0b05fb17f4e8b3e5684f199120709
Author: kindly <kindly at gmail.com>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
M ckanext/homepage/plugin.py
R ckanext/homepage/theme/templates/admin/config.html
Log Message:
-----------
add stats and make homepage_style config option
Commit: 87d0b8b520e1f4860bec04b2a6e5edd67a40b33e
https://github.com/okfn/ckan/commit/87d0b8b520e1f4860bec04b2a6e5edd67a40b33e
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#1228] strip whitespace from title in model_dictize.package_dictize
Commit: 40397fe5c9bd0e2703f0d4e26227863c6cbc6b4a
https://github.com/okfn/ckan/commit/40397fe5c9bd0e2703f0d4e26227863c6cbc6b4a
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/group/member_new.html
M ckan/templates/organization/member_new.html
Log Message:
-----------
[#1178] Add help text to the add member forms
Commit: 08c45188a91f64d121f0d7ed753e461de7df277d
https://github.com/okfn/ckan/commit/08c45188a91f64d121f0d7ed753e461de7df277d
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/configuration.rst
Log Message:
-----------
Merge branch 'master' into 1178-users-invitations
Commit: 0f710ac9888b83977641d082eddf59be97023592
https://github.com/okfn/ckan/commit/0f710ac9888b83977641d082eddf59be97023592
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/index.rst
M doc/tag-vocabularies.rst
R doc/toolkit.rst
R doc/writing-extensions.rst
M setup.py
Log Message:
-----------
Merge branch 'master' into 1178-users-invitations
Commit: 2adda64767ea178e558ccd6844b84efe267a6dcf
https://github.com/okfn/ckan/commit/2adda64767ea178e558ccd6844b84efe267a6dcf
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M ckan/migration/versions/071_add_state_column_to_user_table.py
Log Message:
-----------
[#1178] Fix typo exeecute -> execute in migration
Commit: 6327e2454ae5a98df9e71ecd27725aa0ea9f2e2d
https://github.com/okfn/ckan/commit/6327e2454ae5a98df9e71ecd27725aa0ea9f2e2d
Author: Ian Ward <ian at excess.org>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#772] explaion plugin loading order
Commit: 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: 0c8bbd171f6b919de112f1f33045c0475aae6402
https://github.com/okfn/ckan/commit/0c8bbd171f6b919de112f1f33045c0475aae6402
Author: John Martin <me at johnmart.in>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M ckan/controllers/admin.py
M ckan/controllers/home.py
M ckan/public/base/less/homepage.less
M ckanext/homepage/theme/templates/home/layout2.html
A ckanext/homepage/theme/templates/home/layout3.html
A ckanext/homepage/theme/templates/home/snippets/stats.html
Log Message:
-----------
[#1126] Added stats and new layouts 2 and 3 for homepage
Commit: 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: b0f3e643b2640c2a717d56f802a5d61477fcf7f3
https://github.com/okfn/ckan/commit/b0f3e643b2640c2a717d56f802a5d61477fcf7f3
Author: amercader <amercadero at gmail.com>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1237] Improve facet.limit search option
A negative value should be allowed if you don't want to limit the facet
values, but the search params schema didn't allow it. Also mention in
the docs that this can be set via configuration and that the default is
50. Added some tests.
Commit: 2d76140db869595b83d2d501380bbe9f248192f5
https://github.com/okfn/ckan/commit/2d76140db869595b83d2d501380bbe9f248192f5
Author: John Martin <me at johnmart.in>
Date: 2013-09-11 (Wed, 11 Sep 2013)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/organization/member_new.html
Log Message:
-----------
[#1178] Small CSS tweaks and fix for premature closing div
Commit: 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: f03e409b6e8eed6633cf530ff8cf08b882d1b726
https://github.com/okfn/ckan/commit/f03e409b6e8eed6633cf530ff8cf08b882d1b726
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#848] Fix configuration name search.facet.limits -> search.facet.limit
Commit: 43afc32641e9d09293ebb5276f1098598770ff3a
https://github.com/okfn/ckan/commit/43afc32641e9d09293ebb5276f1098598770ff3a
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#848] extra_template_paths and extra_public_paths aren't deprecated
Commit: fca56dceb35bae9889b2b017af0a8b38afddec15
https://github.com/okfn/ckan/commit/fca56dceb35bae9889b2b017af0a8b38afddec15
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#848] ckan.template_footer_end is deprecated
Commit: 2994a3c3232a8134746337ff528ff613c1844565
https://github.com/okfn/ckan/commit/2994a3c3232a8134746337ff528ff613c1844565
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#848] Reorganize and add examples of FileStore's configuration parameters
Commit: 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: d1e8b9d40e864520ad26425eada1a7af0595390b
https://github.com/okfn/ckan/commit/d1e8b9d40e864520ad26425eada1a7af0595390b
Author: John Martin <me at johnmart.in>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#1187] Adds source URL and version to package form
Commit: 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: 736a614980f6876d632e0724434d77f93dc7e00a
https://github.com/okfn/ckan/commit/736a614980f6876d632e0724434d77f93dc7e00a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Remove testing guidelines about assert messages
This is unnecessary in most cases, should be clear from the test name
(or else the test may be doing too much)
Commit: c5ea35f1db74e228aa1e47dbe92ca6db0b6c5ec4
https://github.com/okfn/ckan/commit/c5ea35f1db74e228aa1e47dbe92ca6db0b6c5ec4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Add factories.MockUser class
Commit: e50a79c7382a400d5491e8f7af91c55f6ee8c93a
https://github.com/okfn/ckan/commit/e50a79c7382a400d5491e8f7af91c55f6ee8c93a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Remove an unnecessary deepcopy
Commit: 084feee3bc7b94f70ec6282d90ba122b74342c1c
https://github.com/okfn/ckan/commit/084feee3bc7b94f70ec6282d90ba122b74342c1c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Simplify a test decorator
Commit: 696f98b392d659211d4c04f60418bc206462a46d
https://github.com/okfn/ckan/commit/696f98b392d659211d4c04f60418bc206462a46d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Simplify some more test decorators
Commit: cf157df17944f68efd37be119e23f7cf06f6125b
https://github.com/okfn/ckan/commit/cf157df17944f68efd37be119e23f7cf06f6125b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Simplify some more test decorators
And also remove some duplicated test decorators
Commit: 5acbbdb56df2fcd937bc2020f536712271076a39
https://github.com/okfn/ckan/commit/5acbbdb56df2fcd937bc2020f536712271076a39
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/config/deployment.ini_tmpl
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/index.rst
M doc/python-coding-standards.rst
M doc/tag-vocabularies.rst
R doc/toolkit.rst
R doc/writing-extensions.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: 5ca99eee04dae54c9f9542bb21b1114294365445
https://github.com/okfn/ckan/commit/5ca99eee04dae54c9f9542bb21b1114294365445
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1117] Tests use clean_db() not delete_all()
This fixes crashes when the database was not initialized or was only
partially initialized
Commit: d528a7de03e528d07d1fdca5788c4566fe216b18
https://github.com/okfn/ckan/commit/d528a7de03e528d07d1fdca5788c4566fe216b18
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M doc/index.rst
A doc/sysadmin-guide.rst
A doc/user-guide.rst
Log Message:
-----------
[#1253] Move user guides from the wiki to the repository
Commit: a7acd293cd4c3350e78b17767d1206edcced2e2f
https://github.com/okfn/ckan/commit/a7acd293cd4c3350e78b17767d1206edcced2e2f
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M doc/sysadmin-guide.rst
Log Message:
-----------
[#1253] Remove contents block and fix warning on the sysadmin guide
Commit: 8066b33de4f139342ebceb6f3b9d263acfd8cf17
https://github.com/okfn/ckan/commit/8066b33de4f139342ebceb6f3b9d263acfd8cf17
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
A doc/images/create_organization.jpg
A doc/images/customize_look_and_feel.jpg
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/move_dataset_between_organizations.jpg
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/sysadmin-guide.rst
M doc/user-guide.rst
Log Message:
-----------
[#1253] Get images into our repository, instead of Flickr
Commit: 31e341dd7d0c7f34ee8981663719bf03982109b1
https://github.com/okfn/ckan/commit/31e341dd7d0c7f34ee8981663719bf03982109b1
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M doc/user-guide.rst
Log Message:
-----------
[#1253] Fixing licence -> license to follow US English
Commit: e7db320c5f514048f18e892e3158bfe0c4c83c1f
https://github.com/okfn/ckan/commit/e7db320c5f514048f18e892e3158bfe0c4c83c1f
Author: Guy Sheffer <guysoft at gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
M doc/i18n.rst
Log Message:
-----------
Add notes and changes to new language submission, since pull requests are not accepted anymore
Commit: c8a483a77f82c4c8a545c569e87cd7843a3d92dc
https://github.com/okfn/ckan/commit/c8a483a77f82c4c8a545c569e87cd7843a3d92dc
Author: kindly <kindly at gmail.com>
Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths:
M ckanext/datastore/logic/action.py
Log Message:
-----------
[#1221] use write url for search as this uses correct priviledges
Commit: 708da6f5979e4973113f904ad98900aeea4acbc6
https://github.com/okfn/ckan/commit/708da6f5979e4973113f904ad98900aeea4acbc6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M CHANGELOG.rst
M ckan/logic/action/create.py
M ckan/templates/header.html
M ckan/templates/organization/member_new.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/login.html
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: 9147540ab8e381a41ab849239b919c19a2641a35
https://github.com/okfn/ckan/commit/9147540ab8e381a41ab849239b919c19a2641a35
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/new_tests/controllers/__init__.py
M ckan/new_tests/logic/action/__init__.py
M ckan/new_tests/logic/action/test_update.py
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Discourage overuse of mocking
Tweak the testing guidelines to discourage overuse of mocking.
Commit: 098ac5de1ece4a5851a2ee4cd4290847f3472aeb
https://github.com/okfn/ckan/commit/098ac5de1ece4a5851a2ee4cd4290847f3472aeb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Add another example to testing guidelines
Commit: af2ed73934b49cece0920266d0dba3b025ac114e
https://github.com/okfn/ckan/commit/af2ed73934b49cece0920266d0dba3b025ac114e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/new_tests/helpers.py
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Testing guidelines small tweaks
Commit: 841ab9d9a88b70523a3cd0fad7275d0c225ab67f
https://github.com/okfn/ckan/commit/841ab9d9a88b70523a3cd0fad7275d0c225ab67f
Author: John Martin <me at johnmart.in>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M CONTRIBUTING.rst
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/solr/schema-2.0.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
A ckan/i18n/ar/LC_MESSAGES/ckan.mo
A ckan/i18n/ar/LC_MESSAGES/ckan.po
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/dv/LC_MESSAGES/ckan.mo
M ckan/i18n/dv/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/id/LC_MESSAGES/ckan.mo
M ckan/i18n/id/LC_MESSAGES/ckan.po
M ckan/i18n/is/LC_MESSAGES/ckan.mo
M ckan/i18n/is/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/ja/LC_MESSAGES/ckan.mo
M ckan/i18n/ja/LC_MESSAGES/ckan.po
A ckan/i18n/km/LC_MESSAGES/ckan.mo
A ckan/i18n/km/LC_MESSAGES/ckan.po
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/tr/LC_MESSAGES/ckan.mo
M ckan/i18n/tr/LC_MESSAGES/ckan.po
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/069_resource_url_and_metadata_modified.py
A ckan/migration/versions/070_add_activity_and_resource_indexes.py
M ckan/model/activity.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_package.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
A ckan/tests/models/test_activity.py
M ckan/tests/models/test_package.py
M ckan/tests/test_plugins.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/multilingual/solr/schema.xml
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
M ckanext/reclinepreview/theme/public/resource.config
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M dev-requirements.txt
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/python-coding-standards.rst
M doc/tag-vocabularies.rst
M doc/test.rst
R doc/toolkit.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
M doc/upgrade-source.rst
M doc/upgrading.rst
R doc/writing-extensions.rst
A pip-requirements-docs.txt
A requirements.in
M requirements.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merged master
Commit: 7e61b82eac629c92ba04e0d9567e96b7c709f49b
https://github.com/okfn/ckan/commit/7e61b82eac629c92ba04e0d9567e96b7c709f49b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/plugins/interfaces.py
Log Message:
-----------
Fix a Sphinx error
Commit: 3fbe844985a00aee1450fd7235ba61bcf293623b
https://github.com/okfn/ckan/commit/3fbe844985a00aee1450fd7235ba61bcf293623b
Author: John Martin <me at johnmart.in>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckanext/homepage/plugin.py
Log Message:
-----------
[#1126] Removed because it's not used
Commit: e7d295d27b56f3ab5252f2e090927c0a3e57ea1e
https://github.com/okfn/ckan/commit/e7d295d27b56f3ab5252f2e090927c0a3e57ea1e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/index.rst
M doc/tag-vocabularies.rst
R doc/toolkit.rst
R doc/writing-extensions.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1228-dictize-whitespace
Commit: 66645627a9ac2a23cc0335e4ae3766d60e0aedc3
https://github.com/okfn/ckan/commit/66645627a9ac2a23cc0335e4ae3766d60e0aedc3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Fix an import (PEP8)
Commit: ad55287efb4a706ad4e957bc43cf7b019ad3b3c6
https://github.com/okfn/ckan/commit/ad55287efb4a706ad4e957bc43cf7b019ad3b3c6
Author: kindly <kindly at gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M ckan/controllers/home.py
M ckan/lib/app_globals.py
M ckan/lib/helpers.py
M ckan/templates/home/index.html
A ckan/templates/home/index_base.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
R ckanext/homepage/__init__.py
R ckanext/homepage/plugin.py
R ckanext/homepage/theme/templates/home/layout1.html
R ckanext/homepage/theme/templates/home/layout2.html
R ckanext/homepage/theme/templates/home/layout3.html
R ckanext/homepage/theme/templates/home/snippets/featured_group.html
R ckanext/homepage/theme/templates/home/snippets/featured_organization.html
R ckanext/homepage/theme/templates/home/snippets/promoted.html
R ckanext/homepage/theme/templates/home/snippets/search.html
R ckanext/homepage/theme/templates/home/snippets/stats.html
M doc/configuration.rst
M setup.py
Log Message:
-----------
[1126] move homepage modules into core and fix tests
Commit: f1616290b2f96c1c5cb5ad98d3ccdfbc3e9be492
https://github.com/okfn/ckan/commit/f1616290b2f96c1c5cb5ad98d3ccdfbc3e9be492
Author: John Martin <me at johnmart.in>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M ckan/templates/home/index.html
R ckan/templates/home/index_base.html
M ckan/templates/home/layout1.html
M ckan/templates/home/layout2.html
M ckan/templates/home/layout3.html
Log Message:
-----------
[#1126] Removed index_base.html and changed layouts into snippets
Commit: 4e6625afd9890c25990cdf012d69006a74ea7f63
https://github.com/okfn/ckan/commit/4e6625afd9890c25990cdf012d69006a74ea7f63
Author: kindly <kindly at gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/navl/validators.py
M ckan/logic/validators.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
Merge branch '1117-start-new-test-suite'
Commit: c339162836695677f02e9090f2ce40f6a65ad194
https://github.com/okfn/ckan/commit/c339162836695677f02e9090f2ce40f6a65ad194
Author: John Glover <j at johnglover.net>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/auth/delete.py
M ckan/model/follower.py
Log Message:
-----------
[#1178] PEP8 (and correct a comment)
Commit: 2e0266f12003244bc32795e82a9825574b93bf72
https://github.com/okfn/ckan/commit/2e0266f12003244bc32795e82a9825574b93bf72
Author: John Martin <me at johnmart.in>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M ckan/lib/app_globals.py
M ckan/public/base/less/forms.less
M ckan/templates/user/new_user_form.html
A ckan/templates/user/snippets/recaptcha.html
Log Message:
-----------
[#1070] Makes recaptcha work with the jinja2 templates
Commit: 4ee4ddb84f6c4f34adfa9783e7ee531c9664a8b3
https://github.com/okfn/ckan/commit/4ee4ddb84f6c4f34adfa9783e7ee531c9664a8b3
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#1126] PEP8 and fix typo
Commit: c82d8e55fd8549cd5ee9c8c2d66b10de586193b6
https://github.com/okfn/ckan/commit/c82d8e55fd8549cd5ee9c8c2d66b10de586193b6
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/helpers.py
M ckan/public/base/less/homepage.less
M ckan/templates/admin/config.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M doc/configuration.rst
Log Message:
-----------
Merge pull request #1126 from okfn/1126-homepage-module
Homepage modules
Commit: ae5a51c6d1765bf2d8271fa4c67a4a79ed5d8451
https://github.com/okfn/ckan/commit/ae5a51c6d1765bf2d8271fa4c67a4a79ed5d8451
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
Log Message:
-----------
[#1126] Update css after merge
Commit: afc80ed59d6173a96980576fc4760702413ac8dc
https://github.com/okfn/ckan/commit/afc80ed59d6173a96980576fc4760702413ac8dc
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/public/base/javascript/modules/autocomplete.js
Log Message:
-----------
[#1259] Fixes a JS error with autocomplete module and improves UX
1. Basically adds an extra check to make sure that 'abort()' is
defined
2. Then changes the module to behave a little nicer when inbetween
ajax requests
Commit: dcfe82da0c458870089a0b7e0e40ae60167ee273
https://github.com/okfn/ckan/commit/dcfe82da0c458870089a0b7e0e40ae60167ee273
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into '1187-source-url-and-version-added-to-package-form'
Commit: eddd6610e24e29a508d0f3439921d4d129540742
https://github.com/okfn/ckan/commit/eddd6610e24e29a508d0f3439921d4d129540742
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
Merge pull request #1187 from okfn/1187-source-url-and-version-added-to-package-form
Dataset Source (url) and Version fields missing
Commit: ef068dc38d71e302651c3b057fa34e00ff5c8106
https://github.com/okfn/ckan/commit/ef068dc38d71e302651c3b057fa34e00ff5c8106
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/admin/config.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/new.html
M ckan/templates/group/read_base.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/user/snippets/login_form.html
Log Message:
-----------
[#1030] Tweaks to labels in tabbed headers, breadcrumbs and forms
Commit: 1dca8f80f9485bb0d023ea6de6cd40b307b64633
https://github.com/okfn/ckan/commit/1dca8f80f9485bb0d023ea6de6cd40b307b64633
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/index.html
M ckan/templates/group/members.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
Log Message:
-----------
[#1030] Tidy up of group template page titles
Commit: b7be3e77e897cf806e9b1ea84918b1e2c7f599b0
https://github.com/okfn/ckan/commit/b7be3e77e897cf806e9b1ea84918b1e2c7f599b0
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read_base.html
Log Message:
-----------
[#1030] Update to organization page titles
Commit: 6fe678b15956d691745d7479f50ee3ccfdf5f98e
https://github.com/okfn/ckan/commit/6fe678b15956d691745d7479f50ee3ccfdf5f98e
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/package/activity.html
R ckan/templates/package/activity_stream.html
M ckan/templates/package/base.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.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
Log Message:
-----------
[#1030] Update to package page titles
Commit: 3054c1e1cbac0dc908bbd64263caffb2974a6714
https://github.com/okfn/ckan/commit/3054c1e1cbac0dc908bbd64263caffb2974a6714
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/user/activity_stream.html
M ckan/templates/user/read.html
M ckan/templates/user/read_base.html
Log Message:
-----------
[#1030] Update to user page titles
Commit: 34af1d5ac7a816ef2575e0228301e553dcf1c34d
https://github.com/okfn/ckan/commit/34af1d5ac7a816ef2575e0228301e553dcf1c34d
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/user/edit.html
M ckan/templates/user/edit_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read_base.html
R ckan/templates/user/snippets/back_to_user_action.html
Log Message:
-----------
[#1030] Update to the user edit and read templates
Commit: 84fc66dc1841c320756194518bc00a9db04e9803
https://github.com/okfn/ckan/commit/84fc66dc1841c320756194518bc00a9db04e9803
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/public/base/less/search.less
M ckan/templates/group/index.html
M ckan/templates/organization/index.html
M ckan/templates/snippets/search_form.html
Log Message:
-----------
[#1030] Removed border bottom search bar from groups and orgs media listings
Commit: 18caed2d10986aac0bc548ee9de5c30df4691e54
https://github.com/okfn/ckan/commit/18caed2d10986aac0bc548ee9de5c30df4691e54
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/public/base/less/layout.less
M ckan/templates/user/dashboard.html
Log Message:
-----------
[#1030] Adds halo around flash messages
Commit: 8cc3dd14a3dfd8ef161d8eac7e7f15d2b4529e1d
https://github.com/okfn/ckan/commit/8cc3dd14a3dfd8ef161d8eac7e7f15d2b4529e1d
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/header.html
Log Message:
-----------
[#1030] Fixes header search to use proper icon like other search inputs
Commit: 68852f28a2d28498c758d9056a48aa91cb1f40e3
https://github.com/okfn/ckan/commit/68852f28a2d28498c758d9056a48aa91cb1f40e3
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/header.html
M ckan/templates/snippets/search_form.html
Log Message:
-----------
[#1030] Correct the search inputs to have the correct placeholders for context
Commit: 005226171858d4e524ad2d1a5bcb514309e0671c
https://github.com/okfn/ckan/commit/005226171858d4e524ad2d1a5bcb514309e0671c
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/group/snippets/group_form.html
M ckan/templates/organization/snippets/organization_form.html
Log Message:
-----------
[#1030] Required field positioning fix on group and org edit templates
Commit: 36cd347b885467b549dff1c788487870506b934d
https://github.com/okfn/ckan/commit/36cd347b885467b549dff1c788487870506b934d
Author: John Martin <me at johnmart.in>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
Log Message:
-----------
[#1030] Fix for required message on package edit/create
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: 50f0d989dcae4b2f9c3ba4b24211eea0f8caed1c
https://github.com/okfn/ckan/commit/50f0d989dcae4b2f9c3ba4b24211eea0f8caed1c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/validators.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/admin/config.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1228-dictize-whitespace
Commit: 59504d7f38e6ef35a2681451ccdaaa99de42b541
https://github.com/okfn/ckan/commit/59504d7f38e6ef35a2681451ccdaaa99de42b541
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch '1228-dictize-whitespace'
Commit: 958027dfd182bfaff874aff1ce1f973bf29fc016
https://github.com/okfn/ckan/commit/958027dfd182bfaff874aff1ce1f973bf29fc016
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 848-finishing-configuration-docs
Commit: 23ab179467aebd0c98b843b293622715c78b794f
https://github.com/okfn/ckan/commit/23ab179467aebd0c98b843b293622715c78b794f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
Merge branch '848-finishing-configuration-docs'
Commit: 11ff9097f9bca2bbc3bf4e280f6134e477944738
https://github.com/okfn/ckan/commit/11ff9097f9bca2bbc3bf4e280f6134e477944738
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
M ckanext/example_iauthfunctions/plugin.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M dev-requirements.txt
M doc/configuration.rst
M doc/extensions/best-practices.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 772-document-plugin-load-order
Commit: 70bff16b4408e614933cfaf42fdbf4d2a774ad94
https://github.com/okfn/ckan/commit/70bff16b4408e614933cfaf42fdbf4d2a774ad94
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M doc/configuration.rst
M doc/extensions/best-practices.rst
Log Message:
-----------
[#772] Clarify plugin-loading order and best practice
Commit: 09364bedc0dd84239865befbb92805a97cd67909
https://github.com/okfn/ckan/commit/09364bedc0dd84239865befbb92805a97cd67909
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M doc/configuration.rst
M doc/extensions/best-practices.rst
Log Message:
-----------
Merge branch '772-document-plugin-load-order'
Commit: e0e0fb5c2562ef021038cedb84aab42d89911659
https://github.com/okfn/ckan/commit/e0e0fb5c2562ef021038cedb84aab42d89911659
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/action/create.py
M ckan/logic/validators.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/admin/config.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/organization/member_new.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/login.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/extensions/best-practices.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into translation-doc-deprecated
Commit: b6f1ff3f220b5e2198d2441261854fb398412cbc
https://github.com/okfn/ckan/commit/b6f1ff3f220b5e2198d2441261854fb398412cbc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M doc/i18n.rst
Log Message:
-----------
Merge branch 'translation-doc-deprecated'
Commit: 4b2c46b59bd6cb5ed1235b60e1555d776c5456b2
https://github.com/okfn/ckan/commit/4b2c46b59bd6cb5ed1235b60e1555d776c5456b2
Author: amercader <amercadero at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#1265] Keep visibility value on form errors
The wrong value was checked to choose the selected option.
Commit: 96678854079906a74ce7e7a1ac195b9c18c29a00
https://github.com/okfn/ckan/commit/96678854079906a74ce7e7a1ac195b9c18c29a00
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M CONTRIBUTING.rst
M bin/ckan_spam.py
M bin/travis-build
R build.sh
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/schema-2.0.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
A ckan/i18n/ar/LC_MESSAGES/ckan.mo
A ckan/i18n/ar/LC_MESSAGES/ckan.po
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
A ckan/i18n/da_DK/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/dv/LC_MESSAGES/ckan.mo
M ckan/i18n/dv/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
A ckan/i18n/en_AU/LC_MESSAGES/ckan.po
M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/id/LC_MESSAGES/ckan.mo
M ckan/i18n/id/LC_MESSAGES/ckan.po
M ckan/i18n/is/LC_MESSAGES/ckan.mo
M ckan/i18n/is/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/ja/LC_MESSAGES/ckan.mo
M ckan/i18n/ja/LC_MESSAGES/ckan.po
A ckan/i18n/km/LC_MESSAGES/ckan.mo
A ckan/i18n/km/LC_MESSAGES/ckan.po
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/tr/LC_MESSAGES/ckan.mo
M ckan/i18n/tr/LC_MESSAGES/ckan.po
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/datapreview.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/__init__.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/navl/validators.py
M ckan/lib/package_saver.py
M ckan/lib/plugins.py
M ckan/lib/render.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/069_resource_url_and_metadata_modified.py
A ckan/migration/versions/070_add_activity_and_resource_indexes.py
M ckan/model/activity.py
M ckan/model/extension.py
M ckan/model/modification.py
M ckan/model/package.py
M ckan/model/package_relationship.py
M ckan/model/resource.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
R ckan/public/base/less/font-awesome.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/homepage.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/modules/custom-fields.spec.js
M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
M ckan/public/base/test/vendor/mocha.css
M ckan/public/base/test/vendor/mocha.js
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/js/.jshintrc
M ckan/public/base/vendor/bootstrap/js/bootstrap.js
M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
M ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
A ckan/public/base/vendor/font-awesome/less/bootstrap.less
A ckan/public/base/vendor/font-awesome/less/core.less
A ckan/public/base/vendor/font-awesome/less/extras.less
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
A ckan/public/base/vendor/font-awesome/less/icons.less
A ckan/public/base/vendor/font-awesome/less/mixins.less
A ckan/public/base/vendor/font-awesome/less/path.less
A ckan/public/base/vendor/font-awesome/less/variables.less
M ckan/public/base/vendor/jquery.js
M ckan/public/base/vendor/resource.config
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/ajax_snippets/related-item.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/package/snippets/stages.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/__init__.py
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/ckantestplugin/setup.cfg
R ckan/tests/ckantestplugin/setup.py
A ckan/tests/ckantestplugins.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_revision_search.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_preview_interface.py
M ckan/tests/functional/test_tag_vocab.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckan/tests/mock_plugin.py
A ckan/tests/models/test_activity.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_package_relationships.py
M ckan/tests/test_coding_standards.py
M ckan/tests/test_plugins.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_configure.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_delete.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/multilingual/solr/schema.xml
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
M ckanext/reclinepreview/tests/test_preview.py
M ckanext/reclinepreview/theme/public/resource.config
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/stats/stats.py
M ckanext/test_tag_vocab_plugin.py
M ckanext/textpreview/plugin.py
M ckanext/textpreview/tests/test_preview.py
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M dev-requirements.txt
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
A doc/changelog.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/i18n.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/multilingual.rst
M doc/python-coding-standards.rst
M doc/tag-vocabularies.rst
M doc/templating.rst
M doc/test.rst
A doc/testing-coding-standards.rst
R doc/toolkit.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
M doc/upgrade-source.rst
M doc/upgrading.rst
R doc/writing-extensions.rst
R fabfile.py
R jshint.json
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
A pip-requirements-docs.txt
A requirements.in
M requirements.txt
M setup.py
M test-core.ini
R test_sync.ini
R test_sync2.ini
Log Message:
-----------
Merge branch 'master' into coveralls
Conflicts:
bin/travis-build
Commit: dad667eb4233b00561167db2aff41092afecfd2d
https://github.com/okfn/ckan/commit/dad667eb4233b00561167db2aff41092afecfd2d
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Correct encoding to make coveralls work
Commit: a903ef999d8d67db48118ea8413595707c2e3080
https://github.com/okfn/ckan/commit/a903ef999d8d67db48118ea8413595707c2e3080
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M README.rst
Log Message:
-----------
Add test coverage banner to readme
Commit: 5ad2c9bc8d651c31b302499780b6926b7a798ebc
https://github.com/okfn/ckan/commit/5ad2c9bc8d651c31b302499780b6926b7a798ebc
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M .coveragerc
Log Message:
-----------
Don't cover tests files
Commit: 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: 1ab6ff449faef790a4f160d30aedd08a82b726fb
https://github.com/okfn/ckan/commit/1ab6ff449faef790a4f160d30aedd08a82b726fb
Author: amercader <amercadero at gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M doc/upgrade-source.rst
Log Message:
-----------
[#1268] Add 'python setup.py develop' step to source upgrade instructions
Commit: 23cfdbee2fcbc9267f66f06b6ecf9a879c92241f
https://github.com/okfn/ckan/commit/23cfdbee2fcbc9267f66f06b6ecf9a879c92241f
Author: John Martin <me at johnmart.in>
Date: 2013-10-08 (Tue, 08 Oct 2013)
Changed paths:
M ckan/config/routing.py
M ckan/templates/package/edit.html
A ckan/templates/package/edit_base.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read_base.html
M ckan/templates/package/resource_edit.html
A ckan/templates/package/resource_edit_base.html
M ckan/templates/package/snippets/info.html
Log Message:
-----------
[#1269] First working version of the proper IA for resources
Commit: 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: e7266eb1854a62c88414e1b412a9ae3304b7c6a1
https://github.com/okfn/ckan/commit/e7266eb1854a62c88414e1b412a9ae3304b7c6a1
Author: John Martin <me at johnmart.in>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
Merge pull request #1265 from okfn/1265-visibility-field-errors
Visibility field value not kept if there are errors on the form
Commit: 485f681f6f5d5fe890dc339d57a8563844e2fde2
https://github.com/okfn/ckan/commit/485f681f6f5d5fe890dc339d57a8563844e2fde2
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M ckanext/datastore/plugin.py
Log Message:
-----------
[#1272] prevent keyerror when looking up 'url_type' in datastore before_show
Commit: a8ac4a6d955fa796bdd603efa7e3768f44758431
https://github.com/okfn/ckan/commit/a8ac4a6d955fa796bdd603efa7e3768f44758431
Author: kindly <kindly at gmail.com>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M ckanext/datastore/plugin.py
Log Message:
-----------
Merge pull request #1272 from okfn/1272-datastore-key-error
fix possible KeyError in before_show of datastore plugin
Commit: b2182944f4a56d78b5942461e8d25ab4d7c18c09
https://github.com/okfn/ckan/commit/b2182944f4a56d78b5942461e8d25ab4d7c18c09
Author: kindly <kindly at gmail.com>
Date: 2013-10-10 (Thu, 10 Oct 2013)
Changed paths:
M doc/upgrade-source.rst
Log Message:
-----------
Merge pull request #1268 from okfn/1268-add-step-upgrade-source
Add "python setup.py develop" step to source upgrade instructions
Commit: 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: 16924d937af4207a585fd34eaf2be083bcc2d6d2
https://github.com/okfn/ckan/commit/16924d937af4207a585fd34eaf2be083bcc2d6d2
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M ckan/migration/versions/071_add_state_column_to_user_table.py
Log Message:
-----------
[#1178] Remove backward migrations, as we don't support it
Commit: 0bd163e75eacc65fee0546fa356f195f1e109713
https://github.com/okfn/ckan/commit/0bd163e75eacc65fee0546fa356f195f1e109713
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M ckan/tests/lib/test_authenticator.py
Log Message:
-----------
[#1178] Fix repeated test name
Commit: d073ce7f6b56361cf8c5452c2f969e4d45356437
https://github.com/okfn/ckan/commit/d073ce7f6b56361cf8c5452c2f969e4d45356437
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#1178] Use the data returned by validate, instead of the one passed as param
Commit: 1da817c40b59d7dfa866abd9e68ed844442f34d4
https://github.com/okfn/ckan/commit/1da817c40b59d7dfa866abd9e68ed844442f34d4
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/schema.py
Log Message:
-----------
[#1178] Move user_invite_schema to ckan.logic.schema
Commit: c2e4f767eed6485383a7ef2efd40a8e990d0a623
https://github.com/okfn/ckan/commit/c2e4f767eed6485383a7ef2efd40a8e990d0a623
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M ckan/logic/action/create.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1178] Refactor user name creation
I've isolated the loop where it needs to be. This makes the code clearer, but
makes it susceptible to errors. For example, after the random name was
generated but before the user is created, another user with the same name might
be created, breaking our code.
This should be rare enough to bother us.
Commit: dfd8ae9fb07ff551707bdc08c6e23bd424c7335c
https://github.com/okfn/ckan/commit/dfd8ae9fb07ff551707bdc08c6e23bd424c7335c
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#1178] Simplify "if" expression, removing redundancy
Commit: bae4d47c3227bd5f7581ac5859edcb9badd027c0
https://github.com/okfn/ckan/commit/bae4d47c3227bd5f7581ac5859edcb9badd027c0
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/migration/versions/071_add_state_column_to_user_table.py
Log Message:
-----------
[#1178] Use model.State instead of core.State
Commit: 31d64f3a1145894033da3061a826cbe42337d64c
https://github.com/okfn/ckan/commit/31d64f3a1145894033da3061a826cbe42337d64c
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-12 (Sat, 12 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/__init__.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M ckanext/example_iauthfunctions/plugin.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M dev-requirements.txt
M doc/configuration.rst
M doc/extensions/best-practices.rst
M doc/i18n.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
M doc/upgrade-source.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 1178-users-invitations
Conflicts:
ckan/controllers/user.py
ckan/templates/group/member_new.html
ckan/tests/logic/test_action.py
dev-requirements.txt
Commit: 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: 3218b581443ad07cd09a93d364bf5085fb0f7884
https://github.com/okfn/ckan/commit/3218b581443ad07cd09a93d364bf5085fb0f7884
Author: amercader <amercadero at gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1237] Fix docstring
Commit: 8c70cefc139df2572e72c3f24d16e2bb37a06e03
https://github.com/okfn/ckan/commit/8c70cefc139df2572e72c3f24d16e2bb37a06e03
Author: amercader <amercadero at gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M ckanext/datastore/logic/action.py
Log Message:
-----------
Merge branch '1221-preview-fails-private-datasets'
Commit: 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: e6d2c45c7f34b2ec5faf8fca619f90b53449a9a2
https://github.com/okfn/ckan/commit/e6d2c45c7f34b2ec5faf8fca619f90b53449a9a2
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge pull request #1237 from okfn/1237-facet.limit_improvements
'facet.limit' in package_search wrongly handled
Commit: f5d168cd9018d68868644188dded4dd2b6b01f36
https://github.com/okfn/ckan/commit/f5d168cd9018d68868644188dded4dd2b6b01f36
Author: amercader <amercadero at gmail.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#1256] Don't load the synchronous_search plugin on cli
It is already loaded on startup
Commit: 6431ba3dc6a117926101a97ae859132a906cf0f2
https://github.com/okfn/ckan/commit/6431ba3dc6a117926101a97ae859132a906cf0f2
Author: John Glover <j at johnglover.net>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1178] Add auth_user_obj back to context in
User controller methods.
Commit: 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: 4ac411b61cfae7048cdc6cc5cace42aec20a13e9
https://github.com/okfn/ckan/commit/4ac411b61cfae7048cdc6cc5cace42aec20a13e9
Author: John Glover <j at johnglover.net>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/templates/organization/member_new.html
Log Message:
-----------
[#1178] Fix typo in org member_new template
Commit: 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: 322149c6934a574589f37ffe8317c444ad0885ff
https://github.com/okfn/ckan/commit/322149c6934a574589f37ffe8317c444ad0885ff
Author: John Glover <j at johnglover.net>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#1178] Constrain number of attempts to generate
a random user name in user_invite
Commit: a480ace5ae73532627ad9b04cc3416f855373fc6
https://github.com/okfn/ckan/commit/a480ace5ae73532627ad9b04cc3416f855373fc6
Author: John Glover <j at johnglover.net>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#1178] handle edge case where _get_random_username_from_email
fails by returning the cleaned local part of the
email address. This is expected to fail
validation in user_create.
Commit: 971026bf286aee490e8080bab715870d65b84cf7
https://github.com/okfn/ckan/commit/971026bf286aee490e8080bab715870d65b84cf7
Author: John Martin <me at johnmart.in>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/module.less
M ckan/templates/development/snippets/facet.html
M ckan/templates/development/snippets/module.html
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
[#1263] Remove the 'clear all' from the faceter on the left nav
Commit: 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: db86eacac53575aade586bf3338effb852f0edf8
https://github.com/okfn/ckan/commit/db86eacac53575aade586bf3338effb852f0edf8
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/public/base/javascript/modules/autocomplete.js
Log Message:
-----------
[#1259] Remove redundant callback definition
Commit: 306ef40efc5a29c84377e1aacbc0c77c2d758081
https://github.com/okfn/ckan/commit/306ef40efc5a29c84377e1aacbc0c77c2d758081
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/public/base/javascript/modules/autocomplete.js
Log Message:
-----------
Merge pull request #1259 from okfn/1259-autocomplete-fixes
Autocomplete JS module issues
Commit: db2c35e7c6550beefc70a4e66a0f8bfda0a1484a
https://github.com/okfn/ckan/commit/db2c35e7c6550beefc70a4e66a0f8bfda0a1484a
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M doc/sysadmin-guide.rst
M doc/user-guide.rst
Log Message:
-----------
[#1253] Change the titles to comply to our docs' guidelines
Commit: a675277bfb6fc60d58f4d0ff7d4f48d136fea1d2
https://github.com/okfn/ckan/commit/a675277bfb6fc60d58f4d0ff7d4f48d136fea1d2
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M doc/sysadmin-guide.rst
M doc/user-guide.rst
Log Message:
-----------
[#1253] Change "Organization" capitalization to comply with our guidelines
Commit: 0f4d257517084708c9d28d114b33f52238c2b736
https://github.com/okfn/ckan/commit/0f4d257517084708c9d28d114b33f52238c2b736
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M doc/index.rst
Log Message:
-----------
[#1253] Add text about the user/sysadmin guides on the index page.
Commit: cb6b5677f73a2f1ba8ae97d8dbd58c68f39ff237
https://github.com/okfn/ckan/commit/cb6b5677f73a2f1ba8ae97d8dbd58c68f39ff237
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M doc/user-guide.rst
Log Message:
-----------
[#1253] De-indent lists in the user guide.
Commit: 28ad8c102e83fea24a9b50b29e40476924a7c6e9
https://github.com/okfn/ckan/commit/28ad8c102e83fea24a9b50b29e40476924a7c6e9
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M doc/getting-started.rst
R doc/images/admin-page.png
M doc/sysadmin-guide.rst
Log Message:
-----------
[#1253] Remove redundancy and cross-link "Getting Started" and "Sysadmin Guide"
Commit: f1ffdb22301dec075dc49801f9455b06776daa15
https://github.com/okfn/ckan/commit/f1ffdb22301dec075dc49801f9455b06776daa15
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M CONTRIBUTING.rst
M doc/api.rst
M doc/background-tasks.rst
M doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/email-notifications.rst
M doc/getting-started.rst
Log Message:
-----------
[#1253] Fix a few section titles' capitalization
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: 3d4040da6702c8eefeecf8b77c65a1c267d262c8
https://github.com/okfn/ckan/commit/3d4040da6702c8eefeecf8b77c65a1c267d262c8
Author: John Glover <j at johnglover.net>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/create_test_data.py
M ckan/lib/mailer.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/schema.py
A ckan/migration/versions/071_add_state_column_to_user_table.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/public/base/less/forms.less
M ckan/templates/group/member_new.html
M ckan/templates/organization/member_new.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read_base.html
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
A ckan/tests/lib/test_authenticator.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
A ckan/tests/models/test_follower.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Merge pull request #1178 from okfn/1178-users-invitations
Users invitations
Commit: 31ccd35da1000e00a9ca819be7080809ea735ca9
https://github.com/okfn/ckan/commit/31ccd35da1000e00a9ca819be7080809ea735ca9
Author: John Glover <j at johnglover.net>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
Log Message:
-----------
[#1178] Updating style (paster less) after merge
Commit: 33c4bd5a511d60e6771523b9025f003f69ae0a70
https://github.com/okfn/ckan/commit/33c4bd5a511d60e6771523b9025f003f69ae0a70
Author: John Martin <me at johnmart.in>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#1070] Removed privatekey from app_globals
Commit: b83048cc8958c46db04da82758d3ddf541572cfd
https://github.com/okfn/ckan/commit/b83048cc8958c46db04da82758d3ddf541572cfd
Author: John Martin <me at johnmart.in>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/mailer.py
M ckan/lib/navl/validators.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/delete.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/071_add_state_column_to_user_table.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/user.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/less/forms.less
M ckan/public/base/less/homepage.less
M ckan/templates/admin/config.html
M ckan/templates/group/member_new.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/organization/member_new.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read_base.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
A ckan/tests/lib/test_authenticator.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
A ckan/tests/models/test_follower.py
M ckan/tests/models/test_user.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/plugin.py
M dev-requirements.txt
M doc/configuration.rst
M doc/extensions/best-practices.rst
M doc/i18n.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
M doc/upgrade-source.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
Merged master
Commit: d0920e946fbbf6e31241391d85bb48b7063c8687
https://github.com/okfn/ckan/commit/d0920e946fbbf6e31241391d85bb48b7063c8687
Author: John Glover <j at johnglover.net>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/lib/app_globals.py
M ckan/public/base/less/forms.less
M ckan/templates/user/new_user_form.html
A ckan/templates/user/snippets/recaptcha.html
Log Message:
-----------
Merge pull request #1070 from okfn/1070-recaptcha
Recaptcha not working in CKAN 2.0 (jinja templates)
Commit: bf4c8e715fa7db2a3211e80a1e1e2e2f785bb54b
https://github.com/okfn/ckan/commit/bf4c8e715fa7db2a3211e80a1e1e2e2f785bb54b
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/public/base/test/spec/modules/autocomplete.spec.js
Log Message:
-----------
Fix the automodule.js tests
Commit: df45a9bc61795eaf906705a6cd195c567138b573
https://github.com/okfn/ckan/commit/df45a9bc61795eaf906705a6cd195c567138b573
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/public/base/test/spec/modules/autocomplete.spec.js
Log Message:
-----------
setupAutocomplete() before testing autocomplete.lookup()
Commit: 10d495e046adce891451821bfc7e6e52189c3ed1
https://github.com/okfn/ckan/commit/10d495e046adce891451821bfc7e6e52189c3ed1
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/public/base/test/spec/modules/autocomplete.spec.js
Log Message:
-----------
Fix wrong call in autocomplete tests
Commit: 383ab7765783661137f5ef2a89c94e48fb5f2a2c
https://github.com/okfn/ckan/commit/383ab7765783661137f5ef2a89c94e48fb5f2a2c
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/module.less
M ckan/templates/development/snippets/facet.html
M ckan/templates/development/snippets/module.html
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
Merge branch '1263'
Commit: 2ce216488ab95be47ad6fbb661d349801323b2fb
https://github.com/okfn/ckan/commit/2ce216488ab95be47ad6fbb661d349801323b2fb
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
Log Message:
-----------
Recompile *.less files
Commit: 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: 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: 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: 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: 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: 5eb3c4099be05f59b477f2f9d0ffe81d7740cc7b
https://github.com/okfn/ckan/commit/5eb3c4099be05f59b477f2f9d0ffe81d7740cc7b
Author: John Martin <me at johnmart.in>
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/create_test_data.py
M ckan/lib/dictization/model_dictize.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/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/configuration.rst
M doc/extensions/best-practices.rst
M doc/i18n.rst
M doc/upgrade-source.rst
Log Message:
-----------
Merged master
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: e88a39940c6aaedca93a2b0dbd334d95d2f1d2e3
https://github.com/okfn/ckan/commit/e88a39940c6aaedca93a2b0dbd334d95d2f1d2e3
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M doc/deployment.rst
Log Message:
-----------
[#877] First cut of adding Nginx instructions
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: 8cdb92b5bf96e7ce7384635e0ff1640bf9639d96
https://github.com/okfn/ckan/commit/8cdb92b5bf96e7ce7384635e0ff1640bf9639d96
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M doc/conf.py
A doc/contents.rst
M doc/index.rst
Log Message:
-----------
Add 'full table of contents' page to docs
Commit: 55732cba210d84e7bf758c1468204488b74d198a
https://github.com/okfn/ckan/commit/55732cba210d84e7bf758c1468204488b74d198a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M doc/contents.rst
Log Message:
-----------
Docs: remove depth limit from full toc
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: d322b015bde73ceb1b484652bf56ccf63b6efd9e
https://github.com/okfn/ckan/commit/d322b015bde73ceb1b484652bf56ccf63b6efd9e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M doc/conf.py
Log Message:
-----------
Fix the docs PDF build
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: 1840de840131af5b50f8100f8998713768515899
https://github.com/okfn/ckan/commit/1840de840131af5b50f8100f8998713768515899
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-11-18 (Mon, 18 Nov 2013)
Changed paths:
M doc/sysadmin-guide.rst
M doc/user-guide.rst
Log Message:
-----------
[#1253] Fix style headings to comply with our docs guidelines
Commit: c50b56d7951f1ae2c84e429d35ebdd56a11e930c
https://github.com/okfn/ckan/commit/c50b56d7951f1ae2c84e429d35ebdd56a11e930c
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-11-19 (Tue, 19 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/ckan_nose_plugin.py
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/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/new_tests/helpers.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/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 test-core.ini
Log Message:
-----------
Merge branch 'master' into 877-nginx-instructions
Commit: 004e640451116142a530f3b59c394edf8c5c3698
https://github.com/okfn/ckan/commit/004e640451116142a530f3b59c394edf8c5c3698
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M doc/conf.py
M doc/deployment.rst
Log Message:
-----------
Update instructions for Nginx config file
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: 1e9874c00b6ca9e56bfc1597b49b99ecc2a7a905
https://github.com/okfn/ckan/commit/1e9874c00b6ca9e56bfc1597b49b99ecc2a7a905
Author: John Martin <me at johnmart.in>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/public/base/javascript/main.js
Log Message:
-----------
[#1305] Fixes popover error by checking for it's existance in the plugins
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
Commit: b8ef9a0838ade71290915b6dd9bcda9ce65e6ffb
https://github.com/okfn/ckan/commit/b8ef9a0838ade71290915b6dd9bcda9ce65e6ffb
Author: kindly <kindly at gmail.com>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M doc/datastore.rst
Log Message:
-----------
[#1334] change the docs
Commit: 0e19cb21a4043fcb73111e41a1d9b97f4c3da982
https://github.com/okfn/ckan/commit/0e19cb21a4043fcb73111e41a1d9b97f4c3da982
Author: Sean Hammond <seanh at users.noreply.github.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M doc/datastore.rst
Log Message:
-----------
Merge pull request #1334 from okfn/1334-change-the-docs-to-datapusher
Change docs to point to datapusher docs.
Commit: a5057a19280142cfae2f664fc057bb1b027c5b3c
https://github.com/okfn/ckan/commit/a5057a19280142cfae2f664fc057bb1b027c5b3c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/logic/action/get.py
M doc/configuration.rst
M doc/datastore.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 877-nginx-instructions
Commit: e36ba3e0f339b60f5d8ee1a3438449ed12c256ce
https://github.com/okfn/ckan/commit/e36ba3e0f339b60f5d8ee1a3438449ed12c256ce
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M doc/conf.py
M doc/deployment.rst
Log Message:
-----------
Merge branch '877-nginx-instructions'
Commit: eb58e111ddc849af30b680a3fb39cf8377e1aa25
https://github.com/okfn/ckan/commit/eb58e111ddc849af30b680a3fb39cf8377e1aa25
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M doc/filestore.rst
Log Message:
-----------
Fix a Sphinx error
Commit: 3232f39dff1f02c5a277cff15653fb503fadd3b3
https://github.com/okfn/ckan/commit/3232f39dff1f02c5a277cff15653fb503fadd3b3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
A .coveragerc
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/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/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/munge.py
M ckan/lib/navl/validators.py
M ckan/lib/plugins.py
A ckan/lib/uploader.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
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/meta.py
M ckan/model/user.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/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
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/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_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/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/form.html
M ckan/templates/organization/member_new.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
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/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/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_activity.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_dictization_schema.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
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
A doc/_static/ckanlogo.png
M doc/_themes/sphinx-theme-okfn
M doc/authorization.rst
M doc/conf.py
M doc/configuration.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/extensions/best-practices.rst
M doc/filestore.rst
M doc/i18n.rst
R doc/images/ckan_logo_box.png
M doc/index.rst
M doc/legacy-api.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
M doc/upgrade-source.rst
A doc/upgrading-dependencies.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' of github.com:okfn/ckan into 1253-moving-user-guides
Conflicts:
doc/datastore.rst
doc/deployment.rst
Commit: ae0b484b2061a28752adf88332fe869e5495c36d
https://github.com/okfn/ckan/commit/ae0b484b2061a28752adf88332fe869e5495c36d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M CONTRIBUTING.rst
M doc/api.rst
M doc/background-tasks.rst
M doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/email-notifications.rst
M doc/getting-started.rst
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
R doc/images/admin-page.png
A doc/images/create_organization.jpg
A doc/images/customize_look_and_feel.jpg
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/move_dataset_between_organizations.jpg
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/index.rst
A doc/sysadmin-guide.rst
A doc/user-guide.rst
Log Message:
-----------
Merge branch '1253-moving-user-guides'
Commit: 9674f862ae6147d3778a05bc8d8168954e0e0e60
https://github.com/okfn/ckan/commit/9674f862ae6147d3778a05bc8d8168954e0e0e60
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
A doc/appendices/index.rst
A doc/appendices/solr-multicore.rst
M doc/conf.py
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
R doc/solr-setup.rst
Log Message:
-----------
Reorganize Solr setup docs
Sphinx doesn't support "inner pages" like the Solr setup page was trying
to be, it breaks Sphinx's navigation.
Move the single-core Solr setup docs into the source install docs,
inline.
And an appendices chapter to the docs, and move the multi-core Solr docs
into it.
Also add new docs for setting up a second Solr core when using
multi-core.
Also tidy up some Sphinx heading styles.
Commit: ab601eca80a5d71bfaebf275a869e2b94d55f8f4
https://github.com/okfn/ckan/commit/ab601eca80a5d71bfaebf275a869e2b94d55f8f4
Author: amercader <amercadero at gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
M ckan/public/base/javascript/main.js
Log Message:
-----------
Merge branch '1305-undefined-popover'
Commit: fee92ce53b602c839aa0147f5a79b31c5350c432
https://github.com/okfn/ckan/commit/fee92ce53b602c839aa0147f5a79b31c5350c432
Author: amercader <amercadero at gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
M CONTRIBUTING.rst
M bin/travis-run-tests
M ckan/ckan_nose_plugin.py
M ckan/controllers/group.py
M ckan/logic/action/get.py
M ckan/new_tests/helpers.py
M ckan/public/base/css/main.css
M ckan/public/base/javascript/main.js
M doc/api.rst
M doc/background-tasks.rst
M doc/conf.py
M doc/configuration.rst
M doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/email-notifications.rst
M doc/filestore.rst
M doc/getting-started.rst
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
R doc/images/admin-page.png
A doc/images/create_organization.jpg
A doc/images/customize_look_and_feel.jpg
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/move_dataset_between_organizations.jpg
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/index.rst
A doc/sysadmin-guide.rst
M doc/test.rst
A doc/user-guide.rst
Log Message:
-----------
Merge branch 'master' into docs-full-table-of-contents
Conflicts:
doc/index.rst
Commit: dbe15f63c0c570facbbb3bd229b3c6e5b13e3af3
https://github.com/okfn/ckan/commit/dbe15f63c0c570facbbb3bd229b3c6e5b13e3af3
Author: amercader <amercadero at gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
M doc/conf.py
A doc/contents.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'docs-full-table-of-contents'
Commit: da133f13795b26653e0c1486501b29dd70a3d794
https://github.com/okfn/ckan/commit/da133f13795b26653e0c1486501b29dd70a3d794
Author: amercader <amercadero at gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
M ckan/public/base/javascript/main.js
M doc/conf.py
A doc/contents.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'master' into solr-docs-reorg
Added appendices/index.rst to the contents.rst main TOC
Conflicts:
doc/index.rst
Commit: 91f31845a2c2b4b43e7d5367bf4b1db081a57624
https://github.com/okfn/ckan/commit/91f31845a2c2b4b43e7d5367bf4b1db081a57624
Author: amercader <amercadero at gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
A doc/appendices/index.rst
A doc/appendices/solr-multicore.rst
M doc/conf.py
M doc/contents.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
R doc/solr-setup.rst
Log Message:
-----------
Merge branch 'solr-docs-reorg'
Commit: f4132ceff66fcdecd96af865df9ebb81cc0919f2
https://github.com/okfn/ckan/commit/f4132ceff66fcdecd96af865df9ebb81cc0919f2
Author: amercader <amercadero at gmail.com>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
A .coveragerc
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/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/organization.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/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/munge.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/navl/validators.py
M ckan/lib/plugins.py
A ckan/lib/uploader.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/meta.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/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/client.js
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/autocomplete.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/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/base.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/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/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/helper.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/organization/snippets/organization_item.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
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/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_help.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/related/snippets/related_item.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
A ckan/templates/snippets/datapusher_status.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/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/organization_item.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/model/test_group_and_organization_purge.py
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.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
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
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
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/plugin.py
M ckanext/multilingual/tests/test_multilingual_plugin.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
A doc/_static/ckanlogo.png
M doc/_themes/sphinx-theme-okfn
M doc/api.rst
A doc/appendices/index.rst
A doc/appendices/solr-multicore.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
A doc/contents.rst
M doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/documentation-guidelines.rst
M doc/email-notifications.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/filestore.rst
M doc/getting-started.rst
M doc/i18n.rst
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
R doc/images/admin-page.png
R doc/images/ckan_logo_box.png
A doc/images/create_organization.jpg
A doc/images/customize_look_and_feel.jpg
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/move_dataset_between_organizations.jpg
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/legacy-api.rst
M doc/multilingual.rst
R doc/solr-setup.rst
A doc/sysadmin-guide.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
A doc/upgrading-dependencies.rst
A doc/user-guide.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 1218-remove-__extras
Commit: cd580c6a6999a6f65704993b58615a8ef6ea977a
https://github.com/okfn/ckan/commit/cd580c6a6999a6f65704993b58615a8ef6ea977a
Author: amercader <amercadero at gmail.com>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
[#1218] Fix wrong test
Commit: c07d875931759f829e1ba10f508028b507ad0144
https://github.com/okfn/ckan/commit/c07d875931759f829e1ba10f508028b507ad0144
Author: amercader <amercadero at gmail.com>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M bin/travis-install-dependencies
Log Message:
-----------
[#1337] Get Postgres 8.4 from Ubuntu repos
Not sure why we use a custom PPA:
http://packages.ubuntu.com/precise/database/postgresql-8.4
Commit: a7b046d2731bc4f48b6370f080be0746b2173d16
https://github.com/okfn/ckan/commit/a7b046d2731bc4f48b6370f080be0746b2173d16
Author: amercader <amercadero at gmail.com>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M bin/travis-install-dependencies
Log Message:
-----------
[#1337] Force postgres restart
Commit: 1048efa07dd5cc035eafe6a209c6129d1e98bcbc
https://github.com/okfn/ckan/commit/1048efa07dd5cc035eafe6a209c6129d1e98bcbc
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M bin/travis-install-dependencies
Log Message:
-----------
[#1337] fix travis tests for postgres 8.4
force config to use port 5432
Commit: bd918a8a77e82efdb457de61f0abe122ef7bf495
https://github.com/okfn/ckan/commit/bd918a8a77e82efdb457de61f0abe122ef7bf495
Author: amercader <amercadero at gmail.com>
Date: 2013-11-25 (Mon, 25 Nov 2013)
Changed paths:
M bin/travis-install-dependencies
Log Message:
-----------
Merge branch '1337-travis-postgres-8.4-cleaned'
Commit: d9ff5b0fcd3590144eda634845f1543a15071933
https://github.com/okfn/ckan/commit/d9ff5b0fcd3590144eda634845f1543a15071933
Author: Samuele Santi <redshadow at hackzine.org>
Date: 2013-11-26 (Tue, 26 Nov 2013)
Changed paths:
M MANIFEST.in
Log Message:
-----------
Fix to MANIFEST.in to explicitly include sub-directories (fixes #1338)
The ``**`` pattern *doesn't* match "any" sub-level, we need to list
all the patterns explicitly.
Commit: 672416c6a8b5b77585d490ccb53c20907864ed0a
https://github.com/okfn/ckan/commit/672416c6a8b5b77585d490ccb53c20907864ed0a
Author: John Martin <me at johnmart.in>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
[#1333] Changed misleading HTML comment in base.html
Commit: ac4d386870e560d6929a198acc4730570f986024
https://github.com/okfn/ckan/commit/ac4d386870e560d6929a198acc4730570f986024
Author: John Martin <me at johnmart.in>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M ckan/templates/snippets/organization.html
Log Message:
-----------
[#1096] Removes member count from sidebar or org pages
Commit: 73d918fe078854337501a6a52321eda296ffd5ec
https://github.com/okfn/ckan/commit/73d918fe078854337501a6a52321eda296ffd5ec
Author: amercader <amercadero at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M ckan/logic/__init__.py
M ckan/new_authz.py
Log Message:
-----------
[#1346] Fix useless debug messages
Commit: 4e3e9667be32986362b5d448d0efa0577cc9570f
https://github.com/okfn/ckan/commit/4e3e9667be32986362b5d448d0efa0577cc9570f
Author: Samuele Santi <redshadow at hackzine.org>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M MANIFEST.in
Log Message:
-----------
Removed comment from MANIFEST.in, to reduce noise (as asked in #1338)
Commit: edda21cd7f62561dc075fce144b159cd389aee26
https://github.com/okfn/ckan/commit/edda21cd7f62561dc075fce144b159cd389aee26
Author: amercader <amercadero at gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
Changed paths:
M MANIFEST.in
Log Message:
-----------
Merge branch 'rshk-bug-1338-static-files-not-being-included'
Commit: 0194fe99f357bd5ae6ed290a05fd497e85900a25
https://github.com/okfn/ckan/commit/0194fe99f357bd5ae6ed290a05fd497e85900a25
Author: John Martin <me at johnmart.in>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#1326] Adds data.group_id to existing_org in order to select the correct org
Commit: e0212f39cb20339265cf5920a786d60978d2ea5b
https://github.com/okfn/ckan/commit/e0212f39cb20339265cf5920a786d60978d2ea5b
Author: John Martin <me at johnmart.in>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#1264] Changes 'license' facet to 'licenses' as it reads better
Commit: 75fad56aa310ef7bbeb156f3ce2988821b6073e2
https://github.com/okfn/ckan/commit/75fad56aa310ef7bbeb156f3ce2988821b6073e2
Author: John Martin <me at johnmart.in>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/templates/snippets/search_result_text.html
Log Message:
-----------
[#1094] Removes references to 'Sorry' from search results titles
Commit: fb0fcf1ce1ca3028e00dd582afdb9476b7c2420f
https://github.com/okfn/ckan/commit/fb0fcf1ce1ca3028e00dd582afdb9476b7c2420f
Author: kindly <kindly at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Merge pull request #1218 from okfn/1218-remove-__extras
Hide __extras from extras on package_show
Commit: c4118d2666186f5c55fc9920d844ecd6205e2e70
https://github.com/okfn/ckan/commit/c4118d2666186f5c55fc9920d844ecd6205e2e70
Author: kindly <kindly at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
Merge pull request #1333 from okfn/1333-html-comment
Misleading HTML comment about scripts in base.html template
Commit: cdde256fbcb2c18bb25ce73e75ef217ea0da55ae
https://github.com/okfn/ckan/commit/cdde256fbcb2c18bb25ce73e75ef217ea0da55ae
Author: kindly <kindly at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/logic/__init__.py
M ckan/new_authz.py
Log Message:
-----------
Merge pull request #1346 from okfn/1346-minor-debug-message-tweaks
More useful debug messages for custom action/auth functions on startup
Commit: 618716bb76a51d3e74c23ba775533f7014ba2055
https://github.com/okfn/ckan/commit/618716bb76a51d3e74c23ba775533f7014ba2055
Author: kindly <kindly at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge pull request #1264 from okfn/1264-licenses-not-license-you-dummy
Incorrect case on Licence facet
Commit: ebd6db1569a99da276090bd9674eed5ed135ce63
https://github.com/okfn/ckan/commit/ebd6db1569a99da276090bd9674eed5ed135ce63
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/search.less
M ckan/templates/admin/config.html
M ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/index.html
M ckan/templates/group/members.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/activity.html
R ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/new.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_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/snippets/search_form.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_base.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read.html
M ckan/templates/user/read_base.html
R ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/login_form.html
M doc/_themes/sphinx-theme-okfn
Log Message:
-----------
Merge branch '1030-ui-update'
Commit: a85b4c03b87547699531219695ee66457d5c361a
https://github.com/okfn/ckan/commit/a85b4c03b87547699531219695ee66457d5c361a
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
Log Message:
-----------
[#1030] paster less after merge
Commit: 945acd6ff1b6bb392f77a8e7d8542d4e41aa3f72
https://github.com/okfn/ckan/commit/945acd6ff1b6bb392f77a8e7d8542d4e41aa3f72
Author: kindly <kindly at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/templates/snippets/search_result_text.html
Log Message:
-----------
Merge pull request #1094 from okfn/1094-not-sorry-just-empty
Better UX for empty groups/orgs
Commit: d92b93a130ad4f9611b4f9dceedca3548497aa09
https://github.com/okfn/ckan/commit/d92b93a130ad4f9611b4f9dceedca3548497aa09
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/templates/snippets/organization.html
Log Message:
-----------
Merge pull request #1096 from okfn/1096-org-members
Don't display number of members on Orgs, Groups
Commit: 9c34e8b92e07f02b426f58ad2b7c71d35fadc6e4
https://github.com/okfn/ckan/commit/9c34e8b92e07f02b426f58ad2b7c71d35fadc6e4
Author: amercader <amercadero at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
Merge branch '1326-create-dataset-incorrect-org'
Commit: b3e52b761ef22b8014f2a4655c44cfe7f888fe3c
https://github.com/okfn/ckan/commit/b3e52b761ef22b8014f2a4655c44cfe7f888fe3c
Author: kindly <kindly at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
A .coveragerc
M .travis.yml
M CHANGELOG.rst
M CONTRIBUTING.rst
M MANIFEST.in
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/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/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/munge.py
M ckan/lib/navl/validators.py
M ckan/lib/plugins.py
A ckan/lib/uploader.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/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/meta.py
M ckan/model/user.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/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
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/public/base/less/homepage.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/module.less
M ckan/public/base/less/search.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/about.html
M ckan/templates/group/activity_stream.html
M ckan/templates/group/edit.html
M ckan/templates/group/edit_base.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_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/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/form.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/edit.html
M ckan/templates/organization/edit_base.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read_base.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/activity.html
R ckan/templates/package/activity_stream.html
M ckan/templates/package/base.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.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
A 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/resource_read.html
A ckan/templates/package/resources.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.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/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/snippets/search_form.html
M ckan/templates/snippets/search_result_text.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_base.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.html
M ckan/templates/user/read_base.html
R ckan/templates/user/snippets/back_to_user_action.html
M ckan/templates/user/snippets/login_form.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_activity.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_dictization_schema.py
M ckan/tests/lib/test_mailer.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
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
A doc/_static/ckanlogo.png
M doc/api.rst
A doc/appendices/index.rst
A doc/appendices/solr-multicore.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/conf.py
M doc/configuration.rst
A doc/contents.rst
M doc/css-coding-standards.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/deployment.rst
M doc/email-notifications.rst
M doc/extensions/best-practices.rst
M doc/filestore.rst
M doc/getting-started.rst
M doc/i18n.rst
A doc/images/add_dataset_1.jpg
A doc/images/add_dataset_2.jpg
A doc/images/add_dataset_3.jpg
R doc/images/admin-page.png
R doc/images/ckan_logo_box.png
A doc/images/create_organization.jpg
A doc/images/customize_look_and_feel.jpg
A doc/images/edit_dataset.jpg
A doc/images/exploring_datasets.jpg
A doc/images/manage_news_feed.jpg
A doc/images/manage_organization.jpg
A doc/images/manage_user_profile.jpg
A doc/images/manage_users.jpg
A doc/images/move_dataset_between_organizations.jpg
A doc/images/register_account.jpg
A doc/images/search_the_site.jpg
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/legacy-api.rst
M doc/multilingual.rst
R doc/solr-setup.rst
A doc/sysadmin-guide.rst
M doc/test.rst
A doc/testing-coding-standards.rst
M doc/upgrade-source.rst
A doc/upgrading-dependencies.rst
A doc/user-guide.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M setup.py
M test-core.ini
Log Message:
-----------
fix merge issues
Commit: f075c6797076674b9c172ce974845427003f7594
https://github.com/okfn/ckan/commit/f075c6797076674b9c172ce974845427003f7594
Author: kindly <kindly at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#1102] make package_dictize go through group_list_dictize, except ignore package counts
Commit: 3e9a13f87ac47a7d54fcf442746c3c10c9013397
https://github.com/okfn/ckan/commit/3e9a13f87ac47a7d54fcf442746c3c10c9013397
Author: kindly <kindly at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/templates/group/snippets/group_item.html
M ckan/templates/package/group_list.html
Log Message:
-----------
fix merge issues
Compare: https://github.com/okfn/ckan/compare/09394b04f691...3e9a13f87ac4
More information about the ckan-changes
mailing list