8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-28 18:03:45 +00:00
Commit graph

3256 commits

Author SHA1 Message Date
klafyvel
3db4f837a4 Merge branch 'refill_balance' into 'dev'
[cotisations] Replace Float by Decimal everywhere

See merge request federez/re2o!323
2018-10-03 22:36:34 +02:00
Maxime Bombar
5c8e90fde8 [cotisations] Replace Float by Decimal everywhere 2018-10-03 22:01:30 +02:00
chirac
f6dc63aac2 Merge branch 'reminder-display' into 'dev'
ffichage des reminders dans les preferences

See merge request federez/re2o!321
2018-09-30 20:36:47 +02:00
grisel-davy
d78c5f30d2 ffichage des reminders dans les preferences 2018-09-30 20:31:07 +02:00
chirac
064ec73cbc Merge branch 'fix_portprofile' into 'dev'
Frontend fix sur les editions de profils de port

See merge request federez/re2o!320
2018-09-29 23:35:53 +02:00
detraz
1774bcf82b Frontend fix sur les editions de profils de port 2018-09-29 23:34:38 +02:00
chirac
54273c29ee Merge branch 'fix_divers_front' into 'dev'
Fix edition des roles + kwargs edition user

See merge request federez/re2o!319
2018-09-29 22:59:19 +02:00
Gabriel Detraz
7d6ab9f7e7 Fix edition des roles + kwargs edition user 2018-09-29 22:53:17 +02:00
chirac
b6ded7720a Merge branch 'reminder-serializer' into 'dev'
serialization des rappel de fin de connexion

See merge request federez/re2o!317
2018-09-29 16:53:27 +02:00
grisel-davy
e723ce018d serialization des rappel de fin de connexion 2018-09-29 16:50:04 +02:00
chirac
7575453126 Merge branch 'fix_typo_ap' into 'dev'
Fixe une typo sur les bornes wifi -> access_point

See merge request federez/re2o!316
2018-09-28 18:30:21 +02:00
detraz
8dd4473d15 Fixe une typo sur les bornes wifi -> access_point 2018-09-28 18:15:29 +02:00
chirac
bbf77adda4 Merge branch 'frontend_fix_fa_footer' into 'dev'
Fix Font Awesome icons and footer

See merge request federez/re2o!315
2018-09-28 14:20:00 +02:00
Alexandre Iooss
129d22d7c5 Change Glyphicon to Font Awesome on login page 2018-09-28 12:37:49 +02:00
Alexandre Iooss
26e68a0ac0 Fix footer not being on footer 2018-09-28 12:37:23 +02:00
Alexandre Iooss
7f6e300033 Fix right sidebar when user is disconnected 2018-09-27 22:35:04 +02:00
Alexandre Iooss
0f7f14c1ea Fix Font Awesome icons
Some icons had their id changed in the Debian version (4.7.0) so their
id need to be updated.

Also the width of an icon in a button was reduced to make it more
compact.
2018-09-27 22:23:45 +02:00
grizzly
8045645502 Merge branch 'switch_conf' into 'dev'
Switch conf

See merge request federez/re2o!308
2018-09-27 16:34:59 +02:00
detraz
42d2f80470 Fix divers 2018-09-27 16:32:21 +02:00
Antoine Vintache
6652e33d8c Modification , utilisation de history button 2018-09-27 16:32:21 +02:00
Antoine Vintache
1ffb481aef Ajout de l'affichage des switchs dans la liste des modèles de switchs. 2018-09-27 16:32:21 +02:00
Gabriel Detraz
eded66beb0 Gestion des switchs à provisioner automatiquement 2018-09-27 16:32:21 +02:00
detraz
b44021a98b Fix bugs et simplifie les migrations de switchs 2018-09-27 16:32:21 +02:00
Gabriel Detraz
bd58c259ee Et la migration pour sftp 2018-09-27 16:32:21 +02:00
Gabriel Detraz
8a22dc1e02 Mode de provision sftp 2018-09-27 16:32:21 +02:00
Gabriel Detraz
3c22ea4e89 Export de l'ensemble des ip du switch 2018-09-27 16:32:21 +02:00
Gabriel Detraz
ae0f134cc7 Crée spécific role, l'utilise pour get l'ip du serveur des config switchs 2018-09-27 16:32:21 +02:00
Gabriel Detraz
6c41f90398 N'affiche pas la clef radius en clair dans le menu preferences 2018-09-27 16:32:21 +02:00
Gabriel Detraz
c12b3575dd Bricoles d'affichage 2018-09-27 16:32:21 +02:00
Gabriel Detraz
ca2e0172a1 Serialisation pour export vers re2o-services 2018-09-27 16:32:21 +02:00
Gabriel Detraz
b4af276b14 Stockage des creds d'identification des switchs 2018-09-27 16:32:21 +02:00
Gabriel Detraz
73610c3417 Methode str pour les clefs radius 2018-09-27 16:32:21 +02:00
Gabriel Detraz
76183df6a8 Gestion automatique des switchs, affichage plus clair 2018-09-27 16:32:21 +02:00
Gabriel Detraz
b9dbce8ccc Gestion de la clef radius, et serialisation 2018-09-27 16:32:21 +02:00
Gabriel Detraz
282ea9b2c6 Bricoles, web management ssl 2018-09-27 16:32:21 +02:00
Gabriel Detraz
49411450af Migration preferences ssl + merge 2018-09-27 16:32:21 +02:00
Gabriel Detraz
54326a35b9 Renvoie le mode plain ou ssl pour webmanagement 2018-09-27 16:32:21 +02:00
Gabriel Detraz
396853db0e Serialisation des réglages pour la provision 2018-09-27 16:32:21 +02:00
Gabriel Detraz
5184fc165f Repare mes bétises à moi sur massive bootstrap form 2018-09-27 16:32:21 +02:00
Gabriel Detraz
daaeb00e89 Complete_name d'un switch 2018-09-27 16:32:21 +02:00
Gabriel Detraz
cedd49e909 Serialisation du constructeur 2018-09-27 16:32:21 +02:00
Gabriel Detraz
07eddfffb7 Optimisation chargement des switchs 2018-09-27 16:32:21 +02:00
Gabriel Detraz
29f00f21cd Stockage du firmware dans la bdd 2018-09-27 16:32:21 +02:00
Gabriel Detraz
d2d6f7e5e4 Gestion igmp et mld par vlan 2018-09-27 16:32:21 +02:00
Gabriel Detraz
30bb38d75f Serialisation des roles et réglages par vlan des switches 2018-09-27 16:32:21 +02:00
Gabriel Detraz
20126a3cd6 Serialisation de la liste des vlans 2018-09-27 16:32:21 +02:00
Gabriel Detraz
aec2c645a2 Serialisation de la conf des swicthes 2018-09-27 16:32:21 +02:00
chirac
916ec9789f Merge branch 'show_more_info_switch' into 'dev'
Added info on switch page

See merge request federez/re2o!314
2018-09-26 15:44:51 +02:00
edpibu
b2c871556a Modified arguments passed to template 2018-09-26 15:44:27 +02:00
edpibu
bc5b7c63be Added info on switch page 2018-09-26 15:44:27 +02:00