[ckan-changes] [okfn/ckan] 593943: Merge branch 'master' into enh-1803-clean-up-route...

[GitHub]

  Branch: refs/heads/enhancement-1792-api-logic
  Home:   https://github.com/okfn/ckan
  Commit: 593943ae0be22948b11f766b040676576b3be3c0
      https://github.com/okfn/ckan/commit/593943ae0be22948b11f766b040676576b3be3c0
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M .tx/config
  M CHANGELOG.txt
  M ckan/config/routing.py
  M ckan/controllers/api.py
  M ckan/controllers/group.py
  M ckan/controllers/home.py
  M ckan/controllers/package.py
  M ckan/controllers/revision.py
  M ckan/controllers/user.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/ckan.pot
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  M ckan/lib/base.py
  M ckan/lib/captcha.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/hash.py
  A ckan/lib/plugins.py
  M ckan/lib/search/query.py
  M ckan/logic/__init__.py
  M ckan/logic/action/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/__init__.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/plugins/interfaces.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  A ckan/public/scripts/vendor/html5shiv/html5.js
  M ckan/templates/group/read.html
  M ckan/templates/home/about.html
  M ckan/templates/home/index.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/new.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/user/edit_user_form.html
  M ckan/templates/user/list.html
  A ckan/templates/user/logout_first.html
  M ckan/tests/__init__.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_revisions.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_search.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckanext/stats/__init__.py
  A ckanext/stats/public/__init__.py
  A ckanext/stats/public/ckanext/__init__.py
  A ckanext/stats/public/ckanext/stats/__init__.py
  A ckanext/stats/templates/__init__.py
  A ckanext/stats/templates/ckanext/__init__.py
  A ckanext/stats/templates/ckanext/stats/__init__.py
  M ckanext/stats/templates/ckanext/stats/index.html
  M ckanext/stats/templates/ckanext/stats/leaderboard.html
  A ckanext/test_tag_vocab_plugin.py
  M doc/common-error-messages.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  M doc/solr-setup.rst
  M doc/writing-extensions.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into enh-1803-clean-up-routes

Conflicts:
	ckan/config/routing.py


  Commit: aa0129dace80b74ea14ecb3a32f39fef0f8298d3
      https://github.com/okfn/ckan/commit/aa0129dace80b74ea14ecb3a32f39fef0f8298d3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  fix merge plus better imports for plugins


  Commit: c6834aa81797cd33ece64e95095ee188a4c6b9a3
      https://github.com/okfn/ckan/commit/c6834aa81797cd33ece64e95095ee188a4c6b9a3
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  minor routing cleanup


  Commit: 10f9ec4467551b7bb0e814717b1146ec77f24e46
      https://github.com/okfn/ckan/commit/10f9ec4467551b7bb0e814717b1146ec77f24e46
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  controller.api minor code clean


  Commit: ae0f7eb0462b7bd9ce0754a9c92e6c3c90b5f452
      https://github.com/okfn/ckan/commit/ae0f7eb0462b7bd9ce0754a9c92e6c3c90b5f452
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  controller.api cleaner action_maps


Compare: https://github.com/okfn/ckan/compare/1a9227d...ae0f7eb