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

20792 Commits

Author SHA1 Message Date
Rafael Ameijeiras 813deba7a5 Merge branch 'ent-12698-nuevos-mensajes-de-bienvenida-quedan-raros-si-el-usuario-no-tiene-full-name' into 'develop' 
Ent 12698 nuevos mensajes de bienvenida quedan raros si el usuario no tiene full name

See merge request artica/pandorafms!6875
 2024-01-29 15:20:27 +00:00
Matias Didier 8269f5fcc6 Merge branch 'ent-11014-codigo-qr-en-user-detail-editor-mantiene-fija-su-posicion-mientras-se-redimensiona-ventana' into 'develop' 
Ent 11014 codigo qr en user detail editor mantiene fija su posicion mientras se redimensiona ventana

See merge request artica/pandorafms!6415
 2024-01-29 14:01:15 +00:00
Diego Muñoz-Reja eba2f45ed1 Merge branch 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' into 'develop' 
fix filter bug

See merge request artica/pandorafms!6761
 2024-01-29 12:39:42 +00:00
Daniel Cebrian f01902903c #12789 fixed regex in event table 2024-01-29 13:38:29 +01:00
Matias Didier a2ea701ef0 Merge branch 'ent-12623-edicion-de-inventory-modules-se-despista-con-el-menu-principal' into 'develop' 
Ent 12623 edicion de inventory modules se despista con el menu principal

See merge request artica/pandorafms!6876
 2024-01-29 12:15:49 +00:00
Daniel Rodriguez 3db0090c0e Merge branch 'ent-12351-16497-Mejoras-Ampliacion-de-los-informes-monitorizacion-Netflow-Top-N-Connection' into 'develop' 
implement several changes in top-n connection report item

See merge request artica/pandorafms!6833
 2024-01-29 11:14:58 +00:00
Rafael Ameijeiras c1b74ab7f0 Merge branch 'ent-12267-dashboard-mejora-del-widget-de-module-status' into 'develop' 
add new filters widget modules status pandora_enterprise#12267

See merge request artica/pandorafms!6734
 2024-01-29 09:33:56 +00:00
Rafael Ameijeiras 8bb2b46c48 Merge branch 'ent-12568-Falta-la-opcion-de-escoger-Exec-server-en-la-configuracion-de-Event-response' into 'develop' 
fix missing fields

See merge request artica/pandorafms!6766
 2024-01-29 09:32:50 +00:00
Rafael Ameijeiras ccaa25da23 Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop' 
Ent 12657 mostrar show entries de eventos de menor a mayor

See merge request artica/pandorafms!6785
 2024-01-29 09:30:55 +00:00
Alejandro Campos 618f677906 Merge branch 'develop' into 'ent-12629-Eventos-se-quedan-tostados-cuando-el-filtro-no-encuentra-nada' 
# Conflicts:
#   pandora_console/include/functions_events.php
#   pandora_console/operation/events/events.php
 2024-01-26 13:42:59 +00:00
Diego Muñoz-Reja 04126c2407 Merge branch 'ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql' into 'develop' 
add tables merge process pandora_enterprise#12352

See merge request artica/pandorafms!6722
 2024-01-26 12:27:59 +00:00
daniel 65385f36c1 fix visual errors in widgets dashboard pandora_enterprise#12267 2024-01-26 09:18:47 +01:00
daniel b84d2aeec9 Merge remote-tracking branch 'origin/develop' into ent-12267-dashboard-mejora-del-widget-de-module-status 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
 2024-01-26 08:10:07 +01:00
artica c5cefb3c13 Auto-updated build strings. 2024-01-26 01:00:30 +01:00
alejandro.campos@artica.es 18cb14bec6 minor fixes 2024-01-25 16:03:48 +01:00
daniel 00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-01-25 15:57:20 +01:00
Rafael Ameijeiras e19f520eb0 Merge branch 'ent-12522-mejoras-en-audit-log' into 'develop' 
Ent 12522 Mejoras en audit log

See merge request artica/pandorafms!6816
 2024-01-25 14:00:56 +00:00
