[ckan-changes] [okfn/ckan] 326d3e: fix I18nMiddleware for tests

GitHub noreply at github.com
Sat Mar 3 21:13:46 UTC 2012


  Branch: refs/heads/feature-1807-recently-changed-datasets
  Home:   https://github.com/okfn/ckan
  Commit: 326d3e1ec249da595b15bf8102bc5c06beafb551
      https://github.com/okfn/ckan/commit/326d3e1ec249da595b15bf8102bc5c06beafb551
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  fix I18nMiddleware for tests


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

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/home.py
  M ckan/lib/base.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/layout_base.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/tests/functional/test_home.py
  M ckan/tests/lib/test_i18n.py

  Log Message:
  -----------
  Merge branch 'feature-1653-i18n_url_rewriting'


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

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/home.py
  M ckan/lib/base.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
  M ckan/logic/action/create.py
  M ckan/logic/action/update.py
  M ckan/logic/converters.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/layout_base.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/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_i18n.py

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


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

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/home.py
  M ckan/lib/base.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
  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/converters.py
  M ckan/logic/schema.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.py
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  M ckan/templates/layout_base.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/tests/functional/api/model/test_vocabulary.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/lib/test_i18n.py

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


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

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

  Log Message:
  -----------
  cleanup the get plugin schema functionality


  Commit: cb0a41c0304575aa20de9494feae2b7a410254e6
      https://github.com/okfn/ckan/commit/cb0a41c0304575aa20de9494feae2b7a410254e6
  Author: amercader <amercadero at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/activity.py

  Log Message:
  -----------
  [bugfix][noticket] Activity streams fail if the object has no id property


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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  routes is nasty fix


  Commit: 39a5840a9f17fb13a1a5d2190664e875579e4f5c
      https://github.com/okfn/ckan/commit/39a5840a9f17fb13a1a5d2190664e875579e4f5c
  Author: amercader <amercadero at gmail.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/activity.py

  Log Message:
  -----------
  [bugfix][noticket] Activity streams fail if the object has no id property


  Commit: 74075f8696ec2ec8e2bd0e99ebbd09837bd2b3ba
      https://github.com/okfn/ckan/commit/74075f8696ec2ec8e2bd0e99ebbd09837bd2b3ba
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/templates/js_strings.html

  Log Message:
  -----------
  Correct a typo in a string


  Commit: 707297e7b2b8fe87c10929ae21aee76c98d48c1b
      https://github.com/okfn/ckan/commit/707297e7b2b8fe87c10929ae21aee76c98d48c1b
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-02-21 (Tue, 21 Feb 2012)

  Changed paths:
    M ckan/lib/activity.py

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


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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  provide default versions for api urls


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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  check ver provided to h.get_url() for api controller


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

  Changed paths:
    M ckan/templates/layout_base.html
  M ckan/templates/package/search.html
  M ckan/tests/functional/api/test_authorization_group.py
  M ckan/tests/functional/api/test_user.py
  M ckan/tests/functional/api/test_util.py

  Log Message:
  -----------
  fix tests and templates for api calls to h.url_for()


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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  GET, PUT helpers in config/routing.py


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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  cleanup in config/routing.py


  Commit: 901282c985666bef9c9ce95dcba4578790b6d137
      https://github.com/okfn/ckan/commit/901282c985666bef9c9ce95dcba4578790b6d137
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [bugfix,user/read][xs]: hide email address on user page.


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

  Changed paths:
    M ckan/lib/activity.py
  M ckan/templates/js_strings.html

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


  Commit: 5d0c1c48b169a1038400c6294ffc8e382a10e1c0
      https://github.com/okfn/ckan/commit/5d0c1c48b169a1038400c6294ffc8e382a10e1c0
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M ckan/templates/user/read.html

  Log Message:
  -----------
  [bugfix,user/read][xs]: hide email address on user page.


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

  Changed paths:
    M ckan/forms/common.py

  Log Message:
  -----------
  fix api url call in forms.common


  Commit: d37d4b1be221871fbeac36c443afb73fb8f1956f
      https://github.com/okfn/ckan/commit/d37d4b1be221871fbeac36c443afb73fb8f1956f
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [1817][schema] Add users and groups to default group schema


  Commit: 68d64e8b6920ad75a5c8198579300a3df7fdec68
      https://github.com/okfn/ckan/commit/68d64e8b6920ad75a5c8198579300a3df7fdec68
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-22 (Wed, 22 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


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

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [xs] bugfix default locale not needed


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

  Changed paths:
    M ckan/templates/user/read.html

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


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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  routing fixes


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

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

  Log Message:
  -----------
  fix broken tests


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

  Changed paths:
    M ckan/lib/i18n.py
  M ckan/templates/user/read.html

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


  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: ac46a4d810f45735f1eb9808e3110c8bf9141543
      https://github.com/okfn/ckan/commit/ac46a4d810f45735f1eb9808e3110c8bf9141543
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-27 (Mon, 27 Feb 2012)

  Changed paths:
    A doc/webstore.rst

  Log Message:
  -----------
  [#1797,doc][s]: basic docs for webstore including how to enable and how it works.


  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: 4e08792664353f10b58b45061eb39b20e487d41f
      https://github.com/okfn/ckan/commit/4e08792664353f10b58b45061eb39b20e487d41f
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

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

  Log Message:
  -----------
  [#1797,tests][xs]: remove blackbox whole stack test as it is too fragile for general use.

* E.g. depends on nginx port resource id etc ...
* Moved code to https://gist.github.com/1930787


  Commit: fd06eea819e0cbbfd0d82722bbe3fc1d88c2ec8c
      https://github.com/okfn/ckan/commit/fd06eea819e0cbbfd0d82722bbe3fc1d88c2ec8c
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M test-core.ini

  Log Message:
  -----------
  [#1797,config][s]: add ckan.webstore.enabled option with which to enable webstore.


  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


  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


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

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [xs] temp fix for logout


  Commit: 9601ea6e8cec6902654293a763569765694d0943
      https://github.com/okfn/ckan/commit/9601ea6e8cec6902654293a763569765694d0943
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/tests/functional/test_webstore.py

  Log Message:
  -----------
  [#1797,webstore][s]: move webstore api to /api/data/{id} and enhance routing tests.

* Also get rid of redirect from /dataset/{id}/resource/.../data


  Commit: ed9656bbadda01125f00d0c00e10fd983788c7fd
      https://github.com/okfn/ckan/commit/ed9656bbadda01125f00d0c00e10fd983788c7fd
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M doc/webstore.rst

  Log Message:
  -----------
  [#1797,webstore,doc][s]: update docs with new api paths and examples.


  Commit: 4d366f4e761c36296c421e2639630b082cb8ee50
      https://github.com/okfn/ckan/commit/4d366f4e761c36296c421e2639630b082cb8ee50
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    A bin/webstore_test.py

  Log Message:
  -----------
  [#1797,bin][s]: add webstore_test.py (external testing of whole thing) to bin as no better place for it.

* Cannot run as proper test as requires nginx and specific config (e.g. port etc).


  Commit: b6a73082e3e52d8c418c3f76370c7df46515fc54
      https://github.com/okfn/ckan/commit/b6a73082e3e52d8c418c3f76370c7df46515fc54
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M .tx/config
  M CHANGELOG.txt
  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/revision.py
  M ckan/controllers/user.py
  M ckan/forms/common.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/activity.py
  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/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
  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/converters.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/tag.py
  M ckan/model/vocabulary.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/history.html
  M ckan/templates/group/new_group_form.html
  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/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.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/search.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/model/test_vocabulary.py
  M ckan/tests/functional/api/test_activity.py
  M ckan/tests/functional/api/test_authorization_group.py
  M ckan/tests/functional/api/test_user.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.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_i18n.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 feature-1797-webstore-v2


  Commit: a054071e2e29e70e7cfa69df8c117ad5d5871a24
      https://github.com/okfn/ckan/commit/a054071e2e29e70e7cfa69df8c117ad5d5871a24
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    A bin/webstore_test.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/home.py
  A ckan/controllers/webstore.py
  A ckan/tests/functional/test_webstore.py
  A doc/webstore.rst
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'feature-1797-webstore-v2'


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

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/i18n.py

  Log Message:
  -----------
  [xs] fix the redirect language issues on logging in/out


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

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/i18n.py

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


  Commit: 6a8457244dde05bdfa05a98646b37028a12da526
      https://github.com/okfn/ckan/commit/6a8457244dde05bdfa05a98646b37028a12da526
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-28 (Tue, 28 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/i18n.py

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


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

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/helpers.py

  Log Message:
  -----------
  lang fixes


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

  Changed paths:
    M ckan/config/middleware.py
  M ckan/lib/helpers.py

  Log Message:
  -----------
  lang fixes


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

  Changed paths:
    A bin/webstore_test.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/routing.py
  M ckan/controllers/home.py
  A ckan/controllers/webstore.py
  A ckan/tests/functional/test_webstore.py
  A doc/webstore.rst
  M test-core.ini

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


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

  Changed paths:
    M ckan/templates/home/index.html

  Log Message:
  -----------
  fix broken template


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

  Changed paths:
    M ckan/config/routing.py

  Log Message:
  -----------
  remove useless route


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

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  fix function params


  Commit: 891921399980823e186b7130afd498aec69b9957
      https://github.com/okfn/ckan/commit/891921399980823e186b7130afd498aec69b9957
  Author: John Glover <j at johnglover.net>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [xs][middleware] Bug fix: check that lang list is not empty (old cookie setup will give a server 500 error)


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

  Changed paths:
    M ckan/templates/package/resource_read.html
  M ckan/templates/user/login.html

  Log Message:
  -----------
  [xs] fix static files using h.url_for_static()


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

  Changed paths:
    A bin/webstore_test.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/controllers/home.py
  A ckan/controllers/webstore.py
  M ckan/templates/home/index.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/login.html
  A ckan/tests/functional/test_webstore.py
  A doc/webstore.rst
  M test-core.ini

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


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

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  random fix of assumed typo


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

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

  Log Message:
  -----------
  get functions via get_action()


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

  Changed paths:
    M ckan/templates/user/login.html

  Log Message:
  -----------
  [xs] fix crazy typo ;)


  Commit: e8a9fa8135bd8371439c654a8130cfac71a1bb7e
      https://github.com/okfn/ckan/commit/e8a9fa8135bd8371439c654a8130cfac71a1bb7e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css

  Log Message:
  -----------
  [css,refactor][s]: move bootstrap css into one dedicated file.


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

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [xs] fix test FakeRequest does not have cookies


  Commit: 1a7db3585cd541cd8e8c89f6c999b778bf75a8e1
      https://github.com/okfn/ckan/commit/1a7db3585cd541cd8e8c89f6c999b778bf75a8e1
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [#1828,css][s]: change to bootstrap v2.0 alert html and styling and add bootstrap v2.0 pagination.


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

  Changed paths:
    M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  [xs]  search to use /dataset not /packages - fixes failing test


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

  Changed paths:
    M ckan/lib/i18n.py
  M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/test_user.py

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


  Commit: d8b39b816a08fd411f91c199ce8d01e7af5a742e
      https://github.com/okfn/ckan/commit/d8b39b816a08fd411f91c199ce8d01e7af5a742e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

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

  Log Message:
  -----------
  [#1828,css/bootstrap][xs]: add btn stuff.


  Commit: 10ed4a640708f035c1ad498d7a3b258360490a7b
      https://github.com/okfn/ckan/commit/10ed4a640708f035c1ad498d7a3b258360490a7b
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#1828,js][s]: upgrade to recline v0.3.

* still have some imperfect css (button on recline query menu) but could not work out how to fix.


  Commit: e6da48d9337575a83bc6a30896e68d1081b43847
      https://github.com/okfn/ckan/commit/e6da48d9337575a83bc6a30896e68d1081b43847
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  Merge branch 'feature-1828-recline-v0.3'


  Commit: f25934b7ee4eb548ae6303bbbd01772a5e08791d
      https://github.com/okfn/ckan/commit/f25934b7ee4eb548ae6303bbbd01772a5e08791d
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/lib/i18n.py
  M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/test_user.py

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


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

  Changed paths:
    M ckan/controllers/group.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:
  -----------
  api and wui use shared code for groups


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

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

  Log Message:
  -----------
  fix tests so they are treated as api calls


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

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

  Log Message:
  -----------
  clean up imports in action.update


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

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

  Log Message:
  -----------
  clean up imports in action.create


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

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

  Log Message:
  -----------
  minor import fixes


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

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

  Log Message:
  -----------
  clean up imports in actions.delete


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

  Changed paths:
    M ckan/controllers/group.py
  M ckan/controllers/package.py

  Log Message:
  -----------
  better imports in package and group controllers


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

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

  Log Message:
  -----------
  get fn via get_action


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

  Changed paths:
    A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js

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


  Commit: a205cd20078d15c53c33b509a31f89a68e54604b
      https://github.com/okfn/ckan/commit/a205cd20078d15c53c33b509a31f89a68e54604b
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/config/middleware.py
  M ckan/config/routing.py
  M ckan/lib/helpers.py
  M ckan/lib/i18n.py
  A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/home/index.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/new_package_form.html
  M ckan/templates/package/resource_read.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/test_user.py

  Log Message:
  -----------
  Merge branch 'master' into feature-1797-webstore-v2


  Commit: 9ab8b0283bb086eb4cd663ff73c27066bdd3c79a
      https://github.com/okfn/ckan/commit/9ab8b0283bb086eb4cd663ff73c27066bdd3c79a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [#1797,js][xs]: switch to elasticsearch for viewing datasets with associated webstore db.


  Commit: eeb8b30829c2165c742bfcd7a1ef79218edeb90e
      https://github.com/okfn/ckan/commit/eeb8b30829c2165c742bfcd7a1ef79218edeb90e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js

  Log Message:
  -----------
  [#1797,js/recline][xs]: latest version of recline (minor improvements).


  Commit: 4b45d819c3478b2ea29a4e4196e413807cb46622
      https://github.com/okfn/ckan/commit/4b45d819c3478b2ea29a4e4196e413807cb46622
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  [#1797,css][xs]: tidy up css for recline data viewer.


  Commit: 687c5a1e0659caa1f999c97d7e5b8ab0b99fdb95
      https://github.com/okfn/ckan/commit/687c5a1e0659caa1f999c97d7e5b8ab0b99fdb95
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-02-29 (Wed, 29 Feb 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html

  Log Message:
  -----------
  Merge branch 'feature-1797-webstore-v2'


  Commit: acf9f13f7cd3c5025c57c87e50f8d7bae5a4d90c
      https://github.com/okfn/ckan/commit/acf9f13f7cd3c5025c57c87e50f8d7bae5a4d90c
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/package/resource_read.html

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


  Commit: 9ecdaea16783f0e539c680517005386fe799ec56
      https://github.com/okfn/ckan/commit/9ecdaea16783f0e539c680517005386fe799ec56
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/controllers/api.py

  Log Message:
  -----------
  allow old calls to api/rest/package etc


  Commit: a85d825133b9bba01b4449f7ae4f1fbcba92d3e4
      https://github.com/okfn/ckan/commit/a85d825133b9bba01b4449f7ae4f1fbcba92d3e4
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/controllers/webstore.py

  Log Message:
  -----------
  [#1797,webstore,bugfix][xs]: make sure x-accel-redirect header is ascii as http protocol requires ascii (or close to ascii).


  Commit: a5cbc581ee451b5d1e8b7b4099cddada01ae495f
      https://github.com/okfn/ckan/commit/a5cbc581ee451b5d1e8b7b4099cddada01ae495f
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  fix redirect double root bug


  Commit: 5c5c297402cec7c456f45038129636dc187bda82
      https://github.com/okfn/ckan/commit/5c5c297402cec7c456f45038129636dc187bda82
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [xs] make register get correct url


  Commit: f2de60e345ff8af0325f40a4e65d969ba3219989
      https://github.com/okfn/ckan/commit/f2de60e345ff8af0325f40a4e65d969ba3219989
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/controllers/webstore.py

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


  Commit: 05d880056ba921b501633b13d69e41f4c9e507d2
      https://github.com/okfn/ckan/commit/05d880056ba921b501633b13d69e41f4c9e507d2
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [xs] keep urls clean


  Commit: 328f8c9bd9fbe7a0177953065b2e06d4911c1f77
      https://github.com/okfn/ckan/commit/328f8c9bd9fbe7a0177953065b2e06d4911c1f77
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/controllers/webstore.py
  M ckan/lib/helpers.py
  M ckan/templates/user/layout.html

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


  Commit: 52855c873e30ec7e6a00622bab35663ce05a6a99
      https://github.com/okfn/ckan/commit/52855c873e30ec7e6a00622bab35663ce05a6a99
  Author: Fulvio Sciarretta <zydio at users.sf.net>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/templates/_util.html
  M ckan/templates/layout_base.html

  Log Message:
  -----------
  [#1788] fix for IE 6/7/8 conditional comments which prevented execution of Python code in Genshi, and caused html5 support script not being loaded/executed.

This required the addition of a pure Python function, and call of that function inside layout_base.html to resolve h.url_for_static() calls.


  Commit: 1e0030e06fc3db7d7ec71110e74db02adbe368ff
      https://github.com/okfn/ckan/commit/1e0030e06fc3db7d7ec71110e74db02adbe368ff
  Author: Toby <toby.junk at gmail.com>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/lib/plugins.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

  Log Message:
  -----------
  import cleanups


  Commit: 730c0ace851bfa897e448382a37706e20b9eb16e
      https://github.com/okfn/ckan/commit/730c0ace851bfa897e448382a37706e20b9eb16e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    M ckan/templates/_util.html
  M ckan/templates/layout_base.html

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

[#1788][s]: Another fix for IE 6/7/8 compatibility that addresses h.url_for_static in conditional browser sections (thx to @zydio).


  Commit: b0885bb661647eeb3be14741529be624b461c731
      https://github.com/okfn/ckan/commit/b0885bb661647eeb3be14741529be624b461c731
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-01 (Thu, 01 Mar 2012)

  Changed paths:
    A .gitmodules
  A doc/_templates/footer.html
  R doc/_templates/layout.html
  A doc/_themes/sphinx-theme-okfn
  M doc/conf.py

  Log Message:
  -----------
  [master,doc][s]: switch docs theme to sphinx-theme-okfn and tweak config (e.g. project title).


  Commit: 913273836b5b7a2248cf537942d222090f04c11e
      https://github.com/okfn/ckan/commit/913273836b5b7a2248cf537942d222090f04c11e
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M doc/index.rst
  M doc/theming.rst

  Log Message:
  -----------
  [master,doc][xs]: micro changes to theming page title and index page text.


  Commit: 0ab99cf0f4755222bc878ec1f266a3c1e75e930a
      https://github.com/okfn/ckan/commit/0ab99cf0f4755222bc878ec1f266a3c1e75e930a
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M ckan/templates/layout_base.html

  Log Message:
  -----------
  [master,bugfix][xs]: correct typo in layout template introduced in 730c0ace851bfa897e448382a37706e20b9eb16e.

See https://github.com/zydio/ckan/commit/52855c873e30ec7e6a00622bab35663ce05a6a99#commitcomment-1037301 for more detail.


  Commit: 69d7f180b02d4ad775dc8b9041dfb109cb9ac0eb
      https://github.com/okfn/ckan/commit/69d7f180b02d4ad775dc8b9041dfb109cb9ac0eb
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  [master,README][xs]: note about how to build docs with note about need to init submodule.


  Commit: cff3ae660667f58683d9727214992edf3a2e64ff
      https://github.com/okfn/ckan/commit/cff3ae660667f58683d9727214992edf3a2e64ff
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-02 (Fri, 02 Mar 2012)

  Changed paths:
    M doc/about.rst
  M doc/api.rst

  Log Message:
  -----------
  [master,doc][xs]: ckan.net removed or changed to ckan.org.


  Commit: e14f90e0ebcedfaf0f3d962f07a6a1a3971eed27
      https://github.com/okfn/ckan/commit/e14f90e0ebcedfaf0f3d962f07a6a1a3971eed27
  Author: Rufus Pollock <rufus.pollock at okfn.org>
  Date:   2012-03-03 (Sat, 03 Mar 2012)

  Changed paths:
    M ckan/public/scripts/application.js

  Log Message:
  -----------
  [master,#1797,js][xs]: set format on resources from formatNormalized as this gets passed to DataProxy.


  Commit: b28ae660bd5150207c02d63a2253ef4e14de6507
      https://github.com/okfn/ckan/commit/b28ae660bd5150207c02d63a2253ef4e14de6507
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-03-03 (Sat, 03 Mar 2012)

  Changed paths:
    A .gitmodules
  M .tx/config
  M CHANGELOG.txt
  M README.rst
  A bin/webstore_test.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/revision.py
  M ckan/controllers/user.py
  A ckan/controllers/webstore.py
  M ckan/forms/common.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/activity.py
  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
  M ckan/lib/helpers.py
  M ckan/lib/i18n.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/delete.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
  A ckan/public/css/bootstrap.css
  R ckan/public/css/pretty_buttons.css
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/public/scripts/templates.js
  M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
  A ckan/public/scripts/vendor/html5shiv/html5.js
  M ckan/public/scripts/vendor/recline/css/data-explorer.css
  A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
  M ckan/public/scripts/vendor/recline/recline.js
  M ckan/templates/_util.html
  M ckan/templates/group/history.html
  M ckan/templates/group/new_group_form.html
  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/history.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/new.html
  M ckan/templates/package/new_package_form.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/search.html
  M ckan/templates/user/edit_user_form.html
  M ckan/templates/user/layout.html
  M ckan/templates/user/list.html
  M ckan/templates/user/login.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/api/test_authorization_group.py
  M ckan/tests/functional/api/test_user.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.py
  M ckan/tests/functional/test_tag_vocab.py
  M ckan/tests/functional/test_user.py
  A ckan/tests/functional/test_webstore.py
  M ckan/tests/lib/test_dictization_schema.py
  M ckan/tests/lib/test_i18n.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
  A doc/_templates/footer.html
  R doc/_templates/layout.html
  A doc/_themes/sphinx-theme-okfn
  M doc/about.rst
  M doc/api.rst
  M doc/common-error-messages.rst
  M doc/conf.py
  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/theming.rst
  A doc/webstore.rst
  M doc/writing-extensions.rst
  M setup.py
  M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1807-recently-changed-datasets

Conflicts:
	ckan/controllers/home.py


Compare: https://github.com/okfn/ckan/compare/35599c6...b28ae66


More information about the ckan-changes mailing list