astakos: Handle prompt for additional login methods
Merge branch 'develop' into feature-quotas
Conflicts: astakosclient/astakosclient/__init__.py astakosclient/astakosclient/errors.py astakosclient/astakosclient/tests.py docs/index.rst
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.
Use updated resource models in projects views
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 'feature-snf-django' into develop
Conflicts: docs/older/Changelog.pithos-app snf-astakos-app/astakos/im/api/__init__.py snf-pithos-app/pithos/api/util.py
Merge branch 'release-0.13' into develop
Conflicts: snf-astakos-app/astakos/im/messages.py
Correct company url in Astakos footer template
Merge branch 'release-0.13' of https://code.grnet.gr/git/synnefo into release-0.13
View revisions
Also available in: Atom