[ckan-changes] [ckan/ckan] d2de73: Add files via upload

Thu Jun 2 09:20:13 UTC 2016

  Branch: refs/heads/poc-flask-views.common-url_for
  Home:   https://github.com/ckan/ckan
  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: 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: 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: 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: 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: b4d14f71b8b94425da1dd26bf1547a17d007419d
      https://github.com/ckan/ckan/commit/b4d14f71b8b94425da1dd26bf1547a17d007419d
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  No need to create an app context explcitly, as it will be done when creating the request one

  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: a5b6efe7d781deba2ced36fdac4bce004838ca88
      https://github.com/ckan/ckan/commit/a5b6efe7d781deba2ced36fdac4bce004838ca88
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/views/api.py

  Log Message:
  -----------
  Support for Pylons urls creation on the Flask app

  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: 85d50cd03e392246109a14624a546282a92f3b05
      https://github.com/ckan/ckan/commit/85d50cd03e392246109a14624a546282a92f3b05
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-25 (Wed, 25 May 2016)

  Changed paths:
    M ckan/config/middleware.py

  Log Message:
  -----------
  Call the i18n Middleware first before asking the apps

The i18n will remove the locale part of the environ['PATH_INFO']
(eg `fr` in `/fr/dataset`) and set the necessary lang vars in the
environ. We need to remove that before asking the apps if they can
handle a request, otherwise localized URLs won't get recognized.

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

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

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

  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: f87cc6a2bdd4bb2154be16da66a06bb1c4ba9229
      https://github.com/ckan/ckan/commit/f87cc6a2bdd4bb2154be16da66a06bb1c4ba9229
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/tests/helpers.py
    M ckanext/example_flask_iroutes/tests/test_routes.py

  Log Message:
  -----------
  Move `find_flask_app` helper to test helpers.

  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: 8d2418fd79eb7f3afbac8e419c1bae9589297b8c
      https://github.com/ckan/ckan/commit/8d2418fd79eb7f3afbac8e419c1bae9589297b8c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py

  Log Message:
  -----------
  Merge branch 'master' into poc-flask-views

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

  Changed paths:
    M ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    M ckan/tests/helpers.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test_action.py
    M ckanext/example_flask_iroutes/tests/test_routes.py

  Log Message:
  -----------
  Merge branch 'poc-flask-views' into poc-flask-views.common-url_for

  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: 5e38a9a3acda60cdea429e7c55314c47e3c98422
      https://github.com/ckan/ckan/commit/5e38a9a3acda60cdea429e7c55314c47e3c98422
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-26 (Thu, 26 May 2016)

  Changed paths:
    M ckan/tests/helpers.py

  Log Message:
  -----------
  Provide a quick reference to the Flask app on functional tests

Wrap the webtest.TestApp in a class that provides a flask_app property
so it can be used like this:

    app = self._get_test_app()
  with app.flask_app.test_request_context():
      offset = url_for(...

  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: 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: 25982cace08b14a5f557df84aee6ada202659f4e
      https://github.com/ckan/ckan/commit/25982cace08b14a5f557df84aee6ada202659f4e
  Author: amercader <amercadero at gmail.com>
  Date:   2016-05-30 (Mon, 30 May 2016)

  Changed paths:
    M Dockerfile
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.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/templates/user/edit_user_form.html
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/test_coding_standards.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
    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
    M dev-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into poc-flask-views

Conflicts:
	dev-requirements.txt
	setup.py

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

  Changed paths:
    M Dockerfile
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/helpers.py
    M ckan/logic/schema.py
    M ckan/plugins/interfaces.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/templates/user/edit_user_form.html
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/test_pagination.py
    M ckan/tests/legacy/test_coding_standards.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
    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
    M dev-requirements.txt
    M setup.py

  Log Message:
  -----------
  Merge branch 'poc-flask-views' into poc-flask-views.common-url_for

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

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Add locale check from #3004

Compare: https://github.com/ckan/ckan/compare/ef32fd2b0182...8b20f15eb555