[ckan-changes] [ckan/ckan] 6e5fa2: [#3196] Common session object using LocalProxy

Wed Feb 22 12:22:44 UTC 2017

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 6e5fa2b93bd27b046bae078f6d4913643f88c40c
      https://github.com/ckan/ckan/commit/6e5fa2b93bd27b046bae078f6d4913643f88c40c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-18 (Thu, 18 Aug 2016)

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

  Log Message:
  -----------
  [#3196] Common session object using LocalProxy

  Commit: a64ebbab4c5834d49fb6a6c1dba7f777ccc4a1f1
      https://github.com/ckan/ckan/commit/a64ebbab4c5834d49fb6a6c1dba7f777ccc4a1f1
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-18 (Thu, 18 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3196] Use Beaker as the Flask Session interface

To allow support both on Pylons and Flask.

Full credit to @brew (d4367d4 and 28bc9c4)

  Commit: 0daf144dd83692d5e1bac58c5f9daf6634071216
      https://github.com/ckan/ckan/commit/0daf144dd83692d5e1bac58c5f9daf6634071216
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-18 (Thu, 18 Aug 2016)

  Changed paths:
    A ckan/templates/tests/flash_messages.html
    A ckan/tests/config/test_sessions.py
    M setup.py

  Log Message:
  -----------
  [#3196] Add tests for common sessions support

  Commit: f7102f8fd2521109726c2d54835c98a95c4de480
      https://github.com/ckan/ckan/commit/f7102f8fd2521109726c2d54835c98a95c4de480
  Author: amercader <amercadero at gmail.com>
  Date:   2016-08-19 (Fri, 19 Aug 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/tests/config/test_middleware.py

  Log Message:
  -----------
  [#3196] Add Fanstatic middleware to Flask

Hopefully just temporarily until we can replace it with something
better. This will be tested further on went the url_for stuff is
avaiable as well.

Changed wrong reference in a test

  Commit: c6d3bbc01d3436a1b98103f2ad9f92de6af0d613
      https://github.com/ckan/ckan/commit/c6d3bbc01d3436a1b98103f2ad9f92de6af0d613
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/feed.py
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/lib/render.py
    M ckan/lib/search/__init__.py
    R ckan/lib/search/sql.py
    M ckan/public/base/vendor/moment-with-locales.js
    M ckan/tests/controllers/test_feed.py
    R ckan/tests/legacy/lib/test_simple_search.py
    M ckanext/datapusher/cli.py
    M ckanext/example_theme/custom_config_setting/plugin.py
    M ckanext/example_theme/custom_emails/tests.py
    M ckanext/reclineview/plugin.py
    M ckanext/reclineview/theme/templates/recline_view.html
    M doc/contributing/architecture.rst
    M doc/contributing/test.rst
    A doc/images/architecture.png
    A doc/images/architecture.svg
    M doc/maintaining/configuration.rst

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-session

Conflicts:
	ckan/config/middleware/flask_app.py

  Commit: 1f421fd8bd052aab568de27c5f3b966b07c5b41d
      https://github.com/ckan/ckan/commit/1f421fd8bd052aab568de27c5f3b966b07c5b41d
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-15 (Thu, 15 Sep 2016)

  Changed paths:
    M ckan/controllers/feed.py

  Log Message:
  -----------
  [#3196] Fix bad merge conflict

  Commit: 994910e0442b8e2ec9325e7f3214d3fcb902eef6
      https://github.com/ckan/ckan/commit/994910e0442b8e2ec9325e7f3214d3fcb902eef6
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    R ckan/config/solr/schema-1.2.xml
    R ckan/config/solr/schema-1.3.xml
    R ckan/config/solr/schema-1.4.xml
    R ckan/config/solr/schema-2.0.xml
    M ckan/config/solr/schema.xml
    A ckan/config/supervisor-ckan-worker.conf
    M ckan/controllers/package.py
    M ckan/controllers/util.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/formatters.py
    M ckan/lib/helpers.py
    A ckan/lib/jobs.py
    M ckan/lib/plugins.py
    A ckan/lib/redis.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/index.py
    M ckan/lib/search/query.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/delete.py
    M ckan/logic/auth/get.py
    M ckan/logic/schema.py
    A ckan/migration/versions/085_adjust_activity_timestamps.py
    M ckan/model/activity.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/controllers/test_tags.py
    M ckan/tests/controllers/test_util.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/test_user.py
    M ckan/tests/lib/test_cli.py
    A ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/plugin.py
    M ckanext/example_igroupform/tests/test_controllers.py
    A ckanext/example_ipermissionlabels/__init__.py
    A ckanext/example_ipermissionlabels/plugin.py
    A ckanext/example_ipermissionlabels/tests/__init__.py
    A ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py
    M doc/api/index.rst
    M doc/contributing/architecture.rst
    M doc/contributing/test.rst
    M doc/extensions/best-practices.rst
    M doc/extensions/custom-config-settings.rst
    M doc/extensions/plugins-toolkit.rst
    M doc/maintaining/authorization.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/configuration.rst
    M doc/maintaining/installing/deployment.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    M doc/maintaining/paster.rst
    M doc/theming/best-practices.rst
    M doc/theming/javascript.rst
    M doc/theming/templates.rst
    M requirements.in
    M requirements.txt
    M setup.py
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-session

Conflicts:
	ckan/plugins/interfaces.py

  Commit: 5a74aff36843cedf2b7ffdb725392180586c9083
      https://github.com/ckan/ckan/commit/5a74aff36843cedf2b7ffdb725392180586c9083
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M ckan/config/middleware/flask_app.py
    M ckan/plugins/interfaces.py

  Log Message:
  -----------
  [#3196] Add IMiddleware hooks to Flask stack

Clarify what app will you get on the interface docstrings

Conflicts:
	ckan/plugins/interfaces.py

  Commit: b2f207bedc3c5f0bb40c3c95213fab5325e2fec1
      https://github.com/ckan/ckan/commit/b2f207bedc3c5f0bb40c3c95213fab5325e2fec1
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

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

  Log Message:
  -----------
  [#3196] Import common redirect function in tests

  Commit: 89a95363392179e65ff56e0c502c375045c47ada
      https://github.com/ckan/ckan/commit/89a95363392179e65ff56e0c502c375045c47ada
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-05 (Thu, 05 Jan 2017)

  Changed paths:
    M .gitattributes
    M CHANGELOG.rst
    M Dockerfile
    M ckan/config/deployment.ini_tmpl
    M ckan/config/environment.py
    M ckan/config/middleware/__init__.py
    M ckan/config/middleware/flask_app.py
    M ckan/config/routing.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/template.py
    M ckan/controllers/user.py
    M ckan/i18n/ar/LC_MESSAGES/ckan.mo
    M ckan/i18n/ar/LC_MESSAGES/ckan.po
    M ckan/i18n/bg/LC_MESSAGES/ckan.mo
    M ckan/i18n/bg/LC_MESSAGES/ckan.po
    M ckan/i18n/ca/LC_MESSAGES/ckan.mo
    M ckan/i18n/ca/LC_MESSAGES/ckan.po
    M ckan/i18n/check_po_files.py
    M ckan/i18n/ckan.pot
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
    M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
    M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
    M ckan/i18n/de/LC_MESSAGES/ckan.mo
    M ckan/i18n/de/LC_MESSAGES/ckan.po
    M ckan/i18n/el/LC_MESSAGES/ckan.mo
    M ckan/i18n/el/LC_MESSAGES/ckan.po
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
    M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
    M ckan/i18n/es/LC_MESSAGES/ckan.mo
    M ckan/i18n/es/LC_MESSAGES/ckan.po
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
    M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
    M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
    M ckan/i18n/fi/LC_MESSAGES/ckan.mo
    M ckan/i18n/fi/LC_MESSAGES/ckan.po
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/i18n/he/LC_MESSAGES/ckan.mo
    M ckan/i18n/he/LC_MESSAGES/ckan.po
    M ckan/i18n/hr/LC_MESSAGES/ckan.mo
    M ckan/i18n/hr/LC_MESSAGES/ckan.po
    M ckan/i18n/hu/LC_MESSAGES/ckan.mo
    M ckan/i18n/hu/LC_MESSAGES/ckan.po
    M ckan/i18n/id/LC_MESSAGES/ckan.mo
    M ckan/i18n/id/LC_MESSAGES/ckan.po
    M ckan/i18n/is/LC_MESSAGES/ckan.mo
    M ckan/i18n/is/LC_MESSAGES/ckan.po
    M ckan/i18n/it/LC_MESSAGES/ckan.mo
    M ckan/i18n/it/LC_MESSAGES/ckan.po
    M ckan/i18n/ja/LC_MESSAGES/ckan.mo
    M ckan/i18n/ja/LC_MESSAGES/ckan.po
    M ckan/i18n/km/LC_MESSAGES/ckan.mo
    M ckan/i18n/km/LC_MESSAGES/ckan.po
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
    M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
    M ckan/i18n/lt/LC_MESSAGES/ckan.mo
    M ckan/i18n/lt/LC_MESSAGES/ckan.po
    M ckan/i18n/lv/LC_MESSAGES/ckan.mo
    M ckan/i18n/lv/LC_MESSAGES/ckan.po
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
    M ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po
    M ckan/i18n/nl/LC_MESSAGES/ckan.mo
    M ckan/i18n/nl/LC_MESSAGES/ckan.po
    M ckan/i18n/no/LC_MESSAGES/ckan.mo
    M ckan/i18n/no/LC_MESSAGES/ckan.po
    M ckan/i18n/pl/LC_MESSAGES/ckan.mo
    M ckan/i18n/pl/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
    M ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
    M ckan/i18n/ro/LC_MESSAGES/ckan.mo
    M ckan/i18n/ro/LC_MESSAGES/ckan.po
    M ckan/i18n/ru/LC_MESSAGES/ckan.mo
    M ckan/i18n/ru/LC_MESSAGES/ckan.po
    M ckan/i18n/sk/LC_MESSAGES/ckan.mo
    M ckan/i18n/sk/LC_MESSAGES/ckan.po
    M ckan/i18n/sl/LC_MESSAGES/ckan.mo
    M ckan/i18n/sl/LC_MESSAGES/ckan.po
    M ckan/i18n/sq/LC_MESSAGES/ckan.mo
    M ckan/i18n/sq/LC_MESSAGES/ckan.po
    M ckan/i18n/sr/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr/LC_MESSAGES/ckan.po
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
    M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
    M ckan/i18n/sv/LC_MESSAGES/ckan.mo
    M ckan/i18n/sv/LC_MESSAGES/ckan.po
    M ckan/i18n/th/LC_MESSAGES/ckan.mo
    M ckan/i18n/th/LC_MESSAGES/ckan.po
    M ckan/i18n/tl/LC_MESSAGES/ckan.mo
    M ckan/i18n/tl/LC_MESSAGES/ckan.po
    M ckan/i18n/tr/LC_MESSAGES/ckan.mo
    M ckan/i18n/tr/LC_MESSAGES/ckan.po
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
    M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
    M ckan/i18n/vi/LC_MESSAGES/ckan.mo
    M ckan/i18n/vi/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
    M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
    M ckan/lib/auth_tkt.py
    M ckan/lib/base.py
    M ckan/lib/celery_app.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/__init__.py
    M ckan/lib/helpers.py
    M ckan/lib/i18n.py
    M ckan/lib/jobs.py
    M ckan/lib/munge.py
    M ckan/lib/search/common.py
    M ckan/lib/uploader.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/schema.py
    M ckan/model/__init__.py
    M ckan/model/core.py
    M ckan/model/dashboard.py
    M ckan/model/system_info.py
    M ckan/pastertemplates/template/setup.cfg_tmpl
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit_sphinx_extension.py
    A ckan/public/base/i18n/.gitignore
    R ckan/public/base/i18n/bg.js
    R ckan/public/base/i18n/ca.js
    R ckan/public/base/i18n/cs_CZ.js
    R ckan/public/base/i18n/de.js
    R ckan/public/base/i18n/el.js
    R ckan/public/base/i18n/es.js
    R ckan/public/base/i18n/fi.js
    R ckan/public/base/i18n/fr.js
    R ckan/public/base/i18n/hu.js
    R ckan/public/base/i18n/it.js
    R ckan/public/base/i18n/lt.js
    R ckan/public/base/i18n/lv.js
    R ckan/public/base/i18n/nl.js
    R ckan/public/base/i18n/no.js
    R ckan/public/base/i18n/pl.js
    R ckan/public/base/i18n/pt_BR.js
    R ckan/public/base/i18n/ro.js
    R ckan/public/base/i18n/ru.js
    R ckan/public/base/i18n/sk.js
    R ckan/public/base/i18n/sl.js
    R ckan/public/base/i18n/sq.js
    R ckan/public/base/i18n/sr.js
    R ckan/public/base/i18n/sr_Latn.js
    R ckan/public/base/i18n/sv.js
    R ckan/public/base/i18n/zh_TW.js
    M ckan/public/base/images/background-tag-ie7.png
    M ckan/public/base/images/background-tag.png
    M ckan/public/base/images/background-tile.png
    M ckan/public/base/images/bg.png
    M ckan/public/base/images/breadcrumb-slash-ie7.png
    M ckan/public/base/images/ckan-logo-footer.png
    M ckan/public/base/images/ckan-logo.png
    M ckan/public/base/images/dashboard-followee-related.png
    M ckan/public/base/images/dotted.png
    M ckan/public/base/images/editing.png
    M ckan/public/base/images/full-width-nav-right.png
    M ckan/public/base/images/icon-search-27x26.png
    M ckan/public/base/images/nav-active.png
    M ckan/public/base/images/nav.png
    M ckan/public/base/images/od_80x15_blue.png
    M ckan/public/base/images/placeholder-200x125.png
    M ckan/public/base/images/placeholder-420x220.png
    M ckan/public/base/images/placeholder-680x400.png
    M ckan/public/base/images/placeholder-application.png
    M ckan/public/base/images/placeholder-group.png
    M ckan/public/base/images/placeholder-image.png
    M ckan/public/base/images/placeholder-organization.png
    M ckan/public/base/images/sprite-ckan-icons.png
    M ckan/public/base/images/sprite-resource-icons.png
    M ckan/public/base/images/table-seperator.png
    M ckan/public/base/javascript/i18n.js
    M ckan/public/base/javascript/main.js
    M ckan/public/base/javascript/module.js
    M ckan/public/base/javascript/modules/activity-stream.js
    M ckan/public/base/javascript/modules/api-info.js
    M ckan/public/base/javascript/modules/autocomplete.js
    M ckan/public/base/javascript/modules/basic-form.js
    M ckan/public/base/javascript/modules/confirm-action.js
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/dashboard.js
    M ckan/public/base/javascript/modules/dataset-visibility.js
    M ckan/public/base/javascript/modules/follow.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/javascript/modules/media-grid.js
    M ckan/public/base/javascript/modules/popover-context.js
    M ckan/public/base/javascript/modules/resource-form.js
    M ckan/public/base/javascript/modules/resource-reorder.js
    M ckan/public/base/javascript/modules/resource-upload-field.js
    M ckan/public/base/javascript/modules/resource-view-embed.js
    M ckan/public/base/javascript/modules/resource-view-filters.js
    M ckan/public/base/javascript/modules/resource-view-reorder.js
    M ckan/public/base/javascript/modules/slug-preview.js
    M ckan/public/base/javascript/modules/table-selectable-rows.js
    M ckan/public/base/javascript/modules/table-toggle-more.js
    M ckan/public/base/test/index.html
    A ckan/public/base/test/spec/i18n.spec.js
    M ckan/public/base/test/spec/module.spec.js
    M ckan/public/base/test/spec/modules/confirm-action.spec.js
    M ckan/public/base/test/spec/sandbox.spec.js
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
    M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
    M ckan/public/base/vendor/select2/select2.png
    M ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/robots.txt
    M ckan/templates/admin/config.html
    R ckan/templates/ajax_snippets/api_info.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/members.html
    M ckan/templates/group/snippets/group_form.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/snippets/organization_form.html
    M ckan/templates/organization/snippets/organization_item.html
    M ckan/templates/organization/snippets/organization_list.html
    M ckan/templates/package/resource_read.html
    R ckan/templates/package/snippets/data_api_button.html
    M ckan/templates/package/snippets/package_form.html
    M ckan/templates/package/snippets/resource_form.html
    A ckan/templates/robots.txt
    M ckan/templates/user/dashboard_organizations.html
    M ckan/templates/user/edit_user_form.html
    M ckan/tests/config/test_middleware.py
    M ckan/tests/controllers/test_feed.py
    M ckan/tests/controllers/test_package.py
    A ckan/tests/controllers/test_template.py
    M ckan/tests/controllers/test_user.py
    M ckan/tests/helpers.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/tests/legacy/logic/test_tag_vocab.py
    M ckan/tests/legacy/test_coding_standards.py
    A ckan/tests/lib/_i18n_build_js_translations/ckanext-test_js_translations.pot
    A ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
    M ckan/tests/lib/test_base.py
    M ckan/tests/lib/test_cli.py
    M ckan/tests/lib/test_helpers.py
    A ckan/tests/lib/test_i18n.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/logic/action/test_update.py
    M ckan/tests/logic/auth/test_update.py
    M ckan/tests/logic/test_validators.py
    M ckan/tests/test_coding_standards.py
    A ckan/tests/test_robots_txt.py
    M ckan/views/__init__.py
    M ckan/views/api.py
    M ckanext/datapusher/tests/test.py
    M ckanext/datastore/controller.py
    M ckanext/datastore/db.py
    M ckanext/datastore/helpers.py
    M ckanext/datastore/logic/action.py
    M ckanext/datastore/logic/auth.py
    M ckanext/datastore/plugin.py
    M ckanext/datastore/set_permissions.sql
    A ckanext/datastore/templates/ajax_snippets/api_info.html
    A ckanext/datastore/templates/package/resource_read.html
    A ckanext/datastore/templates/package/snippets/data_api_button.html
    M ckanext/datastore/tests/test_configure.py
    M ckanext/datastore/tests/test_create.py
    M ckanext/datastore/tests/test_dump.py
    M ckanext/example_idatasetform/plugin_v1.py
    M ckanext/example_idatasetform/plugin_v2.py
    M ckanext/example_idatasetform/plugin_v4.py
    M ckanext/example_igroupform/plugin.py
    M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
    M ckanext/example_theme/v16_initialize_a_javascript_module/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v17_popover/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v18_snippet_api/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_01_error/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v19_02_error_handling/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v20_pubsub/fanstatic/example_theme_popover.js
    M ckanext/example_theme/v21_custom_jquery_plugin/fanstatic/example_theme_popover.js
    M ckanext/imageview/plugin.py
    M ckanext/reclineview/theme/public/recline_view.js
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
    M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
    M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
    M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
    M ckanext/stats/public/ckanext/stats/javascript/modules/plot.js
    M ckanext/textview/theme/public/text_view.js
    M contrib/docker/my_init.d/50_configure
    M contrib/docker/postgresql/Dockerfile
    M contrib/docker/solr/Dockerfile
    M dev-requirements.txt
    M doc/_static/ckanlogo.png
    M doc/api/index.rst
    M doc/contributing/frontend/index.rst
    M doc/contributing/frontend/javascript-module-tutorial.rst
    M doc/contributing/frontend/templating.rst
    M doc/contributing/javascript.rst
    M doc/contributing/release-process.rst
    M doc/contributing/string-i18n.rst
    M doc/extensions/translating-extensions.rst
    M doc/extensions/tutorial.rst
    M doc/images/9.png
    M doc/images/add_dataset_1.jpg
    M doc/images/add_dataset_2.jpg
    M doc/images/add_dataset_3.jpg
    M doc/images/architecture.png
    M doc/images/ckan_importing_diagram.png
    M doc/images/create_organization.jpg
    M doc/images/custom-css.png
    M doc/images/custom_config_fields.png
    M doc/images/customize_look_and_feel.jpg
    M doc/images/debug-footer.png
    M doc/images/edit_dataset.jpg
    M doc/images/example_theme_javascript_popover.png
    M doc/images/example_theme_overlapping_popovers.png
    M doc/images/exploring_datasets.jpg
    M doc/images/extra-public-dir.png
    M doc/images/html_and_css.png
    M doc/images/image_view.png
    M doc/images/manage_news_feed.jpg
    M doc/images/manage_organization.jpg
    M doc/images/manage_user_profile.jpg
    M doc/images/manage_users.jpg
    M doc/images/manage_views.png
    M doc/images/more-custom-css.png
    M doc/images/most-popular-groups-custom-snippet.png
    M doc/images/most-popular-groups-snippet.png
    M doc/images/most-popular-groups.png
    M doc/images/move_dataset_between_organizations.jpg
    M doc/images/popular-dataset.png
    M doc/images/popular-resource.png
    M doc/images/recently-changed-packages-activity-stream.png
    M doc/images/recline_graph_view.png
    M doc/images/recline_grid_view.png
    M doc/images/recline_map_view.png
    M doc/images/recline_view.png
    M doc/images/register_account.jpg
    M doc/images/search_the_site.jpg
    M doc/images/sort-datasets-by-popularity.png
    M doc/images/text_view.png
    M doc/images/views_overview.png
    M doc/images/webpage_view.png
    M doc/maintaining/configuration.rst
    M doc/maintaining/data-viewer.rst
    M doc/maintaining/datastore.rst
    M doc/maintaining/index.rst
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst
    A doc/maintaining/installing/postgres.rst
    A doc/maintaining/installing/solr.rst
    M doc/maintaining/paster.rst
    R doc/maintaining/solr-multicore.rst
    M doc/maintaining/upgrading/index.rst
    A doc/maintaining/upgrading/upgrade-postgres.rst
    M doc/theming/javascript-module-objects-and-methods.rst
    M doc/user-guide.rst
    M requirements.in
    M requirements.txt
    M setup.cfg
    M setup.py

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-session

  Commit: cccd7bd5578e149e30bed535560e185ea735b0a7
      https://github.com/ckan/ckan/commit/cccd7bd5578e149e30bed535560e185ea735b0a7
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-05 (Thu, 05 Jan 2017)

  Changed paths:
    M ckan/common.py

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

  Commit: e20690164996a6eb677d176e4e6655f1ee8e8e54
      https://github.com/ckan/ckan/commit/e20690164996a6eb677d176e4e6655f1ee8e8e54
  Author: amercader <amercadero at gmail.com>
  Date:   2017-01-25 (Wed, 25 Jan 2017)

  Changed paths:
    M .circleci-matrix.yml
    A .travis.yml
    M CHANGELOG.rst
    M Dockerfile
    M ckan/ckan_nose_plugin.py
    M ckan/controllers/admin.py
    M ckan/i18n/fr/LC_MESSAGES/ckan.mo
    M ckan/i18n/fr/LC_MESSAGES/ckan.po
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/email_notifications.py
    M ckan/lib/helpers.py
    M ckan/lib/jobs.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/templates/admin/config.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/user/dashboard_organizations.html
    M ckan/tests/legacy/logic/test_action.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_create.py
    M ckan/tests/logic/action/test_delete.py
    M ckan/tests/logic/action/test_update.py
    M ckanext/datastore/controller.py
    A ckanext/datastore/writer.py
    A contrib/docker/ckan-entrypoint.sh
    M contrib/docker/docker-cloud.yml
    M contrib/docker/docker-compose.yml
    M contrib/docker/solr/Dockerfile
    M doc/maintaining/datastore.rst

  Log Message:
  -----------
  Merge branch 'master' into 3196-common-session

  Commit: 6d51cd27d584662970597de6414bddd8c5f965ee
      https://github.com/ckan/ckan/commit/6d51cd27d584662970597de6414bddd8c5f965ee
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-17 (Fri, 17 Feb 2017)

  Changed paths:
    M ckan/config/middleware/flask_app.py

  Log Message:
  -----------
  [#3196] Use all session options from the ini file

Rather than hardcode some

  Commit: 760d1fb3d789497c582272b86dad3a955536fc60
      https://github.com/ckan/ckan/commit/760d1fb3d789497c582272b86dad3a955536fc60
  Author: Tyler Kennedy <tk at tkte.ch>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M ckan/common.py
    M ckan/config/middleware/flask_app.py
    M ckan/lib/base.py
    A ckan/templates/tests/flash_messages.html
    A ckan/tests/config/test_sessions.py
    M ckan/tests/legacy/lib/test_i18n.py
    M setup.py

  Log Message:
  -----------
  Merge pull request #3208 from ckan/3196-common-session

[#3196] Common session for Flask and Pylons

Compare: https://github.com/ckan/ckan/compare/536111fe96fb...760d1fb3d789