Remove obsolete rcut filter in templates
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
Restore im/admin_notification.txt
Merge branch '0.6.4' into devel-0.13
Conflicts: snf-astakos-app/astakos/im/views.py
Fixes- Rename group to project in ui- Different pagination for groups search result page- Truncatechars filter
Merge remote-tracking branch 'origin/0.12' into devel-0.13
Conflicts: snf-astakos-app/astakos/im/activation_backends.py snf-astakos-app/astakos/im/api/admin.py snf-astakos-app/astakos/im/auth_backends.py snf-astakos-app/astakos/im/forms.py snf-astakos-app/astakos/im/functions.py...
Style improvements
- New styles for select- new Class ResourcePresentation- Group add form javascript validation
Updated shibboleth workflow (enable user change email before activation)
Refs: #3041
View revisions
Also available in: Atom