rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 11:23:10 +00:00
Code Issues Releases Wiki Activity
1532 commits 211 branches 14 tags 12 MiB
Commit graph

1532 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
chirac
d911452ae0 Merge branch 'moamoak/pep8_and_pylint' into 'master' 
Pep8 and Pylint cleaning

See merge request federez/re2o!127
 2018-04-15 17:52:45 +02:00
Maël Kervella
f7f8f7493b Fix : various little things 2018-04-15 13:34:51 +00:00
Maël Kervella
6c30c36943 Fix : missing migrations 2018-04-15 10:54:53 +00:00
Maël Kervella
915d5e8931 Fix: user.models.User.auto_uid can't be static 2018-04-15 10:52:27 +00:00
Maël Kervella
0065e2e0f5 Fix unused variables in kwargs 2018-04-15 10:52:27 +00:00