History | View | Annotate | Download (30.7 kB)
Merge branch 'hotfix-0.14.8' into develop
Merge hotfix-0.14.8 which ports Synnefo to wheezy and Django 1.4.5
Conflicts: ci/ci_squeeze.conf ci/ci_wheezy.conf ci/schemas/one_node_squeeze/packages.conf ci/schemas/one_node_squeeze/squeeze.conf ci/schemas/one_node_squeeze/wheezy.conf...
astakos: Fix project identification in test
Test was mistakenly using application id rather than project id insome occasions.
astakos: Remove duplicate project query
Enrolling a user in a project now returns 409 if the project doesnot exist, rather than 404.
astakos: Force a members limit in project applications
astakos: Restrict project naming in API call
Use the same regex as in the UI, which matches domain-name-like strings.
astakos: Describe and implement API for projects
astakos: Adapt tests to the new project schema
Merge branch 'hotfix-0.14.3' into develop
Conflicts: Changelog snf-astakos-app/astakos/im/messages.py snf-pithos-app/pithos/api/manage_accounts/__init__.py snf-pithos-app/pithos/api/management/commands/reconcile-resources-pithos.py snf-pithos-app/pithos/api/settings.py...
snf-branding: Expose contact email through branding mechanism
although CONTACT_EMAIL is not a branding setting, we use the branding mechanismto expose it to brandable templates for practical reasons.
This also fixes the missing contact email from all project related emails.
astakos: Update tests
properly clean up database on each test tearDown
astakos: Import new-style services and resources
astakos: Clean up tables on test completion
to get over sqlite driver issues to properly clean up database on transactiontest cases.
astakos: Split settings in separate modules