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

37584 Commits

Author SHA1 Message Date
daniel b35af80afb new api 2.0 2024-01-24 09:23:01 +01:00
daniel 2a46720b80 new api 2.0 2024-01-23 17:21:02 +01:00
daniel a11ebc6a57 new api 2.0 2024-01-23 17:02:23 +01:00
daniel 89b1d3317e new api 2.0 2024-01-23 13:16:33 +01:00
daniel 62b03c05cd Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-01-23 13:05:24 +01:00
daniel 3c68356b81 new api 2.0 2024-01-23 13:04:44 +01:00
Diego Muñoz-Reja 43cb4878cc Merge branch 'ent-12518-campo-personalizado-de-enlace-web-desde-agente-software-codifica-mal-al-guardar-en-base-de-datos' into 'develop' 
Ent 12518 campo personalizado de enlace web desde agente software codifica mal al guardar en base de datos

See merge request artica/pandorafms!6732
 2024-01-23 11:28:59 +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
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 013d2119d6 Merge branch 'ent-12752-unauth-time-based-sql-injection' into 'develop' 
Ent 12752 Unauth Time-Based SQL Injection

See merge request artica/pandorafms!6861
 2024-01-23 07:38:34 +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
Rafael Ameijeiras c5f94a203e Merge branch 'ent-12693-bug-al-editar-inventario-remoto' into 'develop' 
Ent 12693 bug al editar inventario remoto

See merge request artica/pandorafms!6863
 2024-01-23 07:22:16 +00:00
Rafael Ameijeiras b14825b2b3 Merge branch 'ent-12734-perdida-de-agente-al-actualizar-gis-map' into 'develop' 
Ent 12734 perdida de agente al actualizar gis map

See merge request artica/pandorafms!6839
 2024-01-23 07:21:50 +00:00
Rafael Ameijeiras 36de621fed Merge branch 'ent-12454-lineas-de-inicio-y-fin-de-mantenimiento-se-introducen-tarde' into 'develop' 
Ent-12454-lineas-de-inicio-y-fin-de-mantenimiento-se-introducen-tarde

Closes pandora_enterprise#12454

See merge request artica/pandorafms!6805
 2024-01-23 07:20:01 +00:00
Rafael Ameijeiras 7fd8423f88 Merge branch 'ent-12673-eliminar-el-de-todas-las-custom-queries-en-el-discovery-de-oracle-2' into 'develop' 
mr changes

See merge request artica/pandorafms!6860
 2024-01-23 07:19:33 +00:00
artica d4c5d2f316 Auto-updated build strings. 2024-01-23 01:00:29 +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
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
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
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
daniel 3922a052c9 new api 2.0 2024-01-19 13:39:51 +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