[ckan-changes] [okfn/ckan] 0b3089: [2347] Implemented related dashboard with filter o...
GitHub
noreply at github.com
Tue Aug 14 14:26:21 UTC 2012
Branch: refs/heads/2733-feature-datastore
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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: 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: c09fc64278ee99e7fa663b6db77b735ab05120b2
https://github.com/okfn/ckan/commit/c09fc64278ee99e7fa663b6db77b735ab05120b2
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M .tx/config
M CHANGELOG.txt
M ckan/__init__.py
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/related.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/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/meta.py
M ckan/model/related.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/js_strings.html
M ckan/templates/package/layout.html
R ckan/templates/package/related_list.html
M ckan/templates/package/resource_embedded_dataviewer.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
M ckan/templates/snippets/recline-extra-footer.html
M ckan/templates/snippets/recline-extra-header.html
M ckan/templates/user/read.html
M ckan/tests/functional/api/test_user.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/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M doc/_themes/sphinx-theme-okfn
A doc/apps-ideas.rst
M doc/conf.py
M doc/configuration.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
Log Message:
-----------
Merge branch 'master' into 2733-feature-datastore
Compare: https://github.com/okfn/ckan/compare/b8eb66d86112...c09fc64278ee
More information about the ckan-changes
mailing list