History | View | Annotate | Download (8.8 kB)
Merge branch 'develop' into feature-quotas
Conflicts: snf-astakos-app/astakos/im/api/service.py snf-quotaholder-app/quotaholder_django/quotaholder_app/callpoint.py
Make pending project options more descriptive
Execute astakos-init and user-update in a transaction
Add per-user limit on pending applications
Add UserSettings model for storing integer-valued settings.If an entry is missing, a default synnefo setting is consulted.
The limit can be set/unset with snf-manage user-update.
Register a user to quotaholder only when is activated
Fix activation_sent assignment in user update
Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into latest-quota
Conflicts: snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/management/commands/service-add.py snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/models.py...
User state fixes
- Never reset activation_sent date- Check for inactive users too for email/username uniqueness- Check both email/username uniquness in user creation process- Activated users should have both email_verified/activation_sent fields set
Progress I
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...
Back up file
Merged demo
Rename user-update mgmt command to user-modify
View and management commands for adding/removing user resource quota
Refs: #2793
Rename management commands
Rename Astakos management commands for uniformity