Commit Graph

183 Commits

Author SHA1 Message Date
Jonathan c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
miguel angel rasteu b89f182e19 #12213 Resolve conflicts 2023-12-01 10:31:50 +01:00
Diego Muñoz-Reja c4e5a3bebd Merge branch 'ent-12088-colocar-enlace-de-la-consola-web-en-mensaje-del-correo-electronico-cuando-no-se-tenga-acceso' into 'develop'
Ent 12088 colocar enlace de la consola web en mensaje del correo electronico cuando no se tenga acceso

See merge request artica/pandorafms!6501
2023-11-30 12:48:00 +00:00
Matias Didier 9919de1d66 Merge branch 'ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para' into 'develop'
Ent 11026 si el token automatically check for updates esta desactivado no debe mostrar aviso para

See merge request artica/pandorafms!6392
2023-11-27 12:24:45 +00:00
miguel angel rasteu b0125d943e #12138 Resolve conflict 2023-11-27 11:51:00 +01:00
Rafael Ameijeiras ad8e3ac44f Merge branch 'ent-11436-envio-de-correo-electronico-con-advertencia-a-pesar-de-ya-haber-cambiado-la-configuracion' into 'develop'
Ent 11436 envio de correo electronico con advertencia a pesar de ya haber cambiado la configuracion

See merge request artica/pandorafms!6464
2023-11-27 10:40:19 +00:00
miguel angel rasteu 262affeb74 Merge branch 'develop' into ent-12138-eliminar-agent-access-graph 2023-11-27 08:18:35 +01:00
Jonathan aa6aa08df3 #11026 autoupdate as string 2023-11-20 14:49:26 +01:00
Jonathan d1b2bf1ee2 Merge branch 'develop' into ent-11026-si-el-token-automatically-check-for-updates-esta-desactivado-no-debe-mostrar-aviso-para 2023-11-20 14:33:49 +01:00
Daniel Rodriguez 1f8554e8d1 Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop'
Ent 11914 editor de alertas de logs

See merge request artica/pandorafms!6505
2023-10-23 12:34:32 +00: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 58261effaf #11914 Added update 2 2023-10-11 17:12:10 +02:00
Daniel Maya f5535a1fc8 #11914 Added update 2023-10-11 17:10:14 +02:00
miguel angel rasteu f058ec5df8 #12213 Fix warp update notification 2023-10-11 08:12:55 +02:00
miguel angel rasteu 3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
Daniel Maya 06e42de207 #11391 Fixed date 2023-10-02 12:39:40 +02:00
alejandro.campos@artica.es 3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
alejandro.campos@artica.es 831ed2570d implemented cron in open 2023-09-27 11:35:57 +02:00
miguel angel rasteu e747e4ef74 #12088 Fix notification 2023-09-26 13:02:07 +02:00
miguel angel rasteu 746b9e48d0 #11436 Fix total agents 2023-09-19 17:50:04 +02:00
miguel angel rasteu eed7ff8aba #11436 Fix notif access stastics performance 2023-09-19 16:18:58 +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
miguel angel rasteu 793c953e07 #11947 Fix notification 2023-09-06 10:38:09 +02:00
Jonathan 4129833a38 #11026 message update only for token enable 2023-09-01 11:44:12 +02:00
Pablo Aragon 9603f90401 11839-Add check global_block_size 2023-08-31 12:23:46 +02:00
miguel angel rasteu df6d0655d1 #11947 Fix agentaccess evaluate 2023-08-29 13:30:05 +02:00
miguel angel rasteu ebd98b479d #11051 Fix conflict css 2023-08-21 09:01:05 +02:00
miguel angel rasteu 970cc997cc #11051 Fix conflict 2023-08-21 08:25:53 +02:00
Rafael Ameijeiras 9c4825f03e Merge branch 'ent-10905-comprobacion-en-el-servidor-de-que-tiene-acceso-a-la-api' into 'develop'
Ent-10905-comprobacion-en-el-servidor-de-que-tiene-acceso-a-la-api

Closes pandora_enterprise#10905

See merge request artica/pandorafms!6289
2023-08-21 06:15:45 +00:00
Félix Suárez 06bba6c2b2 Add events and notifications 2023-07-27 11:58:06 -06: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
miguel angel rasteu 567bfdcbb7 #11737 Fix version 2023-07-17 13:08:13 +02:00
miguel angel rasteu f96adf59e9 #11737 Fix pgp update required message 2023-07-17 10:16:13 +02:00
Matias Didier 676b7a9302 Merge branch 'ent-11040-valores-para-notif.security.default_password-grabados-a-fuego-con-md5' into 'develop'
Ent 11040 Valores para NOTIF.SECURITY.DEFAULT_PASSWORD grabados "a fuego" con MD5

See merge request artica/pandorafms!6086
2023-07-12 11:25:20 +00:00
Matias Didier 01de48631c Merge branch 'ent-11441-15692-aviso-sobre-agent-access-statistics-aparece-cada-dia' into 'develop'
Ent 11441 15692 aviso sobre agent access statistics aparece cada dia

See merge request artica/pandorafms!6060
2023-07-11 13:20:08 +00:00
miguel angel rasteu 5f864d53a8 #11051 Add action to mark all notification as read 2023-07-03 09:18:30 +02:00
Diego Muñoz-Reja 7471e0ef24 Merge branch 'ent-11461-aviso-fuera-soporte-mysql-5-y-php-8-0' into 'develop'
Ent 11461 aviso fuera soporte mysql 5 y php 8 0

See merge request artica/pandorafms!6040
2023-06-26 08:57:11 +00:00
miguel angel rasteu 19e5529c18 #11461 Fix mysql compare version 2023-06-26 08:42:49 +02:00
Daniel Cebrian 114f1661fa #11040 changed default password in checkDefaultPassword() function 2023-06-12 17:06:42 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
miguel angel rasteu f22f6634d1 #11441 Add agentaccess to msg conditional 2023-06-07 16:12:10 +02:00
miguel angel rasteu 88d64a0e09 #11461 Fix notify 2023-06-06 12:06:27 +02:00
miguel angel rasteu d6f296553f #11461 Add warning about php and mysql versions 2023-06-06 12:03:18 +02:00
Félix Suárez 593d197016 Remove reference to tnetwork_matrix 2023-06-04 16:12:29 -06:00
Rafael Ameijeiras bcc1775b1b Merge branch 'ent-10350-GISS-Pierden-acceso-a-Metaconsola-mientras-dura-la-ejecucion-de-pandoradb' into 'develop'
handling synchronizer instantiation when metaconsole is merging

See merge request artica/pandorafms!5580
2023-03-09 15:28:20 +00:00
alejandro.campos@artica.es f47e2dda8c handling synchronizer instantiation when metaconsole is merging 2023-03-06 17:27:21 +01:00
Daniel Cebrian c8096d73b2 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 14:58:25 +01:00