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

38025 Commits

Author SHA1 Message Date
Daniel Cebrian 17056e4ac3 #12460 merge with 12643 2024-01-22 15:30:46 +01: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
Rafael Ameijeiras 83fb802f0e Merge branch 'ent-12228-migrar-pandorafms-datasource-para-grafana-de-angularjs-a-react' into 'develop' 
update grafana extension

See merge request artica/pandorafms!6870
 2024-01-22 12:57:00 +00:00
alejandro 82c8d519b4 update grafana extension 2024-01-22 13:25:43 +01:00
Matias Didier e2a2e27fe7 Merge branch 'ent-11086-usuarios-pueden-borrar-y-deshabilitar-extensiones-de-sistema-pfms' into 'develop' 
Ent 11086 Usuarios pueden borrar y deshabilitar "extensiones de sistema PFMS"

See merge request artica/pandorafms!6864
 2024-01-22 12:18:08 +00:00
Jonathan 29207ed367 #12617 add class correct colum 2024-01-22 12:59:11 +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
Alejandro Sánchez 75481a9677 Merge branch 'develop' into 'ent-12673-eliminar-el-de-todas-las-custom-queries-en-el-discovery-de-oracle-2' 
# Conflicts:
#   pandora_console/extras/mr/68.sql
 2024-01-22 10:55:47 +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
Matias Didier f35b95f0fe Merge branch 'ent-12745-falta-un-campo-en-la-tabla-tncm_agent_data' into 'develop' 
Ent 12745 falta un campo en la tabla tncm agent data

See merge request artica/pandorafms!6857
 2024-01-22 09:28:53 +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 5ece13fc9f #11086 fixed acl in extensions view 2024-01-19 14:05:20 +01:00
Jonathan 30e0ed912a Merge branch 'develop' into ent-12745-falta-un-campo-en-la-tabla-tncm_agent_data 2024-01-19 13:15:01 +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
Matias Didier 1664764fb1 Merge branch 'ent-12439-16595-lista-del-buscador-no-marca-agentes-silenciosos' into 'develop' 
Ent 12439 16595 lista del buscador no marca agentes silenciosos

See merge request artica/pandorafms!6678
 2024-01-19 11:16:51 +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
Jonathan d36ec9a8c0 #12693 add filter id_agente 2024-01-19 10:18:38 +01:00
Rafael Ameijeiras 6e9a367d05 Merge branch 'ent-12677-corregir-timezone-en-eventos' into 'develop' 
fix timezone events pandora_enterprise#12677

See merge request artica/pandorafms!6796
 2024-01-19 08:38:39 +00: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
Daniel Cebrian ae9b786dd5 #12752 fixed sql injection 2024-01-19 09:21:57 +01:00
Rafael Ameijeiras 23c63e2c3f Merge branch 'ent-12674-selectores-sin-accion-en-custom-graphs' into 'develop' 
Ent 12674 selectores sin accion en custom graphs

See merge request artica/pandorafms!6798
 2024-01-19 08:21:43 +00:00
Rafael Ameijeiras 5afa5c36c0 Merge branch 'ent-12598-16733-Filtro-de-eventos-borrado-y-asignado-como-favorito-permanece-en-la-seccion' into 'develop' 
Ent 12598 16733 filtro de eventos borrado y asignado como favorito permanece en la seccion

See merge request artica/pandorafms!6736
 2024-01-19 08:20:47 +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 4705aefb83 Merge branch 'ent-12692-anadir-informacion-i-al-token-event-storm-protection-del-setup-para-evitar-confusiones' into 'develop' 
Ent 12692 anadir informacion i al token event storm protection del setup para evitar confusiones

See merge request artica/pandorafms!6819
 2024-01-19 08:19:48 +00:00
Rafael Ameijeiras 838d68d5e4 Merge branch 'ent-12733-faltan-los-botones-de-accion-de-los-filtros-de-eventos' into 'develop' 
Ent 12733 faltan los botones de accion de los filtros de eventos

See merge request artica/pandorafms!6836
 2024-01-19 08:19:15 +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 11e8b9942f Merge branch 'ent-12514-error-el-ejecutar-comandos-en-la-cli' into 'develop' 
Ent-12514-error-el-ejecutar-comandos-en-la-cli

Closes pandora_enterprise#12514

See merge request artica/pandorafms!6760
 2024-01-19 08:18:06 +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