Statistics
| Branch: | Tag: | Revision:

root / snf-astakos-app / astakos / im / templates / im / login_base.html @ fc1e2f02

History | View | Annotate | Download (2.2 kB)

# Date Author Comment
7cb372c7 08/03/2012 03:43 pm Sofia Papagiannaki

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

6ff7a7ca 08/03/2012 01:02 pm Sofia Papagiannaki

named reverse urls

1b3398a0 06/20/2012 04:02 pm Olga Brani

Bug fixes

2bc206d4 06/13/2012 03:37 pm Kostas Papadimitriou

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

ad956265 06/11/2012 02:20 pm Kostas Papadimitriou

Improved user notifications

additional settings to set messages that get displayed on different
im pages (signin, signup, profile pages).

e7a2ac21 05/24/2012 12:10 pm Olga Brani

Style fixes

0c887794 05/15/2012 02:39 pm Olga Brani

Bug fixes and improvements

fd2b4e8d 05/09/2012 07:47 pm Sofia Papagiannaki

fix shibboleth login link

0f4a8a68 05/02/2012 05:14 pm Olga Brani

New html styles

4e30244e 04/09/2012 05:26 pm Sofia Papagiannaki

support shibboleth with invitations & enable modifyuser command to remove a user group

Refs: #2167

8f5a3a06 04/03/2012 02:35 pm Sofia Papagiannaki

change authentication methods: progress I

25d9d4d0 03/23/2012 06:28 pm Sofia Papagiannaki

merge with master