History | View | Annotate | Download (9.8 kB)
Merge branch 'hotfix-0.14.2' into develop
Conflicts: Changelog snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/views/target/__init__.py snf-cyclades-app/synnefo/logic/backend.py snf-cyclades-app/synnefo/logic/management/commands/reconcile-servers.py...
Revert "astakos: Improve invalid login handling"
This reverts commit 02c1f22a0f7396a7b2211677db78247586e10805.
astakos: Improve invalid login handling
avoid redirecting user to signup view. Notify user the login credentials wasinvalid instead.
astakos: Shibboleth improvements
- include shibboleth headers in provider_details- display eppn instead of identifier in profile
astakos: pep8 fixes
astakos: remove unused imports
astakos: reorganize views