[ckan-changes] [okfn/ckan] 0b3089: [2347] Implemented related dashboard with filter o...
GitHub
noreply at github.com
Tue Aug 21 13:25:56 UTC 2012
Branch: refs/heads/2549-merge-organizations
Home: https://github.com/okfn/ckan
Commit: 0b30897cd28bbc62efa2d9811cb3bff8af6627ae
https://github.com/okfn/ckan/commit/0b30897cd28bbc62efa2d9811cb3bff8af6627ae
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-02 (Wed, 02 May 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/related.py
M ckan/logic/action/get.py
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
R ckan/templates/package/related_list.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
Log Message:
-----------
[2347] Implemented related dashboard with filter on type and tidied up some of the related templates
Commit: db36db63dd994cd1ea84bf294e8b756c0bd41bab
https://github.com/okfn/ckan/commit/db36db63dd994cd1ea84bf294e8b756c0bd41bab
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-02 (Wed, 02 May 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/related.py
M ckan/logic/action/get.py
M ckan/model/related.py
M ckan/templates/_util.html
M ckan/templates/related/dashboard.html
Log Message:
-----------
[2347] Added support for sorting by view count, or creation date
Commit: 5a97413dd61e905624dcb1fae95d4cbe180ea5c5
https://github.com/okfn/ckan/commit/5a97413dd61e905624dcb1fae95d4cbe180ea5c5
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
A ckan/migration/versions/058_add_related_viewcount.py
M ckan/templates/user/read.html
Log Message:
-----------
[2347] viewcount migration and related on user page
Commit: 5a8459d7d60ec02a8f26d0ac95555a833dc9498c
https://github.com/okfn/ckan/commit/5a8459d7d60ec02a8f26d0ac95555a833dc9498c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/home.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
A ckan/migration/versions/058_add_related_count_and_flag.py
R ckan/migration/versions/058_add_related_viewcount.py
M ckan/model/__init__.py
M ckan/model/related.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/_util.html
M ckan/templates/layout_base.html
M ckan/templates/related/dashboard.html
M ckan/templates/related/related_list.html
M ckan/templates/user/login.html
M ckan/tests/lib/test_helpers.py
M doc/configuration.rst
Log Message:
-----------
[2347] Added featured field to related and adding it to the dashboard filters
Commit: 6002a53a6be3c9a1d9a5940a05377d7f8233d5bc
https://github.com/okfn/ckan/commit/6002a53a6be3c9a1d9a5940a05377d7f8233d5bc
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/templates/related/dashboard.html
Log Message:
-----------
[2347] Restrict updates/create of related featured flag to admins for now
Commit: 7cc252d7d5d3c3b7a892f756e8443cc599e7de3c
https://github.com/okfn/ckan/commit/7cc252d7d5d3c3b7a892f756e8443cc599e7de3c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/related/add-related.html
M ckan/templates/related/dashboard.html
Log Message:
-----------
[2347] Added activity for creating of related items
Commit: 3eac5416da57d42a4b5ee9ae48b30efffbfc9f6b
https://github.com/okfn/ckan/commit/3eac5416da57d42a4b5ee9ae48b30efffbfc9f6b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
A ckan/templates/activity_streams/deleted_related_item.html
Log Message:
-----------
[2347] Added activity for deleting related items
Commit: da04077f943dfd83354b74097c5aa09d9ef7fcbc
https://github.com/okfn/ckan/commit/da04077f943dfd83354b74097c5aa09d9ef7fcbc
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/templates/package/layout.html
M doc/configuration.rst
Log Message:
-----------
[2347] Added config option to hide related and documented it
Commit: eeb1cc954e0cc7604edbdcc6fb3a95d3b91c5f73
https://github.com/okfn/ckan/commit/eeb1cc954e0cc7604edbdcc6fb3a95d3b91c5f73
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/logic/validators.py
Log Message:
-----------
[2347] Add a url validator to the related schema
Commit: d2ea8735a3d01a8135c7635b83f204c92712b878
https://github.com/okfn/ckan/commit/d2ea8735a3d01a8135c7635b83f204c92712b878
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/templates/package/layout.html
M doc/configuration.rst
Log Message:
-----------
[2347] Following advice from tobes to use h.bool to allow use or more than 1 or 0 in ini file
Commit: 45336e342fc1a0dd6a469d67c0438296a2dc6513
https://github.com/okfn/ckan/commit/45336e342fc1a0dd6a469d67c0438296a2dc6513
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M ckan/templates/package/layout.html
M doc/configuration.rst
Log Message:
-----------
[2347] Fixing up naming
Commit: 4e64a458c0ac8b62eed7aa5cd68d5adf3414bd5a
https://github.com/okfn/ckan/commit/4e64a458c0ac8b62eed7aa5cd68d5adf3414bd5a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-09 (Wed, 09 May 2012)
Changed paths:
M ckan/authz.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/controllers/related.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/model/group.py
M ckan/plugins/toolkit.py
M ckan/public/css/style.css
M ckan/templates/admin/authz.html
M ckan/templates/group/authz.html
M ckan/templates/home/about.html
M ckan/templates/home/index.html
M ckan/templates/layout_base.html
M ckan/templates/package/authz.html
M ckan/templates/package/read.html
M ckan/templates/package/read.n3
M ckan/templates/package/read.rdf
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/search_form.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_member.py
A ckan/tests/logic/test_tag.py
M ckan/tests/models/test_group.py
M ckanext/organizations/templates/email/join_publisher_request.txt
A doc/data-viewer.rst
M doc/filestore.rst
M doc/index.rst
A doc/user-stories-list.rst
A doc/user-stories.rst
Log Message:
-----------
Merge branch 'master' into feature-2347-related-dashboard
Commit: 8c73fbcda5de09db39efb4469c4e22b0812db87d
https://github.com/okfn/ckan/commit/8c73fbcda5de09db39efb4469c4e22b0812db87d
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-09 (Wed, 09 May 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/auth/publisher/create.py
M ckan/templates/related/related_list.html
Log Message:
-----------
[2347] Use auth check in template for add button and make sure related_create for publisher auth is accurate
Commit: 307ea3ce98e0091883e1756215acfab0be804c75
https://github.com/okfn/ckan/commit/307ea3ce98e0091883e1756215acfab0be804c75
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-09 (Wed, 09 May 2012)
Changed paths:
M ckan/logic/auth/publisher/delete.py
M ckan/templates/_util.html
Log Message:
-----------
[2347] Change delete button to respect auth profile
Commit: 685063a03cdd6d5ac7e78b66354e178b5f687fc1
https://github.com/okfn/ckan/commit/685063a03cdd6d5ac7e78b66354e178b5f687fc1
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-15 (Tue, 15 May 2012)
Changed paths:
M ckan/templates/related/add-related.html
M ckan/templates/related/dashboard.html
Log Message:
-----------
Updated the types of related items
Commit: d0b77ac5c8e6199ff0b0b50049643225e4e5483d
https://github.com/okfn/ckan/commit/d0b77ac5c8e6199ff0b0b50049643225e4e5483d
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-17 (Thu, 17 May 2012)
Changed paths:
M .gitattributes
M .tx/config
M CHANGELOG.txt
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/authztool.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/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/logic/__init__.py
M ckan/logic/action/__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/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/058_add_follower_tables.py
R ckan/migration/versions/058_add_related_count_and_flag.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/__init__.py
M ckan/model/activity.py
M ckan/model/authorization_group.py
M ckan/model/authz.py
M ckan/model/core.py
M ckan/model/domain_object.py
M ckan/model/extension.py
A ckan/model/follower.py
M ckan/model/group.py
M ckan/model/group_extra.py
M ckan/model/license.py
M ckan/model/meta.py
M ckan/model/misc.py
M ckan/model/modification.py
M ckan/model/package.py
M ckan/model/package_extra.py
R ckan/model/package_mapping.py
M ckan/model/package_relationship.py
M ckan/model/rating.py
M ckan/model/related.py
M ckan/model/resource.py
M ckan/model/tag.py
M ckan/model/task_status.py
M ckan/model/term_translation.py
M ckan/model/test_user.py
M ckan/model/tracking.py
M ckan/model/types.py
M ckan/model/user.py
M ckan/model/vocabulary.py
M ckan/plugins/interfaces.py
M ckan/public/scripts/application.js
M ckan/templates/authorization_group/authz.html
M ckan/templates/authorization_group/edit.html
M ckan/templates/authorization_group/index.html
M ckan/templates/authorization_group/new.html
M ckan/templates/authorization_group/read.html
M ckan/templates/group/edit.html
M ckan/templates/home/index.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
M ckan/templates/package/editresources.html
A ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/layout.html
M ckan/templates/package/new.html
M ckan/templates/package/read.rdf
M ckan/templates/related/related_list.html
M ckan/templates/revision/diff.html
M ckan/templates/revision/list.html
A ckan/templates/user/followers.html
M ckan/templates/user/layout.html
M ckan/templates/user/login.html
M ckan/templates/user/read.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/test_api.py
A ckan/tests/functional/api/test_follow.py
A ckan/tests/functional/test_follow.py
A ckan/tests/lib/test_authztool.py
M ckan/tests/logic/test_action.py
M ckan/tests/pylons_controller.py
M ckan_deb/usr/bin/ckan-setup-solr
M ckanext/multilingual/plugin.py
M ckanext/stats/controller.py
M ckanext/stats/plugin.py
M ckanext/stats/stats.py
M doc/api-v2.rst
M doc/api.rst
M doc/apiv3.rst
M doc/background-tasks.rst
M doc/commenting.rst
M doc/deployment.rst
M doc/forms.rst
M doc/index.rst
M doc/linked-data-and-rdf.rst
M doc/publisher-profile.rst
A doc/tag-vocabularies.rst
M doc/using-data-api.rst
M doc/writing-extensions.rst
M requires/lucid_missing.txt
M setup.py
Log Message:
-----------
[2347] Merge from master and changes to the _naming for lib functions
Commit: 34b2dab88c51084518b4a66e0c9af31e642f23ac
https://github.com/okfn/ckan/commit/34b2dab88c51084518b4a66e0c9af31e642f23ac
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-17 (Thu, 17 May 2012)
Changed paths:
M ckan/controllers/related.py
M ckan/templates/_util.html
M ckan/templates/package/layout.html
M ckan/templates/related/add-related.html
M ckan/templates/related/dashboard.html
M ckan/templates/related/related_list.html
M doc/configuration.rst
Log Message:
-----------
[2347] Fix for missing follow count in related list, and renaming of related in the UI
Commit: 193af087ecd4301d344029c207c346d4bd2dbafd
https://github.com/okfn/ckan/commit/193af087ecd4301d344029c207c346d4bd2dbafd
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-17 (Thu, 17 May 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[2347] Remove unnecessary output
Commit: e8017b3f0032259b1fe9a8745c3b4a8d83b81e7a
https://github.com/okfn/ckan/commit/e8017b3f0032259b1fe9a8745c3b4a8d83b81e7a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-17 (Thu, 17 May 2012)
Changed paths:
A doc/apps-ideas.rst
M doc/configuration.rst
M doc/index.rst
Log Message:
-----------
[2347] Documentation update for the feature previously known as related items
Commit: 7f579bef787e02c8efc5a3796f6466c76beafa44
https://github.com/okfn/ckan/commit/7f579bef787e02c8efc5a3796f6466c76beafa44
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-18 (Fri, 18 May 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[2347] Minor changes to related actions
Commit: c44d4f98d3a6f67c20ee424e135b1856114bbc2f
https://github.com/okfn/ckan/commit/c44d4f98d3a6f67c20ee424e135b1856114bbc2f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-05-24 (Thu, 24 May 2012)
Changed paths:
M ckan/templates/package/layout.html
M ckan/templates/related/related_list.html
Log Message:
-----------
2347 Changed naming in layout to preferred version;
Commit: 845c0e5769edb6a1e66a86d97e3ae67f10841363
https://github.com/okfn/ckan/commit/845c0e5769edb6a1e66a86d97e3ae67f10841363
Author: amercader <amercadero at gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
Log Message:
-----------
[#2389] Move recline js and css to a snippet
This will make easier to modify the libraries and load them
conditionally.
Commit: 8a0133ec90038bcf36217b74b4375a77b37040f2
https://github.com/okfn/ckan/commit/8a0133ec90038bcf36217b74b4375a77b37040f2
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
R ckan/templates/activity_streams/added_tag.html
R ckan/templates/activity_streams/changed_group.html
R ckan/templates/activity_streams/changed_package.html
R ckan/templates/activity_streams/changed_package_extra.html
R ckan/templates/activity_streams/changed_resource.html
R ckan/templates/activity_streams/changed_user.html
R ckan/templates/activity_streams/deleted_group.html
R ckan/templates/activity_streams/deleted_package.html
R ckan/templates/activity_streams/deleted_package_extra.html
R ckan/templates/activity_streams/deleted_resource.html
A ckan/templates/activity_streams/general.html
R ckan/templates/activity_streams/new_group.html
R ckan/templates/activity_streams/new_package.html
R ckan/templates/activity_streams/new_package_extra.html
R ckan/templates/activity_streams/new_resource.html
R ckan/templates/activity_streams/new_user.html
R ckan/templates/activity_streams/removed_tag.html
Log Message:
-----------
[#2536] refactor of activity stream output
Commit: adad2af1989d1f7b13f083dee9424b6a849fac2b
https://github.com/okfn/ckan/commit/adad2af1989d1f7b13f083dee9424b6a849fac2b
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2536] fix test fail due to refactor
Commit: d120e14894c00cd7d71f28ea53250a873f13ef91
https://github.com/okfn/ckan/commit/d120e14894c00cd7d71f28ea53250a873f13ef91
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/templates/activity_streams/general.html
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2536] general code cleanup
Commit: b13f6bc9c45621391eff2903015c16b8fe7e92b9
https://github.com/okfn/ckan/commit/b13f6bc9c45621391eff2903015c16b8fe7e92b9
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2536] remove some debugging code added in error
Commit: f262ac7e9b653f76ab471bf6024c900339689a74
https://github.com/okfn/ckan/commit/f262ac7e9b653f76ab471bf6024c900339689a74
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
move activity_info to the correct place so that locale is correctly used
Commit: bc0caafcc6b83aa1fd6a7a5c3d078d435b8f0372
https://github.com/okfn/ckan/commit/bc0caafcc6b83aa1fd6a7a5c3d078d435b8f0372
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add standard python coding standards.
Commit: c8147bed3fb4dfddf969d2568050c53de1308361
https://github.com/okfn/ckan/commit/c8147bed3fb4dfddf969d2568050c53de1308361
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Import aron's javascript style guide.
>From http://aron.github.com/ckan-style/styleguide/javascript/
Commit: e72fa91427614493ecfab5836a6b5713b4dedfd3
https://github.com/okfn/ckan/commit/e72fa91427614493ecfab5836a6b5713b4dedfd3
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Promote the javascript sub-sections so they appear in TOC
Commit: 5cefb0980a698045751245b2bed2ccbd51222894
https://github.com/okfn/ckan/commit/5cefb0980a698045751245b2bed2ccbd51222894
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Import aron's html style guide.
>From http://aron.github.com/ckan-style/styleguide/html/
Commit: 2eaae78ca266a46819950b2e866f32400ba333fd
https://github.com/okfn/ckan/commit/2eaae78ca266a46819950b2e866f32400ba333fd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Import aron's css style guide.
>From http://aron.github.com/ckan-style/styleguide/css/
Commit: d0b3da6f5a15f4f3b33e64999bc5493cd099d887
https://github.com/okfn/ckan/commit/d0b3da6f5a15f4f3b33e64999bc5493cd099d887
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Tidying up of coding-standards restructured text
Commit: ca7b65a202dfc01104367cf8bb281b768c35bf7e
https://github.com/okfn/ckan/commit/ca7b65a202dfc01104367cf8bb281b768c35bf7e
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Moving python coding standards up the document.
Commit: 6c4e2c14a65783b5b4ffd4679d9db99556a529cd
https://github.com/okfn/ckan/commit/6c4e2c14a65783b5b4ffd4679d9db99556a529cd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add further information about the check-in policy.
Commit: 57aea6e7132d8ac6ca9eba44b0f9d6a25eeb1c98
https://github.com/okfn/ckan/commit/57aea6e7132d8ac6ca9eba44b0f9d6a25eeb1c98
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add info about making changes to models.
>From the CKAN wiki: http://wiki.ckan.org/Making_changes_to_model_code
Commit: 43bfa72795db57a19771f8fde3b2e4ce54e44f17
https://github.com/okfn/ckan/commit/43bfa72795db57a19771f8fde3b2e4ce54e44f17
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add information about writing action layer code.
Commit: 306a3982908d249c329f231172e33813ab5bdc17
https://github.com/okfn/ckan/commit/306a3982908d249c329f231172e33813ab5bdc17
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
M doc/writing-extensions.rst
Log Message:
-----------
[#2437] Add link to details about writing extensions.
Commit: 859eab8c9efb5c85237f7c3ef46041e5295a9acb
https://github.com/okfn/ckan/commit/859eab8c9efb5c85237f7c3ef46041e5295a9acb
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
A doc/release-cycle.rst
Log Message:
-----------
[#2437] Add information about the release cycle.
Commit: acbeab430826683d4a49b1d28d8b94daf7ea33c6
https://github.com/okfn/ckan/commit/acbeab430826683d4a49b1d28d8b94daf7ea33c6
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add information about testing.
Commit: 43c7d093146b03d2f73e60686e28c6e170037ec1
https://github.com/okfn/ckan/commit/43c7d093146b03d2f73e60686e28c6e170037ec1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] More instruction about particular areas of the codebase.
Commit: 15e3d4d46d59cf64c640e7636e47b9e41fef9d4b
https://github.com/okfn/ckan/commit/15e3d4d46d59cf64c640e7636e47b9e41fef9d4b
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Move testing section into CKAN-specfic section.
Commit: b1e1ba2db2454ac80473ffe6b2c189022553c6f1
https://github.com/okfn/ckan/commit/b1e1ba2db2454ac80473ffe6b2c189022553c6f1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Correct formatting
Commit: 3c6ec2ee0dbce59ba4b53d097fa5a17ea26ff67b
https://github.com/okfn/ckan/commit/3c6ec2ee0dbce59ba4b53d097fa5a17ea26ff67b
Author: amercader <amercadero at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/release-cycle.rst
Log Message:
-----------
[#2437] Minor edit on release cycle docs
Commit: 2843e91437ff77151c6fb84e049c74231588e8b2
https://github.com/okfn/ckan/commit/2843e91437ff77151c6fb84e049c74231588e8b2
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M CHANGELOG.txt
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/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
A ckan/i18n/check_po_files.py
A ckan/lib/accept.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
A ckan/lib/maintain.py
M ckan/lib/repoze_patch.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.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/publisher/create.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/model/tag.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
M ckan/templates/user/layout.html
R ckan/tests/functional/test_autoneg.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
A ckan/tests/lib/test_accept.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_helpers.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/test_versions.py
M ckanext/multilingual/plugin.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/organizations/templates/organization_read.html
M doc/apiv3.rst
A doc/coding-standards.rst
M doc/configuration.rst
M doc/geospatial.rst
A doc/harvesting.rst
M doc/index.rst
A doc/install-from-package-amazon.rst
A doc/install-from-package-virtualbox.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/post-installation.rst
M doc/solr-setup.rst
M doc/test.rst
M profile_tests.py
M requires/lucid_missing.txt
M requires/lucid_present.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merge from master
Commit: 0170240e93b8725fefd9c71cc21cb794648f2cf0
https://github.com/okfn/ckan/commit/0170240e93b8725fefd9c71cc21cb794648f2cf0
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/action/update.py
Log Message:
-----------
Fixing bad merge
Commit: bd65dea8fd781eb725c7e7b4797e19baa9001a0e
https://github.com/okfn/ckan/commit/bd65dea8fd781eb725c7e7b4797e19baa9001a0e
Author: John Glover <j at johnglover.net>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[2518] Allow custom i18n directory.
Custom i18n directory can be set via the config
option ckan.i18n_directory.
Commit: c191cacedd9bf502435f77ce97e2924aea5ae837
https://github.com/okfn/ckan/commit/c191cacedd9bf502435f77ce97e2924aea5ae837
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/lib/i18n.py
Log Message:
-----------
[#2524] Add functionality for none supplied locale
Commit: c9435c4296fa5de58cbe96f9bdc0be5744a5f731
https://github.com/okfn/ckan/commit/c9435c4296fa5de58cbe96f9bdc0be5744a5f731
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.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/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/celery_app.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
Log Message:
-----------
Merge branch 'master' into defect-2289-i18n-flash
Commit: c632dbb383e1397b620f069ed68eb9d1a8bb5c32
https://github.com/okfn/ckan/commit/c632dbb383e1397b620f069ed68eb9d1a8bb5c32
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2289] flash messages now translated for logging in
Commit: d8a31186372b1609bd1274187d350f13731e1997
https://github.com/okfn/ckan/commit/d8a31186372b1609bd1274187d350f13731e1997
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2289] minor bugfix
Commit: 6960a0fafa92d109b9a627c4deacdf6a2a03ac83
https://github.com/okfn/ckan/commit/6960a0fafa92d109b9a627c4deacdf6a2a03ac83
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_package_form.html
Log Message:
-----------
Stops users adding datasets without organizations set.
Changes the schema in organization_dataset to make sure that the package
has an organization set, and removes the None option from the dropdown.
Commit: 0516bf557838287ad4a4162bc2985732f9f9dad3
https://github.com/okfn/ckan/commit/0516bf557838287ad4a4162bc2985732f9f9dad3
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
PEP8ificiation
Commit: d8734c0064d0f1264408fc20d332c42b7ab09019
https://github.com/okfn/ckan/commit/d8734c0064d0f1264408fc20d332c42b7ab09019
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/js_strings.html
Log Message:
-----------
[#2389] Remove Datastore option from the resource form
The datastore checkbox was confusing so we simplified the process. All
resources have the datastore potentially enabled, and only after an
actual write, the controller sets the 'webstore_url' extra to active.
Commit: 8ebf3118f717f7b7deaeedbe6644b311f43d1a23
https://github.com/okfn/ckan/commit/8ebf3118f717f7b7deaeedbe6644b311f43d1a23
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/controllers/datastore.py
Log Message:
-----------
[#2389,#2472] Remove datastore enabled checks from controller
Datastore is now enabled by default for all resources. When something is
posted to the datastore, the 'webstore_url' extra is set to 'active'.
Also replaced model calls with logic functions.
Commit: 33f42937f1f1cb2c524dcc20e0f32734f6a05bc2
https://github.com/okfn/ckan/commit/33f42937f1f1cb2c524dcc20e0f32734f6a05bc2
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M pip-requirements-test.txt
Log Message:
-----------
[#2604] Add requests as requirement for tests
Commit: 16320b20476295c20f7602b542d4f3b085c698dc
https://github.com/okfn/ckan/commit/16320b20476295c20f7602b542d4f3b085c698dc
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2389] New tests for the datastore
A mock class mimics Nginx forwarding requests to Elastic Search, so we
can actually test what is being returned.
Commit: e2e5041940bee1d661723cedb3127ae98e65c8eb
https://github.com/okfn/ckan/commit/e2e5041940bee1d661723cedb3127ae98e65c8eb
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' into defect-2289-i18n-flash
Commit: bd817df3cda3b0fc2e7a20d0b4808c022215cf50
https://github.com/okfn/ckan/commit/bd817df3cda3b0fc2e7a20d0b4808c022215cf50
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/js_strings.html
Log Message:
-----------
[#2389] Try to make the data explorer fail with more dignity
Adds some checks for DataStore and DataProxy backends. Recline does not
make easy to catch exceptions and errors while initializing, but
hopefully this will cover the most common cases.
Note: includes a small patch on recline.js, which will be ported
upstream.
Commit: 7f59a58e15dfc1d2498534ef0d474cc7ea08d2b9
https://github.com/okfn/ckan/commit/7f59a58e15dfc1d2498534ef0d474cc7ea08d2b9
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M doc/datastore.rst
Log Message:
-----------
Update datastore docs
Commit: 5e165b9e38f716b38907e3ac3e162f62c221d0d9
https://github.com/okfn/ckan/commit/5e165b9e38f716b38907e3ac3e162f62c221d0d9
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2389] Fix silly errors on datastore tests
Commit: c8bc38c62e86a6c834c82fbad78ab233515ead43
https://github.com/okfn/ckan/commit/c8bc38c62e86a6c834c82fbad78ab233515ead43
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
Log Message:
-----------
[#2389] Fix tests that were failing if 'error' was present on the JS strings
Commit: 9ac8976d20a785abafad6f78d40f2699e6aa31a9
https://github.com/okfn/ckan/commit/9ac8976d20a785abafad6f78d40f2699e6aa31a9
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[#2289] include discovered locales
Commit: fca35e5f6929e3008640be1d1c2460dbc2a2ba32
https://github.com/okfn/ckan/commit/fca35e5f6929e3008640be1d1c2460dbc2a2ba32
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1387] fix resource urls with no protocols
Commit: 85d88059e921deb93025d9d8ef55dc551f1f788d
https://github.com/okfn/ckan/commit/85d88059e921deb93025d9d8ef55dc551f1f788d
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1387] fix tests with bad urls
Commit: c9e0e044494d0500bfdd88023e0a03b8a7012125
https://github.com/okfn/ckan/commit/c9e0e044494d0500bfdd88023e0a03b8a7012125
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[#2289] add some docstrings etc to lib/i18n
Commit: 646e551881c54c54b120f68f36205bb7207b53fc
https://github.com/okfn/ckan/commit/646e551881c54c54b120f68f36205bb7207b53fc
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/lib/test_tag_search.py
Log Message:
-----------
[#2439] Allow query parameter to be a list of strings
As well as a single string.
Commit: 903bd62d06392eb211925b4f63d2ee89570bbb78
https://github.com/okfn/ckan/commit/903bd62d06392eb211925b4f63d2ee89570bbb78
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/tests/logic/test_tag.py
Log Message:
-----------
[#2439] Mark fields parameter as deprecated
... in tag_search and tag_autocomplete.
Commit: 85310d44b79ddab590e687c23441b7e244243171
https://github.com/okfn/ckan/commit/85310d44b79ddab590e687c23441b7e244243171
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M doc/apiv3.rst
Log Message:
-----------
[#2439] Update to docs
Commit: bfb48c0a1f0d3b6b518c41a9fe5d41bc0641aaf8
https://github.com/okfn/ckan/commit/bfb48c0a1f0d3b6b518c41a9fe5d41bc0641aaf8
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
Log Message:
-----------
2601 Ensuring users not in a group cannot add datasets
When publisher auth is enabled only users who are in a group/org should
be able to add a dataset.
Commit: 1bca3b5853ef318ee02d6303e70e147440b2c9d2
https://github.com/okfn/ckan/commit/1bca3b5853ef318ee02d6303e70e147440b2c9d2
Author: kindly <kindly at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/controllers/user.py
M ckan/lib/i18n.py
Log Message:
-----------
Merge branch 'defect-2289-i18n-flash'
Commit: 54e8722bdb38ba66e9566c09c44c25edeb29aa07
https://github.com/okfn/ckan/commit/54e8722bdb38ba66e9566c09c44c25edeb29aa07
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/lib/search/query.py
Log Message:
-----------
[#2439] Sanitise method parameters.
And comment reason for making the list copy.
Response to feedback from code-review.
Commit: 5fa209a41e2b01faf629ce9fa91bb8c7eb172ed5
https://github.com/okfn/ckan/commit/5fa209a41e2b01faf629ce9fa91bb8c7eb172ed5
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2389] Be more strict when checking for ES
Commit: 71278f801b6bf734c7a9a5ddb745c556c0c3d866
https://github.com/okfn/ckan/commit/71278f801b6bf734c7a9a5ddb745c556c0c3d866
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/tests/functional/test_authz.py
Log Message:
-----------
[#2389] Yet more failing errors if 'error' was present on the JS strings
Commit: f04cdbca0ef62d24061ba1e72517d09c8e2f6f7f
https://github.com/okfn/ckan/commit/f04cdbca0ef62d24061ba1e72517d09c8e2f6f7f
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M CHANGELOG.txt
R Coding_Standards.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
A ckan/i18n/check_po_files.py
M ckan/lib/accept.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/repoze_patch.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/follower.py
M ckan/model/tag.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/test_plugins.py
M ckan/tests/test_versions.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/organizations/templates/organization_read.html
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
A doc/coding-standards.rst
M doc/configuration.rst
M doc/geospatial.rst
A doc/harvesting.rst
M doc/index.rst
A doc/install-from-package-amazon.rst
A doc/install-from-package-virtualbox.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/post-installation.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into feature-2389-better-dataexplorer-error-handling
Conflicts:
ckan/controllers/datastore.py
ckan/templates/js_strings.html
Commit: 2df478db3968b7dffcc472d10f83884b18a01c59
https://github.com/okfn/ckan/commit/2df478db3968b7dffcc472d10f83884b18a01c59
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/controllers/datastore.py
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/js_strings.html
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M doc/datastore.rst
Log Message:
-----------
Merge branch 'feature-2389-better-dataexplorer-error-handling'
Commit: 3676cfe1ba104271007407077e2caebfd187b930
https://github.com/okfn/ckan/commit/3676cfe1ba104271007407077e2caebfd187b930
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/api.py
M ckan/controllers/datastore.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/follower.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
M ckan/public/scripts/vendor/recline/recline.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/templates/js_strings.html
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
M doc/datastore.rst
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1601-defect-organizations-server-error
Commit: 043704464559d6258bf93f1d2cd53518d3f0a816
https://github.com/okfn/ckan/commit/043704464559d6258bf93f1d2cd53518d3f0a816
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_package_form.html
Log Message:
-----------
Merge branch '1601-defect-organizations-server-error'
Commit: 528d27bf699b8df85edf8c55f7cb91b8fcf64c7c
https://github.com/okfn/ckan/commit/528d27bf699b8df85edf8c55f7cb91b8fcf64c7c
Author: amercader <amercadero at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M doc/configuration.rst
Log Message:
-----------
[#1678] Make synchronous search the default behaviour
Unless already loaded or explicitly disabled via the
`ckan.search.automatic_index` configuration option, the synchronous
search plugin will be loaded during startup time.
Commit: 67d7135ed8c2494279dbe00b67cfea20ed2bfc6c
https://github.com/okfn/ckan/commit/67d7135ed8c2494279dbe00b67cfea20ed2bfc6c
Author: amercader <amercadero at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
PEP8 environment.py
Commit: 93931067fb9126c46cfbcec6a1a8f017aca1b31b
https://github.com/okfn/ckan/commit/93931067fb9126c46cfbcec6a1a8f017aca1b31b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Add credit to Sven in CHANGELOG
Commit: af1f41fb48fc1e8634455b2fa3b464d28de6213d
https://github.com/okfn/ckan/commit/af1f41fb48fc1e8634455b2fa3b464d28de6213d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/templates/package/search.html
Log Message:
-----------
[#2290] Mark facet titles in search pages for translation
Commit: 33faf3e512fa888414e9b191dadb3835fb5e232f
https://github.com/okfn/ckan/commit/33faf3e512fa888414e9b191dadb3835fb5e232f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/templates/group/read.html
Log Message:
-----------
Mark facet titles on group read page for translation
Commit: 4594319109fd4e2cd8f152216ae9214e22a8c2ca
https://github.com/okfn/ckan/commit/4594319109fd4e2cd8f152216ae9214e22a8c2ca
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M setup.py
Log Message:
-----------
Add strings from core extensions to pot file
Commit: fb782e2043d58c7015eb17ee6fe236316dc79ea9
https://github.com/okfn/ckan/commit/fb782e2043d58c7015eb17ee6fe236316dc79ea9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckanext/organizations/controllers.py
Log Message:
-----------
Fix a string that had a lot of whitespace in it
Commit: 58d054970a1ff108678ae8ee3124c7f27eca224a
https://github.com/okfn/ckan/commit/58d054970a1ff108678ae8ee3124c7f27eca224a
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Dictize results list of resource_search action.
Looks like this action wasn't even working!
Commit: f386122015e1b8408b1f94046d8422eb2d17ac7a
https://github.com/okfn/ckan/commit/f386122015e1b8408b1f94046d8422eb2d17ac7a
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Docstring for resource_search action.
Commit: ebd9bc613ea4cea5617998cf2c669ff3f267f4dd
https://github.com/okfn/ckan/commit/ebd9bc613ea4cea5617998cf2c669ff3f267f4dd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Add 'q' parameter to resource_search action.
This deprecates the existing 'fields' parameter, which is not compatible
with GET-ing the resource_search action.
Commit: cc070212a450b7c716cf79e81b29ba54301709be
https://github.com/okfn/ckan/commit/cc070212a450b7c716cf79e81b29ba54301709be
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Ensure legacy parameter, fields, still works.
Keep the old fields `parameter's` behaviour, but encourage use of the new
`query` parameter.
Commit: f8450f4f2b11308e340c83bd78d114e513717615
https://github.com/okfn/ckan/commit/f8450f4f2b11308e340c83bd78d114e513717615
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Special chars are escaped in search terms.
Commit: aeef82cbf16656308730b3e3b9121a4828b526c2
https://github.com/okfn/ckan/commit/aeef82cbf16656308730b3e3b9121a4828b526c2
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Useful validation errors for resource_search
Commit: 966ab39183351701656786d63a193bf79898c748
https://github.com/okfn/ckan/commit/966ab39183351701656786d63a193bf79898c748
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Remove unused session object.
Commit: 79505e541263eadce6f7245e6548240499413ca1
https://github.com/okfn/ckan/commit/79505e541263eadce6f7245e6548240499413ca1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
General tidy of resource_search action.
Commit: d4ea63a2b9c2f5dd339879269fb366f847b3ab76
https://github.com/okfn/ckan/commit/d4ea63a2b9c2f5dd339879269fb366f847b3ab76
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/tests/logic/test_action.py
Log Message:
-----------
Add reference to ticket number
Commit: dcca75713e44763645c2190cd531b30f8c99ff31
https://github.com/okfn/ckan/commit/dcca75713e44763645c2190cd531b30f8c99ff31
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Add log message warning of deprecated parameter.
Obviously this won't indicate to the action api users, only
when in library access.
Commit: 575a96470a9278dc660144743999b9c2849e114d
https://github.com/okfn/ckan/commit/575a96470a9278dc660144743999b9c2849e114d
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/logic/action/get.py
Log Message:
-----------
Context determines resource_search's result type.
This is provided as it allows the search api to continue to use
this action, and still provide the required result-type for the
action api.
Commit: aad834c25ce6f28cd719a59d3d89f5cc79ab533c
https://github.com/okfn/ckan/commit/aad834c25ce6f28cd719a59d3d89f5cc79ab533c
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/tests/logic/test_action.py
Log Message:
-----------
Test resource_search works with a GET request
Commit: f4b6a025618d4ae874f4ffb452365cc6301b4aa6
https://github.com/okfn/ckan/commit/f4b6a025618d4ae874f4ffb452365cc6301b4aa6
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
Log Message:
-----------
Use the new 'query' parameter in resource_search
instead of the now deprecated 'fields' paramter.
Commit: 80781b39423084f33cacd981e8e88e9a69c4d1ce
https://github.com/okfn/ckan/commit/80781b39423084f33cacd981e8e88e9a69c4d1ce
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Clarify translatable string.
``{field}`` is usually used to represent a substitution.
Commit: 51dd38facbf2c622b1d23213951d86f2a2695000
https://github.com/okfn/ckan/commit/51dd38facbf2c622b1d23213951d86f2a2695000
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_tag.py
M doc/apiv3.rst
Log Message:
-----------
Merge pull request #45 from okfn/2439-tag_search-and-tag_autocomplete-GETable
Looks great and all the tests pass.
Commit: 10f8cdee61d6dd72330b0f68be1824796c0b064a
https://github.com/okfn/ckan/commit/10f8cdee61d6dd72330b0f68be1824796c0b064a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/controllers/user.py
M ckan/lib/i18n.py
M doc/configuration.rst
Log Message:
-----------
Merge branch '1678-sync-search-by-default' of https://github.com/okfn/ckan
Commit: 428c9ff756739e4eddc5b5e9e9e794df3726cdc3
https://github.com/okfn/ckan/commit/428c9ff756739e4eddc5b5e9e9e794df3726cdc3
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/datastore.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/create.py
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_package_form.html
M doc/apiv3.rst
M doc/datastore.rst
M setup.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: b094c4eda6e61cacd3da3e638573803457f014d4
https://github.com/okfn/ckan/commit/b094c4eda6e61cacd3da3e638573803457f014d4
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
[#2362] toolkit docs
Commit: 3e00ffea420bd11af64b0d2d417e3c6100b71390
https://github.com/okfn/ckan/commit/3e00ffea420bd11af64b0d2d417e3c6100b71390
Author: amercader <amercadero at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M doc/configuration.rst
Log Message:
-----------
Make synchronous search the default behaviour
Unless already loaded or explicitly disabled via the
`ckan.search.automatic_index` configuration option, the synchronous
search plugin will be loaded during startup time.
Commit: 08cba3144db70784f90c381a2139c8c035f2b63e
https://github.com/okfn/ckan/commit/08cba3144db70784f90c381a2139c8c035f2b63e
Author: amercader <amercadero at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
PEP8 environment.py
Commit: ebc0452576384ace0ea04574b53dc7b9847096b3
https://github.com/okfn/ckan/commit/ebc0452576384ace0ea04574b53dc7b9847096b3
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_tag.py
M doc/apiv3.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 63d82ceaea33277b21be3d336f1cd29d98959704
https://github.com/okfn/ckan/commit/63d82ceaea33277b21be3d336f1cd29d98959704
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
Update several dependencies
Replaced PyUtilib==4.0.2848 with pyutilib.component.core==4.5.3, this
avoids pulling in all the pyutilib packages and the packages they depend
on.
Updated webhelpers, solrpy, formalchemy, markupsafe, tempita, routes and
paste to the latest versions from pypi
Commit: a8dab115f0e94b7f475d15ffd6897bd03a6f81b4
https://github.com/okfn/ckan/commit/a8dab115f0e94b7f475d15ffd6897bd03a6f81b4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
Update babel, psyco and zope dependencies
Commit: 755431512cf806b3af77a3942b613da369f719f8
https://github.com/okfn/ckan/commit/755431512cf806b3af77a3942b613da369f719f8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
Upgrade sqlalchemy-migrate to 0.7.2 (latest)
Commit: 5629aade36916b967ffae250812e833816e0dddd
https://github.com/okfn/ckan/commit/5629aade36916b967ffae250812e833816e0dddd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
Upgrade sqlalchemy to 0.7.8 (latest)
Commit: 9b72e88919fcdd25c0156a430f00968c9ec76ec3
https://github.com/okfn/ckan/commit/9b72e88919fcdd25c0156a430f00968c9ec76ec3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
[#2627] Refactor form_to_db_schema_options
Make it call self.form_to_db_schema so that the form_to_db_schema()
methods of IDatasetForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.
Commit: d93cb58049bf79a1983f3b96759361c0627684a1
https://github.com/okfn/ckan/commit/d93cb58049bf79a1983f3b96759361c0627684a1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
Fix a crasher in package/read.html template
Sometimes c.pkg_dict has no member named groups (e.g. when there is an
active IDatasetForm plugin with a db_to_form_schema() method).
Commit: 6f91aa595b74e3ff4af2128cef11f76786f8ef20
https://github.com/okfn/ckan/commit/6f91aa595b74e3ff4af2128cef11f76786f8ef20
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add db_to_form_schema method
For IDatasetForm plugins to base their db_to_form_schema() dicts on
Commit: 126c94b730b9c399dc2ba9c1a5c8858d7d97b802
https://github.com/okfn/ckan/commit/126c94b730b9c399dc2ba9c1a5c8858d7d97b802
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Rename db_to_form_schema -> db_to_form_package_schema()
Commit: 786479e8e6eea392fc4a4312c7c8a534a08083a8
https://github.com/okfn/ckan/commit/786479e8e6eea392fc4a4312c7c8a534a08083a8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/tests/schema/test_schema.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
Rename package_form_schema() -> form_to_db_package_schema()
The only purpose of this schema is to be used as a base schema by
IDatasetForm plugins for their form_to_db_schema() methods, hopefully
the new name makes that clearer
Commit: 74b346ee9a2bbbc48021ffb2e3ead6fbd5923654
https://github.com/okfn/ckan/commit/74b346ee9a2bbbc48021ffb2e3ead6fbd5923654
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add back in deprectated package_form_schema() for backwards compatibility
Commit: cd7974b2be434d88d937f1fbad2042413b463c48
https://github.com/okfn/ckan/commit/cd7974b2be434d88d937f1fbad2042413b463c48
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Refactor form_to_db_schema_options
Make it call self.form_to_db_schema so that the form_to_db_schema()
methods of IDatasetForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.
Commit: 90012807433047593f7acac22522af5bc1302ac6
https://github.com/okfn/ckan/commit/90012807433047593f7acac22522af5bc1302ac6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
Fix a crasher in package/read.html template
Sometimes c.pkg_dict has no member named groups (e.g. when there is an
active IDatasetForm plugin with a db_to_form_schema() method).
Commit: a5bedce1d321752fd083a7a4ec10e263439e713d
https://github.com/okfn/ckan/commit/a5bedce1d321752fd083a7a4ec10e263439e713d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add db_to_form_schema method
For IDatasetForm plugins to base their db_to_form_schema() dicts on
Commit: 7f59f2539abfa009618d34deea087a97a4a94dba
https://github.com/okfn/ckan/commit/7f59f2539abfa009618d34deea087a97a4a94dba
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Rename db_to_form_schema -> db_to_form_package_schema()
Commit: 38fc15cfc0965e567444b2653ff5a36b3f33828b
https://github.com/okfn/ckan/commit/38fc15cfc0965e567444b2653ff5a36b3f33828b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/tests/schema/test_schema.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
Rename package_form_schema() -> form_to_db_package_schema()
The only purpose of this schema is to be used as a base schema by
IDatasetForm plugins for their form_to_db_schema() methods, hopefully
the new name makes that clearer
Commit: c5553b8e0fdd3e0394c97880f343bee4615b2301
https://github.com/okfn/ckan/commit/c5553b8e0fdd3e0394c97880f343bee4615b2301
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add back in deprectated package_form_schema() for backwards compatibility
Commit: efca8cb18ca6379a51cb81e59d347ecb370ec78c
https://github.com/okfn/ckan/commit/efca8cb18ca6379a51cb81e59d347ecb370ec78c
Author: kindly <kindly at gmail.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[2627] fix some more date issues when displayed
Commit: 519472c1bcf15f66e18927f775e06e5ee70724fa
https://github.com/okfn/ckan/commit/519472c1bcf15f66e18927f775e06e5ee70724fa
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add config file argument to paster commands.
Commit: 29a06dc503681cb0ab7951ea05cf55b47d025998
https://github.com/okfn/ckan/commit/29a06dc503681cb0ab7951ea05cf55b47d025998
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Update commit message guidelines
Commit: 4636408d71d96e961935b50f4703fdbe5c109c79
https://github.com/okfn/ckan/commit/4636408d71d96e961935b50f4703fdbe5c109c79
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M doc/coding-standards.rst
A doc/release-cycle.rst
M doc/writing-extensions.rst
Log Message:
-----------
Merge branch 'task-2437-add-coding-standards-to-ckan-docs'
Commit: 9063f7be8bf73f5a85ee527838c27056facce6a4
https://github.com/okfn/ckan/commit/9063f7be8bf73f5a85ee527838c27056facce6a4
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2313] Remove deprecated facet_items helper.
Commit: 04a9fd7be98675eeb472e6695234c36cb2d6674a
https://github.com/okfn/ckan/commit/04a9fd7be98675eeb472e6695234c36cb2d6674a
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M ckan/templates/facets.html
M ckanext/publisher_form/templates/publisher_read.html
Log Message:
-----------
[#2313] Removed deprecated facet_sidebar() function
Commit: 2ec103a06bb19cd5c00c26e4dbdad4b424d23c51
https://github.com/okfn/ckan/commit/2ec103a06bb19cd5c00c26e4dbdad4b424d23c51
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M ckan/templates/facets.html
Log Message:
-----------
[#2313] Removed deprecated facet_list_items function
Commit: aaff2a1175a4ecb16c272378c8facfedd6a56412
https://github.com/okfn/ckan/commit/aaff2a1175a4ecb16c272378c8facfedd6a56412
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/logic/action/get.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#2313] Remove c.facets.
It's been deprecated by c.search_facets.
Commit: 73f839b31b0c17e97190c0ab01ae72b86d473249
https://github.com/okfn/ckan/commit/73f839b31b0c17e97190c0ab01ae72b86d473249
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2313] Add changes to changelog
Commit: a1e392f9a3fb89e54afafa339c12bb97134ca26e
https://github.com/okfn/ckan/commit/a1e392f9a3fb89e54afafa339c12bb97134ca26e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/templates/package/read.html
M ckan/tests/schema/test_schema.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
M doc/coding-standards.rst
A doc/release-cycle.rst
M doc/writing-extensions.rst
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 3a518547e18a1b9d2177db9243620272c58f3ba9
https://github.com/okfn/ckan/commit/3a518547e18a1b9d2177db9243620272c58f3ba9
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Fixes 2624, where tags were not saved with organization_dataset
Added tag_convert_string to the validators for the form_to_db_schema
so that it correctly converted the string to tags in the DB.
Commit: 4f32c46e50d2c9767faf6768ac013248d83d8d82
https://github.com/okfn/ckan/commit/4f32c46e50d2c9767faf6768ac013248d83d8d82
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
[#2624] Base organizations form_to_db_schema() off form_to_db_package_schema()
Commit: 5d13781be3f7834a178698ae53deaa3ff56bc071
https://github.com/okfn/ckan/commit/5d13781be3f7834a178698ae53deaa3ff56bc071
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Merge branch '2624-organization-tags'
Commit: 3bae84bd1352d4a2b9fe37579f7cfcf87fef49ab
https://github.com/okfn/ckan/commit/3bae84bd1352d4a2b9fe37579f7cfcf87fef49ab
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2634] add restricted template vars to change log
Commit: 167e38f846cbe10a5496b56137c98fbbe38efe8e
https://github.com/okfn/ckan/commit/167e38f846cbe10a5496b56137c98fbbe38efe8e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/api.py
M ckan/controllers/datastore.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/plugins.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/follower.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
M ckan/public/scripts/vendor/recline/recline.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/schema/test_schema.py
M ckan/tests/test_plugins.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/organizations/templates/organization_package_form.html
M ckanext/publisher_form/forms.py
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/test_tag_vocab_plugin.py
M doc/apiv3.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/datastore.rst
M doc/install-from-source.rst
A doc/release-cycle.rst
M doc/solr-setup.rst
M doc/test.rst
M doc/writing-extensions.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
M setup.py
Log Message:
-----------
Merge
Commit: b41b57c5fb686c76a6a1a1dd20df5a358b3c7a93
https://github.com/okfn/ckan/commit/b41b57c5fb686c76a6a1a1dd20df5a358b3c7a93
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#2632] check allowed helper functions exist
Commit: 9a072d30f89429e3913a7f4bca237a19aea202c8
https://github.com/okfn/ckan/commit/9a072d30f89429e3913a7f4bca237a19aea202c8
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Updated after dodgy merge
Commit: cab9e7ddb8efdae373c97fc8523063b3e60d5320
https://github.com/okfn/ckan/commit/cab9e7ddb8efdae373c97fc8523063b3e60d5320
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/templates/related/dashboard.html
Log Message:
-----------
Make sure that featured item checkbox is checked when filtered
Commit: f6da5124e79d5aad6c14b5e4451e5eae07fdac9e
https://github.com/okfn/ckan/commit/f6da5124e79d5aad6c14b5e4451e5eae07fdac9e
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/model/authz.py
Log Message:
-----------
Change default authorization settings
These are the new default authotization behaviours:
* Only logged in users are able to create datasets and upload files
* Only the user that created the dataset can edit it by default
NB: this will break a large number of test. They will be fixed on
following commits.
Commit: 2b0932a105d9c1292814b2afac4bf237a8db3008
https://github.com/okfn/ckan/commit/2b0932a105d9c1292814b2afac4bf237a8db3008
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2638] get_request_param() helper function
Commit: b55c85e4fbc975c4e46dad1c15151ede3f0a6b06
https://github.com/okfn/ckan/commit/b55c85e4fbc975c4e46dad1c15151ede3f0a6b06
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
Log Message:
-----------
Fix broken tests after default auth settings change
All tests involving non logged-in editing were failing, as this is no
longer allowed. The changes on auth settings basically mean than
everytime some editing is tested, a valid user with permissions on the
dataset must be provided, e.g.:
offset = url_for(controller='package', action='edit', id=myid)
self.app.get(offset,extra_environ={'REMOTE_USER': 'russianfan'})
or:
res = self.app.post('/api/action/resource_create', params=postparams,
extra_environ={'Authorization': api_key })
Commit: 0f0ed9837999396748955b35c9c3bc1991c8ae6f
https://github.com/okfn/ckan/commit/0f0ed9837999396748955b35c9c3bc1991c8ae6f
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
A ckan/public/scripts/vendor/moment/1.6.2/moment.js
A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
R ckan/public/scripts/vendor/recline/css/data-explorer.css
R ckan/public/scripts/vendor/recline/css/graph.css
R ckan/public/scripts/vendor/recline/css/grid.css
R ckan/public/scripts/vendor/recline/css/images/edit-map.png
R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
R ckan/public/scripts/vendor/recline/css/map.css
A ckan/public/scripts/vendor/recline/css/recline.css
M ckan/public/scripts/vendor/recline/recline.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
R ckan/public/scripts/vendor/slickgrid/images/actions.gif
R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
R ckan/public/scripts/vendor/slickgrid/images/down.gif
R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/expand.gif
R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/help.png
R ckan/public/scripts/vendor/slickgrid/images/info.gif
R ckan/public/scripts/vendor/slickgrid/images/listview.gif
R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
R ckan/public/scripts/vendor/slickgrid/images/stripes.png
R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
R ckan/public/scripts/vendor/slickgrid/images/tick.png
R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
R ckan/public/scripts/vendor/slickgrid/slick.grid.css
R ckan/public/scripts/vendor/slickgrid/slick.grid.js
Log Message:
-----------
Update and clean up libraries
Commit: 487362e26b1d37714d43ef1fdb9a948dd807b415
https://github.com/okfn/ckan/commit/487362e26b1d37714d43ef1fdb9a948dd807b415
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/templates/snippets/recline-extra-footer.html
M ckan/templates/snippets/recline-extra-header.html
Log Message:
-----------
Update Data explorer with new recline version
TODO: Header row border, hide fields control
Commit: ed816b643b979937d10ea0964dec0f043b5cc2a5
https://github.com/okfn/ckan/commit/ed816b643b979937d10ea0964dec0f043b5cc2a5
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/templates/package/resource_embedded_dataviewer.html
Log Message:
-----------
Use recline snippets on the embed template
Commit: 372028123af4fb7085c3ded497bff2b0b9f3c360
https://github.com/okfn/ckan/commit/372028123af4fb7085c3ded497bff2b0b9f3c360
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/templates/package/resource_embedded_dataviewer.html
M ckan/templates/snippets/recline-extra-header.html
Log Message:
-----------
Remove column headers border
Commit: 0cb37c6578fddddeda320af2ed3657af7a79a8fb
https://github.com/okfn/ckan/commit/0cb37c6578fddddeda320af2ed3657af7a79a8fb
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Hide Recline's fields control by default, as it messes up the layout
Commit: 3b0089ae7f82727b9bfe883f390b7de355976146
https://github.com/okfn/ckan/commit/3b0089ae7f82727b9bfe883f390b7de355976146
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/templates/package/resource_embedded_dataviewer.html
Log Message:
-----------
Hide side bar when embedding recline
Commit: 041d91b92390ac2e9e0ae4d6c3bdcba1e7ec42b6
https://github.com/okfn/ckan/commit/041d91b92390ac2e9e0ae4d6c3bdcba1e7ec42b6
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Remove calls to Backbone history
They were causing exceptions and don't seem to be longer in use
Commit: da1d10ca403ccfa0082e7664d402b09ccead2438
https://github.com/okfn/ckan/commit/da1d10ca403ccfa0082e7664d402b09ccead2438
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/vendor/recline/recline.js
Log Message:
-----------
Update recline build with slickgrid fix
Commit: 870f980c35792d0510de649c8db416795edd9008
https://github.com/okfn/ckan/commit/870f980c35792d0510de649c8db416795edd9008
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Fixed missing markdown on the resource read page.
Changed the read_resource method in package controller to generate the
notes from the dictionary and use the dataset notes if no resource
description is available
Commit: f07c75b3c0d0f0ed0909acf0482051cdfb8e5c3f
https://github.com/okfn/ckan/commit/f07c75b3c0d0f0ed0909acf0482051cdfb8e5c3f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: d57be835330f6dd2b1be27099148e0e3e7c83902
https://github.com/okfn/ckan/commit/d57be835330f6dd2b1be27099148e0e3e7c83902
Author: John Glover <glover.john at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge pull request #58 from okfn/2650-markdown-resource-description
Fixed missing markdown on the resource read page.
Commit: 737d8234ed654fd53e8422205bd23cd824961a0f
https://github.com/okfn/ckan/commit/737d8234ed654fd53e8422205bd23cd824961a0f
Author: John Glover <j at johnglover.net>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
Whitespace cleanup.
Commit: f417be9d35a2d3bd17da654a2c9f04f5cbba89d2
https://github.com/okfn/ckan/commit/f417be9d35a2d3bd17da654a2c9f04f5cbba89d2
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Add support for TSV files on dataproxy
Commit: 6d4452391e7fb8d9f728f8e9e0f21fef802d7c0f
https://github.com/okfn/ckan/commit/6d4452391e7fb8d9f728f8e9e0f21fef802d7c0f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 096a414efd3ef4fb6fc8c48635be12d0f4ee7e73
https://github.com/okfn/ckan/commit/096a414efd3ef4fb6fc8c48635be12d0f4ee7e73
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge branch '1387-fix-resource-urls'
Commit: fea646fc610c96ae9ff34d38a6dc4f8aa153f4e9
https://github.com/okfn/ckan/commit/fea646fc610c96ae9ff34d38a6dc4f8aa153f4e9
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2651] rival patch to keep controller clean
Commit: 16a689555807cd37a66c11340a0201de47ea8e07
https://github.com/okfn/ckan/commit/16a689555807cd37a66c11340a0201de47ea8e07
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch '2651-rival-patch'
Commit: 66aa4f1587ec1d86864bd0ee419fbf4c216462d7
https://github.com/okfn/ckan/commit/66aa4f1587ec1d86864bd0ee419fbf4c216462d7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/public/scripts/application.js
M ckan/templates/package/resource_read.html
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckanext/organizations/forms.py
Log Message:
-----------
Merge branch 'master' into feature-2347-related-dashboard
Commit: f19278e68e8d3148421e97a4a5f034f1b8f94a3b
https://github.com/okfn/ckan/commit/f19278e68e8d3148421e97a4a5f034f1b8f94a3b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Stop the package controller from crashing when used at the root URL
If the root URL '/' was connected to the package controller (e.g. by an
IRoutes plugin) _guess_package_type() would crash. Add a special case to
avoid the crash.
Commit: 8dfbf0d02b070a5a99f75e039eab6a3bf03b006f
https://github.com/okfn/ckan/commit/8dfbf0d02b070a5a99f75e039eab6a3bf03b006f
Author: kindly <kindly at gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge pull request #63 from okfn/feature-allow-package-controller-at-root-url
Stop the package controller from crashing when used at the root URL
Commit: 316f6615a0ee5e4da2e2341c98955d7e99da042c
https://github.com/okfn/ckan/commit/316f6615a0ee5e4da2e2341c98955d7e99da042c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 506f5a11a76c37c3461a1a505648c9d1db6ec55b
https://github.com/okfn/ckan/commit/506f5a11a76c37c3461a1a505648c9d1db6ec55b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge pull request #49 from okfn/2362-toolkit-doc-part1
Docs generate fine.
Commit: 6419864302da0107859d161125fc0535d50c4898
https://github.com/okfn/ckan/commit/6419864302da0107859d161125fc0535d50c4898
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 255c5b62dfb26e41f90208a705d9bb5bccc733da
https://github.com/okfn/ckan/commit/255c5b62dfb26e41f90208a705d9bb5bccc733da
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Merge pull request #52 from okfn/2634-changelog-update
[#2634] add restricted template vars to change log
Commit: 26c7265dbb840a8e9bb5e0772049b375475df5e7
https://github.com/okfn/ckan/commit/26c7265dbb840a8e9bb5e0772049b375475df5e7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: d3056214fbc7e62e0c0e51a907403f86af75491e
https://github.com/okfn/ckan/commit/d3056214fbc7e62e0c0e51a907403f86af75491e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[2632] Fix for missing list item with remove
Commit: f2725f39a1b08e53a0310b8c69ed7d5296484764
https://github.com/okfn/ckan/commit/f2725f39a1b08e53a0310b8c69ed7d5296484764
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge pull request #53 from okfn/2632-check-allowed-helper-functions-exist
[#2632] check allowed helper functions exist
Small fix to check presence before list removal
Commit: 60a3194574cfb5c7200958890e24c24354579e33
https://github.com/okfn/ckan/commit/60a3194574cfb5c7200958890e24c24354579e33
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: a149644aa8e4933eb69aac9e37d4e8d6c20ed780
https://github.com/okfn/ckan/commit/a149644aa8e4933eb69aac9e37d4e8d6c20ed780
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/logic/action/get.py
Log Message:
-----------
[#2313] Revert removal of c.facets.
Instead mark it for deprecation in 1.9
Commit: 8127e208caad9cbbdb3f539cf42502ff5b5af292
https://github.com/okfn/ckan/commit/8127e208caad9cbbdb3f539cf42502ff5b5af292
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2313] Remove facet_items from allowed_functions
Commit: b7d224dec412bc4bba7a2c300051a3e7293ae9ce
https://github.com/okfn/ckan/commit/b7d224dec412bc4bba7a2c300051a3e7293ae9ce
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/public/scripts/application.js
M ckan/templates/group/read.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/schema/test_schema.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
M doc/apiv3.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/index.rst
A doc/release-cycle.rst
A doc/toolkit.rst
M doc/writing-extensions.rst
M pip-requirements.txt
M setup.py
Log Message:
-----------
Merge
Commit: ddda213155cb01d97a85758e467302f4c11a4593
https://github.com/okfn/ckan/commit/ddda213155cb01d97a85758e467302f4c11a4593
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/model/authz.py
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
Log Message:
-----------
Merge branch '2388-out-of-the-box-auth-settings'
Commit: 6d257fc5298e4e3d5bf56c6e16fb6c9d7ee6eed1
https://github.com/okfn/ckan/commit/6d257fc5298e4e3d5bf56c6e16fb6c9d7ee6eed1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/maintain.py
Log Message:
-----------
[#2313] Log warning when c.facets is accessed.
Using a new `deprecate_context_item` function in `ckan.lib.maintain`, which
intercepts access to a named attribute on the context by attaching a property
to the underlying storage of the gloal context object.
Commit: a1820d72c356af916b5deabdcc5ac12901e5e9dc
https://github.com/okfn/ckan/commit/a1820d72c356af916b5deabdcc5ac12901e5e9dc
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Log Message:
-----------
Merge from branch
Commit: d051006817f7ff73b51cf0ea797adb9d767da0b5
https://github.com/okfn/ckan/commit/d051006817f7ff73b51cf0ea797adb9d767da0b5
Author: amercader <amercadero at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#1678] Fix check when ckan.plugins line is missing in ini file
Commit: 6daf3bfe100470b383b95a4b1e23b9d292e3ef3c
https://github.com/okfn/ckan/commit/6daf3bfe100470b383b95a4b1e23b9d292e3ef3c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch '1678-sync-search-by-default' of https://github.com/okfn/ckan into 1678-sync-search-by-default
Commit: cf36baf0be788fd8f366ffeb6e086737f14e2f20
https://github.com/okfn/ckan/commit/cf36baf0be788fd8f366ffeb6e086737f14e2f20
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch '1678-sync-search-by-default'
Commit: 7338fcecca41c1f0ac2ce39bacd53377e0847657
https://github.com/okfn/ckan/commit/7338fcecca41c1f0ac2ce39bacd53377e0847657
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/model/authz.py
M ckan/public/scripts/application.js
M ckan/templates/package/resource_read.html
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge from master
Commit: d64de51eceef62f2f742ca260996b5648f3dd4ea
https://github.com/okfn/ckan/commit/d64de51eceef62f2f742ca260996b5648f3dd4ea
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch '2368-get-request-param-helper'
Commit: 44377670b65b613551ef5219f3aba06cd93e89ba
https://github.com/okfn/ckan/commit/44377670b65b613551ef5219f3aba06cd93e89ba
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Fix a typo in a helper function
Commit: b66f54032a0f02fe3f80de9b60b87e3623347785
https://github.com/okfn/ckan/commit/b66f54032a0f02fe3f80de9b60b87e3623347785
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/templates/layout_base.html
A ckan/templates/snippets/internal-tracking.html
Log Message:
-----------
[misc] move internal tracking code into a snippet
Commit: d09d24dc519ab792d2bfa3879db4b45ca421ed63
https://github.com/okfn/ckan/commit/d09d24dc519ab792d2bfa3879db4b45ca421ed63
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
Log Message:
-----------
[#2672] Pass in passive=True to Session.is_modified()
See [1] for details.
[1] http://docs.sqlalchemy.org/en/rel_0_7/orm/session.html?highlight=is_modified#sqlalchemy.orm.session.Session.is_modified
Commit: e1f0ec35cdad3ba5dd5d3339e1b2a10e59d29193
https://github.com/okfn/ckan/commit/e1f0ec35cdad3ba5dd5d3339e1b2a10e59d29193
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
[#2671] allow delete on partial update
Commit: a76d62f94c334417985d60c16d9dad2048278f64
https://github.com/okfn/ckan/commit/a76d62f94c334417985d60c16d9dad2048278f64
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
[#2671] fix tests that were affectedw
Commit: 8cdd9bd769e2c6ea8f2a1b01f75203beef99e81f
https://github.com/okfn/ckan/commit/8cdd9bd769e2c6ea8f2a1b01f75203beef99e81f
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
[#2671] add ckan.fix_partial_updates config option
Commit: 5310639f20dd369caa4f809f54a536856528822e
https://github.com/okfn/ckan/commit/5310639f20dd369caa4f809f54a536856528822e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 62842b71dd4f34145f4057569bae3643ad800a44
https://github.com/okfn/ckan/commit/62842b71dd4f34145f4057569bae3643ad800a44
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Update to fix the group.get_children_groups call which was returning
deleted items.
Commit: 46c514ea18ef74f84ddf71bb0676d77e12059c00
https://github.com/okfn/ckan/commit/46c514ea18ef74f84ddf71bb0676d77e12059c00
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
PEP8
Commit: 5739818a528bb16748f67b6d57a16f575ae78144
https://github.com/okfn/ckan/commit/5739818a528bb16748f67b6d57a16f575ae78144
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Fix tracking of dataset views
It was counting each view twice, this fixes it to count each view once
Commit: 3cbe0682151ed1da613b30c0d45cb4bdfa5dabac
https://github.com/okfn/ckan/commit/3cbe0682151ed1da613b30c0d45cb4bdfa5dabac
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into internal-tracking-cleanup
Commit: 2d4cb0bebb8474e7d6706f4b6247780cdc7afb91
https://github.com/okfn/ckan/commit/2d4cb0bebb8474e7d6706f4b6247780cdc7afb91
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge pull request #69 from okfn/2670-get-children-groups-defect
2670 get children groups defect
Commit: 8d27f7219f674af37112691c7d0fca783f161e63
https://github.com/okfn/ckan/commit/8d27f7219f674af37112691c7d0fca783f161e63
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: a7c9d3ceca0650ca84fe643861ffdcba11b9dd8c
https://github.com/okfn/ckan/commit/a7c9d3ceca0650ca84fe643861ffdcba11b9dd8c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch 'master' into internal-tracking-cleanup
Commit: d144fce26505402d20a443e3a083bf980719026b
https://github.com/okfn/ckan/commit/d144fce26505402d20a443e3a083bf980719026b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/templates/layout_base.html
A ckan/templates/snippets/internal-tracking.html
Log Message:
-----------
Merge branch 'internal-tracking-cleanup'
Commit: 523c8f49ee361cc17e291538adb465444d100afd
https://github.com/okfn/ckan/commit/523c8f49ee361cc17e291538adb465444d100afd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[#2347] Fix race condition on updating the related view_count.
Commit: 0f2d99de74201717bb77d6542c4b7da56aa5a373
https://github.com/okfn/ckan/commit/0f2d99de74201717bb77d6542c4b7da56aa5a373
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Don't leave user in limbo if they change their username
Commit: 0f785050ee39200f090b1ea3e3f00841ab7f79a8
https://github.com/okfn/ckan/commit/0f785050ee39200f090b1ea3e3f00841ab7f79a8
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
PEP8ification
Commit: 0a321150b372ec5620cf8de69d18bb1e6e56a5cb
https://github.com/okfn/ckan/commit/0a321150b372ec5620cf8de69d18bb1e6e56a5cb
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
Fix for tests failing in admin due to not loading repoze in test
Commit: e4fec4ce1dd8eb2abd25c9235a29ff33cb825be6
https://github.com/okfn/ckan/commit/e4fec4ce1dd8eb2abd25c9235a29ff33cb825be6
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
Log Message:
-----------
Fix exception when querying and a SolrException occurs, due to not importing it in correct place.
Commit: cd10dc43c4b26637e514aabfc4802f8dd75c5640
https://github.com/okfn/ckan/commit/cd10dc43c4b26637e514aabfc4802f8dd75c5640
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Add cli param to allow options to be passed to celery daemon (e.g. concurrency limit).
Commit: 08f14618fa4b06597e3bb6cd1b2746d532e2e6c8
https://github.com/okfn/ckan/commit/08f14618fa4b06597e3bb6cd1b2746d532e2e6c8
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge conflict
Commit: c69b08ae548aa957c898db54dd1bd9ed4bfe41e9
https://github.com/okfn/ckan/commit/c69b08ae548aa957c898db54dd1bd9ed4bfe41e9
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/controllers/revision.py
Log Message:
-----------
Cope with bad revisions being created. To find the problem at source too, but in the mean-time cope.
Commit: 4009298f680ece66a5d8c6f784a35e63cc11d1ab
https://github.com/okfn/ckan/commit/4009298f680ece66a5d8c6f784a35e63cc11d1ab
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/new_authz.py
Log Message:
-----------
Merge conflicts with cherry-pick
Commit: 5644ddd24b2d5d9a170a518a7b9cac2915d419d5
https://github.com/okfn/ckan/commit/5644ddd24b2d5d9a170a518a7b9cac2915d419d5
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/navl/dictization_functions.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Changed debug to show post validation version of the data - more useful.
Commit: 9568c7794957b40021eb8636b47f06c0094b1586
https://github.com/okfn/ckan/commit/9568c7794957b40021eb8636b47f06c0094b1586
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Added some useful feedback from these CLI functions.
Commit: 3c313968a098413bcf7c92f848693a4149b5280f
https://github.com/okfn/ckan/commit/3c313968a098413bcf7c92f848693a4149b5280f
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge conflict
Commit: 0ec482d2b41e30f91ed136d0ef48c797e746d260
https://github.com/okfn/ckan/commit/0ec482d2b41e30f91ed136d0ef48c797e746d260
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/logic/auth/publisher/get.py
M ckan/tests/functional/test_publisher_auth.py
Log Message:
-----------
[#2668] Sysadmin gets permission to view a deleted publisher.
Commit: 70dfc9f7fc0a70a525551659034b9eb8959f547a
https://github.com/okfn/ckan/commit/70dfc9f7fc0a70a525551659034b9eb8959f547a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Fixes from broken merge
Commit: c8041d27e0fe39b310ad09e8bd64ef9da73d4a7e
https://github.com/okfn/ckan/commit/c8041d27e0fe39b310ad09e8bd64ef9da73d4a7e
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/lib/plugins.py
M ckan/model/related.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
[#2347] Improve lookup of related-items count.
Rather than pulling out all the related items of a dataset in order to count
them; run a COUNT() sql-statement.
Commit: 8b7adcabd23f5d376c5693ebd043cbc0ceaa27cc
https://github.com/okfn/ckan/commit/8b7adcabd23f5d376c5693ebd043cbc0ceaa27cc
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#2347] Dictize the related items in user_dictize.
Commit: 15f32dd1e8166e448151d123be1fb5aabca7c290
https://github.com/okfn/ckan/commit/15f32dd1e8166e448151d123be1fb5aabca7c290
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/templates/activity_streams/new_related_item.html
Log Message:
-----------
[#2347] Correct rendering of new related item in activity stream.
Commit: a17c5f496a5ae915de8b51b8ff4eeb0847fca947
https://github.com/okfn/ckan/commit/a17c5f496a5ae915de8b51b8ff4eeb0847fca947
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Fixed bare excepts
Commit: 72321fbc0859692b3af920bebca54d012233f33e
https://github.com/okfn/ckan/commit/72321fbc0859692b3af920bebca54d012233f33e
Author: kindly <kindly at gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
Log Message:
-----------
Merge pull request #66 from okfn/2672-is_modifed-passive-should-be-true
[#2672] Pass in passive=True to Session.is_modified()
Commit: 171e20f5a74951c3452941168d3605bc8e1d92cc
https://github.com/okfn/ckan/commit/171e20f5a74951c3452941168d3605bc8e1d92cc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix IGroupForm's setup_template_variables() not being called
Call setup_template_variables() methods of IGroupForm plugins when
creating new groups.
Commit: 2e84da4caa626091863d561d960309de0ac163e1
https://github.com/okfn/ckan/commit/2e84da4caa626091863d561d960309de0ac163e1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
Fix for IGroupForm's form_to_db_schema() not being used when creating datasets
The schemas from form_to_db_schema() methods of IGroupForm plugins were
not being used when creating groups, fix the code so that they are used.
Commit: e9b4f65c4014ce40029f60d643c02e7d6cf832c2
https://github.com/okfn/ckan/commit/e9b4f65c4014ce40029f60d643c02e7d6cf832c2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Fix data dicts not being validated by group_show
group_show() was validating data_dicts but then returning the
unvalidated dict not the validated one. Looks like a copy-paste mistake.
Fix so that the validated dict is returned.
Commit: 8ed099b25ff529639d85d8de9e76815285b98e06
https://github.com/okfn/ckan/commit/8ed099b25ff529639d85d8de9e76815285b98e06
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/lib/base.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 952f28b659aa297cdeaf12d4512da6532cf1c591
https://github.com/okfn/ckan/commit/952f28b659aa297cdeaf12d4512da6532cf1c591
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Fix 500 error on viewing a group with a custom group schema
display_name was missing from group_form_schema() so if an IGroupForm
plugin with a custom db_to_form_schema() for groups was in use, the
group read template would crash with a 500. Add display_name to the
schema so that the template renders successfully.
Commit: 2893c0ca570bd33849dbc5332e5cbf4ebf8f91c2
https://github.com/okfn/ckan/commit/2893c0ca570bd33849dbc5332e5cbf4ebf8f91c2
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
M ckan/templates/package/new_package_form.html
Log Message:
-----------
auto summary in validationError
Commit: a948489e1c832c72ebed240bcb2cbe8abb420581
https://github.com/okfn/ckan/commit/a948489e1c832c72ebed240bcb2cbe8abb420581
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
ValidationError more cleanups
Commit: 54179fd0bd54a446df62db0a403dd4c31562ef11
https://github.com/okfn/ckan/commit/54179fd0bd54a446df62db0a403dd4c31562ef11
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/templates/package/new_package_form.html
Log Message:
-----------
remove idiotic commit
Commit: 76891f4d22073a994301d76ec27e31b224b03aad
https://github.com/okfn/ckan/commit/76891f4d22073a994301d76ec27e31b224b03aad
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
fix some other silly lines
Commit: 599083ed2b3856b7e9471c7fb62827fd7c9d17c7
https://github.com/okfn/ckan/commit/599083ed2b3856b7e9471c7fb62827fd7c9d17c7
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
Log Message:
-----------
clean the validation errors in logic action
Commit: e2be9b1f2170723208142882eb9ed7106d1051be
https://github.com/okfn/ckan/commit/e2be9b1f2170723208142882eb9ed7106d1051be
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/base.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/model/meta.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 5f07038a6cb47f979b56faf87857504064780e06
https://github.com/okfn/ckan/commit/5f07038a6cb47f979b56faf87857504064780e06
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Log Message:
-----------
Merge branch 'master' into nicer-validation-errors
Commit: e7db091942c085d51765dbbdf4a85b785df7174d
https://github.com/okfn/ckan/commit/e7db091942c085d51765dbbdf4a85b785df7174d
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
fix for failing tests
Commit: d7b8c63ec4e0b8aa3001c3dbdb2f86a655460268
https://github.com/okfn/ckan/commit/d7b8c63ec4e0b8aa3001c3dbdb2f86a655460268
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
Merge branch 'nicer-validation-errors' of https://github.com/okfn/ckan into nicer-validation-errors
Commit: bd76c51a9b37104b43f5fb8de83bce3055d54e9c
https://github.com/okfn/ckan/commit/bd76c51a9b37104b43f5fb8de83bce3055d54e9c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
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
Log Message:
-----------
Merge branch 'nicer-validation-errors'
Commit: 7c8d45062b60d72bdbc3522341ea109abdbcee39
https://github.com/okfn/ckan/commit/7c8d45062b60d72bdbc3522341ea109abdbcee39
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
clean up the concurrency option too stop passing other args
Commit: 7e28eed0fdb951645454990b794dac1b117b1403
https://github.com/okfn/ckan/commit/7e28eed0fdb951645454990b794dac1b117b1403
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
remove unused import
Commit: 46b652c69464c932cac6f677a4ba5d3775bd99c9
https://github.com/okfn/ckan/commit/46b652c69464c932cac6f677a4ba5d3775bd99c9
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
pep8 fixes for from dgu branch cli changes
Commit: 3a4231dd73a3de34ff9cd01b403a9010c31502ba
https://github.com/okfn/ckan/commit/3a4231dd73a3de34ff9cd01b403a9010c31502ba
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Merge pull request #70 from okfn/defects-from-dgu
Defects from dgu
Commit: 5f810ca0236a52b12607621346f40495b0cc607f
https://github.com/okfn/ckan/commit/5f810ca0236a52b12607621346f40495b0cc607f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 52f0efda25361aebc99db818c5b8322d767ab2ec
https://github.com/okfn/ckan/commit/52f0efda25361aebc99db818c5b8322d767ab2ec
Author: kindly <kindly at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/test_revision.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_resource.py
Log Message:
-----------
[1345] remove all signs of vdm doing state management on resources. This commit also removes a lot of old form code that was not worth maintaining.
Commit: a3d61b03e084181f290e631fce6819b67abb5d2d
https://github.com/okfn/ckan/commit/a3d61b03e084181f290e631fce6819b67abb5d2d
Author: kindly <kindly at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/model/authz.py
Log Message:
-----------
[1345] remove global cache turn to weakref
Commit: 3ee86db592d5717ac426b46b91f16c4bc3efc51a
https://github.com/okfn/ckan/commit/3ee86db592d5717ac426b46b91f16c4bc3efc51a
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/model/license.py
Log Message:
-----------
[#2575] fix license title translation
Commit: 7fdc13f62ebea806ea14473d5d0e822ffe8fa757
https://github.com/okfn/ckan/commit/7fdc13f62ebea806ea14473d5d0e822ffe8fa757
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/schema.py
M ckan/model/authz.py
M ckan/model/group.py
M ckan/model/meta.py
M ckan/new_authz.py
M ckan/public/scripts/application.js
M ckan/templates/layout_base.html
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/internal-tracking.html
M ckan/templates/user/edit_user_form.html
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
M ckan/tests/models/test_user.py
M ckanext/organizations/forms.py
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge branch 'master' into 2313-deprecate-old-facet-data-structures-and-related-functions
Commit: 1a5712d33cc400ab2c7eb4f37ada453753c7bb9e
https://github.com/okfn/ckan/commit/1a5712d33cc400ab2c7eb4f37ada453753c7bb9e
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/lib/maintain.py
M ckan/logic/action/get.py
M ckan/templates/facets.html
M ckan/tests/logic/test_action.py
M ckanext/publisher_form/templates/publisher_read.html
Log Message:
-----------
Merge branch '2313-deprecate-old-facet-data-structures-and-related-functions'
Commit: 119ebb5db95e40aa230b6e9ebe87c7ee6c05d974
https://github.com/okfn/ckan/commit/119ebb5db95e40aa230b6e9ebe87c7ee6c05d974
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/lib/maintain.py
M ckan/logic/action/get.py
M ckan/templates/facets.html
M ckan/tests/logic/test_action.py
M ckanext/publisher_form/templates/publisher_read.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: dbc8766fd20ccc4ff627d6a11604694674e7eb77
https://github.com/okfn/ckan/commit/dbc8766fd20ccc4ff627d6a11604694674e7eb77
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M LICENSE.txt
Log Message:
-----------
[#2693] Update requirements files in LICENSE.txt
Commit: 3e0de2715b93c9f6c243cdf589f7697e36fd35f5
https://github.com/okfn/ckan/commit/3e0de2715b93c9f6c243cdf589f7697e36fd35f5
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M LICENSE.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 61add9bf6c9530b01c5fddc3062a03a8b5fd2f1f
https://github.com/okfn/ckan/commit/61add9bf6c9530b01c5fddc3062a03a8b5fd2f1f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/model/license.py
Log Message:
-----------
Merge branch '2575-license-i18n'
Commit: 40b6cca0a9dd7e6e55819d60c24532cedec3df85
https://github.com/okfn/ckan/commit/40b6cca0a9dd7e6e55819d60c24532cedec3df85
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Fix double counting of dataset and resource views
Recent dataset views and total and recent resource views were being
double counted by CKAN's internal page view tracking, fix so that each
page view is counted only once (double-counting of total dataset page
views was already fixed by a previous commit)
Commit: f5043a29067898061176ca5e64032fd4de9718f3
https://github.com/okfn/ckan/commit/f5043a29067898061176ca5e64032fd4de9718f3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Don't insert quotation chars into strings when dictizing extras
Commit: 37e02618b4761eb42ab95b815416802b0a796cce
https://github.com/okfn/ckan/commit/37e02618b4761eb42ab95b815416802b0a796cce
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Added support for specifying the sort direction
Previously we only allowed the sort direction to be asc for groups names
and desc for packages (package counts). Now users can specify a sort_direction
to have a little more control.
Commit: b4e5cecbc6b340d7615775cc350bafefa5e47c19
https://github.com/okfn/ckan/commit/b4e5cecbc6b340d7615775cc350bafefa5e47c19
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
change group_list sorting to use sort
Commit: 8cb4e57ac66202646c62b3752de3227c4ff8f178
https://github.com/okfn/ckan/commit/8cb4e57ac66202646c62b3752de3227c4ff8f178
Author: amercader <amercadero at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/model/authz.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/test_revision.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_resource.py
Log Message:
-----------
Merge branch 'defect-1345-memory-leak'
Commit: 7fd115f63f7e275d017af8b3881c242b10054dd7
https://github.com/okfn/ckan/commit/7fd115f63f7e275d017af8b3881c242b10054dd7
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
[#2347] Move authorization check out of related_create action
and into corresponding auth function.
Commit: 348d7a1e69c6531ff4b3aed29bb5965f4a53ee08
https://github.com/okfn/ckan/commit/348d7a1e69c6531ff4b3aed29bb5965f4a53ee08
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/logic/action/get.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: c2e7c6718cfeab3d04abc038b604d0b56f0d85bd
https://github.com/okfn/ckan/commit/c2e7c6718cfeab3d04abc038b604d0b56f0d85bd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
[#2437] Fix related schema. Featured should be integer.
Commit: 794d86b298283f43c41cf6bcd24af848f95923a1
https://github.com/okfn/ckan/commit/794d86b298283f43c41cf6bcd24af848f95923a1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
[#2437] Move authorization check from related_update action
into corresponding auth function.
Commit: 36e30adb240e897be50c7e3165cb43e575519304
https://github.com/okfn/ckan/commit/36e30adb240e897be50c7e3165cb43e575519304
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
re-add comment lost in merge
Commit: 80155bf1901ca7682a82a39ee88e129291348285
https://github.com/okfn/ckan/commit/80155bf1901ca7682a82a39ee88e129291348285
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.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/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/related.py
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/package/layout.html
R ckan/templates/package/related_list.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
M ckan/templates/user/read.html
M ckan/tests/functional/test_related.py
A doc/apps-ideas.rst
M doc/configuration.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'feature-2347-related-dashboard'
Commit: 759f3b8b73a5f9fe2b7c3bcb13ebceccbd516e8a
https://github.com/okfn/ckan/commit/759f3b8b73a5f9fe2b7c3bcb13ebceccbd516e8a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/model/authz.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/test_revision.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_resource.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 4ce2632c121189583a6ee475eae16a8ac6ee24af
https://github.com/okfn/ckan/commit/4ce2632c121189583a6ee475eae16a8ac6ee24af
Author: amercader <amercadero at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2388] Fix spacing typos that were causing test to be skipped
Commit: ed7e38b0b9a015688a8508549d13dc5ededf1fa8
https://github.com/okfn/ckan/commit/ed7e38b0b9a015688a8508549d13dc5ededf1fa8
Author: amercader <amercadero at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2388] Fix datastore controller test
The old test did not take into account the new default authorization
settings (Non logged in users can not push to the datastore).
Commit: 7a387bef5d621c9e548139375b2ffc548506326c
https://github.com/okfn/ckan/commit/7a387bef5d621c9e548139375b2ffc548506326c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.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/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/related.py
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/package/layout.html
R ckan/templates/package/related_list.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
M ckan/templates/user/read.html
M ckan/tests/functional/test_related.py
A doc/apps-ideas.rst
M doc/configuration.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 5050a90a6f3561062ecb19bec4ee8cb9df134d75
https://github.com/okfn/ckan/commit/5050a90a6f3561062ecb19bec4ee8cb9df134d75
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
Merge branch '2388-out-of-the-box-auth-settings' of https://github.com/okfn/ckan into 2388-out-of-the-box-auth-settings
Commit: e573ca16344e272a487f49904a2318a76d692e0c
https://github.com/okfn/ckan/commit/e573ca16344e272a487f49904a2318a76d692e0c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
Merge branch '2388-out-of-the-box-auth-settings'
Commit: ceee1259f75a6f697386d9ae4a856eee4861b7fc
https://github.com/okfn/ckan/commit/ceee1259f75a6f697386d9ae4a856eee4861b7fc
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
[xs] Skip hierarchical cte test on sqlite
Commit: 7da6b57f8efdc9f04e7dc7c3ebe57e3d5e8a0eeb
https://github.com/okfn/ckan/commit/7da6b57f8efdc9f04e7dc7c3ebe57e3d5e8a0eeb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckanext/multilingual/tests/test_multilingual_plugin.py
Log Message:
-----------
Don't use mustcontain() in tests
It prints out entire pages of HTML to the terminal when tests fail,
which is really annoying.
Commit: d3dbcc0d511af836bdb4a2359db556d897d563f8
https://github.com/okfn/ckan/commit/d3dbcc0d511af836bdb4a2359db556d897d563f8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.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/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/authz.py
M ckan/model/package.py
M ckan/model/related.py
M ckan/model/resource.py
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/package/layout.html
R ckan/templates/package/related_list.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
M ckan/templates/user/read.html
M ckan/tests/forms/test_package.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_related.py
M ckan/tests/functional/test_revision.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_resource.py
A doc/apps-ideas.rst
M doc/configuration.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: bf378efef0ffa15e0c51525937c60bc6a5c5b0c4
https://github.com/okfn/ckan/commit/bf378efef0ffa15e0c51525937c60bc6a5c5b0c4
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
Merge branch '2671-fix-partial-updates'
Commit: a7119e64700a031bcb67af4f9a4a17eaf3f187d8
https://github.com/okfn/ckan/commit/a7119e64700a031bcb67af4f9a4a17eaf3f187d8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.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/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/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/authz.py
M ckan/model/license.py
M ckan/model/package.py
M ckan/model/related.py
M ckan/model/resource.py
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/package/layout.html
R ckan/templates/package/related_list.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
M ckan/templates/user/read.html
M ckan/tests/forms/test_package.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_related.py
M ckan/tests/functional/test_revision.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_resource.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
A doc/apps-ideas.rst
M doc/configuration.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into extras_dict_dictize_string_handling
Commit: 9f493e54a6022e8709392e63e2736377e68f0921
https://github.com/okfn/ckan/commit/9f493e54a6022e8709392e63e2736377e68f0921
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckanext/multilingual/tests/test_multilingual_plugin.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 22804280934aa14f7cc872bcf2d6309922cb72c6
https://github.com/okfn/ckan/commit/22804280934aa14f7cc872bcf2d6309922cb72c6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Revert "Don't insert quotation chars into strings when dictizing extras"
This reverts commit f5043a29067898061176ca5e64032fd4de9718f3.
Commit: 4fe307efedca371a3241298262aaaeb2dd9a5c78
https://github.com/okfn/ckan/commit/4fe307efedca371a3241298262aaaeb2dd9a5c78
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.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/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/authz.py
M ckan/model/license.py
M ckan/model/package.py
M ckan/model/related.py
M ckan/model/resource.py
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/package/layout.html
R ckan/templates/package/related_list.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
M ckan/templates/user/read.html
M ckan/tests/forms/test_package.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_related.py
M ckan/tests/functional/test_revision.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_resource.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
A doc/apps-ideas.rst
M doc/configuration.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into extras_dict_dictize_string_handling
Commit: a8eedda82c0c4e6a4fea5888e5b7864a4abef39e
https://github.com/okfn/ckan/commit/a8eedda82c0c4e6a4fea5888e5b7864a4abef39e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
group controller: use extras_as_string for group read
Commit: fc0545cf201f2daf5ea97d4410dec31570c29396
https://github.com/okfn/ckan/commit/fc0545cf201f2daf5ea97d4410dec31570c29396
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Log Message:
-----------
Merge branch 'extras_dict_dictize_string_handling' of github.com:okfn/ckan into extras_dict_dictize_string_handling
Commit: caaa4bdfff9afb668d78e72aaaf3f2de1a51c4da
https://github.com/okfn/ckan/commit/caaa4bdfff9afb668d78e72aaaf3f2de1a51c4da
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Merge branch 'extras_dict_dictize_string_handling'
Commit: 7172a9ec277d41c5c73b23e8276decd449e21140
https://github.com/okfn/ckan/commit/7172a9ec277d41c5c73b23e8276decd449e21140
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: deaf34957801face908a241263edbc9fc09945ba
https://github.com/okfn/ckan/commit/deaf34957801face908a241263edbc9fc09945ba
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/moment/1.6.2/moment.js
A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
R ckan/public/scripts/vendor/recline/css/data-explorer.css
R ckan/public/scripts/vendor/recline/css/graph.css
R ckan/public/scripts/vendor/recline/css/grid.css
R ckan/public/scripts/vendor/recline/css/images/edit-map.png
R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
R ckan/public/scripts/vendor/recline/css/map.css
A ckan/public/scripts/vendor/recline/css/recline.css
M ckan/public/scripts/vendor/recline/recline.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
R ckan/public/scripts/vendor/slickgrid/images/actions.gif
R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
R ckan/public/scripts/vendor/slickgrid/images/down.gif
R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/expand.gif
R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/help.png
R ckan/public/scripts/vendor/slickgrid/images/info.gif
R ckan/public/scripts/vendor/slickgrid/images/listview.gif
R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
R ckan/public/scripts/vendor/slickgrid/images/stripes.png
R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
R ckan/public/scripts/vendor/slickgrid/images/tick.png
R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
R ckan/public/scripts/vendor/slickgrid/slick.grid.css
R ckan/public/scripts/vendor/slickgrid/slick.grid.js
M ckan/templates/package/resource_embedded_dataviewer.html
M ckan/templates/snippets/recline-extra-footer.html
M ckan/templates/snippets/recline-extra-header.html
Log Message:
-----------
Merge remote-tracking branch 'origin/2639-update-recline-for-1.8-release'
Commit: ba4faad89725ae33aefb1dfcf71609668ceeacfd
https://github.com/okfn/ckan/commit/ba4faad89725ae33aefb1dfcf71609668ceeacfd
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/moment/1.6.2/moment.js
A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
R ckan/public/scripts/vendor/recline/css/data-explorer.css
R ckan/public/scripts/vendor/recline/css/graph.css
R ckan/public/scripts/vendor/recline/css/grid.css
R ckan/public/scripts/vendor/recline/css/images/edit-map.png
R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
R ckan/public/scripts/vendor/recline/css/map.css
A ckan/public/scripts/vendor/recline/css/recline.css
M ckan/public/scripts/vendor/recline/recline.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
R ckan/public/scripts/vendor/slickgrid/images/actions.gif
R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
R ckan/public/scripts/vendor/slickgrid/images/down.gif
R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/expand.gif
R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/help.png
R ckan/public/scripts/vendor/slickgrid/images/info.gif
R ckan/public/scripts/vendor/slickgrid/images/listview.gif
R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
R ckan/public/scripts/vendor/slickgrid/images/stripes.png
R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
R ckan/public/scripts/vendor/slickgrid/images/tick.png
R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
R ckan/public/scripts/vendor/slickgrid/slick.grid.css
R ckan/public/scripts/vendor/slickgrid/slick.grid.js
M ckan/templates/package/resource_embedded_dataviewer.html
M ckan/templates/snippets/recline-extra-footer.html
M ckan/templates/snippets/recline-extra-header.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: a88f79add4767700b633567c50db5280de11b0bb
https://github.com/okfn/ckan/commit/a88f79add4767700b633567c50db5280de11b0bb
Author: amercader <amercadero at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/__init__.py
Log Message:
-----------
Update version number for release 1.8 beta
Commit: 1ceaba22e5a01421b5c2440817c3c8fd5e61d7e4
https://github.com/okfn/ckan/commit/1ceaba22e5a01421b5c2440817c3c8fd5e61d7e4
Author: amercader <amercadero at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/__init__.py
Log Message:
-----------
Update version number
Commit: 7accd54887a5c6767c503e30ea616f669f044e6f
https://github.com/okfn/ckan/commit/7accd54887a5c6767c503e30ea616f669f044e6f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
Log Message:
-----------
[#2757] Add source install upgrade docs
Commit: fb8abd4d5d9e545dd7a22999b404c8d08bea0cdb
https://github.com/okfn/ckan/commit/fb8abd4d5d9e545dd7a22999b404c8d08bea0cdb
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/__init__.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 0bd3db4ba5919f4a88439862375177cf93d83ab8
https://github.com/okfn/ckan/commit/0bd3db4ba5919f4a88439862375177cf93d83ab8
Author: amercader <amercadero at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2757] Add some comments to source upgrade
Commit: 15f98d083f7cf02439cf4978a40e691c82971a0a
https://github.com/okfn/ckan/commit/15f98d083f7cf02439cf4978a40e691c82971a0a
Author: amercader <amercadero at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
Log Message:
-----------
Merge branch '2757-source-install-upgrade-docs'
Commit: 71a3d203efb0777f55ad48ceb11c21ef9c6dd227
https://github.com/okfn/ckan/commit/71a3d203efb0777f55ad48ceb11c21ef9c6dd227
Author: amercader <amercadero at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
Log Message:
-----------
Merge branch '2757-source-install-upgrade-docs' into release-v1.8
Commit: cfdeb919f228f917b287eda203e5a5371e0977bc
https://github.com/okfn/ckan/commit/cfdeb919f228f917b287eda203e5a5371e0977bc
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
Fix for relative url being used when doing file upload to local storage
Commit: 148081c7d579a3ae7cd2f305036bf879b43085b0
https://github.com/okfn/ckan/commit/148081c7d579a3ae7cd2f305036bf879b43085b0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 0bdaf23147f518e45a10bb181b83507ab45f45b1
https://github.com/okfn/ckan/commit/0bdaf23147f518e45a10bb181b83507ab45f45b1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/templates/related/add-related.html
Log Message:
-----------
[#2770] Mark strings for translation on add related item form
Commit: 6d92712cf9338ddd7d93eb3e3348f8440faf1b7f
https://github.com/okfn/ckan/commit/6d92712cf9338ddd7d93eb3e3348f8440faf1b7f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M CHANGELOG.txt
M LICENSE.txt
M ckan/__init__.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/maintain.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/authz.py
M ckan/model/follower.py
M ckan/model/group.py
M ckan/model/license.py
M ckan/model/meta.py
M ckan/model/package.py
M ckan/model/related.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/public/scripts/vendor/moment/1.6.2/moment.js
A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
R ckan/public/scripts/vendor/recline/css/data-explorer.css
R ckan/public/scripts/vendor/recline/css/graph.css
R ckan/public/scripts/vendor/recline/css/grid.css
R ckan/public/scripts/vendor/recline/css/images/edit-map.png
R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
R ckan/public/scripts/vendor/recline/css/map.css
A ckan/public/scripts/vendor/recline/css/recline.css
M ckan/public/scripts/vendor/recline/recline.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
R ckan/public/scripts/vendor/slickgrid/images/actions.gif
R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
R ckan/public/scripts/vendor/slickgrid/images/down.gif
R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/expand.gif
R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/help.png
R ckan/public/scripts/vendor/slickgrid/images/info.gif
R ckan/public/scripts/vendor/slickgrid/images/listview.gif
R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
R ckan/public/scripts/vendor/slickgrid/images/stripes.png
R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
R ckan/public/scripts/vendor/slickgrid/images/tick.png
R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
R ckan/public/scripts/vendor/slickgrid/slick.grid.css
R ckan/public/scripts/vendor/slickgrid/slick.grid.js
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/facets.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/layout.html
M ckan/templates/package/read.html
R ckan/templates/package/related_list.html
M ckan/templates/package/resource_embedded_dataviewer.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
A ckan/templates/snippets/follow_button.html
A ckan/templates/snippets/internal-tracking.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/layout.html
M ckan/templates/user/read.html
M ckan/tests/forms/test_authz.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_related.py
M ckan/tests/functional/test_revision.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_repo.py
M ckan/tests/models/test_resource.py
M ckan/tests/models/test_user.py
M ckan/tests/schema/test_schema.py
M ckan/tests/test_plugins.py
M ckan/tests/test_versions.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/organizations/templates/organization_package_form.html
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/publisher_read.html
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/test_tag_vocab_plugin.py
M doc/apiv3.rst
A doc/apps-ideas.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/datastore.rst
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/paster.rst
A doc/release-cycle.rst
M doc/solr-setup.rst
M doc/test.rst
A doc/toolkit.rst
M doc/writing-extensions.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
M setup.py
Log Message:
-----------
Merge branch 'master' into feature-2536-clean-activity-stream
Conflicts:
ckan/logic/action/get.py
Commit: af3df9262613df992d4c18297804b460ba07f0ff
https://github.com/okfn/ckan/commit/af3df9262613df992d4c18297804b460ba07f0ff
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/templates/activity_streams/follow_dataset.html
Log Message:
-----------
[2536] use consistent naming in activity streams
Commit: 23ab84eca01d4792f35f03258e609b41d235b7ca
https://github.com/okfn/ckan/commit/23ab84eca01d4792f35f03258e609b41d235b7ca
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/action/get.py
R ckan/templates/activity_streams/deleted_related_item.html
R ckan/templates/activity_streams/follow_dataset.html
R ckan/templates/activity_streams/follow_user.html
R ckan/templates/activity_streams/new_related_item.html
Log Message:
-----------
[2536] move new activity streams to new model
Commit: 2e127514fc4c80d816364e1550daa145892f1593
https://github.com/okfn/ckan/commit/2e127514fc4c80d816364e1550daa145892f1593
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
Revert "[2536] use consistent naming in activity streams"
This reverts commit af3df9262613df992d4c18297804b460ba07f0ff.
Conflicts:
ckan/templates/activity_streams/follow_dataset.html
Commit: 31beffeb64a8ade68d8a02841511f808895cca1f
https://github.com/okfn/ckan/commit/31beffeb64a8ade68d8a02841511f808895cca1f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2536] fix dataset snippet for follow_dataset
Commit: d62120843ca7777feb2a5046450dfb74a2d10390
https://github.com/okfn/ckan/commit/d62120843ca7777feb2a5046450dfb74a2d10390
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
A ckan/lib/activity_streams.py
M ckan/logic/action/get.py
Log Message:
-----------
[#2536] move snippets into separate lib
Commit: be28a2475e728d44ffd68e2ca9f666798955d5bb
https://github.com/okfn/ckan/commit/be28a2475e728d44ffd68e2ca9f666798955d5bb
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/get.py
Log Message:
-----------
[#2536] Move activity stream stings into lib.activity_streams
Commit: 0659029942a0ffbfc9c89a36027052ebbb5d1b80
https://github.com/okfn/ckan/commit/0659029942a0ffbfc9c89a36027052ebbb5d1b80
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2536] fix long line
Commit: 8799b16a5eccd3d359e0206bf1dc4b0b7d71a214
https://github.com/okfn/ckan/commit/8799b16a5eccd3d359e0206bf1dc4b0b7d71a214
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2536] rename some functions and slight refactoring
Commit: 89498827274fda959a6b2ef0e24f01c02a32b679
https://github.com/okfn/ckan/commit/89498827274fda959a6b2ef0e24f01c02a32b679
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
Log Message:
-----------
[#2536] fixups
Commit: 548de8ee761a49f6e4753a23c6c930be9e0ff113
https://github.com/okfn/ckan/commit/548de8ee761a49f6e4753a23c6c930be9e0ff113
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2536] fix some errors
Commit: 9acc9ea27723ed4ee90380512652f7c37114b18f
https://github.com/okfn/ckan/commit/9acc9ea27723ed4ee90380512652f7c37114b18f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/public/scripts/templates.js
M ckan/templates/js_strings.html
Log Message:
-----------
[i18n] Mark 2 resource form strings for i18n
Commit: cc79d77f6ded1f10cfe6bec9012c190743703e97
https://github.com/okfn/ckan/commit/cc79d77f6ded1f10cfe6bec9012c190743703e97
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/templates/related/add-related.html
Log Message:
-----------
[#2770] Mark strings for translation on add related item form
Commit: 6fc2a136a2d5382649a3367cbf7b0253ee3a887e
https://github.com/okfn/ckan/commit/6fc2a136a2d5382649a3367cbf7b0253ee3a887e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/public/scripts/templates.js
M ckan/templates/js_strings.html
Log Message:
-----------
[i18n] Mark 2 resource form strings for i18n
Commit: e8a1467965a3d3fa852eb49b84917992d10a1cf5
https://github.com/okfn/ckan/commit/e8a1467965a3d3fa852eb49b84917992d10a1cf5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M .tx/config
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
A ckan/i18n/ja/LC_MESSAGES/ckan.mo
A ckan/i18n/ja/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
Log Message:
-----------
[i18n] Update i18n for CKAN 1.8
Downloaded the latest strings from the CKAN 1.7 resource on Transifex
into the po files
Locked the CKAN 1.7 resource on Transifex
Updated the version number in .tx/config from 1.7 to 1.8
Extracted the latest strings from the CKAN source code into the pot and
po files
Recompiled the mo files
Created the new CKAN 1.8 resource on Transifex from the pot and po files
in this commit
Commit: 613322a3cbb0041815fb9118b372cd9404c2e1a4
https://github.com/okfn/ckan/commit/613322a3cbb0041815fb9118b372cd9404c2e1a4
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2777] Use user_list_dictize
Commit: fbefe8cb730e24edd47a5454bdcdd53473b221f5
https://github.com/okfn/ckan/commit/fbefe8cb730e24edd47a5454bdcdd53473b221f5
Author: amercader <amercadero at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch '2777-defect-user-show'
Commit: ae181d3e0d9f2c6a84d669e2f3b75bfcf2346c0e
https://github.com/okfn/ckan/commit/ae181d3e0d9f2c6a84d669e2f3b75bfcf2346c0e
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2777] Use user_list_dictize
Commit: 85097d9e881f9f0dfe1870fe59e681f099b3623d
https://github.com/okfn/ckan/commit/85097d9e881f9f0dfe1870fe59e681f099b3623d
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Some pep8 fixes for lib.helpers
Commit: 6a48063b971a5f6813c5034eace85e479b5308df
https://github.com/okfn/ckan/commit/6a48063b971a5f6813c5034eace85e479b5308df
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2750] Fix group controller using wrong schema
Fix group controller calling form_to_db_schema() from IGroupForm plugin
when it should be using db_to_form_schema()
Commit: 3ed510b2da164e566fc2c23eee84a495f6800cb3
https://github.com/okfn/ckan/commit/3ed510b2da164e566fc2c23eee84a495f6800cb3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Refactor DefaultGroupForm's form_to_db_schema_options()
The form_to_db_schema() methods of IGroupForm plugins were not being
called if those plugins inherited from DefaultGroupForm. Refactor it in
the same way as DefaultDatasetForm's form_to_db_schema_options() method
was recently refactored. Make it call self.form_to_db_schema so that
the form_to_db_schema() methods of IGroupForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.
Commit: 5c63f301ae22f6f54a62afa0d0211be3cee628cb
https://github.com/okfn/ckan/commit/5c63f301ae22f6f54a62afa0d0211be3cee628cb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
[#2570] Fix IGroupForm check_data_dict not being called
Make group_create() and group_update() call the check_data_dict()
methods of IGroupForm plugins, like package_create() and
package_update() do with IDatasetForm plugins.
Commit: e2073a37ac16acb1233a19f42d6473e0a2065b75
https://github.com/okfn/ckan/commit/e2073a37ac16acb1233a19f42d6473e0a2065b75
Author: amercader <amercadero at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
Be more careful when prepending site_url
Commit: 3c0df274329d4b234863803f31dd0276c13b3ed4
https://github.com/okfn/ckan/commit/3c0df274329d4b234863803f31dd0276c13b3ed4
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
Fix for relative url being used when doing file upload to local storage
Commit: b7f7a80cf895f37ac01ae24299662838484c939e
https://github.com/okfn/ckan/commit/b7f7a80cf895f37ac01ae24299662838484c939e
Author: amercader <amercadero at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
Be more careful when prepending site_url
Commit: bd860dc58758356f36518586d1b70e1079700ba2
https://github.com/okfn/ckan/commit/bd860dc58758356f36518586d1b70e1079700ba2
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#2784] Hand control of user's sensitive data to user_dictize.
Only a sysadmin or the owner of the account may view a user's apikey
or reset_key.
This does not change behaviour of the actions; just moves the logic
form the actions to the model dictize layer.
Commit: 7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
https://github.com/okfn/ckan/commit/7fe6c76a5408e41c5693c7ab4b4217e1547f9da4
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/tests/functional/api/test_user.py
Log Message:
-----------
[#2784] Allow users to see their apikey when creating or updating themselves.
Commit: 99adf3dddb4ef78b34d128e3a5f9031643e8b0e9
https://github.com/okfn/ckan/commit/99adf3dddb4ef78b34d128e3a5f9031643e8b0e9
Author: amercader <amercadero at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 6640521baf54432c247b4cff568ae1bd61f69b20
https://github.com/okfn/ckan/commit/6640521baf54432c247b4cff568ae1bd61f69b20
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/storage.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/public/scripts/templates.js
M ckan/templates/js_strings.html
M ckan/templates/related/add-related.html
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 21ca66c77e9a618cec24709430e73c4409c1ac2c
https://github.com/okfn/ckan/commit/21ca66c77e9a618cec24709430e73c4409c1ac2c
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#2784] User email is treated as sensitive data
Commit: d7408ff17d167d753b08acd62747d661d664e833
https://github.com/okfn/ckan/commit/d7408ff17d167d753b08acd62747d661d664e833
Author: amercader <amercadero at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2784] Set user domain object in 'user_obj' in context instead of 'user'
Commit: b04aa652d235bd88e37e07c9652a08c144c41176
https://github.com/okfn/ckan/commit/b04aa652d235bd88e37e07c9652a08c144c41176
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Fix a db_to_form_package_schema() crash
When db_to_form_package_schema() was in use (e.g. when an IDatasetForm
plugin with a db_to_form_schema() method based on
db_to_form_package_schema() was active) then try to edit a package that
has some resources would crash with a 400 Bad Request.
Extremely difficult to debug.
This seems to fix it.
Commit: 1593e75f8702d1152460a21ec2b6e5082fd78ec4
https://github.com/okfn/ckan/commit/1593e75f8702d1152460a21ec2b6e5082fd78ec4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-05 (Sun, 05 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/storage.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/public/scripts/templates.js
M ckan/templates/js_strings.html
Log Message:
-----------
Merge branch 'master' into feature-2536-clean-activity-stream
Commit: 1fd98fc3e4fac2a559b8b50499829ed8da3844b7
https://github.com/okfn/ckan/commit/1fd98fc3e4fac2a559b8b50499829ed8da3844b7
Author: amercader <amercadero at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch '2784-model-dictize-sensitive-data'
Commit: a12973769c6320c6ff78201e83231ab4f5ebd4c1
https://github.com/okfn/ckan/commit/a12973769c6320c6ff78201e83231ab4f5ebd4c1
Author: amercader <amercadero at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch '2784-model-dictize-sensitive-data' into release-v1.8
Conflicts:
ckan/__init__.py
ckan/controllers/storage.py
Commit: f67c571be2c0653a9ae3d67a9a35e61a7329541e
https://github.com/okfn/ckan/commit/f67c571be2c0653a9ae3d67a9a35e61a7329541e
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2755] Don't call user_show twice
Commit: a26d88cf4ef59980683b594958abe52e1a42c5e5
https://github.com/okfn/ckan/commit/a26d88cf4ef59980683b594958abe52e1a42c5e5
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2755] Don't call user_show twice
Commit: 57b308e54268456ff375d4dd7bdc404bbad9a901
https://github.com/okfn/ckan/commit/57b308e54268456ff375d4dd7bdc404bbad9a901
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
A ckan/templates/activity_streams/activity_stream_item.html
R ckan/templates/activity_streams/general.html
Log Message:
-----------
[#2536] Minor activity streams tidying
For any activity with one activity detail the detail will be
rendered instead of the activity, not just changed packages.
Some comments and PEP8 tidy up.
Rename general.html to activity_stream_item.html
Commit: 1763a8363f27924ee0f389a395c8102587a9b589
https://github.com/okfn/ckan/commit/1763a8363f27924ee0f389a395c8102587a9b589
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
R ckan/lib/activity.py
A ckan/lib/activity_streams_session_extension.py
M ckan/model/meta.py
Log Message:
-----------
Rename activity.py -> activity_streams_session_extension.py
To make it clear what the difference is between lib/activity_streams.py
and lib/activity_streams_session_extension.py (previously
lib/activity.py)
Commit: 388063f2003e275aea6ffa2227478319db80335f
https://github.com/okfn/ckan/commit/388063f2003e275aea6ffa2227478319db80335f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 1ae2c22c3caebe9c282157b602f1f92153e268d9
https://github.com/okfn/ckan/commit/1ae2c22c3caebe9c282157b602f1f92153e268d9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-2536-clean-activity-stream
Commit: c1ee1e995ef7481cd40b9fb3221db1b681293f92
https://github.com/okfn/ckan/commit/c1ee1e995ef7481cd40b9fb3221db1b681293f92
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2750] Fix group controller using wrong schema
Fix group controller calling form_to_db_schema() from IGroupForm plugin
when it should be using db_to_form_schema()
Commit: 5d80f7fc5d41225c79625a8dcadd64148d8adc76
https://github.com/okfn/ckan/commit/5d80f7fc5d41225c79625a8dcadd64148d8adc76
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Refactor DefaultGroupForm's form_to_db_schema_options()
The form_to_db_schema() methods of IGroupForm plugins were not being
called if those plugins inherited from DefaultGroupForm. Refactor it in
the same way as DefaultDatasetForm's form_to_db_schema_options() method
was recently refactored. Make it call self.form_to_db_schema so that
the form_to_db_schema() methods of IGroupForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.
Commit: 8938352c1add570f5dabe67167907edb1167392e
https://github.com/okfn/ckan/commit/8938352c1add570f5dabe67167907edb1167392e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
[#2570] Fix IGroupForm check_data_dict not being called
Make group_create() and group_update() call the check_data_dict()
methods of IGroupForm plugins, like package_create() and
package_update() do with IDatasetForm plugins.
Commit: 5d30fdbc718e2d423b53fdaee1fdf9d22aaa8524
https://github.com/okfn/ckan/commit/5d30fdbc718e2d423b53fdaee1fdf9d22aaa8524
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Fix a db_to_form_package_schema() crash
When db_to_form_package_schema() was in use (e.g. when an IDatasetForm
plugin with a db_to_form_schema() method based on
db_to_form_package_schema() was active) then try to edit a package that
has some resources would crash with a 400 Bad Request.
Extremely difficult to debug.
This seems to fix it.
Commit: 3aa964db2218ad4a55c591fe78ab6b5a3f06d477
https://github.com/okfn/ckan/commit/3aa964db2218ad4a55c591fe78ab6b5a3f06d477
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
R ckan/templates/activity_streams/activity_stream_item.html
A ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#2536] rename activity stream template
Commit: e491daf8a50b08783a5d7813edd66277ebb15913
https://github.com/okfn/ckan/commit/e491daf8a50b08783a5d7813edd66277ebb15913
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2536] Only check for details if certain activity type
Commit: abf6adb3fbd537f509ac690ca06c345281ba09a1
https://github.com/okfn/ckan/commit/abf6adb3fbd537f509ac690ca06c345281ba09a1
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
Log Message:
-----------
Minor bugfix
Commit: 34e8730496ff9eef0b65c1e7f64476700181fba6
https://github.com/okfn/ckan/commit/34e8730496ff9eef0b65c1e7f64476700181fba6
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2722] fix group dataset sort
Commit: a89c8d6dd4764b859fec3a41089a6e9547898072
https://github.com/okfn/ckan/commit/a89c8d6dd4764b859fec3a41089a6e9547898072
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2722] Add c.sort_by_selected to group read template
Commit: fa3ca5bef30b17c2da74653748934407d538c3fb
https://github.com/okfn/ckan/commit/fa3ca5bef30b17c2da74653748934407d538c3fb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Make relevance the default sort order on group pages
If not sort order is specified, group controller passes None to
package_search, same as the package controller does, then package_search
defaults to 'score desc, name asc'
Commit: deedb787786e74888d56e6515bdeb6c7bb37f504
https://github.com/okfn/ckan/commit/deedb787786e74888d56e6515bdeb6c7bb37f504
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Add group read sort ordering to changelog
Commit: 0d0e5a09eddf54544a1737fa45b248532ac7c875
https://github.com/okfn/ckan/commit/0d0e5a09eddf54544a1737fa45b248532ac7c875
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M .tx/config
M CHANGELOG.txt
M ckan/__init__.py
M ckan/controllers/group.py
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
A ckan/i18n/ja/LC_MESSAGES/ckan.mo
A ckan/i18n/ja/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
Log Message:
-----------
Merge branch 'allow-group-read-sort'
Commit: 873f03dc9bf41a1a763698032db9eb281dd7e084
https://github.com/okfn/ckan/commit/873f03dc9bf41a1a763698032db9eb281dd7e084
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/config/environment.py
M ckan/lib/search/__init__.py
Log Message:
-----------
[#2844] actually use simple-search config option
Commit: 419e8395d8708389566c37b4bbf47dd628c07947
https://github.com/okfn/ckan/commit/419e8395d8708389566c37b4bbf47dd628c07947
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/lib/search/sql.py
Log Message:
-----------
[#2844] Fix error in simple search
Commit: 3d33445a6b5eebe41a3f1f87c8d692a921baa3bd
https://github.com/okfn/ckan/commit/3d33445a6b5eebe41a3f1f87c8d692a921baa3bd
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/tests/lib/test_simple_search.py
Log Message:
-----------
[#2844] fix test
Commit: ef5e4a0693254984e52ea052524d523b28123f55
https://github.com/okfn/ckan/commit/ef5e4a0693254984e52ea052524d523b28123f55
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M doc/_themes/sphinx-theme-okfn
M doc/conf.py
Log Message:
-----------
[doc/theme][xs]: update to latest version of sphinx okfn theme with fixes for first heading and support for localtoc.
Commit: f314d00b338182c6e058374576f4473907ff7577
https://github.com/okfn/ckan/commit/f314d00b338182c6e058374576f4473907ff7577
Author: amercader <amercadero at gmail.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/config/environment.py
M ckan/lib/search/__init__.py
M ckan/lib/search/sql.py
M ckan/tests/lib/test_simple_search.py
Log Message:
-----------
Merge branch '2844-re-enable-simple-search'
Commit: 7830d19e4282d0cca8038bf7c4a6e78b8bb0b3c5
https://github.com/okfn/ckan/commit/7830d19e4282d0cca8038bf7c4a6e78b8bb0b3c5
Author: amercader <amercadero at gmail.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M doc/datastore.rst
Log Message:
-----------
Fix typo in datastore docs
Commit: 1de3d7c0048d57bc6239e8dc2f895803fc0316ef
https://github.com/okfn/ckan/commit/1de3d7c0048d57bc6239e8dc2f895803fc0316ef
Author: amercader <amercadero at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/lib/search/index.py
Log Message:
-----------
Avoid unnecessary commit request
The commit can be sent on the same request with the dict to index
Commit: 302042a46a8a7e0e9d907180b9a9702ef7c68981
https://github.com/okfn/ckan/commit/302042a46a8a7e0e9d907180b9a9702ef7c68981
Author: amercader <amercadero at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/tests/lib/test_cli.py
Log Message:
-----------
Commit only once at the end of a search index rebuild
Commiting changes in the Solr search index is a heavy task that takes
significant time. We are currently commiting changes after each update,
which is probably fine for individual updated (ie users editing or
creating a dataset), but when rebuilding the whole index it is
unnecessary. A single commit at the end of the process is needed, and
that speeds the reindexing about a 85%.
A flag has been added (`-e` or `--commit-each`) to allow the old
behaviour (commiting after each edit).
Commit: 6e43373acc4cdfb98bf12048f6df6f527b3d9847
https://github.com/okfn/ckan/commit/6e43373acc4cdfb98bf12048f6df6f527b3d9847
Author: amercader <amercadero at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Allow not returning the package dict when creating or updating
This avoids calling package_show
Commit: 5ec22a75e63cf416ab6c1124958e632ab531d468
https://github.com/okfn/ckan/commit/5ec22a75e63cf416ab6c1124958e632ab531d468
Author: amercader <amercadero at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Return dataset id if 'return_pacakge_dict' is False
Commit: 8f7baad5636c4352d7626ccbfb90c1d91e25262a
https://github.com/okfn/ckan/commit/8f7baad5636c4352d7626ccbfb90c1d91e25262a
Author: amercader <amercadero at gmail.com>
Date: 2012-08-15 (Wed, 15 Aug 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Use return_id_only instead of return_package_dict
Suggested by @tobes, as it is more backwards compatible
Commit: ec53e974a40b4255f844c3f4d773f937c8c98784
https://github.com/okfn/ckan/commit/ec53e974a40b4255f844c3f4d773f937c8c98784
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M .tx/config
M CHANGELOG.txt
M ckan/__init__.py
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
A ckan/i18n/ja/LC_MESSAGES/ckan.mo
A ckan/i18n/ja/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
R ckan/lib/activity.py
A ckan/lib/activity_streams.py
A ckan/lib/activity_streams_session_extension.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/sql.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/meta.py
A ckan/templates/activity_streams/activity_stream_items.html
R ckan/templates/activity_streams/added_tag.html
R ckan/templates/activity_streams/changed_group.html
R ckan/templates/activity_streams/changed_package.html
R ckan/templates/activity_streams/changed_package_extra.html
R ckan/templates/activity_streams/changed_resource.html
R ckan/templates/activity_streams/changed_user.html
R ckan/templates/activity_streams/deleted_group.html
R ckan/templates/activity_streams/deleted_package.html
R ckan/templates/activity_streams/deleted_package_extra.html
R ckan/templates/activity_streams/deleted_related_item.html
R ckan/templates/activity_streams/deleted_resource.html
R ckan/templates/activity_streams/follow_dataset.html
R ckan/templates/activity_streams/follow_user.html
R ckan/templates/activity_streams/new_group.html
R ckan/templates/activity_streams/new_package.html
R ckan/templates/activity_streams/new_package_extra.html
R ckan/templates/activity_streams/new_related_item.html
R ckan/templates/activity_streams/new_resource.html
R ckan/templates/activity_streams/new_user.html
R ckan/templates/activity_streams/removed_tag.html
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_simple_search.py
M doc/_themes/sphinx-theme-okfn
M doc/conf.py
M doc/datastore.rst
Log Message:
-----------
Merge branch 'master' into pep8-lib-helpers
Conflicts:
ckan/lib/helpers.py
trivial merge
Commit: 7fe68d24ff22945b2dbf6fbaf0a5cde653d6f03f
https://github.com/okfn/ckan/commit/7fe68d24ff22945b2dbf6fbaf0a5cde653d6f03f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M .tx/config
M CHANGELOG.txt
M ckan/__init__.py
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
A ckan/i18n/ja/LC_MESSAGES/ckan.mo
A ckan/i18n/ja/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
R ckan/lib/activity.py
A ckan/lib/activity_streams.py
A ckan/lib/activity_streams_session_extension.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/sql.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/validators.py
M ckan/model/meta.py
A ckan/templates/activity_streams/activity_stream_items.html
R ckan/templates/activity_streams/added_tag.html
R ckan/templates/activity_streams/changed_group.html
R ckan/templates/activity_streams/changed_package.html
R ckan/templates/activity_streams/changed_package_extra.html
R ckan/templates/activity_streams/changed_resource.html
R ckan/templates/activity_streams/changed_user.html
R ckan/templates/activity_streams/deleted_group.html
R ckan/templates/activity_streams/deleted_package.html
R ckan/templates/activity_streams/deleted_package_extra.html
R ckan/templates/activity_streams/deleted_related_item.html
R ckan/templates/activity_streams/deleted_resource.html
R ckan/templates/activity_streams/follow_dataset.html
R ckan/templates/activity_streams/follow_user.html
R ckan/templates/activity_streams/new_group.html
R ckan/templates/activity_streams/new_package.html
R ckan/templates/activity_streams/new_package_extra.html
R ckan/templates/activity_streams/new_related_item.html
R ckan/templates/activity_streams/new_resource.html
R ckan/templates/activity_streams/new_user.html
R ckan/templates/activity_streams/removed_tag.html
M ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_simple_search.py
M doc/_themes/sphinx-theme-okfn
M doc/conf.py
M doc/datastore.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 18f95bfb26c1d71a4bc790224d4bd543a56fa39b
https://github.com/okfn/ckan/commit/18f95bfb26c1d71a4bc790224d4bd543a56fa39b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch 'pep8-lib-helpers'
Commit: 483c9402e75f5b10317cbe5180c733ed921644b0
https://github.com/okfn/ckan/commit/483c9402e75f5b10317cbe5180c733ed921644b0
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[#2856] Fix 500 error in related controller
Commit: 84c4cbf74e4cb4bd450c082595e4edb8480656df
https://github.com/okfn/ckan/commit/84c4cbf74e4cb4bd450c082595e4edb8480656df
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/lib/create_test_data.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
Log Message:
-----------
Remove 'Other (Open)' from multilingual test data
This fixes a multilingual extension test that was failing. Seems this
string is getting translated by normal gettext interface translation now
Commit: 32ceeaedb50b74a008116ec728658438e27fb573
https://github.com/okfn/ckan/commit/32ceeaedb50b74a008116ec728658438e27fb573
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/controllers/feed.py
Log Message:
-----------
2869 Fixes problem with invalid data being passed to solr.
The feeds take a page number from the query string and use it to determine the
start position in the list. Occassionally this is 0 and code around line 441
then decrement and then multiply this number, generating a start number less than
0 which solr chokes on.
Commit: 0425e9caf785dd17fbc0b6af1092d4115cfab076
https://github.com/okfn/ckan/commit/0425e9caf785dd17fbc0b6af1092d4115cfab076
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
Test for 2868
Commit: 0ae66717eda4249500a227db32b7fd302bb75fd6
https://github.com/okfn/ckan/commit/0ae66717eda4249500a227db32b7fd302bb75fd6
Author: amercader <amercadero at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/controllers/feed.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch '2868-feed-search-error'
Commit: 5e338d9aba56eb4685b015392ed084fc01c80633
https://github.com/okfn/ckan/commit/5e338d9aba56eb4685b015392ed084fc01c80633
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/lib/mailer.py
M ckan/tests/functional/test_user.py
Log Message:
-----------
2866 Missing key results in strip() being called on None
When no reset key is present then None is used to verify the key
and it is strip()ed first, resulting in an error.
Commit: c73b6f00c16f526015a903642618806a4c642d72
https://github.com/okfn/ckan/commit/c73b6f00c16f526015a903642618806a4c642d72
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
2867 Fixes a problem with passing unicode to url_for
Forces the file_url to be ascii as it appears that for some reason, and only
occassionally OFS returns unicode instead of str. We don't want to fix OFS
as it is scheduled for removal and we can fix routes as it is already out of
date.
Commit: aa710e43529f1f12b4d8c993e2e18409f3199c60
https://github.com/okfn/ckan/commit/aa710e43529f1f12b4d8c993e2e18409f3199c60
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/model/license.py
Log Message:
-----------
Fix for non-open licenses appearing open
The 'This dataset is openly licensed' icon was appearing next to
non-open datasets as well. The problem was that DefaultLicense was
returning u"False" (a string) for boolean attributes such as
is_okd_compliant. Change the class so it no longer turns non-string
attributes into unicode strings when you access them.
Commit: f314b5eaba185ea43feda87c08054a4cd812c525
https://github.com/okfn/ckan/commit/f314b5eaba185ea43feda87c08054a4cd812c525
Author: amercader <amercadero at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/lib/mailer.py
M ckan/tests/functional/test_user.py
Log Message:
-----------
Merge branch '2866-missing-reset-key'
Commit: f0da258544d090b76d6205e3b29b38c1e5793ed1
https://github.com/okfn/ckan/commit/f0da258544d090b76d6205e3b29b38c1e5793ed1
Author: amercader <amercadero at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/model/license.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 85df0117cc85416f134084b3a2a1f5e8b51aec92
https://github.com/okfn/ckan/commit/85df0117cc85416f134084b3a2a1f5e8b51aec92
Author: amercader <amercadero at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
Merge branch '2867-unicode-error-url-for'
Commit: 9af067196ef12830a82a5b011eaf43d0f5313d37
https://github.com/okfn/ckan/commit/9af067196ef12830a82a5b011eaf43d0f5313d37
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/public/scripts/vendor/recline/recline.js
Log Message:
-----------
[#2639,js/recline][xs]: re-insert support for serializing all dataset info into state (and vice-versa) which means format is preserved for dataproxy.
Commit: fd1abd9d5701b4addf7e709c1766d6ffed1bb8bf
https://github.com/okfn/ckan/commit/fd1abd9d5701b4addf7e709c1766d6ffed1bb8bf
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#2639,bugfix][xs]: bugfix for minor issue with backwards compatibility in embed urls.
* Bug: previous recline setup used elasticsearch_url in recline 'state' (dataset part) when generating embed_url for dataset. But recline no longer supports this. Fixed by moving elasticsearch_urlmoving to url attribute of dataset attribute of state.
Commit: 48530a360b4b73cdbf4ecf29b84e9a9de017a8b6
https://github.com/okfn/ckan/commit/48530a360b4b73cdbf4ecf29b84e9a9de017a8b6
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-08-17 (Fri, 17 Aug 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
[#2639,bugfix][xs]: remove reference to recline.Model.Dataset.restore (has been removed from recline) and do the dataset restore by hand (trivial).
Commit: eae560d4bbf3ad0972a52b8cd19ac4893a9e4352
https://github.com/okfn/ckan/commit/eae560d4bbf3ad0972a52b8cd19ac4893a9e4352
Author: amercader <amercadero at gmail.com>
Date: 2012-08-17 (Fri, 17 Aug 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/public/scripts/application.js
M ckan/public/scripts/vendor/recline/recline.js
Log Message:
-----------
Merge branch '2639-update-recline-for-1.8-release'
Commit: 23b5039085ab9e528f5c340249cffec98a9a72fa
https://github.com/okfn/ckan/commit/23b5039085ab9e528f5c340249cffec98a9a72fa
Author: James McKinney <james at slashpoundbang.com>
Date: 2012-08-18 (Sat, 18 Aug 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
Log Message:
-----------
Add FileStore configuration settings to deployment.ini_tmpl
Commit: a84d5fe6d4f8239c65df5e708f475b6c0d5c0145
https://github.com/okfn/ckan/commit/a84d5fe6d4f8239c65df5e708f475b6c0d5c0145
Author: James McKinney <james at slashpoundbang.com>
Date: 2012-08-19 (Sun, 19 Aug 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/filestore.rst
Log Message:
-----------
Add note about setting ckan.site_url when using local file storage
Commit: 20858553ab168eb19e8cad56d81dc99e41aebfed
https://github.com/okfn/ckan/commit/20858553ab168eb19e8cad56d81dc99e41aebfed
Author: James McKinney <james at slashpoundbang.com>
Date: 2012-08-19 (Sun, 19 Aug 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
Fix e2073a37 which caused double slashes to occur
Commit: 3cdc23921f6f25d2c60655a52c56462a0fec0718
https://github.com/okfn/ckan/commit/3cdc23921f6f25d2c60655a52c56462a0fec0718
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
Fix to documentation of file upload parameters
Commit: 0d316e506e833f3d02e48ad52b3c5e8f07acd4a1
https://github.com/okfn/ckan/commit/0d316e506e833f3d02e48ad52b3c5e8f07acd4a1
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/controllers/feed.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/storage.py
M ckan/lib/create_test_data.py
M ckan/lib/mailer.py
M ckan/model/license.py
M ckan/public/scripts/application.js
M ckan/public/scripts/vendor/recline/recline.js
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: c465dd525b12a688013c45d72a8d7b32cdce436f
https://github.com/okfn/ckan/commit/c465dd525b12a688013c45d72a8d7b32cdce436f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
Merge pull request #105 from okfn/file-upload-doc-file
[doc] File upload doc fix.
Commit: d8a2b5f53c76649abde1f1dc12d3538b76daff72
https://github.com/okfn/ckan/commit/d8a2b5f53c76649abde1f1dc12d3538b76daff72
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: c2c70802dbefdaa9f73c61aa50c989621fc78c66
https://github.com/okfn/ckan/commit/c2c70802dbefdaa9f73c61aa50c989621fc78c66
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/templates/package/read.rdf
Log Message:
-----------
[xs] Fixing the RDF template
Commit: 5d81435267ac2510c2b947d18f97c2a74dc8477e
https://github.com/okfn/ckan/commit/5d81435267ac2510c2b947d18f97c2a74dc8477e
Author: amercader <amercadero at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/templates/package/read.rdf
Log Message:
-----------
Merge branch 'rdf-template-fix'
Commit: 2be2b62bd68a6920ffbccebe6d2ed6a39629ddc2
https://github.com/okfn/ckan/commit/2be2b62bd68a6920ffbccebe6d2ed6a39629ddc2
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/lib/search/__init__.py
Log Message:
-----------
[#2844] fix simple search for db clean
Commit: 5f414d0de77148fe73e8004e898fecbabf6ef562
https://github.com/okfn/ckan/commit/5f414d0de77148fe73e8004e898fecbabf6ef562
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
Merge pull request #104 from jpmckinney/no_double_slashes
Fix e2073a37 which caused double slashes to occur
Commit: c7cdab4b2b8d81a48dd3d37e5bf0f1709cf45346
https://github.com/okfn/ckan/commit/c7cdab4b2b8d81a48dd3d37e5bf0f1709cf45346
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/filestore.rst
Log Message:
-----------
Merge pull request #102 from jpmckinney/master
Add FileStore configuration settings to deployment.ini_tmpl
Commit: 58d276987e159b2da113f666b20d3f9643d16409
https://github.com/okfn/ckan/commit/58d276987e159b2da113f666b20d3f9643d16409
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/controllers/storage.py
M ckan/lib/search/__init__.py
M ckan/templates/package/read.rdf
M doc/filestore.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 00037246c7cf1615aec377fbcf2f83530f56e2c6
https://github.com/okfn/ckan/commit/00037246c7cf1615aec377fbcf2f83530f56e2c6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_save.py
Log Message:
-----------
Enable allow_partial_update for group update
Listen to allow_partial_update in the context when saving a group, and
use it in the group controller. This fixes issue #2854 where all an
organizations datasets were being removed on updating an organization
(with the organizations plugins enabled)
Commit: e432ac566eb5dac8ea2cf39b3235be72e204e827
https://github.com/okfn/ckan/commit/e432ac566eb5dac8ea2cf39b3235be72e204e827
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
Log Message:
-----------
Apply allow_partial_update to all group fields
Make 'allow_partial_update': True in the context apply to multiple group
fields: packages, users, groups, tags and extras, when updating a group,
so you can pass a group dict with e.g. no 'packages' key and this will
update the group but will not change the group's packages. Previously
allow_partial_update only affected packages and extras.
Commit: 99a7aef666ff2fc387b5aa73a2fe4e8d73fabbe5
https://github.com/okfn/ckan/commit/99a7aef666ff2fc387b5aa73a2fe4e8d73fabbe5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-08-20 (Mon, 20 Aug 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
Log Message:
-----------
Allow passing empty lists to group_update
If, for example, a group dict with a 'packages' key with an empty list
as the value is passed to group_update, then set the group's packages to
an empty list (i.e. remove any packages from the group), even if
'allow_partial_update': True was specified in the context (previously
such an empty list would be ignored and the group's packages would not
change). Also applies to other group fields e.g. tags, users, groups, etc.
Commit: cdc02db465a4698adaa13268cde435f687b0a772
https://github.com/okfn/ckan/commit/cdc02db465a4698adaa13268cde435f687b0a772
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-21 (Tue, 21 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_save.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 4bcc3297b87988e1f890ff501bd2819472b1cbc7
https://github.com/okfn/ckan/commit/4bcc3297b87988e1f890ff501bd2819472b1cbc7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-08-21 (Tue, 21 Aug 2012)
Changed paths:
M .tx/config
M CHANGELOG.txt
M LICENSE.txt
M ckan/__init__.py
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/datastore.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
A ckan/i18n/ja/LC_MESSAGES/ckan.mo
A ckan/i18n/ja/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
R ckan/lib/activity.py
A ckan/lib/activity_streams.py
A ckan/lib/activity_streams_session_extension.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/mailer.py
M ckan/lib/maintain.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/lib/search/sql.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/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/authz.py
M ckan/model/group.py
M ckan/model/license.py
M ckan/model/meta.py
M ckan/model/package.py
M ckan/model/related.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/moment/1.6.2/moment.js
A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
R ckan/public/scripts/vendor/recline/css/data-explorer.css
R ckan/public/scripts/vendor/recline/css/graph.css
R ckan/public/scripts/vendor/recline/css/grid.css
R ckan/public/scripts/vendor/recline/css/images/edit-map.png
R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
R ckan/public/scripts/vendor/recline/css/map.css
A ckan/public/scripts/vendor/recline/css/recline.css
M ckan/public/scripts/vendor/recline/recline.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
R ckan/public/scripts/vendor/slickgrid/images/actions.gif
R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
R ckan/public/scripts/vendor/slickgrid/images/down.gif
R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/expand.gif
R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/help.png
R ckan/public/scripts/vendor/slickgrid/images/info.gif
R ckan/public/scripts/vendor/slickgrid/images/listview.gif
R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
R ckan/public/scripts/vendor/slickgrid/images/stripes.png
R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
R ckan/public/scripts/vendor/slickgrid/images/tick.png
R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
R ckan/public/scripts/vendor/slickgrid/slick.grid.css
R ckan/public/scripts/vendor/slickgrid/slick.grid.js
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/activity_stream_items.html
R ckan/templates/activity_streams/added_tag.html
R ckan/templates/activity_streams/changed_group.html
R ckan/templates/activity_streams/changed_package.html
R ckan/templates/activity_streams/changed_package_extra.html
R ckan/templates/activity_streams/changed_resource.html
R ckan/templates/activity_streams/changed_user.html
R ckan/templates/activity_streams/deleted_group.html
R ckan/templates/activity_streams/deleted_package.html
R ckan/templates/activity_streams/deleted_package_extra.html
R ckan/templates/activity_streams/deleted_resource.html
R ckan/templates/activity_streams/follow_dataset.html
R ckan/templates/activity_streams/follow_user.html
R ckan/templates/activity_streams/new_group.html
R ckan/templates/activity_streams/new_package.html
R ckan/templates/activity_streams/new_package_extra.html
R ckan/templates/activity_streams/new_resource.html
R ckan/templates/activity_streams/new_user.html
R ckan/templates/activity_streams/removed_tag.html
M ckan/templates/facets.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/layout.html
M ckan/templates/package/read.html
M ckan/templates/package/read.rdf
R ckan/templates/package/related_list.html
M ckan/templates/package/resource_embedded_dataviewer.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
A ckan/templates/snippets/internal-tracking.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/read.html
M ckan/tests/forms/test_authz.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_related.py
M ckan/tests/functional/test_revision.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_cli.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_simple_search.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_repo.py
M ckan/tests/models/test_resource.py
M ckan/tests/models/test_user.py
M ckan/tests/schema/test_schema.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/publisher_read.html
M ckanext/test_tag_vocab_plugin.py
M doc/_themes/sphinx-theme-okfn
M doc/apiv3.rst
A doc/apps-ideas.rst
M doc/coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/datastore.rst
M doc/filestore.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/paster.rst
A doc/release-cycle.rst
M doc/solr-setup.rst
A doc/toolkit.rst
M doc/writing-extensions.rst
M pip-requirements.txt
M setup.py
Log Message:
-----------
Merge conflicts
Compare: https://github.com/okfn/ckan/compare/f3a672c94518...4bcc3297b879
More information about the ckan-changes
mailing list