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

GitHub noreply at github.com
Tue Jul 31 10:45:28 UTC 2012


  Branch: refs/heads/2375-demo-theme-development
  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: 0f0ed9837999396748955b35c9c3bc1991c8ae6f
      https://github.com/okfn/ckan/commit/0f0ed9837999396748955b35c9c3bc1991c8ae6f
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    A ckan/public/scripts/vendor/moment/1.6.2/moment.js
    A ckan/public/scripts/vendor/mustache/0.5.0-dev/mustache.js
    R ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph.css
    R ckan/public/scripts/vendor/recline/css/grid.css
    R ckan/public/scripts/vendor/recline/css/images/edit-map.png
    R ckan/public/scripts/vendor/recline/css/images/menu-dropdown.png
    R ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
    R ckan/public/scripts/vendor/recline/css/map.css
    A ckan/public/scripts/vendor/recline/css/recline.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/README.txt
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-asc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/images/sort-desc.gif
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.css
    A ckan/public/scripts/vendor/slickgrid/2.0.1/slick.grid.min.js
    R ckan/public/scripts/vendor/slickgrid/images/actions.gif
    R ckan/public/scripts/vendor/slickgrid/images/ajax-loader-small.gif
    R ckan/public/scripts/vendor/slickgrid/images/arrow_redo.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_peppermint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_right_spearmint.png
    R ckan/public/scripts/vendor/slickgrid/images/arrow_undo.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_blue.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_star.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_minus.png
    R ckan/public/scripts/vendor/slickgrid/images/bullet_toggle_plus.png
    R ckan/public/scripts/vendor/slickgrid/images/calendar.gif
    R ckan/public/scripts/vendor/slickgrid/images/collapse.gif
    R ckan/public/scripts/vendor/slickgrid/images/comment_yellow.gif
    R ckan/public/scripts/vendor/slickgrid/images/down.gif
    R ckan/public/scripts/vendor/slickgrid/images/drag-handle.png
    R ckan/public/scripts/vendor/slickgrid/images/editor-helper-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/expand.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/header-columns-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/help.png
    R ckan/public/scripts/vendor/slickgrid/images/info.gif
    R ckan/public/scripts/vendor/slickgrid/images/listview.gif
    R ckan/public/scripts/vendor/slickgrid/images/pencil.gif
    R ckan/public/scripts/vendor/slickgrid/images/row-over-bg.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-asc.png
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.gif
    R ckan/public/scripts/vendor/slickgrid/images/sort-desc.png
    R ckan/public/scripts/vendor/slickgrid/images/stripes.png
    R ckan/public/scripts/vendor/slickgrid/images/tag_red.png
    R ckan/public/scripts/vendor/slickgrid/images/tick.png
    R ckan/public/scripts/vendor/slickgrid/images/user_identity.gif
    R ckan/public/scripts/vendor/slickgrid/images/user_identity_plus.gif
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.css
    R ckan/public/scripts/vendor/slickgrid/slick.columnpicker.js
    R ckan/public/scripts/vendor/slickgrid/slick.grid.css
    R ckan/public/scripts/vendor/slickgrid/slick.grid.js

  Log Message:
  -----------
  Update and clean up libraries


  Commit: 487362e26b1d37714d43ef1fdb9a948dd807b415
      https://github.com/okfn/ckan/commit/487362e26b1d37714d43ef1fdb9a948dd807b415
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-09 (Mon, 09 Jul 2012)

  Changed paths:
    M ckan/public/scripts/application.js
    M ckan/templates/snippets/recline-extra-footer.html
    M ckan/templates/snippets/recline-extra-header.html

  Log Message:
  -----------
  Update Data explorer with new recline version

