History | View | Annotate | Download (4.2 kB)
Merge branch 'hotfix-0.14.8' into develop
Merge hotfix-0.14.8 which ports Synnefo to wheezy and Django 1.4.5
Conflicts: ci/ci_squeeze.conf ci/ci_wheezy.conf ci/schemas/one_node_squeeze/packages.conf ci/schemas/one_node_squeeze/squeeze.conf ci/schemas/one_node_squeeze/wheezy.conf...
astakos: Don't use `user.__dict__'
In Django 1.4 the `request.user' returns a SimpleLazyObject insteadof a LazyUser. The equivalent of `user.__dict__' is now`user._wrapped.__dict__'. In order to be backward compatiblewe are requesting explicitely the attributes we want and not...
astakos: pep8 fixes
astakos: unified settings handling
Import astakos settings module instead of importing specific settings
astakos: replace CookieAuthenticationMiddleware with a view decorator
reverse commits ab30f5f163a13dfc7f9bec4d263208dd35f09d16 &1439d6383113b151b6a3316e320a0418fa30d421
decorate also ``django.contrib.auth.views`` utilized byastakos
astakos: fix incomplete previous commit
commit 1439d6383113b151b6a3316e320a0418fa30d421
astakos: api calls authenticated via X-Auth-Token shall not affect cookie
CookieAuthenticationMiddleware.process_request() synchronizesthe astakos cookie with the request user.If an astakos cookie is set but there is no logged in user,the middleware deletes the cookie....
fix whitespace (tabs->spaces)
ui compatibility: translate uuids to display names
Fix cookie logging message
Fix logging messages to use uuid
Change cookie to contain uuid instead of email
Single model for ProjectApplication & Definition - Membership sync
Fix middleware AtributeError in case of non astakos requestFix service-add command: check callpoint result
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...
Cookie handling code refinement
Remove response argument from Cookie __set & __delete methods
Pass also response during Cookie instantiation
Force astakos cookie to follow session state.