History | View | Annotate | Download (3.3 kB)
Merge branch 'master' into develop
Conflicts: Changelog astakosclient/astakosclient/keypath.py ci/utils.py docs/admin-guide.rst snf-astakos-app/astakos/im/cookie.py snf-astakos-app/astakos/im/functions.py snf-astakos-app/astakos/im/quotas.py snf-astakos-app/astakos/im/views/projects.py...
astakos: Fix logging issues
astakos: pep8 fixes
astakos: unified settings handling
Import astakos settings module instead of importing specific settings
Minor authenticate fix
skip duplicate call of check_password
Improve email/username handling
- New helper methods in AstkosUser.objects- Check uniquness between username/email on user creation process- Allow login using both username/email fields- Keep email case intact- Store lowercase email in username field
Change email authentication backend to check username/password pair in any case if email/password authentication fails (not only if username does not match email regex)
Case insensitive email checks
#2883
Merge remote-tracking branch 'origin/0.12' into devel-0.13
Conflicts: snf-astakos-app/astakos/im/activation_backends.py snf-astakos-app/astakos/im/api/admin.py snf-astakos-app/astakos/im/auth_backends.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py...
Log for authentication failures
Refine shibboleth signup mechanism
Refs: #3041
Fix code formatting to conform to the PEP 8 style guide
add missing licence
ask acknowledgment for switching local account to shibboleth one
Repo refactor and webproject hooks fixes