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

34077 Commits

Author SHA1 Message Date
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
Rafael Ameijeiras a46c5617b8 Merge branch 'ent-10887-anadir-el-template-a-los-spec-del-server' into 'develop' 
10887 adding template files to server spec

See merge request artica/pandorafms!5675
 2023-04-10 14:24:26 +00:00
Pablo Aragon a3ed2b1f6b 10320-Confirm delete user 2023-04-10 16:10:44 +02:00
alejandro.campos@artica.es 6648ef34dd minor change 2023-04-10 16:02:28 +02:00
Pablo Aragon bf76104350 10327-Change snmp_version when network_component change 2023-04-10 15:41:18 +02:00
Rafael 60f3e74358 10887 adding .template file in a .spec for pandora server 2023-04-10 15:27:31 +02:00
Rafael e1b05c9569 Merge branch 'develop' into ent-10887-anadir-el-template-a-los-spec-del-server 2023-04-10 15:14:16 +02:00
rafael b074b1bb03 10887 adding template files to server spec 2023-04-10 14:43:33 +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
alejandro.campos@artica.es 3b7e57c93f implemented massive edition of safe operation mode 2023-04-10 12:33:18 +02:00
daniel ad8401413b update composer 2023-04-10 12:33:06 +02:00
alejandro.campos@artica.es c2a21a42ca implemented massive edition of safe operation mode 2023-04-10 12:31:49 +02:00
daniel 7302a108c0 fixed styles 2023-04-10 12:02:35 +02:00
Rafael Ameijeiras f68cd81d35 Merge branch 'ent-10864-conflicto-mergeo-fichero-ver_agentes-php' into 'develop' 
Ent 10864 conflicto mergeo fichero ver agentes php

See merge request artica/pandorafms!5663
 2023-04-10 09:36:44 +00:00
alejandro.campos@artica.es 40b8bcf0eb minor fix 2023-04-10 10:48:51 +02: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
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
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 Leon 8e960821cc Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5667
 2023-04-05 12:38:26 +00: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
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
alejandro.campos@artica.es 1b93472426 minor fix in cps selector 2023-04-05 12:38:23 +02:00
Daniel Maya 91f2336ff4 #10740 heatmap improvements 2 2023-04-05 12:25:33 +02:00
Calvo 92786afa3e Macro _moduledata_X_ image substitution 2023-04-05 11:59:23 +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 Leon f1b098744d Merge branch 'ent-9662-second-round' into 'develop' 
Ent 9662 second round

See merge request artica/pandorafms!5661
 2023-04-04 14:58:55 +00: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 Rodriguez 4d30dca6e0 Merge branch 'ent-10726-guardia-15229-no-se-pueden-sincronizar-colecciones-en-v769' into 'develop' 
Revert "Explicitly use LWP::Protocol::https (required for HTTPS connections)."

See merge request artica/pandorafms!5644
 2023-04-04 13:25:55 +00:00
Daniel Maya dc654c0b6d #10740 heatmap improvements 2023-04-04 15:14:10 +02:00