Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos / im / templates @ f432088a

Name Size
  im
  registration

Latest revisions

# Date Author Comment
2e90e3ec 11/30/2012 03:29 pm Kostas Papadimitriou

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...
d2633501 11/30/2012 02:42 pm Kostas Papadimitriou

Allow multiple login methods per account
6ed0e4a6 11/30/2012 01:30 pm Sofia Papagiannaki

Restore im/admin_notification.txt
f366e3ed 11/30/2012 11:50 am Olga Brani

Merge branch '0.6.4' into devel-0.13

Conflicts:
snf-astakos-app/astakos/im/views.py
59728d4e 11/29/2012 06:19 pm Olga Brani

Fixes
- Rename group to project in ui
- Different pagination for groups search result page
- Truncatechars filter
c0b26605 11/29/2012 05:08 pm Sofia Papagiannaki

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...
bf0c6de5 11/28/2012 12:02 pm Sofia Papagiannaki

Flush other user sessions during password/token change

Refs: #3007
84a7cd69 11/23/2012 05:40 pm Olga Brani

Style improvements
3cbd5e47 11/23/2012 04:44 pm Olga Brani

- New styles for select
- new Class ResourcePresentation
- Group add form javascript validation
fffa19d2 11/20/2012 07:26 pm Sofia Papagiannaki

Updated shibboleth workflow (enable user change email before activation)

Refs: #3041

View revisions

Also available in: Atom