Synnefo branding: Documentation correction & minor fixes
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...
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...
Merge remote-tracking branch 'origin/develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/templates/im/footer.html snf-cyclades-app/setup.py
Merge branch 'release-0.13' into develop
Conflicts: snf-astakos-app/astakos/im/messages.py
Fix create vm view images filtering in cyclades ui
use the new synnefo.user method `get_username` to populatepersonal/shared images.
Conflicts: snf-astakos-app/astakos/im/settings.py snf-astakos-app/astakos/im/templates/im/login_base.html snf-astakos-app/astakos/im/templatetags/astakos_tags.py snf-cyclades-app/synnefo/app_settings/default/ui.py...
Conflicts: snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/views.py version
Merge branch 'tmp-common-email-recipients' into develop
Merge branch 'feature-astakos-authpolicies' into develop
Conflicts: snf-cyclades-app/synnefo/api/management/commands/flavor-create.py version
View revisions
Also available in: Atom