History | View | Annotate | Download (3.3 kB)
Merge branch 'devel-0.13' into multipleauthmethods
Conflicts: snf-astakos-app/astakos/im/context_processors.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/models.py snf-astakos-app/astakos/im/target/local.py snf-astakos-app/astakos/im/target/shibboleth.py...
Allow multiple login methods per account
Comment our LDAPBackend
Restore synnefo_settings.py
Fix middleware AtributeError in case of non astakos requestFix service-add command: check callpoint result
- Help_text for group create form- Resource_presentation dict
Merged demo
Merge branch '0.6.4' of https://code.grnet.gr/git/astakos into 0.6.4
Conflicts: snf-astakos-app/astakos/im/static/im/css/modules.css snf-astakos-app/astakos/im/static/im/js/common.js snf-astakos-app/astakos/im/templates/im/astakosuserquota_list.html snf-astakos-app/astakos/im/views.py
Merge branch 'dev' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
remove django_extensions from installed_apps
Remove debug_toolbar from installed_apps
Fix code formatting to conform to the PEP 8 style guide
fix synnefo.settings
fix syneffo_settings
django-celery configuration
Progress VII
Progress I
Remove set of django specific settings
since common django settings required by synnefo components are placed bywebproject.
enable CsrfViewMiddleware
middleware for the synchronization of the django session and the ASTAKOS_COOKIE
if ASTAKOS_COOKIE is set and the request user is not authenticated (sessionid cookie has expired or deleted), authenticate and login the user
Refs: #2291
merge with master
Merge branch 'master' into aquarium
Conflicts: snf-astakos-app/Changelog snf-astakos-app/README snf-astakos-app/astakos/im/api.py snf-astakos-app/astakos/im/backends.py snf-astakos-app/astakos/im/context_processors.py snf-astakos-app/astakos/im/functions.py...
Removed unused context processor
fix internal astakos menu & minor other changes:
Display menu and use cloudbar processor for cloudbar
Fix loggers webproject entry point
Fixed im static files configuration
Repo refactor and webproject hooks fixes