History | View | Annotate | Download (7 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...
Force astakos cookie to follow session state.
Fix code formatting to conform to the PEP 8 style guide
AstakosUser signed_terms property instead of function
remove unused imports & code refinement
move get_menu and get_service out of api/admin
Do not show change password in the menu if user provider is not local
Refs: #2535
In get menu call: check for email absence before querying the database for retrieving the user
Include service id in get_services json response
Merge branch 'refs/heads/0.6'
Conflicts: docs/source/backends.rst docs/source/conf.py docs/source/devguide.rst
narrow access to user info only to privileged users
Provide an API call for the service clients to send user feedback