Merge branch 'develop' into feature-quotas
Conflicts: astakosclient/astakosclient/__init__.py astakosclient/astakosclient/errors.py astakosclient/astakosclient/tests.py docs/index.rst
astakos: remove js debug statement
astakos: Change response for API call `quotas'
The following indicators are returned for each holding:"limit": the quota limit (as before)"usage": the current usage (pessimistically, includes any pending allocations)"pending": the difference of max and min allocation, indicates...
Astakos: ui minor fixes
Refs: #3573Correct onclick functionality in project create page.Discover missing div tag in project details page.
Update astakos usage view
Update view to use the introduced astakos quotas api.
Cleanup CLRF's
Services api/presentation logic cleanup
- Remove presentation information from Service model (order, icon)- To access the list of services filled with both presentation and api data use Service.catalog(). The method fills a dict with service identifiers and service metadata through the following steps...
Merge branch 'release-0.13' into develop
Conflicts: snf-astakos-app/astakos/im/messages.py
Merge branch 'release-0.13' of https://code.grnet.gr/git/synnefo into release-0.13
Conflicts: snf-astakos-app/astakos/im/messages.py snf-astakos-app/astakos/im/views.py version
View revisions
Also available in: Atom