History | View | Annotate | Download (6.7 kB)
Update Copyright for project-related changes
Update Copyright for files merged into develop in 2014 concerning the newprojects mechanism.
astakos: Adapt resource reconciliation
Assume base project when reconciling astakos resources.
Fix stdout/stderr write in astakos/quota commands
Write actual command output and user prompts to stdout; error and progressmessages to stderr.
Merge branch 'master' into develop
Conflicts: Changelog astakosclient/astakosclient/keypath.py ci/utils.py docs/admin-guide.rst snf-astakos-app/astakos/im/cookie.py snf-astakos-app/astakos/im/functions.py snf-astakos-app/astakos/im/quotas.py snf-astakos-app/astakos/im/views/projects.py...
astakos: Handle quota for accepted users
A user is accepted if moderated=True and is_rejected=False. Onlyaccepted users have entries in the quotaholder.
astakos: Remove custom commit_on_success decorator
Prior to 1.3, django wouldn't set the transaction dirty upon a DBexception and thus wouldn't trigger a rollback, resulting in a danglingaborted DB exception. See https://code.djangoproject.com/ticket/9964...
astakos: Handle quota for moderated users only
At some points, verified users where mistakenly assumed.
Fix stale import statements
Commit 7cfc0ce moved code from webproject to snf_django. This commitfixes some stale imports that skipped renaming.
astakos: Adapt reconcile-resources to new-style services
Catch QuotaLimit exception when reconciling resources
This can happen, if the actual usage registered by a service exceedsthe quota limit.Advise the user to try the --force option.
astakos: Reconcile resources
Sync number of pending applications to quotaholder.