Calvo
|
2ad8fac652
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-22 11:35:25 +01:00 |
|
Pablo Aragon
|
b4dfc5993f
|
9991 Change Skin label to Theme
|
2022-12-22 11:01:21 +01:00 |
|
daniel
|
47c503bdab
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-21 12:51:18 +01:00 |
|
Daniel Rodriguez
|
cc2da2d4a4
|
Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop'
implement cluster in open project
See merge request artica/pandorafms!5204
|
2022-12-21 09:05:01 +00:00 |
|
Jose Gonzalez
|
ffa4ec756c
|
Agent Group icons adding
|
2022-12-20 17:22:35 +01:00 |
|
alejandro.campos@artica.es
|
73e8495f96
|
removed enterprise limitation
|
2022-12-20 15:43:05 +01:00 |
|
alejandro.campos@artica.es
|
47cb138d9b
|
path fix
|
2022-12-20 14:15:33 +01:00 |
|
Rafael Ameijeiras
|
434fd17277
|
Merge branch 'ent-9908-Fallo-en-filtro-de-eventos-metaconsola-al-modificar-el-autorrefresco' into 'develop'
fix bug when loading filters from base64 string
See merge request artica/pandorafms!5332
|
2022-12-20 12:54:56 +00:00 |
|
Calvo
|
f84f9733e3
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2022-12-20 12:15:10 +01:00 |
|
Daniel Rodriguez
|
0f4e3d4056
|
Merge branch 'ent-9292-13830-vista-traps-snmp-peta-con-muchos-elementos' into 'develop'
Ent 9292 13830 vista traps snmp peta con muchos elementos
See merge request artica/pandorafms!5255
|
2022-12-20 10:20:26 +00:00 |
|
Daniel Maya
|
23407892b9
|
#9292 fixed issues 3
|
2022-12-20 10:03:45 +01:00 |
|
Jose Gonzalez
|
b0997850f4
|
Fix server type icon definition
|
2022-12-19 16:38:47 +01:00 |
|
Calvo
|
63840b1d55
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-19 11:31:02 +01:00 |
|
Daniel Barbero
|
b4d306b9b1
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-19 09:38:21 +01:00 |
|
Daniel Barbero
|
1d01b8257d
|
WIP pandora_enterprise#9554
|
2022-12-16 14:28:04 +01:00 |
|
alejandro.campos@artica.es
|
8f3f8679d5
|
Merge remote-tracking branch 'origin/develop' into ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open
|
2022-12-16 11:29:00 +01:00 |
|
Daniel Barbero
|
62aea35d7b
|
fixed js render
|
2022-12-16 10:38:37 +01:00 |
|
alejandro.campos@artica.es
|
4ca220a3a7
|
Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe
|
2022-12-15 15:28:58 +01:00 |
|
Alejandro Campos
|
960d8be258
|
Merge branch 'develop' into 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open'
# Conflicts:
# pandora_console/extras/delete_files/delete_files.txt
|
2022-12-15 14:05:27 +00:00 |
|
jose.gonzalez@pandorafms.com
|
4fd0115d80
|
Adapt views
|
2022-12-15 12:42:35 +01:00 |
|
alejandro.campos@artica.es
|
6a21efc42c
|
fix bug when loading filters from base64 string
|
2022-12-14 11:08:24 +01:00 |
|
Luis
|
ad39ca397e
|
Fi browser console reporting errors
|
2022-12-13 20:08:04 +01:00 |
|
Diego Muñoz-Reja
|
eb212e3c8a
|
Merge branch 'ent-9833-no-funciona-busqueda-general-de-usuarios-en-open' into 'develop'
Ent 9833 no funciona busqueda general de usuarios en open
See merge request artica/pandorafms!5277
|
2022-12-13 16:16:04 +00:00 |
|
Alejandro Campos
|
867e1cc2b3
|
Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional'
# Conflicts:
# pandora_console/extras/mr/60.sql
|
2022-12-13 11:42:41 +00:00 |
|
Daniel Barbero
|
cbc598eb03
|
fixed minor error pandora_enterprise#9135
|
2022-12-13 09:30:56 +01:00 |
|
Daniel Barbero
|
a0ddad63b8
|
Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos
Conflicts:
pandora_console/extras/mr/59.sql
|
2022-12-13 09:17:39 +01:00 |
|
Daniel Barbero
|
01d14ae3b8
|
new chart chartjs pandora_enterprise#9554
|
2022-12-13 09:10:13 +01:00 |
|
Rafael Ameijeiras
|
8a6e3e5e06
|
Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop'
add sound events to metaconsole pandora_enterprise#8854
See merge request artica/pandorafms!5246
|
2022-12-12 14:02:36 +00:00 |
|
Diego Muñoz-Reja
|
31919d4d2c
|
Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop'
Prepare download control
See merge request artica/pandorafms!5276
|
2022-12-12 08:29:51 +00:00 |
|
Rafael Ameijeiras
|
f9bb893aae
|
Merge branch 'ent-8849-13468-Anadir-links-web-en-los-custom-fileds-de-agente' into 'develop'
implemented custom field
See merge request artica/pandorafms!5271
|
2022-12-12 08:20:08 +00:00 |
|
alejandro.campos@artica.es
|
39920692ef
|
Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional
|
2022-12-09 12:49:04 +01:00 |
|
jose.gonzalez@pandorafms.com
|
445a8161cf
|
Merge
|
2022-12-05 09:44:35 +01:00 |
|
Calvo
|
718be360d5
|
Download wait message
|
2022-12-02 15:40:47 +01:00 |
|
Calvo
|
d525cb594c
|
WIP: Download wait message
|
2022-12-02 09:42:24 +01:00 |
|
jose.gonzalez@pandorafms.com
|
dccd950e9e
|
Changes
|
2022-11-30 10:14:42 +01:00 |
|
alejandro.campos@artica.es
|
d170771905
|
fixed filter
|
2022-11-24 16:18:58 +01:00 |
|
jose.gonzalez@pandorafms.com
|
251fddacd0
|
From merge
|
2022-11-23 13:26:54 +01:00 |
|
alejandro.campos@artica.es
|
cdddc07b86
|
changed mr
|
2022-11-23 12:22:19 +01:00 |
|
Daniel Rodriguez
|
8e860d153b
|
Merge branch 'ent-9874-editar-usuario-propio-admin-en-meta-da-un-error-500' into 'develop'
Ent 9874 editar usuario propio admin en meta da un error 500
See merge request artica/pandorafms!5286
|
2022-11-23 11:12:16 +00:00 |
|
Daniel Rodriguez
|
0fb90e3383
|
Merge branch 'ent-9861-stored-cross-site-scripting-vulnerability-in-create-event-section' into 'develop'
Fix events view XSS vulnerabilities
See merge request artica/pandorafms!5284
|
2022-11-23 09:46:52 +00:00 |
|
José González
|
001892ed5a
|
Fix issue with empty autorefresh list
|
2022-11-23 09:42:12 +00:00 |
|
jose.gonzalez@pandorafms.com
|
a688182062
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2022-11-22 17:47:02 +01:00 |
|
Calvo
|
5aa51f28de
|
Fix events view XSS vulnerabilities
|
2022-11-22 15:54:19 +01:00 |
|
alejandro.campos@artica.es
|
767624b0c3
|
implemented link type custom field
|
2022-11-22 11:50:07 +01:00 |
|
Daniel Barbero
|
d1beb5cb2d
|
fixed filters pandora_enterprise#9864
|
2022-11-22 11:35:38 +01:00 |
|
Daniel Rodriguez
|
34c3f7a326
|
Merge branch 'ent-9487-GISS-Conteo-incorrecto-sobre-número-de-agentes-en-búsqueda-general' into 'develop'
fix count
See merge request artica/pandorafms!5194
|
2022-11-22 09:18:42 +00:00 |
|
Jimmy Olano
|
eaae19ab41
|
Merge branch 'ent-9683-bug-en-leyenda-de-graficas-snmp' into 'develop'
fix interfaces charts pandora_enterprise#9683
pandora_enterprise#9683
See merge request artica/pandorafms!5278
|
2022-11-22 00:32:10 +00:00 |
|
jose.gonzalez@pandorafms.com
|
7dce208df9
|
Update breadcrumbs for Agents and other minor fixes
|
2022-11-21 23:45:07 +01:00 |
|
sergio
|
5910002e9d
|
#9833 Fixed general user search in open
|
2022-11-21 18:01:53 +01:00 |
|
jose.gonzalez@pandorafms.com
|
8e0e249b81
|
Fixed views and styles
|
2022-11-21 14:49:07 +01:00 |
|