[ckan-changes] [ckan/ckan] 878a15: [#1943] Add timeout and reissue_time to who.ini

GitHub noreply at github.com
Fri Nov 21 17:06:32 UTC 2014 

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 878a15bf374c07af3b94f66215c5743ac798b041
      https://github.com/ckan/ckan/commit/878a15bf374c07af3b94f66215c5743ac798b041
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/who.ini

  Log Message:
  -----------
  [#1943] Add timeout and reissue_time to who.ini


  Commit: 6bf47f4b898ec023ab564642be67eb9dc0fd6897
      https://github.com/ckan/ckan/commit/6bf47f4b898ec023ab564642be67eb9dc0fd6897
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/middleware.py

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


  Commit: 679ff0ddf52c2ea2b2c7e99e3ca6df20d631067c
      https://github.com/ckan/ckan/commit/679ff0ddf52c2ea2b2c7e99e3ca6df20d631067c
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/middleware.py
    M ckan/config/who.ini
    A ckan/new_tests/config/__init__.py
    A ckan/new_tests/config/test_middleware.py

  Log Message:
  -----------
  [#1943] Set timeout and reissue_time from config.

Can set the session timeout and reissue_time from the config file if
these aren't provided by who.ini. New config settings:

who.timeout
who.reissue_time


  Commit: cae923973a95ab4df07fc17d08de0b3e3a2159ff
      https://github.com/ckan/ckan/commit/cae923973a95ab4df07fc17d08de0b3e3a2159ff
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#1943] Add settings to development template


  Commit: f2aa14cad83679d8e9a2e7b91361796fd466a4ba
      https://github.com/ckan/ckan/commit/f2aa14cad83679d8e9a2e7b91361796fd466a4ba
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl

  Log Message:
  -----------
  [#1943] Remove who.reissue_time from dev template.

This provides too fine-grained control for most users. So leaving it out
of the template (though leaving use of the setting in the code).


  Commit: a3ff6fe2a203dce72bc7b9a7c6827f0ee22441e8
      https://github.com/ckan/ckan/commit/a3ff6fe2a203dce72bc7b9a7c6827f0ee22441e8
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1943] Add session timeout to docs


  Commit: 3ba87f8e5f9604ce20ba2c62942d46692a41f38d
      https://github.com/ckan/ckan/commit/3ba87f8e5f9604ce20ba2c62942d46692a41f38d
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-29 (Wed, 29 Oct 2014)

  Changed paths:
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1943] Fix malformed link is docs


  Commit: 70ca1e60e62f65624f43b8f07d6c581ac1169c0a
      https://github.com/ckan/ckan/commit/70ca1e60e62f65624f43b8f07d6c581ac1169c0a
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/who.ini
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  [#1943] Inactive by default (non-expiring)


  Commit: a8870394df52d91d6b7b36759f21ff987100011e
      https://github.com/ckan/ckan/commit/a8870394df52d91d6b7b36759f21ff987100011e
  Author: jqnatividad <joel.natividad at ontodia.com>
  Date:   2014-11-12 (Wed, 12 Nov 2014)

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Fix python example in Data API window

Fixes #20146


  Commit: f0955ea8ea1a9c5abf8a1b5243da1eb7f173c3c4
      https://github.com/ckan/ckan/commit/f0955ea8ea1a9c5abf8a1b5243da1eb7f173c3c4
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-14 (Fri, 14 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/routing.py
    M ckan/config/who.ini
    M ckan/controllers/revision.py
    M ckan/lib/base.py
    M ckan/lib/create_test_data.py
    M ckan/lib/datapreview.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/dictization/model_save.py
    R ckan/lib/field_types.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/auth/update.py
    M ckan/logic/converters.py
    M ckan/logic/schema.py
    A ckan/migration/versions/074_remove_resource_groups.py
    M ckan/model/__init__.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/dictization/__init__.py
    M ckan/new_tests/lib/dictization/test_model_dictize.py
    A ckan/new_tests/lib/test_base.py
    M ckan/new_tests/logic/action/test_create.py
    A ckan/new_tests/logic/action/test_delete.py
    M ckan/new_tests/logic/action/test_get.py
    M ckan/new_tests/logic/auth/test_create.py
    A ckan/new_tests/logic/auth/test_delete.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/css/main.css
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/less/ckan.less
    M ckan/public/base/less/dataset.less
    R ckan/public/base/less/resource-view-embed.less
    M ckan/public/base/less/toolbar.less
    M ckan/public/scripts/application.js
    M ckan/templates/macros/form.html
    M ckan/templates/package/resource_read.html
    M ckan/templates/package/resource_views.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/resource_view.html
    M ckan/templates/package/snippets/resource_views_list.html
    M ckan/templates/package/snippets/resource_views_list_item.html
    M ckan/templates/snippets/group_item.html
    R ckan/templates_legacy/__init__.py
    R ckan/templates_legacy/_snippet/data-api-help.html
    R ckan/templates_legacy/_util.html
    R ckan/templates_legacy/activity_streams/activity_stream_items.html
    R ckan/templates_legacy/admin/authz.html
    R ckan/templates_legacy/admin/index.html
    R ckan/templates_legacy/admin/layout.html
    R ckan/templates_legacy/admin/trash.html
    R ckan/templates_legacy/error_document_template.html
    R ckan/templates_legacy/facets.html
    R ckan/templates_legacy/group/__init__.py
    R ckan/templates_legacy/group/authz.html
    R ckan/templates_legacy/group/edit.html
    R ckan/templates_legacy/group/edit_form.html
    R ckan/templates_legacy/group/history.html
    R ckan/templates_legacy/group/index.html
    R ckan/templates_legacy/group/layout.html
    R ckan/templates_legacy/group/new.html
    R ckan/templates_legacy/group/new_group_form.html
    R ckan/templates_legacy/group/read.html
    R ckan/templates_legacy/home/__init__.py
    R ckan/templates_legacy/home/about.html
    R ckan/templates_legacy/home/index.html
    R ckan/templates_legacy/home/layout.html
    R ckan/templates_legacy/importer/__init__.py
    R ckan/templates_legacy/importer/importer.html
    R ckan/templates_legacy/importer/preview.html
    R ckan/templates_legacy/importer/result.html
    R ckan/templates_legacy/js_strings.html
    R ckan/templates_legacy/layout.html
    R ckan/templates_legacy/layout_base.html
    R ckan/templates_legacy/package/__init__.py
    R ckan/templates_legacy/package/authz.html
    R ckan/templates_legacy/package/comments.html
    R ckan/templates_legacy/package/edit.html
    R ckan/templates_legacy/package/edit_form.html
    R ckan/templates_legacy/package/editresources.html
    R ckan/templates_legacy/package/followers.html
    R ckan/templates_legacy/package/form.html
    R ckan/templates_legacy/package/form_extra_fields.html
    R ckan/templates_legacy/package/form_fields.html
    R ckan/templates_legacy/package/form_resources.html
    R ckan/templates_legacy/package/history.html
    R ckan/templates_legacy/package/layout.html
    R ckan/templates_legacy/package/new.html
    R ckan/templates_legacy/package/new_package_form.html
    R ckan/templates_legacy/package/read.html
    R ckan/templates_legacy/package/read.n3
    R ckan/templates_legacy/package/read.rdf
    R ckan/templates_legacy/package/read_core.html
    R ckan/templates_legacy/package/resource_embedded_dataviewer.html
    R ckan/templates_legacy/package/resource_read.html
    R ckan/templates_legacy/package/resources.html
    R ckan/templates_legacy/package/search.html
    R ckan/templates_legacy/package/search_form.html
    R ckan/templates_legacy/package/snippets/data_preview.html
    R ckan/templates_legacy/related/add-related.html
    R ckan/templates_legacy/related/dashboard.html
    R ckan/templates_legacy/related/related_list.html
    R ckan/templates_legacy/rest/__init__.py
    R ckan/templates_legacy/revision/__init__.py
    R ckan/templates_legacy/revision/diff.html
    R ckan/templates_legacy/revision/layout.html
    R ckan/templates_legacy/revision/list.html
    R ckan/templates_legacy/revision/read.html
    R ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
    R ckan/templates_legacy/snippets/data-viewer-embed-dialog.html
    R ckan/templates_legacy/snippets/follow_button.html
    R ckan/templates_legacy/snippets/internal-tracking.html
    R ckan/templates_legacy/snippets/package_list.html
    R ckan/templates_legacy/snippets/recline-extra-footer.html
    R ckan/templates_legacy/snippets/recline-extra-header.html
    R ckan/templates_legacy/snippets/revision_list.html
    R ckan/templates_legacy/storage/index.html
    R ckan/templates_legacy/storage/success.html
    R ckan/templates_legacy/tag/__init__.py
    R ckan/templates_legacy/tag/index.html
    R ckan/templates_legacy/tag/layout.html
    R ckan/templates_legacy/tag/read.html
    R ckan/templates_legacy/user/__init__.py
    R ckan/templates_legacy/user/dashboard.html
    R ckan/templates_legacy/user/edit.html
    R ckan/templates_legacy/user/edit_user_form.html
    R ckan/templates_legacy/user/followers.html
    R ckan/templates_legacy/user/layout.html
    R ckan/templates_legacy/user/list.html
    R ckan/templates_legacy/user/login.html
    R ckan/templates_legacy/user/logout.html
    R ckan/templates_legacy/user/logout_first.html
    R ckan/templates_legacy/user/new.html
    R ckan/templates_legacy/user/new_user_form.html
    R ckan/templates_legacy/user/perform_reset.html
    R ckan/templates_legacy/user/read.html
    R ckan/templates_legacy/user/request_reset.html
    M ckan/tests/functional/test_activity.py
    M ckan/tests/functional/test_admin.py
    R ckan/tests/functional/test_cors.py
    R ckan/tests/functional/test_follow.py
    M ckan/tests/functional/test_group.py
    M ckan/tests/functional/test_home.py
    M ckan/tests/functional/test_package.py
    R ckan/tests/functional/test_package_relationships.py
    M ckan/tests/functional/test_revision.py
    R ckan/tests/functional/test_search.py
    M ckan/tests/functional/test_tag.py
    R ckan/tests/functional/test_tag_vocab.py
    R ckan/tests/functional/test_upload.py
    M ckan/tests/functional/test_user.py
    M ckan/tests/lib/test_dictization.py
    R ckan/tests/lib/test_field_types.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/models/test_package.py
    M ckan/tests/models/test_resource.py
    M ckan/tests/test_coding_standards.py
    M ckan/tests/test_plugins.py
    M ckanext/datastore/db.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/schema.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_search.py
    M ckanext/multilingual/tests/test_multilingual_plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/stats/tests/test_stats_plugin.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/getting-started.rst
    M requirements.in
    M requirements.txt

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

... into 1943-session-timeout

Conflicts:
	ckan/config/who.ini


  Commit: 3b87cc0ecf9213c43f7e2a02bf8203ab51d0a0ec
      https://github.com/ckan/ckan/commit/3b87cc0ecf9213c43f7e2a02bf8203ab51d0a0ec
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Fixes #2007

In the plugins before_show the datastore_active flag in the resource
dict would not be set if the sql query generated an exception.  This had
implications with pg 8.4 where the flag was not present because of a
query failure, but it was checked for in tests.

Have set the default to false and just overwrite it if the query does
not explode and if it returns a result.


  Commit: 47e5d9bdccec6d2ec0db47350e5b464cb0f3ca7c
      https://github.com/ckan/ckan/commit/47e5d9bdccec6d2ec0db47350e5b464cb0f3ca7c
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    A ckan/lib/auth_tkt.py
    M ckan/lib/cli.py
    R ckan/lib/package_saver.py
    M ckan/lib/plugins.py
    M ckan/new_authz.py
    M ckan/new_tests/helpers.py
    A ckan/new_tests/lib/test_auth_tkt.py
    A ckan/new_tests/test_authz.py
    M ckan/pastertemplates/__init__.py
    A ckan/pastertemplates/template/+dot+coveragerc_tmpl
    A ckan/pastertemplates/template/+dot+gitignore_tmpl
    A ckan/pastertemplates/template/+dot+travis.yml_tmpl
    A ckan/pastertemplates/template/LICENSE_tmpl
    A ckan/pastertemplates/template/MANIFEST.in_tmpl
    A ckan/pastertemplates/template/README.rst_tmpl
    A ckan/pastertemplates/template/bin/travis-build.bash_tmpl
    A ckan/pastertemplates/template/bin/travis-run.sh_tmpl
    R ckan/pastertemplates/template/ckanext/+project+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/fanstatic/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/plugin.py_tmpl
    A ckan/pastertemplates/template/ckanext/+project_shortname+/public/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/templates/+dot+gitignore
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/__init__.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/tests/test_plugin.py_tmpl
    M ckan/pastertemplates/template/ckanext/__init__.py
    R ckan/pastertemplates/template/ckanext_+project+.egg-info/.gitignore
    A ckan/pastertemplates/template/ckanext_+project_shortname+.egg-info/.gitignore
    A ckan/pastertemplates/template/dev-requirements.txt_tmpl
    M ckan/pastertemplates/template/setup.py_tmpl
    A ckan/pastertemplates/template/test.ini_tmpl
    M ckan/templates/package/read_base.html
    M ckan/tests/functional/api/test_user.py
    M ckan/tests/logic/test_auth.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M doc/maintaining/configuration.rst
    M doc/maintaining/paster.rst

  Log Message:
  -----------
  Merge branch 'master' into 1943-session-timeout

Conflicts:
	ckan/config/middleware.py
	doc/maintaining/configuration.rst


  Commit: 296c3b2e31334ca0b193b45652f28142260c78f4
      https://github.com/ckan/ckan/commit/296c3b2e31334ca0b193b45652f28142260c78f4
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/config/who.ini

  Log Message:
  -----------
  [#1943] Removed example config from who.ini.

All config should be centralized to the .ini files.


  Commit: c260d58387167c660c4981b0305d514693064e20
      https://github.com/ckan/ckan/commit/c260d58387167c660c4981b0305d514693064e20
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-20 (Thu, 20 Nov 2014)

  Changed paths:
    M ckan/lib/auth_tkt.py
    R ckan/new_tests/config/test_middleware.py
    M ckan/new_tests/lib/test_auth_tkt.py

  Log Message:
  -----------
  [#1943] Move session config to lib/auth_tkt


  Commit: a1ea85f82deb102bd8d798ac952e40d38b22cedc
      https://github.com/ckan/ckan/commit/a1ea85f82deb102bd8d798ac952e40d38b22cedc
  Author: Brook Elgie <specialbrew at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  [#2075] Upgrade zope.interface to 4.1.1


  Commit: 8a77df49f664cc5dc836891b0ce77269a055ff8a
      https://github.com/ckan/ckan/commit/8a77df49f664cc5dc836891b0ce77269a055ff8a
  Author: Ross Jones <ross at servercode.co.uk>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Fixes the problem finding development.ini

Unfortunately the code forgot to use os.cwd() to  ensure config was
loaded with an absolute path, and was trying to load it relative without
knowing from where.


  Commit: 943bbb0aea93b0f266a5badcfc6ba04d49a04d2b
      https://github.com/ckan/ckan/commit/943bbb0aea93b0f266a5badcfc6ba04d49a04d2b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Merge branch '1597-fix-using-development-ini'


  Commit: 4894163f398fc5b373109dbb04dfe47b22533b11
      https://github.com/ckan/ckan/commit/4894163f398fc5b373109dbb04dfe47b22533b11
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch '2075-upgrade-zope-interfaces' of https://github.com/brew/ckan into brew-2075-upgrade-zope-interfaces


  Commit: 28487c1034340b0b7a20ab857b43290068f429b5
      https://github.com/ckan/ckan/commit/28487c1034340b0b7a20ab857b43290068f429b5
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M requirements.in
    M requirements.txt

  Log Message:
  -----------
  Merge branch 'brew-2075-upgrade-zope-interfaces'


  Commit: edfc60695e8e452883459f749fd7030ce64515a8
      https://github.com/ckan/ckan/commit/edfc60695e8e452883459f749fd7030ce64515a8
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/lib/auth_tkt.py
    A ckan/new_tests/config/__init__.py
    M ckan/new_tests/lib/test_auth_tkt.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch '1943-session-timeout' of https://github.com/brew/ckan into brew-1943-session-timeout


  Commit: ed23158018b00a3547d64f5cbab059f175305d65
      https://github.com/ckan/ckan/commit/ed23158018b00a3547d64f5cbab059f175305d65
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware.py
    M ckan/config/who.ini
    M ckan/lib/auth_tkt.py
    A ckan/new_tests/config/__init__.py
    M ckan/new_tests/lib/test_auth_tkt.py
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'brew-1943-session-timeout'


  Commit: 2af578cf29302edcd7a27f78a54d21bd5518fd65
      https://github.com/ckan/ckan/commit/2af578cf29302edcd7a27f78a54d21bd5518fd65
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckanext/datastore/plugin.py

  Log Message:
  -----------
  Merge branch '2007-datastore-active-fix'


  Commit: ebdbe1ee877b4a14d67fe93ee3ee59370b2a9d8a
      https://github.com/ckan/ckan/commit/ebdbe1ee877b4a14d67fe93ee3ee59370b2a9d8a
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Merge branch '2046-python-example' of https://github.com/jqnatividad/ckan into jqnatividad-2046-python-example


  Commit: ff3cf1bee313793e9a2cf205ee85069e1e3ecb8c
      https://github.com/ckan/ckan/commit/ff3cf1bee313793e9a2cf205ee85069e1e3ecb8c
  Author: amercader <amercadero at gmail.com>
  Date:   2014-11-21 (Fri, 21 Nov 2014)

  Changed paths:
    M ckan/templates/ajax_snippets/api_info.html

  Log Message:
  -----------
  Merge branch 'jqnatividad-2046-python-example'


Compare: https://github.com/ckan/ckan/compare/479be73fe26e...ff3cf1bee313

More information about the ckan-changes mailing list