Statistics
| Branch: | Tag: | Revision:

root / astakos / im / templates / invitations.html @ d20cecdc

History | View | Annotate | Download (1.3 kB)

# Date Author Comment
4b100dbb 02/02/2012 07:36 pm Kostas Papadimitriou

Merge branch 'master' into grnetstyles

Conflicts:
astakos/im/context_processors.py
astakos/im/templates/account_base.html
astakos/im/templates/invitations.html
astakos/im/templates/registration/password_change_form.html
astakos/im/views.py
13858d75 02/02/2012 07:25 pm Kostas Papadimitriou

Applied grnet theme for user pages
77e2ad52 02/02/2012 03:42 pm root

Change user object in invitations template.
88d56ac5 02/02/2012 02:18 pm root

Fix interface details.
a196eb7e 02/01/2012 05:24 pm Sofia Papagiannaki

Several minor changes

  • change visible fields in user profile page
  • change visible fields in user modification administrator page
  • enable administrator to update user quota
  • read default user level from settings
  • show sent invitations and status in user invite page...
881c856c 01/25/2012 11:23 pm Sofia Papagiannaki

minor changes/fixes
5ed6816e 01/24/2012 06:03 pm Sofia Papagiannaki

- use email to login & authenticate users
- fix user profile editing bug
- fix user activation issue
- consume invitation upon invited user creation
- fix invited user invitations
- add token info in test user fixture
- minor bug fixes

Refs: #1917
Refs: #1911...
890b0eaf 01/22/2012 09:12 pm Sofia Papagiannaki

add docs
-incorporate CsrfViewMiddleware
-change tamplates to render forms
-change email template location
-api.activate() returns only information about token
 In prepare_response, instead of setting the cookie, log the user in
- use django.contrib.auth.views for reseting and changing user password...
64cd4730 01/09/2012 04:42 pm Antony Chazapis

Initial commit. Move from pithos repository.