History | View | Annotate | Download (1.9 kB)
Merge remote-tracking branch 'origin/api-current' into ui-0.5
Conflicts: settings.py.dist
Merge branch 'master' of https://code.grnet.gr/git/synnefo into api-current
Conflicts: api/images.py api/networks.py contrib/ganeti-hooks/kvm-vif-bridge db/fixtures/images.json db/models.py logic/backend.py logic/tests.py settings.py.dist tools/cloud
Add proper license headers
fix ui absolute paths. use relative only
Refs #421
Support '/' at the end of the invitations URL
refs: #439
Active the invitations app
get rid of the MOCK objects and use a database with initial data loaded
Add aquarium app to django base project; Modify configuration files appropriately
removed django localeurl, added ui/i18n that handles the change of languages with GET. also added the translation of a few strings and updated a few lines on the documentation
internalization
port to Django
Add Auth-API application, plus the StripURLMiddleware
Initial commit