Commit Graph

713 Commits

Author SHA1 Message Date
Daniel Cebrian 8f8e5ecf45 #12376 multiple changes in general tactical view 2023-11-07 13:18:44 +01: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
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
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
Pablo Aragon 9603f90401 11839-Add check global_block_size 2023-08-31 12:23:46 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
daniel 512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel 98a5355c94 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 13:33:35 +02:00
daniel 97f25afef7 fixed session pandora_enterprise#11884 2023-08-14 13:25:37 +02:00
daniel 133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00
Jorge Rincon 7fc4788353 #11851 Fixed weird interval 2023-08-10 13:08:12 +02:00
Jorge Rincon f1cbe8c360 #11851 Fixed operation of the interval field, allowing to add more than one. 2023-08-09 12:47:51 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/65.sql
2023-08-09 08:59:01 +02:00
Daniel Maya 59ef20e214 #11739 Fixed date_format 2023-08-03 10:56:28 +02:00
Daniel Maya 8bbaa11ce3 resolved conflict 2023-07-31 09:44:46 +02:00
Daniel Rodriguez 42a5fc0716 Merge branch 'ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados-manualmente' into 'develop'
Ent-9301-anadir-token-de-mantenimiento-para-que-el-pandora_db-elimine-agentes-deshabilitados

See merge request artica/pandorafms!6051
2023-07-27 13:08:05 +00:00
alejandro.campos@artica.es 6114787764 Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-27 13:32:26 +02:00
Daniel Rodriguez 84f61c9022 Merge branch 'ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada' into 'develop'
Ent-10265-eliminar-gestion-de-mapas-via-ntop-antigua-funcionalidad-deprecada

See merge request artica/pandorafms!6028
2023-07-27 10:27:55 +00:00
Daniel Rodriguez c2d7c10442 Merge branch 'ent-11606-Quitar-consolas-visuales-legacy' into 'develop'
remove legacy visual console

See merge request artica/pandorafms!6140
2023-07-26 11:09:44 +00:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
Daniel Rodriguez 4148074996 Merge branch 'ent-11012-Flag-Experimental-para-la-consola' into 'develop'
added setup token

See merge request artica/pandorafms!6133
2023-07-21 07:23:33 +00:00
daniel c520375c61 ack utimestamp pandora_enterprise#11387 2023-07-19 13:28:53 +02:00
daniel 1f1b85561c Merge remote-tracking branch 'origin/develop' into ent-11387-post-mantener-conteo-y-comentarios-de-in-process-extra-id 2023-07-19 11:39:06 +02:00
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop'
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
2023-07-18 10:14:29 +00:00
daniel d3412a7ad1 add filter events comments pandora_enterprise#11387 2023-07-10 16:26:33 +02:00
Daniel Cebrian 496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
Gorka Sanchez 28f99d2c27 Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop'
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres

See merge request artica/pandorafms!5713
2023-06-30 11:39:50 +00:00
Rafael Ameijeiras 2092cfed71 Merge branch 'ent-11648-envio-de-correos-falla-si-se-tiene-la-encriptacion-de-contrasenas-habilitadas-en-771-772' into 'develop'
Draft: Ent 11648 Envío de correos falla si se tiene la encriptación de contraseñas habilitadas en 771-772.

See merge request artica/pandorafms!6177
2023-06-30 07:05:44 +00:00
alejandro.campos@artica.es 087c0c18cc Merge remote-tracking branch 'origin/develop' into ent-9781-14477-Control-reportes-SQL-Query-en-PDF 2023-06-29 12:00:44 +02:00
Daniel Cebrian 70ae1f20e4 #11648 fixed email send with encrypt password 2023-06-27 15:11:18 +02:00
alejandro.campos@artica.es 77ff766f84 remove legacy visual console 2023-06-19 15:25:37 +02:00
alejandro.campos@artica.es 1499af3a2d added setup token 2023-06-19 11:04:08 +02:00
Daniel Cebrian 052852f2d1 #10254 added timeout in active directory 2023-06-13 13:20:28 +02:00
Daniel Cebrian 8678df6982 #10254 added secondary server in ad 2023-06-13 12:37:28 +02:00
Daniel Cebrian 1980458572 #11437 added new control session 2023-06-08 14:06:15 +02:00