Commits · b77a612845df384e9f3bfa4182cdf8709842c6b2 · Nounous / re2o

16 Apr, 2018 6 commits
- Merge branch 'switch_better_display' into 'master' · b77a6128
  chirac authored Apr 16, 2018
```
Switch better display

Closes #102

See merge request federez/re2o!139
```
  b77a6128
- Merge branch 'fix_stack' into 'master' · 5453b845
  chirac authored Apr 16, 2018
```
Fix stack

Closes #104 and #108

See merge request federez/re2o!140
```
  5453b845
- Fix #104 · 56242474
  Gabriel Detraz authored Apr 16, 2018
  
  56242474
- Oublie du fichier de génération de la page d'accueil · e5153609
  Gabriel Detraz authored Apr 16, 2018
  
  e5153609
- Fix #102 · 2839a0ce
  Gabriel Detraz authored Apr 16, 2018
  
  2839a0ce
- Fix #108 · b118e119
  Gabriel Detraz authored Apr 16, 2018
  
  b118e119
15 Apr, 2018 34 commits
- Merge branch 'master' into graph_topo · 8e057db5
  chirac authored Apr 15, 2018
  
  8e057db5
- Merge branch 'Fix_asso_description' into 'master' · 79f4f805
  chirac authored Apr 15, 2018
```
Let use HTML tags in asso description

See merge request federez/re2o!136
```
  79f4f805
- Let use HTML tags in asso description · 48030d9a
  Maël Kervella authored Apr 15, 2018
  
  48030d9a
- Merge branch 'custom_error_pages' into 'master' · b550794f
  chirac authored Apr 15, 2018
```
Encode Error 500 image into base64

See merge request federez/re2o!135
```
  b550794f
- Encode Error 500 image into base64 · e3209d77
  Maël Kervella authored Apr 15, 2018
  
  e3209d77
- Merge branch 'fix_upload_img' into 'master' · 21bfbed5
  moamoak authored Apr 15, 2018
```
Fix no img file

See merge request federez/re2o!134
```
  21bfbed5
- Do not display <img> on home page services when no image · a639e6a8
  Maël Kervella authored Apr 15, 2018
  
  a639e6a8
- Fix no img file · 68830f2e
  Gabriel Detraz authored Apr 15, 2018
  
  68830f2e
- Merge branch 'custom_error_pages' into 'master' · 8de1865a
  chirac authored Apr 15, 2018
```
Add custom Error 500 page

See merge request federez/re2o!133
```
  8de1865a
- Add custom Error 500 page · 1225af69
  Maël Kervella authored Apr 15, 2018
  
  1225af69
- Merge branch 'fix_upload_img' into 'master' · 6c6422af
  chirac authored Apr 15, 2018
```
Fix #106

Closes #106

See merge request federez/re2o!132
```
  6c6422af
- Avoid duplicate settings and keeps comments · 98eae956
  Maël Kervella authored Apr 15, 2018
  
  98eae956
- Fix #106 · 2337a249
  Gabriel Detraz authored Apr 15, 2018
  
  2337a249
- Merge branch 'moamoak/pep8_and_pylint' into 'master' · d911452a
  chirac authored Apr 15, 2018
```
Pep8 and Pylint cleaning

See merge request federez/re2o!127
```
  d911452a
- Fix : various little things · f7f8f749
  Maël Kervella authored Apr 15, 2018
  
  f7f8f749
- Fix : missing migrations · 6c30c369
  Maël Kervella authored Apr 15, 2018
  
  6c30c369
- Fix: user.models.User.auto_uid can't be static · 915d5e89
  Maël Kervella authored Apr 15, 2018
  
  915d5e89
- Fix unused variables in kwargs · 0065e2e0
  Maël Kervella authored Apr 15, 2018
  
  0065e2e0
- Pylint compliance on users · 1469c7d6
  Maël Kervella authored Apr 14, 2018
  
  1469c7d6
- Pylint compliance on topologie · 4a1b97bb
  Maël Kervella authored Apr 14, 2018
  
  4a1b97bb
- Pylint compliance on search · 595c6b99
  Maël Kervella authored Apr 14, 2018
  
  595c6b99
- Pylint compliance on re2o · 2ca271bf
  Maël Kervella authored Apr 14, 2018
  
  2ca271bf
- Pylint compliance on preferences · 332e8a34
  Maël Kervella authored Apr 14, 2018
  
  332e8a34
- Pylint compliance on machines · e88141db
  Maël Kervella authored Apr 14, 2018
  
  e88141db
- Pylint compliance on logs · 2114a6eb
  Maël Kervella authored Apr 14, 2018
  
  2114a6eb
- Pylint compliance on cotisations · f2c91199
  Maël Kervella authored Apr 14, 2018
  
  f2c91199
- Pylint compliance on api · cc4401ff
  Maël Kervella authored Apr 14, 2018
  
  cc4401ff
- Missing Fixes · 955bf42b
  Maël Kervella authored Apr 14, 2018
  
  955bf42b
- Pep8 compliance on users · 7b0b5c2a
  Maël Kervella authored Apr 14, 2018
  
  7b0b5c2a
- Pep8 compliance on topologie · 8afc8e43
  Maël Kervella authored Apr 14, 2018
  
  8afc8e43
- Pep8 compliance on re2o · 48d904b6
  Maël Kervella authored Apr 13, 2018
  
  48d904b6
- Pep8 compliance on machines · 287ce23d
  Maël Kervella authored Apr 13, 2018
  
  287ce23d
- Pep8 compliance on logs · 0c8bb615
  Maël Kervella authored Apr 13, 2018
  
  0c8bb615
- Pep8 compliance on freeradius · 9d7a7fa1
  Maël Kervella authored Apr 13, 2018
  
  9d7a7fa1