[ckan-changes] [okfn/ckan] 0b3089: [2347] Implemented related dashboard with filter o...
GitHub
noreply at github.com
Thu Aug 16 09:11:21 UTC 2012
Branch: refs/heads/2375-demo-theme-stable
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: fca35e5f6929e3008640be1d1c2460dbc2a2ba32
https://github.com/okfn/ckan/commit/fca35e5f6929e3008640be1d1c2460dbc2a2ba32
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1387] fix resource urls with no protocols
Commit: 85d88059e921deb93025d9d8ef55dc551f1f788d
https://github.com/okfn/ckan/commit/85d88059e921deb93025d9d8ef55dc551f1f788d
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1387] fix tests with bad urls
Commit: 528d27bf699b8df85edf8c55f7cb91b8fcf64c7c
https://github.com/okfn/ckan/commit/528d27bf699b8df85edf8c55f7cb91b8fcf64c7c
Author: amercader <amercadero at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M doc/configuration.rst
Log Message:
-----------
[#1678] Make synchronous search the default behaviour
Unless already loaded or explicitly disabled via the
`ckan.search.automatic_index` configuration option, the synchronous
search plugin will be loaded during startup time.
Commit: 67d7135ed8c2494279dbe00b67cfea20ed2bfc6c
https://github.com/okfn/ckan/commit/67d7135ed8c2494279dbe00b67cfea20ed2bfc6c
Author: amercader <amercadero at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
PEP8 environment.py
Commit: 10f8cdee61d6dd72330b0f68be1824796c0b064a
https://github.com/okfn/ckan/commit/10f8cdee61d6dd72330b0f68be1824796c0b064a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/controllers/user.py
M ckan/lib/i18n.py
M doc/configuration.rst
Log Message:
-----------
Merge branch '1678-sync-search-by-default' of https://github.com/okfn/ckan
Commit: 428c9ff756739e4eddc5b5e9e9e794df3726cdc3
https://github.com/okfn/ckan/commit/428c9ff756739e4eddc5b5e9e9e794df3726cdc3
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/datastore.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/create.py
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_package_form.html
M doc/apiv3.rst
M doc/datastore.rst
M setup.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: b094c4eda6e61cacd3da3e638573803457f014d4
https://github.com/okfn/ckan/commit/b094c4eda6e61cacd3da3e638573803457f014d4
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
[#2362] toolkit docs
Commit: 9b72e88919fcdd25c0156a430f00968c9ec76ec3
https://github.com/okfn/ckan/commit/9b72e88919fcdd25c0156a430f00968c9ec76ec3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
[#2627] Refactor form_to_db_schema_options
Make it call self.form_to_db_schema so that the form_to_db_schema()
methods of IDatasetForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.
Commit: d93cb58049bf79a1983f3b96759361c0627684a1
https://github.com/okfn/ckan/commit/d93cb58049bf79a1983f3b96759361c0627684a1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
Fix a crasher in package/read.html template
Sometimes c.pkg_dict has no member named groups (e.g. when there is an
active IDatasetForm plugin with a db_to_form_schema() method).
Commit: 6f91aa595b74e3ff4af2128cef11f76786f8ef20
https://github.com/okfn/ckan/commit/6f91aa595b74e3ff4af2128cef11f76786f8ef20
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add db_to_form_schema method
For IDatasetForm plugins to base their db_to_form_schema() dicts on
Commit: 126c94b730b9c399dc2ba9c1a5c8858d7d97b802
https://github.com/okfn/ckan/commit/126c94b730b9c399dc2ba9c1a5c8858d7d97b802
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Rename db_to_form_schema -> db_to_form_package_schema()
Commit: 786479e8e6eea392fc4a4312c7c8a534a08083a8
https://github.com/okfn/ckan/commit/786479e8e6eea392fc4a4312c7c8a534a08083a8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/tests/schema/test_schema.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
Rename package_form_schema() -> form_to_db_package_schema()
The only purpose of this schema is to be used as a base schema by
IDatasetForm plugins for their form_to_db_schema() methods, hopefully
the new name makes that clearer
Commit: 74b346ee9a2bbbc48021ffb2e3ead6fbd5923654
https://github.com/okfn/ckan/commit/74b346ee9a2bbbc48021ffb2e3ead6fbd5923654
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add back in deprectated package_form_schema() for backwards compatibility
Commit: 9063f7be8bf73f5a85ee527838c27056facce6a4
https://github.com/okfn/ckan/commit/9063f7be8bf73f5a85ee527838c27056facce6a4
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2313] Remove deprecated facet_items helper.
Commit: 04a9fd7be98675eeb472e6695234c36cb2d6674a
https://github.com/okfn/ckan/commit/04a9fd7be98675eeb472e6695234c36cb2d6674a
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M ckan/templates/facets.html
M ckanext/publisher_form/templates/publisher_read.html
Log Message:
-----------
[#2313] Removed deprecated facet_sidebar() function
Commit: 2ec103a06bb19cd5c00c26e4dbdad4b424d23c51
https://github.com/okfn/ckan/commit/2ec103a06bb19cd5c00c26e4dbdad4b424d23c51
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M ckan/templates/facets.html
Log Message:
-----------
[#2313] Removed deprecated facet_list_items function
Commit: aaff2a1175a4ecb16c272378c8facfedd6a56412
https://github.com/okfn/ckan/commit/aaff2a1175a4ecb16c272378c8facfedd6a56412
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/logic/action/get.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#2313] Remove c.facets.
It's been deprecated by c.search_facets.
Commit: 73f839b31b0c17e97190c0ab01ae72b86d473249
https://github.com/okfn/ckan/commit/73f839b31b0c17e97190c0ab01ae72b86d473249
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-08 (Sun, 08 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2313] Add changes to changelog
Commit: a1e392f9a3fb89e54afafa339c12bb97134ca26e
https://github.com/okfn/ckan/commit/a1e392f9a3fb89e54afafa339c12bb97134ca26e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/templates/package/read.html
M ckan/tests/schema/test_schema.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
M doc/coding-standards.rst
A doc/release-cycle.rst
M doc/writing-extensions.rst
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 3a518547e18a1b9d2177db9243620272c58f3ba9
https://github.com/okfn/ckan/commit/3a518547e18a1b9d2177db9243620272c58f3ba9
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Fixes 2624, where tags were not saved with organization_dataset
Added tag_convert_string to the validators for the form_to_db_schema
so that it correctly converted the string to tags in the DB.
Commit: 4f32c46e50d2c9767faf6768ac013248d83d8d82
https://github.com/okfn/ckan/commit/4f32c46e50d2c9767faf6768ac013248d83d8d82
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
[#2624] Base organizations form_to_db_schema() off form_to_db_package_schema()
Commit: 5d13781be3f7834a178698ae53deaa3ff56bc071
https://github.com/okfn/ckan/commit/5d13781be3f7834a178698ae53deaa3ff56bc071
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Merge branch '2624-organization-tags'
Commit: 3bae84bd1352d4a2b9fe37579f7cfcf87fef49ab
https://github.com/okfn/ckan/commit/3bae84bd1352d4a2b9fe37579f7cfcf87fef49ab
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2634] add restricted template vars to change log
Commit: 167e38f846cbe10a5496b56137c98fbbe38efe8e
https://github.com/okfn/ckan/commit/167e38f846cbe10a5496b56137c98fbbe38efe8e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/api.py
M ckan/controllers/datastore.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/plugins.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/follower.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
M ckan/public/scripts/vendor/recline/recline.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/schema/test_schema.py
M ckan/tests/test_plugins.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/organizations/templates/organization_package_form.html
M ckanext/publisher_form/forms.py
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/test_tag_vocab_plugin.py
M doc/apiv3.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/datastore.rst
M doc/install-from-source.rst
A doc/release-cycle.rst
M doc/solr-setup.rst
M doc/test.rst
M doc/writing-extensions.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
M setup.py
Log Message:
-----------
Merge
Commit: b41b57c5fb686c76a6a1a1dd20df5a358b3c7a93
https://github.com/okfn/ckan/commit/b41b57c5fb686c76a6a1a1dd20df5a358b3c7a93
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#2632] check allowed helper functions exist
Commit: 9a072d30f89429e3913a7f4bca237a19aea202c8
https://github.com/okfn/ckan/commit/9a072d30f89429e3913a7f4bca237a19aea202c8
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Updated after dodgy merge
Commit: cab9e7ddb8efdae373c97fc8523063b3e60d5320
https://github.com/okfn/ckan/commit/cab9e7ddb8efdae373c97fc8523063b3e60d5320
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/templates/related/dashboard.html
Log Message:
-----------
Make sure that featured item checkbox is checked when filtered
Commit: f6da5124e79d5aad6c14b5e4451e5eae07fdac9e
https://github.com/okfn/ckan/commit/f6da5124e79d5aad6c14b5e4451e5eae07fdac9e
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/model/authz.py
Log Message:
-----------
Change default authorization settings
These are the new default authotization behaviours:
* Only logged in users are able to create datasets and upload files
* Only the user that created the dataset can edit it by default
NB: this will break a large number of test. They will be fixed on
following commits.
Commit: 2b0932a105d9c1292814b2afac4bf237a8db3008
https://github.com/okfn/ckan/commit/2b0932a105d9c1292814b2afac4bf237a8db3008
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2638] get_request_param() helper function
Commit: b55c85e4fbc975c4e46dad1c15151ede3f0a6b06
https://github.com/okfn/ckan/commit/b55c85e4fbc975c4e46dad1c15151ede3f0a6b06
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
Log Message:
-----------
Fix broken tests after default auth settings change
All tests involving non logged-in editing were failing, as this is no
longer allowed. The changes on auth settings basically mean than
everytime some editing is tested, a valid user with permissions on the
dataset must be provided, e.g.:
offset = url_for(controller='package', action='edit', id=myid)
self.app.get(offset,extra_environ={'REMOTE_USER': 'russianfan'})
or:
res = self.app.post('/api/action/resource_create', params=postparams,
extra_environ={'Authorization': api_key })
Commit: 0f0ed9837999396748955b35c9c3bc1991c8ae6f
https://github.com/okfn/ckan/commit/0f0ed9837999396748955b35c9c3bc1991c8ae6f
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
A ckan/public/scripts/vendor/moment/1.6.2/moment.js
A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
R ckan/public/scripts/vendor/recline/css/data-explorer.css
R ckan/public/scripts/vendor/recline/css/graph.css
R ckan/public/scripts/vendor/recline/css/grid.css
R ckan/public/scripts/vendor/recline/css/images/edit-map.png
R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
R ckan/public/scripts/vendor/recline/css/map.css
A ckan/public/scripts/vendor/recline/css/recline.css
M ckan/public/scripts/vendor/recline/recline.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
R ckan/public/scripts/vendor/slickgrid/images/actions.gif
R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
R ckan/public/scripts/vendor/slickgrid/images/down.gif
R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/expand.gif
R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/help.png
R ckan/public/scripts/vendor/slickgrid/images/info.gif
R ckan/public/scripts/vendor/slickgrid/images/listview.gif
R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
R ckan/public/scripts/vendor/slickgrid/images/stripes.png
R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
R ckan/public/scripts/vendor/slickgrid/images/tick.png
R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
R ckan/public/scripts/vendor/slickgrid/slick.grid.css
R ckan/public/scripts/vendor/slickgrid/slick.grid.js
Log Message:
-----------
Update and clean up libraries
Commit: 487362e26b1d37714d43ef1fdb9a948dd807b415
https://github.com/okfn/ckan/commit/487362e26b1d37714d43ef1fdb9a948dd807b415
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/templates/snippets/recline-extra-footer.html
M ckan/templates/snippets/recline-extra-header.html
Log Message:
-----------
Update Data explorer with new recline version
TODO: Header row border, hide fields control
Commit: ed816b643b979937d10ea0964dec0f043b5cc2a5
https://github.com/okfn/ckan/commit/ed816b643b979937d10ea0964dec0f043b5cc2a5
Author: amercader <amercadero at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M ckan/templates/package/resource_embedded_dataviewer.html
Log Message:
-----------
Use recline snippets on the embed template
Commit: 372028123af4fb7085c3ded497bff2b0b9f3c360
https://github.com/okfn/ckan/commit/372028123af4fb7085c3ded497bff2b0b9f3c360
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/templates/package/resource_embedded_dataviewer.html
M ckan/templates/snippets/recline-extra-header.html
Log Message:
-----------
Remove column headers border
Commit: 0cb37c6578fddddeda320af2ed3657af7a79a8fb
https://github.com/okfn/ckan/commit/0cb37c6578fddddeda320af2ed3657af7a79a8fb
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Hide Recline's fields control by default, as it messes up the layout
Commit: 3b0089ae7f82727b9bfe883f390b7de355976146
https://github.com/okfn/ckan/commit/3b0089ae7f82727b9bfe883f390b7de355976146
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/templates/package/resource_embedded_dataviewer.html
Log Message:
-----------
Hide side bar when embedding recline
Commit: 041d91b92390ac2e9e0ae4d6c3bdcba1e7ec42b6
https://github.com/okfn/ckan/commit/041d91b92390ac2e9e0ae4d6c3bdcba1e7ec42b6
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Remove calls to Backbone history
They were causing exceptions and don't seem to be longer in use
Commit: da1d10ca403ccfa0082e7664d402b09ccead2438
https://github.com/okfn/ckan/commit/da1d10ca403ccfa0082e7664d402b09ccead2438
Author: amercader <amercadero at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/vendor/recline/recline.js
Log Message:
-----------
Update recline build with slickgrid fix
Commit: 870f980c35792d0510de649c8db416795edd9008
https://github.com/okfn/ckan/commit/870f980c35792d0510de649c8db416795edd9008
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Fixed missing markdown on the resource read page.
Changed the read_resource method in package controller to generate the
notes from the dictionary and use the dataset notes if no resource
description is available
Commit: f07c75b3c0d0f0ed0909acf0482051cdfb8e5c3f
https://github.com/okfn/ckan/commit/f07c75b3c0d0f0ed0909acf0482051cdfb8e5c3f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: d57be835330f6dd2b1be27099148e0e3e7c83902
https://github.com/okfn/ckan/commit/d57be835330f6dd2b1be27099148e0e3e7c83902
Author: John Glover <glover.john at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge pull request #58 from okfn/2650-markdown-resource-description
Fixed missing markdown on the resource read page.
Commit: 737d8234ed654fd53e8422205bd23cd824961a0f
https://github.com/okfn/ckan/commit/737d8234ed654fd53e8422205bd23cd824961a0f
Author: John Glover <j at johnglover.net>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
Whitespace cleanup.
Commit: f417be9d35a2d3bd17da654a2c9f04f5cbba89d2
https://github.com/okfn/ckan/commit/f417be9d35a2d3bd17da654a2c9f04f5cbba89d2
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Add support for TSV files on dataproxy
Commit: 6d4452391e7fb8d9f728f8e9e0f21fef802d7c0f
https://github.com/okfn/ckan/commit/6d4452391e7fb8d9f728f8e9e0f21fef802d7c0f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 096a414efd3ef4fb6fc8c48635be12d0f4ee7e73
https://github.com/okfn/ckan/commit/096a414efd3ef4fb6fc8c48635be12d0f4ee7e73
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge branch '1387-fix-resource-urls'
Commit: fea646fc610c96ae9ff34d38a6dc4f8aa153f4e9
https://github.com/okfn/ckan/commit/fea646fc610c96ae9ff34d38a6dc4f8aa153f4e9
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2651] rival patch to keep controller clean
Commit: 16a689555807cd37a66c11340a0201de47ea8e07
https://github.com/okfn/ckan/commit/16a689555807cd37a66c11340a0201de47ea8e07
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-10 (Tue, 10 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
Merge branch '2651-rival-patch'
Commit: 66aa4f1587ec1d86864bd0ee419fbf4c216462d7
https://github.com/okfn/ckan/commit/66aa4f1587ec1d86864bd0ee419fbf4c216462d7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/public/scripts/application.js
M ckan/templates/package/resource_read.html
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckanext/organizations/forms.py
Log Message:
-----------
Merge branch 'master' into feature-2347-related-dashboard
Commit: f19278e68e8d3148421e97a4a5f034f1b8f94a3b
https://github.com/okfn/ckan/commit/f19278e68e8d3148421e97a4a5f034f1b8f94a3b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Stop the package controller from crashing when used at the root URL
If the root URL '/' was connected to the package controller (e.g. by an
IRoutes plugin) _guess_package_type() would crash. Add a special case to
avoid the crash.
Commit: 8dfbf0d02b070a5a99f75e039eab6a3bf03b006f
https://github.com/okfn/ckan/commit/8dfbf0d02b070a5a99f75e039eab6a3bf03b006f
Author: kindly <kindly at gmail.com>
Date: 2012-07-11 (Wed, 11 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge pull request #63 from okfn/feature-allow-package-controller-at-root-url
Stop the package controller from crashing when used at the root URL
Commit: 316f6615a0ee5e4da2e2341c98955d7e99da042c
https://github.com/okfn/ckan/commit/316f6615a0ee5e4da2e2341c98955d7e99da042c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 506f5a11a76c37c3461a1a505648c9d1db6ec55b
https://github.com/okfn/ckan/commit/506f5a11a76c37c3461a1a505648c9d1db6ec55b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge pull request #49 from okfn/2362-toolkit-doc-part1
Docs generate fine.
Commit: 6419864302da0107859d161125fc0535d50c4898
https://github.com/okfn/ckan/commit/6419864302da0107859d161125fc0535d50c4898
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 255c5b62dfb26e41f90208a705d9bb5bccc733da
https://github.com/okfn/ckan/commit/255c5b62dfb26e41f90208a705d9bb5bccc733da
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Merge pull request #52 from okfn/2634-changelog-update
[#2634] add restricted template vars to change log
Commit: 26c7265dbb840a8e9bb5e0772049b375475df5e7
https://github.com/okfn/ckan/commit/26c7265dbb840a8e9bb5e0772049b375475df5e7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: d3056214fbc7e62e0c0e51a907403f86af75491e
https://github.com/okfn/ckan/commit/d3056214fbc7e62e0c0e51a907403f86af75491e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[2632] Fix for missing list item with remove
Commit: f2725f39a1b08e53a0310b8c69ed7d5296484764
https://github.com/okfn/ckan/commit/f2725f39a1b08e53a0310b8c69ed7d5296484764
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge pull request #53 from okfn/2632-check-allowed-helper-functions-exist
[#2632] check allowed helper functions exist
Small fix to check presence before list removal
Commit: 60a3194574cfb5c7200958890e24c24354579e33
https://github.com/okfn/ckan/commit/60a3194574cfb5c7200958890e24c24354579e33
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: a149644aa8e4933eb69aac9e37d4e8d6c20ed780
https://github.com/okfn/ckan/commit/a149644aa8e4933eb69aac9e37d4e8d6c20ed780
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/logic/action/get.py
Log Message:
-----------
[#2313] Revert removal of c.facets.
Instead mark it for deprecation in 1.9
Commit: 8127e208caad9cbbdb3f539cf42502ff5b5af292
https://github.com/okfn/ckan/commit/8127e208caad9cbbdb3f539cf42502ff5b5af292
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2313] Remove facet_items from allowed_functions
Commit: b7d224dec412bc4bba7a2c300051a3e7293ae9ce
https://github.com/okfn/ckan/commit/b7d224dec412bc4bba7a2c300051a3e7293ae9ce
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/public/scripts/application.js
M ckan/templates/group/read.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/schema/test_schema.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
M doc/apiv3.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/index.rst
A doc/release-cycle.rst
A doc/toolkit.rst
M doc/writing-extensions.rst
M pip-requirements.txt
M setup.py
Log Message:
-----------
Merge
Commit: ddda213155cb01d97a85758e467302f4c11a4593
https://github.com/okfn/ckan/commit/ddda213155cb01d97a85758e467302f4c11a4593
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/model/authz.py
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
Log Message:
-----------
Merge branch '2388-out-of-the-box-auth-settings'
Commit: 6d257fc5298e4e3d5bf56c6e16fb6c9d7ee6eed1
https://github.com/okfn/ckan/commit/6d257fc5298e4e3d5bf56c6e16fb6c9d7ee6eed1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/maintain.py
Log Message:
-----------
[#2313] Log warning when c.facets is accessed.
Using a new `deprecate_context_item` function in `ckan.lib.maintain`, which
intercepts access to a named attribute on the context by attaching a property
to the underlying storage of the gloal context object.
Commit: a1820d72c356af916b5deabdcc5ac12901e5e9dc
https://github.com/okfn/ckan/commit/a1820d72c356af916b5deabdcc5ac12901e5e9dc
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Log Message:
-----------
Merge from branch
Commit: d051006817f7ff73b51cf0ea797adb9d767da0b5
https://github.com/okfn/ckan/commit/d051006817f7ff73b51cf0ea797adb9d767da0b5
Author: amercader <amercadero at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
[#1678] Fix check when ckan.plugins line is missing in ini file
Commit: 6daf3bfe100470b383b95a4b1e23b9d292e3ef3c
https://github.com/okfn/ckan/commit/6daf3bfe100470b383b95a4b1e23b9d292e3ef3c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch '1678-sync-search-by-default' of https://github.com/okfn/ckan into 1678-sync-search-by-default
Commit: cf36baf0be788fd8f366ffeb6e086737f14e2f20
https://github.com/okfn/ckan/commit/cf36baf0be788fd8f366ffeb6e086737f14e2f20
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
Merge branch '1678-sync-search-by-default'
Commit: 7338fcecca41c1f0ac2ce39bacd53377e0847657
https://github.com/okfn/ckan/commit/7338fcecca41c1f0ac2ce39bacd53377e0847657
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/model/authz.py
M ckan/public/scripts/application.js
M ckan/templates/package/resource_read.html
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge from master
Commit: d64de51eceef62f2f742ca260996b5648f3dd4ea
https://github.com/okfn/ckan/commit/d64de51eceef62f2f742ca260996b5648f3dd4ea
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch '2368-get-request-param-helper'
Commit: 44377670b65b613551ef5219f3aba06cd93e89ba
https://github.com/okfn/ckan/commit/44377670b65b613551ef5219f3aba06cd93e89ba
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-12 (Thu, 12 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Fix a typo in a helper function
Commit: b66f54032a0f02fe3f80de9b60b87e3623347785
https://github.com/okfn/ckan/commit/b66f54032a0f02fe3f80de9b60b87e3623347785
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/templates/layout_base.html
A ckan/templates/snippets/internal-tracking.html
Log Message:
-----------
[misc] move internal tracking code into a snippet
Commit: d09d24dc519ab792d2bfa3879db4b45ca421ed63
https://github.com/okfn/ckan/commit/d09d24dc519ab792d2bfa3879db4b45ca421ed63
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
Log Message:
-----------
[#2672] Pass in passive=True to Session.is_modified()
See [1] for details.
[1] http://docs.sqlalchemy.org/en/rel_0_7/orm/session.html?highlight=is_modified#sqlalchemy.orm.session.Session.is_modified
Commit: e1f0ec35cdad3ba5dd5d3339e1b2a10e59d29193
https://github.com/okfn/ckan/commit/e1f0ec35cdad3ba5dd5d3339e1b2a10e59d29193
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
[#2671] allow delete on partial update
Commit: a76d62f94c334417985d60c16d9dad2048278f64
https://github.com/okfn/ckan/commit/a76d62f94c334417985d60c16d9dad2048278f64
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
[#2671] fix tests that were affectedw
Commit: 8cdd9bd769e2c6ea8f2a1b01f75203beef99e81f
https://github.com/okfn/ckan/commit/8cdd9bd769e2c6ea8f2a1b01f75203beef99e81f
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-13 (Fri, 13 Jul 2012)
Changed paths:
M ckan/lib/navl/dictization_functions.py
Log Message:
-----------
[#2671] add ckan.fix_partial_updates config option
Commit: 5310639f20dd369caa4f809f54a536856528822e
https://github.com/okfn/ckan/commit/5310639f20dd369caa4f809f54a536856528822e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 62842b71dd4f34145f4057569bae3643ad800a44
https://github.com/okfn/ckan/commit/62842b71dd4f34145f4057569bae3643ad800a44
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Update to fix the group.get_children_groups call which was returning
deleted items.
Commit: 46c514ea18ef74f84ddf71bb0676d77e12059c00
https://github.com/okfn/ckan/commit/46c514ea18ef74f84ddf71bb0676d77e12059c00
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
PEP8
Commit: 5739818a528bb16748f67b6d57a16f575ae78144
https://github.com/okfn/ckan/commit/5739818a528bb16748f67b6d57a16f575ae78144
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Fix tracking of dataset views
It was counting each view twice, this fixes it to count each view once
Commit: 3cbe0682151ed1da613b30c0d45cb4bdfa5dabac
https://github.com/okfn/ckan/commit/3cbe0682151ed1da613b30c0d45cb4bdfa5dabac
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into internal-tracking-cleanup
Commit: 2d4cb0bebb8474e7d6706f4b6247780cdc7afb91
https://github.com/okfn/ckan/commit/2d4cb0bebb8474e7d6706f4b6247780cdc7afb91
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge pull request #69 from okfn/2670-get-children-groups-defect
2670 get children groups defect
Commit: 8d27f7219f674af37112691c7d0fca783f161e63
https://github.com/okfn/ckan/commit/8d27f7219f674af37112691c7d0fca783f161e63
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: a7c9d3ceca0650ca84fe643861ffdcba11b9dd8c
https://github.com/okfn/ckan/commit/a7c9d3ceca0650ca84fe643861ffdcba11b9dd8c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/model/group.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge branch 'master' into internal-tracking-cleanup
Commit: d144fce26505402d20a443e3a083bf980719026b
https://github.com/okfn/ckan/commit/d144fce26505402d20a443e3a083bf980719026b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/templates/layout_base.html
A ckan/templates/snippets/internal-tracking.html
Log Message:
-----------
Merge branch 'internal-tracking-cleanup'
Commit: 523c8f49ee361cc17e291538adb465444d100afd
https://github.com/okfn/ckan/commit/523c8f49ee361cc17e291538adb465444d100afd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[#2347] Fix race condition on updating the related view_count.
Commit: 0f2d99de74201717bb77d6542c4b7da56aa5a373
https://github.com/okfn/ckan/commit/0f2d99de74201717bb77d6542c4b7da56aa5a373
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Don't leave user in limbo if they change their username
Commit: 0f785050ee39200f090b1ea3e3f00841ab7f79a8
https://github.com/okfn/ckan/commit/0f785050ee39200f090b1ea3e3f00841ab7f79a8
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
PEP8ification
Commit: 0a321150b372ec5620cf8de69d18bb1e6e56a5cb
https://github.com/okfn/ckan/commit/0a321150b372ec5620cf8de69d18bb1e6e56a5cb
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
Fix for tests failing in admin due to not loading repoze in test
Commit: e4fec4ce1dd8eb2abd25c9235a29ff33cb825be6
https://github.com/okfn/ckan/commit/e4fec4ce1dd8eb2abd25c9235a29ff33cb825be6
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
Log Message:
-----------
Fix exception when querying and a SolrException occurs, due to not importing it in correct place.
Commit: cd10dc43c4b26637e514aabfc4802f8dd75c5640
https://github.com/okfn/ckan/commit/cd10dc43c4b26637e514aabfc4802f8dd75c5640
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Add cli param to allow options to be passed to celery daemon (e.g. concurrency limit).
Commit: 08f14618fa4b06597e3bb6cd1b2746d532e2e6c8
https://github.com/okfn/ckan/commit/08f14618fa4b06597e3bb6cd1b2746d532e2e6c8
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge conflict
Commit: c69b08ae548aa957c898db54dd1bd9ed4bfe41e9
https://github.com/okfn/ckan/commit/c69b08ae548aa957c898db54dd1bd9ed4bfe41e9
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/controllers/revision.py
Log Message:
-----------
Cope with bad revisions being created. To find the problem at source too, but in the mean-time cope.
Commit: 4009298f680ece66a5d8c6f784a35e63cc11d1ab
https://github.com/okfn/ckan/commit/4009298f680ece66a5d8c6f784a35e63cc11d1ab
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/new_authz.py
Log Message:
-----------
Merge conflicts with cherry-pick
Commit: 5644ddd24b2d5d9a170a518a7b9cac2915d419d5
https://github.com/okfn/ckan/commit/5644ddd24b2d5d9a170a518a7b9cac2915d419d5
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/navl/dictization_functions.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Changed debug to show post validation version of the data - more useful.
Commit: 9568c7794957b40021eb8636b47f06c0094b1586
https://github.com/okfn/ckan/commit/9568c7794957b40021eb8636b47f06c0094b1586
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Added some useful feedback from these CLI functions.
Commit: 3c313968a098413bcf7c92f848693a4149b5280f
https://github.com/okfn/ckan/commit/3c313968a098413bcf7c92f848693a4149b5280f
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
Merge conflict
Commit: 0ec482d2b41e30f91ed136d0ef48c797e746d260
https://github.com/okfn/ckan/commit/0ec482d2b41e30f91ed136d0ef48c797e746d260
Author: David Read <david.read at hackneyworkshop.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/logic/auth/publisher/get.py
M ckan/tests/functional/test_publisher_auth.py
Log Message:
-----------
[#2668] Sysadmin gets permission to view a deleted publisher.
Commit: 70dfc9f7fc0a70a525551659034b9eb8959f547a
https://github.com/okfn/ckan/commit/70dfc9f7fc0a70a525551659034b9eb8959f547a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-16 (Mon, 16 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
Fixes from broken merge
Commit: c8041d27e0fe39b310ad09e8bd64ef9da73d4a7e
https://github.com/okfn/ckan/commit/c8041d27e0fe39b310ad09e8bd64ef9da73d4a7e
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/lib/plugins.py
M ckan/model/related.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
[#2347] Improve lookup of related-items count.
Rather than pulling out all the related items of a dataset in order to count
them; run a COUNT() sql-statement.
Commit: 8b7adcabd23f5d376c5693ebd043cbc0ceaa27cc
https://github.com/okfn/ckan/commit/8b7adcabd23f5d376c5693ebd043cbc0ceaa27cc
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#2347] Dictize the related items in user_dictize.
Commit: 15f32dd1e8166e448151d123be1fb5aabca7c290
https://github.com/okfn/ckan/commit/15f32dd1e8166e448151d123be1fb5aabca7c290
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/templates/activity_streams/new_related_item.html
Log Message:
-----------
[#2347] Correct rendering of new related item in activity stream.
Commit: a17c5f496a5ae915de8b51b8ff4eeb0847fca947
https://github.com/okfn/ckan/commit/a17c5f496a5ae915de8b51b8ff4eeb0847fca947
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Fixed bare excepts
Commit: 72321fbc0859692b3af920bebca54d012233f33e
https://github.com/okfn/ckan/commit/72321fbc0859692b3af920bebca54d012233f33e
Author: kindly <kindly at gmail.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
Log Message:
-----------
Merge pull request #66 from okfn/2672-is_modifed-passive-should-be-true
[#2672] Pass in passive=True to Session.is_modified()
Commit: 171e20f5a74951c3452941168d3605bc8e1d92cc
https://github.com/okfn/ckan/commit/171e20f5a74951c3452941168d3605bc8e1d92cc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix IGroupForm's setup_template_variables() not being called
Call setup_template_variables() methods of IGroupForm plugins when
creating new groups.
Commit: 2e84da4caa626091863d561d960309de0ac163e1
https://github.com/okfn/ckan/commit/2e84da4caa626091863d561d960309de0ac163e1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
Fix for IGroupForm's form_to_db_schema() not being used when creating datasets
The schemas from form_to_db_schema() methods of IGroupForm plugins were
not being used when creating groups, fix the code so that they are used.
Commit: e9b4f65c4014ce40029f60d643c02e7d6cf832c2
https://github.com/okfn/ckan/commit/e9b4f65c4014ce40029f60d643c02e7d6cf832c2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Fix data dicts not being validated by group_show
group_show() was validating data_dicts but then returning the
unvalidated dict not the validated one. Looks like a copy-paste mistake.
Fix so that the validated dict is returned.
Commit: 8ed099b25ff529639d85d8de9e76815285b98e06
https://github.com/okfn/ckan/commit/8ed099b25ff529639d85d8de9e76815285b98e06
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-17 (Tue, 17 Jul 2012)
Changed paths:
M ckan/lib/base.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/model/meta.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 952f28b659aa297cdeaf12d4512da6532cf1c591
https://github.com/okfn/ckan/commit/952f28b659aa297cdeaf12d4512da6532cf1c591
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Fix 500 error on viewing a group with a custom group schema
display_name was missing from group_form_schema() so if an IGroupForm
plugin with a custom db_to_form_schema() for groups was in use, the
group read template would crash with a 500. Add display_name to the
schema so that the template renders successfully.
Commit: 2893c0ca570bd33849dbc5332e5cbf4ebf8f91c2
https://github.com/okfn/ckan/commit/2893c0ca570bd33849dbc5332e5cbf4ebf8f91c2
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
M ckan/templates/package/new_package_form.html
Log Message:
-----------
auto summary in validationError
Commit: a948489e1c832c72ebed240bcb2cbe8abb420581
https://github.com/okfn/ckan/commit/a948489e1c832c72ebed240bcb2cbe8abb420581
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
ValidationError more cleanups
Commit: 54179fd0bd54a446df62db0a403dd4c31562ef11
https://github.com/okfn/ckan/commit/54179fd0bd54a446df62db0a403dd4c31562ef11
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/templates/package/new_package_form.html
Log Message:
-----------
remove idiotic commit
Commit: 76891f4d22073a994301d76ec27e31b224b03aad
https://github.com/okfn/ckan/commit/76891f4d22073a994301d76ec27e31b224b03aad
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
fix some other silly lines
Commit: 599083ed2b3856b7e9471c7fb62827fd7c9d17c7
https://github.com/okfn/ckan/commit/599083ed2b3856b7e9471c7fb62827fd7c9d17c7
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-18 (Wed, 18 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
Log Message:
-----------
clean the validation errors in logic action
Commit: e2be9b1f2170723208142882eb9ed7106d1051be
https://github.com/okfn/ckan/commit/e2be9b1f2170723208142882eb9ed7106d1051be
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-19 (Thu, 19 Jul 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/base.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_save.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/model/meta.py
M ckan/templates/user/edit_user_form.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 5f07038a6cb47f979b56faf87857504064780e06
https://github.com/okfn/ckan/commit/5f07038a6cb47f979b56faf87857504064780e06
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Log Message:
-----------
Merge branch 'master' into nicer-validation-errors
Commit: cec57f36094327611ff9bc8935c061a61ca3e961
https://github.com/okfn/ckan/commit/cec57f36094327611ff9bc8935c061a61ca3e961
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/public/base/javascript/modules/api-info.js
M ckan/templates/ajax_snippets/api_info.html
A ckan/templates/package/resource_api_data.html
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#2710] first stab at cleaner api info page
Commit: e7db091942c085d51765dbbdf4a85b785df7174d
https://github.com/okfn/ckan/commit/e7db091942c085d51765dbbdf4a85b785df7174d
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
fix for failing tests
Commit: d7b8c63ec4e0b8aa3001c3dbdb2f86a655460268
https://github.com/okfn/ckan/commit/d7b8c63ec4e0b8aa3001c3dbdb2f86a655460268
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
Merge branch 'nicer-validation-errors' of https://github.com/okfn/ckan into nicer-validation-errors
Commit: bd76c51a9b37104b43f5fb8de83bce3055d54e9c
https://github.com/okfn/ckan/commit/bd76c51a9b37104b43f5fb8de83bce3055d54e9c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
Log Message:
-----------
Merge branch 'nicer-validation-errors'
Commit: 7c8d45062b60d72bdbc3522341ea109abdbcee39
https://github.com/okfn/ckan/commit/7c8d45062b60d72bdbc3522341ea109abdbcee39
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
clean up the concurrency option too stop passing other args
Commit: 7e28eed0fdb951645454990b794dac1b117b1403
https://github.com/okfn/ckan/commit/7e28eed0fdb951645454990b794dac1b117b1403
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-20 (Fri, 20 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
remove unused import
Commit: 46b652c69464c932cac6f677a4ba5d3775bd99c9
https://github.com/okfn/ckan/commit/46b652c69464c932cac6f677a4ba5d3775bd99c9
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
pep8 fixes for from dgu branch cli changes
Commit: 3a4231dd73a3de34ff9cd01b403a9010c31502ba
https://github.com/okfn/ckan/commit/3a4231dd73a3de34ff9cd01b403a9010c31502ba
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Merge pull request #70 from okfn/defects-from-dgu
Defects from dgu
Commit: 5f810ca0236a52b12607621346f40495b0cc607f
https://github.com/okfn/ckan/commit/5f810ca0236a52b12607621346f40495b0cc607f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/new_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/models/test_user.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 52f0efda25361aebc99db818c5b8322d767ab2ec
https://github.com/okfn/ckan/commit/52f0efda25361aebc99db818c5b8322d767ab2ec
Author: kindly <kindly at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/test_revision.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_resource.py
Log Message:
-----------
[1345] remove all signs of vdm doing state management on resources. This commit also removes a lot of old form code that was not worth maintaining.
Commit: a3d61b03e084181f290e631fce6819b67abb5d2d
https://github.com/okfn/ckan/commit/a3d61b03e084181f290e631fce6819b67abb5d2d
Author: kindly <kindly at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/model/authz.py
Log Message:
-----------
[1345] remove global cache turn to weakref
Commit: 3ee86db592d5717ac426b46b91f16c4bc3efc51a
https://github.com/okfn/ckan/commit/3ee86db592d5717ac426b46b91f16c4bc3efc51a
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M ckan/model/license.py
Log Message:
-----------
[#2575] fix license title translation
Commit: 7fdc13f62ebea806ea14473d5d0e822ffe8fa757
https://github.com/okfn/ckan/commit/7fdc13f62ebea806ea14473d5d0e822ffe8fa757
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/schema.py
M ckan/model/authz.py
M ckan/model/group.py
M ckan/model/meta.py
M ckan/new_authz.py
M ckan/public/scripts/application.js
M ckan/templates/layout_base.html
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/internal-tracking.html
M ckan/templates/user/edit_user_form.html
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
M ckan/tests/models/test_user.py
M ckanext/organizations/forms.py
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge branch 'master' into 2313-deprecate-old-facet-data-structures-and-related-functions
Commit: 1a5712d33cc400ab2c7eb4f37ada453753c7bb9e
https://github.com/okfn/ckan/commit/1a5712d33cc400ab2c7eb4f37ada453753c7bb9e
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-23 (Mon, 23 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/lib/maintain.py
M ckan/logic/action/get.py
M ckan/templates/facets.html
M ckan/tests/logic/test_action.py
M ckanext/publisher_form/templates/publisher_read.html
Log Message:
-----------
Merge branch '2313-deprecate-old-facet-data-structures-and-related-functions'
Commit: 7a4fb0d462983c7f69c9157952b88e42d675dae8
https://github.com/okfn/ckan/commit/7a4fb0d462983c7f69c9157952b88e42d675dae8
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/templates/header.html
Log Message:
-----------
[#2302] show logo if defined else ckan one
Commit: 50f0a57561b587437944b69a557531a7a48e4e67
https://github.com/okfn/ckan/commit/50f0a57561b587437944b69a557531a7a48e4e67
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/templates/base.html
Log Message:
-----------
[#2302] set main_css via the global config
Commit: f6feb1e32e19a51dcdd9858be203c06e21b939b9
https://github.com/okfn/ckan/commit/f6feb1e32e19a51dcdd9858be203c06e21b939b9
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
A ckan/public/base/css/fuchsia.css
A ckan/public/base/css/green.css
A ckan/public/base/css/red.css
Log Message:
-----------
[#2302] add some new style sheets
Commit: 61fbf7f744c1f6ced9b86eadc8707943fa07542c
https://github.com/okfn/ckan/commit/61fbf7f744c1f6ced9b86eadc8707943fa07542c
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] make css link absolute
Commit: 119ebb5db95e40aa230b6e9ebe87c7ee6c05d974
https://github.com/okfn/ckan/commit/119ebb5db95e40aa230b6e9ebe87c7ee6c05d974
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/lib/helpers.py
M ckan/lib/maintain.py
M ckan/logic/action/get.py
M ckan/templates/facets.html
M ckan/tests/logic/test_action.py
M ckanext/publisher_form/templates/publisher_read.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: dbc8766fd20ccc4ff627d6a11604694674e7eb77
https://github.com/okfn/ckan/commit/dbc8766fd20ccc4ff627d6a11604694674e7eb77
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M LICENSE.txt
Log Message:
-----------
[#2693] Update requirements files in LICENSE.txt
Commit: 3e0de2715b93c9f6c243cdf589f7697e36fd35f5
https://github.com/okfn/ckan/commit/3e0de2715b93c9f6c243cdf589f7697e36fd35f5
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M LICENSE.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 61add9bf6c9530b01c5fddc3062a03a8b5fd2f1f
https://github.com/okfn/ckan/commit/61add9bf6c9530b01c5fddc3062a03a8b5fd2f1f
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/model/license.py
Log Message:
-----------
Merge branch '2575-license-i18n'
Commit: b31109b628a21072ec0c2dec2a5d5a1c2cc0ed9c
https://github.com/okfn/ckan/commit/b31109b628a21072ec0c2dec2a5d5a1c2cc0ed9c
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M doc/coding-standards.rst
A doc/frontend-development.rst
M doc/install-from-source.rst
Log Message:
-----------
[#2375] Add some front end documentation
Commit: 40b6cca0a9dd7e6e55819d60c24532cedec3df85
https://github.com/okfn/ckan/commit/40b6cca0a9dd7e6e55819d60c24532cedec3df85
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Fix double counting of dataset and resource views
Recent dataset views and total and recent resource views were being
double counted by CKAN's internal page view tracking, fix so that each
page view is counted only once (double-counting of total dataset page
views was already fixed by a previous commit)
Commit: f5043a29067898061176ca5e64032fd4de9718f3
https://github.com/okfn/ckan/commit/f5043a29067898061176ca5e64032fd4de9718f3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Don't insert quotation chars into strings when dictizing extras
Commit: 37e02618b4761eb42ab95b815416802b0a796cce
https://github.com/okfn/ckan/commit/37e02618b4761eb42ab95b815416802b0a796cce
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
Added support for specifying the sort direction
Previously we only allowed the sort direction to be asc for groups names
and desc for packages (package counts). Now users can specify a sort_direction
to have a little more control.
Commit: b4e5cecbc6b340d7615775cc350bafefa5e47c19
https://github.com/okfn/ckan/commit/b4e5cecbc6b340d7615775cc350bafefa5e47c19
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/functional/test_group.py
Log Message:
-----------
change group_list sorting to use sort
Commit: 9472a94327c20333303810fbac90d2f4ca97eba0
https://github.com/okfn/ckan/commit/9472a94327c20333303810fbac90d2f4ca97eba0
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
Log Message:
-----------
[#2744] Give the text in the select boxes breathing room
Commit: bc5577740cee2fa8ec6dcb053ba06765bbda3c54
https://github.com/okfn/ckan/commit/bc5577740cee2fa8ec6dcb053ba06765bbda3c54
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/footer.less
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
[#2375] Update the language snippet to use select2
Commit: 8cb4e57ac66202646c62b3752de3227c4ff8f178
https://github.com/okfn/ckan/commit/8cb4e57ac66202646c62b3752de3227c4ff8f178
Author: amercader <amercadero at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/model/authz.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/test_revision.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/models/test_package.py
M ckan/tests/models/test_resource.py
Log Message:
-----------
Merge branch 'defect-1345-memory-leak'
Commit: 7fd115f63f7e275d017af8b3881c242b10054dd7
https://github.com/okfn/ckan/commit/7fd115f63f7e275d017af8b3881c242b10054dd7
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/tests/functional/test_related.py
Log Message:
-----------
[#2347] Move authorization check out of related_create action
and into corresponding auth function.
Commit: 1a743abeffa5cfb1c9b1b39a0f437b8f1b65cf1b
https://github.com/okfn/ckan/commit/1a743abeffa5cfb1c9b1b39a0f437b8f1b65cf1b
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M CHANGELOG.txt
M LICENSE.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/maintain.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/schema.py
M ckan/model/authz.py
M ckan/model/group.py
M ckan/model/license.py
M ckan/model/meta.py
M ckan/new_authz.py
M ckan/public/scripts/application.js
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/internal-tracking.html
M ckan/templates_legacy/facets.html
M ckan/templates_legacy/layout_base.html
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
M ckan/tests/models/test_user.py
M ckanext/organizations/forms.py
M ckanext/publisher_form/templates/publisher_read.html
M doc/index.rst
A doc/toolkit.rst
Log Message:
-----------
Merge branch 'master' into 2375-demo-theme-development
Conflicts:
ckan/controllers/home.py
index() c.facets deprecated in master and c.facet_titles from demo branch
ckan/lib/base.py
minor merge differences passing renderer parameter
ckan/lib/dictization/model_dictize.py
format fixes and url corrections in resource dictize merged
ckan/lib/helpers.py
new functions in both branches plus one removed from master
ckan/logic/__init__.py
better tag error handeling from master
ckan/templates/package/resource_read.html
ckan/templates/user/edit_user_form.html
templates have changed
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: e58aa57143fd2094ce29dad80945fc1727be5d21
https://github.com/okfn/ckan/commit/e58aa57143fd2094ce29dad80945fc1727be5d21
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
Merge branch '2375-demo-theme-development' of github.com:okfn/ckan into 2375-demo-theme-development
Commit: 5c1a319edeec11590d2944438e1f728bc8d6baad
https://github.com/okfn/ckan/commit/5c1a319edeec11590d2944438e1f728bc8d6baad
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/package/new_resource.html
Log Message:
-----------
[#2747] fix breadcrumb in new resource
Commit: 4dcbb385eeae0797f631f470b960eec83641e795
https://github.com/okfn/ckan/commit/4dcbb385eeae0797f631f470b960eec83641e795
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/package/new_resource.html
Log Message:
-----------
[#2375] broken title fix
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: 14b6c1f37cd43fc28dfaffea234e2a94a33482cc
https://github.com/okfn/ckan/commit/14b6c1f37cd43fc28dfaffea234e2a94a33482cc
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/javascript/client.js
M ckan/public/base/test/spec/client.spec.js
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
[#2375] Add ability to autocomplete packages
As a test this has been implemented on the edit group form.
Commit: 36e30adb240e897be50c7e3165cb43e575519304
https://github.com/okfn/ckan/commit/36e30adb240e897be50c7e3165cb43e575519304
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
re-add comment lost in merge
Commit: 80155bf1901ca7682a82a39ee88e129291348285
https://github.com/okfn/ckan/commit/80155bf1901ca7682a82a39ee88e129291348285
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/plugins.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/auth/publisher/delete.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/059_add_related_count_and_flag.py
M ckan/model/related.py
R ckan/templates/_snippet/add-related.html
M ckan/templates/_util.html
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/package/layout.html
R ckan/templates/package/related_list.html
A ckan/templates/related/add-related.html
A ckan/templates/related/dashboard.html
A ckan/templates/related/related_list.html
M ckan/templates/user/read.html
M ckan/tests/functional/test_related.py
A doc/apps-ideas.rst
M doc/configuration.rst
M doc/index.rst
Log Message:
-----------
Merge branch 'feature-2347-related-dashboard'
Commit: 1b41a9bc8ce7f0d77a5e2eb5ab2c44f44a61afc5
https://github.com/okfn/ckan/commit/1b41a9bc8ce7f0d77a5e2eb5ab2c44f44a61afc5
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/media.less
M ckan/templates/user/list.html
Log Message:
-----------
[#2720] Add padding around gravatars on user listing
Commit: 1a42b471d3daa23401898efa8c4f8f8f57d02d97
https://github.com/okfn/ckan/commit/1a42b471d3daa23401898efa8c4f8f8f57d02d97
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
[#2375] Pull in config extras from ini file into base.html
Commit: eca4c9e83f007ff290e3a1ff503e9b0e852faf2d
https://github.com/okfn/ckan/commit/eca4c9e83f007ff290e3a1ff503e9b0e852faf2d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/javascript/main.js
M ckan/templates/base.html
Log Message:
-----------
[#2375] Add some missing functionality from the config file
* Favicon is now loaded from the config file
* The "ckan.template_head_end" option is included
* The "ckan.template_footer_end" option is included
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: 58394b686ae33272f08d172e2fd69e93415a4cbf
https://github.com/okfn/ckan/commit/58394b686ae33272f08d172e2fd69e93415a4cbf
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
[#2375] Fix undefined config options in the base.html file
Commit: 3e120730d2949d7b8bab404dd7c9652214a92178
https://github.com/okfn/ckan/commit/3e120730d2949d7b8bab404dd7c9652214a92178
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/main.js
M ckan/public/base/test/spec/client.spec.js
Log Message:
-----------
[#2375] Add support for alternative API endpoints to Client
Commit: 159815afddfecd46c20b69fb5bdff5675658430c
https://github.com/okfn/ckan/commit/159815afddfecd46c20b69fb5bdff5675658430c
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2752] highlight groups main nav link on group index
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: d41af4ce1bf77d2a9c23146b910a5810cf1c2048
https://github.com/okfn/ckan/commit/d41af4ce1bf77d2a9c23146b910a5810cf1c2048
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/package/new_resource.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1553] Do not show upload when not logged in
Previously the upload form would be displayed when the user was
creating a dataset and not logged in. This would cause the upload
to fail. Instead we now remove the field.
Commit: b55a3513cbcaca63a8580f4bd9cc08850416f041
https://github.com/okfn/ckan/commit/b55a3513cbcaca63a8580f4bd9cc08850416f041
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2375] Tweak truncation in resource_read.html
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: 3ba5d03fadc741bf46edd7f1e14de14c36e00410
https://github.com/okfn/ckan/commit/3ba5d03fadc741bf46edd7f1e14de14c36e00410
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] get link class rules to use common code
Commit: e03c1e1feff44739b4e1cbd155b4277c56d94b54
https://github.com/okfn/ckan/commit/e03c1e1feff44739b4e1cbd155b4277c56d94b54
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/user/list.html
M ckan/templates/user/read.html
Log Message:
-----------
[#2753] fix user breadcrumbs
Commit: 19de45dc50f923e3fd0e2a9177086d0a8a58692c
https://github.com/okfn/ckan/commit/19de45dc50f923e3fd0e2a9177086d0a8a58692c
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/package/read.html
M ckan/templates/snippets/related.html
Log Message:
-----------
[#2754] add plus icons on dataset read
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: eade4e38823cca329279e39a3719c98e58c2c0e3
https://github.com/okfn/ckan/commit/eade4e38823cca329279e39a3719c98e58c2c0e3
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
[#2267] Add generator metatag in the head
This can be removed by overriding the meta_generator block:
{% block meta_generator %}{% endblock %}
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: 27af57083be66d2ae3c49a64a37dca0420d5c426
https://github.com/okfn/ckan/commit/27af57083be66d2ae3c49a64a37dca0420d5c426
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/package/base_form_page.html
M ckan/templates/package/new.html
Log Message:
-----------
[#2749] Fix title inheritance in dataset form
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: c7a2bcb80923ddf871097fef9245c76f852f8aa2
https://github.com/okfn/ckan/commit/c7a2bcb80923ddf871097fef9245c76f852f8aa2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/public/base/javascript/modules/api-info.js
M ckan/templates/ajax_snippets/api_info.html
M ckan/templates/package/resource_api_data.html
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#2710] Improve the display of the resource API info
* No longer add classes in the JavaScript.
* Add options to the api_info snippet.
* Normalise the variable names for the templates.
Commit: a8cebfd949e5bbf46c3a229fb313d7dc09db7067
https://github.com/okfn/ckan/commit/a8cebfd949e5bbf46c3a229fb313d7dc09db7067
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/javascript/modules/api-info.js
Log Message:
-----------
[#2710] Move api strings to the i18n object
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: 2464121a6464296a57c537722ff9528c7a3e4186
https://github.com/okfn/ckan/commit/2464121a6464296a57c537722ff9528c7a3e4186
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/public/base/javascript/modules/api-info.js
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2710] Documented the api-info module
Commit: ade150f9b98e153f7e52b8fb362fc1ae2765127e
https://github.com/okfn/ckan/commit/ade150f9b98e153f7e52b8fb362fc1ae2765127e
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2710] Remove debugging logic...
Commit: 65fc06ca8709767319530b8cfc67847bff781fe0
https://github.com/okfn/ckan/commit/65fc06ca8709767319530b8cfc67847bff781fe0
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] css setting minor refactor
Commit: 5e105cc99fa3bbe024116e5e264f9580c53b0ccf
https://github.com/okfn/ckan/commit/5e105cc99fa3bbe024116e5e264f9580c53b0ccf
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#2302] General clean-up ofadmin controller
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: 032b9ac4e38e27500784025d07e4fcdb61c4cfc6
https://github.com/okfn/ckan/commit/032b9ac4e38e27500784025d07e4fcdb61c4cfc6
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M CHANGELOG.txt
M LICENSE.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/maintain.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/schema.py
M ckan/model/authz.py
M ckan/model/group.py
M ckan/model/license.py
M ckan/model/meta.py
M ckan/new_authz.py
M ckan/public/base/css/main.css
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/media.less
M ckan/public/base/test/spec/client.spec.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
M ckan/public/scripts/application.js
A ckan/templates/admin/authz.html
A ckan/templates/admin/index.html
M ckan/templates/base.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
A ckan/templates/snippets/internal-tracking.html
M ckan/templates/snippets/language_selector.html
M ckan/templates/snippets/related.html
M ckan/templates/user/list.html
M ckan/templates/user/read.html
M ckan/templates_legacy/facets.html
M ckan/templates_legacy/layout_base.html
M ckan/tests/forms/test_authz.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
M ckan/tests/models/test_authz.py
M ckan/tests/models/test_repo.py
M ckan/tests/models/test_user.py
M ckanext/organizations/forms.py
M ckanext/publisher_form/templates/publisher_read.html
M doc/coding-standards.rst
A doc/frontend-development.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/toolkit.rst
A jshint.json
Log Message:
-----------
Merge branch '2375-demo-theme-development' into 2302-simple-themes
Commit: 16cb7a3e49287049f28f00818247179b7133c5b9
https://github.com/okfn/ckan/commit/16cb7a3e49287049f28f00818247179b7133c5b9
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
A ckan/templates/admin/config.html
Log Message:
-----------
[#2302] set style via form
Commit: 48986635ae53427d29e3b46f84b219eeb0672da8
https://github.com/okfn/ckan/commit/48986635ae53427d29e3b46f84b219eeb0672da8
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] improvements for setting css
Commit: 1a2c4ce26180a880acf0fba62f0c0cc26c0f5cb5
https://github.com/okfn/ckan/commit/1a2c4ce26180a880acf0fba62f0c0cc26c0f5cb5
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
M ckan/templates/base.html
Log Message:
-----------
[#2302] allow setting of site title
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: 8e8f5c6e32908f1ef59cc3ca43750941f29e75fb
https://github.com/okfn/ckan/commit/8e8f5c6e32908f1ef59cc3ca43750941f29e75fb
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] config for improvements
Commit: cb712108b35440fe9ec6ee0cc7dd8f2995dbc8ca
https://github.com/okfn/ckan/commit/cb712108b35440fe9ec6ee0cc7dd8f2995dbc8ca
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#2302] only update config on post and allow setting empty values
Commit: 14d704657281e5bc5fbd3bd5c417a3cc979f4f58
https://github.com/okfn/ckan/commit/14d704657281e5bc5fbd3bd5c417a3cc979f4f58
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] config add tagline to form
Commit: e5ec5e22041d52a8c4b64efc7ee74f38baa2d32d
https://github.com/okfn/ckan/commit/e5ec5e22041d52a8c4b64efc7ee74f38baa2d32d
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/admin/config.html
M ckan/templates/home/about.html
Log Message:
-----------
[#2302] config add about text to form
Commit: 08cf22f4894c7ca71ffbe359880bb00232daecd2
https://github.com/okfn/ckan/commit/08cf22f4894c7ca71ffbe359880bb00232daecd2
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] add reset button to reset to config values
Commit: 164d62f418b2a6e28525522ad4c2fd88eddbf643
https://github.com/okfn/ckan/commit/164d62f418b2a6e28525522ad4c2fd88eddbf643
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] allow setting ckan.main_css via .ini file
Commit: e6c0094f5aba5e119a13a0eed2f20db05c6be1cf
https://github.com/okfn/ckan/commit/e6c0094f5aba5e119a13a0eed2f20db05c6be1cf
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/templates/home/about.html
Log Message:
-----------
[#2302] only show about title if standard text
Commit: 0360660e794b7f15f5f4f52e0da67f6cfe351e3a
https://github.com/okfn/ckan/commit/0360660e794b7f15f5f4f52e0da67f6cfe351e3a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2760] Add missing list item around data api button
Commit: c8fbe61774541b9c09118f9f8196d0eb10d6b477
https://github.com/okfn/ckan/commit/c8fbe61774541b9c09118f9f8196d0eb10d6b477
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2375] Tidy up the resource description
Commit: 3616e67515d19c5d520cb4d34bf674cbdae3da95
https://github.com/okfn/ckan/commit/3616e67515d19c5d520cb4d34bf674cbdae3da95
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/toolbar.less
Log Message:
-----------
[#2375] Fix border color of the action buttons
Commit: 89a5e15b276de98e3632ebf8ff07ae50b2df9b50
https://github.com/okfn/ckan/commit/89a5e15b276de98e3632ebf8ff07ae50b2df9b50
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/templates/snippets/custom_form_fields.html
Log Message:
-----------
[#2408] Fix the output of custom fields
Currently a fresh resource gets three empty fields, a resource with
more than three custom fields gets an additional empty one.
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: 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: 87fea73bddc94fcfbd2385e0881c3008ea8ae044
https://github.com/okfn/ckan/commit/87fea73bddc94fcfbd2385e0881c3008ea8ae044
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
A ckan/public/base/javascript/modules/custom-fields.js
Log Message:
-----------
[#2408] Add first module for working with custom fields
Commit: b818e5a5a3ef6e69057868a793db882ed65b9de0
https://github.com/okfn/ckan/commit/b818e5a5a3ef6e69057868a793db882ed65b9de0
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/templates/macros/form.html
M ckan/templates/snippets/custom_form_fields.html
M ckan/templates/snippets/scripts.html
Log Message:
-----------
[#2408] Add custom-field module to the resource edit page
Commit: 69277d7ce48e2de1268f1092f9722be5ceaaa384
https://github.com/okfn/ckan/commit/69277d7ce48e2de1268f1092f9722be5ceaaa384
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/public/base/less/forms.less
Log Message:
-----------
[#2408] Style the disabled custom field button
Commit: df502fd9269859c73458f4ad8de75939220e0315
https://github.com/okfn/ckan/commit/df502fd9269859c73458f4ad8de75939220e0315
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/public/base/javascript/modules/api-info.js
M ckan/templates/ajax_snippets/api_info.html
A ckan/templates/package/resource_api_data.html
M ckan/templates/package/snippets/data_api_button.html
Log Message:
-----------
[#2710] Merge into development
Commit: 7f2bb32db49deb57cab556d0d7ef6924e366315c
https://github.com/okfn/ckan/commit/7f2bb32db49deb57cab556d0d7ef6924e366315c
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/templates/header.html
Log Message:
-----------
[#2302] show logo if defined else ckan one
Commit: 0224f30ff5a852563389465ad647cf7a7fe40803
https://github.com/okfn/ckan/commit/0224f30ff5a852563389465ad647cf7a7fe40803
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/templates/base.html
Log Message:
-----------
[#2302] set main_css via the global config
Commit: 60da7c73ce74fa7a8949041161ef13419a0c05f9
https://github.com/okfn/ckan/commit/60da7c73ce74fa7a8949041161ef13419a0c05f9
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
A ckan/public/base/css/fuchsia.css
A ckan/public/base/css/green.css
A ckan/public/base/css/red.css
Log Message:
-----------
[#2302] add some new style sheets
Commit: 46d1038866e9e06d221f81b969f7bb8297e152c1
https://github.com/okfn/ckan/commit/46d1038866e9e06d221f81b969f7bb8297e152c1
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] make css link absolute
Commit: 3efc7df9f53cb67508ccbf63b2ab8a548c15f894
https://github.com/okfn/ckan/commit/3efc7df9f53cb67508ccbf63b2ab8a548c15f894
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] css setting minor refactor
Commit: 745fc9200952071fa2918781d0797250ec387370
https://github.com/okfn/ckan/commit/745fc9200952071fa2918781d0797250ec387370
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#2302] General clean-up ofadmin controller
Commit: 3d055ffb4d747afe81cf76802c66598b465ca074
https://github.com/okfn/ckan/commit/3d055ffb4d747afe81cf76802c66598b465ca074
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
A ckan/templates/admin/config.html
Log Message:
-----------
[#2302] set style via form
Commit: cf468b848a67274ff6d59c5e69c46f9535dce9c7
https://github.com/okfn/ckan/commit/cf468b848a67274ff6d59c5e69c46f9535dce9c7
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] improvements for setting css
Commit: 390a183a33bf83198355fd56fe9465c86e1eed0a
https://github.com/okfn/ckan/commit/390a183a33bf83198355fd56fe9465c86e1eed0a
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
M ckan/templates/base.html
Log Message:
-----------
[#2302] allow setting of site title
Commit: d1abd875b9d07e876d3cee5f2c9bc3f98be1e7a1
https://github.com/okfn/ckan/commit/d1abd875b9d07e876d3cee5f2c9bc3f98be1e7a1
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] config for improvements
Commit: e1d0b1fb4c58f5ca9fd2b84d2adfba43709b41f2
https://github.com/okfn/ckan/commit/e1d0b1fb4c58f5ca9fd2b84d2adfba43709b41f2
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#2302] only update config on post and allow setting empty values
Commit: 7648659a79a04e3e546f6e28414a52aa9c433a9f
https://github.com/okfn/ckan/commit/7648659a79a04e3e546f6e28414a52aa9c433a9f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] config add tagline to form
Commit: 21dfd2703c5c84973f1ba0c337b1d55d279dde0a
https://github.com/okfn/ckan/commit/21dfd2703c5c84973f1ba0c337b1d55d279dde0a
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/admin/config.html
M ckan/templates/home/about.html
Log Message:
-----------
[#2302] config add about text to form
Commit: 0ad2b03e5bdc4d6130aae81d787243b1a5deef53
https://github.com/okfn/ckan/commit/0ad2b03e5bdc4d6130aae81d787243b1a5deef53
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] add reset button to reset to config values
Commit: 8b4e739a11d84ae6631dfdd726043429a1340d1f
https://github.com/okfn/ckan/commit/8b4e739a11d84ae6631dfdd726043429a1340d1f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] allow setting ckan.main_css via .ini file
Commit: 5f59491371fcb13098c5264036a7f585b776bfb5
https://github.com/okfn/ckan/commit/5f59491371fcb13098c5264036a7f585b776bfb5
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/templates/home/about.html
Log Message:
-----------
[#2302] only show about title if standard text
Commit: 6aa103751e39f2cf9929e752f116c79feda9e6d0
https://github.com/okfn/ckan/commit/6aa103751e39f2cf9929e752f116c79feda9e6d0
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2375] fix typo in template
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: b841878ee85db45288046e8085f84f723190d5cd
https://github.com/okfn/ckan/commit/b841878ee85db45288046e8085f84f723190d5cd
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
A ckan/migration/versions/059_add_system_info_table.py
M ckan/model/__init__.py
A ckan/model/system_info.py
Log Message:
-----------
[#2302] sys info table added and stores settings
Commit: 413d3c89f413c233d29e08e1e47f4a3669195c37
https://github.com/okfn/ckan/commit/413d3c89f413c233d29e08e1e47f4a3669195c37
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] add some documentation/comments
Commit: 066bb82d72b889b7404e2faf055f5f53f7162015
https://github.com/okfn/ckan/commit/066bb82d72b889b7404e2faf055f5f53f7162015
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/model/__init__.py
M ckan/model/system_info.py
Log Message:
-----------
[#2302] move some functions into system_info module
Commit: e9429b85102a83d8eaace04c7cb602d4738b6479
https://github.com/okfn/ckan/commit/e9429b85102a83d8eaace04c7cb602d4738b6479
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/lib/extract.py
M setup.cfg
M setup.py
Log Message:
-----------
[#2750] .js i18n ripping including translate()
Commit: 5b78c15b4901093d9a1ec832da3a456b6aa32ead
https://github.com/okfn/ckan/commit/5b78c15b4901093d9a1ec832da3a456b6aa32ead
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M ckan/lib/extract.py
M setup.cfg
M setup.py
Log Message:
-----------
[#2750] .js i18n ripping including translate()
Commit: 0d7779f02113d9e9c88254cc46d317a0dcc9a33c
https://github.com/okfn/ckan/commit/0d7779f02113d9e9c88254cc46d317a0dcc9a33c
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] update config when get/set via system_info
Commit: 48f7bd7d5c098ca8e618c4e03830a43a04e25e07
https://github.com/okfn/ckan/commit/48f7bd7d5c098ca8e618c4e03830a43a04e25e07
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] some refactoring of app globals
Commit: b103a97d8e311625fa5aab6618d1d3c21cf4cf19
https://github.com/okfn/ckan/commit/b103a97d8e311625fa5aab6618d1d3c21cf4cf19
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] rename app_globals helper function
Commit: c3070a77b162acaa352bf075075776e18155b877
https://github.com/okfn/ckan/commit/c3070a77b162acaa352bf075075776e18155b877
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] flakes app_globals
Commit: 90e1572ba5797a11b90c3dcea7b89b50f0b010dd
https://github.com/okfn/ckan/commit/90e1572ba5797a11b90c3dcea7b89b50f0b010dd
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/model/system_info.py
Log Message:
-----------
[#2302] flake8 model/system_info.py
Commit: 51f994a0bd42b8daace8f2f29f6665341a31e956
https://github.com/okfn/ckan/commit/51f994a0bd42b8daace8f2f29f6665341a31e956
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/lib/app_globals.py
M ckan/tests/pylons_controller.py
Log Message:
-----------
[#2302] remove app_global helpers from the globals object
Commit: b4fb4135c01aa778f1937818ee07d2b33c00d0d6
https://github.com/okfn/ckan/commit/b4fb4135c01aa778f1937818ee07d2b33c00d0d6
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
A ckan/migration/versions/059_add_system_info_table.py
M ckan/model/__init__.py
A ckan/model/system_info.py
M ckan/tests/pylons_controller.py
Log Message:
-----------
Merge branch '2302-simple-themes' into 2375-demo-theme-development
Conflicts:
ckan/controllers/admin.py
ckan/lib/app_globals.py
trivial fixes
Commit: 4f46b53bb1c8808e4c9ac8c7e6873d506e98be0e
https://github.com/okfn/ckan/commit/4f46b53bb1c8808e4c9ac8c7e6873d506e98be0e
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
A ckan/templates/ajax_snippets/custom_fields.html
Log Message:
-----------
[#2408] Add a custom field ajax snippet for testing
Commit: 58273c5ea30e37bb8c2321add0ce3dff84e67951
https://github.com/okfn/ckan/commit/58273c5ea30e37bb8c2321add0ce3dff84e67951
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/public/base/test/index.html
Log Message:
-----------
[#2408] Add a loadFixture() helper to the test suite
Can be used to load snippets from the ajax_snippets directory into the
suite fixture element.
Example:
beforeEach(function (done) {
var _this = this;
this.loadFixtire('custom_fields.html').done(function (html) {
this.template = html;
});
});
Commit: 48251cd1f9f857a82b9495ed18b40f9c55c1b1ee
https://github.com/okfn/ckan/commit/48251cd1f9f857a82b9495ed18b40f9c55c1b1ee
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/test/index.html
A ckan/public/base/test/spec/modules/custom-fields.spec.js
Log Message:
-----------
[#2408] Add test suite for the custom fields module
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: d375c09d1a58ec9db304c04690895da41e23283b
https://github.com/okfn/ckan/commit/d375c09d1a58ec9db304c04690895da41e23283b
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/modules/custom-fields.spec.js
Log Message:
-----------
[#2408] Document the loadFixture() test helper
Commit: dcdc9acfbafee6e69c7e80ba07514f25814d45eb
https://github.com/okfn/ckan/commit/dcdc9acfbafee6e69c7e80ba07514f25814d45eb
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/package.py
M ckan/lib/app_globals.py
M ckan/lib/extract.py
A ckan/migration/versions/059_add_system_info_table.py
M ckan/model/__init__.py
A ckan/model/system_info.py
A ckan/public/base/css/fuchsia.css
A ckan/public/base/css/green.css
A ckan/public/base/css/red.css
M ckan/public/base/javascript/modules/api-info.js
A ckan/templates/admin/config.html
M ckan/templates/ajax_snippets/api_info.html
M ckan/templates/base.html
M ckan/templates/header.html
M ckan/templates/home/about.html
A ckan/templates/package/resource_api_data.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/tests/pylons_controller.py
M setup.cfg
M setup.py
Log Message:
-----------
[#2408] Update to latest development version
Commit: 07014a42fb337fd0be8ff088ce58cbf8a89851d8
https://github.com/okfn/ckan/commit/07014a42fb337fd0be8ff088ce58cbf8a89851d8
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2767] form.select() macro now requires options to be a tuple
This ensures that item order is maintained. Each option is now a
dict which also allows for future extension.
Commit: 52b658a757ade71306ffd104395ddca17483228d
https://github.com/okfn/ckan/commit/52b658a757ade71306ffd104395ddca17483228d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[#2767] Update the related controller to use a tuple for options
Commit: 25d74994c6bc088b41e15555adde6b629c465f60
https://github.com/okfn/ckan/commit/25d74994c6bc088b41e15555adde6b629c465f60
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/templates/development/snippets/form.html
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#2767] Update other instances of form.select() to use lists
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: 89b94f41ad31b88c1989db6361d6e9d39a745db2
https://github.com/okfn/ckan/commit/89b94f41ad31b88c1989db6361d6e9d39a745db2
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2375] fix typo causing css debug issue
Commit: 2db3b27f0670c57ecfb138758816d80829468c9c
https://github.com/okfn/ckan/commit/2db3b27f0670c57ecfb138758816d80829468c9c
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2375] fix typo another causing css debug issue
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: 16bb516765fadb0f7c74ceb6568cfa77979da1f6
https://github.com/okfn/ckan/commit/16bb516765fadb0f7c74ceb6568cfa77979da1f6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/public/base/less/toolbar.less
Log Message:
-----------
[#2759] Fix the cursor interaction of the file upload button
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: 4c227907dec438e9e5c7905661399508f4b0d6c2
https://github.com/okfn/ckan/commit/4c227907dec438e9e5c7905661399508f4b0d6c2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2731] Fix issue with un-themed button color
This was due to an additional colon in the variable declaration of the
overridden LESS file.
Commit: 32110e727d44893001b974d200bc41d34d736ff2
https://github.com/okfn/ckan/commit/32110e727d44893001b974d200bc41d34d736ff2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dataset.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/group.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
Log Message:
-----------
[#2731] Move (nearly) all colour declarations into variables
Commit: 1fac47c6b09d70f92047e058d3558716fa65b912
https://github.com/okfn/ckan/commit/1fac47c6b09d70f92047e058d3558716fa65b912
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/public/base/less/footer.less
Log Message:
-----------
[#2375] Fix text showing on top of ckan logo
Commit: f4c6c43f289f64072eb632b4efb9351ee9909ac4
https://github.com/okfn/ckan/commit/f4c6c43f289f64072eb632b4efb9351ee9909ac4
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/public/base/less/variables.less
Log Message:
-----------
[#2375] Fix a number of misnamed variables in the stages css
Commit: a1cc0e2370d3689b0db82e8e79ca77943f7bdf00
https://github.com/okfn/ckan/commit/a1cc0e2370d3689b0db82e8e79ca77943f7bdf00
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] fix some issues with the globals
Commit: 93bcad74dd82f6e2e6ba6c44956047d19a141864
https://github.com/okfn/ckan/commit/93bcad74dd82f6e2e6ba6c44956047d19a141864
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
[#2375] template render logging changed to debug
Commit: 20ae77a9821ad723469e57616513f7d512c067a7
https://github.com/okfn/ckan/commit/20ae77a9821ad723469e57616513f7d512c067a7
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
[#2375] template render time logged
Commit: c3ad590bf7abf7dbf89ba131213427253b21777f
https://github.com/okfn/ckan/commit/c3ad590bf7abf7dbf89ba131213427253b21777f
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
R ckanext/stats/templates/__init__.py
R ckanext/stats/templates/ckanext/__init__.py
R ckanext/stats/templates/ckanext/stats/__init__.py
R ckanext/stats/templates/ckanext/stats/index.html
R ckanext/stats/templates/ckanext/stats/leaderboard.html
A ckanext/stats/templates_legacy/__init__.py
A ckanext/stats/templates_legacy/ckanext/__init__.py
A ckanext/stats/templates_legacy/ckanext/stats/__init__.py
A ckanext/stats/templates_legacy/ckanext/stats/index.html
A ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
Log Message:
-----------
[#2458] Move current templates into templates_legacy directory
Commit: 2748ca7659a13367a2ef2a923c880756f37059f9
https://github.com/okfn/ckan/commit/2748ca7659a13367a2ef2a923c880756f37059f9
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/config/environment.py
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2375] hack to get jinja2 to work with properties
Commit: 1491ffcde9cded193486fd8bb540cba5edbbf804
https://github.com/okfn/ckan/commit/1491ffcde9cded193486fd8bb540cba5edbbf804
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/templates/page.html
Log Message:
-----------
[#2458] Do not show home breadcrumb icon by default
This will now only be shown if there is breadcrumb_content.
Commit: 2bbac455a2da37b439018eddeedcf4b0d144085f
https://github.com/okfn/ckan/commit/2bbac455a2da37b439018eddeedcf4b0d144085f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
[#2375] remove defered import
Commit: 8901bdb202ba89e29b9f13eab8fdb5779752c27f
https://github.com/okfn/ckan/commit/8901bdb202ba89e29b9f13eab8fdb5779752c27f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
[#2375] add defer_context_item() to lib.maintain
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: 9e8a6769042bd974a00ee32fd2724da2b80c797a
https://github.com/okfn/ckan/commit/9e8a6769042bd974a00ee32fd2724da2b80c797a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
A ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
[#2458] Began converting the stats page to Jinja
Commit: 71aca07136933b7b98e27088df13ff24688a15e2
https://github.com/okfn/ckan/commit/71aca07136933b7b98e27088df13ff24688a15e2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M doc/frontend-development.rst
Log Message:
-----------
[#2375] Add note about npm to front end docs
Commit: d09f17d1912916a27266c9c51799e74b686d5ce9
https://github.com/okfn/ckan/commit/d09f17d1912916a27266c9c51799e74b686d5ce9
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
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/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/package.py
M ckan/model/related.py
M ckan/model/resource.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
A ckan/public/scripts/vendor/recline/css/recline.css
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
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/new_related_item.html
R ckan/templates/package/related_list.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_legacy/_util.html
M ckan/templates_legacy/js_strings.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/resource_embedded_dataviewer.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
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
Log Message:
-----------
Merge branch 'master' into 2375-demo-theme-development
Conflicts:
ckan/config/routing.py
trivial both added new routes
ckan/controllers/related.py
combine changes from both branches - new functions in both
ckan/logic/schema.py
urls of related are validated as urls
ckan/public/base/vendor/select2/spinner.gif
ckan/public/scripts/vendor/recline/recline.js
ckan/templates/_snippet/add-related.html
ckan/templates/related/add-related.html
ckan/templates/related/related_list.html
ckan/templates/user/read.html
ckan/templates_legacy/_snippet/add-related.html
template merges all in our favour
Commit: 1d3b744c0eb2d89b668d7d0dad0a8d6bb4167892
https://github.com/okfn/ckan/commit/1d3b744c0eb2d89b668d7d0dad0a8d6bb4167892
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
R ckan/migration/versions/059_add_system_info_table.py
A ckan/migration/versions/060_add_system_info_table.py
Log Message:
-----------
[#2375] renumber add system table migration script
Commit: 8406d4498a261417f029652b67053d83c3310a51
https://github.com/okfn/ckan/commit/8406d4498a261417f029652b67053d83c3310a51
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
A ckan/templates_legacy/activity_streams/deleted_related_item.html
A ckan/templates_legacy/activity_streams/follow_dataset.html
A ckan/templates_legacy/activity_streams/follow_user.html
A ckan/templates_legacy/activity_streams/new_related_item.html
M ckan/templates_legacy/group/read.html
A ckan/templates_legacy/package/followers.html
M ckan/templates_legacy/package/read.html
M ckan/templates_legacy/package/related_list.html
M ckan/templates_legacy/package/resource_read.html
M ckan/templates_legacy/package/search.html
A ckan/templates_legacy/related/add-related.html
A ckan/templates_legacy/related/dashboard.html
A ckan/templates_legacy/related/related_list.html
A ckan/templates_legacy/snippets/internal-tracking.html
A ckan/templates_legacy/snippets/recline-extra-footer.html
A ckan/templates_legacy/snippets/recline-extra-header.html
A ckan/templates_legacy/user/dashboard.html
M ckan/templates_legacy/user/edit_user_form.html
A ckan/templates_legacy/user/followers.html
M ckan/templates_legacy/user/read.html
Log Message:
-----------
[#2375] update legacy templates
Commit: a914908ae3ac15b0a7a1a0935b586e6e74d44a89
https://github.com/okfn/ckan/commit/a914908ae3ac15b0a7a1a0935b586e6e74d44a89
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] fixes to template helpers
Commit: 0b3e558dc4ccfb3b9503a9ceae82904a12dfc090
https://github.com/okfn/ckan/commit/0b3e558dc4ccfb3b9503a9ceae82904a12dfc090
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/templates/related/dashboard.html
Log Message:
-----------
[#2769] related dashboard added
Commit: 15d9330998ab072d9f94cc693577038b5c5bfc2f
https://github.com/okfn/ckan/commit/15d9330998ab072d9f94cc693577038b5c5bfc2f
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
A ckan/templates/package/related_list.html
R ckan/templates/related/related_list.html
Log Message:
-----------
[#2375] moved related_list.html to same dir as legacy template
Commit: ec99ce124b7df7a4586279aea5237023fbf28423
https://github.com/okfn/ckan/commit/ec99ce124b7df7a4586279aea5237023fbf28423
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/templates/package/related_list.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/related/snippets/related_list.html
Log Message:
-----------
[#2375] convert related_list to snippet
Commit: c5f913ecf1820e67b467d171d2fa9c79433ef532
https://github.com/okfn/ckan/commit/c5f913ecf1820e67b467d171d2fa9c79433ef532
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/templates/related/dashboard.html
Log Message:
-----------
[#2769] fix related listing on dashboard
Commit: ca693b14db1fea8ed673f8588b7173a31ab6fc52
https://github.com/okfn/ckan/commit/ca693b14db1fea8ed673f8588b7173a31ab6fc52
Author: tobes <toby.junk at gmail.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/templates/user/snippets/login_form.html
Log Message:
-----------
[#2765] error summary on bad login
Commit: 14a26dc3ea6e4a91f80ec694a9fea7d6b949b66f
https://github.com/okfn/ckan/commit/14a26dc3ea6e4a91f80ec694a9fea7d6b949b66f
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/public/base/less/ckan.less
M ckan/public/base/less/prose.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
Log Message:
-----------
[#2458] Add some generic table styles
Commit: 19bc5c4cafeb4278ef5a9e44033de5ce384ce978
https://github.com/okfn/ckan/commit/19bc5c4cafeb4278ef5a9e44033de5ce384ce978
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
[#2458] Convert the stats index.html to Jinja
Commit: 37bb1bf54f38a43b308406a4aa42f3c156216773
https://github.com/okfn/ckan/commit/37bb1bf54f38a43b308406a4aa42f3c156216773
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
A ckanext/stats/public/ckanext/stats/css/stats.css
A ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
Log Message:
-----------
[#2458] Add JavaScript module for plotting graphs from tables
Commit: 104df65fe3d569075f735ca0f3c0fca8816ceaca
https://github.com/okfn/ckan/commit/104df65fe3d569075f735ca0f3c0fca8816ceaca
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/public/base/vendor/html5.js
Log Message:
-----------
[#2458] Update html5 shiv for better canvas support
Commit: 5a91f39443693a832c29c1a739471596614eec30
https://github.com/okfn/ckan/commit/5a91f39443693a832c29c1a739471596614eec30
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/public/base/javascript/modules/confirm-delete.js
M ckan/public/base/test/spec/modules/confirm-delete.spec.js
Log Message:
-----------
[#2458] Fix IE issues with confirm delete module
Commit: 96b67b1df8f779e1aeb23eaa759adb2f1fa2df27
https://github.com/okfn/ckan/commit/96b67b1df8f779e1aeb23eaa759adb2f1fa2df27
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/public/base/less/footer.less
Log Message:
-----------
[#2458] Fix display of footer in IE8
Commit: cf8578c0bce08892e8cb3a11416eecb09fd8d000
https://github.com/okfn/ckan/commit/cf8578c0bce08892e8cb3a11416eecb09fd8d000
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
A ckanext/stats/public/ckanext/stats/vendor/excanvas.js
A ckanext/stats/public/ckanext/stats/vendor/jquery.flot.js
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
[#2458] Add local vendor folder to stats extension
Commit: da791b1be26ddd5ab7c2ad367d601e72eb0b2801
https://github.com/okfn/ckan/commit/da791b1be26ddd5ab7c2ad367d601e72eb0b2801
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
Log Message:
-----------
[#2458] Only draw stats chart when canvas is visible
Commit: f9913457a10d902c2d4518f7b20e8014aca8b48e
https://github.com/okfn/ckan/commit/f9913457a10d902c2d4518f7b20e8014aca8b48e
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
Log Message:
-----------
[#2458] Documented the plot module
Commit: d12ff0190da4e7964a47a328f20e247f6b3ad649
https://github.com/okfn/ckan/commit/d12ff0190da4e7964a47a328f20e247f6b3ad649
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
A ckanext/stats/public/ckanext/stats/test/fixtures/table.html
A ckanext/stats/public/ckanext/stats/test/index.html
A ckanext/stats/public/ckanext/stats/test/spec/modules/plot.spec.js
Log Message:
-----------
[#2458] Add unit tests for the plot module
The suite has several stubbed tests for the less important methods.
Commit: c1fbad68ebf992fef3763257755192d8be914de6
https://github.com/okfn/ckan/commit/c1fbad68ebf992fef3763257755192d8be914de6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M ckan/__init__.py
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/admin.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/lib/app_globals.py
M ckan/lib/base.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/jinja_extensions.py
M ckan/lib/maintain.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
R ckan/migration/versions/059_add_system_info_table.py
A ckan/migration/versions/060_add_system_info_table.py
M ckan/model/authz.py
M ckan/model/package.py
M ckan/model/related.py
M ckan/model/resource.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
A ckan/public/scripts/vendor/recline/css/recline.css
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
A ckan/templates/activity_streams/deleted_related_item.html
A ckan/templates/activity_streams/new_related_item.html
M ckan/templates/package/related_list.html
A ckan/templates/related/dashboard.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/related/snippets/related_list.html
M ckan/templates/snippets/recline-extra-footer.html
M ckan/templates/snippets/recline-extra-header.html
M ckan/templates/user/snippets/login_form.html
M ckan/templates_legacy/_util.html
A ckan/templates_legacy/activity_streams/deleted_related_item.html
A ckan/templates_legacy/activity_streams/follow_dataset.html
A ckan/templates_legacy/activity_streams/follow_user.html
A ckan/templates_legacy/activity_streams/new_related_item.html
M ckan/templates_legacy/group/read.html
M ckan/templates_legacy/js_strings.html
A ckan/templates_legacy/package/followers.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/read.html
M ckan/templates_legacy/package/related_list.html
M ckan/templates_legacy/package/resource_embedded_dataviewer.html
M ckan/templates_legacy/package/resource_read.html
M ckan/templates_legacy/package/search.html
A ckan/templates_legacy/related/add-related.html
A ckan/templates_legacy/related/dashboard.html
A ckan/templates_legacy/related/related_list.html
A ckan/templates_legacy/snippets/internal-tracking.html
A ckan/templates_legacy/snippets/recline-extra-footer.html
A ckan/templates_legacy/snippets/recline-extra-header.html
A ckan/templates_legacy/user/dashboard.html
M ckan/templates_legacy/user/edit_user_form.html
A ckan/templates_legacy/user/followers.html
M ckan/templates_legacy/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/frontend-development.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
Log Message:
-----------
[#2458] Merge in development branch
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: 6c89ce93328b8a0a20cfd72d5fc45bb31018520e
https://github.com/okfn/ckan/commit/6c89ce93328b8a0a20cfd72d5fc45bb31018520e
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Update the form macro "block" to "input_block"
Commit: 038f4f2a9c7cac7612bb7d5f712803a59ba321dc
https://github.com/okfn/ckan/commit/038f4f2a9c7cac7612bb7d5f712803a59ba321dc
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/macros/form.html
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#2739] Add info message to format field
Commit: b2355532d23af108826f4dc94a1a799cdbd0509e
https://github.com/okfn/ckan/commit/b2355532d23af108826f4dc94a1a799cdbd0509e
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/public/base/less/footer.less
M ckan/templates/footer.html
Log Message:
-----------
[#2375] Add hooks to the footer for extension
Commit: 1b6fa222461694de3412383c423b4f7a613a18be
https://github.com/okfn/ckan/commit/1b6fa222461694de3412383c423b4f7a613a18be
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2765] Allow error=true to be passed to a form macro
This highlights the error field without a message. Also fixed the
error_summary display to exclude the key if missing.
Commit: 99b8c4f79b9cb6ba7499b3c7289a4df9e1d16a7c
https://github.com/okfn/ckan/commit/99b8c4f79b9cb6ba7499b3c7289a4df9e1d16a7c
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/user/login.html
M ckan/templates/user/snippets/login_form.html
Log Message:
-----------
[#2765] Fixed up the display of the login form.
Also converted the include to a snippet statement.
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: 0838430e12abb7806e7aec134780426eb511d4f2
https://github.com/okfn/ckan/commit/0838430e12abb7806e7aec134780426eb511d4f2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Fix broken macros
The check for a valid error argument did not take into account a string
is iterable.
Commit: 48dd6e35ec59947715dc7cd948f318f90f03102e
https://github.com/okfn/ckan/commit/48dd6e35ec59947715dc7cd948f318f90f03102e
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
[#2776] Update the header style
We now use only the logo if one is provided in the ini file. Otherwise
we use the site title and tagline. The tagline has been implemented
as per the design however this will not work for a string longer than
about 12 characters.
Commit: f24fcd9778420a8c944b36b1480a3451e0f85355
https://github.com/okfn/ckan/commit/f24fcd9778420a8c944b36b1480a3451e0f85355
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/header.html
Log Message:
-----------
[#2776] Only show tag line if one is present
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: ef859bf9d9cbe48fe111d7bc0a6408b1a86cd807
https://github.com/okfn/ckan/commit/ef859bf9d9cbe48fe111d7bc0a6408b1a86cd807
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
Log Message:
-----------
[#2776] Update config template to define an icon
Commit: dd7d8dec8b01dc21390587f96e4093938e69fece
https://github.com/okfn/ckan/commit/dd7d8dec8b01dc21390587f96e4093938e69fece
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#2375] Update the main css file
Commit: e401e6eebbf54893d4e0b5e9844def021c1a3a2b
https://github.com/okfn/ckan/commit/e401e6eebbf54893d4e0b5e9844def021c1a3a2b
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2375] Tidy up the admin config html
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: 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: 92a7ca7c62d0246f54eaf5dfa61f2092152cc704
https://github.com/okfn/ckan/commit/92a7ca7c62d0246f54eaf5dfa61f2092152cc704
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/footer.less
Log Message:
-----------
[#2375] Fix some language picker style issues
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: c37903fe81a99f3840503e51fff6029012ce1c2a
https://github.com/okfn/ckan/commit/c37903fe81a99f3840503e51fff6029012ce1c2a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M doc/templating.rst
Log Message:
-----------
[#2375] Update the templating documentation
Commit: 1aaf4be27ec251750a267c0dc0bb0247c90eb6aa
https://github.com/okfn/ckan/commit/1aaf4be27ec251750a267c0dc0bb0247c90eb6aa
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckanext/stats/plugin.py
Log Message:
-----------
[#2375] legacy templates for stats supported
Commit: daac54dbd8560f5e803d41e568779a5abeb25c51
https://github.com/okfn/ckan/commit/daac54dbd8560f5e803d41e568779a5abeb25c51
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/templates/header.html
Log Message:
-----------
[#2375] global header_class for logo
Commit: 6a2a9fb32a96b2fa13e7fed40a71c6f65ed4693a
https://github.com/okfn/ckan/commit/6a2a9fb32a96b2fa13e7fed40a71c6f65ed4693a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M doc/templating.rst
Log Message:
-----------
[#2375] Fix a few documentation typos
Commit: b271f032b575302c09193411ce934002e72cb3d7
https://github.com/okfn/ckan/commit/b271f032b575302c09193411ce934002e72cb3d7
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/public/base/less/profile.less
M ckan/templates/user/read.html
Log Message:
-----------
[#2375] Show a friendly message when the user has no datasets
Commit: 8a3a3e8200cf6f0eb8955d5be08bb715d36377b7
https://github.com/okfn/ckan/commit/8a3a3e8200cf6f0eb8955d5be08bb715d36377b7
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/page.html
Log Message:
-----------
[#2375] Trim whitespace from breadcrumb check
Commit: 0300c4b4f6de9afe38a0618af4dd723b61222a8b
https://github.com/okfn/ckan/commit/0300c4b4f6de9afe38a0618af4dd723b61222a8b
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2707] Nicer output of resource data dates
Commit: b335c69dc7c0d280fcea9e4084055f65c12186b2
https://github.com/okfn/ckan/commit/b335c69dc7c0d280fcea9e4084055f65c12186b2
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/red.css
Log Message:
-----------
[#2375] update custom theme css
Commit: d0f1b3f7c2f45a9b2af75b78189c256929e1802d
https://github.com/okfn/ckan/commit/d0f1b3f7c2f45a9b2af75b78189c256929e1802d
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/snippets/package_list.html
Log Message:
-----------
#[2375] bug fix
Commit: b5db51f1ee96cfbabc10d3547a55c228dc0f2088
https://github.com/okfn/ckan/commit/b5db51f1ee96cfbabc10d3547a55c228dc0f2088
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/related/snippets/related_item.html
Log Message:
-----------
[#2778] Related item banner now displays visualisation better
Commit: a55523175a95f2fc5c0ddddf9fa9579aa7111e39
https://github.com/okfn/ckan/commit/a55523175a95f2fc5c0ddddf9fa9579aa7111e39
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/related.py
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
M ckan/templates/related/dashboard.html
Log Message:
-----------
[#2778] Tidy up the apps dashboard
* Update the markup to meet coding standards.
* Move the filters to the sidebar to give them more space.
* Display a message when there are no apps to view.
* Added a breadcrumb.
* Move select box options into the controller.
* Attempted to reduce duplication in the controllers.
Commit: 275151cc7b5d4f6586b481cb2545d5b74d25c227
https://github.com/okfn/ckan/commit/275151cc7b5d4f6586b481cb2545d5b74d25c227
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/templates/snippets/package_list.html
Log Message:
-----------
#[2375] bug fix 2
Commit: 50448c0c9d10e529ecf4448f164d2e4a2febe2bb
https://github.com/okfn/ckan/commit/50448c0c9d10e529ecf4448f164d2e4a2febe2bb
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#2375] update main.css
Commit: 4751db188eae18a75f552f773d8e1f7dbc738ee9
https://github.com/okfn/ckan/commit/4751db188eae18a75f552f773d8e1f7dbc738ee9
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/stats/templates_legacy/ckanext/stats/index.html
Log Message:
-----------
[#2375] sort javascript includes
Commit: 2c11b1d2cf35e82eb97f60d50d22ac7ad2031b12
https://github.com/okfn/ckan/commit/2c11b1d2cf35e82eb97f60d50d22ac7ad2031b12
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
[#2375] Sort css include
Commit: 8e9c4491c1bbdf5350fd775fb3a0d9ac4bc54e42
https://github.com/okfn/ckan/commit/8e9c4491c1bbdf5350fd775fb3a0d9ac4bc54e42
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
[#2375] better render time logging
Commit: d54ab134eb9dca9c4a415670a14142ecb4ca9432
https://github.com/okfn/ckan/commit/d54ab134eb9dca9c4a415670a14142ecb4ca9432
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
[#2375] add helper decorator for timings
Commit: 41797d269901a7511e795242cdf508bd9aeba1c3
https://github.com/okfn/ckan/commit/41797d269901a7511e795242cdf508bd9aeba1c3
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2755] Don't call user_show twice
Commit: 9242a44d291d994bf5e11f355c2f18b579bb5b43
https://github.com/okfn/ckan/commit/9242a44d291d994bf5e11f355c2f18b579bb5b43
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#2375] fix missing facets
Commit: fd77970cad91c9b72fab86e96c96f5864a417307
https://github.com/okfn/ckan/commit/fd77970cad91c9b72fab86e96c96f5864a417307
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2375] fix imports in lib.jinja_extensions
Commit: a24a9e084579a42b33d30b976c3d85bd71062963
https://github.com/okfn/ckan/commit/a24a9e084579a42b33d30b976c3d85bd71062963
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
[#2375] timer decorator improvements
Commit: 77491ddb11f0c5081fb154a0176938963391b9ad
https://github.com/okfn/ckan/commit/77491ddb11f0c5081fb154a0176938963391b9ad
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
Quick fix for deprecated
Commit: f3c252505809712c6852ce7eb0b2feeb76d0e45f
https://github.com/okfn/ckan/commit/f3c252505809712c6852ce7eb0b2feeb76d0e45f
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
Proper fix of deprecated_context_item
Commit: 65a0dce1fe2feffb0844fe4192f66dcf25a0f249
https://github.com/okfn/ckan/commit/65a0dce1fe2feffb0844fe4192f66dcf25a0f249
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
some documentation
Commit: 7da5d7e42f138e7a44807d2aae2e6d0671780ed6
https://github.com/okfn/ckan/commit/7da5d7e42f138e7a44807d2aae2e6d0671780ed6
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-01 (Wed, 01 Aug 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
Add the warning again
Commit: 6b9394951118ecdc1d1e8c9472689389cfeaa14b
https://github.com/okfn/ckan/commit/6b9394951118ecdc1d1e8c9472689389cfeaa14b
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/lib/maintain.py
Log Message:
-----------
Store the message plus better names
Commit: 791fee3cebcde399fdc2cb793016221a470bbfea
https://github.com/okfn/ckan/commit/791fee3cebcde399fdc2cb793016221a470bbfea
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2650] Remove print statment killing apache
Commit: e449bc741aa6ebc6d522b558e4500d73237d8b3c
https://github.com/okfn/ckan/commit/e449bc741aa6ebc6d522b558e4500d73237d8b3c
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2650] Render description as markdown
Commit: a1056d8ccd0eca3848f3b65ded05b585f213a15d
https://github.com/okfn/ckan/commit/a1056d8ccd0eca3848f3b65ded05b585f213a15d
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/controllers/admin.py
A ckan/public/base/css/maroon.css
Log Message:
-----------
[#2375] Maroon theme added
Commit: 7a6f00b098f340a259ebf118da81197644fc4f68
https://github.com/okfn/ckan/commit/7a6f00b098f340a259ebf118da81197644fc4f68
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/model/__init__.py
M ckan/model/system_info.py
Log Message:
-----------
[#2302] Re-enable reset config options
Commit: 16c7c2e090abb5ee51906c34df26cd9ce22ff10e
https://github.com/okfn/ckan/commit/16c7c2e090abb5ee51906c34df26cd9ce22ff10e
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
M ckan/templates/home/index.html
Log Message:
-----------
[#2781] Intro text editable
Commit: 155fdf167549dbd3513c55eee2a4d0070aad8173
https://github.com/okfn/ckan/commit/155fdf167549dbd3513c55eee2a4d0070aad8173
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/public/base/vendor/select2/README.md
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
M ckan/public/base/vendor/select2/select2.min.js
Log Message:
-----------
[#2792] Update select2 from 2.1 to 3.0
This fixes the issue where the select box caused the page to scroll
when at the bottom of the page.
Commit: 27954243303c318d2a047bdc1a846e47bedfe512
https://github.com/okfn/ckan/commit/27954243303c318d2a047bdc1a846e47bedfe512
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
Log Message:
-----------
[#2792] Fix the width of the autocomplete boxes
Commit: 1a83a77032a77469d7cef2e0fde853f8f62b85da
https://github.com/okfn/ckan/commit/1a83a77032a77469d7cef2e0fde853f8f62b85da
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
Log Message:
-----------
[#2792] Update the formatInitialValue() method
Select2 3.0 supports an asynchronous formatter.
Commit: 1949dd4a9f986216a0991f7f583d2f2b02f56f0b
https://github.com/okfn/ckan/commit/1949dd4a9f986216a0991f7f583d2f2b02f56f0b
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/model/system_info.py
Log Message:
-----------
[#2302] Fix reset print error
Commit: 11f3b6297cb14bf0f8cc680ac9ce1a8c9f0c94eb
https://github.com/okfn/ckan/commit/11f3b6297cb14bf0f8cc680ac9ce1a8c9f0c94eb
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/package/resource_edit.html
Log Message:
-----------
[#2794] Add "back to resource" button to edit resource page
Commit: d17358f3fb3ee1080b5b37f14f576ad0ab81da3c
https://github.com/okfn/ckan/commit/d17358f3fb3ee1080b5b37f14f576ad0ab81da3c
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/dataset.less
M ckan/templates/snippets/package_list.html
Log Message:
-----------
[#2779] Add "deleted" flag to package titles
Commit: b1d03805649c79ec970d985e27800213e6fd4da1
https://github.com/okfn/ckan/commit/b1d03805649c79ec970d985e27800213e6fd4da1
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/admin/config.html
Log Message:
-----------
[#2375] Fix submission of admin config form
Previously pressing return in an input field reset the form.
Commit: 1db2037f583f8fdaf3ba31b4c2c04c183b9ab0a9
https://github.com/okfn/ckan/commit/1db2037f583f8fdaf3ba31b4c2c04c183b9ab0a9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/public/base/less/masthead.less
M ckan/public/base/test/primer/index.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
M ckan/templates/snippets/related.html
Log Message:
-----------
[#2375] Tidy up some html validation issues
Commit: 3a929a4cf053ed222be275838c77307b2586b6da
https://github.com/okfn/ckan/commit/3a929a4cf053ed222be275838c77307b2586b6da
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
[#2375] Fix incorrect meta tag attribute
Commit: df3b5f2e1bcca22f040109184a5f401065989178
https://github.com/okfn/ckan/commit/df3b5f2e1bcca22f040109184a5f401065989178
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/admin/config.html
M ckan/templates/snippets/debug.html
Log Message:
-----------
[#2375] Fix a few more validation issues
Commit: 88e7ffd8b32cb4db016f2aca4c9059b69a949efc
https://github.com/okfn/ckan/commit/88e7ffd8b32cb4db016f2aca4c9059b69a949efc
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/package/search.html
M ckan/templates/package/snippets/search_form.html
Log Message:
-----------
[#2375] Remove invalid attribute from form inputs
Commit: d477dcafd3f7b55d4afd6f88245dd60b303d3719
https://github.com/okfn/ckan/commit/d477dcafd3f7b55d4afd6f88245dd60b303d3719
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/user/read.html
Log Message:
-----------
[#2375] Fixed a few more HTML lint/validation issues
Commit: f7d2c67880d5d8679c3f4c287614df06c45f2c1a
https://github.com/okfn/ckan/commit/f7d2c67880d5d8679c3f4c287614df06c45f2c1a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/group/index.html
Log Message:
-----------
[#2375] Display a nice message when an instance has no groups
Commit: 06257ac8178bc9c5f1e56157f6c63d0b6aaf60ec
https://github.com/okfn/ckan/commit/06257ac8178bc9c5f1e56157f6c63d0b6aaf60ec
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
A ckan/public/base/images/flags.png
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/less/footer.less
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
[#2700] Add flags to language box
Commit: 56c258f8ea192e5dedeba69a359c3e033e248e32
https://github.com/okfn/ckan/commit/56c258f8ea192e5dedeba69a359c3e033e248e32
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
[#2375] Add new {% block subtitle %} to base.html
Saves us using the delimiter all over the place in the templates.
Commit: 2b819585302948c8d380e35309c2cd2d66b66834
https://github.com/okfn/ckan/commit/2b819585302948c8d380e35309c2cd2d66b66834
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/user/dashboard.html
A ckan/templates/user/snippets/things_to_do.html
Log Message:
-----------
[#2375] Update the user dashboard theme
Commit: 954098540480bc1b0e9ad4c63d67f8e735f43b91
https://github.com/okfn/ckan/commit/954098540480bc1b0e9ad4c63d67f8e735f43b91
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M ckan/templates/user/dashboard.html
M ckan/templates/user/read.html
Log Message:
-----------
[#2375] Add links to dashboard page in user profile
Commit: d258fe0d0a5e60c71a5530abd85646ae5cb7b534
https://github.com/okfn/ckan/commit/d258fe0d0a5e60c71a5530abd85646ae5cb7b534
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/lib/cli.py
M setup.py
Log Message:
-----------
[#2751] [#2774] translation paster commands
Commit: 47bf6c69b63dcc133cbc797c45651df1cb3e5554
https://github.com/okfn/ckan/commit/47bf6c69b63dcc133cbc797c45651df1cb3e5554
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
A ckan/public/base/i18n/bg.js
A ckan/public/base/i18n/ca.js
A ckan/public/base/i18n/cs_CZ.js
A ckan/public/base/i18n/de.js
A ckan/public/base/i18n/el.js
A ckan/public/base/i18n/es.js
A ckan/public/base/i18n/fi.js
A ckan/public/base/i18n/fr.js
A ckan/public/base/i18n/hu.js
A ckan/public/base/i18n/it.js
A ckan/public/base/i18n/lt.js
A ckan/public/base/i18n/lv.js
A ckan/public/base/i18n/nl.js
A ckan/public/base/i18n/no.js
A ckan/public/base/i18n/pl.js
A ckan/public/base/i18n/pt_BR.js
A ckan/public/base/i18n/ro.js
A ckan/public/base/i18n/ru.js
A ckan/public/base/i18n/sk.js
A ckan/public/base/i18n/sl.js
A ckan/public/base/i18n/sq.js
A ckan/public/base/i18n/sr.js
A ckan/public/base/i18n/sr_Latn.js
A ckan/public/base/i18n/sv.js
A ckan/public/base/i18n/zh_TW.js
Log Message:
-----------
[#2774] add some js translation samples
Commit: c7bfd3ef1adaa536fe61eb7d880d66b956b9e466
https://github.com/okfn/ckan/commit/c7bfd3ef1adaa536fe61eb7d880d66b956b9e466
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/cli.py
Log Message:
-----------
[#2751] improve mangling regex
Commit: 3123bc46549215c74aefd73f38e132dfd43cb353
https://github.com/okfn/ckan/commit/3123bc46549215c74aefd73f38e132dfd43cb353
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/controllers/home.py
Log Message:
-----------
[#2375] speed rendering of home page
Commit: 0ffe60924720acc738d199e0824e622b819b6eac
https://github.com/okfn/ckan/commit/0ffe60924720acc738d199e0824e622b819b6eac
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
M ckan/templates/base.html
M ckan/templates/macros/form.html
Log Message:
-----------
[#2302] basic css overriding
Commit: 7775262efa0a060a1e2f8aba5c5d1a12ca0eeeed
https://github.com/okfn/ckan/commit/7775262efa0a060a1e2f8aba5c5d1a12ca0eeeed
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2302] add autoform to form macros
Commit: 101dd27405c636484f926e7ed5e99cd2b18b8055
https://github.com/okfn/ckan/commit/101dd27405c636484f926e7ed5e99cd2b18b8055
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2302] bugfix on config updating
Commit: 93b36f03a9b2acd6ee0460abe51bf439558692ec
https://github.com/okfn/ckan/commit/93b36f03a9b2acd6ee0460abe51bf439558692ec
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/admin/config.html
Log Message:
-----------
[#2302] config now uses autoform
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: 1f4057480ab753baf0e4d8f445ec0148804fd218
https://github.com/okfn/ckan/commit/1f4057480ab753baf0e4d8f445ec0148804fd218
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/templates/header.html
Log Message:
-----------
[#2302] only show title and description if no logo
Commit: d56d69fe21c89adeae90aa7bcb16248f9712a38a
https://github.com/okfn/ckan/commit/d56d69fe21c89adeae90aa7bcb16248f9712a38a
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#2302] allow on the fly logo config
Commit: 06e0ba239d91ab36aae98a2a5786322afe6de2e6
https://github.com/okfn/ckan/commit/06e0ba239d91ab36aae98a2a5786322afe6de2e6
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2302] Don't break on unicode url convert to str
Commit: f2b2443e74aa078735fe128c240506c1f40b8504
https://github.com/okfn/ckan/commit/f2b2443e74aa078735fe128c240506c1f40b8504
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
Log Message:
-----------
[#2375] custom css updates
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: 3ef57395a8deff2bd7a54bb1ea52dbe8cc97bffa
https://github.com/okfn/ckan/commit/3ef57395a8deff2bd7a54bb1ea52dbe8cc97bffa
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/i18n/ckan.pot
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/templates/footer.html
M ckan/templates/header.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/sort_by.html
M ckan/templates/user/snippets/login_form.html
Log Message:
-----------
[#2375] Add a few obviously missing translations
Commit: 5087152ac58f6aa460c127597e3d8b35e4270afc
https://github.com/okfn/ckan/commit/5087152ac58f6aa460c127597e3d8b35e4270afc
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/templates/admin/authz.html
M ckan/templates/admin/config.html
M ckan/templates/admin/index.html
M ckan/templates/error_document_template.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/edit.html
M ckan/templates/group/index.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/home/about.html
M ckan/templates/home/index.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/new.html
M ckan/templates/package/new_package_metadata.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_api_data.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/dashboard.html
M ckan/templates/related/edit.html
M ckan/templates/related/new.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout.html
M ckan/templates/user/new.html
M ckan/templates/user/perform_reset.html
M ckan/templates/user/read.html
M ckan/templates/user/request_reset.html
Log Message:
-----------
[#2375] Update all templates to use {% block subtitle %}
Commit: a452c0b9de026bd63207e5c4aa6d11cb791c01b9
https://github.com/okfn/ckan/commit/a452c0b9de026bd63207e5c4aa6d11cb791c01b9
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
[#2371] Upgrade fanstatic to 0.12
Commit: 3f5c05c70b2cf7a94ac7598b7cedfaedcef53876
https://github.com/okfn/ckan/commit/3f5c05c70b2cf7a94ac7598b7cedfaedcef53876
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/html_resources/__init__.py
Log Message:
-----------
[#2371] Fanstatic IE conditionals patch
Commit: 866bc435247f27895e85d07fe3d6972793b32bd4
https://github.com/okfn/ckan/commit/866bc435247f27895e85d07fe3d6972793b32bd4
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/extract.py
Log Message:
-----------
[#2799] Jinja2 now translate pages with custom tags
Commit: ab6b9386b0d0a48f49402a7c6b12fdd13d21d97b
https://github.com/okfn/ckan/commit/ab6b9386b0d0a48f49402a7c6b12fdd13d21d97b
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M setup.py
Log Message:
-----------
[#2799] Fix annoying setup.py formating for easier debugging
Commit: f927598fc530c85d59c91aaa83ba8d947c2148ce
https://github.com/okfn/ckan/commit/f927598fc530c85d59c91aaa83ba8d947c2148ce
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/controllers/admin.py
M ckan/templates/macros/form.html
Log Message:
-----------
[#2797] Update documentation for autoform macro
Also renamed plain_textarea to just textarea.
Commit: c9b9e3a71cc5fdf8bef17f0cc1a9fb0b3428c40d
https://github.com/okfn/ckan/commit/c9b9e3a71cc5fdf8bef17f0cc1a9fb0b3428c40d
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2774] I18n .js allow %1s %2s strings
Commit: b0eec93a33e952fc3ff03868f7bbaac145801b2e
https://github.com/okfn/ckan/commit/b0eec93a33e952fc3ff03868f7bbaac145801b2e
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2774] I18n js strings full sprintf support
Commit: df9d354c387f8d8d90fb2ff3e5b0616fcb7b81aa
https://github.com/okfn/ckan/commit/df9d354c387f8d8d90fb2ff3e5b0616fcb7b81aa
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M doc/templating.rst
Log Message:
-----------
[#2375] Add new macros to documentation
Commit: 899df81815fc0a46d515387a0e84ab1bb431fa9f
https://github.com/okfn/ckan/commit/899df81815fc0a46d515387a0e84ab1bb431fa9f
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2774] I18n js strings %n$s bugfix - thanks aron
Commit: 3fbfe7d0c6fa24cff063ff4c2ea5d4d47357e25a
https://github.com/okfn/ckan/commit/3fbfe7d0c6fa24cff063ff4c2ea5d4d47357e25a
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2774] I18n re-enable mangling of some formats
Commit: e5f5822c338c2c268fb367227c0c7d191a97d5d1
https://github.com/okfn/ckan/commit/e5f5822c338c2c268fb367227c0c7d191a97d5d1
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/cli.py
Log Message:
-----------
[#2774] I18n improved .po JavaScript extractions
Commit: 365fb11bc0c2df1d10cb0c602549db64a48b1eec
https://github.com/okfn/ckan/commit/365fb11bc0c2df1d10cb0c602549db64a48b1eec
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/cli.py
Log Message:
-----------
[#2774] I18n mangle fixes
Commit: 1624f8ed6ce37924a0debcea0a162e9c4d4616ef
https://github.com/okfn/ckan/commit/1624f8ed6ce37924a0debcea0a162e9c4d4616ef
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/public/base/javascript/module.js
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/javascript/modules/resource-upload-field.js
M ckan/public/base/javascript/modules/slug-preview.js
Log Message:
-----------
[#2803] Update JavaScript strings to use keyword placeholders
So for example _('hello %s', 'jim') becomes _('hello %(name)s', {name:
'jim'}). Which is much clearer for those creating the translations.
Commit: 074a31f683d3ad8f56d49acccc3f8c137c8fae1b
https://github.com/okfn/ckan/commit/074a31f683d3ad8f56d49acccc3f8c137c8fae1b
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/public/base/test/spec/modules/autocomplete.spec.js
Log Message:
-----------
[#2803] Fix a couple of errors in the test suite
Commit: f443d9603a4dd70b19f53e5f1571da9a2dbe832a
https://github.com/okfn/ckan/commit/f443d9603a4dd70b19f53e5f1571da9a2dbe832a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M doc/frontend-development.rst
Log Message:
-----------
[#2803] Update the front end docs with locale updates
Commit: 70d4037a0e4549f5f6a46ff773eb44efe4d64adf
https://github.com/okfn/ckan/commit/70d4037a0e4549f5f6a46ff773eb44efe4d64adf
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M doc/templating.rst
Log Message:
-----------
[#2375] Add new macros to documentation
Commit: 3b2427efc820191e7d294239b28acc37bd7d52e5
https://github.com/okfn/ckan/commit/3b2427efc820191e7d294239b28acc37bd7d52e5
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/public/base/javascript/module.js
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/javascript/modules/resource-upload-field.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
M doc/frontend-development.rst
Log Message:
-----------
[#2375] Merge translations branch into development
Commit: 87ce7aad000a341069cd16e7c4e173330d2fd68e
https://github.com/okfn/ckan/commit/87ce7aad000a341069cd16e7c4e173330d2fd68e
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2774] I18n more bugfixes
Commit: 771b5bc676c18c5282ec9d6d793a9b067f37dc7f
https://github.com/okfn/ckan/commit/771b5bc676c18c5282ec9d6d793a9b067f37dc7f
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/api.py
Log Message:
-----------
[#2774] I18n api call for translations
Commit: 493324fe99822ae2ea5a19bbae9e8adf7ccaac92
https://github.com/okfn/ckan/commit/493324fe99822ae2ea5a19bbae9e8adf7ccaac92
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2774] I18n js build translation refactor
Commit: e269d00101f8ae33de517e10dca31ccc1dcce676
https://github.com/okfn/ckan/commit/e269d00101f8ae33de517e10dca31ccc1dcce676
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/templates/footer.html
Log Message:
-----------
[#2375] Fix i18n template error
Commit: 54f9dfaa71ff1e372ee1fa72638599ba394bee97
https://github.com/okfn/ckan/commit/54f9dfaa71ff1e372ee1fa72638599ba394bee97
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
A ckanext/stats/public/ckanext/stats/javascript/modules/stats-nav.js
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
[#2458] Allow the tabs on the stats page to be bookmarked
Commit: 9729f1cb1691cfc124f05e6af4f28aa3eeb8a469
https://github.com/okfn/ckan/commit/9729f1cb1691cfc124f05e6af4f28aa3eeb8a469
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckanext/stats/public/ckanext/stats/test/index.html
A ckanext/stats/public/ckanext/stats/test/spec/modules/stats-nav.spec.js
Log Message:
-----------
[#2458] Add unit tests for the stats-nav module
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: 7ec98572086be59229de2aabd25d57077f2b564b
https://github.com/okfn/ckan/commit/7ec98572086be59229de2aabd25d57077f2b564b
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/controllers/api.py
Log Message:
-----------
[#2802] Content-Type: app/json
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: 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: c846ee2dc066e37c5b5d7205253ccca5698bbce2
https://github.com/okfn/ckan/commit/c846ee2dc066e37c5b5d7205253ccca5698bbce2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/i18n/ckan.pot
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/public/base/i18n/bg.js
M ckan/public/base/i18n/ca.js
M ckan/public/base/i18n/cs_CZ.js
M ckan/public/base/i18n/de.js
M ckan/public/base/i18n/el.js
M ckan/public/base/i18n/es.js
M ckan/public/base/i18n/fi.js
M ckan/public/base/i18n/fr.js
M ckan/public/base/i18n/hu.js
M ckan/public/base/i18n/it.js
M ckan/public/base/i18n/lt.js
M ckan/public/base/i18n/lv.js
M ckan/public/base/i18n/nl.js
M ckan/public/base/i18n/no.js
M ckan/public/base/i18n/pl.js
M ckan/public/base/i18n/pt_BR.js
M ckan/public/base/i18n/ro.js
M ckan/public/base/i18n/ru.js
M ckan/public/base/i18n/sk.js
M ckan/public/base/i18n/sl.js
M ckan/public/base/i18n/sq.js
M ckan/public/base/i18n/sr.js
M ckan/public/base/i18n/sr_Latn.js
M ckan/public/base/i18n/sv.js
M ckan/public/base/i18n/zh_TW.js
Log Message:
-----------
[#2802] Update generated JS localisations
Commit: 43792bbec8a7da98abfbd5ef72a2cfb9453b835d
https://github.com/okfn/ckan/commit/43792bbec8a7da98abfbd5ef72a2cfb9453b835d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/public/base/javascript/client.js
M ckan/public/base/test/spec/client.spec.js
Log Message:
-----------
[#2802] Add an client method for loading the localisations
Commit: aec8e7b2dd049426022e925ad321ca71d13ebe67
https://github.com/okfn/ckan/commit/aec8e7b2dd049426022e925ad321ca71d13ebe67
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/public/base/javascript/i18n.js
M ckan/public/base/javascript/main.js
M ckan/public/base/test/spec/ckan.spec.js
Log Message:
-----------
[#2802] Load localisations on page load
Commit: 8b72d1f8e9bab8bf232f9cfb45488645d45de4e2
https://github.com/okfn/ckan/commit/8b72d1f8e9bab8bf232f9cfb45488645d45de4e2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/public/base/javascript/modules/api-info.js
M ckan/public/base/javascript/modules/confirm-delete.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
Log Message:
-----------
[#2802] Update i18n calls in modules
Updated to work with lazy loaded translations
Commit: 38f824bf8acc79bdf86ed681a5111fbdc9f44bd6
https://github.com/okfn/ckan/commit/38f824bf8acc79bdf86ed681a5111fbdc9f44bd6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/user/read.html
Log Message:
-----------
[#2804] Download button is now blue
Commit: 9a6d0be91294c149430cc3a3ca69eb44c24bcd4f
https://github.com/okfn/ckan/commit/9a6d0be91294c149430cc3a3ca69eb44c24bcd4f
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
Log Message:
-----------
[#2807] Fix an issue in the autocomplete module
Turns out that select2 calls query when loading the page. Now we
check that we have a valid object. Updated unit tests to reflect this.
Commit: 52371cf2bca009769b01b52529df6b325975a286
https://github.com/okfn/ckan/commit/52371cf2bca009769b01b52529df6b325975a286
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2802] mangle bugfix
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: 5b028ead1d10e2ae37be3a5471b0eaf65f469973
https://github.com/okfn/ckan/commit/5b028ead1d10e2ae37be3a5471b0eaf65f469973
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-06 (Mon, 06 Aug 2012)
Changed paths:
A doc/javascript-module-tutorial.rst
Log Message:
-----------
[#2375] Add a tutorial for creating JavaScript modules
Commit: a39bb4eafcd91c629690770c486c8fd4432eabbc
https://github.com/okfn/ckan/commit/a39bb4eafcd91c629690770c486c8fd4432eabbc
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
[#2375] Fix spacing issue with facet list
Commit: 84a41233cd53091b093954ce7c2edb1470cd98b6
https://github.com/okfn/ckan/commit/84a41233cd53091b093954ce7c2edb1470cd98b6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/public/base/javascript/modules/api-info.js
M ckan/public/base/javascript/modules/confirm-delete.js
M ckan/public/base/test/spec/modules/confirm-delete.spec.js
Log Message:
-----------
[#2809] Fix a couple of bad translation calls
Commit: f30de7d206716708cd8f272a827517caff2c402a
https://github.com/okfn/ckan/commit/f30de7d206716708cd8f272a827517caff2c402a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/public/base/less/footer.less
Log Message:
-----------
[#2375] Fix the display of the language flags
Commit: e962619ea102246367a111509e0e1947b14fc192
https://github.com/okfn/ckan/commit/e962619ea102246367a111509e0e1947b14fc192
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M setup.cfg
Log Message:
-----------
[#2774] Add isPlural as a translation keyword
Commit: d4d63067b022aa280d69ae484385f3f40f7bdf2d
https://github.com/okfn/ckan/commit/d4d63067b022aa280d69ae484385f3f40f7bdf2d
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] Show markdown as lioteral in package list snippet
Commit: 8ec841eb449eb6952f056164dbff00bdb165931a
https://github.com/okfn/ckan/commit/8ec841eb449eb6952f056164dbff00bdb165931a
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2722] fix group dataset sort
Commit: 3a0f6a8fafb87834a5e91f73304e46c441b42ece
https://github.com/okfn/ckan/commit/3a0f6a8fafb87834a5e91f73304e46c441b42ece
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] Fix bug in format_resource_items
Commit: 5f8b62d809db6df40e03278d3c4475d41bf3bc4c
https://github.com/okfn/ckan/commit/5f8b62d809db6df40e03278d3c4475d41bf3bc4c
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] Improve fi of format_resource_items
Commit: 25147b18a499d47a699a9db125c43b3b9c58fc4b
https://github.com/okfn/ckan/commit/25147b18a499d47a699a9db125c43b3b9c58fc4b
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
A ckan/public/base/javascript/config.ini
Log Message:
-----------
[#2618] Add config.ini
Commit: 4b9e6d9f0b17d7feb0ef40dc0a237947f5079dad
https://github.com/okfn/ckan/commit/4b9e6d9f0b17d7feb0ef40dc0a237947f5079dad
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
[#2375] Lower logging priority of config loading in app_global INFO -> DEBUG
Commit: f49437c4d5ef704de87560d1fe8509db0b5d9b58
https://github.com/okfn/ckan/commit/f49437c4d5ef704de87560d1fe8509db0b5d9b58
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
A ckan/lib/formatters.py
M ckan/lib/helpers.py
Log Message:
-----------
[#2707] More Resource item listing improvements i18n etc
Commit: d47a278c4371d7487f549d4d3915f5800691ae38
https://github.com/okfn/ckan/commit/d47a278c4371d7487f549d4d3915f5800691ae38
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/javascript/client.js
M ckan/public/base/test/spec/client.spec.js
Log Message:
-----------
[#2375] Fix inconsistency with Firefox date parsing
Commit: 216ac52859558c8fc84c33af4d2efe27e33dbeed
https://github.com/okfn/ckan/commit/216ac52859558c8fc84c33af4d2efe27e33dbeed
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/images/flags.png
M ckan/public/base/less/footer.less
Log Message:
-----------
[#2700] Update language box with new flags
Commit: 5c65383ddc7e2022ad1a17a2d30a9f3335b9eac9
https://github.com/okfn/ckan/commit/5c65383ddc7e2022ad1a17a2d30a9f3335b9eac9
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
[#2375] Facet list bugfix format param missing
Commit: bf2324203e3514db54d4aed73169fe5913bc67bb
https://github.com/okfn/ckan/commit/bf2324203e3514db54d4aed73169fe5913bc67bb
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/less/footer.less
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
[#2375] Fix the position of the language picker on Firefox
Commit: 7309f372ad31db46a67dc50b2b4b98f9c8f9f216
https://github.com/okfn/ckan/commit/7309f372ad31db46a67dc50b2b4b98f9c8f9f216
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/model/__init__.py
M ckan/model/domain_object.py
Log Message:
-----------
[#2816] Re-add some items to model.__init__
Conflicts:
ckan/model/__init__.py
new stuff added in both trivial
Commit: 7586fba5fd90c7754103c1230299d5f9fbaf3329
https://github.com/okfn/ckan/commit/7586fba5fd90c7754103c1230299d5f9fbaf3329
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/group/index.html
Log Message:
-----------
[#2812] Change What is Group text
Commit: 3f6f3fd3581c20da73afc25b9a450307360877b9
https://github.com/okfn/ckan/commit/3f6f3fd3581c20da73afc25b9a450307360877b9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/snippets/sort_by.html
Log Message:
-----------
[#2722] Add documentation to sort by snippet
Commit: 1aa96dec59715da9a7edad57d1cfda742c320dd7
https://github.com/okfn/ckan/commit/1aa96dec59715da9a7edad57d1cfda742c320dd7
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/package/snippets/search_form.html
Log Message:
-----------
[#2722] Re implement the sort by field on the group form
Commit: 876923329995652aa289c93f3437da86709dc43a
https://github.com/okfn/ckan/commit/876923329995652aa289c93f3437da86709dc43a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2722] Add c.sort_by_selected to group read template
Commit: 7c86e31ad775cedf1b8192d5cc05ceb321bf0aec
https://github.com/okfn/ckan/commit/7c86e31ad775cedf1b8192d5cc05ceb321bf0aec
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/media.less
M ckan/templates/home/index.html
Log Message:
-----------
[#2781] Fix display of homepage when image fails to load
Commit: b754828b6cd92ce1badec9c35018f113105afc2d
https://github.com/okfn/ckan/commit/b754828b6cd92ce1badec9c35018f113105afc2d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/snippets/group_item.html
Log Message:
-----------
[#2375] Group images now use url_for_static
Commit: c886f02118d1d0499e861cb1e1829e0c8e50d576
https://github.com/okfn/ckan/commit/c886f02118d1d0499e861cb1e1829e0c8e50d576
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2375] Fix wrong month in locale date formatting
Commit: ac8e2a013b6a0fb9cff869ec8684f83836659be9
https://github.com/okfn/ckan/commit/ac8e2a013b6a0fb9cff869ec8684f83836659be9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/package/read.html
A ckan/templates/package/snippets/resources_list.html
M ckan/templates/related/snippets/related_item.html
Log Message:
-----------
[#2375] Add blocks around package elements
This should help with extensibility allowing theme developers to
add content in between existing elements.
Commit: 54271f613bb1d0bb0106f1d356622723a31ffa60
https://github.com/okfn/ckan/commit/54271f613bb1d0bb0106f1d356622723a31ffa60
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/config/environment.py
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2375] Recursive ckan_extends tags supported ///\\\OO///\\\
Commit: 380ce93158e963d0e531d70504b78a0ae1e763f4
https://github.com/okfn/ckan/commit/380ce93158e963d0e531d70504b78a0ae1e763f4
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/__init__.py
Log Message:
-----------
[#2375] Demo version 2.0a needed for extensions
Commit: 54498dc28d8ec0f924d02e3dc6c1cf220fb67e2c
https://github.com/okfn/ckan/commit/54498dc28d8ec0f924d02e3dc6c1cf220fb67e2c
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/package/snippets/resource_item.html
Log Message:
-----------
[#2375] Hook block for resource title
Commit: c6429cc033ebad1eb97b991bf3b2134d15dbb3ad
https://github.com/okfn/ckan/commit/c6429cc033ebad1eb97b991bf3b2134d15dbb3ad
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/snippets/group.html
Log Message:
-----------
[#2826] Static url for group image
Commit: ea10c78f611fb43f23de80fdf560e8426328b833
https://github.com/okfn/ckan/commit/ea10c78f611fb43f23de80fdf560e8426328b833
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2375] Make {% ckan_extends %} assume same temp[late name
Commit: 4c176ff8d8c9671396d649a52341c2479ebde007
https://github.com/okfn/ckan/commit/4c176ff8d8c9671396d649a52341c2479ebde007
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/related/snippets/related_item.html
M ckan/templates/related/snippets/related_list.html
Log Message:
-----------
[#2801] Documented the related item snippets
Also updated an instance of {% include %} to use snippets
Commit: 17e477ed9227c7fc1590ab091c0500014a3e3e09
https://github.com/okfn/ckan/commit/17e477ed9227c7fc1590ab091c0500014a3e3e09
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
A ckan/public/base/javascript/plugins/jquery.truncator.js
Log Message:
-----------
[#2801] Add a patched version of jQuery.fn.truncate()
This was patched to add more functionality than the original
provides.
Commit: baca89a1f0774de40978adeae51eb4b4f20b4e3e
https://github.com/okfn/ckan/commit/baca89a1f0774de40978adeae51eb4b4f20b4e3e
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
A ckan/templates/ajax_snippets/related-item.html
Log Message:
-----------
[#2801] Add an ajax snippet for loading a related item
Commit: e83df46332760916f346e6ba88a257883c6946fc
https://github.com/okfn/ckan/commit/e83df46332760916f346e6ba88a257883c6946fc
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
A ckan/public/base/javascript/modules/related-item.js
M ckan/public/base/less/media.less
M ckan/public/base/less/variables.less
M ckan/public/base/test/index.html
A ckan/public/base/test/spec/modules/related-item.spec.js
M ckan/templates/snippets/scripts.html
Log Message:
-----------
[#2801] Add a related-item module
This handles toggling between truncated description text and the
full text. Updated the CSS and added some unit tests.
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: 704ad386439346c0b9a4d9840cb1f021b636d6ce
https://github.com/okfn/ckan/commit/704ad386439346c0b9a4d9840cb1f021b636d6ce
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/templates/admin/index.html
Log Message:
-----------
[#2375] Fix admin index template
Commit: f7c68be3097d8bb538cc72e66775eef91d744f1a
https://github.com/okfn/ckan/commit/f7c68be3097d8bb538cc72e66775eef91d744f1a
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
[#2825] Fix language change issue with querystring params
Commit: f04c85af9cad63777031126dc0aedddfec04bc94
https://github.com/okfn/ckan/commit/f04c85af9cad63777031126dc0aedddfec04bc94
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/config/middleware.py
Log Message:
-----------
[#2825] Bugfix for Language changing querystring issue
Commit: f3602376027a2758ac5d501cf408bc1bb87c9bc2
https://github.com/okfn/ckan/commit/f3602376027a2758ac5d501cf408bc1bb87c9bc2
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-09 (Thu, 09 Aug 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2375] Fix translation strings for friendly dates
Commit: 1b39c41f179adc9cd9c8062c65b709be422e4bde
https://github.com/okfn/ckan/commit/1b39c41f179adc9cd9c8062c65b709be422e4bde
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#2375] Move url for primer etc so they don't get eaten
Commit: 9285ecd27da4960e488ae05e6c8565157a69610a
https://github.com/okfn/ckan/commit/9285ecd27da4960e488ae05e6c8565157a69610a
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/templates/development/snippets/form.html
Log Message:
-----------
[#2375] Add textarea to primer
Commit: c531c692034daf4f466d32ae1a82dd20bb910ddb
https://github.com/okfn/ckan/commit/c531c692034daf4f466d32ae1a82dd20bb910ddb
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2375] Add extra hook block in resource read template
Commit: 0e7fd02d80bd822c85a5d754dec1f10010273cbe
https://github.com/okfn/ckan/commit/0e7fd02d80bd822c85a5d754dec1f10010273cbe
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/templates/snippets/language_selector.html
Log Message:
-----------
[#2375] Cleanup of CKAN_CURRENT_URL as issue also affects legacy templates
Commit: 84711c6bdb2f8f7fe56ba3c5ea1c58752ebff2ed
https://github.com/okfn/ckan/commit/84711c6bdb2f8f7fe56ba3c5ea1c58752ebff2ed
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2375] Cleanup formatters to be more private
Commit: 3384ad91fc8c64d80f4a2218320a04a34eb4c551
https://github.com/okfn/ckan/commit/3384ad91fc8c64d80f4a2218320a04a34eb4c551
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2375] Cleanup formatters private MONTH_FUNCTIONS
Commit: 3d78e31f12ab743e9b057b4f3ea7bdc9566a2081
https://github.com/okfn/ckan/commit/3d78e31f12ab743e9b057b4f3ea7bdc9566a2081
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2375] No longer use template path in ckan_extends tag
Commit: b53c8c85e38c0cc3007736f28f6ee947d3e6acb1
https://github.com/okfn/ckan/commit/b53c8c85e38c0cc3007736f28f6ee947d3e6acb1
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/config/environment.py
M ckan/lib/app_globals.py
Log Message:
-----------
[#2375] fix app globals initialisation issue
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: 5d983a7dc36b5ee7a5c1632c6d6fd4d82591ed19
https://github.com/okfn/ckan/commit/5d983a7dc36b5ee7a5c1632c6d6fd4d82591ed19
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] Allow facet title set in config
Commit: 7ce6570df171ab544fab7af28987d5c64a6d3ca6
https://github.com/okfn/ckan/commit/7ce6570df171ab544fab7af28987d5c64a6d3ca6
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
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/helpers.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/logic/validators.py
M ckan/model/meta.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
A ckan/templates_legacy/activity_streams/activity_stream_items.html
R ckan/templates_legacy/activity_streams/added_tag.html
R ckan/templates_legacy/activity_streams/changed_group.html
R ckan/templates_legacy/activity_streams/changed_package.html
R ckan/templates_legacy/activity_streams/changed_package_extra.html
R ckan/templates_legacy/activity_streams/changed_resource.html
R ckan/templates_legacy/activity_streams/changed_user.html
R ckan/templates_legacy/activity_streams/deleted_group.html
R ckan/templates_legacy/activity_streams/deleted_package.html
R ckan/templates_legacy/activity_streams/deleted_package_extra.html
R ckan/templates_legacy/activity_streams/deleted_related_item.html
R ckan/templates_legacy/activity_streams/deleted_resource.html
R ckan/templates_legacy/activity_streams/follow_dataset.html
R ckan/templates_legacy/activity_streams/follow_user.html
R ckan/templates_legacy/activity_streams/new_group.html
R ckan/templates_legacy/activity_streams/new_package.html
R ckan/templates_legacy/activity_streams/new_package_extra.html
R ckan/templates_legacy/activity_streams/new_related_item.html
R ckan/templates_legacy/activity_streams/new_resource.html
R ckan/templates_legacy/activity_streams/new_user.html
R ckan/templates_legacy/activity_streams/removed_tag.html
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch 'master' into 2375-demo-theme-development
Conflicts:
ckan/templates_legacy/activity_streams/added_tag.html
ckan/templates_legacy/activity_streams/changed_group.html
ckan/templates_legacy/activity_streams/changed_package.html
ckan/templates_legacy/activity_streams/changed_package_extra.html
ckan/templates_legacy/activity_streams/changed_resource.html
ckan/templates_legacy/activity_streams/changed_user.html
ckan/templates_legacy/activity_streams/deleted_group.html
ckan/templates_legacy/activity_streams/deleted_package.html
ckan/templates_legacy/activity_streams/deleted_package_extra.html
ckan/templates_legacy/activity_streams/deleted_resource.html
ckan/templates_legacy/activity_streams/new_group.html
ckan/templates_legacy/activity_streams/new_package.html
ckan/templates_legacy/activity_streams/new_package_extra.html
ckan/templates_legacy/activity_streams/new_resource.html
ckan/templates_legacy/activity_streams/new_user.html
ckan/templates_legacy/activity_streams/removed_tag.html
all deleted
Commit: a40a369be6695a3c112f866b3bf1491c23485ecc
https://github.com/okfn/ckan/commit/a40a369be6695a3c112f866b3bf1491c23485ecc
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
A ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#2375] Convert activity stream items template
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: d88ca4d56dd8befd5dde7f608bba8d1cb46373ec
https://github.com/okfn/ckan/commit/d88ca4d56dd8befd5dde7f608bba8d1cb46373ec
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:
-----------
Merge branch 'master' into 2375-demo-theme-development
Commit: c547903d7904a44fbeddc57317b145b0c49a2897
https://github.com/okfn/ckan/commit/c547903d7904a44fbeddc57317b145b0c49a2897
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/controllers/home.py
Log Message:
-----------
[#2375] show group dataset description on home page
Commit: 58381ffa36f1da939522eb58617d17d7688e0d74
https://github.com/okfn/ckan/commit/58381ffa36f1da939522eb58617d17d7688e0d74
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2375] nicer user link formatting
Commit: a6fa5a0f743342ae6b24585abb4fdb64e86bd495
https://github.com/okfn/ckan/commit/a6fa5a0f743342ae6b24585abb4fdb64e86bd495
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
Log Message:
-----------
[#2837] Try and normalize the styling of checkboxes
Now have the same vertical alignment on FF/Webkit on Ubuntu and Firefox
on the Mac. Webkit on the Mac is slightly too high.
Commit: f7bc1c92059a36c85824f3e77f66297dfde9b6d3
https://github.com/okfn/ckan/commit/f7bc1c92059a36c85824f3e77f66297dfde9b6d3
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/masthead.less
Log Message:
-----------
[#2840] Align the tagline to the left
This can be switched back to the right by adding a class of
.tagline-right to the hgroup element if required.
Commit: 42b38160b4ddc27be36ceec7b1a7c4c618425d2d
https://github.com/okfn/ckan/commit/42b38160b4ddc27be36ceec7b1a7c4c618425d2d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/javascript/pubsub.js
M ckan/public/base/test/index.html
Log Message:
-----------
[#2834] Add ability to defer publish() calls until later
Commit: 092d25723f3e8f911b184ec10d50a37cc65be735
https://github.com/okfn/ckan/commit/092d25723f3e8f911b184ec10d50a37cc65be735
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/javascript/module.js
M ckan/public/base/test/spec/module.spec.js
A ckan/public/base/test/spec/pubsub.spec.js
Log Message:
-----------
[#2834] module.initialize() now defers publish calls
It will now wait until all modules have loaded before publishing
the events to ensure that all modules have a chance of receiving
them regardless of order.
Commit: a317fb90f0c3142e1cefe7ad76aaa30457b2d5da
https://github.com/okfn/ckan/commit/a317fb90f0c3142e1cefe7ad76aaa30457b2d5da
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/templates/snippets/scripts.html
Log Message:
-----------
[#2841] Add missing form warning script
Commit: 70c3d22b32e64f30abd55a4e0b594dffb4c8766a
https://github.com/okfn/ckan/commit/70c3d22b32e64f30abd55a4e0b594dffb4c8766a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/javascript/client.js
M ckan/public/base/test/spec/client.spec.js
Log Message:
-----------
[#2835] Added Client#getTemplate() method
Commit: e53417f9976d6df7dc6c64a03dbf0f775aee0987
https://github.com/okfn/ckan/commit/e53417f9976d6df7dc6c64a03dbf0f775aee0987
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/public/base/test/index.html
Log Message:
-----------
[#2835] Updated loadFixture() to use Client#getTemplate()
Commit: 5654b6a0dc95ad444d60a0deda7310e14d9ce5a2
https://github.com/okfn/ckan/commit/5654b6a0dc95ad444d60a0deda7310e14d9ce5a2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2375] Update coding standards with missing todo's
Commit: b31316c068260fdd12fc215230a25932b2f767fd
https://github.com/okfn/ckan/commit/b31316c068260fdd12fc215230a25932b2f767fd
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
A ckan/public/base/javascript/modules/confirm-action.js
R ckan/public/base/javascript/modules/confirm-delete.js
M ckan/public/base/test/index.html
A ckan/public/base/test/spec/modules/confirm-action.spec.js
R ckan/public/base/test/spec/modules/confirm-delete.spec.js
M ckan/templates/group/snippets/group_form.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/related/snippets/related_form.html
M ckan/templates/snippets/scripts.html
Log Message:
-----------
[#2375] Rename confirm-delete module to confirm-action
Commit: c045d2c113311ce37e88cc7325614332b5060502
https://github.com/okfn/ckan/commit/c045d2c113311ce37e88cc7325614332b5060502
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M doc/frontend-development.rst
Log Message:
-----------
[#2375] Update front end docs
* Add links to the other pages
* Update testing section with more examples
Commit: a4780ad9a5b53d7837bfbe15f5fcaf908e55ba90
https://github.com/okfn/ckan/commit/a4780ad9a5b53d7837bfbe15f5fcaf908e55ba90
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M doc/extension-templating.rst
M doc/templating.rst
Log Message:
-----------
[#2375] Update documentation for {% ckan_extends %}
Commit: f939f99cf2078c00eea297afb36d94a86b03b811
https://github.com/okfn/ckan/commit/f939f99cf2078c00eea297afb36d94a86b03b811
Author: kindly <kindly at gmail.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M ckan/controllers/home.py
Log Message:
-----------
[#2375] get featured groups from search facets
Commit: 865d72764867502e1290df87f7416992f60f2875
https://github.com/okfn/ckan/commit/865d72764867502e1290df87f7416992f60f2875
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-13 (Mon, 13 Aug 2012)
Changed paths:
M doc/frontend-development.rst
A doc/template-tutorial.rst
Log Message:
-----------
[#2375] Add a quick template tutorial
Commit: 6055b064143353a68fd1ebb2684903e6e4c24093
https://github.com/okfn/ckan/commit/6055b064143353a68fd1ebb2684903e6e4c24093
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/less/module.less
M ckan/templates/snippets/package_grid.html
A ckan/templates/snippets/package_item.html
M ckan/templates/snippets/package_list.html
Log Message:
-----------
[#2375] Fix the display of the package_grid.html
Floated items were getting caught on the previous row if the heights
varied too much.
Commit: 2fdd2beccbf396497e255ffb803675f3c492ff2d
https://github.com/okfn/ckan/commit/2fdd2beccbf396497e255ffb803675f3c492ff2d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/javascript/main.js
Log Message:
-----------
[#2375] Remove old jQuery.when() in ckan.initialize()
Good old IE8 for picking this one up.
Commit: 129352c3751336681c490c0d532814d56ce26138
https://github.com/okfn/ckan/commit/129352c3751336681c490c0d532814d56ce26138
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/less/module.less
M ckan/templates/home/index.html
Log Message:
-----------
[#2375] Fix up homepage display in IE8
Commit: 848bb75481536ce4d0a79aeb8271e6e39cbca619
https://github.com/okfn/ckan/commit/848bb75481536ce4d0a79aeb8271e6e39cbca619
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/controllers/home.py
Log Message:
-----------
[#2375] Fix up group selection for home page to use various methods including config option
Commit: 97d92bacdf64847772b2e0b6c70e58508dfbeb2a
https://github.com/okfn/ckan/commit/97d92bacdf64847772b2e0b6c70e58508dfbeb2a
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/javascript/modules/confirm-action.js
Log Message:
-----------
[#2808] Centre the confirm action dialog vertically
Commit: 9ee4b309eac35c4657ffbea26657bb467dca0a2f
https://github.com/okfn/ckan/commit/9ee4b309eac35c4657ffbea26657bb467dca0a2f
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#2375] Update CSS with IE8 fixes
Commit: 0ac6b3db2ca78aa4719347b0e5321acd9911ebe2
https://github.com/okfn/ckan/commit/0ac6b3db2ca78aa4719347b0e5321acd9911ebe2
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#2375] Add hooks to the resource_read template
Commit: ddc98cc5eec70c328733642c66c4205d7885bfd4
https://github.com/okfn/ckan/commit/ddc98cc5eec70c328733642c66c4205d7885bfd4
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/ajax_snippets/api_info.html
Log Message:
-----------
[#2375] Add missing links to the api_info template
Commit: e4b164ff8eac1d8f5b4e02bc5012dcada8bd14bb
https://github.com/okfn/ckan/commit/e4b164ff8eac1d8f5b4e02bc5012dcada8bd14bb
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
M ckan/public/base/less/module.less
Log Message:
-----------
[#2375] Update styles
Commit: 532a6b07c2780a0fa31aef8ec231f714334d12d6
https://github.com/okfn/ckan/commit/532a6b07c2780a0fa31aef8ec231f714334d12d6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
Log Message:
-----------
[#2375] Style info text for full width inputs
Commit: 8adcc5a106d897c29d44ff3fe589521b024c11f6
https://github.com/okfn/ckan/commit/8adcc5a106d897c29d44ff3fe589521b024c11f6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Add a form.info() macro to create help text
Commit: c710e3f12db47716de6d7d000ae859e69e803b77
https://github.com/okfn/ckan/commit/c710e3f12db47716de6d7d000ae859e69e803b77
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
A ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Move autoform macro into it's own file
This allows us to dynamically pick the form macro to use and cleans
up the template nicely.
Commit: f687fafb33fda32a0da8f678528e8bb92af257c9
https://github.com/okfn/ckan/commit/f687fafb33fda32a0da8f678528e8bb92af257c9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
Log Message:
-----------
[#2375] Update the info box css
Commit: 1a3839a6d951d57783e9f1e11e4485f721fb28e6
https://github.com/okfn/ckan/commit/1a3839a6d951d57783e9f1e11e4485f721fb28e6
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/admin/config.html
Log Message:
-----------
[#2375] Update config to use new auto form
Commit: 9d097d21a863b27592fffc27ee8c47882a4f6113
https://github.com/okfn/ckan/commit/9d097d21a863b27592fffc27ee8c47882a4f6113
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/macros/autoform.html
Log Message:
-----------
[#2375] Add support for error summaries to autoform macro
Commit: 7f181de66b234730db2a0659e81c9a4a8aa2c4e9
https://github.com/okfn/ckan/commit/7f181de66b234730db2a0659e81c9a4a8aa2c4e9
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/public/base/css/main.css
M ckan/public/base/less/forms.less
M ckan/templates/macros/form.html
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#2375] Update all info blocks to sit below inputs
To make info sit inline add a class of .info-inline to the info
element.
Commit: 634b57b74ecc4556c1497d4d0a747a42be23e89b
https://github.com/okfn/ckan/commit/634b57b74ecc4556c1497d4d0a747a42be23e89b
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Update form.info() to allow inline info boxes
Commit: 36bd991cee2a79299dff061103f931523d420c64
https://github.com/okfn/ckan/commit/36bd991cee2a79299dff061103f931523d420c64
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-08-14 (Tue, 14 Aug 2012)
Changed paths:
M ckan/templates/macros/form.html
Log Message:
-----------
[#2375] Pass extra_html string into input_block macro
This prevents the info appearing before the errors.
Commit: 35f9b0ee033cca927c1ff7fab9a1bbf41f96706e
https://github.com/okfn/ckan/commit/35f9b0ee033cca927c1ff7fab9a1bbf41f96706e
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/templates/macros/autoform.html
Log Message:
-----------
[#2375] Allow extra html in autoforms
Commit: cffa7bc15e1ccf93eb351fa314bd28e01313b0eb
https://github.com/okfn/ckan/commit/cffa7bc15e1ccf93eb351fa314bd28e01313b0eb
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/templates/user/read.html
Log Message:
-----------
[#2375] Disable dashboard for phase 3
Commit: ef1b588e3b5e462fef0dfb386491e57217bb0e28
https://github.com/okfn/ckan/commit/ef1b588e3b5e462fef0dfb386491e57217bb0e28
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[#2856] Fix 500 on non-existant related item
Commit: b26f3303c4f666abb7d99e04f9d2c7fd22ca495c
https://github.com/okfn/ckan/commit/b26f3303c4f666abb7d99e04f9d2c7fd22ca495c
Author: tobes <toby.junk at gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 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/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
M ckan/html_resources/__init__.py
M ckan/i18n/ckan.pot
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/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/extract.py
A ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/jinja_extensions.py
M ckan/lib/maintain.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.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
A ckan/migration/versions/060_add_system_info_table.py
M ckan/model/__init__.py
M ckan/model/authz.py
M ckan/model/domain_object.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
A ckan/model/system_info.py
M ckan/new_authz.py
A ckan/public/base/css/fuchsia.css
A ckan/public/base/css/green.css
M ckan/public/base/css/main.css
A ckan/public/base/css/maroon.css
A ckan/public/base/css/red.css
A ckan/public/base/i18n/bg.js
A ckan/public/base/i18n/ca.js
A ckan/public/base/i18n/cs_CZ.js
A ckan/public/base/i18n/de.js
A ckan/public/base/i18n/el.js
A ckan/public/base/i18n/es.js
A ckan/public/base/i18n/fi.js
A ckan/public/base/i18n/fr.js
A ckan/public/base/i18n/hu.js
A ckan/public/base/i18n/it.js
A ckan/public/base/i18n/lt.js
A ckan/public/base/i18n/lv.js
A ckan/public/base/i18n/nl.js
A ckan/public/base/i18n/no.js
A ckan/public/base/i18n/pl.js
A ckan/public/base/i18n/pt_BR.js
A ckan/public/base/i18n/ro.js
A ckan/public/base/i18n/ru.js
A ckan/public/base/i18n/sk.js
A ckan/public/base/i18n/sl.js
A ckan/public/base/i18n/sq.js
A ckan/public/base/i18n/sr.js
A ckan/public/base/i18n/sr_Latn.js
A ckan/public/base/i18n/sv.js
A ckan/public/base/i18n/zh_TW.js
A ckan/public/base/images/flags.png
M ckan/public/base/javascript/client.js
A ckan/public/base/javascript/config.ini
M ckan/public/base/javascript/i18n.js
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/module.js
M ckan/public/base/javascript/modules/api-info.js
M ckan/public/base/javascript/modules/autocomplete.js
A ckan/public/base/javascript/modules/confirm-action.js
R ckan/public/base/javascript/modules/confirm-delete.js
A ckan/public/base/javascript/modules/custom-fields.js
A ckan/public/base/javascript/modules/related-item.js
M ckan/public/base/javascript/modules/resource-upload-field.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
A ckan/public/base/javascript/plugins/jquery.truncator.js
M ckan/public/base/javascript/pubsub.js
M ckan/public/base/less/ckan.less
M ckan/public/base/less/dataset.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/group.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/less/module.less
M ckan/public/base/less/nav.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/prose.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
M ckan/public/base/test/index.html
M ckan/public/base/test/primer/index.html
M ckan/public/base/test/spec/ckan.spec.js
M ckan/public/base/test/spec/client.spec.js
M ckan/public/base/test/spec/module.spec.js
M ckan/public/base/test/spec/modules/autocomplete.spec.js
A ckan/public/base/test/spec/modules/confirm-action.spec.js
R ckan/public/base/test/spec/modules/confirm-delete.spec.js
A ckan/public/base/test/spec/modules/custom-fields.spec.js
A ckan/public/base/test/spec/modules/related-item.spec.js
A ckan/public/base/test/spec/pubsub.spec.js
M ckan/public/base/vendor/html5.js
M ckan/public/base/vendor/select2/README.md
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
M ckan/public/base/vendor/select2/select2.min.js
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
A ckan/public/scripts/vendor/recline/css/recline.css
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
A ckan/templates/activity_streams/activity_stream_items.html
R ckan/templates/activity_streams/follow_dataset.html
R ckan/templates/activity_streams/follow_user.html
M ckan/templates/admin/authz.html
A ckan/templates/admin/config.html
M ckan/templates/admin/index.html
M ckan/templates/ajax_snippets/api_info.html
A ckan/templates/ajax_snippets/custom_fields.html
A ckan/templates/ajax_snippets/related-item.html
M ckan/templates/base.html
M ckan/templates/development/snippets/form.html
M ckan/templates/error_document_template.html
M ckan/templates/footer.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/edit.html
M ckan/templates/group/index.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/header.html
M ckan/templates/home/about.html
M ckan/templates/home/index.html
A ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/new.html
M ckan/templates/package/new_package_metadata.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/related_list.html
A ckan/templates/package/resource_api_data.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/data_api_button.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_item.html
A ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/search_form.html
M ckan/templates/page.html
M ckan/templates/related/confirm_delete.html
A ckan/templates/related/dashboard.html
M ckan/templates/related/edit.html
M ckan/templates/related/new.html
M ckan/templates/related/snippets/related_form.html
M ckan/templates/related/snippets/related_item.html
M ckan/templates/related/snippets/related_list.html
M ckan/templates/snippets/custom_form_fields.html
M ckan/templates/snippets/debug.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
A ckan/templates/snippets/internal-tracking.html
M ckan/templates/snippets/language_selector.html
M ckan/templates/snippets/package_grid.html
A ckan/templates/snippets/package_item.html
M ckan/templates/snippets/package_list.html
M ckan/templates/snippets/recline-extra-footer.html
M ckan/templates/snippets/recline-extra-header.html
M ckan/templates/snippets/related.html
M ckan/templates/snippets/scripts.html
M ckan/templates/snippets/sort_by.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout.html
M ckan/templates/user/new.html
M ckan/templates/user/perform_reset.html
M ckan/templates/user/read.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/login_form.html
A ckan/templates/user/snippets/things_to_do.html
M ckan/templates_legacy/_util.html
A ckan/templates_legacy/activity_streams/activity_stream_items.html
R ckan/templates_legacy/activity_streams/added_tag.html
R ckan/templates_legacy/activity_streams/changed_group.html
R ckan/templates_legacy/activity_streams/changed_package.html
R ckan/templates_legacy/activity_streams/changed_package_extra.html
R ckan/templates_legacy/activity_streams/changed_resource.html
R ckan/templates_legacy/activity_streams/changed_user.html
R ckan/templates_legacy/activity_streams/deleted_group.html
R ckan/templates_legacy/activity_streams/deleted_package.html
R ckan/templates_legacy/activity_streams/deleted_package_extra.html
R ckan/templates_legacy/activity_streams/deleted_resource.html
R ckan/templates_legacy/activity_streams/new_group.html
R ckan/templates_legacy/activity_streams/new_package.html
R ckan/templates_legacy/activity_streams/new_package_extra.html
R ckan/templates_legacy/activity_streams/new_resource.html
R ckan/templates_legacy/activity_streams/new_user.html
R ckan/templates_legacy/activity_streams/removed_tag.html
M ckan/templates_legacy/facets.html
M ckan/templates_legacy/group/read.html
M ckan/templates_legacy/js_strings.html
M ckan/templates_legacy/layout_base.html
A ckan/templates_legacy/package/followers.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/read.html
M ckan/templates_legacy/package/related_list.html
M ckan/templates_legacy/package/resource_embedded_dataviewer.html
M ckan/templates_legacy/package/resource_read.html
M ckan/templates_legacy/package/search.html
A ckan/templates_legacy/related/add-related.html
A ckan/templates_legacy/related/dashboard.html
A ckan/templates_legacy/related/related_list.html
A ckan/templates_legacy/snippets/internal-tracking.html
A ckan/templates_legacy/snippets/recline-extra-footer.html
A ckan/templates_legacy/snippets/recline-extra-header.html
A ckan/templates_legacy/user/dashboard.html
M ckan/templates_legacy/user/edit_user_form.html
A ckan/templates_legacy/user/followers.html
M ckan/templates_legacy/user/read.html
M ckan/tests/forms/test_authz.py
M ckan/tests/forms/test_package.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/test_admin.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_package_edit_authz.py
M ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_related.py
M ckan/tests/functional/test_revision.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_upload.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_action.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/pylons_controller.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/organizations/forms.py
M ckanext/publisher_form/templates/publisher_read.html
M ckanext/stats/controller.py
M ckanext/stats/plugin.py
A ckanext/stats/public/ckanext/stats/css/stats.css
A ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
A ckanext/stats/public/ckanext/stats/javascript/modules/stats-nav.js
A ckanext/stats/public/ckanext/stats/test/fixtures/table.html
A ckanext/stats/public/ckanext/stats/test/index.html
A ckanext/stats/public/ckanext/stats/test/spec/modules/plot.spec.js
A ckanext/stats/public/ckanext/stats/test/spec/modules/stats-nav.spec.js
A ckanext/stats/public/ckanext/stats/vendor/excanvas.js
A ckanext/stats/public/ckanext/stats/vendor/jquery.flot.js
R ckanext/stats/templates/__init__.py
R ckanext/stats/templates/ckanext/__init__.py
R ckanext/stats/templates/ckanext/stats/__init__.py
M ckanext/stats/templates/ckanext/stats/index.html
R ckanext/stats/templates/ckanext/stats/leaderboard.html
A ckanext/stats/templates_legacy/__init__.py
A ckanext/stats/templates_legacy/ckanext/__init__.py
A ckanext/stats/templates_legacy/ckanext/stats/__init__.py
A ckanext/stats/templates_legacy/ckanext/stats/index.html
A ckanext/stats/templates_legacy/ckanext/stats/leaderboard.html
A doc/apps-ideas.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/extension-templating.rst
A doc/frontend-development.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-module-tutorial.rst
M doc/paster.rst
M doc/solr-setup.rst
A doc/template-tutorial.rst
M doc/templating.rst
A doc/toolkit.rst
M pip-requirements.txt
M setup.cfg
M setup.py
Log Message:
-----------
Merge branch '2375-demo-theme-development' into 2375-demo-theme-stable
Conflicts:
ckan/lib/helpers.py
_nav_named_link conflict but use new code
ckan/templates/package/new_resource.html
trivial title to subtitle change
Compare: https://github.com/okfn/ckan/compare/2ac24b76f922...b26f3303c4f6
More information about the ckan-changes
mailing list