Gabriel Detraz
60b2a6cd9d
Refactor l'affichage des réglages, factorisation et utilisation help_text
2018-05-06 19:08:59 +02:00
chirac
dcd1e2af96
Merge branch 'fix_110_display_superuser' into 'master'
...
Fix #110 display superuser
Closes #110
See merge request federez/re2o!150
2018-05-03 14:42:44 +02:00
Hugo LEVY-FALK
a5013920da
ACL
2018-05-03 14:22:52 +02:00
Hugo LEVY-FALK
9d79ffb5ca
Plus de BÔTÉ dans l'affichage des superusers
2018-05-03 14:08:05 +02:00
chirac
34d29349ed
Merge branch 'paginateur' into 'master'
...
Fixe #111 : Supression du paginateur si page unique
See merge request federez/re2o!151
2018-05-03 13:49:39 +02:00
grisel-davy
5575995437
Fixe #111 : Supression du paginateur si page unique
2018-05-03 13:45:13 +02:00
Hugo LEVY-FALK
8a19977757
Ne réinvente pas la roue
2018-05-03 11:55:34 +02:00
klafyvel
f62178bebb
Merge branch 'fix_ns' into 'master'
...
Fix #119 : Plusieurs NS peuvent avoir le meme origin
Closes #119
See merge request federez/re2o!149
2018-05-03 11:00:43 +02:00
Hugo LEVY-FALK
4a5fd06ace
Ajout de superusers
2018-05-03 10:56:21 +02:00
Hugo LEVY-FALK
6f3fc983ac
Suppression de superuser
2018-05-03 10:26:17 +02:00
chirac
94cea4e7c3
Merge branch 'fix_#114' into 'master'
...
Fix #114 : Take locale datetime formats into account in help text
Closes #114
See merge request federez/re2o!144
2018-05-03 06:47:37 +02:00
Gabriel Detraz
28393797e4
Et la migration
2018-05-03 06:42:59 +02:00
Gabriel Detraz
d8270f8073
Fix #119 : Plusieurs NS peuvent avoir le meme origin
2018-05-03 06:40:36 +02:00
chirac
cae97a385d
Merge branch 'fixe_comment' into 'master'
...
Ajout du champ comment dans le ServiceUserForm
See merge request federez/re2o!148
2018-05-02 21:16:56 +02:00
grisel-davy
acd8fff2ca
Ajout du champ comment dans le ServiceUserForm
2018-05-02 21:10:28 +02:00
chirac
c2facd8a27
Merge branch 'Fix_112' into 'master'
...
Fix #112 : Switch representation is only displayed on switch details
Closes #112
See merge request federez/re2o!146
2018-05-02 07:05:28 +02:00
Maël Kervella
c8b2f95cb9
Fix #112 : Switch representation is only displayed on switch details
...
- 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
2018-04-29 15:41:55 +00:00
Maël Kervella
ef91a1047a
Add migrations for the fix
2018-04-26 18:21:48 +00:00
Maël Kervella
090c838381
Take locale datetime formats into account in help text
2018-04-26 13:08:04 +00:00
moamoak
52a35e523d
Merge branch 'fix_radius' into 'master'
...
Fix freeradius compatibility.
See merge request federez/re2o!143
2018-04-26 10:45:58 +02:00
Hugo LEVY-FALK
0cbd39cc0d
Fix freeradius compatibility.
2018-04-26 09:19:32 +02:00
klafyvel
9c332890bc
Merge branch 'translation' into 'master'
...
Set language button
See merge request federez/re2o!142
2018-04-23 14:00:24 +02:00
Maël Kervella
8003634563
Add warning button: translation in dev
2018-04-18 20:13:11 +00:00
Maël Kervella
9569e22df9
Set language button
2018-04-18 15:49:03 +00:00
Hugo LEVY-FALK
d2946a94b5
affiche les superuser
2018-04-17 00:32:37 +02:00
moamoak
ad12dff8d5
Merge branch 'fix_86_number_of_machines' into 'master'
...
Fix #86
Closes #86
See merge request federez/re2o!141
2018-04-17 00:02:01 +02:00
Hugo LEVY-FALK
e4d53e6791
Fix #86
2018-04-16 23:57:22 +02:00
grizzly
39d8340e6c
Merge branch 'twitter_and_fb' into 'master'
...
Twitter and fb
See merge request federez/re2o!138
2018-04-16 18:37:55 +02:00
chirac
6bece0bcb2
Merge branch 'migration_misnamed_permissions' into 'master'
...
Fix : migration for renaming permission Srv.view_soa to Srv.view_srv
See merge request federez/re2o!137
2018-04-16 18:27:08 +02:00
chirac
b77a612845
Merge branch 'switch_better_display' into 'master'
...
Switch better display
Closes #102
See merge request federez/re2o!139
2018-04-16 18:26:24 +02:00
chirac
5453b845e2
Merge branch 'fix_stack' into 'master'
...
Fix stack
Closes #104 and #108
See merge request federez/re2o!140
2018-04-16 18:26:04 +02:00
Gabriel Detraz
f38c12fcc3
Accueil -> Home
2018-04-16 18:23:04 +02:00
Gabriel Detraz
5624247487
Fix #104
2018-04-16 06:55:02 +02:00
Gabriel Detraz
e515360936
Oublie du fichier de génération de la page d'accueil
2018-04-16 06:42:17 +02:00
Gabriel Detraz
2839a0ce19
Fix #102
2018-04-16 05:51:51 +02:00
Gabriel Detraz
b118e1199e
Fix #108
2018-04-16 05:28:47 +02:00
Maël Kervella
c1e3d34b84
Fix : migration for renaming permission Srv.view_soa to Srv.view_srv
2018-04-15 23:52:24 +00:00
chirac
8e057db5ea
Merge branch 'master' into graph_topo
2018-04-15 21:22:47 +02:00
chirac
79f4f8051a
Merge branch 'Fix_asso_description' into 'master'
...
Let use HTML tags in asso description
See merge request federez/re2o!136
2018-04-15 20:54:05 +02:00
Maël Kervella
48030d9a53
Let use HTML tags in asso description
2018-04-15 18:51:04 +00:00
chirac
b550794fc8
Merge branch 'custom_error_pages' into 'master'
...
Encode Error 500 image into base64
See merge request federez/re2o!135
2018-04-15 20:26:15 +02:00
Maël Kervella
e3209d77dc
Encode Error 500 image into base64
2018-04-15 18:20:33 +00:00
moamoak
21bfbed542
Merge branch 'fix_upload_img' into 'master'
...
Fix no img file
See merge request federez/re2o!134
2018-04-15 20:19:53 +02:00
Maël Kervella
a639e6a809
Do not display <img> on home page services when no image
2018-04-15 18:16:50 +00:00
Gabriel Detraz
68830f2e64
Fix no img file
2018-04-15 19:44:23 +02:00
chirac
8de1865a81
Merge branch 'custom_error_pages' into 'master'
...
Add custom Error 500 page
See merge request federez/re2o!133
2018-04-15 19:35:03 +02:00
Maël Kervella
1225af69bd
Add custom Error 500 page
2018-04-15 17:30:46 +00:00
chirac
6c6422aff3
Merge branch 'fix_upload_img' into 'master'
...
Fix #106
Closes #106
See merge request federez/re2o!132
2018-04-15 19:29:34 +02:00
Maël Kervella
98eae95632
Avoid duplicate settings and keeps comments
2018-04-15 17:26:28 +00:00
Gabriel Detraz
2337a24997
Fix #106
2018-04-15 19:09:37 +02:00
