rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-05-20 17:42:26 +00:00
Code Issues Releases Wiki Activity
1593 commits 211 branches 14 tags 12 MiB
Commit graph

1593 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
grisel-davy f7a74d3576 détection de la modification des objects du graph 2018-05-01 12:09:59 +02:00
Maël Kervella 5eaa9a2feb Fix #116: Remove default SOA in Extension & Force reversion context 
- The default for extension SOA is now None, else a new SOA named `SOA
to edit` was created when adding a new extension (because of the
get_or_create() )
- The mixins are now inside a reversion context else sometimes the
reversion context was not set and re2o would crash on the set_comment
 2018-04-29 16:34:05 +00: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
grisel-davy 4f4d10b799 ajout des serveurs sur le graph 2018-04-25 20:28:56 +02:00
Gabriel Detraz 9f153c49d8 Ca me broute donc je fais simple 2018-04-25 18:39:13 +02:00
Gabriel Detraz 2c02a9fb6b Factorise + fonctions pour recup switch et building d'une machine 2018-04-25 08:37:04 +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
grisel-davy e2f969f831 Modification esthetiques 2018-04-19 16:48:50 +02:00
Maël Kervella 8003634563 Add warning button: translation in dev 2018-04-18 20:13:11 +00:00
Gabriel Detraz 4e2f426c1d Short name ap 2018-04-18 21:27:06 +02:00
grisel-davy d6cc00c9d7 Correction d'erreur dans les labels 2018-04-18 18:59:55 +02:00
grisel-davy 22d49864a7 Ajout des bornes wifi 2018-04-18 18:38:59 +02:00
Gabriel Detraz 30140de2ae Des methodes raccourci pour mon gentil grizzly 2018-04-18 18:11:59 +02:00
Maël Kervella 9569e22df9 Set language button 2018-04-18 15:49:03 +00:00
grisel-davy f7b2e22d3c Templatisation du graphe 2018-04-18 16:48:46 +02:00
grisel-davy 736c676bbe Graph caché par défaut sur la page 2018-04-17 21:34:59 +02: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
Gabriel Detraz 6b3448986d Dossier media/images 2018-04-16 20:27:04 +02:00
chirac c64f71c2c4 Merge branch 'master' into graph_topo 2018-04-16 19:27:14 +02:00
chirac 42ddb747b7 Merge branch 'twitter_and_fb' into graph_topo 2018-04-16 19:26:15 +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