webproject: Do not require django.contrib.admin by default
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...
wheezy: Django database engine has been changed
Merge branch 'hotfix-0.14.6' into develop
Conflicts: Changelog docs/admin-guide.rst snf-cyclades-app/synnefo/api/management/commands/network-remove.py snf-cyclades-app/synnefo/api/servers.py snf-cyclades-app/synnefo/api/tests/servers.py snf-cyclades-app/synnefo/logic/backend.py...
Move middlewares from snf-common to snf-webproject
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...
Replace regexp in cleanse middleware
Replace the regexp in mail_admins_safe() with manual parsing of the message.
pep8 changes
webproject: Disable APPEND_SLASH setting by default
webproject: common 404, 500 handling
- Move 404, 500 templates from astakos to webproject- Remove 404, 500 templates from pithos-app- Webproject now includes static files to serve jquery as an asset in 404, 500 pages.- Custom 500 handler. Use RequestContext if possible.
View revisions
Also available in: Atom