Correct merging error
Merge branch 'develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js snf-astakos-app/astakos/im/templates/im/base.html snf-astakos-app/astakos/im/templates/im/landing.html snf-astakos-app/astakos/im/views.py...
Synnefo branding: Remove greek text & verbal fixes
Emails sent to Astakos Users do not contain greek translations any more.Minor verbal corrections are made and title attribute are added to logoslinks.
astakos: WIP move all api calls under ``/astakos/api``
Refs: #3340
Further improvents to branding settings
cyclades ui: Remove deprecated setting
cyclades ui: Expose and use the new astakos quota api
- Removed /userdata/quota view in respect of astakos quotas api delegate views served in the same urls used by astakos api (/astakos/api/quotas, /astakos/api/resources). Base url is configurable using the...
cyclades: Remove obsolete code for static quotas
Remove the following obsolete settings, since their usage is coveredby Quotaholder:- MAX_VMS_PER_USER- MAX_NETWORKS_PER_USER- VMS_USER_QUOTA- NETWORKS_USER_QUOTA
Also remove 'cyclades-export-quota' management command.
snf-cyclades-app: Use astakosclient
PEP8 style fixes
View revisions
Also available in: Atom