tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 00:34:46 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,058 Commits 34 Branches 30 Tags
Commit Graph

33058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan
a0bffb79bd Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 14:21:17 +01:00
Jonathan
10c0d95f34 Reports PDFS changes 2023-03-13 14:21:10 +01:00
Jose Gonzalez
1b4136d91e Minor fix 2023-03-13 14:10:20 +01:00
Jose Gonzalez
45ba4cdd15 Netflow 2023-03-13 14:03:00 +01:00
Jose Gonzalez
7bedd86e25 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 13:26:03 +01:00
Jose Gonzalez
5466cb5995 Netflow live view 2023-03-13 13:25:42 +01:00
daniel
0643b4e0ba fixed styles 2023-03-13 12:19:27 +01:00
Pablo Aragon
0203e5eba9 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-13 12:03:43 +01:00
Pablo Aragon
2cd09d7618 Datatable message info 2023-03-13 12:03:33 +01:00
Jose Gonzalez
590e7a3978 Netflow improvements 2023-03-13 11:25:43 +01:00
Jonathan
80076434b3 SNMP visual fix staticts 2023-03-13 10:29:03 +01:00
Jose Gonzalez
bbec6a92a4 Minor fixes 2023-03-13 09:35:12 +01:00
daniel
60f8c9bc95 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 07:55:43 +01:00
artica
87e165ff80 Auto-updated build strings. 2023-03-13 01:00:18 +01:00
artica
ef04e54058 Auto-updated build strings. 2023-03-12 01:00:40 +01:00
Jose Gonzalez
d449179765 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-11 02:10:23 +01:00
Jose Gonzalez
f553019a40 Minor fixes 2023-03-11 02:10:16 +01:00
Jose Gonzalez
39ace10629 Fix image issue with Networkmap 2023-03-11 02:08:37 +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