[ckan-changes] [okfn/ckan] e759ef: Merge branch 'master' of https://github.com/okfn/c...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: e759ef98adf6de7f25ebcd925d16d4ab4359e192
      https://github.com/okfn/ckan/commit/e759ef98adf6de7f25ebcd925d16d4ab4359e192
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-22 (Fri, 22 Jun 2012)

  Changed paths:
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/helpers.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/public/scripts/application.js
    M ckan/templates/js_strings.html
    M ckan/templates/package/layout.html
    A ckan/templates/snippets/follow_button.html
    M ckan/templates/user/layout.html
    M ckan/tests/logic/test_action.py
    M doc/solr-setup.rst

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


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

  Changed paths:
    M ckan/config/environment.py
    M ckan/controllers/admin.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/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/lib/accept.py
    M ckan/lib/celery_app.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/test_versions.py

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


  Commit: 42a65080d886d1575f54615d1a4f2440a7f10e4c
      https://github.com/okfn/ckan/commit/42a65080d886d1575f54615d1a4f2440a7f10e4c
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M ckan/logic/auth/publisher/create.py
    M ckan/logic/schema.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckanext/organizations/templates/organization_layout.html

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


  Commit: 40189ee0f34c2dfb46e7363fd8281c7bf884b15a
      https://github.com/okfn/ckan/commit/40189ee0f34c2dfb46e7363fd8281c7bf884b15a
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/tests/test_plugins.py
    M doc/install-from-source.rst
    M doc/solr-setup.rst
    M doc/test.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

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


  Commit: 2c2bf5405bfae1381314f859300461991101960e
      https://github.com/okfn/ckan/commit/2c2bf5405bfae1381314f859300461991101960e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-28 (Thu, 28 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py
    M ckan/model/follower.py
    M ckan/public/css/style.css
    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_user.py

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


  Commit: 881f287ff7b65b1949838f5554481f27659fd1c9
      https://github.com/okfn/ckan/commit/881f287ff7b65b1949838f5554481f27659fd1c9
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    M ckan/config/solr/CHANGELOG.txt
    M ckan/config/solr/schema-1.4.xml
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    M ckan/public/scripts/application.js
    A ckan/public/scripts/vendor/flot/0.7/excanvas.js
    M ckan/public/scripts/vendor/html5shiv/html5.js
    A ckan/templates/activity_streams/follow_dataset.html
    A ckan/templates/activity_streams/follow_user.html
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/logic/test_tag_vocab.py
    M ckanext/stats/controller.py
    M ckanext/stats/templates/ckanext/stats/index.html

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


  Commit: 15a3ae9f04d765882a00c68aa7c934a6aa51d4f9
      https://github.com/okfn/ckan/commit/15a3ae9f04d765882a00c68aa7c934a6aa51d4f9
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  rePEP8ification


Compare: https://github.com/okfn/ckan/compare/db21610e18d2...15a3ae9f04d7