Commits · c2facd8a27ddc1253110bab695f1477d1a28cf76 · Nounous / re2o

02 May, 2018 1 commit

Merge branch 'Fix_112' into 'master' · c2facd8a

chirac authored May 02, 2018

Fix #112: Switch representation is only displayed on switch details

Closes #112

See merge request federez/re2o!146

c2facd8a

29 Apr, 2018 1 commit

Fix #112: Switch representation is only displayed on switch details · c8b2f95c

Maël Kervella authored Apr 29, 2018

- The nice switch representation is only displayes on the swithc details
page and not on any other page using the `topologie/aff_port.html` (like
the search)

- Use acl to display links or not on the switch detail page

c8b2f95c

26 Apr, 2018 2 commits
- Merge branch 'fix_radius' into 'master' · 52a35e52
  moamoak authored Apr 26, 2018
```
Fix freeradius compatibility.

See merge request federez/re2o!143
```
  52a35e52
- Fix freeradius compatibility. · 0cbd39cc
  Hugo LEVY-FALK authored Apr 26, 2018
  
  0cbd39cc
23 Apr, 2018 1 commit
- Merge branch 'translation' into 'master' · 9c332890
  klafyvel authored Apr 23, 2018
```
Set language button

See merge request federez/re2o!142
```
  9c332890
18 Apr, 2018 2 commits
- Add warning button: translation in dev · 80036345
  Maël Kervella authored Apr 18, 2018
  
  80036345
- Set language button · 9569e22d
  Maël Kervella authored Apr 16, 2018
  
  9569e22d
17 Apr, 2018 1 commit
- Merge branch 'fix_86_number_of_machines' into 'master' · ad12dff8
  moamoak authored Apr 17, 2018
```
Fix #86

Closes #86

See merge request federez/re2o!141
```
  ad12dff8
16 Apr, 2018 11 commits
- Fix #86 · e4d53e67
  Hugo LEVY-FALK authored Apr 16, 2018
  
  e4d53e67
- Merge branch 'twitter_and_fb' into 'master' · 39d8340e
  Grizzly authored Apr 16, 2018
```
Twitter and fb

See merge request federez/re2o!138
```
  39d8340e
- Merge branch 'migration_misnamed_permissions' into 'master' · 6bece0bc
  chirac authored Apr 16, 2018
```
Fix : migration for renaming permission Srv.view_soa to Srv.view_srv

See merge request federez/re2o!137
```
  6bece0bc
- 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
- Accueil -> Home · f38c12fc
  Gabriel Detraz authored Apr 16, 2018
  
  f38c12fc
- 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
- Fix : migration for renaming permission Srv.view_soa to Srv.view_srv · c1e3d34b
  Maël Kervella authored Apr 15, 2018
  
  c1e3d34b
15 Apr, 2018 21 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