History | View | Annotate | Download (3.4 kB)
astakos: oa2 app
astakos: pep8 fixes
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...
Add messages context processor to default settings
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
Move context_processors from common to middleware
astakos: Dynamically resolve login_url in login_required
duplicated django user_passes_test and login_required decorators to be ableto dynamicaly resolve the url to which we redirect unauthorized users. Replaceddjango login_required with astakos.im.views.decorators.login_required.
astakos: Update references to astakos urls
/im/ renamed to /ui/.Updated all references in default settings, documentation and constants.
astakos: Include contrib.auth context processor
astakos: replace CookieAuthenticationMiddleware with a view decorator
reverse commits ab30f5f163a13dfc7f9bec4d263208dd35f09d16 &1439d6383113b151b6a3316e320a0418fa30d421
decorate also ``django.contrib.auth.views`` utilized byastakos
astakos: Update django requirements in synnefo settings
since session and messages middleware classes removed from webproject we shouldexplicitly set them on astakos settings.
Merge branch 'develop' into feature-branding
Conflicts: snf-astakos-app/astakos/im/static/im/cloudbar/cloudbar.js snf-astakos-app/astakos/im/templates/im/base.html snf-astakos-app/astakos/im/templates/im/landing.html snf-astakos-app/astakos/im/views.py...
Revert quotaholder's name to quotaholder_app
In order to facilitate migrations.
Move astakos webproject hooks
move astakos.im.synnefo_settings to astakos.synnefo_settings and makethe appropriate changes in setup.py