rezometz/re2o
8
0
Fork 0
mirror of https://gitlab.federez.net/re2o/re2o synced 2024-06-24 11:38:51 +00:00
Code Issues Releases Wiki Activity
2163 commits 211 branches 14 tags 12 MiB
Commit graph

2163 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandre Iooss 6faa1931c7 Delete handlebars JavaScript library 
It seems this library is useless and might even interfere with Django
templates during debug if something isn't rendered properly.
 2018-10-06 11:31:35 +02:00
klafyvel 69d1515aab Merge branch 'cleanup_api' into 'dev' 
Clean up of API code

See merge request federez/re2o!309
 2018-10-06 11:10:57 +02:00
Alexandre Iooss d673e4d54d Clean up of API code 
Automatic clean up that checks Python 2.7 compatibility, switch some
methods to static and rearrange code.
 2018-10-06 11:07:45 +02:00
klafyvel ee2ee0ad12 Merge branch 'cleanup_machines' into 'dev' 
Clean up of machines

See merge request federez/re2o!310
 2018-10-06 11:04:01 +02:00
Alexandre Iooss 48d5ab108c Autoformat code 2018-10-06 11:00:37 +02:00
Alexandre Iooss 1e9a4b3d32 Autoformat templates 2018-10-06 11:00:37 +02:00
Fardale 92e66bb18f Merge branch 'fix_trad_and_autocapture' into 'dev' 
Traductions, style et fixe de bugs sur la page d'enregistrement mac/room

See merge request federez/re2o!322
 2018-10-05 22:00:03 +02:00
Fardale 52818dab63 Correct typo with get_port_profile 2018-10-05 21:48:06 +02:00
Gabriel Detraz a933cda18f Traductions, style et fixe de bugs sur la page d'enregistrement mac/room 2018-10-05 21:29:48 +02:00
chirac 152b0a6421 Merge branch 'hotfix_typo_get_port_profile' into 'dev' 
Hotfix typo get port profile

See merge request federez/re2o!324
 2018-10-05 21:20:21 +02:00
Hugo LEVY-FALK f8ba60087e Hotfix : Typo dans le hotfix de la typo 2018-10-05 21:19:20 +02:00
Hugo LEVY-FALK e84c2a4f48 Hotfix : Typo dans le nom de get_port_profile 2018-10-05 21:19:20 +02:00
Hugo LEVY-FALK 6491fb0247 Hotfix : Typo dans le nom de get_port_profile 2018-10-05 21:19:20 +02:00
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