[ckan-changes] [ckan/ckan] fa1697: Quick and dirty changes to make lib.base.render wo...

[GitHub]

  Branch: refs/heads/poc-flask-views
  Home:   https://github.com/ckan/ckan
  Commit: fa16975d2d8dbafa793e7a0a5f84c5483a923e63
      https://github.com/ckan/ckan/commit/fa16975d2d8dbafa793e7a0a5f84c5483a923e63
  Author: amercader <amercadero at gmail.com>
  Date:   2016-06-15 (Wed, 15 Jun 2016)

  Changed paths:
    M ckan/lib/activity_streams.py
    M ckan/lib/base.py

  Log Message:
  -----------
  Quick and dirty changes to make lib.base.render work on Flask

This needs to be properly investigated, specially all the logic around
caching

Conflicts:
	ckan/lib/base.py


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

  Changed paths:
    M ckan/templates/activity_streams/activity_stream_email_notifications.text

  Log Message:
  -----------
  Temporary fix in template


Compare: https://github.com/ckan/ckan/compare/2f2e9722f093...a3c6ac507937