History | View | Annotate | Download (1.8 kB)
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
Bug fixes
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).
Style fixes
Bug fixes and improvements
fix shibboleth login link
New html styles
support shibboleth with invitations & enable modifyuser command to remove a user group
Refs: #2167
change authentication methods: progress I
merge with master