[ckan-changes] [ckan/ckan] 285c96: [#2199] Add permission cascading to the org list.

GitHub noreply at github.com
Sat Jun 13 10:39:59 UTC 2015


  Branch: refs/heads/make-vocabulary-dictize-faster
  Home:   https://github.com/ckan/ckan
  Commit: 285c965d83829cf645360ef15dea1ff0f0e30394
      https://github.com/ckan/ckan/commit/285c965d83829cf645360ef15dea1ff0f0e30394
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-01-09 (Fri, 09 Jan 2015)

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

  Log Message:
  -----------
  [#2199] Add permission cascading to the org list.


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

  Changed paths:
    M ckan/new_tests/controllers/test_group.py
    M ckan/templates/group/snippets/group_form.html
    M ckan/tests/legacy/functional/test_group.py

  Log Message:
  -----------
  [#2344] New-style tests for group form.


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

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

  Log Message:
  -----------
  [#2344] Develop IGroupForm. Can now edit one!


  Commit: 105c9598412a4fcfc848a6a3110b3ee6a45f7d80
      https://github.com/ckan/ckan/commit/105c9598412a4fcfc848a6a3110b3ee6a45f7d80
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M ckan/tests/legacy/functional/test_group.py
    M ckanext/example_igroupform/tests/__init__.py

  Log Message:
  -----------
  [#2344] PEP8


  Commit: 8ce8acc5b44d9d13cc84c00d98639533139a34dc
      https://github.com/ckan/ckan/commit/8ce8acc5b44d9d13cc84c00d98639533139a34dc
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

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

  Log Message:
  -----------
  [#2344] Tidier way to determine the controller.


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

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

  Log Message:
  -----------
  [#2344] Capital letter for flash message. Improved docs.


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

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

  Log Message:
  -----------
  [#2344] Get more actions working for IGroupForm.


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

  Changed paths:
    M ckanext/example_igroupform/tests/test_controllers.py

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


  Commit: 40059224a28336a3f3dc0e04059303c24b540b65
      https://github.com/ckan/ckan/commit/40059224a28336a3f3dc0e04059303c24b540b65
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M ckanext/example_igroupform/tests/test_controllers.py

  Log Message:
  -----------
  [#2344] Fix edit test.


  Commit: 70e51adb8195d27c1f9714ca70c71133e8fc906b
      https://github.com/ckan/ckan/commit/70e51adb8195d27c1f9714ca70c71133e8fc906b
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M ckan/controllers/group.py

  Log Message:
  -----------
  [#2216] Pass the group_type to templates, similar to #1795, as requested by wardi.


  Commit: 9f9b32800c8ccf214765f18491fe1be7ef647a1e
      https://github.com/ckan/ckan/commit/9f9b32800c8ccf214765f18491fe1be7ef647a1e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M ckan/model/license.py
    R ckan/tests/legacy/models/test_license.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py

  Log Message:
  -----------
  [#2110] Update license keys to match opendefinition.org.


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

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

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


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

  Changed paths:
    M ckan/controllers/user.py

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


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

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

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


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

  Changed paths:
    M ckan/controllers/user.py

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


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

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

  Log Message:
  -----------
  Improve translatability of delete message. Lose __ in names.


  Commit: 45e886274d1daace1cfd4db69b7cdc1ace878762
      https://github.com/ckan/ckan/commit/45e886274d1daace1cfd4db69b7cdc1ace878762
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-24 (Fri, 24 Apr 2015)

  Changed paths:
    M ckan/model/license.py
    M ckan/tests/model/test_license.py

  Log Message:
  -----------
  [#2110] Added backwards compatibility - the old keys are available again. Deprecation warnings added.


  Commit: 4175107da362d9719a2ed1eedd8bd4668e55f34d
      https://github.com/ckan/ckan/commit/4175107da362d9719a2ed1eedd8bd4668e55f34d
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-04-24 (Fri, 24 Apr 2015)

  Changed paths:
    M ckan/controllers/group.py
    M ckan/controllers/organization.py
    M ckan/lib/helpers.py

  Log Message:
  -----------
  [#2216] Factor out facet titles code, between GroupController and OrganizationController, for clarity.


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

  Changed paths:
    M ckan/controllers/group.py
    M ckan/lib/plugins.py

  Log Message:
  -----------
  [#2216] Pick the controller for the links based on IGroupForm registered controller for the group_type.


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

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

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

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


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

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

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

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


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

  Changed paths:
    M ckan/lib/captcha.py

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


  Commit: 5eafb87cf232de787bdfccb197fd61762c449a1d
      https://github.com/ckan/ckan/commit/5eafb87cf232de787bdfccb197fd61762c449a1d
  Author: Matt Fullerton <matt.fullerton at gmail.com>
  Date:   2015-05-02 (Sat, 02 May 2015)

  Changed paths:
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js

  Log Message:
  -----------
  Fixes #2410 by upgrading leaflet cluster plugin
This has also been done in the central recline repo


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

  Changed paths:
    M ckanext/resourceproxy/controller.py

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

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


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

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

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


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

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

  Log Message:
  -----------
  [#2421] pop package schema from context before creating views


  Commit: 9fe5450f64903f5c282e25cafb9bcbbf0f737edd
      https://github.com/ckan/ckan/commit/9fe5450f64903f5c282e25cafb9bcbbf0f737edd
  Author: pduchesne <pduchesne at gmail.com>
  Date:   2015-05-08 (Fri, 08 May 2015)

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

  Log Message:
  -----------
  fix line length


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

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  [#2238] Wrap default filters block in try/catch.

A recline view embedded in a site hosted on a different domain to the
view will not have access to the `window.parent.ckan` property. This
try/catch supresses the error, allowing the view to load and run.


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

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

  Log Message:
  -----------
  Merge branch 'pduchesne-2421-remove-schema-before-create-view'


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

  Changed paths:
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js

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


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

  Changed paths:
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js

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


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

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  Merge branch '2238-recline-embed' of https://github.com/brew/ckan into brew-2238-recline-embed


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

  Changed paths:
    M ckanext/reclineview/theme/public/recline_view.js

  Log Message:
  -----------
  Merge branch 'brew-2238-recline-embed'


  Commit: 60a7edf78ebc4d980c8caa25d5dbd6a5b7c294b6
      https://github.com/ckan/ckan/commit/60a7edf78ebc4d980c8caa25d5dbd6a5b7c294b6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-05-12 (Tue, 12 May 2015)

  Changed paths:
    M .coveragerc
    M CHANGELOG.rst
    A ckan/authz.py
    M ckan/ckan_nose_plugin.py
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware.py
    M ckan/config/resource_formats.json
    M ckan/config/routing.py
    M ckan/config/solr/schema.xml
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/cli.py
    M ckan/lib/create_test_data.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/lib/mailer.py
    M ckan/lib/plugins.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/model/user.py
    M ckan/new_authz.py
    A ckan/new_tests.py
    R ckan/new_tests/__init__.py
    R ckan/new_tests/config/__init__.py
    R ckan/new_tests/controllers/__init__.py
    R ckan/new_tests/controllers/test_api.py
    R ckan/new_tests/controllers/test_feed.py
    R ckan/new_tests/controllers/test_group.py
    R ckan/new_tests/controllers/test_package.py
    R ckan/new_tests/controllers/test_user.py
    R ckan/new_tests/controllers/test_util.py
    R ckan/new_tests/factories.py
    R ckan/new_tests/helpers.py
    R ckan/new_tests/lib/__init__.py
    R ckan/new_tests/lib/dictization/__init__.py
    R ckan/new_tests/lib/dictization/test_model_dictize.py
    R ckan/new_tests/lib/navl/__init__.py
    R ckan/new_tests/lib/navl/test_dictization_functions.py
    R ckan/new_tests/lib/navl/test_validators.py
    R ckan/new_tests/lib/search/__init__.py
    R ckan/new_tests/lib/search/test_index.py
    R ckan/new_tests/lib/test_auth_tkt.py
    R ckan/new_tests/lib/test_base.py
    R ckan/new_tests/lib/test_cli.py
    R ckan/new_tests/lib/test_config_tool.py
    R ckan/new_tests/lib/test_datapreview.py
    R ckan/new_tests/lib/test_helpers.py
    R ckan/new_tests/lib/test_munge.py
    R ckan/new_tests/logic/__init__.py
    R ckan/new_tests/logic/action/__init__.py
    R ckan/new_tests/logic/action/test_create.py
    R ckan/new_tests/logic/action/test_delete.py
    R ckan/new_tests/logic/action/test_get.py
    R ckan/new_tests/logic/action/test_patch.py
    R ckan/new_tests/logic/action/test_update.py
    R ckan/new_tests/logic/auth/__init__.py
    R ckan/new_tests/logic/auth/test_create.py
    R ckan/new_tests/logic/auth/test_delete.py
    R ckan/new_tests/logic/auth/test_get.py
    R ckan/new_tests/logic/auth/test_init.py
    R ckan/new_tests/logic/auth/test_update.py
    R ckan/new_tests/logic/test_conversion.py
    R ckan/new_tests/logic/test_converters.py
    R ckan/new_tests/logic/test_schema.py
    R ckan/new_tests/logic/test_validators.py
    R ckan/new_tests/migration/__init__.py
    R ckan/new_tests/model/__init__.py
    R ckan/new_tests/model/test_resource.py
    R ckan/new_tests/model/test_resource_view.py
    R ckan/new_tests/model/test_user.py
    R ckan/new_tests/plugins/__init__.py
    R ckan/new_tests/test_authz.py
    R ckan/new_tests/test_coding_standards.py
    R ckan/new_tests/test_factories.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/javascript/client.js
    M ckan/public/base/less/masthead.less
    M ckan/templates/admin/base.html
    M ckan/templates/header.html
    M ckan/templates/home/snippets/stats.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/snippets/user_search.html
    M ckan/tests/__init__.py
    A ckan/tests/config/__init__.py
    A ckan/tests/config/test_middleware.py
    A ckan/tests/controllers/__init__.py
    A ckan/tests/controllers/test_api.py
    A ckan/tests/controllers/test_feed.py
    A ckan/tests/controllers/test_group.py
    A ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_user.py
    A ckan/tests/controllers/test_util.py
    A ckan/tests/factories.py
    R ckan/tests/functional/__init__.py
    R ckan/tests/functional/api/base.py
    R ckan/tests/functional/base.py
    A ckan/tests/helpers.py
    M ckan/tests/legacy/functional/api/test_user.py
    M ckan/tests/legacy/logic/test_auth.py
    M ckan/tests/legacy/test_coding_standards.py
    M ckan/tests/legacy/test_plugins.py
    A ckan/tests/lib/__init__.py
    A ckan/tests/lib/dictization/__init__.py
    A ckan/tests/lib/dictization/test_model_dictize.py
    A ckan/tests/lib/navl/__init__.py
    A ckan/tests/lib/navl/test_dictization_functions.py
    A ckan/tests/lib/navl/test_validators.py
    A ckan/tests/lib/search/__init__.py
    A ckan/tests/lib/search/test_index.py
    A ckan/tests/lib/test_auth_tkt.py
    A ckan/tests/lib/test_base.py
    A ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_config_tool.py
    A ckan/tests/lib/test_datapreview.py
    A ckan/tests/lib/test_helpers.py
    A ckan/tests/lib/test_munge.py
    A ckan/tests/logic/__init__.py
    A ckan/tests/logic/action/__init__.py
    A ckan/tests/logic/action/test_create.py
    A ckan/tests/logic/action/test_delete.py
    A ckan/tests/logic/action/test_get.py
    A ckan/tests/logic/action/test_patch.py
    A ckan/tests/logic/action/test_update.py
    A ckan/tests/logic/auth/__init__.py
    A ckan/tests/logic/auth/test_create.py
    A ckan/tests/logic/auth/test_delete.py
    A ckan/tests/logic/auth/test_get.py
    A ckan/tests/logic/auth/test_init.py
    A ckan/tests/logic/auth/test_update.py
    A ckan/tests/logic/test_conversion.py
    A ckan/tests/logic/test_converters.py
    A ckan/tests/logic/test_schema.py
    A ckan/tests/logic/test_validators.py
    A ckan/tests/migration/__init__.py
    A ckan/tests/model/__init__.py
    A ckan/tests/model/test_resource.py
    A ckan/tests/model/test_resource_view.py
    A ckan/tests/model/test_user.py
    A ckan/tests/plugins/__init__.py
    A ckan/tests/test_authz.py
    A ckan/tests/test_coding_standards.py
    A ckan/tests/test_factories.py
    M ckanext/datapusher/tests/test_default_views.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_db.py
    M ckanext/datastore/tests/test_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/example_iauthfunctions/tests/test_example_iauthfunctions.py
    A ckanext/example_iconfigurer/__init__.py
    A ckanext/example_iconfigurer/controller.py
    A ckanext/example_iconfigurer/plugin.py
    A ckanext/example_iconfigurer/templates/admin/myext_config.html
    A ckanext/example_iconfigurer/tests/__init__.py
    A ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
    A ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py
    M ckanext/example_idatasetform/tests/test_controllers.py
    M ckanext/example_idatasetform/tests/test_example_idatasetform.py
    M ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py
    M ckanext/imageview/tests/test_view.py
    M ckanext/reclineview/tests/test_view.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/resource.config
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.css
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/MarkerCluster.min.css
    M ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.js
    R ckanext/reclineview/theme/public/vendor/leaflet.markercluster/leaflet.markercluster.min.js
    M ckanext/webpageview/tests/test_view.py
    M doc/contributing/testing.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 2344-igroupform

Conflicts:
	ckan/controllers/group.py


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

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

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


  Commit: 20a9f74bdfa32947c659094a359584183ce589a7
      https://github.com/ckan/ckan/commit/20a9f74bdfa32947c659094a359584183ce589a7
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

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

  Log Message:
  -----------
  Merge branch '2199-org-list-hierarchy'


  Commit: 269ddc079e2c16dec9109bc2e834b768c29f2501
      https://github.com/ckan/ckan/commit/269ddc079e2c16dec9109bc2e834b768c29f2501
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#2199] changelog for #2199


  Commit: 20f4332f295fd719abf02dcf8667e494ad4ab381
      https://github.com/ckan/ckan/commit/20f4332f295fd719abf02dcf8667e494ad4ab381
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M ckan/model/license.py
    R ckan/tests/legacy/models/test_license.py
    A ckan/tests/model/licenses.v1
    A ckan/tests/model/licenses.v2
    A ckan/tests/model/test_license.py

  Log Message:
  -----------
  Merge branch '2110-license-keys'


  Commit: b095f82cab1e527c569626040f3b0dd1a4d3acd1
      https://github.com/ckan/ckan/commit/b095f82cab1e527c569626040f3b0dd1a4d3acd1
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  [#2110] Update changelog.


  Commit: 078cb28f4b2433bd5a82b8edac90b5f3517225a1
      https://github.com/ckan/ckan/commit/078cb28f4b2433bd5a82b8edac90b5f3517225a1
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

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

  Log Message:
  -----------
  [#2199] change new_auth to authz


  Commit: 56100e77d856dfac17519efcd4bc76550cc35c5b
      https://github.com/ckan/ckan/commit/56100e77d856dfac17519efcd4bc76550cc35c5b
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2015-05-14 (Thu, 14 May 2015)

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

  Log Message:
  -----------
  Merge pull request #2428 from ckan/2199-fix-for-authz

fix master from bad merge of 2199


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

  Changed paths:
    M ckan/config/environment.py
    A ckan/tests/config/test_environment.py

  Log Message:
  -----------
  [#2429] Config options set from env vars.

A whitelist of config options that can be set from env vars, currently:

    'sqlalchemy.url': 'CKAN_SQLALCHEMY_URL'
    'ckan.datastore.write_url': 'CKAN_DATASTORE_WRITE_URL'
    'ckan.datastore.read_url': 'CKAN_DATASTORE_READ_URL'
    'solr_url': 'CKAN_SOLR_URL'
    'ckan.site_id': 'CKAN_SITE_ID'

These are set after the config is read from the .ini file and after
plugins have had an opportunity to update the config, but before
app_globals are set from the database.


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

  Changed paths:
    M ckan/tests/config/test_environment.py

  Log Message:
  -----------
  [#2429] Test teardown removes env vars


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

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

  Log Message:
  -----------
  [#2429] Deprecate warning for CKAN_DB env var


  Commit: 27aeccc8c47892349548476bf87bf7b98d344227
      https://github.com/ckan/ckan/commit/27aeccc8c47892349548476bf87bf7b98d344227
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-19 (Tue, 19 May 2015)

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

  Log Message:
  -----------
  [#2429] Email settings exposed to env vars


  Commit: 2db129a4c04df6c0099d4d12a33a90d8e05ddb59
      https://github.com/ckan/ckan/commit/2db129a4c04df6c0099d4d12a33a90d8e05ddb59
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ckan/config/environment.py

  Log Message:
  -----------
  [#2429] Better name for the config/envvar mapping


  Commit: 71565cbc0c3d9907f7660f1439301e6d8b6152c2
      https://github.com/ckan/ckan/commit/71565cbc0c3d9907f7660f1439301e6d8b6152c2
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ckan/tests/config/test_environment.py

  Log Message:
  -----------
  [#2429] Fix typo


  Commit: 0f145a54629287a6f7764b8fd73963bda62260ef
      https://github.com/ckan/ckan/commit/0f145a54629287a6f7764b8fd73963bda62260ef
  Author: amercader <amercadero at gmail.com>
  Date:   2015-05-19 (Tue, 19 May 2015)

  Changed paths:
    M ckan/config/environment.py
    A ckan/tests/config/test_environment.py

  Log Message:
  -----------
  Merge branch '2429-config-env-var'


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

  Changed paths:
    M ckan/logic/validators.py

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

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


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

  Changed paths:
    M ckan/logic/validators.py

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


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

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

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


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

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

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

Fix typo in db pass configuration


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

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

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

Conflicts:
	ckan/tests/controllers/test_user.py


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

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

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


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

  Changed paths:
    M ckanext/resourceproxy/controller.py

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


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

  Changed paths:
    M ckanext/resourceproxy/controller.py

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


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

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

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


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

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

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

Fix broken boolean validator


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

  Changed paths:
    M requirements.in
    M requirements.txt

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


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

  Changed paths:
    M requirements.in
    M requirements.txt

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

Upgrade beaker requirement


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

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

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

Conflicts:
	CHANGELOG.rst


Compare: https://github.com/ckan/ckan/compare/90d0ddd8020f...1b3b7133eee8


More information about the ckan-changes mailing list