History | View | Annotate | Download (10.2 kB)
Merge branch 'hotfix-0.14.3' into develop
Conflicts: Changelog snf-astakos-app/astakos/im/messages.py snf-pithos-app/pithos/api/manage_accounts/__init__.py snf-pithos-app/pithos/api/management/commands/reconcile-resources-pithos.py snf-pithos-app/pithos/api/settings.py...
snf-branding: Expose contact email through branding mechanism
although CONTACT_EMAIL is not a branding setting, we use the branding mechanismto expose it to brandable templates for practical reasons.
This also fixes the missing contact email from all project related emails.
astakos: Update tests
properly clean up database on each test tearDown
astakos: Import new-style services and resources
astakos: Clean up tables on test completion
to get over sqlite driver issues to properly clean up database on transactiontest cases.
astakos: Split settings in separate modules