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

4677 Commits

Author SHA1 Message Date
Daniel Maya b4d54fb729 #10119 Fixed alerts table 2023-01-05 13:31:40 +01:00
Rafael Ameijeiras 03cad0b117 Merge branch 'ent-9991-opcion-de-edicion-de-usuario-skin-theme' into 'develop' 
Ent 9991 opcion de edicion de usuario skin theme

See merge request artica/pandorafms!5352
 2022-12-28 11:30:52 +00:00
Rafael Ameijeiras 19b74922a8 Merge branch 'ent-9587-busqueda-doble-en-vista-de-agentes' into 'develop' 
Ent 9587 busqueda doble en vista de agentes

See merge request artica/pandorafms!5360
 2022-12-28 09:56:34 +00:00
Rafael Ameijeiras fa034e4ae2 Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop' 
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas

See merge request artica/pandorafms!5359
 2022-12-28 09:42:23 +00:00
Jonathan 3caaf3a2a5 #9587 agent view - filter alerts when filter on list of modules 2022-12-28 10:03:31 +01:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
daniel 69e3203317 Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-27 09:06:20 +01:00
Rafael Ameijeiras c25ad3d4ea Merge branch 'ent-9932-errores-en-consola-del-navegador-de-filtro-del-snmp-browser' into 'develop' 
Fi browser console reporting errors

See merge request artica/pandorafms!5330
 2022-12-23 07:43:21 +00:00
daniel 5907d55ec1 phpchartjs pandora_enterprise#9554 2022-12-22 23:03:52 +01:00
Calvo 617c044a92 Fix js snmp browser errors 2022-12-22 20:10:02 +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
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
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
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
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
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
alejandro.campos@artica.es d170771905 fixed filter 2022-11-24 16:18:58 +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
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
sergio 5910002e9d #9833 Fixed general user search in open 2022-11-21 18:01:53 +01:00
Daniel Barbero 4118a46b9f add new filter search events pandora_enterprise#9135 2022-11-18 14:04:54 +01:00
Daniel Barbero a31733ffef Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos 2022-11-18 07:51:26 +01:00