History | View | Annotate | Download (5.4 kB)
Merge branch 'hotfix-0.14.2' into develop
Conflicts: snf-astakos-app/astakos/im/views/projects.py snf-cyclades-app/synnefo/logic/backend.py snf-django-lib/snf_django/lib/astakos.py version
Merge branch 'release-0.14' into develop
Conflicts: snf-astakos-app/astakos/im/views/target/redirect.py snf-cyclades-app/synnefo/logic/backend.py version
astakos: return uuid in weblogin
The weblogin used to return the user uuid.However, this in 0.14 version had been removed since the uuidcan be retrieved using the POST /tokens authentication method.However, the old pithos clients have no other wayto get the uuid, so we restore it temporarily.
astakos: REDIRECT_ALLOWED_SCHEMES hidden setting
astakos: modifications in redirect view
astakos: Separate index/login views
- Login view added. The view renders the login template.- Index view acts as a gateway to landing/login views based on whether the user is authenticated.
astakos: Remove uuid parameter from weblogin redirect
url only contains token parameter. Clients can use the identity/tokens endpointusing the gathered token to access the uuid information.
astakos: change web login view
astakos: unified settings handling
Import astakos settings module instead of importing specific settings
astakos: reorganize views