[ckan-changes] [ckan/ckan] 99a95f: Allow underscores in filenames

GitHub noreply at github.com
Fri Jul 1 12:13:07 UTC 2016


  Branch: refs/heads/3002-jsonp-get
  Home:   https://github.com/ckan/ckan
  Commit: 99a95f4ae3d082936561ff89af20d320ef44e443
      https://github.com/ckan/ckan/commit/99a95f4ae3d082936561ff89af20d320ef44e443
  Author: mbellotti <marianne.bellotti at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  Allow underscores in filenames


  Commit: 60802e8abdc90c9f30ab9a81fbbf0e10f145ab8f
      https://github.com/ckan/ckan/commit/60802e8abdc90c9f30ab9a81fbbf0e10f145ab8f
  Author: mbellotti <marianne.bellotti at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  test closes #2597


  Commit: a5b8aa663b156adf3fed925dcb5e55b908784539
      https://github.com/ckan/ckan/commit/a5b8aa663b156adf3fed925dcb5e55b908784539
  Author: mbellotti <marianne.bellotti at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  updating old tests


  Commit: 752302b573a8c5ec95b0a4f8b2ae10c8aa4826f4
      https://github.com/ckan/ckan/commit/752302b573a8c5ec95b0a4f8b2ae10c8aa4826f4
  Author: mbellotti <marianne.bellotti at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  Update munge.py


  Commit: d9ac6273664d832900abf12784098b7e467911b6
      https://github.com/ckan/ckan/commit/d9ac6273664d832900abf12784098b7e467911b6
  Author: mbellotti <marianne.bellotti at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  Update test_munge.py


  Commit: b65a49c3d4e1e9806dfab7b1b9b502360c519bd7
      https://github.com/ckan/ckan/commit/b65a49c3d4e1e9806dfab7b1b9b502360c519bd7
  Author: mbellotti <marianne.bellotti at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/lib/munge.py

  Log Message:
  -----------
  Update munge.py


  Commit: a33ce2bcae786a60fe813a2b4388c878aa861e13
      https://github.com/ckan/ckan/commit/a33ce2bcae786a60fe813a2b4388c878aa861e13
  Author: mbellotti <marianne.bellotti at gmail.com>
  Date:   2015-08-25 (Tue, 25 Aug 2015)

  Changed paths:
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  pep8 standards


  Commit: 3946b3f5c4636c499400e689627e9a96dc506af9
      https://github.com/ckan/ckan/commit/3946b3f5c4636c499400e689627e9a96dc506af9
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/logic/action/test_create.py

  Log Message:
  -----------
  [#2844] remove url not_empty validator


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

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

  Log Message:
  -----------
  [#2844] force missing url value to ""


  Commit: 9c0050bed5811c8cdfc9664b94f053b65ea2b5fb
      https://github.com/ckan/ckan/commit/9c0050bed5811c8cdfc9664b94f053b65ea2b5fb
  Author: Ian Ward <ian at excess.org>
  Date:   2016-01-25 (Mon, 25 Jan 2016)

  Changed paths:
    M ckan/tests/legacy/lib/test_dictization_schema.py

  Log Message:
  -----------
  [#2844] update old tests for optional urls


  Commit: 7cac4e16fafbd91e4299902f1706b9eb2191edd6
      https://github.com/ckan/ckan/commit/7cac4e16fafbd91e4299902f1706b9eb2191edd6
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-04-12 (Tue, 12 Apr 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Fix #2953: Strange facet item order.

Previously, facet items (e.g. tags) were first sorted descendingly by
number of matching datasets and then descendingly by case-sensitive
display name. The latter is unexpected and makes browsing the facets
unnecessarily difficult.

With this commit, facets are first sorted descendingly by dataset count
(as before) and then ascendingly by case-insensitive display name.


  Commit: 6a7babdd7a86c1e292cbdcaccbd63be4afa594c9
      https://github.com/ckan/ckan/commit/6a7babdd7a86c1e292cbdcaccbd63be4afa594c9
  Author: Ian Ward <ian at excess.org>
  Date:   2016-04-27 (Wed, 27 Apr 2016)

  Changed paths:
    M ckan/controllers/api.py
    R ckan/lib/lazyjson.py
    M ckan/logic/action/get.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  [#2983] remove LazyJSONObject


  Commit: be80f158856c754dd12d030175337b7732cfb3ba
      https://github.com/ckan/ckan/commit/be80f158856c754dd12d030175337b7732cfb3ba
  Author: amercader <amercadero at gmail.com>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2969] Fix unicode error when indexing field of type JSON


  Commit: effcf825e81e0a446dfcefe2a38994e7c4281053
      https://github.com/ckan/ckan/commit/effcf825e81e0a446dfcefe2a38994e7c4281053
  Author: amercader <amercadero at gmail.com>
  Date:   2016-04-28 (Thu, 28 Apr 2016)

  Changed paths:
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  [#2969] Add a couple of tests


  Commit: e03da496fc2400be90ad7020a54b761740d5afdf
      https://github.com/ckan/ckan/commit/e03da496fc2400be90ad7020a54b761740d5afdf
  Author: yingqiaogit <qiaoying at hotmail.com>
  Date:   2016-04-29 (Fri, 29 Apr 2016)

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

  Log Message:
  -----------
  A resource is allowed to have null value in its url. We don't set resource['url'] as 'http://' after the resource is retrieved from the database. In this way, the value of resource['url'] is kept as null at front end. We have tested the update with the others in the same branch using the default web UI front. For a resuouce with an empty url, in the Resource Page , the line for URL and the Go to resource Button are not displayed. In the Package page, the Go to resource button is not included in the Explore pop up menu. There is no extra log message shown up in the console.


  Commit: 825f9081b90a50b5693bf7920423b0b134f5acd1
      https://github.com/ckan/ckan/commit/825f9081b90a50b5693bf7920423b0b134f5acd1
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-04-30 (Sat, 30 Apr 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml

  Log Message:
  -----------
  Solr Docker File Updated

Gets the latest schema


  Commit: f366dc21b277bf27738a500a27253c69e2b6dad1
      https://github.com/ckan/ckan/commit/f366dc21b277bf27738a500a27253c69e2b6dad1
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-04-30 (Sat, 30 Apr 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile
    A contrib/docker/solr/schema.xml

  Log Message:
  -----------
  Seems can't return to parent directory


  Commit: 2077df01c12b5ed5c7103ceb282b77acdc2fe163
      https://github.com/ckan/ckan/commit/2077df01c12b5ed5c7103ceb282b77acdc2fe163
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-04-30 (Sat, 30 Apr 2016)

  Changed paths:
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  Postgresql Image Updated


  Commit: cbaadf217411816752644ef63244bbfeee5b9571
      https://github.com/ckan/ckan/commit/cbaadf217411816752644ef63244bbfeee5b9571
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-01 (Sun, 01 May 2016)

  Changed paths:
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  Postgres Env Updated


  Commit: 5ad8aff366d70274c9ae10a3edb0eeb4e6415ff0
      https://github.com/ckan/ckan/commit/5ad8aff366d70274c9ae10a3edb0eeb4e6415ff0
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-01 (Sun, 01 May 2016)

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

  Log Message:
  -----------
  Init Vars name changed


  Commit: af8bcec56f32b41db5c64977ad506894abc30ba5
      https://github.com/ckan/ckan/commit/af8bcec56f32b41db5c64977ad506894abc30ba5
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  Added Volumes


  Commit: a836810d79caf27206744b06fc83dac2b809b4dc
      https://github.com/ckan/ckan/commit/a836810d79caf27206744b06fc83dac2b809b4dc
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-02 (Mon, 02 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Changed Solr Path


  Commit: eb9ece4242d2a0a33a8a5ec42be801714f1dc4ca
      https://github.com/ckan/ckan/commit/eb9ece4242d2a0a33a8a5ec42be801714f1dc4ca
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Revert "Changed Solr Path"

This reverts commit a836810d79caf27206744b06fc83dac2b809b4dc.


  Commit: 5dcd1a8a1cabc1081d2c52050fe053a413a551d3
      https://github.com/ckan/ckan/commit/5dcd1a8a1cabc1081d2c52050fe053a413a551d3
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  Revert "Added Volumes"

This reverts commit af8bcec56f32b41db5c64977ad506894abc30ba5.


  Commit: a138390b8ca3a5ff005c71019053d615a51e64a7
      https://github.com/ckan/ckan/commit/a138390b8ca3a5ff005c71019053d615a51e64a7
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml

  Log Message:
  -----------
  Schema File Not Required - Volume to Configuration


  Commit: c4d3e3ad05262faf41e800412cb7e8f7df027b97
      https://github.com/ckan/ckan/commit/c4d3e3ad05262faf41e800412cb7e8f7df027b97
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    A contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  SOLR Update to 6.0.0 - Added docker-compose.yml


  Commit: a0c61145632cc668e0e4ba0c2cdb2038ae863d64
      https://github.com/ckan/ckan/commit/a0c61145632cc668e0e4ba0c2cdb2038ae863d64
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Tabulation with spaces


  Commit: 91d04d27d6d70fbf0fe2623d8b6443d878df50d5
      https://github.com/ckan/ckan/commit/91d04d27d6d70fbf0fe2623d8b6443d878df50d5
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Return to 4.8.1


  Commit: 24a9a22e52a358daa870d21be267adbe18bb7db8
      https://github.com/ckan/ckan/commit/24a9a22e52a358daa870d21be267adbe18bb7db8
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Using default Solr


  Commit: 92259dd86e6ad9af4bec33d59df18280e8635093
      https://github.com/ckan/ckan/commit/92259dd86e6ad9af4bec33d59df18280e8635093
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Changed Schema Location


  Commit: 3b24547ea086532d72537b4f47d6f774e7f2099d
      https://github.com/ckan/ckan/commit/3b24547ea086532d72537b4f47d6f774e7f2099d
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-03 (Tue, 03 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Return to normal solr


  Commit: db2943f791c04aac9d21b280f91aee3e6414e56b
      https://github.com/ckan/ckan/commit/db2943f791c04aac9d21b280f91aee3e6414e56b
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-04 (Wed, 04 May 2016)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Changed docker-compose.yml to official ckan images


  Commit: 46cf2e442d2af1a79d4f5f9af41148d9a9cbcec9
      https://github.com/ckan/ckan/commit/46cf2e442d2af1a79d4f5f9af41148d9a9cbcec9
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-05 (Thu, 05 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/snippets/debug.html

  Log Message:
  -----------
  [#3000] remove variables from debug info, debug_full_info_as_list helper


  Commit: 73f4361c2e9f0e206244e3d4d1abb972198bebd2
      https://github.com/ckan/ckan/commit/73f4361c2e9f0e206244e3d4d1abb972198bebd2
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-05 (Thu, 05 May 2016)

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

  Log Message:
  -----------
  [#3000] add back accidentally removed endfor


  Commit: 1a39062c3465b2529a44875e19786083e7fdc72e
      https://github.com/ckan/ckan/commit/1a39062c3465b2529a44875e19786083e7fdc72e
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/templates/snippets/language_selector.html
    M ckan/tests/controllers/test_home.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#3004] Upgrade Babel requirement, fix issues with language selector

The language selector did not work with Babel 2.3.4 because the URLs on
the option tags didn't contain the language code. This was caused
because we are passing the Babel `Locale` classes to the `url_for`
helper, which compares them against a list of string codes (eg `ca`).
On older Babel versions comparing eg `Locale('ca') == 'ca'` used to
work.

This includes the necessary changes both on the selector snippet and the
helper functions so we are comparing apples to apples.


  Commit: 3adb55195c85df56aa365392fe61e3bc64c46ef2
      https://github.com/ckan/ckan/commit/3adb55195c85df56aa365392fe61e3bc64c46ef2
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-09 (Mon, 09 May 2016)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  [#3004] PEP8 lib/i18n.py


  Commit: c1ff9e8c2aabf9c491ca6d7a8210db304e525541
      https://github.com/ckan/ckan/commit/c1ff9e8c2aabf9c491ca6d7a8210db304e525541
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#3004] Upgrade pytz requirement


  Commit: 2836860c93db100f7661372fd3f60645e1cc7324
      https://github.com/ckan/ckan/commit/2836860c93db100f7661372fd3f60645e1cc7324
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#3004] Don't try to localize True/False as numbers

Not enought thorough checks meant that True/False were passed to Babel
to localize, which causes a crash on modern Babel versions.


  Commit: a8cfc57ad4215a012c63b716e63e870f95be8872
      https://github.com/ckan/ckan/commit/a8cfc57ad4215a012c63b716e63e870f95be8872
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

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

  Log Message:
  -----------
  [#3004] Smarter nose import


  Commit: fde833156b4b7327d8d3dfaa8b226f589a19ddf3
      https://github.com/ckan/ckan/commit/fde833156b4b7327d8d3dfaa8b226f589a19ddf3
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M ckan/controllers/api.py
    R ckan/lib/lazyjson.py
    M ckan/logic/action/get.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge branch '2983-remove-lazyjson'


  Commit: 667cd997c8371242185a5ec4014843fed93f7538
      https://github.com/ckan/ckan/commit/667cd997c8371242185a5ec4014843fed93f7538
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch '2953-strange-facet-item-order' of https://github.com/torfsen/ckan into torfsen-2953-strange-facet-item-order


  Commit: 2914ed3b65ef00e68ac2f258555f99c42ca8428c
      https://github.com/ckan/ckan/commit/2914ed3b65ef00e68ac2f258555f99c42ca8428c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch 'torfsen-2953-strange-facet-item-order'


  Commit: f588413b160ecfbbdd92a12e4a91e34b66304132
      https://github.com/ckan/ckan/commit/f588413b160ecfbbdd92a12e4a91e34b66304132
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M ckan/lib/jinja_extensions.py
    M ckan/tests/controllers/test_package.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#3005] Update Jinja2 to 2.8, fix i18n extension

The main issue is an API change on Jinja2 Internationalization extension
that makes our own `CkanInternationalizationExtension` crash when rendering
eg resource_list.html:

https://github.com/pallets/jinja/commit/79c8475f80257be4999a20d1432ff6a8e3f38815#diff-fc43b0d0748bc433885163912839f823L297


  Commit: 60326ca5a533ab98a618867b7e84259c1386c8f2
      https://github.com/ckan/ckan/commit/60326ca5a533ab98a618867b7e84259c1386c8f2
  Author: yingqiaogit <qiaoying at hotmail.com>
  Date:   2016-05-10 (Tue, 10 May 2016)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  retrieve the title of a package in a selected lanuage rather than in the form of a dictionary when a multi-language plugin is used


  Commit: eb1770d63e52b5cd0d069c83dedc017609213995
      https://github.com/ckan/ckan/commit/eb1770d63e52b5cd0d069c83dedc017609213995
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    R .travis.yml

  Log Message:
  -----------
  Remove travis (moved to CircleCI) to stop IRC spam


  Commit: 367360e8e9d10c088d4d1d3a92955e0605a1aa33
      https://github.com/ckan/ckan/commit/367360e8e9d10c088d4d1d3a92955e0605a1aa33
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    R .travis.yml

  Log Message:
  -----------
  Merge pull request #3014 from Psykar/bugfix/removetravis

Remove travis (moved to CircleCI) to stop IRC spam


  Commit: 85247a257fdfac6f5feb440c0c01be55afa25c64
      https://github.com/ckan/ckan/commit/85247a257fdfac6f5feb440c0c01be55afa25c64
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-12 (Thu, 12 May 2016)

  Changed paths:
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_upsert.py

  Log Message:
  -----------
  Merge pull request #2985 from ckan/2969-fix-unicode-datastore-indexing

[#2969] Fix unicode error when indexing JSON DataStore fields


  Commit: 0523cd9c49695a913a06b98c686bca2964007825
      https://github.com/ckan/ckan/commit/0523cd9c49695a913a06b98c686bca2964007825
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-13 (Fri, 13 May 2016)

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

  Log Message:
  -----------
  [#3012] Persist datastore_active on resource updates

As datastore_active is stored as an extra, if it's not provided in the
incoming data_dict on resource_update it will get dropped. This happens
most noticeably when udpating via the frontend, causing the green Data
API button to disappear.


  Commit: aeb38632927b09bf6e702b61110f9edff839a951
      https://github.com/ckan/ckan/commit/aeb38632927b09bf6e702b61110f9edff839a951
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M Dockerfile
    A contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml

  Log Message:
  -----------
  Merge pull request #2995 from deinok/master

Fix + enable automatic docker image builds


  Commit: 41c061a0af96bdb6b21e001f6f801ca07538835e
      https://github.com/ckan/ckan/commit/41c061a0af96bdb6b21e001f6f801ca07538835e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-05-13 (Fri, 13 May 2016)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Minor improvement to aslist and asbool docs.


  Commit: 55add0906f02a648b0018b603ec7b09393cb6100
      https://github.com/ckan/ckan/commit/55add0906f02a648b0018b603ec7b09393cb6100
  Author: yingqiaogit <qiaoying at hotmail.com>
  Date:   2016-05-15 (Sun, 15 May 2016)

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

  Log Message:
  -----------
  test the case for resource_show action on resource with empty url


  Commit: f0eff6660c2f156bbce005a7b045b7c2a6d387db
      https://github.com/ckan/ckan/commit/f0eff6660c2f156bbce005a7b045b7c2a6d387db
  Author: yingqiaogit <qiaoying at hotmail.com>
  Date:   2016-05-15 (Sun, 15 May 2016)

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

  Log Message:
  -----------
  adjust the code for cleaning the error messages on pep8 issues


  Commit: 9c65efd6dfad7da6571932b2e2e525ec6a03e4c2
      https://github.com/ckan/ckan/commit/9c65efd6dfad7da6571932b2e2e525ec6a03e4c2
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-05-16 (Mon, 16 May 2016)

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

  Log Message:
  -----------
  Allow filtering on group type when listing orgs


  Commit: 68a975889cb3a33886516d51e026c33760d33e68
      https://github.com/ckan/ckan/commit/68a975889cb3a33886516d51e026c33760d33e68
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-05-16 (Mon, 16 May 2016)

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

  Log Message:
  -----------
  Added test for creating custom organization types


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

  Changed paths:
    M ckan/controllers/package.py

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


  Commit: 5e50a09006cbdaaabf9e21c93421131f239ea934
      https://github.com/ckan/ckan/commit/5e50a09006cbdaaabf9e21c93421131f239ea934
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-16 (Mon, 16 May 2016)

  Changed paths:
    M ckan/controllers/package.py

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


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

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/snippets/debug.html

  Log Message:
  -----------
  Merge branch '3000-slow-debug-render'


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/factories.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge branch 'feature/allow_custom_org_types' of https://github.com/Psykar/ckan into Psykar-feature/allow_custom_org_types


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/tests/factories.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py

  Log Message:
  -----------
  Merge branch 'Psykar-feature/allow_custom_org_types'


  Commit: c197578f8390c677b6f5d30c6f25ac1574c5f49c
      https://github.com/ckan/ckan/commit/c197578f8390c677b6f5d30c6f25ac1574c5f49c
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-17 (Tue, 17 May 2016)

  Changed paths:
    M ckan/plugins/toolkit.py

  Log Message:
  -----------
  Merge pull request #3021 from ckan/aslist-docs

aslist and asbool docs improvement


  Commit: 32375f2d07635db89606cfd150886b80e67a58b4
      https://github.com/ckan/ckan/commit/32375f2d07635db89606cfd150886b80e67a58b4
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-17 (Tue, 17 May 2016)

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

  Log Message:
  -----------
  Merge pull request #3020 from ckan/3012-fix-datastore_active-getting-lost

[#3012] Persist datastore_active on resource updates


  Commit: d2de73b93bcfdbd75a6162d626a549479bced8ba
      https://github.com/ckan/ckan/commit/d2de73b93bcfdbd75a6162d626a549479bced8ba
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  Add files via upload


  Commit: ba164cae94671291821b549cf5196375cd3b3f6e
      https://github.com/ckan/ckan/commit/ba164cae94671291821b549cf5196375cd3b3f6e
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-18 (Wed, 18 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile
    A contrib/docker/solr/solrconfig.xml

  Log Message:
  -----------
  Add files via upload


  Commit: 05375b57cb80f80f4510f47964eb457bb85758b1
      https://github.com/ckan/ckan/commit/05375b57cb80f80f4510f47964eb457bb85758b1
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M ckan/tests/helpers.py

  Log Message:
  -----------
  If a test app exists, reset it for each test


  Commit: 991c40c48dd9d9a853e98275618872b025c485f5
      https://github.com/ckan/ckan/commit/991c40c48dd9d9a853e98275618872b025c485f5
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-05-19 (Thu, 19 May 2016)

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

  Log Message:
  -----------
  Fix user log out on username change

Fixes #2394


  Commit: b8270b903da01fb66a386da21332e69a1aa3dc84
      https://github.com/ckan/ckan/commit/b8270b903da01fb66a386da21332e69a1aa3dc84
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Move code path for group into explicit else

- the functionality in the code remains the same
- The branch for the case that `is_org` is False was just moved into
  an explicit `else` for better readibility
- The code in the else branch was also slightly reindented to be more
  simliar to the if branch


  Commit: 5bc8e4e69952629809ce638c4f3eaa07aa124bc0
      https://github.com/ckan/ckan/commit/5bc8e4e69952629809ce638c4f3eaa07aa124bc0
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Change Travis build status badge to CircleCI


  Commit: f48da51490333086fdcc08846b9ce542895485d9
      https://github.com/ckan/ckan/commit/f48da51490333086fdcc08846b9ce542895485d9
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  [#3033] Change CircleCI badge style to shield.

This style fits better with our other badges. Thanks @k-nut!


  Commit: 148175e8eceea5128d074f2dee541bd89e1ed227
      https://github.com/ckan/ckan/commit/148175e8eceea5128d074f2dee541bd89e1ed227
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    A contrib/docker/docker-cloud.yml
    R contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Update and rename docker-compose.yml to docker-cloud.yml


  Commit: 802374e74f620a55792f7eb42fc69d90f39213e5
      https://github.com/ckan/ckan/commit/802374e74f620a55792f7eb42fc69d90f39213e5
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Merge pull request #3033 from ckan/3033-build-status-badge

Build Status badge in README should point to CircleCI, not Travis


  Commit: 94e24d990f27ff62100c9b71c920faf7113eac89
      https://github.com/ckan/ckan/commit/94e24d990f27ff62100c9b71c920faf7113eac89
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Fix comment


  Commit: 05eb24111246467820d290a92784307bf3bc1042
      https://github.com/ckan/ckan/commit/05eb24111246467820d290a92784307bf3bc1042
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-05-19 (Thu, 19 May 2016)

  Changed paths:
    M ckan/lib/munge.py
    M ckan/tests/lib/test_munge.py

  Log Message:
  -----------
  Merge pull request #2600 from mbellotti/2597-allow-underscores-in-filenames

issue 2597 allow underscores in filenames


  Commit: 41039d48188fd058736eec03d10e0f6b2606ac35
      https://github.com/ckan/ckan/commit/41039d48188fd058736eec03d10e0f6b2606ac35
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M ckan/logic/action/get.py
    M ckan/tests/controllers/test_organization.py

  Log Message:
  -----------
  [#2990] Create 403 on organization_index if user has no permission


  Commit: e94b541ac7c56147dbca0a1b260ee7ac1c6a58a4
      https://github.com/ckan/ckan/commit/e94b541ac7c56147dbca0a1b260ee7ac1c6a58a4
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    A contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Added docker-compose file, easy to install ckan

Simplificates the creation of the ckan docker containers required


  Commit: dce83b745917a4d50298016b41335035401f68bf
      https://github.com/ckan/ckan/commit/dce83b745917a4d50298016b41335035401f68bf
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M contrib/docker/solr/solrconfig.xml

  Log Message:
  -----------
  Fix a small bug


  Commit: 0fa410b710e8d06c2d1e698772237dfa937e5d54
      https://github.com/ckan/ckan/commit/0fa410b710e8d06c2d1e698772237dfa937e5d54
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-20 (Fri, 20 May 2016)

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

  Log Message:
  -----------
  [#2990] Add test for organization_list

- The test makes sure that the response is a 403
- Mosly this is to make sure that the view renders at all and that it
  does not throw an exception in the backend anymore like it used to


  Commit: bcc644f67dcc983a127f31ce9fc44d6b6924c711
      https://github.com/ckan/ckan/commit/bcc644f67dcc983a127f31ce9fc44d6b6924c711
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-20 (Fri, 20 May 2016)

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

  Log Message:
  -----------
  [#2990] Move check for permission to controller


  Commit: 3c802655579f2e94087626f55f3d09ed6531b20b
      https://github.com/ckan/ckan/commit/3c802655579f2e94087626f55f3d09ed6531b20b
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-20 (Fri, 20 May 2016)

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

  Log Message:
  -----------
  [#2990] remove stray import


  Commit: b1f9c75fedf9beadc16ae4a10eed73ac723cb336
      https://github.com/ckan/ckan/commit/b1f9c75fedf9beadc16ae4a10eed73ac723cb336
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M ckan/templates/group/index.html
    M ckan/tests/controllers/test_group.py

  Log Message:
  -----------
  [#2981] Preserve sort order in groups on pagination

- Uses the same code that was introuced in #2153 for organizations
- Changes the tests to sort descending so that they actually make sure
  that the sort order is not changed


  Commit: 92e9cf36a5bba60d31df8996f9d8fe8334ff02df
      https://github.com/ckan/ckan/commit/92e9cf36a5bba60d31df8996f9d8fe8334ff02df
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-20 (Fri, 20 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/plugins/test_toolkit.py
    M setup.py

  Log Message:
  -----------
  [#3041] Raise HelperError when calling bad helper.

Fixes exception handling introduced in #2908, by fixing call to super
class's __getitem__ and catching correct exception in
HelperAttributeDict.

Tests added for rendering helpers in templates, and using helpers from
toolkit.


  Commit: 0c091835d78403223ec486e4bc2886cd5128cf3f
      https://github.com/ckan/ckan/commit/0c091835d78403223ec486e4bc2886cd5128cf3f
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-23 (Mon, 23 May 2016)

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

  Log Message:
  -----------
  [#2760] change old password label is user is sysadmin


  Commit: 1fae410b2fd92f2f48d9d3a00cedaf54a46387e8
      https://github.com/ckan/ckan/commit/1fae410b2fd92f2f48d9d3a00cedaf54a46387e8
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  Merge branch 'k-nut-small-stylistic-improvement'


  Commit: c1d4dda4d39288ada8872d35323c976690ff4b5e
      https://github.com/ckan/ckan/commit/c1d4dda4d39288ada8872d35323c976690ff4b5e
  Author: Grahame Bowland <grahame at angrygoats.net>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M MANIFEST.in
    M setup.py

  Log Message:
  -----------
  include '.sql' migrations (Fixes #3045)

remove dead code from setup.py (the code in there made no
difference to the tarball produced by sdist.)

update MANIFEST.in to achieve what the stuff in setup.py
was trying to do.


  Commit: fa023f7fd9871c7f481c840b9258979b283f44c3
      https://github.com/ckan/ckan/commit/fa023f7fd9871c7f481c840b9258979b283f44c3
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/images/sprite-resource-icons.png

  Log Message:
  -----------
  [#2948] include icon for image data


  Commit: 4d64ec6c2b9e7d62ced5d2780df2b1f4da131546
      https://github.com/ckan/ckan/commit/4d64ec6c2b9e7d62ced5d2780df2b1f4da131546
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-23 (Mon, 23 May 2016)

  Changed paths:
    M ckan/tests/legacy/functional/test_pagination.py

  Log Message:
  -----------
  [#2981] add empty params to paginated url in tests


  Commit: b0f0cd2c46d55b46b2502782981c1c5dcfc1f99d
      https://github.com/ckan/ckan/commit/b0f0cd2c46d55b46b2502782981c1c5dcfc1f99d
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M setup.py

  Log Message:
  -----------
  Add missing routes to IGroupForm

(And fix bulk process to check 'is_organization' instead of the group type)


  Commit: 8f17532c09b4b94749d3c5dc040bec9163d2dee3
      https://github.com/ckan/ckan/commit/8f17532c09b4b94749d3c5dc040bec9163d2dee3
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

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

  Log Message:
  -----------
  Merge branch 'bugfix/username-change-error' of https://github.com/Psykar/ckan into Psykar-bugfix/username-change-error


  Commit: e5381619538a8ee259eb4f34a8c76e15c8b16092
      https://github.com/ckan/ckan/commit/e5381619538a8ee259eb4f34a8c76e15c8b16092
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

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

  Log Message:
  -----------
  Merge branch 'Psykar-bugfix/username-change-error'


  Commit: 391ebe760936653d7757e8c2e3d92598fe58f96b
      https://github.com/ckan/ckan/commit/391ebe760936653d7757e8c2e3d92598fe58f96b
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/tests/controllers/test_organization.py

  Log Message:
  -----------
  Merge branch '2990-server-error-for-organization_list' of https://github.com/k-nut/ckan into k-nut-2990-server-error-for-organization_list


  Commit: 28eb8c0c0ced20af753d537d6c0181c784357b32
      https://github.com/ckan/ckan/commit/28eb8c0c0ced20af753d537d6c0181c784357b32
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/tests/controllers/test_organization.py

  Log Message:
  -----------
  Merge branch 'k-nut-2990-server-error-for-organization_list'


  Commit: 1437d5567d44c0efa2bf173478bde5f3fd5c1206
      https://github.com/ckan/ckan/commit/1437d5567d44c0efa2bf173478bde5f3fd5c1206
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'feature/IGroupForm-routes' of https://github.com/Psykar/ckan into Psykar-feature/IGroupForm-routes


  Commit: a74370286111945f60128a7bdca68db5fa76dc8c
      https://github.com/ckan/ckan/commit/a74370286111945f60128a7bdca68db5fa76dc8c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'Psykar-feature/IGroupForm-routes'


  Commit: ebcbb05edecaaefc32e65c0b630b3c6bd210a71f
      https://github.com/ckan/ckan/commit/ebcbb05edecaaefc32e65c0b630b3c6bd210a71f
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/templates/group/index.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/legacy/functional/test_pagination.py

  Log Message:
  -----------
  Merge branch '2981-preserve-group-sort-order-on-pagination' of https://github.com/k-nut/ckan


  Commit: 7363a402c4506520e8b163998e426f2de1b4e6e5
      https://github.com/ckan/ckan/commit/7363a402c4506520e8b163998e426f2de1b4e6e5
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/templates/group/index.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/legacy/functional/test_pagination.py

  Log Message:
  -----------
  Merge branch 'k-nut-2981-preserve-group-sort-order-on-pagination'


  Commit: c38b78ddfa000bb4b5ae92b31193ca19acaa9d17
      https://github.com/ckan/ckan/commit/c38b78ddfa000bb4b5ae92b31193ca19acaa9d17
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl

  Log Message:
  -----------
  [#2972] Overwrite path to solr core for Travis


  Commit: 027c09ada64334d263f78b6b2042440531779780
      https://github.com/ckan/ckan/commit/027c09ada64334d263f78b6b2042440531779780
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/lib/jinja_extensions.py
    M ckan/tests/controllers/test_package.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3005 from ckan/3005-update-jinja2

Update Jinja2 version


  Commit: b9dab31e953d9722c45b1c5e411da2ac45556c53
      https://github.com/ckan/ckan/commit/b9dab31e953d9722c45b1c5e411da2ac45556c53
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-24 (Tue, 24 May 2016)

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

  Log Message:
  -----------
  [#2760] Change label text in template not controller


  Commit: 56ae1bd8f5e205db7731a11e728f826ef3b051b4
      https://github.com/ckan/ckan/commit/56ae1bd8f5e205db7731a11e728f826ef3b051b4
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/plugins/test_toolkit.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #3042 from ckan/3041-helpererror

Raise HelperError exception when calling non-existing helper


  Commit: 1fddc84830eababdcf7523bd73055f81d5fd7643
      https://github.com/ckan/ckan/commit/1fddc84830eababdcf7523bd73055f81d5fd7643
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-24 (Tue, 24 May 2016)

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

  Log Message:
  -----------
  [#2760] change capitalization back to previous way


  Commit: ad63650109a41377bf795de385b9de1ae0143b66
      https://github.com/ckan/ckan/commit/ad63650109a41377bf795de385b9de1ae0143b66
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-24 (Tue, 24 May 2016)

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

  Log Message:
  -----------
  [#2760] split line


  Commit: 2e6afc34f7b4e2b946188390c749de5ed97bd2fe
      https://github.com/ckan/ckan/commit/2e6afc34f7b4e2b946188390c749de5ed97bd2fe
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py

  Log Message:
  -----------
  [#2856] Create DataPusher task timestamps using UTC

When an upload to the DataPusher finishes we check
`resource['last_modified']` (in UTC) against `task['last_updated']`
to check whether it changed during the previous upload and resubmit it.
As `task['last_updated']` was created using `datetime.now()` this could
lead to infinite upload loops.

Discussion is here:

https://github.com/ckan/ckan/issues/2856#issuecomment-220383735


  Commit: 46be8f619a22ed41063c5a1ca7cc0ccca7cca544
      https://github.com/ckan/ckan/commit/46be8f619a22ed41063c5a1ca7cc0ccca7cca544
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py

  Log Message:
  -----------
  Merge pull request #3051 from ckan/2856-datapusher-tasks-utc

[#2856] Create DataPusher task timestamps using UTC


  Commit: 03973767c4751a51ea077012aa5dc1af4944c6a9
      https://github.com/ckan/ckan/commit/03973767c4751a51ea077012aa5dc1af4944c6a9
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    R .travis.yml
    M Dockerfile
    M README.rst
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    R ckan/lib/lazyjson.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/plugins/toolkit.py
    M ckan/templates/group/index.html
    M ckan/templates/snippets/debug.html
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/plugins/test_toolkit.py
    M ckanext/datastore/db.py
    M ckanext/datastore/tests/test_upsert.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    A contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3004-upgrade-babel

Conflicts:
	requirements.in


  Commit: dc3bb9eb01e8e266b97cc9e10f74e263988fd9b7
      https://github.com/ckan/ckan/commit/dc3bb9eb01e8e266b97cc9e10f74e263988fd9b7
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl

  Log Message:
  -----------
  Merge pull request #3050 from ckan/2972-solr-travis

Overwrite path to solr core for Travis in paster templates


  Commit: f4e8c8446ccb8071ee9c42b7cd08d513a1330584
      https://github.com/ckan/ckan/commit/f4e8c8446ccb8071ee9c42b7cd08d513a1330584
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/lib/base.py
    M ckan/tests/legacy/lib/test_i18n.py

  Log Message:
  -----------
  [#3053] Remove old locale session code.

Locale is no longer persisted by a value in the session (instead using
urls). This simply removes some old unused references to i18n info in
the session, and some commented out tests.


  Commit: 9eb66f2daa68d0f677eedfe498499983b6617a97
      https://github.com/ckan/ckan/commit/9eb66f2daa68d0f677eedfe498499983b6617a97
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  [#3053] Remove test_i18n from pep blacklist


  Commit: 1df9543ac1585e46f59b4fd73f20a7a80877c5b7
      https://github.com/ckan/ckan/commit/1df9543ac1585e46f59b4fd73f20a7a80877c5b7
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/base.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/snippets/home_breadcrumb_item.html

  Log Message:
  -----------
  [#3055] Deprecate and remove uses of h.url

In favour of h.url_for


  Commit: 75b0c1de7e91c00bedc7484a98f91db1856d2039
      https://github.com/ckan/ckan/commit/75b0c1de7e91c00bedc7484a98f91db1856d2039
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-25 (Wed, 25 May 2016)

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

  Log Message:
  -----------
  [#2859] catch validation error in actvity lists


  Commit: 045582e03c577e644e3112668e5325beadf3d1a4
      https://github.com/ckan/ckan/commit/045582e03c577e644e3112668e5325beadf3d1a4
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3057] reorder imports and remove unused ones


  Commit: 76495e6912c66b77cf96790678b74beb5d775711
      https://github.com/ckan/ckan/commit/76495e6912c66b77cf96790678b74beb5d775711
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3067] consistent spacing between functions


  Commit: cece50ba6a57d3cac602cff4efc3c86e5a931002
      https://github.com/ckan/ckan/commit/cece50ba6a57d3cac602cff4efc3c86e5a931002
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3057] remove duplicate keys


  Commit: 4c81720cf13db770407107ba1eefdf3a51d5f0d9
      https://github.com/ckan/ckan/commit/4c81720cf13db770407107ba1eefdf3a51d5f0d9
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3057] always use short form when refering to imported functions


  Commit: a89ce5afc2a1a817395bd4f2c13b9369a43d0d04
      https://github.com/ckan/ckan/commit/a89ce5afc2a1a817395bd4f2c13b9369a43d0d04
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/tests/legacy/functional/test_pagination.py

  Log Message:
  -----------
  [#3055] Fix fragile legacy test


  Commit: a83fdfca2b639e245bf22257ca57f10def02147c
      https://github.com/ckan/ckan/commit/a83fdfca2b639e245bf22257ca57f10def02147c
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M contrib/docker/postgresql/Dockerfile

  Log Message:
  -----------
  Postgres 9.5


  Commit: 18de3abfb81e86c767ea36305320a1833d519c35
      https://github.com/ckan/ckan/commit/18de3abfb81e86c767ea36305320a1833d519c35
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Solr 6.0


  Commit: 8eb1839a212adf1077386b21c258d3a43d08f451
      https://github.com/ckan/ckan/commit/8eb1839a212adf1077386b21c258d3a43d08f451
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  BaseImage 0.9.15

Probably we should transfer to ubuntu image. This will be on next PR


  Commit: dd2859c31faccda8c6aac141dd035058d90c61ac
      https://github.com/ckan/ckan/commit/dd2859c31faccda8c6aac141dd035058d90c61ac
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  Fixed Bug in URLs


  Commit: c5f82f65bec911836eedaccd5b642b325136ff22
      https://github.com/ckan/ckan/commit/c5f82f65bec911836eedaccd5b642b325136ff22
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M contrib/docker/solr/solrconfig.xml

  Log Message:
  -----------
  Deleted comments, added URL to SolrConfigXml WIKI


  Commit: 61d7349cfb48ae28149015c72874877949295e69
      https://github.com/ckan/ckan/commit/61d7349cfb48ae28149015c72874877949295e69
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M contrib/docker/docker-compose.yml

  Log Message:
  -----------
  Blank Line not required


  Commit: b97e1029da8bdaa9fcb538f92bcf84814fa9fa47
      https://github.com/ckan/ckan/commit/b97e1029da8bdaa9fcb538f92bcf84814fa9fa47
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M README.rst
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/munge.py
    M ckan/lib/plugins.py
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/templates/group/index.html
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/plugins/test_toolkit.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge remote-tracking branch 'refs/remotes/ckan/master'


  Commit: 28a95fd5d306453fbf6bf2bdea286a6ae23adfc3
      https://github.com/ckan/ckan/commit/28a95fd5d306453fbf6bf2bdea286a6ae23adfc3
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/templates/snippets/language_selector.html
    M ckan/tests/controllers/test_home.py
    M ckan/tests/legacy/test_coding_standards.py
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3004 from ckan/3004-upgrade-babel

Upgrade Babel version


  Commit: 18ed5d6661a252bae55e138677ef71ce10b9f2b3
      https://github.com/ckan/ckan/commit/18ed5d6661a252bae55e138677ef71ce10b9f2b3
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

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

  Log Message:
  -----------
  Merge pull request #3044 from k-nut/2760-change-label-for-chaning-passwords

[#2760] change old password label if user is sysadmin


  Commit: a2e866557f0b43d44fd62bffa20d08558e73b37f
      https://github.com/ckan/ckan/commit/a2e866557f0b43d44fd62bffa20d08558e73b37f
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-26 (Thu, 26 May 2016)

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

  Log Message:
  -----------
  Merge pull request #3056 from k-nut/2859-abort-400-if-validation-error-in-activity-view

Catch validation error in actvity lists


  Commit: 771b28628ef122780bdb0b3a29b2484be87612df
      https://github.com/ckan/ckan/commit/771b28628ef122780bdb0b3a29b2484be87612df
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/lib/helpers.py
    M ckan/templates/base.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/tests/legacy/functional/test_pagination.py

  Log Message:
  -----------
  Merge pull request #3055 from ckan/3055-deprecate-h.url

Deprecate h.url, make it use h.url_for internally


  Commit: f560e1809cb5fbed15197794e1716c59f1eae10a
      https://github.com/ckan/ckan/commit/f560e1809cb5fbed15197794e1716c59f1eae10a
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3057] remove validators that were overwritten


  Commit: 7a9089a224f73483de4f24cfd18f45b93c6071d9
      https://github.com/ckan/ckan/commit/7a9089a224f73483de4f24cfd18f45b93c6071d9
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M Dockerfile
    M contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile

  Log Message:
  -----------
  End of Line - to LF (Unix)

All files should be in LF End of Line


  Commit: bdad7d68f4a92406921f37fcc159ae16ebaf7294
      https://github.com/ckan/ckan/commit/bdad7d68f4a92406921f37fcc159ae16ebaf7294
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M Dockerfile
    A contrib/docker/docker-cloud.yml
    M contrib/docker/docker-compose.yml
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    A contrib/docker/solr/solrconfig.xml

  Log Message:
  -----------
  Merge pull request #3029 from deinok/master

Solr Docker Image Updated


  Commit: a09f4d369acd64cea0ecece5bfb16ae5b346b125
      https://github.com/ckan/ckan/commit/a09f4d369acd64cea0ecece5bfb16ae5b346b125
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  [#3057] include schema.py in coding standard test & pep8 it


  Commit: ed2196b31421365fc559eb8e0fa9141fa17a057f
      https://github.com/ckan/ckan/commit/ed2196b31421365fc559eb8e0fa9141fa17a057f
  Author: Ian Ward <ian at excess.org>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/logic/schema.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Merge pull request #3058 from k-nut/3057-cleanup-schema-py

Cleanup schema.py


  Commit: df4b05bf299e4565f8865dcbb095fe2418a4f8fd
      https://github.com/ckan/ckan/commit/df4b05bf299e4565f8865dcbb095fe2418a4f8fd
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  Fix resource downloads to call IUploader plugins


  Commit: 4f3299a6f359819d94211020c75b787c1cc546f5
      https://github.com/ckan/ckan/commit/4f3299a6f359819d94211020c75b787c1cc546f5
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    A ckanext/example_iuploader/__init__.py
    A ckanext/example_iuploader/plugin.py
    A ckanext/example_iuploader/test/__init__.py
    A ckanext/example_iuploader/test/test_plugin.py
    M dev-requirements.txt
    M setup.py

  Log Message:
  -----------
  Add example_iuploader


  Commit: 89dab0cd3544cc206f5035796e7514c3301ef316
      https://github.com/ckan/ckan/commit/89dab0cd3544cc206f5035796e7514c3301ef316
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py

  Log Message:
  -----------
  [#3060] set ckan.locale_default as language for FormEncode

- If this is not done FormEncode takes the system LANG for its
  validation messages which might lead to unexpected behaviour.
- This also leads to the tests passing on machines where the LANG is
  set to something other then `en`
- More information can be found at
  http://www.formencode.org/en/latest/Validator.html#localization-of-error-messages-i18n


  Commit: ae52164e009df1863f1451a343041a94c3d0fc0d
      https://github.com/ckan/ckan/commit/ae52164e009df1863f1451a343041a94c3d0fc0d
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M ckan/tests/factories.py

  Log Message:
  -----------
  Pad Groups and Org names from factories with zeros

The test in ckan/tests/controllers/test_group.py would sometimes fail
when run in an unfortunate order. The
`test_page_thru_list_of_orgs_preserves_sort_order` and
`test_page_thru_list_of_groups_preserves_sort_order` would fail because
some organizations had already been created by oyher tests and the numbering would
start a 5 instead of 1. And because the sorting was done via strings (so
`Group 5` came after `Group 31` the test would fail. By always padding
them with zeros this should not happend anymore and make the tests more
stable (So it is `Group 05` now).


  Commit: 617de3e51c3721d3666334ba9a0bb1a4f7ae3a50
      https://github.com/ckan/ckan/commit/617de3e51c3721d3666334ba9a0bb1a4f7ae3a50
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/module.less

  Log Message:
  -----------
  [#2399] fix pagination style


  Commit: 8e6aab9d9f4cfd20b9e106e828b925dd741ea3d9
      https://github.com/ckan/ckan/commit/8e6aab9d9f4cfd20b9e106e828b925dd741ea3d9
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-27 (Fri, 27 May 2016)

  Changed paths:
    M ckan/controllers/package.py
    M ckan/plugins/interfaces.py
    A ckanext/example_iuploader/__init__.py
    A ckanext/example_iuploader/plugin.py
    A ckanext/example_iuploader/test/__init__.py
    A ckanext/example_iuploader/test/test_plugin.py
    M dev-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'Psykar-bugfix/resource-download-iuploader'


  Commit: f67043821eebf7482b81d67c346972d800b9ebe0
      https://github.com/ckan/ckan/commit/f67043821eebf7482b81d67c346972d800b9ebe0
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/install.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.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/partyline.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/exceptions.py
    M ckan/i18n/__init__.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M 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/email_notifications.py
    M ckan/lib/extract.py
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/formatters.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/search/sql.py
    M ckan/lib/uploader.py
    M ckan/lib/util.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/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
    M 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
    M ckan/migration/manage.py
    M ckan/migration/versions/001_add_existing_tables.py
    M ckan/migration/versions/002_add_author_and_maintainer.py
    M ckan/migration/versions/003_add_user_object.py
    M ckan/migration/versions/004_add_group_object.py
    M ckan/migration/versions/005_add_authorization_tables.py
    M ckan/migration/versions/006_add_ratings.py
    M ckan/migration/versions/007_add_system_roles.py
    M ckan/migration/versions/008_update_vdm_ids.py
    M ckan/migration/versions/009_add_creation_timestamps.py
    M ckan/migration/versions/010_add_user_about.py
    M ckan/migration/versions/011_add_package_search_vector.py
    M ckan/migration/versions/012_add_resources.py
    M ckan/migration/versions/013_add_hash.py
    M ckan/migration/versions/014_hash_2.py
    M ckan/migration/versions/015_remove_state_object.py
    M ckan/migration/versions/016_uuids_everywhere.py
    M ckan/migration/versions/017_add_pkg_relationships.py
    M ckan/migration/versions/018_adjust_licenses.py
    M ckan/migration/versions/019_pkg_relationships_state.py
    M ckan/migration/versions/020_add_changeset.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/023_add_harvesting.py
    M ckan/migration/versions/024_add_harvested_document.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/migration/versions/026_authorization_group_user_pk.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/028_drop_harvest_source_status.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/030_additional_user_attributes.py
    M ckan/migration/versions/031_move_openid_to_new_field.py
    M ckan/migration/versions/032_add_extra_info_field_to_resources.py
    M ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    M ckan/migration/versions/034_resource_group_table.py
    M ckan/migration/versions/035_harvesting_doc_versioning.py
    M ckan/migration/versions/036_lockdown_roles.py
    M ckan/migration/versions/037_role_anon_editor.py
    M ckan/migration/versions/038_delete_migration_tables.py
    M ckan/migration/versions/039_add_expired_id_and_dates.py
    M ckan/migration/versions/040_reset_key_on_user.py
    M ckan/migration/versions/041_resource_new_fields.py
    M ckan/migration/versions/042_user_revision_indexes.py
    M ckan/migration/versions/043_drop_postgres_search.py
    M ckan/migration/versions/044_add_task_status.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/046_drop_changesets.py
    M ckan/migration/versions/047_rename_package_group_member.py
    M ckan/migration/versions/048_add_activity_streams_tables.py
    M ckan/migration/versions/049_add_group_approval_status.py
    M ckan/migration/versions/050_term_translation_table.py
    M ckan/migration/versions/051_add_tag_vocabulary.py
    M ckan/migration/versions/052_update_member_capacities.py
    M ckan/migration/versions/053_add_group_logo.py
    M ckan/migration/versions/054_add_resource_created_date.py
    M ckan/migration/versions/055_update_user_and_activity_detail.py
    M ckan/migration/versions/056_add_related_table.py
    M ckan/migration/versions/057_tracking.py
    M ckan/migration/versions/058_add_follower_tables.py
    M ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/migration/versions/060_add_system_info_table.py
    M ckan/migration/versions/061_add_follower__group_table.py
    M ckan/migration/versions/062_add_dashboard_table.py
    M ckan/migration/versions/063_org_changes.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/migration/versions/068_add_package_extras_index.py
    M ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/migration/versions/074_remove_resource_groups.py
    M ckan/migration/versions/075_rename_view_plugins.py
    M ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/migration/versions/079_resource_revision_index.py
    M ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/migration/versions/081_set_datastore_active.py
    M ckan/migration/versions/082_create_index_creator_user_id.py
    M ckan/migration/versions/083_remove_related_items.py
    M ckan/migration/versions/084_add_metadata_created.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/system_info.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/ckanext/__init__.py
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/templates/revision/__init__.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/__init__.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_misc.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/base.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_error.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/__init__.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/lib/test_authenticator.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_email_notifications.py
    M ckan/tests/legacy/lib/test_hash.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/lib/test_resource_search.py
    M ckan/tests/legacy/lib/test_simple_search.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/lib/test_solr_schema_version.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/lib/test_tag_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/logic/test_init.py
    M ckan/tests/legacy/logic/test_member.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/logic/test_validators.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/mock_plugin.py
    M ckan/tests/legacy/models/test_activity.py
    M ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_follower.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_misc.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/models/test_package_relationships.py
    M ckan/tests/legacy/models/test_purge_revision.py
    M ckan/tests/legacy/models/test_resource.py
    M ckan/tests/legacy/models/test_revision.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/pylons_controller.py
    M ckan/tests/legacy/schema/test_schema.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/navl/test_dictization_functions.py
    M ckan/tests/lib/navl/test_validators.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_auth_tkt.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/__init__.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/__init__.py
    M ckan/tests/logic/auth/test_create.py
    M ckan/tests/logic/auth/test_delete.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_conversion.py
    M ckan/tests/logic/test_converters.py
    M ckan/tests/logic/test_schema.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/migration/__init__.py
    M ckan/tests/model/__init__.py
    M ckan/tests/model/test_license.py
    M ckan/tests/model/test_resource.py
    M ckan/tests/model/test_resource_view.py
    M ckan/tests/model/test_system_info.py
    M ckan/tests/model/test_user.py
    M ckan/tests/plugins/__init__.py
    M ckan/tests/plugins/test_toolkit.py
    M ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_factories.py
    M ckan/websetup.py
    M ckanext/__init__.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/auth.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/interfaces.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/helpers.py
    M ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_configure.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_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.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/plugin_v1.py
    M ckanext/example_iauthfunctions/plugin_v2.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M ckanext/example_iauthfunctions/plugin_v4.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/controller.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/plugin.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_itemplatehelpers/plugin.py
    M ckanext/example_itranslation/plugin.py
    M ckanext/example_itranslation/plugin_v1.py
    M ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/example_iuploader/plugin.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/example_theme/v01_empty_extension/plugin.py
    M ckanext/example_theme/v02_empty_template/plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/plugin.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
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/public/__init__.py
    M ckanext/stats/public/ckanext/__init__.py
    M ckanext/stats/public/ckanext/stats/__init__.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/test_tag_vocab_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 profile_tests.py
    M setup.py

  Log Message:
  -----------
  Add and test PEP 263 source file encoding specifications.

PEP 263 describes how to specify the encoding of a Python source file.
This commit adds UTF-8 encoding specifications to all CKAN Python source
files. It also adds a test which verifies that each source file does
indeed have a UTF-8 encoding specification.


  Commit: eefe7bf1a7d693ec6da599aa93bd1098baadec46
      https://github.com/ckan/ckan/commit/eefe7bf1a7d693ec6da599aa93bd1098baadec46
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M MANIFEST.in
    M setup.py

  Log Message:
  -----------
  Merge pull request #3047 from muccg/include-migration-sql

include '.sql' migrations (Fixes #3045)


  Commit: 1885cba55244f23a19dcbe23b18db4ad8785ab16
      https://github.com/ckan/ckan/commit/1885cba55244f23a19dcbe23b18db4ad8785ab16
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-05-31 (Tue, 31 May 2016)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/less/module.less

  Log Message:
  -----------
  Merge pull request #3067 from k-nut/2399-pagination-styling

Fix pagination style (CSS)


  Commit: 2cc254d3bfe704b5d797acc2e1388d56b9a6c171
      https://github.com/ckan/ckan/commit/2cc254d3bfe704b5d797acc2e1388d56b9a6c171
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/patch.py
    M ckan/logic/auth/update.py
    M ckan/tests/logic/auth/test_delete.py
    A ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M setup.py

  Log Message:
  -----------
  Fix some auth functions not using IAuthFunctions

Various auth functions are purely wrappers around other auth functions.
Unfortunately this means when overriding one of auth functions (a parent) that is used by others (children),
the children will still call the original version, not the overridden version.

This commit fixes this for most cases.


  Commit: f079e0da448d9e9da53314c400febd653dd64321
      https://github.com/ckan/ckan/commit/f079e0da448d9e9da53314c400febd653dd64321
  Author: Louis des Landes <ldeslandes at swin.edu.au>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Add patch to tested auth action functions


  Commit: a8097478f67f2085bfa77115eaf198f4f4bc7e75
      https://github.com/ckan/ckan/commit/a8097478f67f2085bfa77115eaf198f4f4bc7e75
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

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

  Log Message:
  -----------
  [#3077] Catch mailer exceptions on user invite

Rather than returning a 500 error, return a ValidationError with the
SMTP error, and delete the pending user.


  Commit: 3d7a567bcb63b4d38be3280f7e9ff61bcd716103
      https://github.com/ckan/ckan/commit/3d7a567bcb63b4d38be3280f7e9ff61bcd716103
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

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

  Log Message:
  -----------
  [#3078] Don't show deleted users/datasets on member_list

The members table is stateful, ie it has a state=active/deleted field which
was not updated when deleting a dataset or user.

This commit sets the state of all user/dataset memberships to deleted
and adds some tests


  Commit: 1e4338e61cf53c6e1f2b2b95868970fef4c23150
      https://github.com/ckan/ckan/commit/1e4338e61cf53c6e1f2b2b95868970fef4c23150
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [#3073] smarter way to get available locales


  Commit: a1b33a9787731af093036761e0584b121836c027
      https://github.com/ckan/ckan/commit/a1b33a9787731af093036761e0584b121836c027
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/tests/factories.py

  Log Message:
  -----------
  Pad all things that come from factories with zeros


  Commit: e171528b8e4a9220dd3b2245a4b2a0a7d1a64a07
      https://github.com/ckan/ckan/commit/e171528b8e4a9220dd3b2245a4b2a0a7d1a64a07
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-01 (Wed, 01 Jun 2016)

  Changed paths:
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/install.py
    M ckan/config/middleware.py
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.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/partyline.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/exceptions.py
    M ckan/i18n/__init__.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M 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/email_notifications.py
    M ckan/lib/extract.py
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/formatters.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/search/sql.py
    M ckan/lib/uploader.py
    M ckan/lib/util.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/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
    M 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
    M ckan/migration/manage.py
    M ckan/migration/versions/001_add_existing_tables.py
    M ckan/migration/versions/002_add_author_and_maintainer.py
    M ckan/migration/versions/003_add_user_object.py
    M ckan/migration/versions/004_add_group_object.py
    M ckan/migration/versions/005_add_authorization_tables.py
    M ckan/migration/versions/006_add_ratings.py
    M ckan/migration/versions/007_add_system_roles.py
    M ckan/migration/versions/008_update_vdm_ids.py
    M ckan/migration/versions/009_add_creation_timestamps.py
    M ckan/migration/versions/010_add_user_about.py
    M ckan/migration/versions/011_add_package_search_vector.py
    M ckan/migration/versions/012_add_resources.py
    M ckan/migration/versions/013_add_hash.py
    M ckan/migration/versions/014_hash_2.py
    M ckan/migration/versions/015_remove_state_object.py
    M ckan/migration/versions/016_uuids_everywhere.py
    M ckan/migration/versions/017_add_pkg_relationships.py
    M ckan/migration/versions/018_adjust_licenses.py
    M ckan/migration/versions/019_pkg_relationships_state.py
    M ckan/migration/versions/020_add_changeset.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/023_add_harvesting.py
    M ckan/migration/versions/024_add_harvested_document.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/migration/versions/026_authorization_group_user_pk.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/028_drop_harvest_source_status.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/030_additional_user_attributes.py
    M ckan/migration/versions/031_move_openid_to_new_field.py
    M ckan/migration/versions/032_add_extra_info_field_to_resources.py
    M ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    M ckan/migration/versions/034_resource_group_table.py
    M ckan/migration/versions/035_harvesting_doc_versioning.py
    M ckan/migration/versions/036_lockdown_roles.py
    M ckan/migration/versions/037_role_anon_editor.py
    M ckan/migration/versions/038_delete_migration_tables.py
    M ckan/migration/versions/039_add_expired_id_and_dates.py
    M ckan/migration/versions/040_reset_key_on_user.py
    M ckan/migration/versions/041_resource_new_fields.py
    M ckan/migration/versions/042_user_revision_indexes.py
    M ckan/migration/versions/043_drop_postgres_search.py
    M ckan/migration/versions/044_add_task_status.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/046_drop_changesets.py
    M ckan/migration/versions/047_rename_package_group_member.py
    M ckan/migration/versions/048_add_activity_streams_tables.py
    M ckan/migration/versions/049_add_group_approval_status.py
    M ckan/migration/versions/050_term_translation_table.py
    M ckan/migration/versions/051_add_tag_vocabulary.py
    M ckan/migration/versions/052_update_member_capacities.py
    M ckan/migration/versions/053_add_group_logo.py
    M ckan/migration/versions/054_add_resource_created_date.py
    M ckan/migration/versions/055_update_user_and_activity_detail.py
    M ckan/migration/versions/056_add_related_table.py
    M ckan/migration/versions/057_tracking.py
    M ckan/migration/versions/058_add_follower_tables.py
    M ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/migration/versions/060_add_system_info_table.py
    M ckan/migration/versions/061_add_follower__group_table.py
    M ckan/migration/versions/062_add_dashboard_table.py
    M ckan/migration/versions/063_org_changes.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/migration/versions/068_add_package_extras_index.py
    M ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/migration/versions/074_remove_resource_groups.py
    M ckan/migration/versions/075_rename_view_plugins.py
    M ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/migration/versions/079_resource_revision_index.py
    M ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/migration/versions/081_set_datastore_active.py
    M ckan/migration/versions/082_create_index_creator_user_id.py
    M ckan/migration/versions/083_remove_related_items.py
    M ckan/migration/versions/084_add_metadata_created.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/system_info.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/ckanext/__init__.py
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/templates/revision/__init__.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/__init__.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_misc.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/base.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_error.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/__init__.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/lib/test_authenticator.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_email_notifications.py
    M ckan/tests/legacy/lib/test_hash.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/lib/test_resource_search.py
    M ckan/tests/legacy/lib/test_simple_search.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/lib/test_solr_schema_version.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/lib/test_tag_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/logic/test_init.py
    M ckan/tests/legacy/logic/test_member.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/logic/test_validators.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/mock_plugin.py
    M ckan/tests/legacy/models/test_activity.py
    M ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_follower.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_misc.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/models/test_package_relationships.py
    M ckan/tests/legacy/models/test_purge_revision.py
    M ckan/tests/legacy/models/test_resource.py
    M ckan/tests/legacy/models/test_revision.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/pylons_controller.py
    M ckan/tests/legacy/schema/test_schema.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/navl/test_dictization_functions.py
    M ckan/tests/lib/navl/test_validators.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_auth_tkt.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    M ckan/tests/logic/action/__init__.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/__init__.py
    M ckan/tests/logic/auth/test_create.py
    M ckan/tests/logic/auth/test_delete.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_conversion.py
    M ckan/tests/logic/test_converters.py
    M ckan/tests/logic/test_schema.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/migration/__init__.py
    M ckan/tests/model/__init__.py
    M ckan/tests/model/test_license.py
    M ckan/tests/model/test_resource.py
    M ckan/tests/model/test_resource_view.py
    M ckan/tests/model/test_system_info.py
    M ckan/tests/model/test_user.py
    M ckan/tests/plugins/__init__.py
    M ckan/tests/plugins/test_toolkit.py
    M ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_factories.py
    M ckan/websetup.py
    M ckanext/__init__.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/auth.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/interfaces.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/helpers.py
    M ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_configure.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_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.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/plugin_v1.py
    M ckanext/example_iauthfunctions/plugin_v2.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M ckanext/example_iauthfunctions/plugin_v4.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/controller.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/plugin.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_itemplatehelpers/plugin.py
    M ckanext/example_itranslation/plugin.py
    M ckanext/example_itranslation/plugin_v1.py
    M ckanext/example_itranslation/tests/test_plugin.py
    M ckanext/example_iuploader/plugin.py
    M ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/example_theme/v01_empty_extension/plugin.py
    M ckanext/example_theme/v02_empty_template/plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/plugin.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
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/public/__init__.py
    M ckanext/stats/public/ckanext/__init__.py
    M ckanext/stats/public/ckanext/stats/__init__.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/test_tag_vocab_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 profile_tests.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #3069 from torfsen/3006-source-file-encoding

Add and test PEP 263 source file encoding specifications.


  Commit: e54912ee578557fc6168c08f6ed9085ef018e015
      https://github.com/ckan/ckan/commit/e54912ee578557fc6168c08f6ed9085ef018e015
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/templates/snippets/language_selector.html

  Log Message:
  -----------
  [#3073] Add  `short_name` to locale for url construction


  Commit: a179ae3fdee075e281926d001bfef3f4e0eb2794
      https://github.com/ckan/ckan/commit/a179ae3fdee075e281926d001bfef3f4e0eb2794
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M ckan/lib/i18n.py

  Log Message:
  -----------
  [#3073] make pep8 happy


  Commit: 30a27cedb445e5c3cabc920cec87b035cc9a02fb
      https://github.com/ckan/ckan/commit/30a27cedb445e5c3cabc920cec87b035cc9a02fb
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/navl/dictization_functions.py
    A ckan/tests/lib/test_navl.py

  Log Message:
  -----------
  [#3060] move formencode lang settings to environment.py


  Commit: 7b6dbed7ba8e735fce2bad52beccede6cd1ef373
      https://github.com/ckan/ckan/commit/7b6dbed7ba8e735fce2bad52beccede6cd1ef373
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

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

  Log Message:
  -----------
  [#3027] use commit from 3027 and add test


  Commit: a75630da9818a54e84fe1fa6574bab2e3572404d
      https://github.com/ckan/ckan/commit/a75630da9818a54e84fe1fa6574bab2e3572404d
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-02 (Thu, 02 Jun 2016)

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

  Log Message:
  -----------
  [#3027] redirect to user feed after creation


  Commit: a8d4ab7d92e74395ba31b90dab3850ad88345a73
      https://github.com/ckan/ckan/commit/a8d4ab7d92e74395ba31b90dab3850ad88345a73
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/public/base/css/main.css
    M ckan/public/base/images/sprite-resource-icons.png

  Log Message:
  -----------
  Merge pull request #3048 from k-nut/2948-icon-for-image-files

Include icon for image data


  Commit: b25dfdd098075fd7d78244f0690d9530a2cdd365
      https://github.com/ckan/ckan/commit/b25dfdd098075fd7d78244f0690d9530a2cdd365
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/lib/dictization/model_dictize.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/logic/action/test_create.py

  Log Message:
  -----------
  Merge branch '2844-optional-resource-url'


  Commit: 87c100078d2461dd085998c2001cb17afc0079fa
      https://github.com/ckan/ckan/commit/87c100078d2461dd085998c2001cb17afc0079fa
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/lib/base.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/test_coding_standards.py

  Log Message:
  -----------
  Merge branch '3053-old-session-data'

Conflicts:
	ckan/tests/legacy/lib/test_i18n.py


  Commit: a4045d1f06de42d9df46a03bf7bed95f4e5bb432
      https://github.com/ckan/ckan/commit/a4045d1f06de42d9df46a03bf7bed95f4e5bb432
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/patch.py
    M ckan/logic/auth/update.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/logic/auth/test_delete.py
    A ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'bugfix/permissions_call_check_access' of https://github.com/Psykar/ckan into Psykar-bugfix/permissions_call_check_access

Conflicts:
	ckan/logic/auth/patch.py


  Commit: 0856d55d2104d697651aa3e2eb1702997ae95e48
      https://github.com/ckan/ckan/commit/0856d55d2104d697651aa3e2eb1702997ae95e48
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/patch.py
    M ckan/logic/auth/update.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/logic/auth/test_delete.py
    A ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M setup.py

  Log Message:
  -----------
  Merge branch 'Psykar-bugfix/permissions_call_check_access'


  Commit: 0b7aa77e5e38d1376050b638d19a88da67346ea6
      https://github.com/ckan/ckan/commit/0b7aa77e5e38d1376050b638d19a88da67346ea6
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/navl/dictization_functions.py
    A ckan/tests/lib/test_navl.py

  Log Message:
  -----------
  Merge branch '3060-set-formencode-default-lang' of https://github.com/k-nut/ckan into k-nut-3060-set-formencode-default-lang


  Commit: ae9e163790859331d980c8d3cb0fe13750bcec4c
      https://github.com/ckan/ckan/commit/ae9e163790859331d980c8d3cb0fe13750bcec4c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/navl/dictization_functions.py
    A ckan/tests/lib/test_navl.py

  Log Message:
  -----------
  Merge branch 'k-nut-3060-set-formencode-default-lang'


  Commit: 1e747f6d3eee08cdf2e43dab397368154bf55394
      https://github.com/ckan/ckan/commit/1e747f6d3eee08cdf2e43dab397368154bf55394
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/templates/snippets/language_selector.html

  Log Message:
  -----------
  Merge branch '3073-enable-chinese-locale' of https://github.com/k-nut/ckan into k-nut-3073-enable-chinese-locale


  Commit: 4bffd8c2611ae9eacec6b8593681fcc287d9a622
      https://github.com/ckan/ckan/commit/4bffd8c2611ae9eacec6b8593681fcc287d9a622
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/lib/i18n.py
    M ckan/templates/snippets/language_selector.html

  Log Message:
  -----------
  Merge branch 'k-nut-3073-enable-chinese-locale'


  Commit: a01b9280fd34d528a469133c57bfc38250c3b677
      https://github.com/ckan/ckan/commit/a01b9280fd34d528a469133c57bfc38250c3b677
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/tests/lib/test_navl.py
    M ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py

  Log Message:
  -----------
  Specify encoding in new files


  Commit: ccacc811ac400d789c9b9dd5046134e707f9aa82
      https://github.com/ckan/ckan/commit/ccacc811ac400d789c9b9dd5046134e707f9aa82
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/tests/lib/test_navl.py
    M ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py

  Log Message:
  -----------
  Merge pull request #3088 from ckan/specify-encoding-in-forgotten-files

Specify encoding in new files


  Commit: debc9fb032a97a24fe1f6c60fe0ad4e3e0f2a9e2
      https://github.com/ckan/ckan/commit/debc9fb032a97a24fe1f6c60fe0ad4e3e0f2a9e2
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-03 (Fri, 03 Jun 2016)

  Changed paths:
    M ckan/tests/factories.py

  Log Message:
  -----------
  Merge pull request #3066 from k-nut/padding-in-group-and-org-names

Pad object names from factories with zeros


  Commit: 16a81926b0d3e4080cf5c0f34b0e53ab8bb4691c
      https://github.com/ckan/ckan/commit/16a81926b0d3e4080cf5c0f34b0e53ab8bb4691c
  Author: Mark Gregson <mark.gregson at linkdigital.com.au>
  Date:   2016-06-04 (Sat, 04 Jun 2016)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  [#3089] move RootPathMiddlware up the WSGI stack so it doesn't impact other middleware


  Commit: dd8551949005d30a7b0372bf2013b7816881d75d
      https://github.com/ckan/ckan/commit/dd8551949005d30a7b0372bf2013b7816881d75d
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-05 (Sun, 05 Jun 2016)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  Merge pull request #3090 from MrkGrgsn/3089-fix-rootpath-for-middleware

[#3089] move RootPathMiddleware up the WSGI stack so it doesn't impact…


  Commit: a0a8f68732e9a194ad8354ede643060162b4f7cf
      https://github.com/ckan/ckan/commit/a0a8f68732e9a194ad8354ede643060162b4f7cf
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M doc/contributing/index.rst
    M doc/contributing/python.rst
    A doc/contributing/unicode.rst

  Log Message:
  -----------
  Document CKAN Unicode handling.


  Commit: f2537b1c4b5a8e5eaccccf1068a1cc669eff272b
      https://github.com/ckan/ckan/commit/f2537b1c4b5a8e5eaccccf1068a1cc669eff272b
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

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

  Log Message:
  -----------
  [#3011] do not create default views on package_update


  Commit: 5d9a994ee93714e6622e5eb47dd05d5ca4977782
      https://github.com/ckan/ckan/commit/5d9a994ee93714e6622e5eb47dd05d5ca4977782
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

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

  Log Message:
  -----------
  [#3011] Create default views on resource_create

- This was not neccessary before because we would call `package_update`
  in the `resource_create` function. Now that `package_update` does not
  create the default views anymore the `resource_create` function has to
  do it itself


  Commit: 045927eae9a5f159f663adfd36d0f7d1cd8d5a6e
      https://github.com/ckan/ckan/commit/045927eae9a5f159f663adfd36d0f7d1cd8d5a6e
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M ckan/tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#3011] Remove tests for package_update and resource_update

- The new logic is not to create the views anymore on `*_update` but
  just on `*_create`


  Commit: 505d1c9fafb963f1f7047c98b562e4b7cc3b5781
      https://github.com/ckan/ckan/commit/505d1c9fafb963f1f7047c98b562e4b7cc3b5781
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

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

  Log Message:
  -----------
  [#3011] create default views via get_action


  Commit: c906aa1bd1147c310be073edb63f5debda01c66c
      https://github.com/ckan/ckan/commit/c906aa1bd1147c310be073edb63f5debda01c66c
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M ckan/tests/lib/test_datapreview.py

  Log Message:
  -----------
  [#3011] remove empty line for pep8


  Commit: 218d6f4a9defe798ce8a1426f6cde5b01705b486
      https://github.com/ckan/ckan/commit/218d6f4a9defe798ce8a1426f6cde5b01705b486
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M ckanext/reclineview/tests/test_view.py

  Log Message:
  -----------
  [#3011] Spcifiy format in test

Not sure if this is a good idea but all the tests should at least pass
now


  Commit: ab64c77869e029d0dd602957b5d618d098be7a3e
      https://github.com/ckan/ckan/commit/ab64c77869e029d0dd602957b5d618d098be7a3e
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py

  Log Message:
  -----------
  [#3011] properly check for _datastore_only_resource


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

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

  Log Message:
  -----------
  Merge branch 'ckan-3077-exceptions-user-invite'


  Commit: 3717886a0231499b52db1e8eba869b2947358e1f
      https://github.com/ckan/ckan/commit/3717886a0231499b52db1e8eba869b2947358e1f
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

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

  Log Message:
  -----------
  Merge branch 'ckan-3078-member_list-shows-deleted'


  Commit: 11369af309135bffa6ab2e4cbd87808562d1e059
      https://github.com/ckan/ckan/commit/11369af309135bffa6ab2e4cbd87808562d1e059
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  [#3011] change check for _datastore_only_resource in ReclineViewBase


  Commit: 7cf95acbc01c65d666dcf32a0f3c52642c1c4931
      https://github.com/ckan/ckan/commit/7cf95acbc01c65d666dcf32a0f3c52642c1c4931
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

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

  Log Message:
  -----------
  [#3046] prompt user to create organization


  Commit: 7227b7026cb47dab07912ce2ea837997dbb76d94
      https://github.com/ckan/ckan/commit/7227b7026cb47dab07912ce2ea837997dbb76d94
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M ckan/logic/validators.py

  Log Message:
  -----------
  [#3046] Fix typo in exception message


  Commit: 48ffbf54a674b1bbeb1486012cb6b9e8a730a97d
      https://github.com/ckan/ckan/commit/48ffbf54a674b1bbeb1486012cb6b9e8a730a97d
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M ckan/templates/package/new.html
    A ckan/templates/package/snippets/cannot_create_package.html

  Log Message:
  -----------
  [#3046] extract warning into own page


  Commit: ff93ffbfe0eb61b9c8b4dca7ea6125b4d6f46df6
      https://github.com/ckan/ckan/commit/ff93ffbfe0eb61b9c8b4dca7ea6125b4d6f46df6
  Author: Knut Hühne <knut at k-nut.eu>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

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

  Log Message:
  -----------
  [#3046] add tests


  Commit: 65b4e7dfcbefcd874be354cd1846d6c83b961df8
      https://github.com/ckan/ckan/commit/65b4e7dfcbefcd874be354cd1846d6c83b961df8
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-06 (Mon, 06 Jun 2016)

  Changed paths:
    M ckan/ckan_nose_plugin.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Fix #3093: Incorrect usage of `str.split`.


  Commit: 7a58753aefe8b8edebf4ebb429e65e2b9a5cd1bd
      https://github.com/ckan/ckan/commit/7a58753aefe8b8edebf4ebb429e65e2b9a5cd1bd
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M ckan/ckan_nose_plugin.py
    M ckan/lib/base.py
    M ckan/lib/datapreview.py
    M ckan/lib/helpers.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge pull request #3094 from torfsen/3093-fix-split-usage

Fix #3093: Incorrect usage of str.split


  Commit: 42632dc3aa0d42765b3cec0ad0cab821b70f5c15
      https://github.com/ckan/ckan/commit/42632dc3aa0d42765b3cec0ad0cab821b70f5c15
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

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

  Log Message:
  -----------
  [#3046] improve patching in test


  Commit: 71ee7c1a5a427b34cf3878727fcd5208d78b69a4
      https://github.com/ckan/ckan/commit/71ee7c1a5a427b34cf3878727fcd5208d78b69a4
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M ckan/tests/controllers/test_package.py
    M ckan/tests/helpers.py

  Log Message:
  -----------
  [#3046] create mock_auth helper function and use it


  Commit: 192491e3419c7c5c256d06911b5a0ab1cd665af9
      https://github.com/ckan/ckan/commit/192491e3419c7c5c256d06911b5a0ab1cd665af9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M ckan/config/resource_formats.json

  Log Message:
  -----------
  Add GTFS format - to be detected by ckanext-qa.


  Commit: c148f45647cd7e2c07e9a8ddfb3bd8ac1dfc4c35
      https://github.com/ckan/ckan/commit/c148f45647cd7e2c07e9a8ddfb3bd8ac1dfc4c35
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-07 (Tue, 07 Jun 2016)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/tests/lib/test_datapreview.py
    M ckanext/reclineview/plugin.py

  Log Message:
  -----------
  Merge pull request #3061 from k-nut/3011-do-not-always-create-default-views

Do not create default views on update


  Commit: ec04d6db82a8d68447114c5cd07140c4faa1920f
      https://github.com/ckan/ckan/commit/ec04d6db82a8d68447114c5cd07140c4faa1920f
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-08 (Wed, 08 Jun 2016)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Fix #3097: Improve documentation of `get_action`.

Mention that context dicts should not be reused.


  Commit: a28b95c0f027c59004cf450fe521f710e5b4470b
      https://github.com/ckan/ckan/commit/a28b95c0f027c59004cf450fe521f710e5b4470b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-08 (Wed, 08 Jun 2016)

  Changed paths:
    M ckan/config/resource_formats.json

  Log Message:
  -----------
  Merge pull request #3096 from ckan/gtfs

Add GTFS format


  Commit: 29c62ed375ffa569211bc22b604f800119a2d552
      https://github.com/ckan/ckan/commit/29c62ed375ffa569211bc22b604f800119a2d552
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Fix #3081: Improve docs of `ckan.site_url` and `ckan.root_path`.

Improves the documentation of the configuration options `ckan.site_url`
and `ckan.root_path` to make it clear that the former should not contain
only the host and not a potentially non-standard mount point.


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

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge pull request #3100 from torfsen/3081-improve-site_url-and-root_path-docs

Fix #3081: Improve docs of `ckan.site_url` and `ckan.root_path`.


  Commit: 997b06cf5627660ec7b9b1d8dca2f2463e901d1a
      https://github.com/ckan/ckan/commit/997b06cf5627660ec7b9b1d8dca2f2463e901d1a
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-09 (Thu, 09 Jun 2016)

  Changed paths:
    M ckan/logic/__init__.py

  Log Message:
  -----------
  Merge pull request #3099 from torfsen/3097-improve-get_action-docs

Fix #3097: Improve documentation of `get_action`.


  Commit: 62d1e67e309d47f96d3c42af5567a8fa4757a616
      https://github.com/ckan/ckan/commit/62d1e67e309d47f96d3c42af5567a8fa4757a616
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-11 (Sat, 11 Jun 2016)

  Changed paths:
    M circle.yml

  Log Message:
  -----------
  -- deleted depreced pip


  Commit: b2bbdc6db56f0f5d9b72708279454127fe9ac387
      https://github.com/ckan/ckan/commit/b2bbdc6db56f0f5d9b72708279454127fe9ac387
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Bleach Updated


  Commit: 2e3f47b68cb9055fd6b74a578a7b4f332e2403f9
      https://github.com/ckan/ckan/commit/2e3f47b68cb9055fd6b74a578a7b4f332e2403f9
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  Mako Updated


  Commit: 5583f2a978459192f76fb4dcccc811711332ece3
      https://github.com/ckan/ckan/commit/5583f2a978459192f76fb4dcccc811711332ece3
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Markdown Updated


  Commit: 5f824d3b3fdd4c4df5773ba907077f4bbad99cfe
      https://github.com/ckan/ckan/commit/5f824d3b3fdd4c4df5773ba907077f4bbad99cfe
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  OFS Updated


  Commit: 181addb54fe9be18078797fe6fdf7c160d6726b9
      https://github.com/ckan/ckan/commit/181addb54fe9be18078797fe6fdf7c160d6726b9
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  PairTree Updated


  Commit: a21f3f723719e8f433c3f4419da85592222f7669
      https://github.com/ckan/ckan/commit/a21f3f723719e8f433c3f4419da85592222f7669
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Passlib Updated


  Commit: 06fb95c023a3685df1cfaa1aa0c1b92763ae3e50
      https://github.com/ckan/ckan/commit/06fb95c023a3685df1cfaa1aa0c1b92763ae3e50
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  Pygments Updated


  Commit: f21388b5e2b8bc773e733e51bfac0f045d2f81a6
      https://github.com/ckan/ckan/commit/f21388b5e2b8bc773e733e51bfac0f045d2f81a6
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  PySolr Updated


  Commit: 6aec9ed1102fa070cadca9401cd9130c069fa72d
      https://github.com/ckan/ckan/commit/6aec9ed1102fa070cadca9401cd9130c069fa72d
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  PyUtilLib Updated


  Commit: e10700f7f37d5a5fcb665f9ccbf2613cf4224f4e
      https://github.com/ckan/ckan/commit/e10700f7f37d5a5fcb665f9ccbf2613cf4224f4e
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Repose.who Updated


  Commit: 84fba05e1f8b0353ebc1108068aee6280998235c
      https://github.com/ckan/ckan/commit/84fba05e1f8b0353ebc1108068aee6280998235c
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Requests Update


  Commit: 5fbb580e68bbbe8fcf2e0e9c0eccaf26f8d9a86e
      https://github.com/ckan/ckan/commit/5fbb580e68bbbe8fcf2e0e9c0eccaf26f8d9a86e
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  SimpleJson Updated


  Commit: 4c4c8974a3bf05ff53a1b0971ed0fb7901af0477
      https://github.com/ckan/ckan/commit/4c4c8974a3bf05ff53a1b0971ed0fb7901af0477
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  SqlParse Updated


  Commit: b08008058213286363cb90a74ee0e26a722f9e29
      https://github.com/ckan/ckan/commit/b08008058213286363cb90a74ee0e26a722f9e29
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  WebError Upgrade


  Commit: 635d15f100d61cabba84bc8244c48857a0347025
      https://github.com/ckan/ckan/commit/635d15f100d61cabba84bc8244c48857a0347025
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  SqlAlchemy-migrate Updated


  Commit: 8dda8c471df48e70ea99083b010830a7cdf86a4f
      https://github.com/ckan/ckan/commit/8dda8c471df48e70ea99083b010830a7cdf86a4f
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  Werkzeug Upgrade


  Commit: b83159a02dbf7bbdf9f0ddfc371c21db58b71ca2
      https://github.com/ckan/ckan/commit/b83159a02dbf7bbdf9f0ddfc371c21db58b71ca2
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  zope.interface Upgraded


  Commit: 359f8c22fd5e281b4c9d1410d85b7614f78829f1
      https://github.com/ckan/ckan/commit/359f8c22fd5e281b4c9d1410d85b7614f78829f1
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M requirements.in

  Log Message:
  -----------
  Requirements.in - Ordered by name


  Commit: 6f1e8e7d87b89b05ec78b36d63a075d109b899d4
      https://github.com/ckan/ckan/commit/6f1e8e7d87b89b05ec78b36d63a075d109b899d4
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-12 (Sun, 12 Jun 2016)

  Changed paths:
    M README.rst

  Log Message:
  -----------
  Added Requires.io bandge

It shows the outdated requirements


  Commit: 2a5e5ea767dd108a4f7fe462e4a70d6faa5f199b
      https://github.com/ckan/ckan/commit/2a5e5ea767dd108a4f7fe462e4a70d6faa5f199b
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Sorted Dev-requirements by name


  Commit: 9863285ec4016afb873adbe7a95aaa4f0773e927
      https://github.com/ckan/ckan/commit/9863285ec4016afb873adbe7a95aaa4f0773e927
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Coveralls Pined


  Commit: 0eaca7924b405a1f519a2100f0a157012242b4d8
      https://github.com/ckan/ckan/commit/0eaca7924b405a1f519a2100f0a157012242b4d8
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  BeautifulSoup Updated


  Commit: a116078fec1e68f91be995aeafe5a9dc02ef28ce
      https://github.com/ckan/ckan/commit/a116078fec1e68f91be995aeafe5a9dc02ef28ce
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  DocUtils Updated


  Commit: 99c0f33b7feb33c8c4d6e3ed40a26dc84a7f3e51
      https://github.com/ckan/ckan/commit/99c0f33b7feb33c8c4d6e3ed40a26dc84a7f3e51
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/schema.py
    M ckan/tests/logic/action/test_create.py

  Log Message:
  -----------
  [#3108] Raise validation errors on group/org_member_create

Add not_missing to the schema and raise the errors on the action. Adds
some tests as well


  Commit: b3354c0339f2f54e38840ff0fe8d0470297dd18b
      https://github.com/ckan/ckan/commit/b3354c0339f2f54e38840ff0fe8d0470297dd18b
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Mock Updated


  Commit: f0798fa84f62414d94ec16c6e385cd0aa71e00a1
      https://github.com/ckan/ckan/commit/f0798fa84f62414d94ec16c6e385cd0aa71e00a1
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Pip-Tools Updated


  Commit: b2778c82fb901891b95b899ae0847547c5e53189
      https://github.com/ckan/ckan/commit/b2778c82fb901891b95b899ae0847547c5e53189
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  PoLib Updated


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

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3108] Allow to renferece groups and users by id or name


  Commit: fde822fefe350238910d6f6bea51d188d240e0a1
      https://github.com/ckan/ckan/commit/fde822fefe350238910d6f6bea51d188d240e0a1
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  Docs: Extensions should not automatically alter the database structure.

See https://github.com/ckan/ideas-and-roadmap/issues/164.


  Commit: 23e0ea31ef77725e76891e3bde049721f11d9c76
      https://github.com/ckan/ckan/commit/23e0ea31ef77725e76891e3bde049721f11d9c76
  Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

  Changed paths:
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl

  Log Message:
  -----------
  Update extension template to reflect best practice w.r.t. requirements.

Extensions should use a separate ``requirements.txt`` file to list their
dependencies (instead of ``setup.py``). This was already documented but
the ``setup.py`` template did not mention it.


  Commit: d36226b443f30cad4b70f6b8a881cb0066945b6b
      https://github.com/ckan/ckan/commit/d36226b443f30cad4b70f6b8a881cb0066945b6b
  Author: Martin Burchell <martinb at aptivate.org>
  Date:   2016-06-13 (Mon, 13 Jun 2016)

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

  Log Message:
  -----------
  Purge dataset relationships


  Commit: 688a1a769becca06fb115edd3467781dd1f62de4
      https://github.com/ckan/ckan/commit/688a1a769becca06fb115edd3467781dd1f62de4
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#3113] Remove reference to lang in session.

lang maintained by i18n middleware, not by key in cookie. This continues
removal of old session code missed in #3053.


  Commit: ad8db409e48e4ccc6d3da7eb9a27d48ce586bad5
      https://github.com/ckan/ckan/commit/ad8db409e48e4ccc6d3da7eb9a27d48ce586bad5
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  [#3113] Restore session deletion.

I over-committed in the previous commit and removed too much code. This
restores session deletion if there is a session.id, but no valid session
data.


  Commit: 4d55b4ee887b3e76d503e3a42a0c24a3771d1b63
      https://github.com/ckan/ckan/commit/4d55b4ee887b3e76d503e3a42a0c24a3771d1b63
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M doc/extensions/best-practices.rst

  Log Message:
  -----------
  Merge pull request #3111 from torfsen/improve-extension-best-practices

Improve extension best practices


  Commit: e759e1b0892fb703c4b2e77b1cd73475bf920bd3
      https://github.com/ckan/ckan/commit/e759e1b0892fb703c4b2e77b1cd73475bf920bd3
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M circle.yml

  Log Message:
  -----------
  Merge pull request #3106 from deinok/circle-update

CircleCi - deleted --allow-all-external


  Commit: 7528a736623ff58c14347263ae422cbd4efc3f67
      https://github.com/ckan/ckan/commit/7528a736623ff58c14347263ae422cbd4efc3f67
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Coveralls Unpinned - Added Comment


  Commit: c3e5dd546b4283cba73beee7177a8dba1e8be3d3
      https://github.com/ckan/ckan/commit/c3e5dd546b4283cba73beee7177a8dba1e8be3d3
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M ckan/lib/base.py

  Log Message:
  -----------
  Merge pull request #3113 from ckan/3113-more-session-removal

Remove another old sessions reference


  Commit: 8a382300148f9d8f454c870b8ee2527c40d326d4
      https://github.com/ckan/ckan/commit/8a382300148f9d8f454c870b8ee2527c40d326d4
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M ckan/logic/validators.py
    M ckan/templates/package/new.html
    A ckan/templates/package/snippets/cannot_create_package.html
    M ckan/tests/controllers/test_package.py
    M ckan/tests/helpers.py

  Log Message:
  -----------
  Merge pull request #3054 from k-nut/3046-display-warning-when-creating-dataset-without-organizations

Display warning when creating dataset without organizations


  Commit: 60b951d6dc752df5c82e8d452c867f05ccd7b1d9
      https://github.com/ckan/ckan/commit/60b951d6dc752df5c82e8d452c867f05ccd7b1d9
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-14 (Tue, 14 Jun 2016)

  Changed paths:
    M dev-requirements.txt

  Log Message:
  -----------
  Merge branch 'deinok-dev-requirements-upgrade'


  Commit: e20bef268bd3108642bddd328a2ad84f2cae59e4
      https://github.com/ckan/ckan/commit/e20bef268bd3108642bddd328a2ad84f2cae59e4
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

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

  Log Message:
  -----------
  [#3108] Add back plugin unload command


  Commit: 83f4a477c238965ae76035643747b995a103e6d6
      https://github.com/ckan/ckan/commit/83f4a477c238965ae76035643747b995a103e6d6
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

  Changed paths:
    M ckan/logic/schema.py

  Log Message:
  -----------
  [#3108] Remove redundant validator


  Commit: 55ae76ec73e97bcae05b778ab35f23ed518e6e24
      https://github.com/ckan/ckan/commit/55ae76ec73e97bcae05b778ab35f23ed518e6e24
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

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

  Log Message:
  -----------
  Merge pull request #3082 from k-nut/3027-test

Allow Sysadmins to create users with the form (and test)


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

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/schema.py
    M ckan/tests/logic/action/test_create.py

  Log Message:
  -----------
  Merge pull request #3108 from ckan/3108-validation-errors-on-member-create

*_member_create don't raise validation errors


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

  Changed paths:
    M doc/contributing/index.rst
    M doc/contributing/python.rst
    A doc/contributing/unicode.rst

  Log Message:
  -----------
  Merge pull request #3068 from torfsen/3006-document-unicode-handling

Document CKAN Unicode handling.


  Commit: 2a726ab6045750906cb4061a96431905b03357ad
      https://github.com/ckan/ckan/commit/2a726ab6045750906cb4061a96431905b03357ad
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  [#3117] Remove site_url_nice from app_globals


  Commit: 9f59e91113a7e129bd4ce801f3fae5835d0baef4
      https://github.com/ckan/ckan/commit/9f59e91113a7e129bd4ce801f3fae5835d0baef4
  Author: Ian Ward <ian at excess.org>
  Date:   2016-06-16 (Thu, 16 Jun 2016)

  Changed paths:
    M ckan/lib/app_globals.py

  Log Message:
  -----------
  Merge pull request #3117 from ckan/3117-site-url-nice

Remove `site_url_nice` from app_globals


  Commit: 3d0f8abd511d5f07f9a28c7c478a801cf5fe19fd
      https://github.com/ckan/ckan/commit/3d0f8abd511d5f07f9a28c7c478a801cf5fe19fd
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  [#3121] Change test to prevent deprecation warning


  Commit: 42dfed5a48afb4d4cc8bb9c797ed418b7f11a1e0
      https://github.com/ckan/ckan/commit/42dfed5a48afb4d4cc8bb9c797ed418b7f11a1e0
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  Merge pull request #3112 from aptivate/purge-dataset-relationships

Purge dataset relationships


  Commit: 91bf17e269269973f967fb84e62cd36b7bccf040
      https://github.com/ckan/ckan/commit/91bf17e269269973f967fb84e62cd36b7bccf040
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  remove duplicated import


  Commit: 282543be441329b66d2532c3c4dccdc981dd09f1
      https://github.com/ckan/ckan/commit/282543be441329b66d2532c3c4dccdc981dd09f1
  Author: Cody <cody at quantifiedcode.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/schema.py
    M ckan/model/package.py

  Log Message:
  -----------
  Use dict comprehension instead of dict([...])


  Commit: 9fb9f576003578674223b57cf9175cb07b27a4d9
      https://github.com/ckan/ckan/commit/9fb9f576003578674223b57cf9175cb07b27a4d9
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  Merge pull request #3121 from ckan/3121-logout-test

Remove `e.message` deprecation warning when running tests


  Commit: 550385128cf058a9aa863c1e17924fc4a9b3d395
      https://github.com/ckan/ckan/commit/550385128cf058a9aa863c1e17924fc4a9b3d395
  Author: Knut Hühne <knut at viderum.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M ckan/lib/config_tool.py

  Log Message:
  -----------
  [#3123] fix indentation for pep8


  Commit: ff00d5c6fd79c80b7d6772b0cb578a8c584b2095
      https://github.com/ckan/ckan/commit/ff00d5c6fd79c80b7d6772b0cb578a8c584b2095
  Author: Deinok <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

  Changed paths:
    M README.rst
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  PairTree and Readme fix


  Commit: 817d97dba5ab79128eb3e8a176d98f7585ecbfb0
      https://github.com/ckan/ckan/commit/817d97dba5ab79128eb3e8a176d98f7585ecbfb0
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-17 (Fri, 17 Jun 2016)

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

  Log Message:
  -----------
  Merge pull request #3124 from k-nut/remove-duplicate-import-in-test

Remove duplicated import


  Commit: d4236878335818d4272cc4fd1f8da9d294847b9a
      https://github.com/ckan/ckan/commit/d4236878335818d4272cc4fd1f8da9d294847b9a
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M ckan/lib/config_tool.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_save.py
    M ckan/logic/schema.py
    M ckan/model/package.py

  Log Message:
  -----------
  Merge pull request #3125 from k-nut/3123-dict-comprehension

Dict comprehension without pep8 problems


  Commit: cd340b172e012020f86fdb712ead54c7d0f35460
      https://github.com/ckan/ckan/commit/cd340b172e012020f86fdb712ead54c7d0f35460
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Beaker Upgrade - Changed Comment


  Commit: afba1b078f96662f1e101ead85b9e41a25c2cca6
      https://github.com/ckan/ckan/commit/afba1b078f96662f1e101ead85b9e41a25c2cca6
  Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M requirements.txt

  Log Message:
  -----------
  SimpleJson - Hand-fix deleted


  Commit: a4ae04a779016a04766f242c847bc7dd6555d12e
      https://github.com/ckan/ckan/commit/a4ae04a779016a04766f242c847bc7dd6555d12e
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-06-20 (Mon, 20 Jun 2016)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge pull request #3107 from deinok/requirements-upgrades

Requirements upgrades


  Commit: b52909dec4e777d77b6e46c067dbbc7ca1953d95
      https://github.com/ckan/ckan/commit/b52909dec4e777d77b6e46c067dbbc7ca1953d95
  Author: amercader <amercadero at gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    R .travis.yml
    M Dockerfile
    M MANIFEST.in
    M README.rst
    M circle.yml
    M ckan/__init__.py
    M ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/common.py
    M ckan/config/environment.py
    M ckan/config/install.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/error.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/partyline.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/controllers/util.py
    M ckan/exceptions.py
    M ckan/i18n/__init__.py
    M ckan/i18n/check_po_files.py
    M ckan/lib/activity_streams.py
    M ckan/lib/activity_streams_session_extension.py
    M ckan/lib/alphabet_paginate.py
    M ckan/lib/app_globals.py
    M ckan/lib/auth_tkt.py
    M ckan/lib/authenticator.py
    M ckan/lib/base.py
    M ckan/lib/captcha.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M 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/email_notifications.py
    M ckan/lib/extract.py
    M ckan/lib/fanstatic_extensions.py
    M ckan/lib/fanstatic_resources.py
    M ckan/lib/formatters.py
    M ckan/lib/hash.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jinja_extensions.py
    M ckan/lib/jsonp.py
    R ckan/lib/lazyjson.py
    M ckan/lib/mailer.py
    M ckan/lib/maintain.py
    M ckan/lib/munge.py
    M ckan/lib/navl/__init__.py
    M ckan/lib/navl/dictization_functions.py
    M ckan/lib/navl/validators.py
    M ckan/lib/plugins.py
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/common.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/lib/search/sql.py
    M ckan/lib/uploader.py
    M ckan/lib/util.py
    M ckan/logic/__init__.py
    M ckan/logic/action/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/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
    M 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
    M ckan/migration/manage.py
    M ckan/migration/versions/001_add_existing_tables.py
    M ckan/migration/versions/002_add_author_and_maintainer.py
    M ckan/migration/versions/003_add_user_object.py
    M ckan/migration/versions/004_add_group_object.py
    M ckan/migration/versions/005_add_authorization_tables.py
    M ckan/migration/versions/006_add_ratings.py
    M ckan/migration/versions/007_add_system_roles.py
    M ckan/migration/versions/008_update_vdm_ids.py
    M ckan/migration/versions/009_add_creation_timestamps.py
    M ckan/migration/versions/010_add_user_about.py
    M ckan/migration/versions/011_add_package_search_vector.py
    M ckan/migration/versions/012_add_resources.py
    M ckan/migration/versions/013_add_hash.py
    M ckan/migration/versions/014_hash_2.py
    M ckan/migration/versions/015_remove_state_object.py
    M ckan/migration/versions/016_uuids_everywhere.py
    M ckan/migration/versions/017_add_pkg_relationships.py
    M ckan/migration/versions/018_adjust_licenses.py
    M ckan/migration/versions/019_pkg_relationships_state.py
    M ckan/migration/versions/020_add_changeset.py
    M ckan/migration/versions/022_add_group_extras.py
    M ckan/migration/versions/023_add_harvesting.py
    M ckan/migration/versions/024_add_harvested_document.py
    M ckan/migration/versions/025_add_authorization_groups.py
    M ckan/migration/versions/026_authorization_group_user_pk.py
    M ckan/migration/versions/027_adjust_harvester.py
    M ckan/migration/versions/028_drop_harvest_source_status.py
    M ckan/migration/versions/029_version_groups.py
    M ckan/migration/versions/030_additional_user_attributes.py
    M ckan/migration/versions/031_move_openid_to_new_field.py
    M ckan/migration/versions/032_add_extra_info_field_to_resources.py
    M ckan/migration/versions/033_auth_group_user_id_add_conditional.py
    M ckan/migration/versions/034_resource_group_table.py
    M ckan/migration/versions/035_harvesting_doc_versioning.py
    M ckan/migration/versions/036_lockdown_roles.py
    M ckan/migration/versions/037_role_anon_editor.py
    M ckan/migration/versions/038_delete_migration_tables.py
    M ckan/migration/versions/039_add_expired_id_and_dates.py
    M ckan/migration/versions/040_reset_key_on_user.py
    M ckan/migration/versions/041_resource_new_fields.py
    M ckan/migration/versions/042_user_revision_indexes.py
    M ckan/migration/versions/043_drop_postgres_search.py
    M ckan/migration/versions/044_add_task_status.py
    M ckan/migration/versions/045_user_name_unique.py
    M ckan/migration/versions/046_drop_changesets.py
    M ckan/migration/versions/047_rename_package_group_member.py
    M ckan/migration/versions/048_add_activity_streams_tables.py
    M ckan/migration/versions/049_add_group_approval_status.py
    M ckan/migration/versions/050_term_translation_table.py
    M ckan/migration/versions/051_add_tag_vocabulary.py
    M ckan/migration/versions/052_update_member_capacities.py
    M ckan/migration/versions/053_add_group_logo.py
    M ckan/migration/versions/054_add_resource_created_date.py
    M ckan/migration/versions/055_update_user_and_activity_detail.py
    M ckan/migration/versions/056_add_related_table.py
    M ckan/migration/versions/057_tracking.py
    M ckan/migration/versions/058_add_follower_tables.py
    M ckan/migration/versions/059_add_related_count_and_flag.py
    M ckan/migration/versions/060_add_system_info_table.py
    M ckan/migration/versions/061_add_follower__group_table.py
    M ckan/migration/versions/062_add_dashboard_table.py
    M ckan/migration/versions/063_org_changes.py
    M ckan/migration/versions/064_add_email_last_sent_column.py
    M ckan/migration/versions/065_add_email_notifications_preference.py
    M ckan/migration/versions/066_default_package_type.py
    M ckan/migration/versions/067_turn_extras_to_strings.py
    M ckan/migration/versions/068_add_package_extras_index.py
    M ckan/migration/versions/069_resource_url_and_metadata_modified.py
    M ckan/migration/versions/070_add_activity_and_resource_indexes.py
    M ckan/migration/versions/071_add_state_column_to_user_table.py
    M ckan/migration/versions/072_add_resource_view.py
    M ckan/migration/versions/073_update_resource_view_resource_id_constraint.py
    M ckan/migration/versions/074_remove_resource_groups.py
    M ckan/migration/versions/075_rename_view_plugins.py
    M ckan/migration/versions/076_rename_view_plugins_2.py
    M ckan/migration/versions/077_add_revisions_to_system_info.py
    M ckan/migration/versions/078_remove_old_authz_model.py
    M ckan/migration/versions/079_resource_revision_index.py
    M ckan/migration/versions/080_continuity_id_indexes.py
    M ckan/migration/versions/081_set_datastore_active.py
    M ckan/migration/versions/082_create_index_creator_user_id.py
    M ckan/migration/versions/083_remove_related_items.py
    M ckan/migration/versions/084_add_metadata_created.py
    M ckan/model/__init__.py
    M ckan/model/activity.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/domain_object.py
    M ckan/model/extension.py
    M ckan/model/follower.py
    M ckan/model/group.py
    M ckan/model/group_extra.py
    M ckan/model/license.py
    M ckan/model/meta.py
    M ckan/model/misc.py
    M ckan/model/modification.py
    M ckan/model/package.py
    M ckan/model/package_extra.py
    M ckan/model/package_relationship.py
    M ckan/model/rating.py
    M ckan/model/resource.py
    M ckan/model/resource_view.py
    M ckan/model/system_info.py
    M ckan/model/tag.py
    M ckan/model/task_status.py
    M ckan/model/term_translation.py
    M ckan/model/tracking.py
    M ckan/model/types.py
    M ckan/model/user.py
    M ckan/model/vocabulary.py
    M ckan/pastertemplates/__init__.py
    M ckan/pastertemplates/template/MANIFEST.in_tmpl
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    A ckan/pastertemplates/template/requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    M ckan/plugins/__init__.py
    M ckan/plugins/core.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/plugins/toolkit_sphinx_extension.py
    M ckan/public/base/css/main.css
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/less/module.less
    M ckan/templates/base.html
    M ckan/templates/group/index.html
    M ckan/templates/group/snippets/feeds.html
    M ckan/templates/header.html
    M ckan/templates/organization/snippets/feeds.html
    M ckan/templates/package/new.html
    M ckan/templates/package/read_base.html
    A ckan/templates/package/snippets/cannot_create_package.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/revision/__init__.py
    M ckan/templates/snippets/debug.html
    M ckan/templates/snippets/home_breadcrumb_item.html
    M ckan/templates/snippets/language_selector.html
    A ckan/templates/tests/broken_helper_as_attribute.html
    A ckan/templates/tests/broken_helper_as_item.html
    A ckan/templates/tests/helper_as_attribute.html
    A ckan/templates/tests/helper_as_item.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/config/test_environment.py
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/__init__.py
    M ckan/tests/controllers/test_admin.py
    M ckan/tests/controllers/test_api.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_group.py
    M ckan/tests/controllers/test_home.py
    M ckan/tests/controllers/test_organization.py
    M ckan/tests/controllers/test_package.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/factories.py
    M ckan/tests/helpers.py
    M ckan/tests/i18n/test_check_po_files.py
    M ckan/tests/legacy/__init__.py
    M ckan/tests/legacy/ckantestplugins.py
    M ckan/tests/legacy/functional/api/__init__.py
    M ckan/tests/legacy/functional/api/base.py
    M ckan/tests/legacy/functional/api/model/test_group.py
    M ckan/tests/legacy/functional/api/model/test_licenses.py
    M ckan/tests/legacy/functional/api/model/test_package.py
    M ckan/tests/legacy/functional/api/model/test_ratings.py
    M ckan/tests/legacy/functional/api/model/test_relationships.py
    M ckan/tests/legacy/functional/api/model/test_revisions.py
    M ckan/tests/legacy/functional/api/model/test_tag.py
    M ckan/tests/legacy/functional/api/model/test_vocabulary.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/functional/api/test_api.py
    M ckan/tests/legacy/functional/api/test_dashboard.py
    M ckan/tests/legacy/functional/api/test_email_notifications.py
    M ckan/tests/legacy/functional/api/test_follow.py
    M ckan/tests/legacy/functional/api/test_misc.py
    M ckan/tests/legacy/functional/api/test_package_search.py
    M ckan/tests/legacy/functional/api/test_resource.py
    M ckan/tests/legacy/functional/api/test_resource_search.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/functional/api/test_util.py
    M ckan/tests/legacy/functional/base.py
    M ckan/tests/legacy/functional/test_activity.py
    M ckan/tests/legacy/functional/test_admin.py
    M ckan/tests/legacy/functional/test_error.py
    M ckan/tests/legacy/functional/test_group.py
    M ckan/tests/legacy/functional/test_package.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/functional/test_preview_interface.py
    M ckan/tests/legacy/functional/test_revision.py
    M ckan/tests/legacy/functional/test_tag.py
    M ckan/tests/legacy/functional/test_tracking.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/legacy/html_check.py
    M ckan/tests/legacy/lib/__init__.py
    M ckan/tests/legacy/lib/test_alphabet_pagination.py
    M ckan/tests/legacy/lib/test_authenticator.py
    M ckan/tests/legacy/lib/test_cli.py
    M ckan/tests/legacy/lib/test_dictization.py
    M ckan/tests/legacy/lib/test_dictization_schema.py
    M ckan/tests/legacy/lib/test_email_notifications.py
    M ckan/tests/legacy/lib/test_hash.py
    M ckan/tests/legacy/lib/test_helpers.py
    M ckan/tests/legacy/lib/test_i18n.py
    M ckan/tests/legacy/lib/test_navl.py
    M ckan/tests/legacy/lib/test_resource_search.py
    M ckan/tests/legacy/lib/test_simple_search.py
    M ckan/tests/legacy/lib/test_solr_package_search.py
    M ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py
    M ckan/tests/legacy/lib/test_solr_schema_version.py
    M ckan/tests/legacy/lib/test_solr_search_index.py
    M ckan/tests/legacy/lib/test_tag_search.py
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/logic/test_init.py
    M ckan/tests/legacy/logic/test_member.py
    M ckan/tests/legacy/logic/test_tag.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/logic/test_validators.py
    M ckan/tests/legacy/misc/test_format_text.py
    M ckan/tests/legacy/misc/test_mock_mail_server.py
    M ckan/tests/legacy/misc/test_sync.py
    M ckan/tests/legacy/mock_mail_server.py
    M ckan/tests/legacy/mock_plugin.py
    M ckan/tests/legacy/models/test_activity.py
    M ckan/tests/legacy/models/test_extras.py
    M ckan/tests/legacy/models/test_follower.py
    M ckan/tests/legacy/models/test_group.py
    M ckan/tests/legacy/models/test_misc.py
    M ckan/tests/legacy/models/test_package.py
    M ckan/tests/legacy/models/test_package_relationships.py
    M ckan/tests/legacy/models/test_purge_revision.py
    M ckan/tests/legacy/models/test_resource.py
    M ckan/tests/legacy/models/test_revision.py
    M ckan/tests/legacy/models/test_user.py
    M ckan/tests/legacy/pylons_controller.py
    M ckan/tests/legacy/schema/test_schema.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    M ckan/tests/legacy/test_versions.py
    M ckan/tests/lib/__init__.py
    M ckan/tests/lib/dictization/test_model_dictize.py
    M ckan/tests/lib/navl/test_dictization_functions.py
    M ckan/tests/lib/navl/test_validators.py
    M ckan/tests/lib/search/test_index.py
    M ckan/tests/lib/test_app_globals.py
    M ckan/tests/lib/test_auth_tkt.py
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_config_tool.py
    M ckan/tests/lib/test_datapreview.py
    M ckan/tests/lib/test_helpers.py
    M ckan/tests/lib/test_mailer.py
    M ckan/tests/lib/test_munge.py
    A ckan/tests/lib/test_navl.py
    M ckan/tests/logic/action/__init__.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_patch.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/__init__.py
    M ckan/tests/logic/auth/test_create.py
    M ckan/tests/logic/auth/test_delete.py
    M ckan/tests/logic/auth/test_get.py
    M ckan/tests/logic/auth/test_init.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_conversion.py
    M ckan/tests/logic/test_converters.py
    M ckan/tests/logic/test_schema.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/migration/__init__.py
    M ckan/tests/model/__init__.py
    M ckan/tests/model/test_license.py
    M ckan/tests/model/test_resource.py
    M ckan/tests/model/test_resource_view.py
    M ckan/tests/model/test_system_info.py
    M ckan/tests/model/test_user.py
    M ckan/tests/plugins/__init__.py
    M ckan/tests/plugins/test_toolkit.py
    M ckan/tests/test_authz.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_factories.py
    M ckan/websetup.py
    M ckanext/__init__.py
    M ckanext/datapusher/cli.py
    M ckanext/datapusher/helpers.py
    M ckanext/datapusher/interfaces.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/logic/auth.py
    M ckanext/datapusher/logic/schema.py
    M ckanext/datapusher/plugin.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datapusher/tests/test_interfaces.py
    M ckanext/datastore/commands.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/interfaces.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/helpers.py
    M ckanext/datastore/tests/sample_datastore_plugin.py
    M ckanext/datastore/tests/test_configure.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_disable.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/datastore/tests/test_helpers.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/plugin_v1.py
    M ckanext/example_iauthfunctions/plugin_v2.py
    M ckanext/example_iauthfunctions/plugin_v3.py
    M ckanext/example_iauthfunctions/plugin_v4.py
    M ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py
    A ckanext/example_iauthfunctions/plugin_v6_parent_auth_functions.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/example_iconfigurer/controller.py
    M ckanext/example_iconfigurer/plugin.py
    M ckanext/example_iconfigurer/plugin_v1.py
    M ckanext/example_iconfigurer/plugin_v2.py
    M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py
    M ckanext/example_idatasetform/plugin.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v3.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    M ckanext/example_iresourcecontroller/plugin.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/example_itemplatehelpers/plugin.py
    M ckanext/example_itranslation/plugin.py
    M ckanext/example_itranslation/plugin_v1.py
    M ckanext/example_itranslation/tests/test_plugin.py
    A ckanext/example_iuploader/__init__.py
    A ckanext/example_iuploader/plugin.py
    A ckanext/example_iuploader/test/__init__.py
    A ckanext/example_iuploader/test/test_plugin.py
    M ckanext/example_ivalidators/plugin.py
    M ckanext/example_ivalidators/tests/test_ivalidators.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/example_theme/v01_empty_extension/plugin.py
    M ckanext/example_theme/v02_empty_template/plugin.py
    M ckanext/example_theme/v08_custom_helper_function/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/plugin.py
    M ckanext/example_theme/v15_fanstatic/plugin.py
    M ckanext/example_theme/v16_initialize_a_javascript_module/plugin.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
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/plugin.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M ckanext/stats/controller.py
    M ckanext/stats/plugin.py
    M ckanext/stats/public/__init__.py
    M ckanext/stats/public/ckanext/__init__.py
    M ckanext/stats/public/ckanext/stats/__init__.py
    M ckanext/stats/stats.py
    M ckanext/stats/tests/__init__.py
    M ckanext/stats/tests/test_stats_lib.py
    M ckanext/stats/tests/test_stats_plugin.py
    M ckanext/test_tag_vocab_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
    A contrib/docker/docker-cloud.yml
    A contrib/docker/docker-compose.yml
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    R contrib/docker/solr/schema.xml
    A contrib/docker/solr/solrconfig.xml
    M dev-requirements.txt
    M doc/contributing/index.rst
    M doc/contributing/python.rst
    A doc/contributing/unicode.rst
    M doc/extensions/best-practices.rst
    M doc/maintaining/configuration.rst
    M profile_tests.py
    M requirements.in
    M requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3002-jsonp-get


Compare: https://github.com/ckan/ckan/compare/02668cb8b24c...b52909dec4e7


More information about the ckan-changes mailing list