[ckan-changes] [okfn/ckan] 629f68: Merge branch 'master' into enhancement-1792-api-lo...

GitHub noreply at github.com
Tue Feb 28 11:35:57 UTC 2012


  Branch: refs/heads/enh-1803-clean-up-routes
  Home:   https://github.com/okfn/ckan
  Commit: 629f685effc13baf1ff0e7d6b0f4de5125ed9867
      https://github.com/okfn/ckan/commit/629f685effc13baf1ff0e7d6b0f4de5125ed9867
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M ckan/lib/activity.py
  M ckan/lib/i18n.py
  M ckan/logic/schema.py
  M ckan/templates/js_strings.html
  M ckan/templates/user/read.html

  Log Message:
  -----------
  Merge branch 'master' into enhancement-1792-api-logic


  Commit: 8c9a1ec506db1f25f885bfc708daa4a1331d5cce
      https://github.com/okfn/ckan/commit/8c9a1ec506db1f25f885bfc708daa4a1331d5cce
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  sort imports in lib/plugins.py


  Commit: 3f7e5f081e3a2fa59598ae8990b0d7cd1e353e3e
      https://github.com/okfn/ckan/commit/3f7e5f081e3a2fa59598ae8990b0d7cd1e353e3e
  Author: kindly <kindly at gmail.com>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M ckan/controllers/package.py
  M ckan/lib/search/query.py
  M ckan/tests/functional/test_search.py
  M ckan/tests/lib/test_solr_package_search.py

  Log Message:
  -----------
  [1826] make query dismax and change package filtering to use fq for filtering


  Commit: 34c53f79df0b8f71f27bb1904629ff2141cd4152
      https://github.com/okfn/ckan/commit/34c53f79df0b8f71f27bb1904629ff2141cd4152
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  [master][noticket][doc]: Rearrange order to avoid warnings on paster db init.


  Commit: ea2d824ec5fff4fa0741730f5e2437a6904f3e41
      https://github.com/okfn/ckan/commit/ea2d824ec5fff4fa0741730f5e2437a6904f3e41
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M ckan/controllers/user.py
  A ckan/templates/user/logout_first.html
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [master][#1799][controllers]: Fix for login/register behaviour when already logged in.


  Commit: 1ecdfda65efbca0931629b982d73f3b6b814533d
      https://github.com/okfn/ckan/commit/1ecdfda65efbca0931629b982d73f3b6b814533d
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  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/user.py
  M ckan/forms/common.py
  M ckan/forms/package_dict.py
  A ckan/lib/activity.py
  M ckan/lib/alphabet_paginate.py
  M ckan/lib/base.py
  M ckan/lib/create_test_data.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  M ckan/lib/hash.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/query.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/action/delete.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/logic/auth/create.py
  M ckan/logic/auth/delete.py
  A ckan/logic/auth/publisher/__init__.py
  A ckan/logic/auth/publisher/create.py
  A ckan/logic/auth/publisher/delete.py
  A ckan/logic/auth/publisher/get.py
  A ckan/logic/auth/publisher/update.py
  M ckan/logic/auth/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  A ckan/migration/versions/048_add_activity_streams_tables.py
  A ckan/migration/versions/049_add_group_approval_status.py
  A ckan/migration/versions/050_term_translation_table.py
  A ckan/migration/versions/051_add_tag_vocabulary.py
  M ckan/model/__init__.py
  A ckan/model/activity.py
  M ckan/model/group.py
  M ckan/model/license.py
  M ckan/model/meta.py
  M ckan/model/package.py
  M ckan/model/package_extra.py
  M ckan/model/resource.py
  M ckan/model/tag.py
  A ckan/model/term_translation.py
  M ckan/model/user.py
  A ckan/model/vocabulary.py
  M ckan/new_authz.py
  M ckan/plugins/interfaces.py
  A ckan/public/css/chosen.css
  M ckan/public/css/style.css
  A ckan/public/images/chosen-sprite.png
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  A ckan/public/scripts/vendor/jquery.chosen/0.9.7/chosen.js
  M ckan/templates/_util.html
  A ckan/templates/activity_streams/added_tag.html
  A ckan/templates/activity_streams/changed_group.html
  A ckan/templates/activity_streams/changed_package.html
  A ckan/templates/activity_streams/changed_package_extra.html
  A ckan/templates/activity_streams/changed_resource.html
  A ckan/templates/activity_streams/changed_user.html
  A ckan/templates/activity_streams/deleted_group.html
  A ckan/templates/activity_streams/deleted_package.html
  A ckan/templates/activity_streams/deleted_package_extra.html
  A ckan/templates/activity_streams/deleted_resource.html
  A ckan/templates/activity_streams/new_group.html
  A ckan/templates/activity_streams/new_package.html
  A ckan/templates/activity_streams/new_package_extra.html
  A ckan/templates/activity_streams/new_resource.html
  A ckan/templates/activity_streams/new_user.html
  A ckan/templates/activity_streams/removed_tag.html
  M ckan/templates/group/history.html
  M ckan/templates/group/layout.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/js_strings.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/read.html
  M ckan/tests/forms/test_package.py
  M ckan/tests/functional/api/__init__.py
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/model/test_package.py
  A ckan/tests/functional/api/model/test_vocabulary.py
  A ckan/tests/functional/api/test_activity.py
  A ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_authz.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  A ckan/tests/functional/test_publisher_auth.py
  M ckan/tests/functional/test_search.py
  A ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_alphabet_pagination.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  A ckan/tests/lib/test_hash.py
  M ckan/tests/lib/test_helpers.py
  M ckan/tests/lib/test_i18n.py
  M ckan/tests/lib/test_solr_package_search.py
  M ckan/tests/logic/test_action.py
  A ckan/tests/logic/test_tag_vocab.py
  A ckan/tests/misc/test_auth_profiles.py
  A ckan/tests/mock_publisher_auth.py
  M ckan/tests/models/test_license.py
  M ckan/tests/models/test_package.py
  M ckan/tests/models/test_purge_revision.py
  A ckanext/publisher_form/__init__.py
  A ckanext/publisher_form/forms.py
  A ckanext/publisher_form/templates/dataset_form.html
  A ckanext/publisher_form/templates/publisher_form.html
  M doc/apiv3.rst
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  R doc/plugins.rst
  R doc/prepare-extensions.rst
  A doc/writing-extensions.rst
  M requires/lucid_missing.txt
  M setup.py

  Log Message:
  -----------
  [merge]


  Commit: d53f66001d43dd21c9e0280163b3231f25cd182c
      https://github.com/okfn/ckan/commit/d53f66001d43dd21c9e0280163b3231f25cd182c
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M CHANGELOG.txt
  M doc/common-error-messages.rst

  Log Message:
  -----------
  [release-v1.6][doc]: Minor improvements.


  Commit: 367c080cffc96fe012ff8ba01faa64bfe3c73f7a
      https://github.com/okfn/ckan/commit/367c080cffc96fe012ff8ba01faa64bfe3c73f7a
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  [merge] doc/install-from-source.txt.


  Commit: 0d5c6c3ef2300256c0841289569f150b90a05ecd
      https://github.com/okfn/ckan/commit/0d5c6c3ef2300256c0841289569f150b90a05ecd
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M ckan/controllers/user.py
  A ckan/templates/user/logout_first.html
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [master][#1799][controllers]: Fix for login/register behaviour when already logged in.


  Commit: 37a7c3aaf14a6775fd9cf541bc3488b0e99627d9
      https://github.com/okfn/ckan/commit/37a7c3aaf14a6775fd9cf541bc3488b0e99627d9
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M ckan/lib/helpers.py
  M ckan/templates/_util.html
  M ckan/templates/package/history.html
  M ckan/templates/package/read.html
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [master,ux][s]: improve rendering of datetime in frontend by updating h.render_datetime (now like Feb 10, 2010).

* Also have generic option to add hours/mins (with_hours)
* Default is now without hours/min so had to update various templates to reflect this (and a few tests)


  Commit: 2bf2446c9afcd07f5f0f823a823b56d7d618cf2f
      https://github.com/okfn/ckan/commit/2bf2446c9afcd07f5f0f823a823b56d7d618cf2f
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M doc/install-from-source.rst

  Log Message:
  -----------
  [release-v1.6][doc]: Improvements and taking account of merge in last commit.


  Commit: 07d3a0281587bff44e5dbb1588c4009216916139
      https://github.com/okfn/ckan/commit/07d3a0281587bff44e5dbb1588c4009216916139
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M ckan/controllers/home.py
  M ckan/tests/__init__.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  [release-v1.6][#1829][controllers]: Fix flash message when changing back to English.


  Commit: 597981ba9ba494b1c4c824bb8d055a8ac3eca409
      https://github.com/okfn/ckan/commit/597981ba9ba494b1c4c824bb8d055a8ac3eca409
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M CHANGELOG.txt
  M ckan/controllers/api.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/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/activity.py
  M ckan/lib/base.py
  M ckan/lib/hash.py
  M ckan/lib/helpers.py
  M ckan/templates/_util.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/history.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/read.html
  A ckan/templates/user/logout_first.html
  M ckan/templates/user/read.html
  M ckan/tests/functional/api/base.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_user.py
  M ckan/tests/lib/test_helpers.py
  M doc/common-error-messages.rst
  M doc/extensions.rst
  M doc/install-from-source.rst
  M doc/solr-setup.rst

  Log Message:
  -----------
  [merge]


  Commit: 881aa16c09287bdedb9331dcadb91c3a4e6ad511
      https://github.com/okfn/ckan/commit/881aa16c09287bdedb9331dcadb91c3a4e6ad511
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  nicer import of ckan.logic in logic.actions.get


  Commit: 303dd6d50d6b93b47aebf9ef94081a457e42b24f
      https://github.com/okfn/ckan/commit/303dd6d50d6b93b47aebf9ef94081a457e42b24f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  use get_action to find function


  Commit: 557e72330db79d36a10cb3a50dd2259d7c33ed3b
      https://github.com/okfn/ckan/commit/557e72330db79d36a10cb3a50dd2259d7c33ed3b
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-23 (Thu, 23 Feb 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [release-v1.6][#1804][templates]: Fix for switching language when CKAN is mounted at a URL.


  Commit: d6fda2c6084a7d555db38948eaf9956e74fe0a13
      https://github.com/okfn/ckan/commit/d6fda2c6084a7d555db38948eaf9956e74fe0a13
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M CHANGELOG.txt

  Log Message:
  -----------
  [release-v1.6][CHANGELOG]: Finished changelog.


  Commit: df94c73746f9bcd611f63af5df7e3cf1d6f49964
      https://github.com/okfn/ckan/commit/df94c73746f9bcd611f63af5df7e3cf1d6f49964
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  [release-v1.6]: Version number updated for release.


  Commit: cdcc5b2cef72f0c17c84aedaa9491857a34c346f
      https://github.com/okfn/ckan/commit/cdcc5b2cef72f0c17c84aedaa9491857a34c346f
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
  M ckan/i18n/ca/LC_MESSAGES/ckan.mo
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
  M ckan/i18n/de/LC_MESSAGES/ckan.mo
  M ckan/i18n/el/LC_MESSAGES/ckan.mo
  M ckan/i18n/es/LC_MESSAGES/ckan.mo
  M ckan/i18n/fi/LC_MESSAGES/ckan.mo
  M ckan/i18n/fr/LC_MESSAGES/ckan.mo
  M ckan/i18n/hu/LC_MESSAGES/ckan.mo
  M ckan/i18n/it/LC_MESSAGES/ckan.mo
  M ckan/i18n/lt/LC_MESSAGES/ckan.mo
  M ckan/i18n/nl/LC_MESSAGES/ckan.mo
  M ckan/i18n/no/LC_MESSAGES/ckan.mo
  M ckan/i18n/pl/LC_MESSAGES/ckan.mo
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
  M ckan/i18n/ro/LC_MESSAGES/ckan.mo
  M ckan/i18n/ru/LC_MESSAGES/ckan.mo
  M ckan/i18n/sl/LC_MESSAGES/ckan.mo
  M ckan/i18n/sq/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr/LC_MESSAGES/ckan.mo
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
  M ckan/i18n/sv/LC_MESSAGES/ckan.mo

  Log Message:
  -----------
  [release-v1.6][i18n]: Compile translations.


  Commit: 77e070c684139577fa51efa1c4861cfea41ef90f
      https://github.com/okfn/ckan/commit/77e070c684139577fa51efa1c4861cfea41ef90f
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/tests/functional/api/model/test_revisions.py

  Log Message:
  -----------
  [release-v1.6][tests]: Fix test which is broken only when running under postgres.


  Commit: b295bde299ca5131486eeb55876c6a03aaf96f4d
      https://github.com/okfn/ckan/commit/b295bde299ca5131486eeb55876c6a03aaf96f4d
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/templates/user/edit_user_form.html
  M test-core.ini

  Log Message:
  -----------
  [master][#1830]: OpenID disable option improved.


  Commit: 6c7da48ad1249658808fd667ae8a12263143db75
      https://github.com/okfn/ckan/commit/6c7da48ad1249658808fd667ae8a12263143db75
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/plugins/interfaces.py
  M doc/index.rst
  M doc/install-from-source.rst
  M doc/paster.rst
  M doc/writing-extensions.rst

  Log Message:
  -----------
  [release-v1.6][doc]: Fix warnings and errors in sphinx docs.


  Commit: 7f4a7118f6dc84433f5d1db471f7920f9eba528c
      https://github.com/okfn/ckan/commit/7f4a7118f6dc84433f5d1db471f7920f9eba528c
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M .tx/config
  M CHANGELOG.txt
  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/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/hash.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.py
  M ckan/logic/validators.py
  M ckan/plugins/interfaces.py
  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/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/list.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/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/lib/test_dictization_schema.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
  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 pip-requirements.txt
  M setup.py

  Log Message:
  -----------
  [master][merge] from release-v1.6.


  Commit: 6f743b636001f6f78f40b0dc9a53cffdd972c851
      https://github.com/okfn/ckan/commit/6f743b636001f6f78f40b0dc9a53cffdd972c851
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/controllers/api.py
  M ckan/controllers/package.py
  M ckan/lib/plugins.py
  M ckan/logic/action/create.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  rest of web/api changes


  Commit: 3fab4a18601ef78f362b088696dab9f03034618b
      https://github.com/okfn/ckan/commit/3fab4a18601ef78f362b088696dab9f03034618b
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/test_activity.py
  M ckan/tests/functional/test_package.py

  Log Message:
  -----------
  fix tests for api changes


  Commit: 9f8aef8d55f86d3809154b2349db4cb23a6b61a9
      https://github.com/okfn/ckan/commit/9f8aef8d55f86d3809154b2349db4cb23a6b61a9
  Author: David Read <david.read at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  M pip-requirements.txt

  Log Message:
  -----------
  [master][noticket]: Merge tidy up.


  Commit: c102a468ee90702cbb4a69215a3bbc10d5d3e3a7
      https://github.com/okfn/ckan/commit/c102a468ee90702cbb4a69215a3bbc10d5d3e3a7
  Author: Fulvio Sciarretta <zydio at users.sf.net>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js

  Log Message:
  -----------
  [#1788] Remove some trailing commas breaking script execution in IE7, which in turn made the dataset Edit page impossible to work with.


  Commit: 7af8c364b69bc3151fadcdab1bb7ced42982a9b9
      https://github.com/okfn/ckan/commit/7af8c364b69bc3151fadcdab1bb7ced42982a9b9
  Author: Fulvio Sciarretta <zydio at users.sf.net>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/public/css/style.css

  Log Message:
  -----------
  [#1788] minornavigation menu incorrectly showed vertically instead of horizontally because of missing support for inline-block in IE <= 7, fixed with a css workaround.


  Commit: 2f4d754b1a2a42f54b6795bc92782147d692923f
      https://github.com/okfn/ckan/commit/2f4d754b1a2a42f54b6795bc92782147d692923f
  Author: Fulvio Sciarretta <zydio at users.sf.net>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    A ckan/public/scripts/vendor/html5shiv/html5.js
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1788] added html5shiv, and conditionally included in layout_base.html for IE < 9, to properly show HTML5 section elements which corrupted the layout on those browsers.

It must be included in <head> tag because it is said to be required to come before the <body> tag: http://code.google.com/p/html5shiv/


  Commit: 703064c64786531ed7acb7490b57a7ed53a51a9b
      https://github.com/okfn/ckan/commit/703064c64786531ed7acb7490b57a7ed53a51a9b
  Author: Fulvio Sciarretta <zydio at users.sf.net>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    M ckan/public/css/style.css
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1788] change of some style and layout to have a properly sized footer element in all browsers, and fix the footer appearance in IE <= 8.

This not only fixes IE7 behavior (the first half of the footer gray, the second half white), but also shows footer containers stretching properly to content in Firefox with Firebug element highlighting feature.
Side effect: there may be less white space below the three boxes in a empty homepage.


  Commit: 27f4fc776b9199621d259749cf20787328df101f
      https://github.com/okfn/ckan/commit/27f4fc776b9199621d259749cf20787328df101f
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-24 (Fri, 24 Feb 2012)

  Changed paths:
    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/layout_base.html

  Log Message:
  -----------
  Merge pull request #2 from zydio/defect-1788-ie7-compatibility-problems

[#1788,master][s]: solves the vast majority of layout and misc issues encountered in IE < 9 (and hence IE7 as well).

The first two commits, the "light" ones:

- some Javascript errors which prevented the dataset page to work correctly
- minornavigation links layout.

The third commit also tries to deal with the major layout issue: the missing support for HTML5 elements which breaks the header and footer layout (as shown in the screenshot in the ticket #1788 ). It does so by conditionally including html5shiv for IE < 9, which currently seems to be the best way (besides removing all HTML5 elements from ckan).

The fourth commit sorts the last annoying visual problem: the footer in IE <= 8 shows half grey and half white, with lists overflowing in the white half. Reworked a bit the html layout and some css properties, and the layout now seems to work better (even analyzing the page with Firebug).


  Commit: 7e02ff5ad615527e083c5722a3a6ad7c47e0e0cb
      https://github.com/okfn/ckan/commit/7e02ff5ad615527e083c5722a3a6ad7c47e0e0cb
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M .tx/config
  M CHANGELOG.txt
  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/hash.py
  M ckan/lib/i18n.py
  M ckan/lib/search/query.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.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/templates/user/read.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/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_search.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
  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 pull request #3 from okfn/27f4fc776b9199621d259749cf20787328df101f

Perhaps merging this commit onto master will restore the history.


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

  Changed paths:
    M ckan/lib/create_test_data.py
  M ckan/tests/functional/test_tag_vocab.py

  Log Message:
  -----------
  allow creating none default package types for testing purposes


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

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  accept old style check_data_dict calls in update


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

  Changed paths:
    M .tx/config
  M CHANGELOG.txt
  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/hash.py
  M ckan/lib/search/query.py
  M ckan/logic/__init__.py
  M ckan/logic/action/create.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/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_search.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
  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 enhancement-1792-api-logic

Conflicts:
	ckan/logic/__init__.py


  Commit: 0ce65c037cf8f6a6d8493f666a5cfcd6972c6916
      https://github.com/okfn/ckan/commit/0ce65c037cf8f6a6d8493f666a5cfcd6972c6916
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_home.py

  Log Message:
  -----------
  remove failing test that should not have been added to master


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

  Changed paths:
    M ckan/tests/functional/test_home.py

  Log Message:
  -----------
  Merge branch 'master' into enhancement-1792-api-logic


  Commit: 54d656cc9fb7dcee1996554c472cc60cadd025de
      https://github.com/okfn/ckan/commit/54d656cc9fb7dcee1996554c472cc60cadd025de
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M ckan/logic/action/create.py
  M ckan/plugins/interfaces.py

  Log Message:
  -----------
  fixes to check_data_dict()


  Commit: 92654443df8004c04a578bc96cefcb5269b7ae7f
      https://github.com/okfn/ckan/commit/92654443df8004c04a578bc96cefcb5269b7ae7f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M ckan/tests/functional/test_tag_vocab.py
  A ckanext/test_tag_vocab_plugin.py
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  make plugin for tag_vocab_tests


  Commit: fd3ece6ed1540b776809a48b37771ff728437272
      https://github.com/okfn/ckan/commit/fd3ece6ed1540b776809a48b37771ff728437272
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M ckan/lib/captcha.py

  Log Message:
  -----------
  Fix an AttributeError in captcha.py


  Commit: 12e0d519e625567dd24dee1da76424616b728ec6
      https://github.com/okfn/ckan/commit/12e0d519e625567dd24dee1da76424616b728ec6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M ckan/tests/functional/api/test_util.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckanext/test_tag_vocab_plugin.py
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  fix tag_vocab_tests


  Commit: 04e5add20255612127918142fab07af7ce3652c1
      https://github.com/okfn/ckan/commit/04e5add20255612127918142fab07af7ce3652c1
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

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

  Log Message:
  -----------
  remove unused imports


  Commit: 8255e38d624628002af75519fd0a80246e312ce6
      https://github.com/okfn/ckan/commit/8255e38d624628002af75519fd0a80246e312ce6
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  cleaner imports


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

  Changed paths:
    M ckan/logic/action/create.py
  M ckan/logic/action/get.py

  Log Message:
  -----------
  cleaner imports


  Commit: 72f2070f877d7ec24b626283990f9e8ca813a18a
      https://github.com/okfn/ckan/commit/72f2070f877d7ec24b626283990f9e8ca813a18a
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    M ckan/logic/action/update.py

  Log Message:
  -----------
  cleaner imports


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

  Changed paths:
    M ckan/logic/action/create.py
  M ckan/logic/action/update.py

  Log Message:
  -----------
  package update and create now use show for returning data


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

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  remove unneeded import


  Commit: 71b159fdd8d51f167d54a31167b7093b0abc2316
      https://github.com/okfn/ckan/commit/71b159fdd8d51f167d54a31167b7093b0abc2316
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

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

  Log Message:
  -----------
  clean up model_dictize.package_to_api functions


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

  Changed paths:
    M ckan/lib/plugins.py

  Log Message:
  -----------
  better imports in lib/plugins.py


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

  Changed paths:
    M ckan/lib/captcha.py

  Log Message:
  -----------
  Merge branch 'master' into enhancement-1792-api-logic


  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


Compare: https://github.com/okfn/ckan/compare/88419af...c6834aa


More information about the ckan-changes mailing list