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

[noreply at github.com]

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

  Commit: 2ac0b1c4af84131a671058d07be832548de1cb14
      https://github.com/okfn/ckan/commit/2ac0b1c4af84131a671058d07be832548de1cb14
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

  Changed paths:
    M ckan/config/environment.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/home.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  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/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/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/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/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/i18n/sv/LC_MESSAGES/ckan.po
  M ckan/lib/base.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/lib/navl/dictization_functions.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/action/update.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/__init__.py
  M ckan/model/meta.py
  M ckan/model/package.py
  M ckan/model/types.py
  M ckan/public/css/style.css
  A ckan/public/images/icons/arrow-down-16.png
  A ckan/public/images/icons/arrow-down-32.png
  A ckan/public/images/icons/arrow-right-16-black.png
  A ckan/public/images/icons/arrow-right-16.png
  A ckan/public/images/icons/arrow-right-32.png
  A ckan/public/images/icons/package-disabled.png
  A ckan/public/images/ldquo.png
  M ckan/public/scripts/application.js
  A ckan/public/scripts/dataexplorer/icon-sprite.png
  A ckan/public/scripts/dataexplorer/loading.gif
  A ckan/public/scripts/dataexplorer/table-view-template.js
  A ckan/public/scripts/dataexplorer/table-view.css
  A ckan/public/scripts/dataexplorer/table-view.js
  A ckan/public/scripts/dataexplorer/table-view.ui.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/templates/group/layout.html
  M ckan/templates/group/read.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/read.html
  M ckan/templates/package/read_core.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/package/resources.html
  M ckan/tests/functional/api/test_action.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_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_solr_schema_version.py
  M ckan/tests/lib/test_solr_search_index.py
  M ckan/tests/models/test_package.py
  M doc/api.rst
  M doc/apiv3.rst
  M doc/configuration.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/install-from-source.rst
  A doc/solr-setup.rst
  M pip-requirements-test.txt
  M setup.py

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

Conflicts:
	ckan/model/meta.py