[ckan-changes] [okfn/ckan] dcd469: Merge branch 'master' into 2549-merge-organization...

[GitHub]

  Branch: refs/heads/2549-merge-organizations
  Home:   https://github.com/okfn/ckan
  Commit: dcd469d535915c7164b2e5a895258dd4f1a71936
      https://github.com/okfn/ckan/commit/dcd469d535915c7164b2e5a895258dd4f1a71936
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M CHANGELOG.txt
    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/package.py
    M ckan/controllers/related.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/search/index.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
    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
    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
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/test_plugins.py
    M ckanext/organizations/templates/organization_layout.html
    M ckanext/stats/controller.py
    M ckanext/stats/templates/ckanext/stats/index.html
    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' into 2549-merge-organizations


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

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckan/logic/action/get.py
    M ckan/logic/schema.py
    A ckan/templates/email/join_publisher_request.txt
    A ckan/templates/group/apply.html
    A ckan/templates/group/apply_form.html
    M ckan/templates/group/layout.html
    A ckan/templates/group/users.html
    A ckan/templates/group/users_form.html
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/test_versions.py

  Log Message:
  -----------
  Initial manual merge of organizations plugin


Compare: https://github.com/okfn/ckan/compare/dcd469d53591^...752498a97244