[ckan-changes] [okfn/ckan] 7b57f3: [#1218] Ignore __extras on package_show extras
GitHub
noreply at github.com
Mon Dec 9 22:15:38 UTC 2013
Branch: refs/heads/1038-organization-hierarchy
Home: https://github.com/okfn/ckan
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: 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: 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: 660fc8194233a2b746c239a7b731218d66cf53ec
https://github.com/okfn/ckan/commit/660fc8194233a2b746c239a7b731218d66cf53ec
Author: kindly <kindly at gmail.com>
Date: 2013-09-29 (Sun, 29 Sep 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.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/new_authz.py
A ckan/templates/package/group_list.html
M ckan/templates/package/read_base.html
M ckan/templates/snippets/package_list.html
Log Message:
-----------
basic group add remove done with out any styling
Commit: bfad157979c406631ebb28185605db7ab7320626
https://github.com/okfn/ckan/commit/bfad157979c406631ebb28185605db7ab7320626
Author: kindly <kindly at gmail.com>
Date: 2013-09-30 (Mon, 30 Sep 2013)
Changed paths:
M ckan/controllers/group.py
M ckan/logic/action/get.py
M ckan/templates/group/member_new.html
M ckan/templates/group/read.html
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#1102] various group ui cleanups
Commit: d4cd29041bbb526473a11c1a683aedac04586d9b
https://github.com/okfn/ckan/commit/d4cd29041bbb526473a11c1a683aedac04586d9b
Author: John Martin <me at johnmart.in>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/templates/group/snippets/group_item.html
M ckan/templates/package/group_list.html
Log Message:
-----------
[#1102] Improves the groups list within package template
Commit: 3fb00598daee5be79e245bfc351a47ea0d4b4987
https://github.com/okfn/ckan/commit/3fb00598daee5be79e245bfc351a47ea0d4b4987
Author: John Martin <me at johnmart.in>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/templates/package/read_base.html
Log Message:
-----------
[#1102] Remove old sidebar groups since we now have tab for them
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: 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: 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: 57d6a4e6b112b4e159a4d93fdc9fa4626491d472
https://github.com/okfn/ckan/commit/57d6a4e6b112b4e159a4d93fdc9fa4626491d472
Author: kindly <kindly at gmail.com>
Date: 2013-10-09 (Wed, 09 Oct 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/uploader.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1273] resource upload with basic ui and mulitipart api uploading
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: 8ce0b90e813e3d312dcb89d133c243051523dd76
https://github.com/okfn/ckan/commit/8ce0b90e813e3d312dcb89d133c243051523dd76
Author: kindly <kindly at gmail.com>
Date: 2013-10-11 (Fri, 11 Oct 2013)
Changed paths:
M ckan/tests/test_coding_standards.py
Log Message:
-----------
#1102 fix blacklist test
Commit: 5023e0c3354ca03475b06ee11a3e47f867adedaf
https://github.com/okfn/ckan/commit/5023e0c3354ca03475b06ee11a3e47f867adedaf
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-10-13 (Sun, 13 Oct 2013)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
Don't exempt sysadmins
Commit: 878772cfc37932805cca58439150d702506fe043
https://github.com/okfn/ckan/commit/878772cfc37932805cca58439150d702506fe043
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-10-13 (Sun, 13 Oct 2013)
Changed paths:
M ckan/tests/functional/api/test_user.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#1226] Add tests
Commit: c269023a3fce3e80fcfdc58ea0335d769eb56163
https://github.com/okfn/ckan/commit/c269023a3fce3e80fcfdc58ea0335d769eb56163
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/config/deployment.ini_tmpl
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/user.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/navl/validators.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M dev-requirements.txt
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/i18n.rst
M doc/index.rst
M doc/multilingual.rst
M doc/tag-vocabularies.rst
M doc/test.rst
A doc/testing-coding-standards.rst
R doc/toolkit.rst
M doc/upgrade-source.rst
R doc/writing-extensions.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 1226-user-create-option
Conflicts:
ckan/logic/auth/create.py
ckan/templates/header.html
Commit: 3273ebf7d0e06dbf3d854a25f701e651fe88bb0b
https://github.com/okfn/ckan/commit/3273ebf7d0e06dbf3d854a25f701e651fe88bb0b
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M ckan/logic/auth/create.py
M ckan/tests/functional/api/test_user.py
Log Message:
-----------
[#1226] Return the old behaviour for create_user
Commit: bb6cb7d0ff417b72f002dd372bdfd09ba560a766
https://github.com/okfn/ckan/commit/bb6cb7d0ff417b72f002dd372bdfd09ba560a766
Author: kindly <kindly at gmail.com>
Date: 2013-10-14 (Mon, 14 Oct 2013)
Changed paths:
M ckan/lib/helpers.py
M ckan/lib/uploader.py
Log Message:
-----------
[#1261] add filesize limit, make storage folder backwards compatable, document a bit more
Commit: 3dee85226f1fa6a29a03d598c8c11be1c5dba4ca
https://github.com/okfn/ckan/commit/3dee85226f1fa6a29a03d598c8c11be1c5dba4ca
Author: John Martin <me at johnmart.in>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
A ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/forms.less
M ckan/templates/group/snippets/group_form.html
M ckan/templates/macros/form.html
M ckan/templates/organization/snippets/organization_form.html
Log Message:
-----------
[#1262] First working version of the JS module for image uploading
Commit: 0f74db8a964451e5cba1360b4f15ea3a84a56544
https://github.com/okfn/ckan/commit/0f74db8a964451e5cba1360b4f15ea3a84a56544
Author: John Martin <me at johnmart.in>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/public/base/javascript/modules/image-upload.js
Log Message:
-----------
[#1262] Adds in doc blocks into the image_upload JS module
Commit: 7d15d591499d5722f60cc0ecfc09abf59dad177f
https://github.com/okfn/ckan/commit/7d15d591499d5722f60cc0ecfc09abf59dad177f
Author: John Martin <me at johnmart.in>
Date: 2013-10-15 (Tue, 15 Oct 2013)
Changed paths:
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/macros/form.html
Log Message:
-----------
[#1262] Adds support for different field names for image upload
Commit: 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: 3a60c2e2420350631742f8d0330be2f002d581eb
https://github.com/okfn/ckan/commit/3a60c2e2420350631742f8d0330be2f002d581eb
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M .travis.yml
R bin/travis-build
A bin/travis-install-dependencies
A bin/travis-run-tests
Log Message:
-----------
[#766] Stop Travis build if a dependency install fails
To do so, I needed to split our ./bin/travis-build in two files, one with the
deps install, and one with the test run. Doing so allows me to use the
"install" directive in Travis, and break the build as soon as something fails
with it.
Commit: 1aee242081710ddb1283d3cb9b0987d209273b53
https://github.com/okfn/ckan/commit/1aee242081710ddb1283d3cb9b0987d209273b53
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-10-16 (Wed, 16 Oct 2013)
Changed paths:
M bin/travis-install-dependencies
Log Message:
-----------
[#766] Remove redundant datastore_test psql user creation
Commit: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 83a0519533dca1f5112b2014ff7bd9a2a3088a52
https://github.com/okfn/ckan/commit/83a0519533dca1f5112b2014ff7bd9a2a3088a52
Author: kindly <kindly at gmail.com>
Date: 2013-11-12 (Tue, 12 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/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/plugins.py
M 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
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
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/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/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_dictization_schema.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:
-----------
[#1273] fix merge with org upload branch
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: 4913975a2863e2a4ab12a42daef737c632fe9284
https://github.com/okfn/ckan/commit/4913975a2863e2a4ab12a42daef737c632fe9284
Author: kindly <kindly at gmail.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
Changed paths:
M ckan/lib/uploader.py
M ckan/logic/action/create.py
Log Message:
-----------
[#1273] Make sure new resource upload works, also fixes #994
Commit: 2ec5fcfc934d08be502af27d3459400394cd030f
https://github.com/okfn/ckan/commit/2ec5fcfc934d08be502af27d3459400394cd030f
Author: kindly <kindly at gmail.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
Changed paths:
M ckan/logic/action/update.py
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/group/snippets/group_form.html
M ckan/templates/macros/form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1273] Add javascript to resource uploads
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: 35acb45361c3e2eb750cf7f54d64023e5e9f728b
https://github.com/okfn/ckan/commit/35acb45361c3e2eb750cf7f54d64023e5e9f728b
Author: kindly <kindly at gmail.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M ckan/lib/uploader.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M doc/configuration.rst
Log Message:
-----------
[#1273] add size limits properly and add docs
Commit: 4629b4125d5042f0346bd53172a87b2c31b4cf95
https://github.com/okfn/ckan/commit/4629b4125d5042f0346bd53172a87b2c31b4cf95
Author: kindly <kindly at gmail.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/configuration.rst
Log Message:
-----------
[#1273] change template.ini and fix more docs
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: 091eb3b257ada4c72595eb69546a3131478c56d9
https://github.com/okfn/ckan/commit/091eb3b257ada4c72595eb69546a3131478c56d9
Author: kindly <kindly at gmail.com>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M doc/conf.py
M doc/filestore.rst
Log Message:
-----------
[#1273] change filestore docs
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: 29366924e9f62ea94793c81f87033baf0ef1760a
https://github.com/okfn/ckan/commit/29366924e9f62ea94793c81f87033baf0ef1760a
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-11-17 (Sun, 17 Nov 2013)
Changed paths:
M CONTRIBUTING.rst
M bin/travis-install-dependencies
M ckan/controllers/user.py
M ckan/public/base/css/main.css
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
A doc/upgrading-dependencies.rst
Log Message:
-----------
Merge branch 'master' into 1273-resource-uploads
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: 57397c20b0ceae51b1081c0589c67c9594104e83
https://github.com/okfn/ckan/commit/57397c20b0ceae51b1081c0589c67c9594104e83
Author: kindly <kindly at gmail.com>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/lib/uploader.py
M ckan/logic/action/update.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1273] fix some tests
Commit: 091284965aa43a79607cd6842900ab40b320e291
https://github.com/okfn/ckan/commit/091284965aa43a79607cd6842900ab40b320e291
Author: kindly <kindly at gmail.com>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M CONTRIBUTING.rst
M bin/travis-install-dependencies
M ckan/controllers/user.py
M ckan/public/base/css/main.css
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
A doc/upgrading-dependencies.rst
Log Message:
-----------
Merge branch '1273-resource-uploads' of github.com:okfn/ckan into 1273-resource-uploads
Commit: 53d6a1f869eb3afdb289305ab31a355ea7fba987
https://github.com/okfn/ckan/commit/53d6a1f869eb3afdb289305ab31a355ea7fba987
Author: kindly <kindly at gmail.com>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#1273] fix some more tests
Commit: edb65c01afce7b8c5d699e7d704d3ab05a1518f0
https://github.com/okfn/ckan/commit/edb65c01afce7b8c5d699e7d704d3ab05a1518f0
Author: kindly <kindly at gmail.com>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/lib/uploader.py
Log Message:
-----------
[#1273] pep8
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: d4ff6a8a929855300be19e99b2e38a68f923788a
https://github.com/okfn/ckan/commit/d4ff6a8a929855300be19e99b2e38a68f923788a
Author: kindly <kindly at gmail.com>
Date: 2013-11-20 (Wed, 20 Nov 2013)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#1273] fix datastore test
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: f011d992d64c0a46ebd07be4e226f38e5a1fcf54
https://github.com/okfn/ckan/commit/f011d992d64c0a46ebd07be4e226f38e5a1fcf54
Author: John Martin <me at johnmart.in>
Date: 2013-11-21 (Thu, 21 Nov 2013)
Changed paths:
M ckan/public/base/less/dataset.less
Log Message:
-----------
[#1273] Removes old CSS for resource file type swtiching
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: 882a7274667b8f76bf801f88544d657e13c2d66c
https://github.com/okfn/ckan/commit/882a7274667b8f76bf801f88544d657e13c2d66c
Author: amercader <amercadero at gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
Changed paths:
M CHANGELOG.rst
M bin/travis-run-tests
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/tests/lib/test_solr_schema_version.py
M doc/appendices/solr-multicore.rst
M doc/install-from-source.rst
M doc/release-process.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
Log Message:
-----------
[#1314] Single Solr schema file
To make easier to track changes and simplify the deplyment and upgrade,
the Solr schema file included in the CKAN source is now unified under
`schema.xml`.
As part of the release process, the file will be checked for changes,
and if present the version numbers on the schema file and the supported
versions list will be updated.
Release, install and upgrade docs have been updated to reflect this
changes.
Travis now also always points to schema.xml
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: 9f3bd90046436717dd8602d74e1395c5b43192c9
https://github.com/okfn/ckan/commit/9f3bd90046436717dd8602d74e1395c5b43192c9
Author: John Martin <me at johnmart.in>
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:
-----------
[#1102] Changed labelling on remove and add buttons
Commit: 09394b04f69147c58d11dc84a5d7f4e959f271f1
https://github.com/okfn/ckan/commit/09394b04f69147c58d11dc84a5d7f4e959f271f1
Author: John Martin <me at johnmart.in>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#1102] Typo fix
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: 0f075c61666468881316331847c5bbea7ca29860
https://github.com/okfn/ckan/commit/0f075c61666468881316331847c5bbea7ca29860
Author: amercader <amercadero at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M ckan/templates/organization/read.html
Log Message:
-----------
[#1348] Don't show Add Dataset button on org pages unless authorized
The check_access function was passing the wrong parameter for the org id
so it always returned True.
We are removing the Add Dataset button on the Groups page on #1102
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
Commit: 89583c8354a5ab5b3b314ef5233390d30d4f7ea1
https://github.com/okfn/ckan/commit/89583c8354a5ab5b3b314ef5233390d30d4f7ea1
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
Changed paths:
M CONTRIBUTING.rst
M MANIFEST.in
M bin/travis-install-dependencies
M bin/travis-run-tests
M ckan/ckan_nose_plugin.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/new_authz.py
M ckan/new_tests/helpers.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/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/base.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/organization.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/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 ckan/tests/functional/api/test_activity.py
M doc/_themes/sphinx-theme-okfn
M doc/api.rst
A doc/appendices/index.rst
A doc/appendices/solr-multicore.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/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
M doc/install-from-package.rst
M doc/install-from-source.rst
R doc/solr-setup.rst
A doc/sysadmin-guide.rst
M doc/test.rst
A doc/user-guide.rst
Log Message:
-----------
Merge branch 'master' into 1273-resource-uploads
Conflicts:
ckan/templates/group/snippets/group_form.html
doc/filestore.rst
Commit: 2d7d567b46ba926121b99d52c8ee33a8c4fc2961
https://github.com/okfn/ckan/commit/2d7d567b46ba926121b99d52c8ee33a8c4fc2961
Author: amercader <amercadero at gmail.com>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/tests/functional/test_package.py
Log Message:
-----------
[#1353] Fix exception in resource listing, add tests
Commit: 042c161257891726f88971d6403651647760b14c
https://github.com/okfn/ckan/commit/042c161257891726f88971d6403651647760b14c
Author: kindly <kindly at gmail.com>
Date: 2013-12-02 (Mon, 02 Dec 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/templates/macros/form.html
M doc/configuration.rst
M doc/filestore.rst
Log Message:
-----------
[#1273] fix typos and minor issues from pull request
Commit: 62b91b1bf522fad39ad0a2d0a9b7c6c16b2b2cca
https://github.com/okfn/ckan/commit/62b91b1bf522fad39ad0a2d0a9b7c6c16b2b2cca
Author: kindly <kindly at gmail.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/lib/cli.py
M doc/filestore.rst
Log Message:
-----------
[#1273] add filestore migration script
Commit: 681bdd6da1c1538c6a834313c70767a877630ffa
https://github.com/okfn/ckan/commit/681bdd6da1c1538c6a834313c70767a877630ffa
Author: kindly <kindly at gmail.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/email_notifications.py
M ckan/logic/action/create.py
Log Message:
-----------
[#1191] refactor user dictize to be clearer
Commit: c3a3cf918b51136950d2bed36a02a57b5ddf774d
https://github.com/okfn/ckan/commit/c3a3cf918b51136950d2bed36a02a57b5ddf774d
Author: John Martin <me at johnmart.in>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/public/base/javascript/modules/slug-preview.js
Log Message:
-----------
[#1232] Checks if there is no value in slug field ... if there is don't autogenerate the slug for keyup events
Commit: 26a1a1ec94121600ebac9ecf99c0a36e577dbb11
https://github.com/okfn/ckan/commit/26a1a1ec94121600ebac9ecf99c0a36e577dbb11
Author: John Martin <me at johnmart.in>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/public/base/javascript/modules/slug-preview.js
Log Message:
-----------
[#1232] Added whitespace to lines
Commit: 38f1e30eaa41f219cebbb5f08e28772f2968c181
https://github.com/okfn/ckan/commit/38f1e30eaa41f219cebbb5f08e28772f2968c181
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M doc/_themes/sphinx-theme-okfn
Log Message:
-----------
Upgrade the OKFN Sphinx theme to the version we had before
Somehow it got downgraded
Commit: 9416adc0c9f7e54b5573a99a348e34b17f421154
https://github.com/okfn/ckan/commit/9416adc0c9f7e54b5573a99a348e34b17f421154
Author: kindly <kindly at gmail.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M doc/filestore.rst
Log Message:
-----------
[#1273] fix some typos
Commit: 41baadecfb3a3ae000a3d2ae65c8b765691df9ed
https://github.com/okfn/ckan/commit/41baadecfb3a3ae000a3d2ae65c8b765691df9ed
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M MANIFEST.in
M bin/travis-install-dependencies
M ckan/controllers/package.py
M ckan/logic/__init__.py
M ckan/logic/schema.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/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/base.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/organization.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/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 ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1314-solr-schema-single-file
Commit: ca008e84cec6a909a7c0cd3cc48d7d5dc25f3cda
https://github.com/okfn/ckan/commit/ca008e84cec6a909a7c0cd3cc48d7d5dc25f3cda
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M doc/contents.rst
Log Message:
-----------
Add user guide and sysadmin guide to docs toc
These seem to have got removed somehow
Commit: c0a3958ed4e330a8923651990dcdebcbfcfdb99a
https://github.com/okfn/ckan/commit/c0a3958ed4e330a8923651990dcdebcbfcfdb99a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/plugins/interfaces.py
Log Message:
-----------
Fix a Sphinx warning
Commit: 817725b9f7dcee94e87b47de6740029f5909f938
https://github.com/okfn/ckan/commit/817725b9f7dcee94e87b47de6740029f5909f938
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M ckan/plugins/interfaces.py
M doc/contents.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1314-solr-schema-single-file
Commit: 02d3f60f4c0593e11a51c0ad87cf8a6cd7ece3e8
https://github.com/okfn/ckan/commit/02d3f60f4c0593e11a51c0ad87cf8a6cd7ece3e8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-03 (Tue, 03 Dec 2013)
Changed paths:
M doc/release-process.rst
Log Message:
-----------
[#1314] Fix a Sphinx warning
Commit: 82cdbb83c4724dc905ff7f5b4a3b9461c627f66d
https://github.com/okfn/ckan/commit/82cdbb83c4724dc905ff7f5b4a3b9461c627f66d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M CHANGELOG.rst
M bin/travis-run-tests
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/tests/lib/test_solr_schema_version.py
M doc/appendices/solr-multicore.rst
M doc/install-from-source.rst
M doc/release-process.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
Log Message:
-----------
Merge branch '1314-solr-schema-single-file'
Commit: e80e45e84b38179e5c44cbb5494f5e536497e846
https://github.com/okfn/ckan/commit/e80e45e84b38179e5c44cbb5494f5e536497e846
Author: amercader <amercadero at gmail.com>
Date: 2013-12-04 (Wed, 04 Dec 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
Log Message:
-----------
[#1359] Add organization_revision_list to avoid exception on org history page
Commit: 6dde1045105f7c9574c039336ed19cf191e9ef17
https://github.com/okfn/ckan/commit/6dde1045105f7c9574c039336ed19cf191e9ef17
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/uploader.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/less/dataset.less
M ckan/templates/group/snippets/group_form.html
M ckan/templates/macros/form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/tests/logic/test_action.py
M doc/conf.py
M doc/configuration.rst
M doc/filestore.rst
Log Message:
-----------
Merge pull request #1273 from okfn/1273-resource-uploads
Resource uploads through multipart form data.
Commit: db01ffed2d5f8d63d26b5cf63fa7cf8737e3a37b
https://github.com/okfn/ckan/commit/db01ffed2d5f8d63d26b5cf63fa7cf8737e3a37b
Author: amercader <amercadero at gmail.com>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M ckan/templates/group/snippets/group_item.html
Log Message:
-----------
[#1102] Don't display dataset count if packages property is not there
Commit: 78fa009f07bf0a83a4c1056292681525c776aa69
https://github.com/okfn/ckan/commit/78fa009f07bf0a83a4c1056292681525c776aa69
Author: amercader <amercadero at gmail.com>
Date: 2013-12-05 (Thu, 05 Dec 2013)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#1102] Add display_name to schema so it shows on the Groups tab
Commit: 10ea25184d38caea396defe00f9e60f0be5e2917
https://github.com/okfn/ckan/commit/10ea25184d38caea396defe00f9e60f0be5e2917
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/email_notifications.py
M ckan/logic/action/create.py
Log Message:
-----------
Merge branch '1191-group-show-no-user-data'
Commit: b377ec20a8f870d98e3bcd6ad2b63f136c9067a4
https://github.com/okfn/ckan/commit/b377ec20a8f870d98e3bcd6ad2b63f136c9067a4
Author: amercader <amercadero at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M CHANGELOG.rst
M bin/travis-run-tests
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/uploader.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/plugins/interfaces.py
M ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/less/dataset.less
M ckan/templates/group/snippets/group_form.html
M ckan/templates/macros/form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/tests/lib/test_solr_schema_version.py
M ckan/tests/logic/test_action.py
M doc/_themes/sphinx-theme-okfn
M doc/appendices/solr-multicore.rst
M doc/conf.py
M doc/configuration.rst
M doc/contents.rst
M doc/filestore.rst
M doc/install-from-source.rst
M doc/release-process.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
Log Message:
-----------
Merge branch 'master' into 1102-dataset-group-add
Commit: 4e89ef8ec916a47fdefd0694d3ea39a9ca9cec6c
https://github.com/okfn/ckan/commit/4e89ef8ec916a47fdefd0694d3ea39a9ca9cec6c
Author: amercader <amercadero at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.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/schema.py
M ckan/new_authz.py
M ckan/templates/group/member_new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_item.html
A ckan/templates/package/group_list.html
M ckan/templates/package/read_base.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/package_list.html
M ckan/tests/lib/test_dictization.py
M ckan/tests/test_coding_standards.py
Log Message:
-----------
Merge branch '1102-dataset-group-add'
Commit: 6e8859a156e0b5993db8d28b51e7c6f3c4a0c2a9
https://github.com/okfn/ckan/commit/6e8859a156e0b5993db8d28b51e7c6f3c4a0c2a9
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
Log Message:
-----------
[#1373] Give datastore_search_sql own auth function. Before it was going though normal datastore_search auth function which made no sense as their was no resource to check. It was picking a random resource to check agaist! This patch also fixes a very minor unicode bug.
Commit: 8ba294f504b54d4aa68b36713f525f7ef7b62759
https://github.com/okfn/ckan/commit/8ba294f504b54d4aa68b36713f525f7ef7b62759
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
Log Message:
-----------
Merge pull request #1359 from okfn/1359-org_rev_list-missing
Exception when visiting org history page
Commit: 92128c30c006ac3a9e9137d421cceb0ed62dcfc4
https://github.com/okfn/ckan/commit/92128c30c006ac3a9e9137d421cceb0ed62dcfc4
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/controllers/package.py
M ckan/tests/functional/test_package.py
Log Message:
-----------
Merge pull request #1353 from okfn/1353-exception-resource-listing
Uncaught exception on resources listing
Commit: 061a67a941b1c060bab06a95c09cb7fdb36265bf
https://github.com/okfn/ckan/commit/061a67a941b1c060bab06a95c09cb7fdb36265bf
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/templates/organization/read.html
Log Message:
-----------
Merge pull request #1348 from okfn/1348-add-dataset-button-org-page
"Add Dataset" button shown on org pages when not authorized
Commit: 6c5a5cbffc7e49951a5fc771b678f3c96e4bf303
https://github.com/okfn/ckan/commit/6c5a5cbffc7e49951a5fc771b678f3c96e4bf303
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/public/base/javascript/modules/slug-preview.js
Log Message:
-----------
Merge pull request #1232 from okfn/1232-slug-edit
Title edit for existing dataset changes the URL
Commit: ce3e42b9cb867d9f04163dd3834b0b7e113c4d09
https://github.com/okfn/ckan/commit/ce3e42b9cb867d9f04163dd3834b0b7e113c4d09
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M doc/filestore.rst
Log Message:
-----------
Various FileStore docs fixes
Correct storage_dir to storage_path.
Correct case in titles (see doc guidelines).
Fix Sphinx warnings - title underlines too long.
When mentioning config settings, cross-reference them.
When mentioning action functions, cross-reference them.
api = API
json = JSON
python = Python
Dedent parsed literals - the rst was formatted wrong so that it was outputting
literals inside blockquotes.
Commit: c4a71abf60b31594c2fef7488d36b71c4e139461
https://github.com/okfn/ckan/commit/c4a71abf60b31594c2fef7488d36b71c4e139461
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M doc/filestore.rst
Log Message:
-----------
Fix a cross-reference
If you're going to mention another section in the docs, cross-reference
it properly. This way if that section gets moved or deleted, a Sphinx
error will remind you to update the cross-reference (or Sphinx will do
it automatically). Also users get a nice hyperlink.
Commit: eb7ec826da38b0f97e35bc5a736f4b331b2c4216
https://github.com/okfn/ckan/commit/eb7ec826da38b0f97e35bc5a736f4b331b2c4216
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M doc/filestore.rst
Log Message:
-----------
General edit of new FileStore docs
Edit text for clarity, simplicity.
Commit: 0ddce2631877527df6824ec1778bd66e85770de1
https://github.com/okfn/ckan/commit/0ddce2631877527df6824ec1778bd66e85770de1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M doc/filestore.rst
Log Message:
-----------
Change DataStore ref in FileStore docs to seealso
It'll be good if we can use this style (a Sphinx .. seealso::, near the
top of the page) whenever we want to say "also see this page" in the
docs. That'll make it a lot more predictable and easier for users to
find, when one feature is connected to another.
Commit: 2c53e5b7a197345f952708c3f05a369b30f583bc
https://github.com/okfn/ckan/commit/2c53e5b7a197345f952708c3f05a369b30f583bc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M doc/filestore.rst
Log Message:
-----------
Spellcheck new FileStore docs
Commit: 933209852836e7ed1174cd91395f7020c5361ee0
https://github.com/okfn/ckan/commit/933209852836e7ed1174cd91395f7020c5361ee0
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckanext/datastore/logic/auth.py
Log Message:
-----------
[#1373] fix pep-8 issues
Commit: 07449ae59acf74bf84433eeab117bf2d26c96d8a
https://github.com/okfn/ckan/commit/07449ae59acf74bf84433eeab117bf2d26c96d8a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M doc/documentation-guidelines.rst
Log Message:
-----------
Add some details to the documentation guidelines
Commit: ca11b7a1b65376c2d84cf1178a102960b6dcdafb
https://github.com/okfn/ckan/commit/ca11b7a1b65376c2d84cf1178a102960b6dcdafb
Author: kindly <kindly at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M doc/documentation-guidelines.rst
M doc/filestore.rst
Log Message:
-----------
Merge pull request #1376 from okfn/fix-filestore-docs
Fix filestore docs
Commit: 22a3432edc3dc330da87c468a539402b234469c3
https://github.com/okfn/ckan/commit/22a3432edc3dc330da87c468a539402b234469c3
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/tests/models/test_group.py
Log Message:
-----------
[#1038] Fix for python 2.6.
Commit: 75394f84c0410e146b9cda434dfad0687689480d
https://github.com/okfn/ckan/commit/75394f84c0410e146b9cda434dfad0687689480d
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/new_authz.py
M ckan/tests/test_coding_standards.py
Log Message:
-----------
[#1038] Simplify code that reads ckan.auth config.
Commit: 4de48399092c8644f5a2d1e234a0c263ee6a9157
https://github.com/okfn/ckan/commit/4de48399092c8644f5a2d1e234a0c263ee6a9157
Author: amercader <amercadero at gmail.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
Log Message:
-----------
Merge branch '1373-anon-user-datastore-search-sql'
Commit: 8dffa31ab286c3b2939c88b9a40f2834ff6531a4
https://github.com/okfn/ckan/commit/8dffa31ab286c3b2939c88b9a40f2834ff6531a4
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M .travis.yml
M CHANGELOG.rst
M CONTRIBUTING.rst
M MANIFEST.in
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
R ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/README.txt
M ckan/config/solr/schema-1.2.xml
M ckan/config/solr/schema-1.3.xml
M ckan/config/solr/schema-1.4.xml
M ckan/config/solr/schema-2.0.xml
A ckan/config/solr/schema.xml
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/package.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/dictization/model_save.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/munge.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/get.py
M ckan/logic/schema.py
M ckan/new_authz.py
M ckan/new_tests/helpers.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/client.js
M ckan/public/base/javascript/main.js
A ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/dataset.less
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/base.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.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/info.html
M ckan/templates/header.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/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
A ckan/templates/package/group_list.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/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.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/snippets/package_list.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/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 ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_schema_version.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
M ckan/tests/test_coding_standards.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
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/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
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
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/release-process.rst
R doc/solr-setup.rst
A doc/sysadmin-guide.rst
M doc/test.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
A doc/upgrading-dependencies.rst
A doc/user-guide.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1038-organization-hierarchy
Conflicts:
ckan/config/deployment.ini_tmpl
ckan/new_authz.py
ckan/templates/organization/read.html
ckan/tests/logic/test_auth.py
doc/configuration.rst
doc/solr-setup.rst
Commit: 1de51c637aa750872d9d8a72b176a009f84df229
https://github.com/okfn/ckan/commit/1de51c637aa750872d9d8a72b176a009f84df229
Author: David Read <david.read at hackneyworkshop.com>
Date: 2013-12-09 (Mon, 09 Dec 2013)
Changed paths:
M ckan/templates/organization/read.html
Log Message:
-----------
[#1038] Fix a bug introduced on this branch, for pre-filling the group in the new-package form.
Compare: https://github.com/okfn/ckan/compare/b95ef5983204...1de51c637aa7
More information about the ckan-changes
mailing list