tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
33,041 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

33041 Commits

Author SHA1 Message Date
artica ef04e54058 Auto-updated build strings. 2023-03-12 01:00:40 +01:00
artica a4d1d2c9b2 Auto-updated build strings. 2023-03-11 01:00:20 +01:00
daniel 3c7592dffe Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5592
 2023-03-10 13:52:58 +00:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 8778fcea93 fixed styles 2023-03-10 14:49:38 +01:00
Pablo Aragon 427ecf96e4 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 13:03:35 +01:00
Pablo Aragon ceed3c5d51 Alert details validation 2023-03-10 13:02:23 +01:00
Matias Didier 7d6452554f Merge branch 'ent-10551-Al-crear-actualizar-CV-con-espacios-se-meten-entities-en-el-nombre' into 'develop' 
fixed entities

See merge request artica/pandorafms!5578
 2023-03-10 11:54:46 +00:00
Jose Gonzalez f875fe674e Fix main_menu_icons 2023-03-10 12:52:18 +01:00
Jose Gonzalez a065833117 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 12:48:50 +01:00
Jose Gonzalez bb6bf85537 Minor visual fixes 2023-03-10 12:48:31 +01:00
Jose Gonzalez dc216ff788 Tree view black 2023-03-10 12:47:44 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Pablo Aragon b785696acd Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 12:29:24 +01:00
Pablo Aragon 000874ea6e CSV button datatable. IPAM fix 2023-03-10 12:29:13 +01:00
Rafael Ameijeiras f2fb22da3c Merge branch 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' into 'develop' 
Ent 9073 nuevo sistema de tips de bienvenida

See merge request artica/pandorafms!5525
 2023-03-10 10:47:58 +00:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' 
# Conflicts:
#   pandora_console/pandoradb.sql
 2023-03-10 10:41:08 +00:00
Jose Gonzalez 5b748d8ec0 Added images 2023-03-10 11:12:26 +01:00
Jose Gonzalez 3f884d9aff Tree View fixed 2023-03-10 11:09:36 +01:00
Pablo Aragon 92e5c4efa0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 08:40:48 +01:00
Pablo Aragon ae6159c7a1 Events 2023-03-10 08:40:38 +01:00
daniel 8736629954 fixed styles 2023-03-10 08:38:44 +01:00
artica 0cfe85770f Auto-updated build strings. 2023-03-10 01:00:21 +01:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
daniel 30a28c7432 Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5589
 2023-03-09 19:03:28 +00:00
daniel 9aa5d76963 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-09 20:00:32 +01:00
daniel 312efeaa1e Merge branch 'ent-10281-descuadre-vista-snmp-console' into 'develop' 
Ent 10281 descuadre vista snmp console

See merge request artica/pandorafms!5526
 2023-03-09 18:59:36 +00:00
daniel 89b3be06f9 fixed styles 2023-03-09 19:57:37 +01:00
daniel 6d0b0039c5 fixed styles 2023-03-09 19:25:14 +01:00
Jose Gonzalez e8e4d79336 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 17:42:19 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Jonathan ff1b9b3b2b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 17:21:54 +01:00
Jonathan a9de0496f6 tables graphs info_table class 2023-03-09 17:21:36 +01:00
Pablo Aragon 188ad07be0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 17:21:29 +01:00
Pablo Aragon d3ed5a93fc Admin tools 2023-03-09 17:21:18 +01:00
Jose Gonzalez d4fa2831bf Inventory tab 2023-03-09 16:44:45 +01:00
Jose Gonzalez a41811ee58 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 16:37:49 +01:00
Jose Gonzalez a9abda1fd4 Network maps adjust 2023-03-09 16:37:43 +01:00
Jonathan 068f23f278 Tables icon svg correction reports 2023-03-09 16:33:58 +01:00
Rafael Ameijeiras bcc1775b1b Merge branch 'ent-10350-GISS-Pierden-acceso-a-Metaconsola-mientras-dura-la-ejecucion-de-pandoradb' into 'develop' 
handling synchronizer instantiation when metaconsole is merging

See merge request artica/pandorafms!5580
 2023-03-09 15:28:20 +00:00
Jonathan 7b3ed98d4b Agent inventory fix graph 2023-03-09 16:28:08 +01:00
Jonathan 13261a1298 Availability Graph correction 2023-03-09 16:08:33 +01:00
Pablo Aragon cbc05f7ea0 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 15:15:06 +01:00
Pablo Aragon 2a97b26cfe Admin tools 2023-03-09 15:14:47 +01:00
daniel 1a63f8070a fixed styles 2023-03-09 15:06:03 +01:00
Jonathan 72a3cb0e3f Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 14:15:23 +01:00
Jonathan 1e2657fed3 Chart generator bug solution 2023-03-09 14:15:18 +01:00
Diego Muñoz-Reja c977188e75 Merge branch 'ent-9883-mejora-de-informes-de-inventario-de-monitorizacion' into 'develop' 
Ent 9883 mejora de informes de inventario de monitorizacion

See merge request artica/pandorafms!5490
 2023-03-09 11:28:48 +00:00
Jose Gonzalez a59a6153cc Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-09 11:43:45 +01:00
Jose Gonzalez d8cdb13b59 Fix minor issue 2023-03-09 11:43:36 +01:00