History | View | Annotate | Download (1.2 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
merge with origin 0.6.4
Merge remote-tracking branch 'origin/newstyles' into 0.6.4
Conflicts: snf-astakos-app/astakos/im/templates/im/invitations.html snf-astakos-app/astakos/im/templates/im/login_base.html snf-astakos-app/astakos/im/templates/im/profile.html snf-astakos-app/astakos/im/views.py
named reverse urls
Page notification messages improvements
- New template tag {% display_messages %} which handles messages display, both for django.contrib.messages and ASTAKOS_*_MESSAGES.- Apply messages block class from python code (instead of js).- Changed format of ASTAKOS_*_MESSAGES to list of tuples, to allow...
Merge branch 'master' into newstyles
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/login_base.html
Improved user notifications
additional settings to set messages that get displayed on differentim pages (signin, signup, profile pages).
Minor fixes & improvements
Style fixes
New html styles
add support for groups
change authentication methods: progress I
Repo refactor and webproject hooks fixes