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

20740 Commits

Author SHA1 Message Date
Rafael Ameijeiras 2daa6f1e87 Merge branch 'ent-12797-error-select2-javascript-discovery' into 'develop' 
Ent 12797 error select2 javascript discovery

See merge request artica/pandorafms!6892
 2024-01-31 14:06:36 +00:00
Rafael Ameijeiras 8d45692b76 Merge branch 'ent-9757-anadir-escalado-de-estados-a-api-y-cli' into 'develop' 
Add warning time to CLI create

Closes pandora_enterprise#9757

See merge request artica/pandorafms!6815
 2024-01-31 14:06:07 +00:00
Diego Muñoz-Reja 1980b36c17 Merge branch 'ent-11165-anadir-info-de-whois-de-una-ip-dada-en-netflow-explorer' into 'develop' 
Ent 11165 Añadir info de whois de una IP dada en Netflow explorer

See merge request artica/pandorafms!6827
 2024-01-31 09:14:44 +00:00
Matias Didier 66eda7368d Merge branch 'ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada' into 'develop' 
Ent 12034 Enlace público de dashboard que ha sido borrado no muestra nada

See merge request artica/pandorafms!6828
 2024-01-31 08:21:45 +00:00
Daniel Cebrian 2531de8cb0 #12034 fixed page not access when dashboard is deleted 2024-01-30 14:58:04 +01:00
Jonathan f430d3ce9f #12797 fix select2 2024-01-30 14:53:48 +01:00
Rafael Ameijeiras 35b5644f9c Merge branch 'ent-12789-busqueda-por-regex-funciona-mal' into 'develop' 
Ent 12789 Búsqueda por regex funciona mal

See merge request artica/pandorafms!6889
 2024-01-30 13:52:57 +00:00
Daniel Cebrian b28c97b9b7 Merge branch 'develop' into ent-12034-enlace-publico-de-dashboard-que-ha-sido-borrado-no-muestra-nada 2024-01-30 13:25:58 +01:00
Daniel Cebrian 61e38865f6 Merge branch 'develop' into ent-12789-busqueda-por-regex-funciona-mal 2024-01-30 08:53:04 +01:00
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
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 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
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