[ckan-changes] [okfn/ckan] 204d80: domain_object fixes

GitHub noreply at github.com
Thu May 10 10:36:27 UTC 2012


  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 204d807b969727a1dd2f547e96eeeefb2b20cee4
      https://github.com/okfn/ckan/commit/204d807b969727a1dd2f547e96eeeefb2b20cee4
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M ckan/lib/search/__init__.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/group_extra.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/task_status.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py

  Log Message:
  -----------
  domain_object fixes


  Commit: 62113e17419a7007912d37496761a1c68d40631c
      https://github.com/okfn/ckan/commit/62113e17419a7007912d37496761a1c68d40631c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-28 (Wed, 28 Mar 2012)

  Changed paths:
    M ckan/model/core.py
    M ckan/model/vocabulary.py

  Log Message:
  -----------
  more model import cleans vocab and core


  Commit: 92bb334ff7e4b175cd2e823fb512b7c80bff2aa0
      https://github.com/okfn/ckan/commit/92bb334ff7e4b175cd2e823fb512b7c80bff2aa0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/authz.py
    M ckan/model/domain_object.py
    M ckan/model/user.py

  Log Message:
  -----------
  more import cleanups


  Commit: 5c063b1f43314e3fc5be24e81bf7b06ed5f1f89e
      https://github.com/okfn/ckan/commit/5c063b1f43314e3fc5be24e81bf7b06ed5f1f89e
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/activity.py
    M ckan/model/authorization_group.py
    M ckan/model/authz.py
    M ckan/model/group_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/task_status.py

  Log Message:
  -----------
  some more import cleaning


  Commit: d9d6a71a2e588ecb38742434cf9a87d67e5af734
      https://github.com/okfn/ckan/commit/d9d6a71a2e588ecb38742434cf9a87d67e5af734
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/activity.py
    M ckan/model/authz.py
    M ckan/model/group.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/tag.py
    M ckan/model/term_translation.py

  Log Message:
  -----------
  further import cleans for models


  Commit: cb4c4c2c87565ca6db2b66e293118a746971277f
      https://github.com/okfn/ckan/commit/cb4c4c2c87565ca6db2b66e293118a746971277f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/lib/search/__init__.py
    M ckan/model/__init__.py
    M ckan/model/domain_object.py
    M ckan/model/tag.py
    M ckan/model/term_translation.py

  Log Message:
  -----------
  another bunch of import cleans for models


  Commit: f1b8aac2a05ca3e30741c9da9a1a36892fb70dfe
      https://github.com/okfn/ckan/commit/f1b8aac2a05ca3e30741c9da9a1a36892fb70dfe
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/activity.py

  Log Message:
  -----------
  import cleans for model/activity


  Commit: 68594504dd0dde1f1e888f1a5d78a87389409d51
      https://github.com/okfn/ckan/commit/68594504dd0dde1f1e888f1a5d78a87389409d51
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  import cleans for model/user


  Commit: 9fbd51342a0ac450d2557b3053e5a88d643d203c
      https://github.com/okfn/ckan/commit/9fbd51342a0ac450d2557b3053e5a88d643d203c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/authorization_group.py

  Log Message:
  -----------
  import cleans for model/authourization_group


  Commit: 570805427a11e72bb82d9b6b1d9c6ab2accfc01b
      https://github.com/okfn/ckan/commit/570805427a11e72bb82d9b6b1d9c6ab2accfc01b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/authorization_group.py

  Log Message:
  -----------
  more cleans for model/authourization_group


  Commit: d3be023c1f53f9b93e2aec782ad005045b224da9
      https://github.com/okfn/ckan/commit/d3be023c1f53f9b93e2aec782ad005045b224da9
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/authz.py

  Log Message:
  -----------
  more cleans for model/authz


  Commit: 079a0b49f16b675e996385bcc0f09e14ad297c40
      https://github.com/okfn/ckan/commit/079a0b49f16b675e996385bcc0f09e14ad297c40
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/extension.py

  Log Message:
  -----------
  more cleans for model/extensions


  Commit: 25fb6a26cca0486873a6e2cc9f2b4f9b30b59d68
      https://github.com/okfn/ckan/commit/25fb6a26cca0486873a6e2cc9f2b4f9b30b59d68
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/group.py
    M ckan/model/tag.py

  Log Message:
  -----------
  more cleans for model/group


  Commit: 0b4a9007bd5b98882cfb3ccc239a138085cbebb6
      https://github.com/okfn/ckan/commit/0b4a9007bd5b98882cfb3ccc239a138085cbebb6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/group_extra.py

  Log Message:
  -----------
  more cleans for model/group_extra


  Commit: c5f44bc5707268aa58d0c11121147cf661384ee2
      https://github.com/okfn/ckan/commit/c5f44bc5707268aa58d0c11121147cf661384ee2
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  more cleans for model/license


  Commit: 323049f8f0de56d9252a700f237890a79b415e76
      https://github.com/okfn/ckan/commit/323049f8f0de56d9252a700f237890a79b415e76
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/misc.py

  Log Message:
  -----------
  more cleans for model/misc


  Commit: 8406f4ed2c7c0f777aca3db5637ea9623ee40619
      https://github.com/okfn/ckan/commit/8406f4ed2c7c0f777aca3db5637ea9623ee40619
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/modification.py

  Log Message:
  -----------
  more cleans for model/modification


  Commit: 368c5e9ae2b5d60d6d27d5544eb53eafcaf2e961
      https://github.com/okfn/ckan/commit/368c5e9ae2b5d60d6d27d5544eb53eafcaf2e961
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/modification.py
    M ckan/model/package.py

  Log Message:
  -----------
  more cleans for model/package


  Commit: 3e242ea9ec7f2326272e7b0e49befd80544fed66
      https://github.com/okfn/ckan/commit/3e242ea9ec7f2326272e7b0e49befd80544fed66
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/package_extra.py

  Log Message:
  -----------
  more cleans for model/package_extras


  Commit: 7274549108ec75ab7a60ffaf3fd94f890577b8c0
      https://github.com/okfn/ckan/commit/7274549108ec75ab7a60ffaf3fd94f890577b8c0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/package_mapping.py

  Log Message:
  -----------
  more cleans for model/package_mapping


  Commit: 478058d52ad5b25f3faec213a63d58f3682e2afd
      https://github.com/okfn/ckan/commit/478058d52ad5b25f3faec213a63d58f3682e2afd
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/package_relationship.py

  Log Message:
  -----------
  more cleans for model/package_relationship plus __init__


  Commit: caccaea2d7f265c7663475a60226d0b7e05cb921
      https://github.com/okfn/ckan/commit/caccaea2d7f265c7663475a60226d0b7e05cb921
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/rating.py

  Log Message:
  -----------
  more cleans for model/rating


  Commit: 1fa31fe8e564c35203df22cda7d7408eb296b8d5
      https://github.com/okfn/ckan/commit/1fa31fe8e564c35203df22cda7d7408eb296b8d5
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/resource.py

  Log Message:
  -----------
  more cleans for model/resource


  Commit: f6ac49adaddd86450382af0212bbb71d13ff2abb
      https://github.com/okfn/ckan/commit/f6ac49adaddd86450382af0212bbb71d13ff2abb
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/task_status.py

  Log Message:
  -----------
  more cleans for model/task_status


  Commit: 345255f2138d6e2c6b0b91717e4f138fdee18b78
      https://github.com/okfn/ckan/commit/345255f2138d6e2c6b0b91717e4f138fdee18b78
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/vocabulary.py

  Log Message:
  -----------
  more cleans for model/vocabulary


  Commit: 55d0decbb4ff8400311d9508dbf6326d14b13dec
      https://github.com/okfn/ckan/commit/55d0decbb4ff8400311d9508dbf6326d14b13dec
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-29 (Thu, 29 Mar 2012)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  more cleans for model/meta


  Commit: 9de3cb89077304043f39b3148d36addfa280931d
      https://github.com/okfn/ckan/commit/9de3cb89077304043f39b3148d36addfa280931d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-30 (Fri, 30 Mar 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  cleanups to model/__init__


  Commit: 8dfa64ef14b10f76765a212d802dae609fb27dac
      https://github.com/okfn/ckan/commit/8dfa64ef14b10f76765a212d802dae609fb27dac
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    R MIGRATE.txt
    R RELEASE.txt
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    A ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/storage.py
    M ckan/controllers/user.py
    M ckan/forms/authorization_group.py
    M ckan/forms/package.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/field_types.py
    M ckan/lib/helpers.py
    R ckan/lib/helpers_clean.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/search/index.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/schema.py
    M ckan/migration/versions/047_rename_package_group_member.py
    A ckan/migration/versions/052_update_member_capacities.py
    A ckan/migration/versions/053_add_group_logo.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/package.py
    M ckan/plugins/__init__.py
    M ckan/plugins/interfaces.py
    A ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    R ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/layers.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/marker-shadow.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/marker.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/popup-close.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-in.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/images/zoom-out.png
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.css
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.ie.css
    A ckan/public/scripts/vendor/leaflet/0.3.1/leaflet.js
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
    A ckan/public/scripts/vendor/recline/css/map.css
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/_util.html
    R ckan/templates/_util_activity_div.html
    M ckan/templates/activity_streams/added_tag.html
    M ckan/templates/activity_streams/changed_group.html
    M ckan/templates/activity_streams/changed_package.html
    M ckan/templates/activity_streams/changed_package_extra.html
    M ckan/templates/activity_streams/changed_resource.html
    M ckan/templates/activity_streams/changed_user.html
    M ckan/templates/activity_streams/deleted_group.html
    M ckan/templates/activity_streams/deleted_package.html
    M ckan/templates/activity_streams/deleted_package_extra.html
    M ckan/templates/activity_streams/deleted_resource.html
    M ckan/templates/activity_streams/new_group.html
    M ckan/templates/activity_streams/new_package.html
    M ckan/templates/activity_streams/new_package_extra.html
    M ckan/templates/activity_streams/new_resource.html
    M ckan/templates/activity_streams/new_user.html
    M ckan/templates/activity_streams/removed_tag.html
    M ckan/templates/group/new_group_form.html
    M ckan/templates/group/read.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/editresources.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new.html
    M ckan/templates/package/new_package_form.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/snippets/package_list.html
    A ckan/templates/snippets/revision_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/tag/read.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/new_user_form.html
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/model/test_vocabulary.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    M ckan/tests/functional/test_authz.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_pagination.py
    M ckan/tests/functional/test_storage.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_member.py
    M ckan_deb/usr/lib/ckan/common.sh
    A ckanext/organizations/__init__.py
    A ckanext/organizations/controllers.py
    A ckanext/organizations/forms.py
    A ckanext/organizations/templates/email/join_publisher_request.txt
    A ckanext/organizations/templates/organization_apply.html
    A ckanext/organizations/templates/organization_apply_form.html
    A ckanext/organizations/templates/organization_form.html
    A ckanext/organizations/templates/organization_history.html
    A ckanext/organizations/templates/organization_index.html
    A ckanext/organizations/templates/organization_layout.html
    A ckanext/organizations/templates/organization_new.html
    A ckanext/organizations/templates/organization_package_form.html
    A ckanext/organizations/templates/organization_read.html
    A ckanext/organizations/templates/organization_users.html
    A ckanext/organizations/templates/organization_users_form.html
    M doc/api-v2.rst
    M doc/configuration.rst
    M doc/forms.rst
    A doc/geospatial.rst
    M doc/index.rst
    M doc/publisher-profile.rst
    A doc/publishing-datasets.rst
    M requires/lucid_missing.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into clean-models