TODO: Header row border, hide fields control


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

  Changed paths:
    M ckan/templates/package/resource_embedded_dataviewer.html

  Log Message:
  -----------
  Use recline snippets on the embed template


  Commit: 372028123af4fb7085c3ded497bff2b0b9f3c360
      https://github.com/okfn/ckan/commit/372028123af4fb7085c3ded497bff2b0b9f3c360
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/snippets/recline-extra-header.html

  Log Message:
  -----------
  Remove column headers border


  Commit: 0cb37c6578fddddeda320af2ed3657af7a79a8fb
      https://github.com/okfn/ckan/commit/0cb37c6578fddddeda320af2ed3657af7a79a8fb
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  Hide Recline's fields control by default, as it messes up the layout


  Commit: 3b0089ae7f82727b9bfe883f390b7de355976146
      https://github.com/okfn/ckan/commit/3b0089ae7f82727b9bfe883f390b7de355976146
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M ckan/templates/package/resource_embedded_dataviewer.html

  Log Message:
  -----------
  Hide side bar when embedding recline


  Commit: 041d91b92390ac2e9e0ae4d6c3bdcba1e7ec42b6
      https://github.com/okfn/ckan/commit/041d91b92390ac2e9e0ae4d6c3bdcba1e7ec42b6
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-10 (Tue, 10 Jul 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  Remove calls to Backbone history

They were causing exceptions and don't seem to be longer in use


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

  Changed paths:
    M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  Update recline build with slickgrid fix


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

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/public/scripts/application.js
    M ckan/templates/package/resource_read.html
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/logic/test_action.py
    M ckanext/organizations/forms.py

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


  Commit: e1f0ec35cdad3ba5dd5d3339e1b2a10e59d29193
      https://github.com/okfn/ckan/commit/e1f0ec35cdad3ba5dd5d3339e1b2a10e59d29193
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [#2671] allow delete on partial update


  Commit: a76d62f94c334417985d60c16d9dad2048278f64
      https://github.com/okfn/ckan/commit/a76d62f94c334417985d60c16d9dad2048278f64
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#2671] fix tests that were affectedw


  Commit: 8cdd9bd769e2c6ea8f2a1b01f75203beef99e81f
      https://github.com/okfn/ckan/commit/8cdd9bd769e2c6ea8f2a1b01f75203beef99e81f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-07-13 (Fri, 13 Jul 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [#2671] add ckan.fix_partial_updates config option


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

  Changed paths:
    M ckan/controllers/related.py

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


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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

and into corresponding auth function.


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

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

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


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

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

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


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

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

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

into corresponding auth function.


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

  Changed paths:
    M ckan/lib/helpers.py

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


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

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

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


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

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

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


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

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

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


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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

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

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

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


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

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

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


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

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  Merge branch '2671-fix-partial-updates'


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

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

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


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

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

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


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

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

  Log Message:
  -----------
  Revert "Don't insert quotation chars into strings when dictizing extras"

This reverts commit f5043a29067898061176ca5e64032fd4de9718f3.


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

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

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


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  group controller: use extras_as_string for group read


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

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


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  Merge branch 'extras_dict_dictize_string_handling'


  Commit: 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: 1ceaba22e5a01421b5c2440817c3c8fd5e61d7e4
      https://github.com/okfn/ckan/commit/1ceaba22e5a01421b5c2440817c3c8fd5e61d7e4
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-25 (Wed, 25 Jul 2012)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number


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

  Changed paths:
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  [#2757] Add source install upgrade docs


  Commit: 0bd3db4ba5919f4a88439862375177cf93d83ab8
      https://github.com/okfn/ckan/commit/0bd3db4ba5919f4a88439862375177cf93d83ab8
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  [#2757] Add some comments to source upgrade


  Commit: 15f98d083f7cf02439cf4978a40e691c82971a0a
      https://github.com/okfn/ckan/commit/15f98d083f7cf02439cf4978a40e691c82971a0a
  Author: amercader <amercadero at gmail.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch '2757-source-install-upgrade-docs'


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

  Changed paths:
    M ckan/controllers/storage.py

  Log Message:
  -----------
  Fix for relative url being used when doing file upload to local storage


  Commit: 148081c7d579a3ae7cd2f305036bf879b43085b0
      https://github.com/okfn/ckan/commit/148081c7d579a3ae7cd2f305036bf879b43085b0
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-26 (Thu, 26 Jul 2012)

  Changed paths:
    M doc/install-from-source.rst
    M doc/paster.rst
    M doc/solr-setup.rst

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


  Commit: 0bdaf23147f518e45a10bb181b83507ab45f45b1
      https://github.com/okfn/ckan/commit/0bdaf23147f518e45a10bb181b83507ab45f45b1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-07-27 (Fri, 27 Jul 2012)

  Changed paths:
    M ckan/templates/related/add-related.html

  Log Message:
  -----------
  [#2770] Mark strings for translation on add related item form


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


Compare: https://github.com/okfn/ckan/compare/71aca0713693...0b3e558dc4cc


More information about the ckan-changes mailing list