[ckan-changes] [okfn/ckan] 494420: [#727] Clean up imports in core

Tue Apr 16 09:35:39 UTC 2013

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 494420ffaa7eeb7e4b676f6ffcc0a44836f4b407
      https://github.com/okfn/ckan/commit/494420ffaa7eeb7e4b676f6ffcc0a44836f4b407
  Author: tobes <toby.junk at gmail.com>
  Date:   2013-04-02 (Tue, 02 Apr 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/base.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/converters.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/package_relationship.py
    M ckan/plugins/toolkit.py
    M ckan/tests/functional/test_home.py

  Log Message:
  -----------
  [#727] Clean up imports in core


  Commit: cf1c548b4d1fcbe5ee1015fa9f253225089805c4
      https://github.com/okfn/ckan/commit/cf1c548b4d1fcbe5ee1015fa9f253225089805c4
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-15 (Mon, 15 Apr 2013)

  Changed paths:
    M CONTRIBUTING.rst
    M bin/osx-postgres-mem.sh
    M bin/travis-build
    M ckan/config/deployment.ini_tmpl
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/error.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/search/query.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/model/tag.py
    M ckan/public/base/css/main.css
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/mixins.less
    M ckan/public/base/less/prose.less
    A ckan/templates/group/history.html
    A ckan/templates/group/snippets/history_revisions.html
    A ckan/templates/group/snippets/revisions_table.html
    M ckan/templates/organization/index.html
    A ckan/templates/package/history.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    A ckan/templates/package/snippets/history_revisions.html
    A ckan/templates/package/snippets/revisions_table.html
    A ckan/templates/revision/__init__.py
    A ckan/templates/revision/diff.html
    A ckan/templates/revision/list.html
    A ckan/templates/revision/read.html
    A ckan/templates/revision/read_base.html
    A ckan/templates/revision/snippets/revisions_list.html
    M ckan/tests/lib/test_dictization.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/db.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_configure.py
    R doc/contrib.rst
    A doc/contributing.rst
    M doc/database-dumps.rst
    M doc/index.rst
    M doc/install-from-source.rst
    M doc/legacy-api.rst
    M doc/paster.rst
    M doc/test.rst
    M test-core.ini

  Log Message:
  -----------
  Merge remote-tracking branch 'okfn/master' into 727-import-cleans

Conflicts:
	ckan/controllers/feed.py


  Commit: ad87251ec5755754b6161c490ed82ebb21fc869c
      https://github.com/okfn/ckan/commit/ad87251ec5755754b6161c490ed82ebb21fc869c
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-04-16 (Tue, 16 Apr 2013)

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/activity_streams.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/base.py
    M ckan/lib/email_notifications.py
    M ckan/lib/formatters.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.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/converters.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/model/package_relationship.py
    M ckan/plugins/toolkit.py
    M ckan/tests/functional/test_home.py

  Log Message:
  -----------
  Merge pull request #727 from okfn/727-import-cleans

import cleanups for 2.1


Compare: https://github.com/okfn/ckan/compare/f75d21b288e5...ad87251ec575