Conflicts:
	ckan/model/__init__.py
	ckan/model/group.py
	ckan/model/license.py
	ckan/model/package.py


  Commit: 8bdff050fb867335c39780be4c1cf33a2263d113
      https://github.com/okfn/ckan/commit/8bdff050fb867335c39780be4c1cf33a2263d113
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-20 (Fri, 20 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  add fns to model to fix failing tests


  Commit: 736ab989b303fb7ce225cd54dcf334097d6de70d
      https://github.com/okfn/ckan/commit/736ab989b303fb7ce225cd54dcf334097d6de70d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    A ckan/config/solr/schema-1.4.xml
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    A ckan/controllers/related.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.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/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.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/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/logic/auth/publisher/get.py
    M ckan/logic/auth/publisher/update.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    A ckan/migration/versions/054_add_resource_created_date.py
    A ckan/migration/versions/055_update_user_and_activity_detail.py
    A ckan/migration/versions/056_add_related_table.py
    A ckan/migration/versions/057_tracking.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    A ckan/model/related.py
    M ckan/model/resource.py
    A ckan/model/tracking.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    A ckan/public/images/photo-placeholder.png
    M ckan/public/scripts/application.js
    M ckan/public/scripts/templates.js
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
    R ckan/public/scripts/vendor/recline/css/graph-flot.css
    A ckan/public/scripts/vendor/recline/css/graph.css
    A ckan/public/scripts/vendor/recline/css/grid.css
    M ckan/public/scripts/vendor/recline/css/map.css
    M ckan/public/scripts/vendor/recline/recline.js
    A ckan/templates/_snippet/add-related.html
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/_util.html
    M ckan/templates/facets.html
    M ckan/templates/group/read.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/layout.html
    A ckan/templates/package/related_list.html
    A ckan/templates/package/resource_embedded_dataviewer.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html
    A ckan/templates/snippets/data-viewer-embed-branded-link.html
    A ckan/templates/snippets/data-viewer-embed-dialog.html
    M ckan/templates/tag/index.html
    M ckan/templates/tag/read.html
    M ckan/templates/user/layout.html
    M ckan/tests/functional/api/base.py
    M ckan/tests/functional/test_cors.py
    M ckan/tests/functional/test_edit_authz.py
    M ckan/tests/functional/test_pagination.py
    A ckan/tests/functional/test_related.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_resource_search.py
    A ckan/tests/logic/__init__.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/misc/test_auth_profiles.py
    A ckanext/multilingual/plugin.py
    A ckanext/multilingual/solr/dutch_stop.txt
    A ckanext/multilingual/solr/english_stop.txt
    A ckanext/multilingual/solr/fr_elision.txt
    A ckanext/multilingual/solr/french_stop.txt
    A ckanext/multilingual/solr/german_stop.txt
    A ckanext/multilingual/solr/greek_stopwords.txt
    A ckanext/multilingual/solr/italian_stop.txt
    A ckanext/multilingual/solr/polish_stop.txt
    A ckanext/multilingual/solr/portuguese_stop.txt
    A ckanext/multilingual/solr/romanian_stop.txt
    A ckanext/multilingual/solr/schema.xml
    A ckanext/multilingual/solr/spanish_stop.txt
    A ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/organizations/forms.py
    M doc/_themes/sphinx-theme-okfn
    M doc/api.rst
    M doc/apiv3.rst
    A doc/contrib.rst
    M doc/datastore.rst
    M doc/i18n.rst
    M doc/index.rst
    A doc/multilingual.rst
    M doc/paster.rst
    M doc/post-installation.rst
    A doc/using-data-api.rst
    M requires/lucid_missing.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into clean-models

Conflicts:
	ckan/model/__init__.py
	ckan/model/resource.py


  Commit: 1487690df9cf154d1e7437be764f7702e7f5cca3
      https://github.com/okfn/ckan/commit/1487690df9cf154d1e7437be764f7702e7f5cca3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  merge fix


  Commit: c78a6d3df705e9e47c3104d2132e269405f44a8d
      https://github.com/okfn/ckan/commit/c78a6d3df705e9e47c3104d2132e269405f44a8d
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/model/tracking.py

  Log Message:
  -----------
  cleanup model/tracking.py


  Commit: 6a728d6334ef4a1fa03e1307fb0f73b280c1bdc6
      https://github.com/okfn/ckan/commit/6a728d6334ef4a1fa03e1307fb0f73b280c1bdc6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/related.py

  Log Message:
  -----------
  fixup related model


  Commit: fc58cb03376954cb16d350c43665c625f2270346
      https://github.com/okfn/ckan/commit/fc58cb03376954cb16d350c43665c625f2270346
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/meta.py

  Log Message:
  -----------
  minor import cleanup meta.py


  Commit: b73e1ccd963a6e3d425168d0bc7704c92731fb74
      https://github.com/okfn/ckan/commit/b73e1ccd963a6e3d425168d0bc7704c92731fb74
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/__init__.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/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/modification.py
    M ckan/model/package_relationship.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/tracking.py
    M ckan/model/types.py

  Log Message:
  -----------
  more model cleanups


  Commit: 5ffe44bac28923fb85938f5ccdfd40c75336ecaa
      https://github.com/okfn/ckan/commit/5ffe44bac28923fb85938f5ccdfd40c75336ecaa
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py
    M ckan/model/authz.py
    M ckan/model/package.py
    R ckan/model/package_mapping.py
    M ckan/model/tag.py

  Log Message:
  -----------
  kill package_mapping module


  Commit: 0aad92d53805b9926f2e06e1a984e63f5511bb54
      https://github.com/okfn/ckan/commit/0aad92d53805b9926f2e06e1a984e63f5511bb54
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/package.py
    M ckan/model/tag.py

  Log Message:
  -----------
  more model fixups


  Commit: 6c429da6eecfbefe59e2073b6aa81117db864e15
      https://github.com/okfn/ckan/commit/6c429da6eecfbefe59e2073b6aa81117db864e15
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  fix missing param in _create_license_list


  Commit: 382cb33726cf08a925a00fb677acd3b2dac208e9
      https://github.com/okfn/ckan/commit/382cb33726cf08a925a00fb677acd3b2dac208e9
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  make license_url optional


  Commit: a55724f81a219a0c398cad08d269d2fd1e88c061
      https://github.com/okfn/ckan/commit/a55724f81a219a0c398cad08d269d2fd1e88c061
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/license.py

  Log Message:
  -----------
  model.license clean whitespace


  Commit: 14f4b14bbfad9b24452c0553fdcf32ec04cd474c
      https://github.com/okfn/ckan/commit/14f4b14bbfad9b24452c0553fdcf32ec04cd474c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/test_user.py

  Log Message:
  -----------
  remove unused imports


  Commit: 71757b2c00fc884decaf3f8882a4cdd4b37986b8
      https://github.com/okfn/ckan/commit/71757b2c00fc884decaf3f8882a4cdd4b37986b8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/core.py

  Log Message:
  -----------
  pep8 model.core


  Commit: 5decd98d6ece0cc5dfcc450d253262e8c03daace
      https://github.com/okfn/ckan/commit/5decd98d6ece0cc5dfcc450d253262e8c03daace
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  actually update version table


  Commit: 96cfa71d9c4b8046adb4e621634cd9ea407c32b8
      https://github.com/okfn/ckan/commit/96cfa71d9c4b8046adb4e621634cd9ea407c32b8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  some pep8 model/__init__.py


  Commit: 705398096ae242d9db8524362760a970843cd7f2
      https://github.com/okfn/ckan/commit/705398096ae242d9db8524362760a970843cd7f2
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-04-26 (Thu, 26 Apr 2012)

  Changed paths:
    M ckan/__init__.py
    M ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/schema-1.4.xml
    M ckan/controllers/package.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/publisher/delete.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/style.css
    M ckan/public/scripts/vendor/recline/css/graph.css
    M ckan/public/scripts/vendor/recline/recline.js
    M ckan/templates/_util.html
    M ckan/templates/package/related_list.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout.html
    M ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_alphabet_pagination.py
    M ckan/tests/lib/test_solr_package_search.py
    M ckanext/multilingual/solr/schema.xml
    M doc/index.rst
    M doc/solr-setup.rst
    M doc/using-data-api.rst
    M pip-requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into clean-models


  Commit: 36ba5e685d91611fd6d7e547f32b52044dd9409e
      https://github.com/okfn/ckan/commit/36ba5e685d91611fd6d7e547f32b52044dd9409e
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-08 (Tue, 08 May 2012)

  Changed paths:
    M ckan/authz.py
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/controllers/user.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/helpers.py
    M ckan/lib/mailer.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/converters.py
    M ckan/model/__init__.py
    M ckan/model/group.py
    M ckan/plugins/toolkit.py
    M ckan/public/css/bootstrap.min.css
    M ckan/public/css/style.css
    M ckan/public/img/glyphicons-halflings-white.png
    M ckan/public/img/glyphicons-halflings.png
    M ckan/public/scripts/application.js
    R ckan/public/scripts/vendor/bootstrap/2.0.2/bootstrap.min.js
    A ckan/public/scripts/vendor/bootstrap/2.0.3/bootstrap.min.js
    M ckan/templates/_snippet/data-api-help.html
    M ckan/templates/_util.html
    M ckan/templates/admin/authz.html
    M ckan/templates/facets.html
    M ckan/templates/group/authz.html
    M ckan/templates/home/about.html
    M ckan/templates/home/index.html
    M ckan/templates/js_strings.html
    M ckan/templates/layout_base.html
    M ckan/templates/package/authz.html
    M ckan/templates/package/layout.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read.n3
    M ckan/templates/package/read.rdf
    M ckan/templates/package/related_list.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/search_form.html
    M ckan/templates/user/login.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/lib/test_helpers.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
    A ckanext/multilingual/__init__.py
    M ckanext/multilingual/plugin.py
    M ckanext/organizations/forms.py
    M ckanext/organizations/templates/email/join_publisher_request.txt
    M ckanext/organizations/templates/organization_package_form.html
    M doc/_themes/sphinx-theme-okfn
    M doc/conf.py
    M doc/configuration.rst
    A doc/data-viewer.rst
    M doc/filestore.rst
    M doc/index.rst
    M doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'master' into clean-models

Conflicts:
	ckan/model/__init__.py
	ckan/model/group.py


  Commit: 6ce9a0a961bce251fa946a7af4294b3b1c6a93f3
      https://github.com/okfn/ckan/commit/6ce9a0a961bce251fa946a7af4294b3b1c6a93f3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  remove lib.helper dependency for model


  Commit: e132d9c6d1c390462e99e2b26039db0881a6e71b
      https://github.com/okfn/ckan/commit/e132d9c6d1c390462e99e2b26039db0881a6e71b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  clean the imports in model/__init__.py


  Commit: 7a822bc382da45c0ea4e2dcd70ca257c1672b648
      https://github.com/okfn/ckan/commit/7a822bc382da45c0ea4e2dcd70ca257c1672b648
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  more cleaning model/__init__.py


  Commit: aae1765fdfa07bcdac450a8a1842efa0fd9ae546
      https://github.com/okfn/ckan/commit/aae1765fdfa07bcdac450a8a1842efa0fd9ae546
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  bug fix model group


  Commit: cca7b08da6b1b831f051ab752e67c67250c62580
      https://github.com/okfn/ckan/commit/cca7b08da6b1b831f051ab752e67c67250c62580
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/vocabulary.py

  Log Message:
  -----------
  pep8 model.vocabulary


  Commit: e97546abbddbd6f24ad90e119018fa0ddff5bcb7
      https://github.com/okfn/ckan/commit/e97546abbddbd6f24ad90e119018fa0ddff5bcb7
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  better import in model.user


  Commit: 1ce3225dd6b77266902dccdccf3eb3d0d1535308
      https://github.com/okfn/ckan/commit/1ce3225dd6b77266902dccdccf3eb3d0d1535308
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/user.py

  Log Message:
  -----------
  pep8 model.user


  Commit: 1565758d4a58e36124280d5f44394840aec1d9c8
      https://github.com/okfn/ckan/commit/1565758d4a58e36124280d5f44394840aec1d9c8
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  fix model import in lib helpers


  Commit: e445eb7bd3952ade3de12d783877691f712fef83
      https://github.com/okfn/ckan/commit/e445eb7bd3952ade3de12d783877691f712fef83
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M .gitattributes
    M .tx/config
    M CHANGELOG.txt
    M ckan/config/middleware.py
    M ckan/controllers/package.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/get.py
    M ckan/model/__init__.py
    M ckan/public/css/style.css
    M ckan/templates/_util.html
    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
    M ckan/templates/package/history.html
    M ckan/templates/package/new.html
    M ckan/templates/package/related_list.html
    M ckan/templates/revision/diff.html
    M ckan/templates/revision/list.html
    M ckan/tests/logic/test_action.py
    M ckan_deb/usr/bin/ckan-setup-solr
    M ckanext/multilingual/plugin.py
    M doc/api-v2.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
    A doc/user-stories-list.rst
    A doc/user-stories.rst
    M doc/writing-extensions.rst
    M requires/lucid_missing.txt

  Log Message:
  -----------
  Merge branch 'master' into clean-models

Conflicts:
	ckan/model/__init__.py


  Commit: 8ec502604cf9b4dcb819c50925bb0203bf8a0764
      https://github.com/okfn/ckan/commit/8ec502604cf9b4dcb819c50925bb0203bf8a0764
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-05-10 (Thu, 10 May 2012)

  Changed paths:
    M ckan/model/__init__.py

  Log Message:
  -----------
  model.__init__ needs meta imported


Compare: https://github.com/okfn/ckan/compare/b9ee2fa...8ec5026


More information about the ckan-changes mailing list