Rafael Ameijeiras b271cff73e Merge branch 'ent-12754-widget-modules-by-status-bug-al-filtrar-por-estados' into 'develop' 
Ent 12754 widget modules by status bug al filtrar por estados

See merge request artica/pandorafms!6858
 2024-01-25 13:58:02 +00:00
artica 8bbfa2803f Auto-updated build strings. 2024-01-25 01:00:29 +01:00
Diego Muñoz-Reja 077252d9cb Merge branch 'ent-11605-item-weekly-sla-mete-salto-de-pagina-si-el-siguiente-elemento-es-del-mismo-tipo-aunque-haya' into 'develop' 
quit pagebreak pandora_enterprise#11605

See merge request artica/pandorafms!6737
 2024-01-24 13:41:00 +00:00
Daniel Cebrian fd8d233cf8 #12460 fixed deprecated 2024-01-24 13:28:43 +01:00
Daniel Cebrian fbb5d349a2 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-24 11:58:00 +01:00
Rafael Ameijeiras 5dc0e35be8 Merge branch 'ent-12753-os-command-injection' into 'develop' 
Ent 12753 OS Command Injection

See merge request artica/pandorafms!6868
 2024-01-24 08:15:58 +00:00
Daniel Cebrian 4fc3013cc3 #12522 fixed multiple audit when update setup 2024-01-24 09:15:32 +01:00
artica dd252daaf2 Auto-updated build strings. 2024-01-24 01:00:32 +01:00
Daniel Cebrian 7f604f0c8d #12460 fixed deprecated 2024-01-23 17:47:26 +01:00
Daniel Cebrian 538177c3e5 #12753 fixed vul command in ajax 2024-01-23 17:08:06 +01:00
Rafael Ameijeiras e1478f61e5 Merge branch 'ent-12364-vista-de-logs-filtro-para-agentes-y-sources' into 'develop' 
Ent 12364 vista de logs filtro para agentes y sources

See merge request artica/pandorafms!6855
 2024-01-23 15:46:03 +00:00
Rafael Ameijeiras d2bdbc9e42 Merge branch 'ent-12767-passwords-de-ldap-no-se-pueden-visualizar' into 'develop' 
Ent 12767 passwords de ldap no se pueden visualizar

See merge request artica/pandorafms!6856
 2024-01-23 15:45:23 +00:00
Rafael Ameijeiras b019abbb97 Merge branch 'ent-12782-vista-de-eventos-se-ve-feo-la-paginacion-en-una-pantalla-de-1300px-de-ancho' into 'develop' 
Ent 12782 Vista de eventos: se ve feo la paginacion en una pantalla de 1300px de ancho

See merge request artica/pandorafms!6871
 2024-01-23 15:44:49 +00:00
Matias Didier a93c9985ec Merge branch 'ent-12792-error-500-en-inventario-al-cambiar-de-agente' into 'develop' 
Ent 12792 error 500 en inventario al cambiar de agente

See merge request artica/pandorafms!6877
 2024-01-23 14:43:51 +00:00
Matias Didier e47b8eb364 Merge branch 'ent-12323-campo-para-configurar-rotado-de-netflow_interval' into 'develop' 
Ent 12323 Campo para configurar rotado de netflow_interval

See merge request artica/pandorafms!6824
 2024-01-23 12:51:28 +00:00
Matias Didier 1cce0a3cea Merge branch 'ent-12777-export-qr-mete-html-encoding' into 'develop' 
Ent 12777 export qr mete html encoding

See merge request artica/pandorafms!6865
 2024-01-23 11:23:33 +00:00
Jonathan fc08e9b9b6 #12792 fix 500 change agent inventory 2024-01-23 11:27:15 +01:00
Jonathan cd27935b4c #12623 fix menu inventory modules 2024-01-23 11:26:15 +01:00
Jonathan 510c28bb09 #12698 fix welcome messages 2024-01-23 10:56:31 +01:00
Matias Didier eba0ce9e80 Merge branch 'ent-12624-cambio-estilo-de-ventanas-modales' into 'develop' 
Ent 12624 cambio estilo de ventanas modales

