Commits · c56b762112a3a70144fa5e8909a90743b05e9e96 · itminedu / synnefo

10 Apr, 2012 3 commits
- Merge branch 'master' of https://code.grnet.gr/git/astakos into 0.5 · c56b7621
  Sofia Papagiannaki authored Apr 10, 2012
```
Conflicts:
	snf-astakos-app/astakos/im/models.py
	snf-astakos-app/astakos/im/views.py
```
  c56b7621
- Prevent non local users (not having usable password) from reseting their password. · 64d62c24
  Sofia Papagiannaki authored Apr 10, 2012
```
Refs: #2167
```
  64d62c24
- Do not pass current location in Signin's next param · 908798c9
  Sofia Papagiannaki authored Apr 10, 2012
  
  908798c9
09 Apr, 2012 1 commit
- support shibboleth with invitations & enable modifyuser command to remove a user group · d1af8094
  Sofia Papagiannaki authored Apr 09, 2012
```
Refs: #2167
```
  d1af8094
08 Apr, 2012 1 commit

Merge branch 'master' into 0.5 · 2ec804cb

Sofia Papagiannaki authored Apr 08, 2012

Conflicts:
	snf-astakos-app/astakos/im/forms.py
	snf-astakos-app/astakos/im/templates/im/approval_terms.html

2ec804cb

07 Apr, 2012 1 commit
- add support for groups · da1b5d6d
  Sofia Papagiannaki authored Apr 07, 2012
  
  da1b5d6d
06 Apr, 2012 1 commit
- Redirect to index if no approval terms found · bb90aac3
  Kostas Papadimitriou authored Apr 06, 2012
  
  bb90aac3
04 Apr, 2012 6 commits
- Merge branch 'current_changes' · 7e7cd5c1
  Kostas Papadimitriou authored Apr 04, 2012
```
Conflicts:
	snf-astakos-app/Changelog
```
  7e7cd5c1
- Update changelog for v0.4.0 · 5126df92
  Kostas Papadimitriou authored Apr 04, 2012
  
  5126df92
- Update settings documentation · a3daea35
  Kostas Papadimitriou authored Apr 04, 2012
  
  a3daea35
- Update sample settings file · ac0c73e2
  Kostas Papadimitriou authored Apr 04, 2012
  
  ac0c73e2
- Safe imports · 2856312c
  Kostas Papadimitriou authored Apr 04, 2012
```
include required queue imports only if QUEUE_CONNECTION is set
```
  2856312c
- Remove unused source files · 76450648
  Kostas Papadimitriou authored Apr 04, 2012
  
  76450648
03 Apr, 2012 2 commits
- Merge branch 'master' into 0.5 · 84da84cb
  Sofia Papagiannaki authored Apr 03, 2012
  
  84da84cb
- change authentication methods: progress I · 21bbd25b
  Sofia Papagiannaki authored Apr 03, 2012
  
  21bbd25b
02 Apr, 2012 9 commits
- Fix signup form terms label display · f9dff99c
  Kostas Papadimitriou authored Apr 02, 2012
  
  f9dff99c
- Update Changelog for v0.3.9 · afd0710e
  Kostas Papadimitriou authored Apr 02, 2012
  
  afd0710e
- Terms sample file · 97477f69
  Kostas Papadimitriou authored Apr 02, 2012
  
  97477f69
- Update approval terms template · 80f880f4
  Kostas Papadimitriou authored Apr 02, 2012
  
  80f880f4
- Handle label display for checkbox fields · 7fb53280
  Kostas Papadimitriou authored Apr 02, 2012
  
  7fb53280
- Update base template · fb4e28ae
  Kostas Papadimitriou authored Apr 02, 2012
```
- Include ie7 specific css styles
- Include footer from separate template file to make it easy to override
```
  fb4e28ae
- Update styles · 07bf4e97
  Kostas Papadimitriou authored Apr 02, 2012
  
  07bf4e97
- Show user email in feedback email content · 2d87b0fd
  Sofia Papagiannaki authored Apr 02, 2012
```
Refs: #2285
```
  2d87b0fd
- upon successfully submitting the form, approval terms view redirects in index... · 0114d1a8
  Sofia Papagiannaki authored Apr 02, 2012
```
upon successfully submitting the form, approval terms view redirects in index page if no next is specified.

Refs: #2019
```
  0114d1a8
28 Mar, 2012 3 commits
- Merge branch 'master' of https://code.grnet.gr/git/astakos · 8ecaae49
  Kostas Papadimitriou authored Mar 28, 2012
  
  8ecaae49
- Changelog fix · b78bcb1b
  Kostas Papadimitriou authored Mar 28, 2012
  
  b78bcb1b
- Merge branch 'aquarium', remote-tracking branch 'origin' · 205c657e
  Sofia Papagiannaki authored Mar 28, 2012
```
Conflicts:
	snf-astakos-app/astakos/im/settings.py
```
  205c657e
27 Mar, 2012 4 commits
- createuser command: validate email · 4d65a5a1
  Sofia Papagiannaki authored Mar 27, 2012
  
  4d65a5a1
- fix has_signed_terms function · 1bdbddd0
  Sofia Papagiannaki authored Mar 27, 2012
```
Refs: #2019
```
  1bdbddd0
- do not show approval terms checkbox if there are no terms · d8f63346
  Sofia Papagiannaki authored Mar 27, 2012
```
Refs: #2019
```
  d8f63346
- configurable recaptcha disable · 53bf2659
  Sofia Papagiannaki authored Mar 27, 2012
```
Refs: #2260
```
  53bf2659
26 Mar, 2012 6 commits
- if no registered approval terms bypass approval terms mechanism · a9164f06
  Sofia Papagiannaki authored Mar 26, 2012
```
Refs: #2019
```
  a9164f06
- if no registered approval terms bypass approval terms mechanism · e905a3f5
  Sofia Papagiannaki authored Mar 26, 2012
```
Refs: #2019
```
  e905a3f5
- force absolute path in addterms command · 963dfc33
  Sofia Papagiannaki authored Mar 26, 2012
```
Refs: #2019
```
  963dfc33
- do not approval terms form if user has already signed the terms · 586967c0
  Sofia Papagiannaki authored Mar 26, 2012
```
Refs: #2019
```
  586967c0
- bug fixing · 9e19989d
  Sofia Papagiannaki authored Mar 26, 2012
```
Refs: #1824
```
  9e19989d
- missing import · 4c0174a9
  Sofia Papagiannaki authored Mar 26, 2012
  
  4c0174a9
23 Mar, 2012 3 commits
- clear has_singed_terms in case of updated terms · e06793ea
  Sofia Papagiannaki authored Mar 23, 2012
```
Refs: #2019
```
  e06793ea
- merge with master · 25d9d4d0
  Sofia Papagiannaki authored Mar 23, 2012
  
  25d9d4d0
- changes in user event queue messages · cc1fc3ed
  Sofia Papagiannaki authored Mar 23, 2012
```
Refs: #1824
```
  cc1fc3ed