History | View | Annotate | Download (7.4 kB)
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