[ckan-changes] [okfn/ckan] d2a480: Merge branch 'master' of github.com:okfn/ckan into...

Tue Jan 3 16:22:20 UTC 2012

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan

  Commit: d2a480f44d95aac09fac29a279db90cc805266d9
      https://github.com/okfn/ckan/commit/d2a480f44d95aac09fac29a279db90cc805266d9
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-03 (Tue, 03 Jan 2012)

  Changed paths:
    M MANIFEST.in
  A README.rst
  R README.txt
  M ckan/config/deployment.ini_tmpl
  M ckan/controllers/authorization_group.py
  M ckan/controllers/group.py
  M ckan/controllers/group_formalchemy.py
  M ckan/controllers/home.py
  M ckan/controllers/revision.py
  M ckan/controllers/user.py
  M ckan/forms/common.py
  M ckan/forms/group.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/dumper.py
  M ckan/lib/helpers.py
  R ckan/lib/stats.py
  M ckan/logic/action/get.py
  M ckan/logic/auth/create.py
  A ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/__init__.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/public/css/style.css
  M ckan/templates/layout_base.html
  M ckan/templates/package/read.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_group.py
  M ckan/tests/functional/api/model/test_licenses.py
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/model/test_ratings.py
  M ckan/tests/functional/api/model/test_relationships.py
  M ckan/tests/functional/api/model/test_revisions.py
  M ckan/tests/functional/api/model/test_tag.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  R ckan/tests/misc/test_stats.py
  M ckan/tests/models/test_group.py
  M ckan/tests/models/test_package.py
  M ckan/tests/test_dumper.py
  A ckanext/__init__.py
  A ckanext/stats/__init__.py
  A ckanext/stats/controller.py
  A ckanext/stats/plugin.py
  A ckanext/stats/public/ckanext/stats/app.js
  A ckanext/stats/public/ckanext/stats/demo.html
  A ckanext/stats/public/ckanext/stats/style.css
  A ckanext/stats/stats.py
  A ckanext/stats/templates/ckanext/stats/index.html
  A ckanext/stats/templates/ckanext/stats/leaderboard.html
  A ckanext/stats/tests/__init__.py
  A ckanext/stats/tests/test_stats_lib.py
  A ckanext/stats/tests/test_stats_plugin.py
  M doc/apiv3.rst
  M doc/extensions.rst
  M doc/i18n.rst
  M doc/loading_data.rst
  M requires/lucid_missing.txt
  M setup.py
  M test.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1515-activity-streams