See merge request artica/pandorafms!6826
 2024-01-23 09:44:21 +00:00
Daniel Rodriguez b11651aa6e Merge branch 'ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico' into 'develop' 
Ent-12580-16708-modulos-webserver-no-loguean-y-devuelven-critico

Closes pandora_enterprise#12580

See merge request artica/pandorafms!6791
 2024-01-23 09:20:40 +00:00
Rafael Ameijeiras 30f6e9ea36 Merge branch 'ent-12539-mostrar-dialogo-con-retardo-de-cierre-en-vista-ppal-de-agente' into 'develop' 
Ent 12539 mostrar dialogo con retardo de cierre en vista ppal de agente

See merge request artica/pandorafms!6807
 2024-01-23 07:27:34 +00:00
Rafael Ameijeiras 028c8a5aee Merge branch 'ent-12538-meter-chequeos-adicionales-en-el-systemcheck-para-controlar-total-de-modulos-en-el-sistema' into 'develop' 
Ent 12538 Meter chequeos adicionales en el systemcheck para controlar total de modulos en el sistema

See merge request artica/pandorafms!6867
 2024-01-23 07:23:16 +00:00
artica d4c5d2f316 Auto-updated build strings. 2024-01-23 01:00:29 +01:00
Daniel Maya 6948306d82 #12767 Fixed password 3 2024-01-22 17:29:51 +01:00
Diego Muñoz-Reja 9bdcfb4b4d Merge branch 'ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api' into 'develop' 
Ent-12519-anadir-el-campo-event-custom-id-a-la-creacion-de-eventos-por-cli-y-api

Closes pandora_enterprise#12519

See merge request artica/pandorafms!6769
 2024-01-22 15:49:32 +00:00
Jonathan a747308b26 #12636 fix errors 2024-01-22 16:21:51 +01:00
Matias Didier 23c33a73f6 Merge branch 'ent-12299-al-borrar-un-agente-por-masivas-en-meta-no-se-borra-el-md5-y-el-conf' into 'develop' 
remove agents bulk operation pandora_enterprise#12299

See merge request artica/pandorafms!6749
 2024-01-22 14:34:29 +00:00
Daniel Cebrian d504267460 Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache 2024-01-22 15:18:01 +01:00
Daniel Cebrian 54e3f94d62 #12782 fixed button sound events style in events 2024-01-22 15:07:25 +01:00
Matias Didier 5a640960c1 Merge branch 'ent-12778-secciones-sin-enlace-al-menu' into 'develop' 
Ent 12778 secciones sin enlace al menu

See merge request artica/pandorafms!6866
 2024-01-22 11:53:13 +00:00
Daniel Cebrian 5d5bfc654d #12753 fixed os command injection 2024-01-22 12:39:43 +01:00
Diego Muñoz-Reja f560ae8d56 Merge branch 'ent-12520-errores-en-formularios-de-los-dashboards' into 'develop' 
Ent 12520 errores en formularios de los dashboards

See merge request artica/pandorafms!6718
 2024-01-22 11:16:19 +00:00
Matias Didier 1276b1a972 Merge branch 'ent-12509-cuadro-grupos-vista-tactica-y-vista-tactica-de-grupos-muestra-deshabilitados' into 'develop' 
Ent 12509 Cuadro grupos vista táctica y vista táctica de grupos muestra deshabilitados

See merge request artica/pandorafms!6764
 2024-01-22 11:04:20 +00:00
Daniel Cebrian a9c16e1f69 #12538 added url in new notificacions 2024-01-22 10:55:37 +01:00
Daniel Cebrian d85a488cb0 #12538 new notifications in console supervisor 2024-01-22 10:37:03 +01:00
Matias Didier b38d50a3b2 Merge branch 'ent-12515-bug-al-mostrar-el-evento-completo-en-un-tooltip-en-la-vista-de-eventos' into 'develop' 
Ent 12515 bug al mostrar el evento completo en un tooltip en la vista de eventos

