[ckan-changes] [okfn/ckan] 0b3089: [2347] Implemented related dashboard with filter o...

GitHub noreply at github.com
Wed Jul 25 15:16:16 UTC 2012


  Branch: refs/heads/extras_dict_dictize_string_handling
  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: 2843e91437ff77151c6fb84e049c74231588e8b2
      https://github.com/okfn/ckan/commit/2843e91437ff77151c6fb84e049c74231588e8b2
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/authorization_group.py
    M ckan/controllers/datastore.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    A ckan/i18n/check_po_files.py
    A ckan/lib/accept.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    A ckan/lib/maintain.py
    M ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/model/tag.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/layout.html
    A ckan/templates/snippets/follow_button.html
    M ckan/templates/user/layout.html
    R ckan/tests/functional/test_autoneg.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_user.py
    A ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/test_versions.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/templates/organization_read.html
    M doc/apiv3.rst
    A doc/coding-standards.rst
    M doc/configuration.rst
    M doc/geospatial.rst
    A doc/harvesting.rst
    M doc/index.rst
    A doc/install-from-package-amazon.rst
    A doc/install-from-package-virtualbox.rst
    M doc/install-from-package.rst
    M doc/install-from-source.rst
    M doc/post-installation.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M profile_tests.py
    M requires/lucid_missing.txt
    M requires/lucid_present.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge from master


  Commit: 0170240e93b8725fefd9c71cc21cb794648f2cf0
      https://github.com/okfn/ckan/commit/0170240e93b8725fefd9c71cc21cb794648f2cf0
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Fixing bad merge


  Commit: 167e38f846cbe10a5496b56137c98fbbe38efe8e
      https://github.com/okfn/ckan/commit/167e38f846cbe10a5496b56137c98fbbe38efe8e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/schema-1.4.xml
    M ckan/controllers/api.py
    M ckan/controllers/datastore.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/follower.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    A ckan/public/scripts/vendor/flot/0.7/excanvas.js
    M ckan/public/scripts/vendor/html5shiv/html5.js
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/templates/activity_streams/follow_dataset.html
    A ckan/templates/activity_streams/follow_user.html
    M ckan/templates/group/read.html
    M ckan/templates/js_strings.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/snippets/recline-extra-footer.html
    A ckan/templates/snippets/recline-extra-header.html
    A ckan/templates/user/dashboard.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_follow.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_package.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_tag_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_plugins.py
    M ckanext/organizations/controllers.py
    M ckanext/organizations/forms.py
    M ckanext/organizations/templates/organization_layout.html
    M ckanext/organizations/templates/organization_package_form.html
    M ckanext/publisher_form/forms.py
    M ckanext/stats/controller.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/test_tag_vocab_plugin.py
    M doc/apiv3.rst
    M doc/coding-standards.rst
    M doc/configuration.rst
    M doc/datastore.rst
    M doc/install-from-source.rst
    A doc/release-cycle.rst
    M doc/solr-setup.rst
    M doc/test.rst
    M doc/writing-extensions.rst
    M pip-requirements-test.txt
    M pip-requirements.txt
    R requires/lucid_conflict.txt
    R requires/lucid_missing.txt
    R requires/lucid_present.txt
    M setup.py

  Log Message:
  -----------
  Merge


  Commit: 9a072d30f89429e3913a7f4bca237a19aea202c8
      https://github.com/okfn/ckan/commit/9a072d30f89429e3913a7f4bca237a19aea202c8
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Updated after dodgy merge


  Commit: cab9e7ddb8efdae373c97fc8523063b3e60d5320
      https://github.com/okfn/ckan/commit/cab9e7ddb8efdae373c97fc8523063b3e60d5320
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M ckan/templates/related/dashboard.html

  Log Message:
  -----------
  Make sure that featured item checkbox is checked when filtered


  Commit: 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: 523c8f49ee361cc17e291538adb465444d100afd
      https://github.com/okfn/ckan/commit/523c8f49ee361cc17e291538adb465444d100afd
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/controllers/related.py

  Log Message:
  -----------
  [#2347] Fix race condition on updating the related view_count.


  Commit: c8041d27e0fe39b310ad09e8bd64ef9da73d4a7e
      https://github.com/okfn/ckan/commit/c8041d27e0fe39b310ad09e8bd64ef9da73d4a7e
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/plugins.py
    M ckan/model/related.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  [#2347] Improve lookup of related-items count.

Rather than pulling out all the related items of a dataset in order to count
them; run a COUNT() sql-statement.


  Commit: 8b7adcabd23f5d376c5693ebd043cbc0ceaa27cc
      https://github.com/okfn/ckan/commit/8b7adcabd23f5d376c5693ebd043cbc0ceaa27cc
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py

  Log Message:
  -----------
  [#2347] Dictize the related items in user_dictize.


  Commit: 15f32dd1e8166e448151d123be1fb5aabca7c290
      https://github.com/okfn/ckan/commit/15f32dd1e8166e448151d123be1fb5aabca7c290
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-17 (Tue, 17 Jul 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/templates/activity_streams/new_related_item.html

  Log Message:
  -----------
  [#2347] Correct rendering of new related item in activity stream.


  Commit: 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: 3e0de2715b93c9f6c243cdf589f7697e36fd35f5
      https://github.com/okfn/ckan/commit/3e0de2715b93c9f6c243cdf589f7697e36fd35f5
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M LICENSE.txt

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 61add9bf6c9530b01c5fddc3062a03a8b5fd2f1f
      https://github.com/okfn/ckan/commit/61add9bf6c9530b01c5fddc3062a03a8b5fd2f1f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  Merge branch '2575-license-i18n'


  Commit: 40b6cca0a9dd7e6e55819d60c24532cedec3df85
      https://github.com/okfn/ckan/commit/40b6cca0a9dd7e6e55819d60c24532cedec3df85
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-24 (Tue, 24 Jul 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Fix double counting of dataset and resource views

Recent dataset views and total and recent resource views were being
double counted by CKAN's internal page view tracking, fix so that each
page view is counted only once (double-counting of total dataset page
views was already fixed by a previous commit)


  Commit: 37e02618b4761eb42ab95b815416802b0a796cce
      https://github.com/okfn/ckan/commit/37e02618b4761eb42ab95b815416802b0a796cce
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Added support for specifying the sort direction

Previously we only allowed the sort direction to be asc for groups names
and desc for packages (package counts).  Now users can specify a sort_direction
to have a little more control.


  Commit: b4e5cecbc6b340d7615775cc350bafefa5e47c19
      https://github.com/okfn/ckan/commit/b4e5cecbc6b340d7615775cc350bafefa5e47c19
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  change group_list sorting to use sort


  Commit: 8cb4e57ac66202646c62b3752de3227c4ff8f178
      https://github.com/okfn/ckan/commit/8cb4e57ac66202646c62b3752de3227c4ff8f178
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/model/authz.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/tests/forms/test_package.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py

  Log Message:
  -----------
  Merge branch 'defect-1345-memory-leak'


  Commit: 7fd115f63f7e275d017af8b3881c242b10054dd7
      https://github.com/okfn/ckan/commit/7fd115f63f7e275d017af8b3881c242b10054dd7
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/auth/create.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  [#2347] Move authorization check out of related_create action

and into corresponding auth function.


  Commit: 348d7a1e69c6531ff4b3aed29bb5965f4a53ee08
      https://github.com/okfn/ckan/commit/348d7a1e69c6531ff4b3aed29bb5965f4a53ee08
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/get.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: c2e7c6718cfeab3d04abc038b604d0b56f0d85bd
      https://github.com/okfn/ckan/commit/c2e7c6718cfeab3d04abc038b604d0b56f0d85bd
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  [#2437] Fix related schema.  Featured should be integer.


  Commit: 794d86b298283f43c41cf6bcd24af848f95923a1
      https://github.com/okfn/ckan/commit/794d86b298283f43c41cf6bcd24af848f95923a1
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/logic/action/update.py
    M ckan/logic/auth/update.py
    M ckan/tests/functional/test_related.py

  Log Message:
  -----------
  [#2437] Move authorization check from related_update action

into corresponding auth function.


  Commit: 36e30adb240e897be50c7e3165cb43e575519304
      https://github.com/okfn/ckan/commit/36e30adb240e897be50c7e3165cb43e575519304
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  re-add comment lost in merge


  Commit: 80155bf1901ca7682a82a39ee88e129291348285
      https://github.com/okfn/ckan/commit/80155bf1901ca7682a82a39ee88e129291348285
  Author: Ian Murray <ian.murray at okfn.org>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/model/related.py
    R ckan/templates/_snippet/add-related.html
    M ckan/templates/_util.html
    A ckan/templates/activity_streams/deleted_related_item.html
    A ckan/templates/activity_streams/new_related_item.html
    M ckan/templates/package/layout.html
    R ckan/templates/package/related_list.html
    A ckan/templates/related/add-related.html
    A ckan/templates/related/dashboard.html
    A ckan/templates/related/related_list.html
    M ckan/templates/user/read.html
    M ckan/tests/functional/test_related.py
    A doc/apps-ideas.rst
    M doc/configuration.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'feature-2347-related-dashboard'


  Commit: 759f3b8b73a5f9fe2b7c3bcb13ebceccbd516e8a
      https://github.com/okfn/ckan/commit/759f3b8b73a5f9fe2b7c3bcb13ebceccbd516e8a
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/model/authz.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/tests/forms/test_package.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 4ce2632c121189583a6ee475eae16a8ac6ee24af
      https://github.com/okfn/ckan/commit/4ce2632c121189583a6ee475eae16a8ac6ee24af
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  [#2388] Fix spacing typos that were causing test to be skipped


  Commit: ed7e38b0b9a015688a8508549d13dc5ededf1fa8
      https://github.com/okfn/ckan/commit/ed7e38b0b9a015688a8508549d13dc5ededf1fa8
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  [#2388] Fix datastore controller test

The old test did not take into account the new default authorization
settings (Non logged in users can not push to the datastore).


  Commit: 7a387bef5d621c9e548139375b2ffc548506326c
      https://github.com/okfn/ckan/commit/7a387bef5d621c9e548139375b2ffc548506326c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/model/related.py
    R ckan/templates/_snippet/add-related.html
    M ckan/templates/_util.html
    A ckan/templates/activity_streams/deleted_related_item.html
    A ckan/templates/activity_streams/new_related_item.html
    M ckan/templates/package/layout.html
    R ckan/templates/package/related_list.html
    A ckan/templates/related/add-related.html
    A ckan/templates/related/dashboard.html
    A ckan/templates/related/related_list.html
    M ckan/templates/user/read.html
    M ckan/tests/functional/test_related.py
    A doc/apps-ideas.rst
    M doc/configuration.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


  Commit: 5050a90a6f3561062ecb19bec4ee8cb9df134d75
      https://github.com/okfn/ckan/commit/5050a90a6f3561062ecb19bec4ee8cb9df134d75
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  Merge branch '2388-out-of-the-box-auth-settings' of https://github.com/okfn/ckan into 2388-out-of-the-box-auth-settings


  Commit: e573ca16344e272a487f49904a2318a76d692e0c
      https://github.com/okfn/ckan/commit/e573ca16344e272a487f49904a2318a76d692e0c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/tests/functional/test_datastore.py

  Log Message:
  -----------
  Merge branch '2388-out-of-the-box-auth-settings'


  Commit: ceee1259f75a6f697386d9ae4a856eee4861b7fc
      https://github.com/okfn/ckan/commit/ceee1259f75a6f697386d9ae4a856eee4861b7fc
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  [xs] Skip hierarchical cte test on sqlite


  Commit: 7da6b57f8efdc9f04e7dc7c3ebe57e3d5e8a0eeb
      https://github.com/okfn/ckan/commit/7da6b57f8efdc9f04e7dc7c3ebe57e3d5e8a0eeb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckanext/multilingual/tests/test_multilingual_plugin.py

  Log Message:
  -----------
  Don't use mustcontain() in tests

It prints out entire pages of HTML to the terminal when tests fail,
which is really annoying.


  Commit: d3dbcc0d511af836bdb4a2359db556d897d563f8
      https://github.com/okfn/ckan/commit/d3dbcc0d511af836bdb4a2359db556d897d563f8
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/model/authz.py
    M ckan/model/package.py
    M ckan/model/related.py
    M ckan/model/resource.py
    R ckan/templates/_snippet/add-related.html
    M ckan/templates/_util.html
    A ckan/templates/activity_streams/deleted_related_item.html
    A ckan/templates/activity_streams/new_related_item.html
    M ckan/templates/package/layout.html
    R ckan/templates/package/related_list.html
    A ckan/templates/related/add-related.html
    A ckan/templates/related/dashboard.html
    A ckan/templates/related/related_list.html
    M ckan/templates/user/read.html
    M ckan/tests/forms/test_package.py
    M ckan/tests/functional/test_datastore.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_related.py
    M ckan/tests/functional/test_revision.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    A doc/apps-ideas.rst
    M doc/configuration.rst
    M doc/index.rst

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan


  Commit: 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


Compare: https://github.com/okfn/ckan/compare/f5043a290678...a7119e64700a


More information about the ckan-changes mailing list