/snf-astakos-app/astakos - Repository - astakos - Greek Research and Technology Network's projects

| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos @ 895c0deb

#	Date	Author	Comment
895c0deb	11/30/2012 03:38 pm	Kostas Papadimitriou	Remove conflicting migrations
e2581777	11/30/2012 03:36 pm	Kostas Papadimitriou	Merge remote-tracking branch 'origin/devel-0.13' into multipleauthmethods
2e90e3ec	11/30/2012 03:29 pm	Kostas Papadimitriou	Merge branch 'devel-0.13' into multipleauthmethods Conflicts: snf-astakos-app/astakos/im/context_processors.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/models.py snf-astakos-app/astakos/im/target/local.py snf-astakos-app/astakos/im/target/shibboleth.py...
30d92d1e	11/30/2012 03:23 pm	Georgios D. Tsoukalas	add token to quotaholder client also rename QUOTA_HOLDER to QUOTAHOLDER in settings strings
d2633501	11/30/2012 02:42 pm	Kostas Papadimitriou	Allow multiple login methods per account
421aeae8	11/30/2012 01:32 pm	root	Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13
3b1912f4	11/30/2012 01:32 pm	root	Change commissioning imports
6ed0e4a6	11/30/2012 01:30 pm	Sofia Papagiannaki	Restore im/admin_notification.txt
49474ffe	11/30/2012 01:29 pm	Sofia Papagiannaki	Comment our LDAPBackend
11c48149	11/30/2012 01:29 pm	Sofia Papagiannaki	Add missing import

Also available in: Atom