See merge request artica/pandorafms!6787
 2024-01-22 09:30:08 +00:00
Jonathan 740c0adc9c #12778 add sections hack 2024-01-22 10:15:31 +01:00
Matias Didier c6a9dce7b2 Merge branch 'ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos' into 'develop' 
Ent 12537 Display de mensajes no tiene en cuenta los tipos

See merge request artica/pandorafms!6825
 2024-01-22 08:57:06 +00:00
Jonathan f43279acc3 #12777 qr name remove entities 2024-01-22 09:27:02 +01:00
Daniel Cebrian cb58b6e8f0 Merge branch 'develop' into ent-12509-cuadro-grupos-vista-tactica-y-vista-tactica-de-grupos-muestra-deshabilitados 2024-01-22 08:33:42 +01:00
artica 895684238e Auto-updated build strings. 2024-01-22 01:00:15 +01:00
artica 91e072e384 Auto-updated build strings. 2024-01-21 01:00:15 +01:00
artica f67c9185f8 Auto-updated build strings. 2024-01-20 01:00:29 +01:00
Daniel Cebrian fadb70d740 Merge branch 'develop' into ent-12537-display-de-mensajes-no-tiene-en-cuenta-los-tipos 2024-01-19 13:06:37 +01:00
Matias Didier a4f67d353b Merge branch 'ent-12725-16851-tree-view-no-marca-agentes-en-estado-quiet' into 'develop' 
Ent 12725 16851 tree view no marca agentes en estado quiet

See merge request artica/pandorafms!6849
 2024-01-19 11:36:30 +00:00
Daniel Rodriguez cc33e5413a Merge branch 'ent-12202-eastern-egg-asteroids' into 'develop' 
Ent 12202 eastern egg asteroids

See merge request artica/pandorafms!6693
 2024-01-19 11:10:55 +00:00
Daniel Cebrian da8769c860 #12509 resolve conflicts 2024-01-19 10:26:09 +01:00
Rafael Ameijeiras 7caabd9805 Merge branch 'ent-12666-severity-mini-no-se-estira-verticalmente-en-la-vista-de-eventos' into 'develop' 
Ent 12666 severity mini no se estira verticalmente en la vista de eventos

See merge request artica/pandorafms!6799
 2024-01-19 08:38:14 +00:00
Rafael Ameijeiras 3386347253 Merge branch 'ent-12575-no-se-puede-ordenar-por-columnas-en-la-vista-de-dashboards' into 'develop' 
Ent 12575 No se puede ordenar por columnas en la vista de Dashboards

See merge request artica/pandorafms!6756
 2024-01-19 08:37:12 +00:00
Rafael Ameijeiras 0c73dab521 Merge branch 'ent-12366-bug-al-asignar-5-o-mas-perfiles-a-un-usuario' into 'develop' 
Ent 12366 bug al asignar 5 o mas perfiles a un usuario

See merge request artica/pandorafms!6771
 2024-01-19 08:36:45 +00:00
Daniel Maya a41d2214e6 #12767 Fixed password 2 2024-01-19 09:33:53 +01:00
Rafael Ameijeiras 2baef1ccf2 Merge branch 'ent-12553-correccion-de-erratas' into 'develop' 
Ent 12553 Corrección de erratas

See merge request artica/pandorafms!6817
 2024-01-19 08:23:35 +00:00
Rafael Ameijeiras 49487c0960 Merge branch 'ent-12577-Error-visual-de-los-contenedores-de-opciones-avanzadas-de-modulos-Dynamic-Threshold-FF-threshold-y-Cron-from' into 'develop' 
Ent 12577 error visual de los contenedores de opciones avanzadas de modulos dynamic threshold ff threshold y cron from

See merge request artica/pandorafms!6743
 2024-01-19 08:20:07 +00:00
Rafael Ameijeiras e4c30eaeb6 Merge branch 'ent-12501-varios-errores-en-los-campos-personalizados-por-consola-web' into 'develop' 
Ent 12501 varios errores en los campos personalizados por consola web

