Commits · 8ed29e14ce26f946555ae6956aa0cee2aaea842a · itminedu / synnefo

23 Feb, 2012 7 commits
- Default settings configuration file · 8ed29e14
  Kostas Papadimitriou authored Feb 23, 2012
  
  8ed29e14
- Merge branch 'master' into packaging · 5c8d2fbc
  Kostas Papadimitriou authored Feb 23, 2012
  
  5c8d2fbc
- Repo refactor and webproject hooks fixes · 27993be5
  Kostas Papadimitriou authored Feb 23, 2012
  
  27993be5
- Merge branch 'master' of https://code.grnet.gr/git/astakos · 5a6f91fc
  Antony Chazapis authored Feb 23, 2012
```
Conflicts:
	astakos/im/util.py
```
  5a6f91fc
- Use option for secure cookie. · ca34523e
  Antony Chazapis authored Feb 23, 2012
```
Refs #2069
```
  ca34523e
- Merge branch 'master' of https://code.grnet.gr/git/astakos · e5396d5e
  Sofia Papagiannaki authored Feb 23, 2012
  
  e5396d5e
- secure cookies · aac376e8
  Sofia Papagiannaki authored Feb 23, 2012
```
Refs: #2069
```
  aac376e8
21 Feb, 2012 33 commits
- Merge branch 'packaging' · 89de9d6b
  Kostas Papadimitriou authored Feb 21, 2012
  
  89de9d6b
- Bump version. · 884301db
  Antony Chazapis authored Feb 21, 2012
  
  884301db
- fix reset password email template · 8f378756
  Sofia Papagiannaki authored Feb 21, 2012
  
  8f378756
- fix reset password link in email template · e019ace5
  Sofia Papagiannaki authored Feb 21, 2012
  
  e019ace5
- Merge branch 'master' into packaging · 395c10c1
  Kostas Papadimitriou authored Feb 21, 2012
  
  395c10c1
- Merge branch 'master' of https://code.grnet.gr/git/astakos · 08ac4139
  Sofia Papagiannaki authored Feb 21, 2012
  
  08ac4139
- add welcome_email template · eeb3fe84
  Sofia Papagiannaki authored Feb 21, 2012
  
  eeb3fe84
- Fix reference to external js. · 397b7b69
  Antony Chazapis authored Feb 21, 2012
  
  397b7b69
- Bring top elements a little bit closer. · 9500a4c8
  root authored Feb 21, 2012
  
  9500a4c8
- Updated styles.css · 08aa3ac7
  Kostas Papadimitriou authored Feb 21, 2012
  
  08aa3ac7
- Merge branch 'master' of https://code.grnet.gr/git/astakos · c210b843
  Sofia Papagiannaki authored Feb 21, 2012
  
  c210b843
- fix functions.py · ef0c73c4
  Sofia Papagiannaki authored Feb 21, 2012
  
  ef0c73c4
- Merge branch 'master' of https://code.grnet.gr/git/astakos · 0ca63dfa
  Kostas Papadimitriou authored Feb 21, 2012
  
  0ca63dfa
- Update styles and minor html fixes · 86243acc
  Kostas Papadimitriou authored Feb 21, 2012
```
- Update styles.less and styles.css
- Add checkbox styles and jquery plugin
- Fix google font import (use https)
```
  86243acc
- remove sites · 10df1a91
  Sofia Papagiannaki authored Feb 21, 2012
  
  10df1a91
- No parameter in email addresses. · d552ecb7
  Antony Chazapis authored Feb 21, 2012
  
  d552ecb7
- Bring back admin functions. · f36af44a
  Antony Chazapis authored Feb 21, 2012
  
  f36af44a
- Remove invite script. · dfd570aa
  Antony Chazapis authored Feb 21, 2012
  
  dfd570aa
- Merge branch 'admin' · 4eb627e0
  Antony Chazapis authored Feb 21, 2012
  
  4eb627e0
- Remove custom web admin. · 17bebf7e
  Antony Chazapis authored Feb 21, 2012
```
Refs #1996
```
  17bebf7e
- Move common code to _common.py · 397d5cbe
  Giorgos Verigakis authored Feb 21, 2012
  
  397d5cbe
- Merge branch 'master' into packaging · 3e469591
  Kostas Papadimitriou authored Feb 21, 2012
  
  3e469591
- Delete cookie with path and domain. · 28ff5b5d
  Antony Chazapis authored Feb 21, 2012
```
Fixes #2080
```
  28ff5b5d
- Hide service descriptions. · 2e8f8632
  Antony Chazapis authored Feb 21, 2012
  
  2e8f8632
- Remove obsolete import. · 807db1d1
  Antony Chazapis authored Feb 21, 2012
  
  807db1d1
- Merge branch 'master' into packaging · 3ccdbf8b
  Kostas Papadimitriou authored Feb 21, 2012
  
  3ccdbf8b
- Merge branch 'master' of https://code.grnet.gr/git/astakos · b7a645c1
  Antony Chazapis authored Feb 21, 2012
  
  b7a645c1
- Remove site fixture. · ba584535
  Antony Chazapis authored Feb 21, 2012
  
  ba584535
- Add inviteuser command · add3d318
  Giorgos Verigakis authored Feb 21, 2012
  
  add3d318
- Send an email to user when activating · 004cc109
  Giorgos Verigakis authored Feb 21, 2012
  
  004cc109
- enable user to renew token · c301698f
  Sofia Papagiannaki authored Feb 21, 2012
```
Refs: #2047
```
  c301698f
- Use the correct year in copyright clauses · ca96a346
  Giorgos Verigakis authored Feb 21, 2012
  
  ca96a346
- Merge branch 'master' of https://code.grnet.gr/git/astakos into admin · 19a2b04c
  Giorgos Verigakis authored Feb 21, 2012
  
  19a2b04c