History | View | Annotate | Download (8.9 kB)
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...
Flush other user sessions during password/token change
Refs: #3007
Force astakos cookie to follow session state.
Ensure ASTAKOS_COOKIE is not set if there is no django session cookie.
restrict_next should not affect relative paths
Refs: #3008
Restrict next url parameter
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts: snf-astakos-app/astakos/im/templates/im/astakosgroup_form.html snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.BACKUP.21131.html
Back up file
Isolate astakos messages in separate module
Merged demo
Handle AttributeError in case of other than GET or POST method
Fix code formatting to conform to the PEP 8 style guide
fix get_query utility in case of HEAD request
remove unused imports & code refinement
named reverse urls
Log main astakos functions
Refs: #2448
remove unnecessary import
handle AstakosUser model validation error
set session cookie expiration to user auth_token expiration date
Refs: #2291
remove has_signed_terms utility, introduce AstakosUser signed_terms function instead
ask acknowledgment for switching local account to shibboleth one
support shibboleth with invitations & enable modifyuser command to remove a user group
Refs: #2167
add support for groups
fix has_signed_terms function
Refs: #2019
do not show approval terms checkbox if there are no terms
if no registered approval terms bypass approval terms mechanism
clear has_singed_terms in case of updated terms
Force user to accept service terms
merge with master
Merge branch 'master' into packaging
Repo refactor and webproject hooks fixes