Commit Graph

747 Commits

Author SHA1 Message Date
Jonathan 5a8a8c6139 #13378 fix pandorarc switch on 2024-04-08 17:09:45 +02:00
Juan Antonio Loarte aec6f81fb9 Merge branch 'ent-12973-17187-tamano-de-la-etiqueta-de-un-elemento-en-consola-visual-ocupa-mucho-espacio-extra' into 'develop'
Ent 12973 17187 tamano de la etiqueta de un elemento en consola visual ocupa mucho espacio extra

See merge request artica/pandorafms!7039
2024-04-05 11:49:52 +00:00
Daniel Rodriguez 16e6755214 Merge branch 'ent-13004-mejorar-sincronizacion-agentes-inventario-pandora-itsm' into 'develop'
update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004

See merge request artica/pandorafms!7047
2024-04-01 16:22:01 +00:00
daniel 9dfc052e2f Merge remote-tracking branch 'origin/develop' into ent-13004-mejorar-sincronizacion-agentes-inventario-pandora-itsm
Conflicts:
	pandora_console/godmode/setup/setup_ITSM.php
2024-04-01 08:06:35 +02:00
Daniel Cebrian 567f1bb1ca Merge remote-tracking branch 'origin/develop' into ent-11634-eliminar-ha-antigua 2024-03-25 15:01:36 +01:00
Diego Muñoz-Reja 3e5ecb6574 Merge branch 'ent-13135-cambiar-comportamiento-menu-derecho-elegir-opciones-en-el-setup' into 'develop'
Ent 13135 cambiar comportamiento menu derecho elegir opciones en el setup

See merge request artica/pandorafms!7067
2024-03-25 11:37:05 +00:00
Pablo Aragon ae23649037 13135-Add options Menu tabs in Visual styles 2024-03-22 10:52:20 +01:00
Pablo Aragon 61b51aa75d 13134-Set default login splash image 2024-03-21 15:03:51 +01:00
daniel 75f416ae50 update endpoints and add new fields integration pandoraitsm pandora_enterprise#13004 2024-03-19 19:21:54 +01:00
Daniel Maya a5ddef0b77 #12973 Added vc_text_margin 2024-03-18 11:49:38 +01:00
Rafael Ameijeiras d3f931703b Merge branch 'ent-12630-guardia-15143-problemas-con-cifrado-de-contrasenas-smtp' into 'develop'
Ent 12630 guardia 15143 problemas con cifrado de contrasenas smtp

See merge request artica/pandorafms!6753
2024-03-06 08:42:13 +00:00
Daniel Cebrian cc43ab26db #11634 deleted ha legacy 2024-02-15 16:25:11 +01:00
Rafael Ameijeiras e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop'
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
2024-01-25 14:00:56 +00:00
Daniel Cebrian 4fc3013cc3 #12522 fixed multiple audit when update setup 2024-01-24 09:15:32 +01:00
Daniel Cebrian 0ceb578717 #12522 fixed audit log in setup 2024-01-17 16:48:38 +01:00
Daniel Cebrian 110d7f4842 #12323 added netflow interval select 2024-01-02 12:57:02 +01:00
daniel 27a83a8eb5 Merge remote-tracking branch 'origin/develop' into ent-12201-eastern-egg-setup
Conflicts:
	pandora_console/include/functions_config.php
2023-12-14 16:36:11 +01:00
Jonathan 6e60d19193 #8365 ftp server ip 2023-12-12 15:46:42 +01:00
Daniel Maya a019f72f1e #12630 Fixed double safe_input 2023-12-11 16:42:32 +01:00
Daniel Maya e9d0002d4e #12630 Fixed double safe_input 2023-12-11 15:26:57 +01:00
Matias Didier 874e60bf55 Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop'
Ent 12248 mover token de configuracion s flow a la seccion de netflow

See merge request artica/pandorafms!6621
2023-11-30 13:05:46 +00:00
Jorge Rincon 34f9e0df49 Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico 2023-11-27 15:52:41 +01:00
miguel angel rasteu 262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +01:00
Jorge Rincon 1f51b0475e #12201 Added configuration in the setup for easter egg 2023-11-24 13:12:12 +01:00
Jorge Rincon e60b97c234 Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico 2023-11-20 15:32:06 +01:00
Ramon Novoa 8ec1432414 Merge remote-tracking branch 'origin/develop' into ent-11125-pandora-security-monitoring-vulnerability-scanner 2023-11-10 09:53:17 +01:00
Daniel Cebrian cacb524ece #12376 changed label in new token 2023-11-07 13:28:35 +01:00
Daniel Cebrian 8f8e5ecf45 #12376 multiple changes in general tactical view 2023-11-07 13:18:44 +01:00
Jonathan 495c4d861f #12248 move nflow to netflow config 2023-11-03 11:35:30 +01:00
Jonathan 1362ff0967 Revert "#12248 change setup netflow tab"
This reverts commit 1412480b4d.
2023-11-03 11:32:54 +01:00
Jonathan 1412480b4d #12248 change setup netflow tab 2023-11-03 09:54:56 +01:00
Daniel Cebrian 5e497db840 #11126 moved token vulnerabilities to enterprise 2023-10-25 11:48:49 +02:00
Daniel Cebrian a862a8018c #11126 added token in config agent and setup 2023-10-24 18:02:14 +02:00
Daniel Rodriguez 9aee38aa0b Merge branch 'ent-11391-pandora-indexer-cambios-en-el-collector-de-logs' into 'develop'
#11391 Fixed ace editor and log viewer

See merge request artica/pandorafms!6461
2023-10-23 07:19:51 +00:00
Daniel Maya ef1cd39cac #11391 Changed Days_purge_old_information 2023-10-19 11:31:22 +02:00
alejandro.campos@artica.es c059f83420 some changes in gotty 2023-10-09 18:56:02 +02:00
Daniel Maya 3479245a6b #11391 Fixed https 2023-10-06 13:34:21 +02:00
miguel angel rasteu 3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
Daniel Maya 528c5a726a Merge branch 'develop' into ent-11391-pandora-indexer-cambios-en-el-collector-de-logs 2023-10-02 10:27:14 +02:00
alejandro.campos@artica.es 85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +02:00
alejandro.campos@artica.es 3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
Jorge Rincon 01bf91f213 #11127 Added token Number of modules in queue 2023-09-22 13:13:06 +02:00
miguel angel rasteu 954a225279 #12090 Fix intervals 2023-09-19 17:47:12 +02:00
Rafael Ameijeiras a75369aeda Merge branch 'ent-11839-error-en-direccion-url-por-correo-electronico-con-incorrect-config-value-y-error-en-causa-raiz' into 'develop'
Ent 11839 error en direccion url por correo electronico con incorrect config value y error en causa raiz

See merge request artica/pandorafms!6381
2023-09-18 13:18:36 +00:00
Daniel Maya a0dcdb88b0 #11391 Fixed ace editor and log viewer 2023-09-13 15:19:42 +02:00
daniel 802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
miguel angel rasteu 99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
daniel 3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
daniel fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00