tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,904 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

692 Commits

Author SHA1 Message Date
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 99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
Pablo Aragon 9603f90401 11839-Add check global_block_size 2023-08-31 12:23:46 +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 97f25afef7 fixed session pandora_enterprise#11884 2023-08-14 13:25:37 +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 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 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
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
Félix Suárez 17262c45e0 FrontEnd display and Token DB update 2023-06-06 16:02:04 -06:00
Félix Suárez 593d197016 Remove reference to tnetwork_matrix 2023-06-04 16:12:29 -06:00
Daniel Maya 4f1d5e217a #11416 Added recursive group search in AD 2023-06-01 12:00:46 +02:00
Jorge Rincon be197de69a #11157 Adjusted URL update manager 2023-05-10 11:52:46 +02:00
alejandro.campos@artica.es f2cbfd930c implement sql query item limit 2023-05-03 13:44:58 +02:00
Daniel Rodriguez 191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop' 
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
 2023-04-28 06:07:10 +00:00
miguel angel rasteu dc41e1c377 fix if in header and declare correctly a value 2023-04-13 11:36:13 +02:00
miguel angel rasteu c26db22fa5 #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-04-13 11:07:09 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
alejandro.campos@artica.es d0aa931f46 setup check to enable/disable vc item alert frame 2023-04-05 16:24:46 +02:00
Matias Didier 9344bd16c9 Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop' 
Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
 2023-03-30 12:39:06 +00:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Jonathan 3057e67d1f Merge conflict solution 2023-03-27 12:11:53 +02:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop' 
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
 2023-03-24 07:25:52 +00:00
daniel 96d03ca31c Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-23 17:47:58 +01:00
Rafael Ameijeiras 766664470d Merge branch 'ent-9893-nuevo-sistema-de-ha' into 'develop' 
Ent 9893 nuevo sistema de ha

See merge request artica/pandorafms!5563
 2023-03-23 12:58:53 +00:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00