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
chirac
311b13e694
Merge branch 'add_switch_name_to_ports_search_results' into 'dev'
...
Added switch name to port search results, moved link to switch on switch name…
See merge request federez/re2o!312
2018-09-26 15:34:32 +02:00
edpibu
7e36cbc7ba
Added switch name to port search results, moved link to switch on switch name rather than port number
2018-09-26 15:33:49 +02:00
chirac
c7949ac684
Merge branch 'fix_affichage_solde' into 'dev'
...
Fix affichage du solde
See merge request federez/re2o!311
2018-09-26 15:31:16 +02:00
edpibu
783c724f94
Fix affichage du solde
2018-09-26 15:29:56 +02:00
chirac
a6f65fd967
Merge branch 'js_fix_load_order' into 'dev'
...
Fix JavaScript not being load before the code using it.
See merge request federez/re2o!305
2018-09-24 17:21:07 +02:00
Alexandre Iooss
b6e4344893
Fix JavaScript not being load before the code using it.
2018-09-24 17:20:55 +02:00
chirac
1703d79bd8
Merge branch 'frontend_change_navbar_color' into 'dev'
...
Change navbar color back to black
See merge request federez/re2o!306
2018-09-24 17:20:49 +02:00
Alexandre Iooss
794aa65c06
Change navbar color back to black
2018-09-24 12:02:15 +02:00
chirac
3fd554041d
Merge branch 'gen_contrib_normalize' into 'dev'
...
Update gen_contrib.py to match current contributors.py
See merge request federez/re2o!300
2018-09-23 23:37:51 +02:00
Alexandre Iooss
1f35e6340b
Update gen_contrib.py to match current contributors.py
...
Now `manage.py gen_contrib` generates a contributors.py matching the
already existing format. It normalizes names to make the list more
enjoyable.
Before using this to seriously generate contributors.py we need to
figure out a way to add pseudo names, or tell everyone to change their
name on GitLab.
2018-09-23 23:31:26 +02:00
chirac
a584c37bcb
Merge branch 'apt_requirements_add_git' into 'dev'
...
Add git in apt_requirements.txt
See merge request federez/re2o!302
2018-09-23 23:30:58 +02:00
Alexandre Iooss
1f583643ab
Add git in apt_requirements
...
re2o/management/commands/gen_contrib.py uses git but it isn't in apt requirements.
Fix issue 174.
2018-09-23 23:01:45 +02:00
