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

26969 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 4bb88080ea Keep In process status for new events with same extra id 2023-04-14 08:59:19 +02:00
alejandro.campos@artica.es 23f0ffdf9e Keep In process status for new events with same extra id 2023-04-12 17:46:10 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
artica 9da3816a88 Auto-updated build strings. 2023-04-11 01:00:13 +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
Pablo Aragon 71d97593ed Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-04-10 14:16:19 +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 7302a108c0 fixed styles 2023-04-10 12:02:35 +02:00
Pablo Aragon 8dfb01c7da 10854-Break word SNMP Console trap 2023-04-10 10:26:15 +02:00
Pablo Aragon b4d3d0aa34 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-04-10 09:36:36 +02:00
Jonathan 55fc0c57ad Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php 2023-04-10 09:24:30 +02:00
Jonathan a0ae7327c7 Conflict solution inventory 2023-04-10 09:23:40 +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
Pablo Aragon 7b9d6fdca2 10871-Filter fixed in realtime snmp graph 2023-04-06 09:52:46 +02:00
artica 86d6c24540 Auto-updated build strings. 2023-04-06 01:00:18 +02:00
Jonathan 1dbe161ea9 Merge branch 'develop' into ent-9662-second-round 2023-04-05 14:37:13 +02:00
Pablo Aragon 514c1b300c 10867-Tactical view status 2023-04-05 14:33:06 +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
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +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
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
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
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
Calvo 764823c93f 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 10:25:58 +02:00
Matias Didier e4b718a468 Merge branch 'ent-10839-problema-con-buscador-agentes' into 'develop' 
Ent 10839 problema con buscador agentes

See merge request artica/pandorafms!5642
 2023-04-03 06:58:55 +00:00
Pablo Aragon 2dcba8c8fb 10643 2023-04-03 08:43:24 +02:00
artica 715cedb20f Auto-updated build strings. 2023-04-03 01:00:12 +02:00
artica 2bcd4de201 Auto-updated build strings. 2023-04-02 01:00:09 +02:00
artica 070105c766 Auto-updated build strings. 2023-04-01 01:00:17 +02:00
slerena 20df35e399 Removed border conflicting with white/black styles. 2023-03-31 12:29:35 +00:00
slerena 484c4d4d03 Update event row style (removed duped line) 2023-03-31 12:28:52 +00:00
slerena 07dcc57a5b Styles for events in default (white) style 2023-03-31 12:27:08 +00:00
daniel 631767aaef translates 2023-03-31 13:46:02 +02:00
Jonathan 8d950c3672 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-31 13:37:59 +02:00