[ckan-changes] [okfn/ckan] 6e01ee: Merge branch 'master' into feature-1485-package-an...

Fri Jan 20 13:03:14 UTC 2012

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan
  Commit: 6e01ee522f7ac2e95e05a6165aae19c606d02869
      https://github.com/okfn/ckan/commit/6e01ee522f7ac2e95e05a6165aae19c606d02869
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    A .gitattributes
  M .tx/config
  M CHANGELOG.txt
  M MANIFEST.in
  A README.rst
  R README.txt
  A bin/canada.py
  A bin/status.py
  M build.sh
  M ckan/__init__.py
  M ckan/authz.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/environment.py
  M ckan/config/middleware.py
  M ckan/config/routing.py
  R ckan/config/schema.xml
  A ckan/config/solr/CHANGELOG.txt
  A ckan/config/solr/README.txt
  A ckan/config/solr/schema-1.2.xml
  A ckan/config/solr/schema-1.3.xml
  M ckan/controllers/admin.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/revision.py
  A ckan/controllers/storage.py
  M ckan/controllers/user.py
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/ckan.pot
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/lib/app_globals.py
  M ckan/lib/base.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/__init__.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/navl/dictization_functions.py
  A ckan/lib/repoze_patch.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/lib/search/query.py
  R ckan/lib/stats.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/authz.py
  M ckan/model/group.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  R ckan/public/images/ckan-features.png
  A ckan/public/images/icons/ckan.ico
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/templates/group/read.html
  M ckan/templates/home/about.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/search_form.html
  A ckan/templates/storage/index.html
  A ckan/templates/storage/success.html
  M ckan/templates/user/login.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/api/test_package_search.py
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_cors.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  A ckan/tests/functional/test_storage.py
  A ckan/tests/functional/test_upload.py
  M ckan/tests/functional/test_user.py
  A ckan/tests/lib/solr/schema-no-version.xml
  A ckan/tests/lib/solr/schema-wrong-version.xml
  A ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_dictization.py
  A ckan/tests/lib/test_solr_schema_version.py
  M ckan/tests/lib/test_solr_search_index.py
  R ckan/tests/misc/test_stats.py
  M ckan/tests/models/test_package.py
  M ckan/tests/models/test_repo.py
  M ckan_deb/usr/bin/ckan-create-instance
  M ckan_deb/usr/bin/ckan-setup-solr
  M ckan_deb/usr/lib/ckan/common.sh
  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/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  A doc/file-upload.rst
  M doc/i18n.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/install-from-source.rst
  M doc/loading_data.rst
  A doc/solr-setup.rst
  M doc/test.rst
  R doc/upgrade.rst
  M pip-requirements-test.txt
  M requires/lucid_missing.txt
  M setup.py
  M test-core.ini
  M test.ini

  Log Message:
  -----------
  Merge branch 'master' into feature-1485-package-and-group-custom-forms

Conflicts:
	ckan/lib/dictization/model_dictize.py
	ckan/logic/schema.py
	ckan/tests/functional/test_cors.py


  Commit: cbf2243a5a631024710f586130a4cac9bede0c17
      https://github.com/okfn/ckan/commit/cbf2243a5a631024710f586130a4cac9bede0c17
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
  M ckan/tests/lib/test_dictization_schema.py

  Log Message:
  -----------
  Fixing up tests after merge conflicts


  Commit: 57bdf0eefdd61347503e06b747b23c52ea8af0cf
      https://github.com/okfn/ckan/commit/57bdf0eefdd61347503e06b747b23c52ea8af0cf
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/logic/schema.py
  M ckan/migration/versions/047_rename_package_group_member.py
  R notes.txt

  Log Message:
  -----------
  Updated migration to update old data


  Commit: 42be122bfd1e1411837da266e160bc5a9f7450f7
      https://github.com/okfn/ckan/commit/42be122bfd1e1411837da266e160bc5a9f7450f7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/migration/versions/047_rename_package_group_member.py

  Log Message:
  -----------
  [xs] change to the migration for existing data


  Commit: 627382e6ff575146da221efc50321a41152d8b0f
      https://github.com/okfn/ckan/commit/627382e6ff575146da221efc50321a41152d8b0f
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/ckan_nose_plugin.py
  M ckan/model/__init__.py
  M doc/common-error-messages.rst
  M doc/install-from-package.rst

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


Compare: https://github.com/okfn/ckan/compare/8cc0dc2...627382e