Revert "common: do not overwrite test database setting"
This reverts commit b6eb72e5ccef38cfabf13f6fdf2acf53438ab34e.
common: do not overwrite test database setting
snf-common: update test settings
Add cloudbar settings in the test settingsto prevent tests from failingif cyclades are not installed
tests: Set default BASE_URL settings
astakos: Convert list-like settings to tuple
Settings ADMINS, MANAGERS, and HELPDESK are tuples even though they couldnaturally be lists. If one sets by mistake one of these to list, thistriggers an error in notification code, which tries to concatenate them:...
Merge branch 'feature-branding' into develop
Conflicts: snf-astakos-app/astakos/im/templates/im/account_pending_moderation_notification.txt snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt snf-astakos-app/astakos/im/views.py
Merge branch 'develop' into feature-astakos-userflow
common: Disable proxy in tests
Do not follow redirections in im tests.
astakos: User activation flow improvements
Major refactoring on user email verification/activation process---------------------------------------------------------------Activation logic moved from dispersed code in functions/view modules toActivationBackend methods. All user activation handling code in astakos views...
Merge branch 'develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js snf-astakos-app/astakos/im/templates/im/base.html snf-astakos-app/astakos/im/templates/im/landing.html snf-astakos-app/astakos/im/views.py...
View revisions
Also available in: Atom