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 |
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 |
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 |