History | View | Annotate | Download (4.5 kB)
Merge branch 'master' of https://code.grnet.gr/git/pithos into invitations
Conflicts: pithos/im/models.py
Invitation improvements
Create the appropriate level and invitations whena user is created.
Refs #1459
Provide functions for getting/setting quota.
Add support for invitations
Requires an update to settings.
Merge changes from master branch. Fix quota updates. Clean up util. Create token when creating user from admin interface.
Refs #1470Refs #1471
Merge of aai and admin apps.