Merge branch 'release-0.13' into develop
Conflicts: snf-astakos-app/astakos/im/messages.py
Make pending project options more descriptive
Conflicts: snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/views.py version
Merge branch 'tmp-common-email-recipients' into develop
Fix user-set-initial-quota command
Do not display unnecessary message:"Please use either `--from-file' or `--set-capacity' options" while importing quotas from file.
Preserve owner info when modifying project
An admin can modify a project, i.e. create an application based ona previous application. We distinguish the initial applicant, calledthe `owner', from the user who submitted the current application,called the `applicant'....
Merge branch 'release-0.13' into feature-astakos-authpolicies
Specify reason when denying project application
Add field `response' in ProjectApplication model.Add option `-m' in project-control command.
Refs #3493
Change helper function to allow multiple arguments
Change output of astakos-quota --sync
Inform specifically which users, if any, have been synced, instead oflisting the whole diff. The latter can be recovered by giving theoption --verify.
View revisions
Also available in: Atom