See merge request artica/pandorafms!6723
 2024-01-19 08:18:53 +00:00
Rafael Ameijeiras 8f9200cdd9 Merge branch 'ent-12729-guardia-16873-problemas-con-tareas-de-la-consola' into 'develop' 
Ent 12729 guardia 16873 problemas con tareas de la consola

See merge request artica/pandorafms!6832
 2024-01-19 08:17:29 +00:00
artica 2400c110b1 Auto-updated build strings. 2024-01-19 01:01:35 +01:00
Diego Muñoz-Reja 5ade3a9e82 Merge branch 'ent-12541-fallos-en-graph-analytics' into 'develop' 
Ent 12541 Fallos en graph analytics

See merge request artica/pandorafms!6714
 2024-01-18 16:00:08 +00:00
Rafael Ameijeiras 9bd4593c60 Merge branch 'ent-12542-16692-grupo-de-modulo-de-componente-local-no-se-muestra-correctamente' into 'develop' 
Ent 12542 16692 grupo de modulo de componente local no se muestra correctamente

See merge request artica/pandorafms!6730
 2024-01-18 15:46:31 +00:00
Jonathan 01049303d9 #12202 remove loadModal not defined function 2024-01-18 16:22:44 +01:00
Matias Didier 6f290f940f Merge branch 'ent-12602-16735-Bug-de-grupos-en-vista-tactica' into 'develop' 
fix tactical item

See merge request artica/pandorafms!6840
 2024-01-18 14:06:38 +00:00
Rafael Ameijeiras c98e773cb3 Merge branch 'ent-12139-16339-llamada-api-new_agent-no-funciona-correctamente' into 'develop' 
Ent 12139 16339 llamada api new agent no funciona correctamente

See merge request artica/pandorafms!6509
 2024-01-18 13:37:52 +00:00
Rafael Ameijeiras 04478bbdfb Merge branch 'ent-12503-cambio-visual-del-boton-unique-ip-de-la-config-de-agentes' into 'develop' 
Ent 12503 Cambio Visual del Botón Unique IP de la Config de Agentes

See merge request artica/pandorafms!6820
 2024-01-18 12:57:08 +00:00
Rafael Ameijeiras 510a06a347 Merge branch 'ent-12579-formato-erroneo-de-los-botones-accion-sobre-agentes-del-Satellite-Server' into 'develop' 
Ent 12579 formato erroneo de los botones accion sobre agentes del satellite server

See merge request artica/pandorafms!6747
 2024-01-18 12:56:43 +00:00
Rafael Ameijeiras edc5354c21 Merge branch 'ent-12696-usuario-de-con-permisos-de-grupo-ve-todas-las-paradas-planificadas-en-la-vista-tactica' into 'develop' 
Ent 12696 usuario de con permisos de grupo ve todas las paradas planificadas en la vista tactica

See merge request artica/pandorafms!6852
 2024-01-18 12:53:02 +00:00
Rafael Ameijeiras 030d34224e Merge branch 'ent-12523-Problemas-visualizacion-de-eventos-de-auditoria' into 'develop' 
some changes in audit view

See merge request artica/pandorafms!6754
 2024-01-18 12:50:40 +00:00
Rafael Ameijeiras f7d5c4d443 Merge branch 'ent-12573-no-se-muestra-el-numero-de-celdas-widgets-en-los-dashboards' into 'develop' 
Ent 12573 No se muestra el número de celdas (widgets) en los Dashboards

See merge request artica/pandorafms!6762
 2024-01-18 12:41:44 +00:00
Rafael Ameijeiras f0d892c268 Merge branch 'ent-12601-16734-Filtros-de-tags-en-eventos-ignoran-criticidad-configurada-en-filtro' into 'develop' 
fix tags filter

See merge request artica/pandorafms!6780
 2024-01-18 11:34:02 +00:00
Rafael Ameijeiras c2c3c5e5ed Merge branch 'ent-12484-pestanas-de-informacion-en-el-about-en-774-han-desaparecido' into 'develop' 
Ent 12484 pestanas de informacion en el about en 774 han desaparecido

