27706 Commits

Author SHA1 Message Date
Calvo
784bd2dbcf Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-22 12:31:11 +01:00
Rafael Ameijeiras
3fcf4dfbc5 Merge branch 'ent-10737-15246-error-500-en-mapa-servicios-metaconsola' into 'develop'
Ent 10737 15246 error 500 en mapa servicios metaconsola

See merge request artica/pandorafms!5617
2023-03-22 10:34:42 +00:00
Pablo Aragon
41a20a90fa Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 11:23:14 +01:00
Pablo Aragon
904b526b30 Change pass login. Graph tree view width 2023-03-22 11:23:07 +01:00
daniel
5eaa4a10bb fixed styles 2023-03-22 11:13:56 +01:00
Rafael Ameijeiras
87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos'
# Conflicts:
#   pandora_console/install.php
2023-03-22 08:23:07 +00:00
artica
6e8eb9800f Auto-updated build strings. 2023-03-22 01:00:23 +01:00
daniel
64e5ceaea0 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-21 18:43:39 +01:00
daniel
732000f7bd fixed styles 2023-03-21 18:42:31 +01:00
Pablo Aragon
583ec8209c Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 18:12:11 +01:00
Pablo Aragon
99b845db3f progress bar 2023-03-21 18:12:02 +01:00
Jonathan
e2615b9593 Visual changes header 2023-03-21 17:02:03 +01:00
Daniel Cebrian
fe70d7d44b #10650 added image maintenance mode 2023-03-21 16:26:05 +01:00
Daniel Cebrian
a21e43a452 #10764 ignore selected action in fav menu 2023-03-21 15:40:46 +01:00
Jonathan
93f5b62bd2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 14:23:15 +01:00
Jonathan
a960644975 Omnishell fix view 2023-03-21 14:23:12 +01:00
daniel
64fc4bcd46 fixed styles 2023-03-21 14:06:28 +01:00
Pablo Aragon
1f7183c701 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 13:31:18 +01:00
Pablo Aragon
e8744b5d12 10712-New login 2023-03-21 13:31:11 +01:00
Jonathan
d2d8b43c87 Custom fields agent view change size svg 2023-03-21 13:09:32 +01:00
Daniel Cebrian
aec5e6b483 #10737 fixed error 500 in service map 2023-03-21 12:52:24 +01:00
Jonathan
9654ba4fa2 Snmp browser select multiple post 2023-03-21 12:35:25 +01:00
Calvo
834be58631 Fix erorrs 2023-03-21 12:28:46 +01:00
Calvo
cd2f8021f5 Updated MR netflow server 2023-03-21 12:12:54 +01:00
Calvo
1686a758b9 Updated MR netflow server 2023-03-21 12:11:07 +01:00
Jonathan
af00950dc5 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 12:07:25 +01:00
Jonathan
72778eb97c Wizzard template fix 2023-03-21 12:07:10 +01:00
Daniel Cebrian
8e88e0a603 #10747 fixed error 500 in agent 2023-03-21 11:45:38 +01:00
Calvo
803e23fbac Updated MR netflow server 2023-03-21 11:28:11 +01:00
Calvo
a69151a3ca Merge remote-tracking branch 'origin/develop' into ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow 2023-03-21 11:23:02 +01:00
Daniel Cebrian
388c6c3a2f fixed color in counter refresh in node 2023-03-21 11:07:44 +01:00
Daniel Cebrian
2db4ec6a2b fixed color in counter refresh 2023-03-21 10:53:23 +01:00
Daniel Cebrian
563e9e15c4 #9624 fixed conflics 2023-03-21 10:30:35 +01:00
Rafael Ameijeiras
361ecf4019 Merge branch 'ent-10411-15079-error-event-replication-en-vista-de-comentarios' into 'develop'
Fix events comment tags acl

See merge request artica/pandorafms!5544
2023-03-21 09:00:45 +00:00
Daniel Cebrian
ed7b46eb22 #9662 fixed url tactic in list groups 2023-03-21 09:56:36 +01:00
Jonathan
82dd6ebb37 Metaconsole view reports change 2023-03-21 09:52:21 +01:00
Daniel Cebrian
9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
artica
01e152a6e3 Auto-updated build strings. 2023-03-21 08:01:57 +01:00
artica
dc86557f19 Auto-updated build strings. 2023-03-21 08:01:57 +01:00
artica
fff8b78cb4 Auto-updated build strings. 2023-03-21 08:01:57 +01:00
artica
b9e546cbd6 Auto-updated build strings. 2023-03-21 08:01:57 +01:00
artica
f896eceb47 Auto-updated build strings. 2023-03-21 01:00:19 +01:00
artica
37940a2565 Auto-updated build strings. 2023-03-20 01:00:08 +01:00
artica
e64d9e2b7b Auto-updated build strings. 2023-03-19 01:00:12 +01:00
artica
426f756d16 Auto-updated build strings. 2023-03-18 01:00:23 +01:00
Jonathan
a1144ce7ab Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 13:35:46 +01:00
Jonathan
de538a10cb setup Performance visual changes 2023-03-17 13:35:43 +01:00
daniel
594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Daniel Cebrian
b81b7ce7af #fixed in fav menu when change name the original name 2023-03-17 12:25:43 +01:00
Jonathan
fd5347e893 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 12:15:13 +01:00