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

1498 Commits

Author SHA1 Message Date
Daniel Maya ae0bb2022d #12029 Fixed font size 2023-10-04 15:42:19 +02:00
Rafael Ameijeiras 03700d2653 Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop' 
refactor cluster view pandora_enterprise#12032

See merge request artica/pandorafms!6476
 2023-09-26 15:15:27 +00:00
daniel f46626e120 refactor cluster view pandora_enterprise#12032 2023-09-21 10:21:45 +02:00
Jonathan dc9b47a904 #12027 tree view quiet mode 2023-09-20 13:51:56 +02:00
Daniel Cebrian a1fd85f486 Merge branch 'develop' into ent-11807-security-hardening-console-informes 2023-09-18 16:49:00 +02:00
Rafael Ameijeiras 83732250da Merge branch 'ent-11363-automonitoring-alertserver' into 'develop' 
Ent-11363-automonitoring-alertserver

Closes pandora_enterprise#11363

See merge request artica/pandorafms!6406
 2023-09-18 13:20:37 +00: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
Rafael Ameijeiras 8a41aa7f7a Merge branch 'ent-11947-16141-notificacion-access-statistics-performance-permanece-en-la-consola-teniendo-los-tokens' into 'develop' 
Ent 11947 16141 notificacion access statistics performance permanece en la consola teniendo los tokens

See merge request artica/pandorafms!6372
 2023-09-11 07:17:46 +00:00
miguel angel rasteu 793c953e07 #11947 Fix notification 2023-09-06 10:38:09 +02:00
Rafael Ameijeiras f2b99cf38e Merge branch 'ent-10639-unificacion-de-controles-de-fecha' into 'develop' 
Ent 10639 unificacion de controles de fecha

See merge request artica/pandorafms!6212
 2023-09-05 07:50:45 +00:00
felix.suarez 85462b3aae Add alert modules, queue and status 2023-09-04 08:46:24 -06:00
Alejandro Campos fa5af7efab Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-09-04 11:50:03 +00: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
Jorge Rincon 601e533a3a #11879 error control is added .disco file is missing 2023-08-29 10:27:35 +02:00
Jonathan d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Rafael Ameijeiras 1fa70b3afc Merge branch 'ent-11852-advertencia-al-usar-intervalos-largos' into 'develop' 
Ent 11852 advertencia al usar intervalos largos

See merge request artica/pandorafms!6346
 2023-08-23 05:56:19 +00:00
Alejandro Campos ad4a46d2b1 Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-08-22 08:43:10 +00:00
Rafael Ameijeiras 8eab813101 Merge branch 'ent-11051-marcar-como-leidos-todos-los-mensajes-del-sistema' into 'develop' 
Ent 11051 marcar como leidos todos los mensajes del sistema

See merge request artica/pandorafms!6202
 2023-08-22 06:46:29 +00:00
Rafael Ameijeiras 4b10cd4216 Merge branch 'ent-10946-enlaces-filtrando-por-estado-en-widget-general-group-status' into 'develop' 
Ent 10946 enlaces filtrando por estado en widget general group status

See merge request artica/pandorafms!6225
 2023-08-21 11:18:14 +00:00
Jonathan 563323d0be #11852 warning time lapse more than 30 days 2023-08-21 13:05:39 +02:00
miguel angel rasteu 6cbb332a8a #10701 Fix css conflict 2023-08-21 09:16:22 +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
Daniel Rodriguez 2e4c542f28 Merge branch 'ent-11636-SNMP-v2-hace-que-wizard-no-funcione' into 'develop' 
Ent 11636 snmp v2 hace que wizard no funcione

See merge request artica/pandorafms!6303
 2023-08-18 06:29:45 +00:00
Daniel Rodriguez c4ff61a2c0 Merge branch 'ent-11326-security-hardening-console' into 'develop' 
Ent 11326 Security hardening: Console

See merge request artica/pandorafms!6242
 2023-08-11 08:20:03 +00:00
Daniel Cebrian 06eae47560 Merge branch 'develop' into ent-11326-security-hardening-console 2023-08-09 13:27:21 +02:00
Jonathan e7be37167e #10598 change title group 2023-08-09 11:21:19 +02:00
Rafael Ameijeiras 0b680568b5 Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' 
Ent 11739 compatibilidad php 8 2 second

See merge request artica/pandorafms!6300
 2023-08-04 06:32:37 +00:00
Rafael Ameijeiras 507c91ab1e Merge branch 'ent-11683-faltan-opciones-en-las-listas-de-dias-especiales' into 'develop' 
Ent 11683 Faltan opciones en las listas de días especiales

See merge request artica/pandorafms!6221
 2023-08-02 12:01:07 +00:00
alejandro.campos@artica.es 8074448bfd remove snmp version 2 2023-08-02 11:07:08 +02:00
Rafael Ameijeiras d96977b883 Merge branch 'ent-10562-Nueva-vista-de-detalle-de-alertas-encoladas' into 'develop' 
Ent 10562 nueva vista de detalle de alertas encoladas

See merge request artica/pandorafms!6273
 2023-08-02 08:26:50 +00:00
Daniel Maya aef7f0edd0 #11739 Fixed deprecated functions 4 2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es 700bb53df4 implemented pending alerts list for event server 2023-08-01 14:37:16 +02:00
Jonathan f2328407b1 Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-01 09:39:56 +02: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
Daniel Rodriguez 0c6877e7d2 Merge branch 'ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery' into 'develop' 
Ent 9771 discovery 2 0 sistema de extensiones disco para el discovery

See merge request artica/pandorafms!5603
 2023-07-27 07:24:09 +00:00
Rafael Ameijeiras 9f888643bf Merge branch 'ent-11602-vista-de-traps-no-mantiene-el-ancho-ni-traps-abiertas' into 'develop' 
Ent 11602 vista de traps no mantiene el ancho ni traps abiertas

See merge request artica/pandorafms!6146
 2023-07-27 05:46:57 +00:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Rafael Ameijeiras 1f52a2d466 Merge branch 'ent-11031-en-visor-de-auditoria-los-filtros-personalizados-tienen-tres-detalles-que-vale-la-pena' into 'develop' 
Ent 11031 en visor de auditoria los filtros personalizados tienen tres detalles que vale la pena

See merge request artica/pandorafms!6235
 2023-07-25 07:54:36 +00:00
Pablo Aragon ccf124103d 11135-Move js code from ui_print_datatable. Resolve conflict 2023-07-24 10:46:19 +02:00
alejandro.campos@artica.es 66d2fef3aa implemented pending alerts list for event server 2023-07-21 11:53:04 +02:00
alejandro.campos@artica.es 7b9170312c implemented pending alerts list for event server 2023-07-21 11:50:53 +02:00
alejandro.campos@artica.es c8393ae210 fixed snmp traps time 2023-07-18 10:40:33 +02:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02: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
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
 2023-07-17 05:57:29 +00:00