See merge request artica/pandorafms!6831
 2024-01-18 11:33:28 +00:00
Diego Muñoz-Reja d1855569dc Merge branch 'ent-12571-arreglar-interfaz-de-definicion-de-graficas-combinadas' into 'develop' 
Ent 12571 Arreglar interfaz de definicion de graficas combinadas

See merge request artica/pandorafms!6767
 2024-01-18 11:32:59 +00:00
Rafael Ameijeiras 8a41a04345 Merge branch 'ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha' into 'develop' 
Ent 12143 arreglar mejorar visualizacion de calendarios y selectores de fecha

See merge request artica/pandorafms!6765
 2024-01-18 11:27:20 +00:00
Rafael Ameijeiras 5ada85bd56 Merge branch 'ent-12527-enlace-a-mensajes-en-sistema-de-notificacion' into 'develop' 
Ent 12527 enlace a mensajes en sistema de notificacion

See merge request artica/pandorafms!6829
 2024-01-18 11:26:49 +00:00
Rafael Ameijeiras 14b512ddde Merge branch 'ent-12685-se-pueden-anadir-widget-sin-estar-en-modo-edicion' into 'develop' 
Ent 12685 se pueden anadir widget sin estar en modo edicion

See merge request artica/pandorafms!6841
 2024-01-18 11:20:34 +00:00
Rafael Ameijeiras 1f64fb6115 Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop' 
Ent 12320 wizard de bienvenida mas molon visualmente

See merge request artica/pandorafms!6842
 2024-01-18 11:16:08 +00:00
Rafael Ameijeiras 4a0d8058c5 Merge branch 'ent-12156-usuario-agregado-con-grupo-agregado-a-categoria-de-notificaciones-no-puede-habilitar-su-envio' into 'develop' 
Ent 12156 usuario agregado con grupo agregado a categoria de notificaciones no puede habilitar su envio

See merge request artica/pandorafms!6797
 2024-01-18 11:14:35 +00:00
Rafael Ameijeiras 2b78bdd664 Merge branch 'ent-12026-nuevo-widget-de-inventario-para-dashboard-falta-mostrar-mensaje-inicial-please-configure-this' into 'develop' 
Ent 12026 nuevo widget de inventario para dashboard falta mostrar mensaje inicial please configure this

See merge request artica/pandorafms!6776
 2024-01-18 11:13:49 +00:00
Rafael Ameijeiras e7ee0ef6b8 Merge branch 'ent-12747-Home-Screen-no-actualiza-en-nodo-cuando-mergeamos-nodo-y-meta-2' into 'develop' 
fix home screen

See merge request artica/pandorafms!6850
 2024-01-18 11:13:04 +00:00
Jonathan 4ce970eab1 #12539 fix dialog 2024-01-18 11:26:38 +01:00
Matias Didier de406f3224 Merge branch 'ent-11329-widget-de-latest-events-no-recoge-grupos-secundarios' into 'develop' 
Ent 11329 Widget de latest events no recoge grupos secundarios

See merge request artica/pandorafms!6818
 2024-01-18 10:16:23 +00:00
Daniel Cebrian 7d1e06ce30 #12571 resolve conflics 2024-01-18 10:39:07 +01:00
Daniel Maya ae3c9bc2f5 #12754 Fixed status 2024-01-18 10:28:57 +01:00
Matias Didier bfa087413c Merge branch 'ent-12560-notificacion-del-alert-correlation-changed-in-v774-sigue-apareciendo' into 'develop' 
Ent 12560 notificacion del alert correlation changed in v774 sigue apareciendo

See merge request artica/pandorafms!6770
 2024-01-18 08:45:26 +00:00
Matias Didier e863fbc999 Merge branch 'ent-12638-16777-inconsistencia-en-los-comentarios-de-items-en-visual-console' into 'develop' 
Ent 12638 16777 inconsistencia en los comentarios de items en visual console

See merge request artica/pandorafms!6801
 2024-01-18 08:45:19 +00:00