19163 Commits

Author SHA1 Message Date
Jonathan
3a96c60bac #10191 new event sound modal 2023-04-11 13:50:11 +02:00
alejandro.campos@artica.es
5f0e9aac69 fixed free string search 2023-04-11 13:48:08 +02:00
Daniel Cebrian
da2ede8627 #10420 fixed login ldap with quotes 2023-04-11 13:12:48 +02:00
alejandro.campos@artica.es
472c342f81 fixed collation compatibily with older mysql versions 2023-04-11 11:24:42 +02:00
Pablo Aragon
b3becfc861 10889-500 acustic console 2023-04-11 10:06:47 +02:00
artica
9da3816a88 Auto-updated build strings. 2023-04-11 01:00:13 +02:00
Daniel Maya
837092d17e #10002 Fixed comments 2023-04-10 16:57:22 +02:00
daniel
086f742455 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
	pandora_console/operation/agentes/ver_agente.php
2023-04-10 16:42:41 +02:00
daniel
c0172afc3d update composer 2023-04-10 16:38:37 +02:00
alejandro.campos@artica.es
6648ef34dd minor change 2023-04-10 16:02:28 +02:00
Pablo Aragon
8c1fa4b245 10835-Logs icons 2023-04-10 14:16:15 +02:00
Daniel Rodriguez
871a8f15c5 Merge branch 'ent-10873-mini-revision-de-consola-movil' into 'develop'
Ent 10873 mini revision de consola movil

See merge request artica/pandorafms!5671
2023-04-10 12:14:26 +00:00
daniel
ba1f299440 fixed add commet event 2023-04-10 10:35:47 +02:00
Pablo Aragon
8dfb01c7da 10854-Break word SNMP Console trap 2023-04-10 10:26:15 +02:00
Jonathan
55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00
Pablo Aragon
45ca03245c 10873-Mini mobile console review 2023-04-10 08:56:44 +02:00
artica
538f8266dc Auto-updated build strings. 2023-04-10 01:00:11 +02:00
artica
c5cd6b08e8 Auto-updated build strings. 2023-04-09 01:00:13 +02:00
artica
33904e3ed7 Auto-updated build strings. 2023-04-08 01:00:11 +02:00
artica
b1489c9245 Auto-updated build strings. 2023-04-07 01:00:14 +02:00
artica
86d6c24540 Auto-updated build strings. 2023-04-06 01:00:18 +02:00
Pablo Aragon
c8ca3ad68f 10848-Small input graph form 2023-04-05 17:29:28 +02:00
alejandro.campos@artica.es
d0aa931f46 setup check to enable/disable vc item alert frame 2023-04-05 16:24:46 +02:00
Jonathan
1dbe161ea9 Merge branch 'develop' into ent-9662-second-round 2023-04-05 14:37:13 +02:00
Pablo Aragon
5f6213f0f0 10863-Buttons Network maps 2023-04-05 14:15:23 +02:00
Daniel Rodriguez
ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop'
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
2023-04-05 11:55:20 +00:00
Pablo Aragon
2dc8b25ddc 10066-Recursion group widget alerts triggered 2023-04-05 12:59:52 +02:00
Jonathan
17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +02:00
Daniel Maya
91f2336ff4 #10740 heatmap improvements 2 2023-04-05 12:25:33 +02:00
Pablo Aragon
73d7345844 10067-Alerts triggered filter tree view 2023-04-05 09:14:01 +02:00
Rafael Ameijeiras
cc2709c42c Merge branch 'ent-10699-errores-en-los-mapas-varios' into 'develop'
Ent 10699 errores en los mapas varios

See merge request artica/pandorafms!5632
2023-04-05 06:47:31 +00:00
artica
ce43cc9bb2 Auto-updated build strings. 2023-04-05 01:00:19 +02:00
Jonathan
90b4b5d46d Merge branch 'develop' into ent-9662-second-round 2023-04-04 16:56:53 +02:00
Pablo Aragon
2ee17683e2 10859-Tree view buttons 2023-04-04 15:43:02 +02:00
Daniel Maya
dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00
Pablo Aragon
e10b072df8 10755-Horizontal graph legend 2023-04-04 14:30:43 +02:00
Jonathan
2d3c3b70e6 #10727 PDF correction agent event module 2023-04-04 14:27:47 +02:00
Jimmy Olano
89aa227b98 Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS.
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual

See merge request artica/pandorafms!5613
2023-04-04 11:57:45 +00:00
Jonathan
99b07a2fb2 Conflict solution 2023-04-04 11:35:26 +02:00
Jonathan
b1b516d664 Merge branch 'develop' into ent-10490-theme-base-de-tinymce 2023-04-04 11:31:47 +02:00
Jonathan
000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
Pablo Aragon
435c944c75 10375-Vertical align Tactical view 2023-04-04 09:50:00 +02:00
Matias Didier
e7d71cf99c Merge branch 'ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos' into 'develop'
Process inventory modules with correct xml and empty data

See merge request artica/pandorafms!5593
2023-04-04 07:24:44 +00:00
Pablo Aragon
e4c8097e9c 10402 remove passwords box & 10856 vcard 2023-04-04 09:24:29 +02:00
artica
0fb35a02fe Auto-updated build strings. 2023-04-04 01:00:15 +02:00
Calvo
1d6a0d049c Merge remote-tracking branch 'origin/develop' into ent-9676-modulos-de-inventario-se-actualicen-datos-cuando-venga-el-xml-con-nombre-y-sin-datos 2023-04-03 17:10:51 +02:00
Pablo Aragon
fdcdde6c78 10550-Credential store clean snmp fields 2023-04-03 15:35:46 +02:00
Pablo Aragon
f798149502 10653-ACL reporting 2023-04-03 14:09:37 +02:00
Daniel Rodriguez
e8f7246e54 Merge branch 'ent-10826-actualizacion-traducciones' into 'develop'
translates

See merge request artica/pandorafms!5647
2023-04-03 11:41:51 +00:00
Rafael Ameijeiras
2a5bf21621 Merge branch 'ent-10793-fallo-de-filtro-en-welcome-tips' into 'develop'
Ent 10793 fallo de filtro en welcome tips

See merge request artica/pandorafms!5626
2023-04-03 10:19:11 +00:00