Commit Graph

85 Commits

Author SHA1 Message Date
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Rafael Ameijeiras ce38970c38 Merge branch 'ent-12007-16207-error-vmware-en-discovery-por-falta-de-atributo' into 'develop'
Changed version for VMware discovery plugin

See merge request artica/pandorafms!6439
2023-09-18 13:19:33 +00:00
alejandro.campos@artica.es f410f09745 change mr 2023-09-14 10:43:35 +02:00
Enrique Martin 64effb2e91 Added Proxmox discovery APP to MR and pandoradb_data 2023-09-12 11:48:29 +02:00
Enrique Martin 6f5b20ac54 Changed version for VMware discovery plugin 2023-09-12 09:51:49 +02:00
Jorge Rincon 764d5908bb Merge branch 'develop' into ent-10065-post-filtros-de-eventos-privados 2023-09-11 10:58:37 +02:00
Calvo c4271bf737 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-07 17:58:27 +02:00
Daniel Cebrian 39a44828fc Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-07 13:55:48 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop'
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
2023-09-05 07:50:45 +00:00
Daniel Cebrian a417b15d6f Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-05 09:23:35 +02:00
Alejandro Campos fa5af7efab Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-09-04 11:50:03 +00:00
daniel 1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
2023-09-04 08:16:48 +02:00
Calvo 788b6f9c26 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-09-01 13:30:28 +02:00
Calvo 2fc08b7246 Added enable MADE option to modules and bulk op 2023-08-31 18:07:26 +02:00
Jonathan 84bb4780ca #10639 new datepicker style and save filter 2023-08-29 12:17:41 +02:00
Pablo Aragon 6757e69a75 11423-Graph analytics. Resolve Confict 2023-08-23 11:55:41 +02:00
Daniel Cebrian 61839db7ff #11807 new report list of checks agent 2023-08-22 16:28:01 +02:00
Alejandro Campos ad4a46d2b1 Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-08-22 08:43:10 +00:00
Pablo Aragon ce1c8cdbb7 11423-Graph analytics. Before Share & Export 2023-08-22 10:04:33 +02:00
Jorge Rincon 76b3e1da4a #10065 Fixed query that adds private_filter_user field in the database 2023-08-21 13:29:58 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
2023-08-21 08:08:34 +02:00
Daniel Cebrian 0696ca60da Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-08-18 14:48:47 +02:00
Jorge Rincon 3e4178c490 Merge branch develop into ent-10065-post-filtros-de-eventos-privados 2023-08-18 09:19:57 +02:00
Jorge Rincon baa63eac77 Merge branch develop into ent-11595-tip-de-bienvenida-planned-stops 2023-08-18 09:02:14 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel 64c7f56235 ITSM pandora_enterprise#11471 2023-08-14 10:59:56 +02:00
daniel 554570fda0 ITSM pandora_enterprise#11471 2023-08-11 14:31:20 +02:00
Jorge Rincon 3429e0d190 #10065 Added the option to create-edit a private event filter. 2023-08-07 14:43:50 +02:00
Daniel Cebrian bc66f71e14 #11807 added report vul_by_cat 2023-08-07 12:42:05 +02:00
alejandro.campos@artica.es 9f76e7cc83 update mr 2023-08-03 09:09:13 +02:00
alejandro.campos@artica.es 27766d9650 remove snmp version 2 2023-08-02 11:07:24 +02:00
Daniel Cebrian a0fdb2a791 #11326 new report vulnerabilities 2023-07-28 12:11:36 +02:00
alejandro.campos@artica.es c8393ae210 fixed snmp traps time 2023-07-18 10:40:33 +02:00
Jorge Rincon 89355f07a4 #11595 The title and the url of the Tip are updated in the English language. 2023-06-16 12:03:44 +02:00