[ckan-changes] [ckan/ckan] 5e6146: Don't dictize packages when dictizing a vocab

• Previous message: [ckan-changes] [ckan/ckan] 5e6146: Don't dictize packages when dictizing a vocab
• Next message: [ckan-changes] [ckan/ckan] a16662: [#2206] group/org_show: default include_datasets=F...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

  Branch: refs/heads/2429-remote-config
  Home:   https://github.com/ckan/ckan
  Commit: 5e614687da77dfd0986260753e7d3e86fdfba28b
      https://github.com/ckan/ckan/commit/5e614687da77dfd0986260753e7d3e86fdfba28b
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

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

  Log Message:
  -----------
  Don't dictize packages when dictizing a vocab

When dictizing a vocabulary, don't dictize every package of every one of
the vocab's tags. This makes vocabulary_dictize and vocabulary_show much
faster, which makes a big difference when creating and updating datasets
that have some custom fields that use tag vocabularies.


  Commit: 3c3c99623f10e63849a65afd875668f65d69432e
      https://github.com/ckan/ckan/commit/3c3c99623f10e63849a65afd875668f65d69432e
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-08-21 (Thu, 21 Aug 2014)

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

  Log Message:
  -----------
  Replace context itema with parameters


  Commit: 85cb59f370f5ae693a1687465e3bb34b2347608d
      https://github.com/ckan/ckan/commit/85cb59f370f5ae693a1687465e3bb34b2347608d
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckan/controllers/group.py
    M ckan/controllers/related.py
    M ckan/exceptions.py
    M ckan/lib/cli.py
    M ckan/lib/search/__init__.py
    M ckan/logic/__init__.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/login.html
    M ckan/tests/functional/test_related.py
    A ckanext/example_ivalidators_iconverters/__init__.py
    A ckanext/example_ivalidators_iconverters/plugin.py
    A ckanext/example_ivalidators_iconverters/tests/__init__.py
    A ckanext/example_ivalidators_iconverters/tests/test_ivalidators_iconverters.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M doc/extensions/adding-custom-fields.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into make-vocabulary-dictize-faster


  Commit: 6f03a4d4f624a4f25a5c979cf844ecad1fe0e1ce
      https://github.com/ckan/ckan/commit/6f03a4d4f624a4f25a5c979cf844ecad1fe0e1ce
  Author: Sean Hammond <git at seanh.cc>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

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

  Log Message:
  -----------
  Fix a couple of failing legacy tests


  Commit: 0be404bcdec54f3a2a01fa1e236674dcc121a5db
      https://github.com/ckan/ckan/commit/0be404bcdec54f3a2a01fa1e236674dcc121a5db
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/environment.py
    A ckan/tests/functional/test_config.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Make sure CKAN complains if site_url is missing


  Commit: 4a046aee93e78d69362e3abc02df780ba8890f3d
      https://github.com/ckan/ckan/commit/4a046aee93e78d69362e3abc02df780ba8890f3d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2014-11-13 (Thu, 13 Nov 2014)

  Changed paths:
    M contrib/docker/my_init.d/50_configure
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  [#1976] Added a bit more docs.


  Commit: 76ef2e1a79c6578018828dc9cbbfa4497026ff98
      https://github.com/ckan/ckan/commit/76ef2e1a79c6578018828dc9cbbfa4497026ff98
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-12-08 (Mon, 08 Dec 2014)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py

  Log Message:
  -----------
  [#2125] Add organization autocomplete action


  Commit: 6d031f6d6d19de83781cbf89c860957dc386a162
      https://github.com/ckan/ckan/commit/6d031f6d6d19de83781cbf89c860957dc386a162
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_group.py
    M ckan/tests/test_dumper.py

  Log Message:
  -----------
  [#2125] Add a test for organization autocomplete


  Commit: 33ebbd40b304e8f2f09c9f2512ed4dcb139c9ed5
      https://github.com/ckan/ckan/commit/33ebbd40b304e8f2f09c9f2512ed4dcb139c9ed5
  Author: Mika Wahlroos <mika.wahlroos at csc.fi>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M ckan/lib/create_test_data.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  [#2125] Fix group and organization tests


  Commit: a16662f02aee067a9c3fc1dd2d5949dd3707f217
      https://github.com/ckan/ckan/commit/a16662f02aee067a9c3fc1dd2d5949dd3707f217
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

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

  Log Message:
  -----------
  [#2206] group/org_show: default include_datasets=False


  Commit: 00c6578cfd16e6637aeb0c46153c13f434371c2f
      https://github.com/ckan/ckan/commit/00c6578cfd16e6637aeb0c46153c13f434371c2f
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/functional/api/test_dashboard.py

  Log Message:
  -----------
  [#2206] fix tests


  Commit: 8bde0b30b6db0920c48f22af851d134fa11140be
      https://github.com/ckan/ckan/commit/8bde0b30b6db0920c48f22af851d134fa11140be
  Author: Ian Ward <ian at excess.org>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

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

  Log Message:
  -----------
  [#2206] use asbool


  Commit: b2ce8e403d70b6b3652110344a1f90e1a4e6f36f
      https://github.com/ckan/ckan/commit/b2ce8e403d70b6b3652110344a1f90e1a4e6f36f
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/tests/functional/api/test_dashboard.py
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Fixes #2210 - changing group_create and group_list calls

Instead of calling group_dictize and returning the results at the end of
group_create this now returns group_show instead for consistency.  This
ensures the show schema is used to validate and process the result
returned to the user.  It should make it easier to call create, modify
the response and then post to update.

Instead of using group_list_dictize the group_list call now uses
group_show to return the relevant data.

The deprecated use of packages as either a list or a count has been
removed as package_count is already returned on each group_show call.

This is more than likely a breaking change and will need close checks to
make sure it is accurate.


  Commit: 9da394912e8f72beeb03d7df46966cf4a26f85f7
      https://github.com/ckan/ckan/commit/9da394912e8f72beeb03d7df46966cf4a26f85f7
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M ckan/new_tests/logic/action/test_create.py

  Log Message:
  -----------
  New style tests to make sure create returns the show result


  Commit: 6e3c3231aa3bda4c8105309dddc200d598f748ad
      https://github.com/ckan/ckan/commit/6e3c3231aa3bda4c8105309dddc200d598f748ad
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/lib/create_test_data.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/new_tests/controllers/test_api.py
    M ckan/tests/functional/api/test_util.py
    M ckan/tests/models/test_group.py

  Log Message:
  -----------
  [#2125] Move tests to new_tests.


  Commit: a98b7e505195b758924cf9b04954535af6ddb6b9
      https://github.com/ckan/ckan/commit/a98b7e505195b758924cf9b04954535af6ddb6b9
  Author: Rachel Knowler <rachel.knowler at liip.ch>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Remove user id from redirect to dashboard after logging in.


  Commit: b151c70cd79aad411d2ff2efce81e8ee613ae153
      https://github.com/ckan/ckan/commit/b151c70cd79aad411d2ff2efce81e8ee613ae153
  Author: george <george at orion.(none)>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Log Message:
  -----------
  Merge branch 'master', remote-tracking branch 'upstream/master'


  Commit: b96df5ef3552af4a8e316191ae7511a6d2cce44a
      https://github.com/ckan/ckan/commit/b96df5ef3552af4a8e316191ae7511a6d2cce44a
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  [#1940] Old password needs to be verified before allowing password to be changed.

Currently a user can change their password without requiring them to enter their current password.

With this change, an 'Old Password' fields is added to the user edit page and will display an error if the password is entered incorrectly.


  Commit: 133a6c8c645fbbab97c1c8866ad0a0c39393fcf9
      https://github.com/ckan/ckan/commit/133a6c8c645fbbab97c1c8866ad0a0c39393fcf9
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  be gone with you, embarrassing print statement!


  Commit: 158cfa8856e5dec0d90e5cbc171072b618be60a7
      https://github.com/ckan/ckan/commit/158cfa8856e5dec0d90e5cbc171072b618be60a7
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    A ckan/new_tests/controllers/test_user.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Adds a new file for testing the user controller with two tests for checking the validity of the old password before updating the password.

Adds "id" tag to user_edit_form.html so that it can be reliably found by when the tests want to get the form from the page.


  Commit: b093dc6a8b24cf71d27b86eb09a463f79b7e285f
      https://github.com/ckan/ckan/commit/b093dc6a8b24cf71d27b86eb09a463f79b7e285f
  Author: george-sattler <george.sattler at xvt.com.au>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M ckan/new_tests/controllers/test_user.py

  Log Message:
  -----------
  fixes pep8 issue in test_user.py file


  Commit: d0d57495b9af58e63ed43a7ff53dfac1042e416f
      https://github.com/ckan/ckan/commit/d0d57495b9af58e63ed43a7ff53dfac1042e416f
  Author: Sean Hammond <git at seanh.cc>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M CHANGELOG.rst
    M MANIFEST.in
    M bin/travis-install-dependencies
    M ckan/__init__.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/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
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/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/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/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
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/cli.py
    A ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    A ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    A ckan/logic/auth/patch.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/074_remove_resource_groups.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/meta.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/controllers/test_api.py
    A ckan/new_tests/controllers/test_feed.py
    A ckan/new_tests/controllers/test_group.py
    M ckan/new_tests/controllers/test_package.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/navl/test_dictization_functions.py
    M ckan/new_tests/lib/search/test_index.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/lib/test_base.py
    A ckan/new_tests/lib/test_cli.py
    A ckan/new_tests/lib/test_config_tool.py
    A ckan/new_tests/lib/test_datapreview.py
    M ckan/new_tests/lib/test_helpers.py
    A ckan/new_tests/lib/test_munge.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    A ckan/new_tests/logic/action/test_patch.py
    M ckan/new_tests/logic/action/test_update.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_delete.py
    A ckan/new_tests/logic/auth/test_get.py
    M ckan/new_tests/logic/auth/test_update.py
    A ckan/new_tests/logic/test_conversion.py
    M ckan/new_tests/logic/test_converters.py
    M ckan/new_tests/model/test_resource.py
    M ckan/new_tests/model/test_resource_view.py
    A ckan/new_tests/test_authz.py
    M ckan/new_tests/test_factories.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/footer.less
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/homepage.less
    M ckan/public/base/less/iehacks.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/main.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/nav.less
    R ckan/public/base/less/resource-view-embed.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    M ckan/public/base/vendor/bootstrap/less/responsive.less
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/scripts/application.js
    R ckan/rating.py
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/package/base_form_page.html
    M ckan/templates/package/edit.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_edit.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_edit_form.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/page.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/group_item.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/__init__.py
    M ckan/tests/functional/api/model/test_package.py
    M ckan/tests/functional/api/test_activity.py
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    M ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_accept.py
    M ckan/tests/lib/test_authenticator.py
    R ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_field_types.py
    R ckan/tests/lib/test_munge.py
    M ckan/tests/lib/test_navl.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_auth.py
    M ckan/tests/logic/test_tag.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/models/test_user.py
    M ckan/tests/schema/test_schema.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    A ckanext/example_iresourcecontroller/__init__.py
    A ckanext/example_iresourcecontroller/plugin.py
    A ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    A ckanext/example_ivalidators/__init__.py
    A ckanext/example_ivalidators/plugin.py
    A ckanext/example_ivalidators/tests/__init__.py
    A ckanext/example_ivalidators/tests/test_ivalidators.py
    R ckanext/example_ivalidators_iconverters/__init__.py
    R ckanext/example_ivalidators_iconverters/plugin.py
    R ckanext/example_ivalidators_iconverters/tests/__init__.py
    R ckanext/example_ivalidators_iconverters/tests/test_ivalidators_iconverters.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/pdfview/plugin.py
    M ckanext/pdfview/tests/test_view.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/textview/theme/public/css/text.css
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/html.rst
    M doc/contributing/i18n.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/extensions/adding-custom-fields.rst
    R doc/extensions/converters.rst
    M doc/extensions/index.rst
    M doc/extensions/tutorial.rst
    M doc/extensions/validators.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/form-integration.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/index.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/solr-multicore.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into make-vocabulary-dictize-faster


  Commit: ef24fc831bfb1566b01865919c00133ccb445574
      https://github.com/ckan/ckan/commit/ef24fc831bfb1566b01865919c00133ccb445574
  Author: Sean Hammond <git at seanh.cc>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckan/new_tests/factories.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py

  Log Message:
  -----------
  Add some tag_dictize and vocabulary_dictize tests


  Commit: 4f825209773b2a38ff08a598db2b141231b57af5
      https://github.com/ckan/ckan/commit/4f825209773b2a38ff08a598db2b141231b57af5
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-03-03 (Tue, 03 Mar 2015)

  Changed paths:
    M ckan/templates/snippets/search_form.html

  Log Message:
  -----------
  [#2330] add id to search form snippet


  Commit: d09bfe76cf30badfbb2fde28e38e573825331b62
      https://github.com/ckan/ckan/commit/d09bfe76cf30badfbb2fde28e38e573825331b62
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

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

  Log Message:
  -----------
  [#1886] Vocab selection - minor improvement to API.


  Commit: 095813d22da222ab1c2a6770e0d91239477f98ce
      https://github.com/ckan/ckan/commit/095813d22da222ab1c2a6770e0d91239477f98ce
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/search.html

  Log Message:
  -----------
  [#2330] Add id to dataset/group/organization search forms


  Commit: 381a2a225354126e45cd08c3f168b8d3f35518b0
      https://github.com/ckan/ckan/commit/381a2a225354126e45cd08c3f168b8d3f35518b0
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/base.py

  Log Message:
  -----------
  [#2350] Fix validation of license schema.


  Commit: 1d74ea8ed4034c95578897cf8be430b87e413fa4
      https://github.com/ckan/ckan/commit/1d74ea8ed4034c95578897cf8be430b87e413fa4
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  PEP8


  Commit: 1945e89fca109658a22963f02fbc843a8ba2c28c
      https://github.com/ckan/ckan/commit/1945e89fca109658a22963f02fbc843a8ba2c28c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  [#2350] Add test for editing a user - not directly related to the issue, but useful.


  Commit: aedff1dff634f12500b07260b398cc35b086032c
      https://github.com/ckan/ckan/commit/aedff1dff634f12500b07260b398cc35b086032c
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-14 (Tue, 14 Apr 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge branch '2350-license-schema' of github.com:ckan/ckan into 2350-license-schema


  Commit: c804308f70ae719693906d8603095e1c87755160
      https://github.com/ckan/ckan/commit/c804308f70ae719693906d8603095e1c87755160
  Author: Adam Rivers <rivers.adz at gmail.com>
  Date:   2015-04-27 (Mon, 27 Apr 2015)

  Changed paths:
    M ckan/lib/captcha.py
    M ckan/templates/user/snippets/recaptcha.html

  Log Message:
  -----------
  Support for new reCAPTCHA v2.0

Currently CKAN uses reCAPTCHA v1.0, this commit enables support for the
much more user friendly reCAPTCHA v2.0


  Commit: cc6d950c4c3bbc32511a3dfee421841b5fff2b89
      https://github.com/ckan/ckan/commit/cc6d950c4c3bbc32511a3dfee421841b5fff2b89
  Author: Adam Rivers <rivers.adz at gmail.com>
  Date:   2015-04-29 (Wed, 29 Apr 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/app_globals.py
    M ckan/lib/captcha.py
    M ckan/templates/user/snippets/recaptcha.html
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Added config option for reCAPTCHA version

Added config option for reCAPTCHA version which can handle both versions
1 and 2 of reCAPTCHA.


  Commit: 35ff8e1201d0517082688be88b8f6b197cd294ef
      https://github.com/ckan/ckan/commit/35ff8e1201d0517082688be88b8f6b197cd294ef
  Author: Adam Rivers <rivers.adz at gmail.com>
  Date:   2015-04-30 (Thu, 30 Apr 2015)

  Changed paths:
    M ckan/lib/captcha.py

  Log Message:
  -----------
  Fixed typo in captcha.py


  Commit: 48a2162ade3851e4ce2e822e92548a37280e253b
      https://github.com/ckan/ckan/commit/48a2162ade3851e4ce2e822e92548a37280e253b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-05-06 (Wed, 06 May 2015)

  Changed paths:
    M .coveragerc
    M CHANGELOG.rst
    A ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    M ckan/i18n/eu/LC_MESSAGES/ckan.mo
    M ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lo/LC_MESSAGES/ckan.mo
    M ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/my/LC_MESSAGES/ckan.mo
    M ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A ckan/i18n/ne/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/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/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/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/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/i18n/sw/LC_MESSAGES/ckan.mo
    M ckan/i18n/sw/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.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
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/resource_view.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests.py
    R ckan/new_tests/__init__.py
    R ckan/new_tests/config/__init__.py
    R ckan/new_tests/controllers/__init__.py
    R ckan/new_tests/controllers/test_api.py
    R ckan/new_tests/controllers/test_feed.py
    R ckan/new_tests/controllers/test_group.py
    R ckan/new_tests/controllers/test_package.py
    R ckan/new_tests/controllers/test_util.py
    R ckan/new_tests/factories.py
    R ckan/new_tests/helpers.py
    R ckan/new_tests/lib/__init__.py
    R ckan/new_tests/lib/dictization/__init__.py
    R ckan/new_tests/lib/dictization/test_model_dictize.py
    R ckan/new_tests/lib/navl/__init__.py
    R ckan/new_tests/lib/navl/test_dictization_functions.py
    R ckan/new_tests/lib/navl/test_validators.py
    R ckan/new_tests/lib/search/__init__.py
    R ckan/new_tests/lib/search/test_index.py
    R ckan/new_tests/lib/test_auth_tkt.py
    R ckan/new_tests/lib/test_base.py
    R ckan/new_tests/lib/test_cli.py
    R ckan/new_tests/lib/test_config_tool.py
    R ckan/new_tests/lib/test_datapreview.py
    R ckan/new_tests/lib/test_helpers.py
    R ckan/new_tests/lib/test_munge.py
    R ckan/new_tests/logic/__init__.py
    R ckan/new_tests/logic/action/__init__.py
    R ckan/new_tests/logic/action/test_create.py
    R ckan/new_tests/logic/action/test_delete.py
    R ckan/new_tests/logic/action/test_get.py
    R ckan/new_tests/logic/action/test_patch.py
    R ckan/new_tests/logic/action/test_update.py
    R ckan/new_tests/logic/auth/__init__.py
    R ckan/new_tests/logic/auth/test_create.py
    R ckan/new_tests/logic/auth/test_delete.py
    R ckan/new_tests/logic/auth/test_get.py
    R ckan/new_tests/logic/auth/test_init.py
    R ckan/new_tests/logic/auth/test_update.py
    R ckan/new_tests/logic/test_conversion.py
    R ckan/new_tests/logic/test_converters.py
    R ckan/new_tests/logic/test_schema.py
    R ckan/new_tests/logic/test_validators.py
    R ckan/new_tests/migration/__init__.py
    R ckan/new_tests/model/__init__.py
    R ckan/new_tests/model/test_resource.py
    R ckan/new_tests/model/test_resource_view.py
    R ckan/new_tests/model/test_user.py
    R ckan/new_tests/plugins/__init__.py
    R ckan/new_tests/test_authz.py
    R ckan/new_tests/test_coding_standards.py
    R ckan/new_tests/test_factories.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/client.js
    M ckan/public/base/less/masthead.less
    M ckan/templates/admin/base.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugins.py
    A ckan/tests/config/__init__.py
    A ckan/tests/config/test_middleware.py
    A ckan/tests/controllers/__init__.py
    A ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_user.py
    A ckan/tests/controllers/test_util.py
    A ckan/tests/factories.py
    R ckan/tests/functional/__init__.py
    R ckan/tests/functional/api/__init__.py
    R ckan/tests/functional/api/base.py
    R ckan/tests/functional/api/model/__init__.py
    R ckan/tests/functional/api/model/test_group.py
    R ckan/tests/functional/api/model/test_group_and_organization_purge.py
    R ckan/tests/functional/api/model/test_licenses.py
    R ckan/tests/functional/api/model/test_package.py
    R ckan/tests/functional/api/model/test_ratings.py
    R ckan/tests/functional/api/model/test_relationships.py
    R ckan/tests/functional/api/model/test_revisions.py
    R ckan/tests/functional/api/model/test_tag.py
    R ckan/tests/functional/api/model/test_vocabulary.py
    R ckan/tests/functional/api/test_activity.py
    R ckan/tests/functional/api/test_api.py
    R ckan/tests/functional/api/test_dashboard.py
    R ckan/tests/functional/api/test_email_notifications.py
    R ckan/tests/functional/api/test_follow.py
    R ckan/tests/functional/api/test_misc.py
    R ckan/tests/functional/api/test_package_search.py
    R ckan/tests/functional/api/test_resource.py
    R ckan/tests/functional/api/test_resource_search.py
    R ckan/tests/functional/api/test_revision_search.py
    R ckan/tests/functional/api/test_user.py
    R ckan/tests/functional/api/test_util.py
    R ckan/tests/functional/base.py
    R ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_error.py
    R ckan/tests/functional/test_group.py
    R ckan/tests/functional/test_home.py
    R ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_pagination.py
    R ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_related.py
    R ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_storage.py
    R ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_user.py
    A ckan/tests/helpers.py
    R ckan/tests/html_check.py
    A ckan/tests/legacy/__init__.py
    A ckan/tests/legacy/ckantestplugins.py
    A ckan/tests/legacy/functional/__init__.py
    A ckan/tests/legacy/functional/api/__init__.py
    A ckan/tests/legacy/functional/api/base.py
    A ckan/tests/legacy/functional/api/model/__init__.py
    A ckan/tests/legacy/functional/api/model/test_group.py
    A ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    A ckan/tests/legacy/functional/api/model/test_licenses.py
    A ckan/tests/legacy/functional/api/model/test_package.py
    A ckan/tests/legacy/functional/api/model/test_ratings.py
    A ckan/tests/legacy/functional/api/model/test_relationships.py
    A ckan/tests/legacy/functional/api/model/test_revisions.py
    A ckan/tests/legacy/functional/api/model/test_tag.py
    A ckan/tests/legacy/functional/api/model/test_vocabulary.py
    A ckan/tests/legacy/functional/api/test_activity.py
    A ckan/tests/legacy/functional/api/test_api.py
    A ckan/tests/legacy/functional/api/test_dashboard.py
    A ckan/tests/legacy/functional/api/test_email_notifications.py
    A ckan/tests/legacy/functional/api/test_follow.py
    A ckan/tests/legacy/functional/api/test_misc.py
    A ckan/tests/legacy/functional/api/test_package_search.py
    A ckan/tests/legacy/functional/api/test_resource.py
    A ckan/tests/legacy/functional/api/test_resource_search.py
    A ckan/tests/legacy/functional/api/test_revision_search.py
    A ckan/tests/legacy/functional/api/test_user.py
    A ckan/tests/legacy/functional/api/test_util.py
    A ckan/tests/legacy/functional/base.py
    A ckan/tests/legacy/functional/test_activity.py
    A ckan/tests/legacy/functional/test_admin.py
    A ckan/tests/legacy/functional/test_error.py
    A ckan/tests/legacy/functional/test_group.py
    A ckan/tests/legacy/functional/test_home.py
    A ckan/tests/legacy/functional/test_package.py
    A ckan/tests/legacy/functional/test_pagination.py
    A ckan/tests/legacy/functional/test_preview_interface.py
    A ckan/tests/legacy/functional/test_related.py
    A ckan/tests/legacy/functional/test_revision.py
    A ckan/tests/legacy/functional/test_storage.py
    A ckan/tests/legacy/functional/test_tag.py
    A ckan/tests/legacy/functional/test_tracking.py
    A ckan/tests/legacy/functional/test_user.py
    A ckan/tests/legacy/html_check.py
    A ckan/tests/legacy/lib/__init__.py
    A ckan/tests/legacy/lib/solr/schema-no-version.xml
    A ckan/tests/legacy/lib/solr/schema-wrong-version.xml
    A ckan/tests/legacy/lib/test_accept.py
    A ckan/tests/legacy/lib/test_alphabet_pagination.py
    A ckan/tests/legacy/lib/test_authenticator.py
    A ckan/tests/legacy/lib/test_cli.py
    A ckan/tests/legacy/lib/test_dictization.py
    A ckan/tests/legacy/lib/test_dictization_schema.py
    A ckan/tests/legacy/lib/test_email_notifications.py
    A ckan/tests/legacy/lib/test_hash.py
    A ckan/tests/legacy/lib/test_helpers.py
    A ckan/tests/legacy/lib/test_i18n.py
    A ckan/tests/legacy/lib/test_mailer.py
    A ckan/tests/legacy/lib/test_navl.py
    A ckan/tests/legacy/lib/test_resource_search.py
    A ckan/tests/legacy/lib/test_simple_search.py
    A ckan/tests/legacy/lib/test_solr_package_search.py
    A ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    A ckan/tests/legacy/lib/test_solr_schema_version.py
    A ckan/tests/legacy/lib/test_solr_search_index.py
    A ckan/tests/legacy/lib/test_tag_search.py
    A ckan/tests/legacy/logic/__init__.py
    A ckan/tests/legacy/logic/test_action.py
    A ckan/tests/legacy/logic/test_auth.py
    A ckan/tests/legacy/logic/test_init.py
    A ckan/tests/legacy/logic/test_member.py
    A ckan/tests/legacy/logic/test_tag.py
    A ckan/tests/legacy/logic/test_tag_vocab.py
    A ckan/tests/legacy/logic/test_validators.py
    A ckan/tests/legacy/misc/__init__.py
    A ckan/tests/legacy/misc/test_format_text.py
    A ckan/tests/legacy/misc/test_mock_mail_server.py
    A ckan/tests/legacy/misc/test_sync.py
    A ckan/tests/legacy/mock_mail_server.py
    A ckan/tests/legacy/mock_plugin.py
    A ckan/tests/legacy/models/__init__.py
    A ckan/tests/legacy/models/test_activity.py
    A ckan/tests/legacy/models/test_extras.py
    A ckan/tests/legacy/models/test_follower.py
    A ckan/tests/legacy/models/test_group.py
    A ckan/tests/legacy/models/test_license.py
    A ckan/tests/legacy/models/test_misc.py
    A ckan/tests/legacy/models/test_package.py
    A ckan/tests/legacy/models/test_package_relationships.py
    A ckan/tests/legacy/models/test_purge_revision.py
    A ckan/tests/legacy/models/test_resource.py
    A ckan/tests/legacy/models/test_revision.py
    A ckan/tests/legacy/models/test_user.py
    A ckan/tests/legacy/pylons_controller.py
    A ckan/tests/legacy/schema/__init__.py
    A ckan/tests/legacy/schema/test_schema.py
    A ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/legacy/test_dumper.py
    A ckan/tests/legacy/test_plugins.py
    A ckan/tests/legacy/test_versions.py
    A ckan/tests/legacy/test_wsgi_ckanclient.py
    A ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/__init__.py
    A ckan/tests/lib/dictization/__init__.py
    A ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/navl/__init__.py
    A ckan/tests/lib/navl/test_dictization_functions.py
    A ckan/tests/lib/navl/test_validators.py
    A ckan/tests/lib/search/__init__.py
    A ckan/tests/lib/search/test_index.py
    R ckan/tests/lib/solr/schema-no-version.xml
    R ckan/tests/lib/solr/schema-wrong-version.xml
    R ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_alphabet_pagination.py
    A ckan/tests/lib/test_auth_tkt.py
    R ckan/tests/lib/test_authenticator.py
    A ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_config_tool.py
    A ckan/tests/lib/test_datapreview.py
    R ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_email_notifications.py
    R ckan/tests/lib/test_hash.py
    M ckan/tests/lib/test_helpers.py
    R ckan/tests/lib/test_i18n.py
    R ckan/tests/lib/test_mailer.py
    A ckan/tests/lib/test_munge.py
    R ckan/tests/lib/test_navl.py
    R ckan/tests/lib/test_resource_search.py
    R ckan/tests/lib/test_simple_search.py
    R ckan/tests/lib/test_solr_package_search.py
    R ckan/tests/lib/test_solr_package_search_synchronous_update.py
    R ckan/tests/lib/test_solr_schema_version.py
    R ckan/tests/lib/test_solr_search_index.py
    R ckan/tests/lib/test_tag_search.py
    A ckan/tests/logic/action/__init__.py
    A ckan/tests/logic/action/test_create.py
    A ckan/tests/logic/action/test_delete.py
    A ckan/tests/logic/action/test_get.py
    A ckan/tests/logic/action/test_patch.py
    A ckan/tests/logic/action/test_update.py
    A ckan/tests/logic/auth/__init__.py
    A ckan/tests/logic/auth/test_create.py
    A ckan/tests/logic/auth/test_delete.py
    A ckan/tests/logic/auth/test_get.py
    A ckan/tests/logic/auth/test_init.py
    A ckan/tests/logic/auth/test_update.py
    R ckan/tests/logic/test_action.py
    R ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_conversion.py
    A ckan/tests/logic/test_converters.py
    R ckan/tests/logic/test_init.py
    R ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_schema.py
    R ckan/tests/logic/test_tag.py
    R ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/migration/__init__.py
    R ckan/tests/misc/__init__.py
    R ckan/tests/misc/test_format_text.py
    R ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_sync.py
    R ckan/tests/mock_mail_server.py
    R ckan/tests/mock_plugin.py
    A ckan/tests/model/__init__.py
    A ckan/tests/model/test_resource.py
    A ckan/tests/model/test_resource_view.py
    A ckan/tests/model/test_user.py
    R ckan/tests/models/__init__.py
    R ckan/tests/models/test_activity.py
    R ckan/tests/models/test_extras.py
    R ckan/tests/models/test_follower.py
    R ckan/tests/models/test_group.py
    R ckan/tests/models/test_license.py
    R ckan/tests/models/test_misc.py
    R ckan/tests/models/test_package.py
    R ckan/tests/models/test_package_relationships.py
    R ckan/tests/models/test_purge_revision.py
    R ckan/tests/models/test_resource.py
    R ckan/tests/models/test_revision.py
    R ckan/tests/models/test_user.py
    A ckan/tests/plugins/__init__.py
    R ckan/tests/pylons_controller.py
    R ckan/tests/schema/__init__.py
    R ckan/tests/schema/test_schema.py
    A ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    R ckan/tests/test_dumper.py
    A ckan/tests/test_factories.py
    R ckan/tests/test_plugins.py
    R ckan/tests/test_versions.py
    R ckan/tests/test_wsgi_ckanclient.py
    R ckan/tests/wsgi_ckanclient.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_iconfigurer/__init__.py
    A ckanext/example_iconfigurer/controller.py
    A ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/templates/admin/myext_config.html
    A ckanext/example_iconfigurer/tests/__init__.py
    A ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/templating.rst
    M doc/contributing/testing.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into make-vocabulary-dictize-faster


  Commit: 8369d3396a192fd9621e14870420679968cda8b6
      https://github.com/ckan/ckan/commit/8369d3396a192fd9621e14870420679968cda8b6
  Author: Matt Fullerton <mattfullerton at users.noreply.github.com>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Fixes #2412 by checking for less correct 400 response

Although the code checks for Error 405 which would be the correct response from a server when HEAD is not supported, I have come across a server where 400 is issued with the text "Invalid method in request", which essentially seems to mean the same thing. If we check for this too we can save problems with annoying servers.


  Commit: cec2ebfd9f15d681fe3c184b53e844c0a68c2672
      https://github.com/ckan/ckan/commit/cec2ebfd9f15d681fe3c184b53e844c0a68c2672
  Author: Matt Fullerton <mattfullerton at users.noreply.github.com>
  Date:   2015-05-07 (Thu, 07 May 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  Make the resource view extendable by adding a block definition


  Commit: bc53d5d820f0685c19474afdbb60435844877e27
      https://github.com/ckan/ckan/commit/bc53d5d820f0685c19474afdbb60435844877e27
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  [#2401] Cast string to unicode instead of str.

Casting the string to str caused an error for characters outside of the
ascii range. Notably, BOM at the beginning of documents.


  Commit: 8fccf8210e1e4a20fcd8db7acff83225761671e6
      https://github.com/ckan/ckan/commit/8fccf8210e1e4a20fcd8db7acff83225761671e6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M .coveragerc
    M CHANGELOG.rst
    A ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A ckan/i18n/ne/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
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/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/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/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
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.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
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/resource_view.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests.py
    R ckan/new_tests/__init__.py
    R ckan/new_tests/config/__init__.py
    R ckan/new_tests/controllers/__init__.py
    R ckan/new_tests/controllers/test_api.py
    R ckan/new_tests/controllers/test_feed.py
    R ckan/new_tests/controllers/test_group.py
    R ckan/new_tests/controllers/test_package.py
    R ckan/new_tests/controllers/test_util.py
    R ckan/new_tests/factories.py
    R ckan/new_tests/helpers.py
    R ckan/new_tests/lib/__init__.py
    R ckan/new_tests/lib/dictization/__init__.py
    R ckan/new_tests/lib/dictization/test_model_dictize.py
    R ckan/new_tests/lib/navl/__init__.py
    R ckan/new_tests/lib/navl/test_dictization_functions.py
    R ckan/new_tests/lib/navl/test_validators.py
    R ckan/new_tests/lib/search/__init__.py
    R ckan/new_tests/lib/search/test_index.py
    R ckan/new_tests/lib/test_auth_tkt.py
    R ckan/new_tests/lib/test_base.py
    R ckan/new_tests/lib/test_config_tool.py
    R ckan/new_tests/lib/test_datapreview.py
    R ckan/new_tests/lib/test_helpers.py
    R ckan/new_tests/lib/test_munge.py
    R ckan/new_tests/logic/__init__.py
    R ckan/new_tests/logic/action/__init__.py
    R ckan/new_tests/logic/action/test_create.py
    R ckan/new_tests/logic/action/test_delete.py
    R ckan/new_tests/logic/action/test_get.py
    R ckan/new_tests/logic/action/test_patch.py
    R ckan/new_tests/logic/action/test_update.py
    R ckan/new_tests/logic/auth/__init__.py
    R ckan/new_tests/logic/auth/test_create.py
    R ckan/new_tests/logic/auth/test_delete.py
    R ckan/new_tests/logic/auth/test_get.py
    R ckan/new_tests/logic/auth/test_init.py
    R ckan/new_tests/logic/auth/test_update.py
    R ckan/new_tests/logic/test_conversion.py
    R ckan/new_tests/logic/test_converters.py
    R ckan/new_tests/logic/test_schema.py
    R ckan/new_tests/logic/test_validators.py
    R ckan/new_tests/migration/__init__.py
    R ckan/new_tests/model/__init__.py
    R ckan/new_tests/model/test_resource.py
    R ckan/new_tests/model/test_resource_view.py
    R ckan/new_tests/model/test_user.py
    R ckan/new_tests/plugins/__init__.py
    R ckan/new_tests/test_authz.py
    R ckan/new_tests/test_coding_standards.py
    R ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/templates/admin/base.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugins.py
    A ckan/tests/config/__init__.py
    A ckan/tests/config/test_middleware.py
    A ckan/tests/controllers/__init__.py
    A ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_user.py
    A ckan/tests/controllers/test_util.py
    A ckan/tests/factories.py
    R ckan/tests/functional/__init__.py
    R ckan/tests/functional/api/__init__.py
    R ckan/tests/functional/api/base.py
    R ckan/tests/functional/api/model/__init__.py
    R ckan/tests/functional/api/model/test_group.py
    R ckan/tests/functional/api/model/test_group_and_organization_purge.py
    R ckan/tests/functional/api/model/test_licenses.py
    R ckan/tests/functional/api/model/test_package.py
    R ckan/tests/functional/api/model/test_ratings.py
    R ckan/tests/functional/api/model/test_relationships.py
    R ckan/tests/functional/api/model/test_revisions.py
    R ckan/tests/functional/api/model/test_tag.py
    R ckan/tests/functional/api/model/test_vocabulary.py
    R ckan/tests/functional/api/test_activity.py
    R ckan/tests/functional/api/test_api.py
    R ckan/tests/functional/api/test_dashboard.py
    R ckan/tests/functional/api/test_email_notifications.py
    R ckan/tests/functional/api/test_follow.py
    R ckan/tests/functional/api/test_misc.py
    R ckan/tests/functional/api/test_package_search.py
    R ckan/tests/functional/api/test_resource.py
    R ckan/tests/functional/api/test_resource_search.py
    R ckan/tests/functional/api/test_revision_search.py
    R ckan/tests/functional/api/test_user.py
    R ckan/tests/functional/api/test_util.py
    R ckan/tests/functional/base.py
    R ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_error.py
    R ckan/tests/functional/test_group.py
    R ckan/tests/functional/test_home.py
    R ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_pagination.py
    R ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_related.py
    R ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_storage.py
    R ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_user.py
    A ckan/tests/helpers.py
    R ckan/tests/html_check.py
    A ckan/tests/legacy/__init__.py
    A ckan/tests/legacy/ckantestplugins.py
    A ckan/tests/legacy/functional/__init__.py
    A ckan/tests/legacy/functional/api/__init__.py
    A ckan/tests/legacy/functional/api/base.py
    A ckan/tests/legacy/functional/api/model/__init__.py
    A ckan/tests/legacy/functional/api/model/test_group.py
    A ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    A ckan/tests/legacy/functional/api/model/test_licenses.py
    A ckan/tests/legacy/functional/api/model/test_package.py
    A ckan/tests/legacy/functional/api/model/test_ratings.py
    A ckan/tests/legacy/functional/api/model/test_relationships.py
    A ckan/tests/legacy/functional/api/model/test_revisions.py
    A ckan/tests/legacy/functional/api/model/test_tag.py
    A ckan/tests/legacy/functional/api/model/test_vocabulary.py
    A ckan/tests/legacy/functional/api/test_activity.py
    A ckan/tests/legacy/functional/api/test_api.py
    A ckan/tests/legacy/functional/api/test_dashboard.py
    A ckan/tests/legacy/functional/api/test_email_notifications.py
    A ckan/tests/legacy/functional/api/test_follow.py
    A ckan/tests/legacy/functional/api/test_misc.py
    A ckan/tests/legacy/functional/api/test_package_search.py
    A ckan/tests/legacy/functional/api/test_resource.py
    A ckan/tests/legacy/functional/api/test_resource_search.py
    A ckan/tests/legacy/functional/api/test_revision_search.py
    A ckan/tests/legacy/functional/api/test_user.py
    A ckan/tests/legacy/functional/api/test_util.py
    A ckan/tests/legacy/functional/base.py
    A ckan/tests/legacy/functional/test_activity.py
    A ckan/tests/legacy/functional/test_admin.py
    A ckan/tests/legacy/functional/test_error.py
    A ckan/tests/legacy/functional/test_group.py
    A ckan/tests/legacy/functional/test_home.py
    A ckan/tests/legacy/functional/test_package.py
    A ckan/tests/legacy/functional/test_pagination.py
    A ckan/tests/legacy/functional/test_preview_interface.py
    A ckan/tests/legacy/functional/test_related.py
    A ckan/tests/legacy/functional/test_revision.py
    A ckan/tests/legacy/functional/test_storage.py
    A ckan/tests/legacy/functional/test_tag.py
    A ckan/tests/legacy/functional/test_tracking.py
    A ckan/tests/legacy/functional/test_user.py
    A ckan/tests/legacy/html_check.py
    A ckan/tests/legacy/lib/__init__.py
    A ckan/tests/legacy/lib/solr/schema-no-version.xml
    A ckan/tests/legacy/lib/solr/schema-wrong-version.xml
    A ckan/tests/legacy/lib/test_accept.py
    A ckan/tests/legacy/lib/test_alphabet_pagination.py
    A ckan/tests/legacy/lib/test_authenticator.py
    A ckan/tests/legacy/lib/test_cli.py
    A ckan/tests/legacy/lib/test_dictization.py
    A ckan/tests/legacy/lib/test_dictization_schema.py
    A ckan/tests/legacy/lib/test_email_notifications.py
    A ckan/tests/legacy/lib/test_hash.py
    A ckan/tests/legacy/lib/test_helpers.py
    A ckan/tests/legacy/lib/test_i18n.py
    A ckan/tests/legacy/lib/test_mailer.py
    A ckan/tests/legacy/lib/test_navl.py
    A ckan/tests/legacy/lib/test_resource_search.py
    A ckan/tests/legacy/lib/test_simple_search.py
    A ckan/tests/legacy/lib/test_solr_package_search.py
    A ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    A ckan/tests/legacy/lib/test_solr_schema_version.py
    A ckan/tests/legacy/lib/test_solr_search_index.py
    A ckan/tests/legacy/lib/test_tag_search.py
    A ckan/tests/legacy/logic/__init__.py
    A ckan/tests/legacy/logic/test_action.py
    A ckan/tests/legacy/logic/test_auth.py
    A ckan/tests/legacy/logic/test_init.py
    A ckan/tests/legacy/logic/test_member.py
    A ckan/tests/legacy/logic/test_tag.py
    A ckan/tests/legacy/logic/test_tag_vocab.py
    A ckan/tests/legacy/logic/test_validators.py
    A ckan/tests/legacy/misc/__init__.py
    A ckan/tests/legacy/misc/test_format_text.py
    A ckan/tests/legacy/misc/test_mock_mail_server.py
    A ckan/tests/legacy/misc/test_sync.py
    A ckan/tests/legacy/mock_mail_server.py
    A ckan/tests/legacy/mock_plugin.py
    A ckan/tests/legacy/models/__init__.py
    A ckan/tests/legacy/models/test_activity.py
    A ckan/tests/legacy/models/test_extras.py
    A ckan/tests/legacy/models/test_follower.py
    A ckan/tests/legacy/models/test_group.py
    A ckan/tests/legacy/models/test_license.py
    A ckan/tests/legacy/models/test_misc.py
    A ckan/tests/legacy/models/test_package.py
    A ckan/tests/legacy/models/test_package_relationships.py
    A ckan/tests/legacy/models/test_purge_revision.py
    A ckan/tests/legacy/models/test_resource.py
    A ckan/tests/legacy/models/test_revision.py
    A ckan/tests/legacy/models/test_user.py
    A ckan/tests/legacy/pylons_controller.py
    A ckan/tests/legacy/schema/__init__.py
    A ckan/tests/legacy/schema/test_schema.py
    A ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/legacy/test_dumper.py
    A ckan/tests/legacy/test_plugins.py
    A ckan/tests/legacy/test_versions.py
    A ckan/tests/legacy/test_wsgi_ckanclient.py
    A ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/__init__.py
    A ckan/tests/lib/dictization/__init__.py
    A ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/navl/__init__.py
    A ckan/tests/lib/navl/test_dictization_functions.py
    A ckan/tests/lib/navl/test_validators.py
    A ckan/tests/lib/search/__init__.py
    A ckan/tests/lib/search/test_index.py
    R ckan/tests/lib/solr/schema-no-version.xml
    R ckan/tests/lib/solr/schema-wrong-version.xml
    R ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_alphabet_pagination.py
    A ckan/tests/lib/test_auth_tkt.py
    R ckan/tests/lib/test_authenticator.py
    A ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_config_tool.py
    A ckan/tests/lib/test_datapreview.py
    R ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_email_notifications.py
    R ckan/tests/lib/test_hash.py
    M ckan/tests/lib/test_helpers.py
    R ckan/tests/lib/test_i18n.py
    R ckan/tests/lib/test_mailer.py
    A ckan/tests/lib/test_munge.py
    R ckan/tests/lib/test_navl.py
    R ckan/tests/lib/test_resource_search.py
    R ckan/tests/lib/test_simple_search.py
    R ckan/tests/lib/test_solr_package_search.py
    R ckan/tests/lib/test_solr_package_search_synchronous_update.py
    R ckan/tests/lib/test_solr_schema_version.py
    R ckan/tests/lib/test_solr_search_index.py
    R ckan/tests/lib/test_tag_search.py
    A ckan/tests/logic/action/__init__.py
    A ckan/tests/logic/action/test_create.py
    A ckan/tests/logic/action/test_delete.py
    A ckan/tests/logic/action/test_get.py
    A ckan/tests/logic/action/test_patch.py
    A ckan/tests/logic/action/test_update.py
    A ckan/tests/logic/auth/__init__.py
    A ckan/tests/logic/auth/test_create.py
    A ckan/tests/logic/auth/test_delete.py
    A ckan/tests/logic/auth/test_get.py
    A ckan/tests/logic/auth/test_init.py
    A ckan/tests/logic/auth/test_update.py
    R ckan/tests/logic/test_action.py
    R ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_conversion.py
    A ckan/tests/logic/test_converters.py
    R ckan/tests/logic/test_init.py
    R ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_schema.py
    R ckan/tests/logic/test_tag.py
    R ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/migration/__init__.py
    R ckan/tests/misc/__init__.py
    R ckan/tests/misc/test_format_text.py
    R ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_sync.py
    R ckan/tests/mock_mail_server.py
    R ckan/tests/mock_plugin.py
    A ckan/tests/model/__init__.py
    A ckan/tests/model/test_resource.py
    A ckan/tests/model/test_resource_view.py
    A ckan/tests/model/test_user.py
    R ckan/tests/models/__init__.py
    R ckan/tests/models/test_activity.py
    R ckan/tests/models/test_extras.py
    R ckan/tests/models/test_follower.py
    R ckan/tests/models/test_group.py
    R ckan/tests/models/test_license.py
    R ckan/tests/models/test_misc.py
    R ckan/tests/models/test_package.py
    R ckan/tests/models/test_package_relationships.py
    R ckan/tests/models/test_purge_revision.py
    R ckan/tests/models/test_resource.py
    R ckan/tests/models/test_revision.py
    R ckan/tests/models/test_user.py
    A ckan/tests/plugins/__init__.py
    R ckan/tests/pylons_controller.py
    R ckan/tests/schema/__init__.py
    R ckan/tests/schema/test_schema.py
    A ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    R ckan/tests/test_dumper.py
    A ckan/tests/test_factories.py
    R ckan/tests/test_plugins.py
    R ckan/tests/test_versions.py
    R ckan/tests/test_wsgi_ckanclient.py
    R ckan/tests/wsgi_ckanclient.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_iconfigurer/__init__.py
    A ckanext/example_iconfigurer/controller.py
    A ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/templates/admin/myext_config.html
    A ckanext/example_iconfigurer/tests/__init__.py
    A ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/frontend/templating.rst
    M doc/contributing/testing.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into kata-csc-2125-add-organization-autocomplete

Conflicts:
	ckan/tests/controllers/test_api.py


  Commit: ec3b2448abb716a7f956d2876b2a2ab918bfd3e5
      https://github.com/ckan/ckan/commit/ec3b2448abb716a7f956d2876b2a2ab918bfd3e5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

  Changed paths:
    M ckan/tests/controllers/test_api.py

  Log Message:
  -----------
  [#2125] Fix test.


  Commit: c6d933388b19e16cec21ca447fae7a50ece6bccb
      https://github.com/ckan/ckan/commit/c6d933388b19e16cec21ca447fae7a50ece6bccb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-11 (Mon, 11 May 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge branch '2401-unicode-remove-linebreaks' of https://github.com/brew/ckan into brew-2401-unicode-remove-linebreaks


  Commit: e53a8eadc4109714b5e86f90f49c3eeeea359f4a
      https://github.com/ckan/ckan/commit/e53a8eadc4109714b5e86f90f49c3eeeea359f4a
  Author: Kacper Kowalik <xarthisius.kk at gmail.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M contrib/docker/my_init.d/50_configure

  Log Message:
  -----------
  Fix typo in db pass configuration


  Commit: ba85a882b16c849212deb289a0765ac1eea97202
      https://github.com/ckan/ckan/commit/ba85a882b16c849212deb289a0765ac1eea97202
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/legacy/functional/test_package.py

  Log Message:
  -----------
  Fix for /dataset?sort exception.


  Commit: 71a5524392013ea3836d455af8a8e26672e44e30
      https://github.com/ckan/ckan/commit/71a5524392013ea3836d455af8a8e26672e44e30
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2015-05-21 (Thu, 21 May 2015)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  Fix broken boolean validator

The boolean validator treats missing values as True. They should be treated as False, both semantically and because unchecked  HTML checkboxes in forms transmit empty values on form submits


  Commit: 6735af05884614ddab64372eee0e57613034dd2c
      https://github.com/ckan/ckan/commit/6735af05884614ddab64372eee0e57613034dd2c
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  docstring for boolean validator


  Commit: 24f69559f9e403c8eb07744cb9f0be420a714389
      https://github.com/ckan/ckan/commit/24f69559f9e403c8eb07744cb9f0be420a714389
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2015-06-01 (Mon, 01 Jun 2015)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/tests/logic/test_validators.py

  Log Message:
  -----------
  boolean validator tests


  Commit: 8e582080b590c5d2cf53a0cfe49848c22c082611
      https://github.com/ckan/ckan/commit/8e582080b590c5d2cf53a0cfe49848c22c082611
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2015-06-04 (Thu, 04 Jun 2015)

  Changed paths:
    M contrib/docker/my_init.d/50_configure

  Log Message:
  -----------
  Merge pull request #2427 from Xarthisius/docker_configure_fix

Fix typo in db pass configuration


  Commit: aa5b878ecf1cbba8feca12b8e10cbee9d9a025d6
      https://github.com/ckan/ckan/commit/aa5b878ecf1cbba8feca12b8e10cbee9d9a025d6
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/model/license.py
    M ckan/plugins/toolkit.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/snippets/user_search.html
    A ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/functional/test_group.py
    R ckan/tests/legacy/models/test_license.py
    M ckan/tests/logic/action/test_get.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M contrib/docker/my_init.d/50_configure
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2350-license-schema

Conflicts:
	ckan/tests/controllers/test_user.py


  Commit: 2b27a58b9d9a22841f1b6c89657662d19d0dff9d
      https://github.com/ckan/ckan/commit/2b27a58b9d9a22841f1b6c89657662d19d0dff9d
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/lib/base.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  Merge branch '2350-license-schema'


  Commit: 33034ef981c5b0233ce73bbcf0dda8082b5af9e6
      https://github.com/ckan/ckan/commit/33034ef981c5b0233ce73bbcf0dda8082b5af9e6
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge branch 'patch-2' of https://github.com/mattfullerton/ckan into mattfullerton-patch-2


  Commit: c13528dcf674214f3bceeaef532317dff03fc001
      https://github.com/ckan/ckan/commit/c13528dcf674214f3bceeaef532317dff03fc001
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M ckanext/resourceproxy/controller.py

  Log Message:
  -----------
  Merge branch 'mattfullerton-patch-2'


  Commit: 6a40db5d6d4fc943d116476d2a6489d253ef1c83
      https://github.com/ckan/ckan/commit/6a40db5d6d4fc943d116476d2a6489d253ef1c83
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M ckan/tests/logic/test_validators.py

  Log Message:
  -----------
  pep8 fix for boolean validator test


  Commit: bb9bc1142244fe1ff31ec6332362ea166c177207
      https://github.com/ckan/ckan/commit/bb9bc1142244fe1ff31ec6332362ea166c177207
  Author: Ian Ward <ian at excess.org>
  Date:   2015-06-09 (Tue, 09 Jun 2015)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/tests/logic/test_validators.py

  Log Message:
  -----------
  Merge pull request #2443 from deniszgonjanin/broken_boolean_validator

Fix broken boolean validator


  Commit: c5e63c6a40456421c9e76ed16d9c60d5b664bf0f
      https://github.com/ckan/ckan/commit/c5e63c6a40456421c9e76ed16d9c60d5b664bf0f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#2462] Upgrade Beaker requirement

Because of this issue you get an exception when using the Beaker database
backend on the version CKAN is targeting now (Beaker==1.6.4):

https://github.com/bbangert/beaker/commit/fc511ceda4305fcf54919b3f081fed7790e2fef3


  Commit: 02b83ce3f573f34aaa523336a884bbd36bb6f260
      https://github.com/ckan/ckan/commit/02b83ce3f573f34aaa523336a884bbd36bb6f260
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/app_globals.py
    M ckan/lib/captcha.py
    M ckan/templates/user/snippets/recaptcha.html
    M doc/maintaining/configuration.rst

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


  Commit: 64401b77dffdacdc5915c58e442b1608ea0e746b
      https://github.com/ckan/ckan/commit/64401b77dffdacdc5915c58e442b1608ea0e746b
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/lib/app_globals.py
    M ckan/lib/captcha.py
    M ckan/templates/user/snippets/recaptcha.html
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'AdzRivers-master'


  Commit: 6ef3060243a3a334c6529240342e91fd47ab4110
      https://github.com/ckan/ckan/commit/6ef3060243a3a334c6529240342e91fd47ab4110
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  Merge branch 'patch-3' of https://github.com/mattfullerton/ckan into mattfullerton-patch-3


  Commit: c3e3018ae0ad0e5b2d8ce6e7184685ef7c16eedb
      https://github.com/ckan/ckan/commit/c3e3018ae0ad0e5b2d8ce6e7184685ef7c16eedb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M ckan/templates/package/snippets/resource_view.html

  Log Message:
  -----------
  Merge branch 'mattfullerton-patch-3'


  Commit: e2e197071a6ef284710b06912a0548f7c16855a5
      https://github.com/ckan/ckan/commit/e2e197071a6ef284710b06912a0548f7c16855a5
  Author: Ian Ward <ian at excess.org>
  Date:   2015-06-11 (Thu, 11 Jun 2015)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #2462 from ckan/2462-upgrade-beaker

Upgrade beaker requirement


  Commit: 69a31126c61636a0e539c85a0a56ea97a0f03335
      https://github.com/ckan/ckan/commit/69a31126c61636a0e539c85a0a56ea97a0f03335
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#1886] tag_show now works with vocabs and you dont have to return datasets. New tests for tag_show and tag_list.


  Commit: 72d1707fd1c1b981b53765c6ba6fec6d7b10aefc
      https://github.com/ckan/ckan/commit/72d1707fd1c1b981b53765c6ba6fec6d7b10aefc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/logic/action/get.py
    M doc/api/index.rst

  Log Message:
  -----------
  [#1886] Docs and changelog.


  Commit: 90d0ddd8020fbbc8c95cc972fcf3143a8fda886d
      https://github.com/ckan/ckan/commit/90d0ddd8020fbbc8c95cc972fcf3143a8fda886d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-12 (Fri, 12 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/logic/action/get.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#1886] Change default of tag_show include_datasets to False, like in #2206.


  Commit: 1b3b7133eee8cefa717ac3cf50105b21d1891ad6
      https://github.com/ckan/ckan/commit/1b3b7133eee8cefa717ac3cf50105b21d1891ad6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/helpers.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/validators.py
    M ckan/model/license.py
    M ckan/plugins/toolkit.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/snippets/recaptcha.html
    A ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/legacy/functional/test_group.py
    R ckan/tests/legacy/models/test_license.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M ckanext/resourceproxy/controller.py
    M contrib/docker/my_init.d/50_configure
    M doc/maintaining/configuration.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into make-vocabulary-dictize-faster

Conflicts:
	CHANGELOG.rst


  Commit: d753dfd339740dadeab24b18d9dadd77c97ce6aa
      https://github.com/ckan/ckan/commit/d753dfd339740dadeab24b18d9dadd77c97ce6aa
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-13 (Sat, 13 Jun 2015)

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

  Log Message:
  -----------
  [#1886] Fix test.


  Commit: c6b494dcdd6df1d5b04c7dcf313beac39c049916
      https://github.com/ckan/ckan/commit/c6b494dcdd6df1d5b04c7dcf313beac39c049916
  Author: Ian Ward <ian at excess.org>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

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

  Log Message:
  -----------
  [#1886] remove unnecessary legacy test modifications


  Commit: 39039d8c04116b01dbd01334f350cfb3404ccc75
      https://github.com/ckan/ckan/commit/39039d8c04116b01dbd01334f350cfb3404ccc75
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/search_form.html

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


  Commit: 3ae76b73d94f1968e8746b3766be954e444013ae
      https://github.com/ckan/ckan/commit/3ae76b73d94f1968e8746b3766be954e444013ae
  Author: Ian Ward <ian at excess.org>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/factories.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/logic/action/test_get.py
    M doc/api/index.rst

  Log Message:
  -----------
  Merge branch 'make-vocabulary-dictize-faster'


  Commit: 2eb26a415f9efd63bc50ee8fa5e343d895d50727
      https://github.com/ckan/ckan/commit/2eb26a415f9efd63bc50ee8fa5e343d895d50727
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M .coveragerc
    M CHANGELOG.rst
    M MANIFEST.in
    M ckan/__init__.py
    A ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A ckan/i18n/ne/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
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/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/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/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
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.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/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/license.py
    M ckan/model/resource_view.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests.py
    R ckan/new_tests/__init__.py
    R ckan/new_tests/config/__init__.py
    R ckan/new_tests/controllers/__init__.py
    R ckan/new_tests/controllers/test_api.py
    R ckan/new_tests/controllers/test_feed.py
    R ckan/new_tests/controllers/test_group.py
    R ckan/new_tests/controllers/test_package.py
    R ckan/new_tests/controllers/test_util.py
    R ckan/new_tests/factories.py
    R ckan/new_tests/helpers.py
    R ckan/new_tests/lib/__init__.py
    R ckan/new_tests/lib/dictization/__init__.py
    R ckan/new_tests/lib/dictization/test_model_dictize.py
    R ckan/new_tests/lib/navl/__init__.py
    R ckan/new_tests/lib/navl/test_dictization_functions.py
    R ckan/new_tests/lib/navl/test_validators.py
    R ckan/new_tests/lib/search/__init__.py
    R ckan/new_tests/lib/search/test_index.py
    R ckan/new_tests/lib/test_auth_tkt.py
    R ckan/new_tests/lib/test_base.py
    R ckan/new_tests/lib/test_config_tool.py
    R ckan/new_tests/lib/test_helpers.py
    R ckan/new_tests/logic/__init__.py
    R ckan/new_tests/logic/action/__init__.py
    R ckan/new_tests/logic/action/test_create.py
    R ckan/new_tests/logic/action/test_delete.py
    R ckan/new_tests/logic/action/test_get.py
    R ckan/new_tests/logic/action/test_patch.py
    R ckan/new_tests/logic/action/test_update.py
    R ckan/new_tests/logic/auth/__init__.py
    R ckan/new_tests/logic/auth/test_create.py
    R ckan/new_tests/logic/auth/test_delete.py
    R ckan/new_tests/logic/auth/test_init.py
    R ckan/new_tests/logic/auth/test_update.py
    R ckan/new_tests/logic/test_conversion.py
    R ckan/new_tests/logic/test_converters.py
    R ckan/new_tests/logic/test_schema.py
    R ckan/new_tests/logic/test_validators.py
    R ckan/new_tests/migration/__init__.py
    R ckan/new_tests/model/__init__.py
    R ckan/new_tests/model/test_resource.py
    R ckan/new_tests/model/test_resource_view.py
    R ckan/new_tests/model/test_user.py
    R ckan/new_tests/plugins/__init__.py
    R ckan/new_tests/test_authz.py
    R ckan/new_tests/test_coding_standards.py
    R ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugins.py
    A ckan/tests/config/__init__.py
    A ckan/tests/config/test_environment.py
    A ckan/tests/config/test_middleware.py
    A ckan/tests/controllers/__init__.py
    A ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_user.py
    A ckan/tests/controllers/test_util.py
    A ckan/tests/factories.py
    R ckan/tests/functional/__init__.py
    R ckan/tests/functional/api/__init__.py
    R ckan/tests/functional/api/base.py
    R ckan/tests/functional/api/model/__init__.py
    R ckan/tests/functional/api/model/test_group.py
    R ckan/tests/functional/api/model/test_group_and_organization_purge.py
    R ckan/tests/functional/api/model/test_licenses.py
    R ckan/tests/functional/api/model/test_package.py
    R ckan/tests/functional/api/model/test_ratings.py
    R ckan/tests/functional/api/model/test_relationships.py
    R ckan/tests/functional/api/model/test_revisions.py
    R ckan/tests/functional/api/model/test_tag.py
    R ckan/tests/functional/api/model/test_vocabulary.py
    R ckan/tests/functional/api/test_activity.py
    R ckan/tests/functional/api/test_api.py
    R ckan/tests/functional/api/test_dashboard.py
    R ckan/tests/functional/api/test_email_notifications.py
    R ckan/tests/functional/api/test_follow.py
    R ckan/tests/functional/api/test_misc.py
    R ckan/tests/functional/api/test_package_search.py
    R ckan/tests/functional/api/test_resource.py
    R ckan/tests/functional/api/test_resource_search.py
    R ckan/tests/functional/api/test_revision_search.py
    R ckan/tests/functional/api/test_user.py
    R ckan/tests/functional/api/test_util.py
    R ckan/tests/functional/base.py
    R ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_error.py
    R ckan/tests/functional/test_group.py
    R ckan/tests/functional/test_home.py
    R ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_pagination.py
    R ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_related.py
    R ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_storage.py
    R ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_user.py
    A ckan/tests/helpers.py
    R ckan/tests/html_check.py
    A ckan/tests/legacy/__init__.py
    A ckan/tests/legacy/ckantestplugins.py
    A ckan/tests/legacy/functional/__init__.py
    A ckan/tests/legacy/functional/api/__init__.py
    A ckan/tests/legacy/functional/api/base.py
    A ckan/tests/legacy/functional/api/model/__init__.py
    A ckan/tests/legacy/functional/api/model/test_group.py
    A ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    A ckan/tests/legacy/functional/api/model/test_licenses.py
    A ckan/tests/legacy/functional/api/model/test_package.py
    A ckan/tests/legacy/functional/api/model/test_ratings.py
    A ckan/tests/legacy/functional/api/model/test_relationships.py
    A ckan/tests/legacy/functional/api/model/test_revisions.py
    A ckan/tests/legacy/functional/api/model/test_tag.py
    A ckan/tests/legacy/functional/api/model/test_vocabulary.py
    A ckan/tests/legacy/functional/api/test_activity.py
    A ckan/tests/legacy/functional/api/test_api.py
    A ckan/tests/legacy/functional/api/test_dashboard.py
    A ckan/tests/legacy/functional/api/test_email_notifications.py
    A ckan/tests/legacy/functional/api/test_follow.py
    A ckan/tests/legacy/functional/api/test_misc.py
    A ckan/tests/legacy/functional/api/test_package_search.py
    A ckan/tests/legacy/functional/api/test_resource.py
    A ckan/tests/legacy/functional/api/test_resource_search.py
    A ckan/tests/legacy/functional/api/test_revision_search.py
    A ckan/tests/legacy/functional/api/test_user.py
    A ckan/tests/legacy/functional/api/test_util.py
    A ckan/tests/legacy/functional/base.py
    A ckan/tests/legacy/functional/test_activity.py
    A ckan/tests/legacy/functional/test_admin.py
    A ckan/tests/legacy/functional/test_error.py
    A ckan/tests/legacy/functional/test_group.py
    A ckan/tests/legacy/functional/test_home.py
    A ckan/tests/legacy/functional/test_package.py
    A ckan/tests/legacy/functional/test_pagination.py
    A ckan/tests/legacy/functional/test_preview_interface.py
    A ckan/tests/legacy/functional/test_related.py
    A ckan/tests/legacy/functional/test_revision.py
    A ckan/tests/legacy/functional/test_storage.py
    A ckan/tests/legacy/functional/test_tag.py
    A ckan/tests/legacy/functional/test_tracking.py
    A ckan/tests/legacy/functional/test_user.py
    A ckan/tests/legacy/html_check.py
    A ckan/tests/legacy/lib/__init__.py
    A ckan/tests/legacy/lib/solr/schema-no-version.xml
    A ckan/tests/legacy/lib/solr/schema-wrong-version.xml
    A ckan/tests/legacy/lib/test_accept.py
    A ckan/tests/legacy/lib/test_alphabet_pagination.py
    A ckan/tests/legacy/lib/test_authenticator.py
    A ckan/tests/legacy/lib/test_cli.py
    A ckan/tests/legacy/lib/test_dictization.py
    A ckan/tests/legacy/lib/test_dictization_schema.py
    A ckan/tests/legacy/lib/test_email_notifications.py
    A ckan/tests/legacy/lib/test_hash.py
    A ckan/tests/legacy/lib/test_helpers.py
    A ckan/tests/legacy/lib/test_i18n.py
    A ckan/tests/legacy/lib/test_mailer.py
    A ckan/tests/legacy/lib/test_navl.py
    A ckan/tests/legacy/lib/test_resource_search.py
    A ckan/tests/legacy/lib/test_simple_search.py
    A ckan/tests/legacy/lib/test_solr_package_search.py
    A ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    A ckan/tests/legacy/lib/test_solr_schema_version.py
    A ckan/tests/legacy/lib/test_solr_search_index.py
    A ckan/tests/legacy/lib/test_tag_search.py
    A ckan/tests/legacy/logic/__init__.py
    A ckan/tests/legacy/logic/test_action.py
    A ckan/tests/legacy/logic/test_auth.py
    A ckan/tests/legacy/logic/test_init.py
    A ckan/tests/legacy/logic/test_member.py
    A ckan/tests/legacy/logic/test_tag.py
    A ckan/tests/legacy/logic/test_tag_vocab.py
    A ckan/tests/legacy/logic/test_validators.py
    A ckan/tests/legacy/misc/__init__.py
    A ckan/tests/legacy/misc/test_format_text.py
    A ckan/tests/legacy/misc/test_mock_mail_server.py
    A ckan/tests/legacy/misc/test_sync.py
    A ckan/tests/legacy/mock_mail_server.py
    A ckan/tests/legacy/mock_plugin.py
    A ckan/tests/legacy/models/__init__.py
    A ckan/tests/legacy/models/test_activity.py
    A ckan/tests/legacy/models/test_extras.py
    A ckan/tests/legacy/models/test_follower.py
    A ckan/tests/legacy/models/test_group.py
    A ckan/tests/legacy/models/test_misc.py
    A ckan/tests/legacy/models/test_package.py
    A ckan/tests/legacy/models/test_package_relationships.py
    A ckan/tests/legacy/models/test_purge_revision.py
    A ckan/tests/legacy/models/test_resource.py
    A ckan/tests/legacy/models/test_revision.py
    A ckan/tests/legacy/models/test_user.py
    A ckan/tests/legacy/pylons_controller.py
    A ckan/tests/legacy/schema/__init__.py
    A ckan/tests/legacy/schema/test_schema.py
    A ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/legacy/test_dumper.py
    A ckan/tests/legacy/test_plugins.py
    A ckan/tests/legacy/test_versions.py
    A ckan/tests/legacy/test_wsgi_ckanclient.py
    A ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/__init__.py
    A ckan/tests/lib/dictization/__init__.py
    A ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/navl/__init__.py
    A ckan/tests/lib/navl/test_dictization_functions.py
    A ckan/tests/lib/navl/test_validators.py
    A ckan/tests/lib/search/__init__.py
    A ckan/tests/lib/search/test_index.py
    R ckan/tests/lib/solr/schema-no-version.xml
    R ckan/tests/lib/solr/schema-wrong-version.xml
    R ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_alphabet_pagination.py
    A ckan/tests/lib/test_auth_tkt.py
    R ckan/tests/lib/test_authenticator.py
    A ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    R ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_email_notifications.py
    R ckan/tests/lib/test_hash.py
    M ckan/tests/lib/test_helpers.py
    R ckan/tests/lib/test_i18n.py
    R ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    R ckan/tests/lib/test_navl.py
    R ckan/tests/lib/test_resource_search.py
    R ckan/tests/lib/test_simple_search.py
    R ckan/tests/lib/test_solr_package_search.py
    R ckan/tests/lib/test_solr_package_search_synchronous_update.py
    R ckan/tests/lib/test_solr_schema_version.py
    R ckan/tests/lib/test_solr_search_index.py
    R ckan/tests/lib/test_tag_search.py
    A ckan/tests/logic/action/__init__.py
    A ckan/tests/logic/action/test_create.py
    A ckan/tests/logic/action/test_delete.py
    A ckan/tests/logic/action/test_get.py
    A ckan/tests/logic/action/test_patch.py
    A ckan/tests/logic/action/test_update.py
    A ckan/tests/logic/auth/__init__.py
    A ckan/tests/logic/auth/test_create.py
    A ckan/tests/logic/auth/test_delete.py
    A ckan/tests/logic/auth/test_get.py
    A ckan/tests/logic/auth/test_init.py
    A ckan/tests/logic/auth/test_update.py
    R ckan/tests/logic/test_action.py
    R ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_conversion.py
    A ckan/tests/logic/test_converters.py
    R ckan/tests/logic/test_init.py
    R ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_schema.py
    R ckan/tests/logic/test_tag.py
    R ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/migration/__init__.py
    R ckan/tests/misc/__init__.py
    R ckan/tests/misc/test_format_text.py
    R ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_sync.py
    R ckan/tests/mock_mail_server.py
    R ckan/tests/mock_plugin.py
    A ckan/tests/model/__init__.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckan/tests/model/test_resource.py
    A ckan/tests/model/test_resource_view.py
    A ckan/tests/model/test_user.py
    R ckan/tests/models/__init__.py
    R ckan/tests/models/test_activity.py
    R ckan/tests/models/test_extras.py
    R ckan/tests/models/test_follower.py
    R ckan/tests/models/test_group.py
    R ckan/tests/models/test_license.py
    R ckan/tests/models/test_misc.py
    R ckan/tests/models/test_package.py
    R ckan/tests/models/test_package_relationships.py
    R ckan/tests/models/test_purge_revision.py
    R ckan/tests/models/test_resource.py
    R ckan/tests/models/test_revision.py
    R ckan/tests/models/test_user.py
    A ckan/tests/plugins/__init__.py
    R ckan/tests/pylons_controller.py
    R ckan/tests/schema/__init__.py
    R ckan/tests/schema/test_schema.py
    A ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    R ckan/tests/test_dumper.py
    A ckan/tests/test_factories.py
    R ckan/tests/test_plugins.py
    R ckan/tests/test_versions.py
    R ckan/tests/test_wsgi_ckanclient.py
    R ckan/tests/wsgi_ckanclient.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_iconfigurer/__init__.py
    A ckanext/example_iconfigurer/controller.py
    A ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/templates/admin/myext_config.html
    A ckanext/example_iconfigurer/tests/__init__.py
    A ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M contrib/docker/my_init.d/50_configure
    M doc/contributing/frontend/templating.rst
    M doc/contributing/testing.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2206-group-org-show-exclude-datasets

Conflicts:
	CHANGELOG.rst
	ckan/tests/logic/action/test_get.py


  Commit: 97ab43f46e38fd9af0e437c9b051e38962a79b81
      https://github.com/ckan/ckan/commit/97ab43f46e38fd9af0e437c9b051e38962a79b81
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-06-15 (Mon, 15 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/search.html
    M ckan/templates/snippets/search_form.html
    M ckan/tests/factories.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/logic/action/test_get.py
    M doc/api/index.rst

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


  Commit: c0e6fcbc82efdf05767e2c1ba106f09e5f1e6759
      https://github.com/ckan/ckan/commit/c0e6fcbc82efdf05767e2c1ba106f09e5f1e6759
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckanext/multilingual/solr/schema.xml

  Log Message:
  -----------
  [#2161] Update multilingual schema with changes from #2078 #1905 #1495.


  Commit: ed6da180afd71aad8575e09c843c72caaa2b9261
      https://github.com/ckan/ckan/commit/ed6da180afd71aad8575e09c843c72caaa2b9261
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckan/config/solr/schema.xml

  Log Message:
  -----------
  [#2161] Updated version policy, following agreement at ckan tech meeting.


  Commit: 80275f89ca87665fbc187d2279347dc1120e6ace
      https://github.com/ckan/ckan/commit/80275f89ca87665fbc187d2279347dc1120e6ace
  Author: Joe Tsoi <joetsoi at users.noreply.github.com>
  Date:   2015-06-16 (Tue, 16 Jun 2015)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/legacy/functional/test_package.py

  Log Message:
  -----------
  Merge pull request #2432 from ckan/sort-exception2

Fix for /dataset?sort exception.


  Commit: 37dcf7b8b052d36a20a3860dcdd123fc7d03e603
      https://github.com/ckan/ckan/commit/37dcf7b8b052d36a20a3860dcdd123fc7d03e603
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-17 (Wed, 17 Jun 2015)

  Changed paths:
    M ckan/config/solr/schema.xml
    M ckanext/multilingual/solr/schema.xml

  Log Message:
  -----------
  Merge branch 'multilingual-schema-update'


  Commit: 362b6f43123e55a2f0c4384f67140b23be909839
      https://github.com/ckan/ckan/commit/362b6f43123e55a2f0c4384f67140b23be909839
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Remove old useless scripts.


  Commit: 2d5a56aa632639d4a873769028a80dad7aeaf60d
      https://github.com/ckan/ckan/commit/2d5a56aa632639d4a873769028a80dad7aeaf60d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    M ckan/tests/legacy/test_coding_standards.py
    R ckan/tests/legacy/test_wsgi_ckanclient.py
    R ckan/tests/legacy/wsgi_ckanclient.py
    M dev-requirements.txt

  Log Message:
  -----------
  Theres really no need to test WSGI layer as well as logic layer. Lose ckanclient dependency too.


  Commit: bc66ed3a4b0feb0969f082f8ee8bd7020c2f058a
      https://github.com/ckan/ckan/commit/bc66ed3a4b0feb0969f082f8ee8bd7020c2f058a
  Author: Ian Ward <ian at excess.org>
  Date:   2015-06-18 (Thu, 18 Jun 2015)

  Changed paths:
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/tests/legacy/test_coding_standards.py
    R ckan/tests/legacy/test_wsgi_ckanclient.py
    R ckan/tests/legacy/wsgi_ckanclient.py
    M dev-requirements.txt

  Log Message:
  -----------
  Merge pull request #2477 from ckan/delete_old_bin

Remove old useless scripts in /bin


  Commit: 6c67fe2b40ecbe8f8403ac3c0cdb9b84422294e3
      https://github.com/ckan/ckan/commit/6c67fe2b40ecbe8f8403ac3c0cdb9b84422294e3
  Author: george <george.sattler at xvt.com.au>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  wraps error messages in internationalisation helper methods


  Commit: 1357527f9de0c66fc3234226cc10ce581d4369a0
      https://github.com/ckan/ckan/commit/1357527f9de0c66fc3234226cc10ce581d4369a0
  Author: george <george.sattler at xvt.com.au>
  Date:   2015-06-19 (Fri, 19 Jun 2015)

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

  Log Message:
  -----------
  changes form id attribute to align with new naming convention


  Commit: f077267d82cabc16c68e441e005ae75fd0344a7a
      https://github.com/ckan/ckan/commit/f077267d82cabc16c68e441e005ae75fd0344a7a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/lib/test_helpers.py

  Log Message:
  -----------
  Merge branch 'brew-2401-unicode-remove-linebreaks'


  Commit: 0f6b894c656d06ea1a8e70e6448846ad36de74fb
      https://github.com/ckan/ckan/commit/0f6b894c656d06ea1a8e70e6448846ad36de74fb
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    A ckan/new_tests/controllers/test_user.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch '1940-check-old-password-on-user-password-update' of https://github.com/george-sattler/ckan into george-sattler-1940-check-old-password-on-user-password-update

Conflicts:
	ckan/templates/user/edit_user_form.html


  Commit: ae633a76809a83cb0655f36078ceae8626818c0a
      https://github.com/ckan/ckan/commit/ae633a76809a83cb0655f36078ceae8626818c0a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/logic/__init__.py
    A ckan/new_tests/controllers/test_user.py
    M ckan/templates/user/edit_user_form.html

  Log Message:
  -----------
  Merge branch 'george-sattler-1940-check-old-password-on-user-password-update'


  Commit: ad1b8890e6093541b53cdf4f5b2a79e750ee8375
      https://github.com/ckan/ckan/commit/ad1b8890e6093541b53cdf4f5b2a79e750ee8375
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M .coveragerc
    M CHANGELOG.rst
    M MANIFEST.in
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/__init__.py
    A ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/config/who.ini
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/home.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A ckan/i18n/ne/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
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/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/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/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
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/accept.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/fanstatic_resources.py
    R ckan/lib/field_types.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    R ckan/lib/repoze_patch.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    A ckan/logic/action/patch.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    A ckan/logic/auth/patch.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/074_remove_resource_groups.py
    A ckan/migration/versions/075_rename_view_plugins.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/group.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/package.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/tag.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests.py
    R ckan/new_tests/__init__.py
    R ckan/new_tests/controllers/__init__.py
    R ckan/new_tests/controllers/test_group.py
    R ckan/new_tests/controllers/test_package.py
    A ckan/new_tests/controllers/test_user.py
    R ckan/new_tests/controllers/test_util.py
    R ckan/new_tests/factories.py
    R ckan/new_tests/helpers.py
    R ckan/new_tests/lib/__init__.py
    R ckan/new_tests/lib/dictization/test_model_dictize.py
    R ckan/new_tests/lib/navl/__init__.py
    R ckan/new_tests/lib/navl/test_dictization_functions.py
    R ckan/new_tests/lib/navl/test_validators.py
    R ckan/new_tests/lib/search/__init__.py
    R ckan/new_tests/lib/search/test_index.py
    R ckan/new_tests/lib/test_config_tool.py
    R ckan/new_tests/lib/test_helpers.py
    R ckan/new_tests/logic/__init__.py
    R ckan/new_tests/logic/action/__init__.py
    R ckan/new_tests/logic/action/test_create.py
    R ckan/new_tests/logic/action/test_get.py
    R ckan/new_tests/logic/action/test_update.py
    R ckan/new_tests/logic/auth/__init__.py
    R ckan/new_tests/logic/auth/test_create.py
    R ckan/new_tests/logic/auth/test_init.py
    R ckan/new_tests/logic/auth/test_update.py
    R ckan/new_tests/logic/test_conversion.py
    R ckan/new_tests/logic/test_converters.py
    R ckan/new_tests/logic/test_schema.py
    R ckan/new_tests/logic/test_validators.py
    R ckan/new_tests/migration/__init__.py
    R ckan/new_tests/model/__init__.py
    R ckan/new_tests/model/test_resource.py
    R ckan/new_tests/model/test_resource_view.py
    R ckan/new_tests/model/test_user.py
    R ckan/new_tests/plugins/__init__.py
    R ckan/new_tests/test_coding_standards.py
    R ckan/new_tests/test_factories.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    A ckan/public/base/images/od_80x15_blue.png
    A ckan/public/base/images/placeholder-200x125.png
    A ckan/public/base/images/placeholder-420x220.png
    A ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/javascript/client.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    A ckan/public/base/javascript/modules/resource-view-filters-form.js
    A ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/resource.config
    A ckan/public/base/javascript/view-filters.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    R ckan/public/base/less/resource-view-embed.less
    A ckan/public/base/less/resource-view.less
    M ckan/public/base/less/search.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/view-filters.spec.js
    A ckan/public/base/vendor/polyfill-object-keys.js
    M ckan/public/base/vendor/resource.config
    M ckan/public/scripts/application.js
    R ckan/rating.py
    M ckan/templates/admin/base.html
    M ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/development/snippets/markup.html
    M ckan/templates/footer.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/promoted.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/macros/form.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/snippets/help.html
    M ckan/templates/package/new_view.html
    M ckan/templates/package/read.html
    A ckan/templates/package/read.n3
    A ckan/templates/package/read.rdf
    M ckan/templates/package/read_base.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_item.html
    M ckan/templates/package/snippets/resource_view.html
    A ckan/templates/package/snippets/resource_view_filters.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/view_form.html
    A ckan/templates/package/snippets/view_form_filters.html
    M ckan/templates/snippets/context.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/related.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates/user/snippets/user_search.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugins.py
    A ckan/tests/config/__init__.py
    A ckan/tests/config/test_environment.py
    A ckan/tests/config/test_middleware.py
    A ckan/tests/controllers/__init__.py
    A ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_user.py
    A ckan/tests/controllers/test_util.py
    A ckan/tests/factories.py
    R ckan/tests/functional/__init__.py
    R ckan/tests/functional/api/__init__.py
    R ckan/tests/functional/api/base.py
    R ckan/tests/functional/api/model/__init__.py
    R ckan/tests/functional/api/model/test_group.py
    R ckan/tests/functional/api/model/test_group_and_organization_purge.py
    R ckan/tests/functional/api/model/test_licenses.py
    R ckan/tests/functional/api/model/test_package.py
    R ckan/tests/functional/api/model/test_ratings.py
    R ckan/tests/functional/api/model/test_relationships.py
    R ckan/tests/functional/api/model/test_revisions.py
    R ckan/tests/functional/api/model/test_tag.py
    R ckan/tests/functional/api/model/test_vocabulary.py
    R ckan/tests/functional/api/test_activity.py
    R ckan/tests/functional/api/test_api.py
    R ckan/tests/functional/api/test_dashboard.py
    R ckan/tests/functional/api/test_email_notifications.py
    R ckan/tests/functional/api/test_follow.py
    R ckan/tests/functional/api/test_misc.py
    R ckan/tests/functional/api/test_package_search.py
    R ckan/tests/functional/api/test_resource.py
    R ckan/tests/functional/api/test_resource_search.py
    R ckan/tests/functional/api/test_revision_search.py
    R ckan/tests/functional/api/test_user.py
    R ckan/tests/functional/api/test_util.py
    R ckan/tests/functional/base.py
    R ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_error.py
    R ckan/tests/functional/test_follow.py
    R ckan/tests/functional/test_group.py
    R ckan/tests/functional/test_home.py
    R ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    R ckan/tests/functional/test_pagination.py
    R ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_related.py
    R ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    R ckan/tests/functional/test_storage.py
    R ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_upload.py
    R ckan/tests/functional/test_user.py
    A ckan/tests/helpers.py
    R ckan/tests/html_check.py
    A ckan/tests/legacy/__init__.py
    A ckan/tests/legacy/ckantestplugins.py
    A ckan/tests/legacy/functional/__init__.py
    A ckan/tests/legacy/functional/api/__init__.py
    A ckan/tests/legacy/functional/api/base.py
    A ckan/tests/legacy/functional/api/model/__init__.py
    A ckan/tests/legacy/functional/api/model/test_group.py
    A ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    A ckan/tests/legacy/functional/api/model/test_licenses.py
    A ckan/tests/legacy/functional/api/model/test_package.py
    A ckan/tests/legacy/functional/api/model/test_ratings.py
    A ckan/tests/legacy/functional/api/model/test_relationships.py
    A ckan/tests/legacy/functional/api/model/test_revisions.py
    A ckan/tests/legacy/functional/api/model/test_tag.py
    A ckan/tests/legacy/functional/api/model/test_vocabulary.py
    A ckan/tests/legacy/functional/api/test_activity.py
    A ckan/tests/legacy/functional/api/test_api.py
    A ckan/tests/legacy/functional/api/test_dashboard.py
    A ckan/tests/legacy/functional/api/test_email_notifications.py
    A ckan/tests/legacy/functional/api/test_follow.py
    A ckan/tests/legacy/functional/api/test_misc.py
    A ckan/tests/legacy/functional/api/test_package_search.py
    A ckan/tests/legacy/functional/api/test_resource.py
    A ckan/tests/legacy/functional/api/test_resource_search.py
    A ckan/tests/legacy/functional/api/test_revision_search.py
    A ckan/tests/legacy/functional/api/test_user.py
    A ckan/tests/legacy/functional/api/test_util.py
    A ckan/tests/legacy/functional/base.py
    A ckan/tests/legacy/functional/test_activity.py
    A ckan/tests/legacy/functional/test_admin.py
    A ckan/tests/legacy/functional/test_error.py
    A ckan/tests/legacy/functional/test_group.py
    A ckan/tests/legacy/functional/test_home.py
    A ckan/tests/legacy/functional/test_package.py
    A ckan/tests/legacy/functional/test_pagination.py
    A ckan/tests/legacy/functional/test_preview_interface.py
    A ckan/tests/legacy/functional/test_related.py
    A ckan/tests/legacy/functional/test_revision.py
    A ckan/tests/legacy/functional/test_storage.py
    A ckan/tests/legacy/functional/test_tag.py
    A ckan/tests/legacy/functional/test_tracking.py
    A ckan/tests/legacy/functional/test_user.py
    A ckan/tests/legacy/html_check.py
    A ckan/tests/legacy/lib/__init__.py
    A ckan/tests/legacy/lib/solr/schema-no-version.xml
    A ckan/tests/legacy/lib/solr/schema-wrong-version.xml
    A ckan/tests/legacy/lib/test_accept.py
    A ckan/tests/legacy/lib/test_alphabet_pagination.py
    A ckan/tests/legacy/lib/test_authenticator.py
    A ckan/tests/legacy/lib/test_cli.py
    A ckan/tests/legacy/lib/test_dictization.py
    A ckan/tests/legacy/lib/test_dictization_schema.py
    A ckan/tests/legacy/lib/test_email_notifications.py
    A ckan/tests/legacy/lib/test_hash.py
    A ckan/tests/legacy/lib/test_helpers.py
    A ckan/tests/legacy/lib/test_i18n.py
    A ckan/tests/legacy/lib/test_mailer.py
    A ckan/tests/legacy/lib/test_navl.py
    A ckan/tests/legacy/lib/test_resource_search.py
    A ckan/tests/legacy/lib/test_simple_search.py
    A ckan/tests/legacy/lib/test_solr_package_search.py
    A ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    A ckan/tests/legacy/lib/test_solr_schema_version.py
    A ckan/tests/legacy/lib/test_solr_search_index.py
    A ckan/tests/legacy/lib/test_tag_search.py
    A ckan/tests/legacy/logic/__init__.py
    A ckan/tests/legacy/logic/test_action.py
    A ckan/tests/legacy/logic/test_auth.py
    A ckan/tests/legacy/logic/test_init.py
    A ckan/tests/legacy/logic/test_member.py
    A ckan/tests/legacy/logic/test_tag.py
    A ckan/tests/legacy/logic/test_tag_vocab.py
    A ckan/tests/legacy/logic/test_validators.py
    A ckan/tests/legacy/misc/__init__.py
    A ckan/tests/legacy/misc/test_format_text.py
    A ckan/tests/legacy/misc/test_mock_mail_server.py
    A ckan/tests/legacy/misc/test_sync.py
    A ckan/tests/legacy/mock_mail_server.py
    A ckan/tests/legacy/mock_plugin.py
    A ckan/tests/legacy/models/__init__.py
    A ckan/tests/legacy/models/test_activity.py
    A ckan/tests/legacy/models/test_extras.py
    A ckan/tests/legacy/models/test_follower.py
    A ckan/tests/legacy/models/test_group.py
    A ckan/tests/legacy/models/test_misc.py
    A ckan/tests/legacy/models/test_package.py
    A ckan/tests/legacy/models/test_package_relationships.py
    A ckan/tests/legacy/models/test_purge_revision.py
    A ckan/tests/legacy/models/test_resource.py
    A ckan/tests/legacy/models/test_revision.py
    A ckan/tests/legacy/models/test_user.py
    A ckan/tests/legacy/pylons_controller.py
    A ckan/tests/legacy/schema/__init__.py
    A ckan/tests/legacy/schema/test_schema.py
    A ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/legacy/test_dumper.py
    A ckan/tests/legacy/test_plugins.py
    A ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    A ckan/tests/lib/dictization/__init__.py
    A ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/navl/__init__.py
    A ckan/tests/lib/navl/test_dictization_functions.py
    A ckan/tests/lib/navl/test_validators.py
    A ckan/tests/lib/search/__init__.py
    A ckan/tests/lib/search/test_index.py
    R ckan/tests/lib/solr/schema-no-version.xml
    R ckan/tests/lib/solr/schema-wrong-version.xml
    R ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_alphabet_pagination.py
    A ckan/tests/lib/test_auth_tkt.py
    R ckan/tests/lib/test_authenticator.py
    A ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    R ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_email_notifications.py
    R ckan/tests/lib/test_field_types.py
    R ckan/tests/lib/test_hash.py
    M ckan/tests/lib/test_helpers.py
    R ckan/tests/lib/test_i18n.py
    R ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    R ckan/tests/lib/test_navl.py
    R ckan/tests/lib/test_resource_search.py
    R ckan/tests/lib/test_simple_search.py
    R ckan/tests/lib/test_solr_package_search.py
    R ckan/tests/lib/test_solr_package_search_synchronous_update.py
    R ckan/tests/lib/test_solr_schema_version.py
    R ckan/tests/lib/test_solr_search_index.py
    R ckan/tests/lib/test_tag_search.py
    A ckan/tests/logic/action/__init__.py
    A ckan/tests/logic/action/test_create.py
    A ckan/tests/logic/action/test_delete.py
    A ckan/tests/logic/action/test_get.py
    A ckan/tests/logic/action/test_patch.py
    A ckan/tests/logic/action/test_update.py
    A ckan/tests/logic/auth/__init__.py
    A ckan/tests/logic/auth/test_create.py
    A ckan/tests/logic/auth/test_delete.py
    A ckan/tests/logic/auth/test_get.py
    A ckan/tests/logic/auth/test_init.py
    A ckan/tests/logic/auth/test_update.py
    R ckan/tests/logic/test_action.py
    R ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_conversion.py
    A ckan/tests/logic/test_converters.py
    R ckan/tests/logic/test_init.py
    R ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_schema.py
    R ckan/tests/logic/test_tag.py
    R ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/migration/__init__.py
    R ckan/tests/misc/__init__.py
    R ckan/tests/misc/test_format_text.py
    R ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_sync.py
    R ckan/tests/mock_mail_server.py
    R ckan/tests/mock_plugin.py
    A ckan/tests/model/__init__.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckan/tests/model/test_resource.py
    A ckan/tests/model/test_resource_view.py
    A ckan/tests/model/test_user.py
    R ckan/tests/models/__init__.py
    R ckan/tests/models/test_activity.py
    R ckan/tests/models/test_extras.py
    R ckan/tests/models/test_follower.py
    R ckan/tests/models/test_group.py
    R ckan/tests/models/test_license.py
    R ckan/tests/models/test_misc.py
    R ckan/tests/models/test_package.py
    R ckan/tests/models/test_package_relationships.py
    R ckan/tests/models/test_purge_revision.py
    R ckan/tests/models/test_resource.py
    R ckan/tests/models/test_revision.py
    R ckan/tests/models/test_user.py
    A ckan/tests/plugins/__init__.py
    R ckan/tests/pylons_controller.py
    R ckan/tests/schema/__init__.py
    R ckan/tests/schema/test_schema.py
    A ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    R ckan/tests/test_dumper.py
    A ckan/tests/test_factories.py
    R ckan/tests/test_plugins.py
    R ckan/tests/test_versions.py
    R ckan/tests/test_wsgi_ckanclient.py
    R ckan/tests/wsgi_ckanclient.py
    A ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    A ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_iconfigurer/__init__.py
    A ckanext/example_iconfigurer/controller.py
    A ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/templates/admin/myext_config.html
    A ckanext/example_iconfigurer/tests/__init__.py
    A ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/imageview/theme/templates/image_view.html
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/ckan.js/ckan.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.js
    M ckanext/reclineview/theme/public/vendor/flot/excanvas.min.js
    M ckanext/reclineview/theme/public/vendor/flot/jquery.flot.js
    A ckanext/reclineview/theme/public/vendor/flot/jquery.flot.time.js
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/layers.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-icon.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/marker-shadow.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-in.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/images/zoom-out.png
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet-src.min.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.js
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet/0.4.4/leaflet.min.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet-src.js
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.css
    A ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/leaflet.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.js
    R ckanext/reclineview/theme/public/vendor/moment/1.6.2/moment.min.js
    A ckanext/reclineview/theme/public/vendor/moment/2.0.0/moment.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.css
    M ckanext/reclineview/theme/public/vendor/recline/recline.dataset.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.dataset.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.css
    R ckanext/reclineview/theme/public/vendor/recline/recline.min.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.min.css
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/css/timeline.png
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/timeline/20120520/js/timeline.min.js
    A ckanext/reclineview/theme/public/vendor/timeline/css/loading.gif
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.css
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    A ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    A ckanext/reclineview/theme/public/vendor/timeline/js/timeline.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.js
    R ckanext/reclineview/theme/public/vendor/underscore/1.4.2/underscore.min.js
    A ckanext/reclineview/theme/public/vendor/underscore/1.4.4/underscore.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/textview/theme/public/css/text.css
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    R doc/_themes/sphinx-theme-okfn
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/contributing/upgrading-dependencies.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/getting-started.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
    M doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1976-crash-without-siteurl


  Commit: 563fffe4ea31cdb65d2998f180cb7a731de176e8
      https://github.com/ckan/ckan/commit/563fffe4ea31cdb65d2998f180cb7a731de176e8
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/config/environment.py
    M ckan/tests/config/test_environment.py
    R ckan/tests/functional/test_config.py

  Log Message:
  -----------
  [#1976] Add further checks to site_url, improve tests


  Commit: bc344f41c19ad8ffd8411d48770397843fa8f75a
      https://github.com/ckan/ckan/commit/bc344f41c19ad8ffd8411d48770397843fa8f75a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  [#1940] Fix failing test after change on form id


  Commit: 1b1fe8d9720a26c4e914e694b403c5684aa3a58e
      https://github.com/ckan/ckan/commit/1b1fe8d9720a26c4e914e694b403c5684aa3a58e
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  Merge branch 'master' into 1976-crash-without-siteurl


  Commit: 0478b564f11fe0338519b2aebe6c6aa3d451419f
      https://github.com/ckan/ckan/commit/0478b564f11fe0338519b2aebe6c6aa3d451419f
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    R ckan/new_tests/controllers/test_user.py
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  [#1940] Fix user edit tests

The user edit tests hadn't been updated, and there was a bad merge that
made the new_tests folder reappear


  Commit: 5d1cbaec0b3b9936b0f84e235d5ec2ccfbb91e5a
      https://github.com/ckan/ckan/commit/5d1cbaec0b3b9936b0f84e235d5ec2ccfbb91e5a
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  [#1940] Use underscore in data_dict param


  Commit: a35e7007349f3cf9ef3c786825599a377730e507
      https://github.com/ckan/ckan/commit/a35e7007349f3cf9ef3c786825599a377730e507
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  Merge branch 'george-sattler-1940-check-old-password-on-user-password-update'


  Commit: 692ad5c26e40a51174c6d732e7bc2a0b72b29206
      https://github.com/ckan/ckan/commit/692ad5c26e40a51174c6d732e7bc2a0b72b29206
  Author: Ian Ward <ian at excess.org>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py

  Log Message:
  -----------
  Merge pull request #2227 from opendatazurich/remove-userid-from-dashboard-redirect

Remove user id from redirect to dashboard after logging in.


  Commit: 65c689b61e39dec1b0d06bedbefb846aa9ddeb35
      https://github.com/ckan/ckan/commit/65c689b61e39dec1b0d06bedbefb846aa9ddeb35
  Author: Ian Ward <ian at excess.org>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/lib/create_test_data.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/models/test_group.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/kata-csc-2125-add-organization-autocomplete'


  Commit: 0fcf6deef9af20aed02d9eed6046d601718e1f49
      https://github.com/ckan/ckan/commit/0fcf6deef9af20aed02d9eed6046d601718e1f49
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M ckan/controllers/user.py
    R ckan/new_tests/controllers/test_user.py
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/controllers/test_user.py

  Log Message:
  -----------
  Merge branch 'master' into 1976-crash-without-siteurl


  Commit: 5445af62b2b1df9125a3d7d3d8c29a2496c23f80
      https://github.com/ckan/ckan/commit/5445af62b2b1df9125a3d7d3d8c29a2496c23f80
  Author: Ian Ward <ian at excess.org>
  Date:   2015-06-22 (Mon, 22 Jun 2015)

  Changed paths:
    M .coveragerc
    M CHANGELOG.rst
    M MANIFEST.in
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/__init__.py
    A ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    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/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/dv/LC_MESSAGES/ckan.mo
    M ckan/i18n/dv/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
    A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
    A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
    A ckan/i18n/eu/LC_MESSAGES/ckan.mo
    A ckan/i18n/eu/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/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/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    A ckan/i18n/hr/LC_MESSAGES/ckan.mo
    A ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    A ckan/i18n/lo/LC_MESSAGES/ckan.mo
    A ckan/i18n/lo/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    A ckan/i18n/my/LC_MESSAGES/ckan.mo
    A ckan/i18n/my/LC_MESSAGES/ckan.po
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
    M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
    A ckan/i18n/ne/LC_MESSAGES/ckan.mo
    A ckan/i18n/ne/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
    A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    A ckan/i18n/pt_PT/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/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/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
    A ckan/i18n/sw/LC_MESSAGES/ckan.mo
    A ckan/i18n/sw/LC_MESSAGES/ckan.po
    A ckan/i18n/th/LC_MESSAGES/ckan.mo
    A ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/app_globals.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/uploader.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/__init__.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    A ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/model/license.py
    M ckan/model/resource_view.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests.py
    R ckan/new_tests/__init__.py
    R ckan/new_tests/config/__init__.py
    R ckan/new_tests/controllers/__init__.py
    R ckan/new_tests/controllers/test_api.py
    R ckan/new_tests/controllers/test_feed.py
    R ckan/new_tests/controllers/test_group.py
    R ckan/new_tests/controllers/test_package.py
    R ckan/new_tests/controllers/test_util.py
    R ckan/new_tests/factories.py
    R ckan/new_tests/helpers.py
    R ckan/new_tests/lib/__init__.py
    R ckan/new_tests/lib/dictization/__init__.py
    R ckan/new_tests/lib/dictization/test_model_dictize.py
    R ckan/new_tests/lib/navl/__init__.py
    R ckan/new_tests/lib/navl/test_dictization_functions.py
    R ckan/new_tests/lib/navl/test_validators.py
    R ckan/new_tests/lib/search/__init__.py
    R ckan/new_tests/lib/search/test_index.py
    R ckan/new_tests/lib/test_auth_tkt.py
    R ckan/new_tests/lib/test_base.py
    R ckan/new_tests/lib/test_config_tool.py
    R ckan/new_tests/lib/test_datapreview.py
    R ckan/new_tests/lib/test_helpers.py
    R ckan/new_tests/lib/test_munge.py
    R ckan/new_tests/logic/__init__.py
    R ckan/new_tests/logic/action/__init__.py
    R ckan/new_tests/logic/action/test_create.py
    R ckan/new_tests/logic/action/test_delete.py
    R ckan/new_tests/logic/action/test_get.py
    R ckan/new_tests/logic/action/test_patch.py
    R ckan/new_tests/logic/action/test_update.py
    R ckan/new_tests/logic/auth/__init__.py
    R ckan/new_tests/logic/auth/test_create.py
    R ckan/new_tests/logic/auth/test_delete.py
    R ckan/new_tests/logic/auth/test_init.py
    R ckan/new_tests/logic/auth/test_update.py
    R ckan/new_tests/logic/test_conversion.py
    R ckan/new_tests/logic/test_converters.py
    R ckan/new_tests/logic/test_schema.py
    R ckan/new_tests/logic/test_validators.py
    R ckan/new_tests/migration/__init__.py
    R ckan/new_tests/model/__init__.py
    R ckan/new_tests/model/test_resource.py
    R ckan/new_tests/model/test_resource_view.py
    R ckan/new_tests/model/test_user.py
    R ckan/new_tests/plugins/__init__.py
    R ckan/new_tests/test_authz.py
    R ckan/new_tests/test_coding_standards.py
    R ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/fuchsia.css
    M ckan/public/base/css/green.css
    M ckan/public/base/css/main.css
    M ckan/public/base/css/maroon.css
    M ckan/public/base/css/red.css
    M ckan/public/base/javascript/client.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/masthead.less
    M ckan/public/base/less/module.less
    M ckan/public/base/less/search.less
    M ckan/templates/admin/base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/group/snippets/info.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/read.html
    M ckan/templates/package/resource_data.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/new_user_form.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/__init__.py
    R ckan/tests/ckantestplugins.py
    A ckan/tests/config/__init__.py
    A ckan/tests/config/test_environment.py
    A ckan/tests/config/test_middleware.py
    A ckan/tests/controllers/__init__.py
    A ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_user.py
    A ckan/tests/controllers/test_util.py
    A ckan/tests/factories.py
    R ckan/tests/functional/__init__.py
    R ckan/tests/functional/api/__init__.py
    R ckan/tests/functional/api/base.py
    R ckan/tests/functional/api/model/__init__.py
    R ckan/tests/functional/api/model/test_group.py
    R ckan/tests/functional/api/model/test_group_and_organization_purge.py
    R ckan/tests/functional/api/model/test_licenses.py
    R ckan/tests/functional/api/model/test_package.py
    R ckan/tests/functional/api/model/test_ratings.py
    R ckan/tests/functional/api/model/test_relationships.py
    R ckan/tests/functional/api/model/test_revisions.py
    R ckan/tests/functional/api/model/test_tag.py
    R ckan/tests/functional/api/model/test_vocabulary.py
    R ckan/tests/functional/api/test_activity.py
    R ckan/tests/functional/api/test_api.py
    R ckan/tests/functional/api/test_dashboard.py
    R ckan/tests/functional/api/test_email_notifications.py
    R ckan/tests/functional/api/test_follow.py
    R ckan/tests/functional/api/test_misc.py
    R ckan/tests/functional/api/test_package_search.py
    R ckan/tests/functional/api/test_resource.py
    R ckan/tests/functional/api/test_resource_search.py
    R ckan/tests/functional/api/test_revision_search.py
    R ckan/tests/functional/api/test_user.py
    R ckan/tests/functional/api/test_util.py
    R ckan/tests/functional/base.py
    R ckan/tests/functional/test_activity.py
    R ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_error.py
    R ckan/tests/functional/test_group.py
    R ckan/tests/functional/test_home.py
    R ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_pagination.py
    R ckan/tests/functional/test_preview_interface.py
    R ckan/tests/functional/test_related.py
    R ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_storage.py
    R ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tracking.py
    R ckan/tests/functional/test_user.py
    A ckan/tests/helpers.py
    R ckan/tests/html_check.py
    A ckan/tests/legacy/__init__.py
    A ckan/tests/legacy/ckantestplugins.py
    A ckan/tests/legacy/functional/__init__.py
    A ckan/tests/legacy/functional/api/__init__.py
    A ckan/tests/legacy/functional/api/base.py
    A ckan/tests/legacy/functional/api/model/__init__.py
    A ckan/tests/legacy/functional/api/model/test_group.py
    A ckan/tests/legacy/functional/api/model/test_group_and_organization_purge.py
    A ckan/tests/legacy/functional/api/model/test_licenses.py
    A ckan/tests/legacy/functional/api/model/test_package.py
    A ckan/tests/legacy/functional/api/model/test_ratings.py
    A ckan/tests/legacy/functional/api/model/test_relationships.py
    A ckan/tests/legacy/functional/api/model/test_revisions.py
    A ckan/tests/legacy/functional/api/model/test_tag.py
    A ckan/tests/legacy/functional/api/model/test_vocabulary.py
    A ckan/tests/legacy/functional/api/test_activity.py
    A ckan/tests/legacy/functional/api/test_api.py
    A ckan/tests/legacy/functional/api/test_dashboard.py
    A ckan/tests/legacy/functional/api/test_email_notifications.py
    A ckan/tests/legacy/functional/api/test_follow.py
    A ckan/tests/legacy/functional/api/test_misc.py
    A ckan/tests/legacy/functional/api/test_package_search.py
    A ckan/tests/legacy/functional/api/test_resource.py
    A ckan/tests/legacy/functional/api/test_resource_search.py
    A ckan/tests/legacy/functional/api/test_revision_search.py
    A ckan/tests/legacy/functional/api/test_user.py
    A ckan/tests/legacy/functional/api/test_util.py
    A ckan/tests/legacy/functional/base.py
    A ckan/tests/legacy/functional/test_activity.py
    A ckan/tests/legacy/functional/test_admin.py
    A ckan/tests/legacy/functional/test_error.py
    A ckan/tests/legacy/functional/test_group.py
    A ckan/tests/legacy/functional/test_home.py
    A ckan/tests/legacy/functional/test_package.py
    A ckan/tests/legacy/functional/test_pagination.py
    A ckan/tests/legacy/functional/test_preview_interface.py
    A ckan/tests/legacy/functional/test_related.py
    A ckan/tests/legacy/functional/test_revision.py
    A ckan/tests/legacy/functional/test_storage.py
    A ckan/tests/legacy/functional/test_tag.py
    A ckan/tests/legacy/functional/test_tracking.py
    A ckan/tests/legacy/functional/test_user.py
    A ckan/tests/legacy/html_check.py
    A ckan/tests/legacy/lib/__init__.py
    A ckan/tests/legacy/lib/solr/schema-no-version.xml
    A ckan/tests/legacy/lib/solr/schema-wrong-version.xml
    A ckan/tests/legacy/lib/test_accept.py
    A ckan/tests/legacy/lib/test_alphabet_pagination.py
    A ckan/tests/legacy/lib/test_authenticator.py
    A ckan/tests/legacy/lib/test_cli.py
    A ckan/tests/legacy/lib/test_dictization.py
    A ckan/tests/legacy/lib/test_dictization_schema.py
    A ckan/tests/legacy/lib/test_email_notifications.py
    A ckan/tests/legacy/lib/test_hash.py
    A ckan/tests/legacy/lib/test_helpers.py
    A ckan/tests/legacy/lib/test_i18n.py
    A ckan/tests/legacy/lib/test_mailer.py
    A ckan/tests/legacy/lib/test_navl.py
    A ckan/tests/legacy/lib/test_resource_search.py
    A ckan/tests/legacy/lib/test_simple_search.py
    A ckan/tests/legacy/lib/test_solr_package_search.py
    A ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    A ckan/tests/legacy/lib/test_solr_schema_version.py
    A ckan/tests/legacy/lib/test_solr_search_index.py
    A ckan/tests/legacy/lib/test_tag_search.py
    A ckan/tests/legacy/logic/__init__.py
    A ckan/tests/legacy/logic/test_action.py
    A ckan/tests/legacy/logic/test_auth.py
    A ckan/tests/legacy/logic/test_init.py
    A ckan/tests/legacy/logic/test_member.py
    A ckan/tests/legacy/logic/test_tag.py
    A ckan/tests/legacy/logic/test_tag_vocab.py
    A ckan/tests/legacy/logic/test_validators.py
    A ckan/tests/legacy/misc/__init__.py
    A ckan/tests/legacy/misc/test_format_text.py
    A ckan/tests/legacy/misc/test_mock_mail_server.py
    A ckan/tests/legacy/misc/test_sync.py
    A ckan/tests/legacy/mock_mail_server.py
    A ckan/tests/legacy/mock_plugin.py
    A ckan/tests/legacy/models/__init__.py
    A ckan/tests/legacy/models/test_activity.py
    A ckan/tests/legacy/models/test_extras.py
    A ckan/tests/legacy/models/test_follower.py
    A ckan/tests/legacy/models/test_group.py
    A ckan/tests/legacy/models/test_misc.py
    A ckan/tests/legacy/models/test_package.py
    A ckan/tests/legacy/models/test_package_relationships.py
    A ckan/tests/legacy/models/test_purge_revision.py
    A ckan/tests/legacy/models/test_resource.py
    A ckan/tests/legacy/models/test_revision.py
    A ckan/tests/legacy/models/test_user.py
    A ckan/tests/legacy/pylons_controller.py
    A ckan/tests/legacy/schema/__init__.py
    A ckan/tests/legacy/schema/test_schema.py
    A ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/legacy/test_dumper.py
    A ckan/tests/legacy/test_plugins.py
    A ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    A ckan/tests/lib/dictization/__init__.py
    A ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/navl/__init__.py
    A ckan/tests/lib/navl/test_dictization_functions.py
    A ckan/tests/lib/navl/test_validators.py
    A ckan/tests/lib/search/__init__.py
    A ckan/tests/lib/search/test_index.py
    R ckan/tests/lib/solr/schema-no-version.xml
    R ckan/tests/lib/solr/schema-wrong-version.xml
    R ckan/tests/lib/test_accept.py
    R ckan/tests/lib/test_alphabet_pagination.py
    A ckan/tests/lib/test_auth_tkt.py
    R ckan/tests/lib/test_authenticator.py
    A ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_config_tool.py
    A ckan/tests/lib/test_datapreview.py
    R ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_dictization_schema.py
    R ckan/tests/lib/test_email_notifications.py
    R ckan/tests/lib/test_hash.py
    M ckan/tests/lib/test_helpers.py
    R ckan/tests/lib/test_i18n.py
    R ckan/tests/lib/test_mailer.py
    A ckan/tests/lib/test_munge.py
    R ckan/tests/lib/test_navl.py
    R ckan/tests/lib/test_resource_search.py
    R ckan/tests/lib/test_simple_search.py
    R ckan/tests/lib/test_solr_package_search.py
    R ckan/tests/lib/test_solr_package_search_synchronous_update.py
    R ckan/tests/lib/test_solr_schema_version.py
    R ckan/tests/lib/test_solr_search_index.py
    R ckan/tests/lib/test_tag_search.py
    A ckan/tests/logic/action/__init__.py
    A ckan/tests/logic/action/test_create.py
    A ckan/tests/logic/action/test_delete.py
    A ckan/tests/logic/action/test_get.py
    A ckan/tests/logic/action/test_patch.py
    A ckan/tests/logic/action/test_update.py
    A ckan/tests/logic/auth/__init__.py
    A ckan/tests/logic/auth/test_create.py
    A ckan/tests/logic/auth/test_delete.py
    A ckan/tests/logic/auth/test_get.py
    A ckan/tests/logic/auth/test_init.py
    A ckan/tests/logic/auth/test_update.py
    R ckan/tests/logic/test_action.py
    R ckan/tests/logic/test_auth.py
    A ckan/tests/logic/test_conversion.py
    A ckan/tests/logic/test_converters.py
    R ckan/tests/logic/test_init.py
    R ckan/tests/logic/test_member.py
    A ckan/tests/logic/test_schema.py
    R ckan/tests/logic/test_tag.py
    R ckan/tests/logic/test_tag_vocab.py
    M ckan/tests/logic/test_validators.py
    A ckan/tests/migration/__init__.py
    R ckan/tests/misc/__init__.py
    R ckan/tests/misc/test_format_text.py
    R ckan/tests/misc/test_mock_mail_server.py
    R ckan/tests/misc/test_sync.py
    R ckan/tests/mock_mail_server.py
    R ckan/tests/mock_plugin.py
    A ckan/tests/model/__init__.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py
    A ckan/tests/model/test_resource.py
    A ckan/tests/model/test_resource_view.py
    A ckan/tests/model/test_user.py
    R ckan/tests/models/__init__.py
    R ckan/tests/models/test_activity.py
    R ckan/tests/models/test_extras.py
    R ckan/tests/models/test_follower.py
    R ckan/tests/models/test_group.py
    R ckan/tests/models/test_license.py
    R ckan/tests/models/test_misc.py
    R ckan/tests/models/test_package.py
    R ckan/tests/models/test_package_relationships.py
    R ckan/tests/models/test_purge_revision.py
    R ckan/tests/models/test_resource.py
    R ckan/tests/models/test_revision.py
    R ckan/tests/models/test_user.py
    A ckan/tests/plugins/__init__.py
    R ckan/tests/pylons_controller.py
    R ckan/tests/schema/__init__.py
    R ckan/tests/schema/test_schema.py
    A ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    R ckan/tests/test_dumper.py
    A ckan/tests/test_factories.py
    R ckan/tests/test_plugins.py
    R ckan/tests/test_versions.py
    R ckan/tests/test_wsgi_ckanclient.py
    R ckan/tests/wsgi_ckanclient.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_delete.py
    M ckanext/datastore/tests/test_dump.py
    A ckanext/datastore/tests/test_info.py
    M ckanext/datastore/tests/test_interface.py
    M ckanext/datastore/tests/test_plugin.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/datastore/tests/test_unit.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_iconfigurer/__init__.py
    A ckanext/example_iconfigurer/controller.py
    A ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/templates/admin/myext_config.html
    A ckanext/example_iconfigurer/tests/__init__.py
    A ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
    A ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    A ckanext/example_igroupform/__init__.py
    A ckanext/example_igroupform/plugin.py
    A ckanext/example_igroupform/tests/__init__.py
    A ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/imageview/plugin.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/multilingual/plugin.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    R ckanext/pdfview/__init__.py
    R ckanext/pdfview/plugin.py
    R ckanext/pdfview/tests/__init__.py
    R ckanext/pdfview/tests/test_view.py
    R ckanext/pdfview/theme/public/css/pdf.css
    R ckanext/pdfview/theme/public/css/recline.css
    R ckanext/pdfview/theme/public/img/ajaxload-circle.gif
    R ckanext/pdfview/theme/public/pdf_view.js
    R ckanext/pdfview/theme/public/resource.config
    R ckanext/pdfview/theme/public/vendor/l10n/ar/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ar/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ca/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ca/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/cs/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/cs/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/da/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/da/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/de/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/de/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/el/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/el/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/en-US/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/es/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/es/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/fr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/fr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/he/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/he/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/it/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/it/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ja/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ja/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ko/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ko/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/locale.properties.js
    R ckanext/pdfview/theme/public/vendor/l10n/lt/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/lt/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/lt/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/nl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/nl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pl/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pl/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/pt-BR/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ro/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ro/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/ru/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/ru/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/sv/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/sv/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/tr/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/tr/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/vi/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/vi/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-CN/viewer.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/chrome.properties
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/metadata.inc
    R ckanext/pdfview/theme/public/vendor/l10n/zh-TW/viewer.properties
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.js
    R ckanext/pdfview/theme/public/vendor/pdfjs/pdf.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/compatibility.min.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/debugger.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-check.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-comment.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-help.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-insert.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-key.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-newparagraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-note.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-paragraph.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/annotation-text.svg
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-next.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/findbarButton-previous.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-icon.gif
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/loading-small.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/shadow.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/texture.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-bookmark.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-download.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-fullscreen.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-menuArrows.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-openFile.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageDown.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-pageUp.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-presentationMode.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-print.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-search.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewOutline.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomIn.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/images/toolbarButton-zoomOut.png
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.js
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.css
    R ckanext/pdfview/theme/public/vendor/pdfviewer/viewer.min.js
    R ckanext/pdfview/theme/public/vendor/webL10n/README.md
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.js
    R ckanext/pdfview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/pdfview/theme/templates/pdf.html
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M ckanext/reclineview/theme/public/vendor/recline/recline.js
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/stats.py
    M ckanext/stats/templates/ckanext/stats/index.html
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/textview/plugin.py
    M ckanext/textview/tests/test_view.py
    M ckanext/webpageview/plugin.py
    M ckanext/webpageview/tests/test_view.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    M doc/api/index.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/testing.rst
    M doc/extensions/adding-custom-fields.rst
    A doc/images/image_view.png
    A doc/images/manage_views.png
    A doc/images/recline_graph_view.png
    A doc/images/recline_grid_view.png
    A doc/images/recline_map_view.png
    A doc/images/recline_view.png
    A doc/images/text_view.png
    A doc/images/views_overview.png
    A doc/images/webpage_view.png
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/filestore.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into 2210-use-group-show-not-group-dictize

And fix tests..

Conflicts:
	ckan/logic/action/get.py
	ckan/tests/logic/action/test_get.py


  Commit: be95a53b39b9d857485e144402c2e8e716d3d7fd
      https://github.com/ckan/ckan/commit/be95a53b39b9d857485e144402c2e8e716d3d7fd
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/config/environment.py
    M ckan/tests/config/test_environment.py
    M contrib/docker/my_init.d/50_configure
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Merge pull request #2016 from ckan/1976-crash-without-siteurl

Make sure CKAN complains if site_url is missing


  Commit: 3442366dbcde075e9e54900719ce57d43fcc93c2
      https://github.com/ckan/ckan/commit/3442366dbcde075e9e54900719ce57d43fcc93c2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M CHANGELOG.rst
    R bin/canada.py
    R bin/ckan-correct-tags.py
    R bin/ckan-edit-tags.py
    R bin/ckan-edit-tags2.py
    R bin/ckan-hmg-breakdown.py
    R bin/ckan-hmg-update-licenses.py
    R bin/ckan-rest-edit-tags.py
    R bin/ckan_edit_local.py
    R bin/ckan_spam.py
    R bin/copy-ckan-2-ckan.py
    R bin/dump-ukgov.py
    R bin/dump_23_pkgs.py
    R bin/fixes.py
    R bin/loadconfig.py
    R bin/ons-load.py
    R bin/revision_manager.py
    R bin/status.py
    R bin/talisckan.py
    R bin/webstore_test.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/api.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/app_globals.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/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/get.py
    M ckan/logic/validators.py
    M ckan/templates/group/index.html
    M ckan/templates/group/read.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/read.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/snippets/search_form.html
    M ckan/templates/user/edit_user_form.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/test_coding_standards.py
    R ckan/tests/legacy/test_wsgi_ckanclient.py
    R ckan/tests/legacy/wsgi_ckanclient.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/test_validators.py
    M ckanext/multilingual/solr/schema.xml
    M ckanext/resourceproxy/controller.py
    M contrib/docker/my_init.d/50_configure
    M dev-requirements.txt
    M doc/api/index.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/install-from-source.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'master' into 2429-remote-config


  Commit: 5e4a2b5e751c2ce90052915f76998a881f05dabd
      https://github.com/ckan/ckan/commit/5e4a2b5e751c2ce90052915f76998a881f05dabd
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M doc/extensions/remote-config-update.rst
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#2429] Fix typos, improve language

Use runtime-editable config options consistently


  Commit: c64b43096f5a10035690da52b0ae354f8c4a13e1
      https://github.com/ckan/ckan/commit/c64b43096f5a10035690da52b0ae354f8c4a13e1
  Author: amercader <amercadero at gmail.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge branch '2429-remote-config' of github.com:ckan/ckan into 2429-remote-config

Conflicts:
	ckan/logic/action/update.py
	doc/extensions/remote-config-update.rst


Compare: https://github.com/ckan/ckan/compare/d8accae28f74...c64b43096f5a

• Previous message: [ckan-changes] [ckan/ckan] 5e6146: Don't dictize packages when dictizing a vocab
• Next message: [ckan-changes] [ckan/ckan] a16662: [#2206] group/org_show: default include_datasets=F...
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]