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

25137 Commits

Author SHA1 Message Date
artica 61f6a794b5 Auto-updated build strings. 2020-07-23 01:00:16 +02:00
Daniel Rodriguez b93f826f89 Merge branch 'ent-6100-Comando-de-alerta-Pandora-FMS-event' into 'develop' 
Ent 6100 comando de alerta pandora fms event

See merge request artica/pandorafms!3356
 2020-07-22 16:37:46 +02:00
Daniel Rodriguez bd3fdeed25 Merge branch 'ent-4158-Bug-al-crear-evento-con-id_server-que-no-existe-desde-la-API-en-meta' into 'develop' 
Ent 4158 bug al crear evento con id server que no existe desde la api en meta

See merge request artica/pandorafms!3330
 2020-07-22 16:29:28 +02:00
Daniel Rodriguez 7afc8902d3 Merge branch 'ent-6107-console-notifications-doesnt-clean-afeter-solved' into 'develop' 
Server notifications clean when solved

See merge request artica/pandorafms!3360
 2020-07-22 13:47:57 +02:00
Daniel Rodriguez fe5fcfbb1d Merge branch 'ent-6074-Ya-no-existe-el-public-link-para-dashboards' into 'develop' 
Add public link dashboards

See merge request artica/pandorafms!3347
 2020-07-22 10:56:16 +02:00
daniel fdad32e4f0 Add public link dashboards 2020-07-22 10:56:16 +02:00
artica b6af8758cb Auto-updated build strings. 2020-07-22 01:00:17 +02:00
Daniel Rodriguez 413e113cad Merge branch 'ent-5814-Titulo-erroneo' into 'develop' 
Fixed errors po and mo

See merge request artica/pandorafms!3371
 2020-07-21 15:11:42 +02:00
Daniel Rodriguez 62acbf69df Merge branch 'ent-4776-Poner-labels-en-graficas-clasicas' into 'develop' 
Fixed labels mode classic

See merge request artica/pandorafms!3370
 2020-07-21 15:06:41 +02:00
daniel 2c535bb747 Fixed labels mode classic 2020-07-21 15:06:41 +02:00
Daniel Rodriguez ffdc18b8af Merge branch 'revert-3ad55504' into 'develop' 
Revert "Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'"

See merge request artica/pandorafms!3384
 2020-07-21 14:05:13 +02:00
Daniel Rodriguez 50cba7936a Revert "Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop'" 
This reverts merge request !3311
 2020-07-21 14:03:17 +02:00
Daniel Rodriguez 3ad555048f Merge branch 'ent-5992-XSS-Vuln-en-los-eventos-metaconsola' into 'develop' 
fix vulnerability

See merge request artica/pandorafms!3311
 2020-07-21 14:00:07 +02:00
Daniel Rodriguez dd08f3bfdd Merge branch 'ent-5964-AADCM-Refresh-time-en-CV-link-publico' into 'develop' 
fix default refresh time in visual console public link

See merge request artica/pandorafms!3309
 2020-07-21 10:48:57 +02:00
Daniel Rodriguez 7d69cbe65d Merge branch 'ent-5907-bug-status-modulo-prediccion' into 'develop' 
Solved issue with thresholds in prediction modules

Closes pandora_enterprise#5907

See merge request artica/pandorafms!3293
 2020-07-21 10:48:06 +02:00
artica 001edf95dd Auto-updated build strings. 2020-07-21 01:00:16 +02:00
Daniel Rodriguez de271193cc Merge branch 'ent-5963-10190-Mala-representacion-de-graficas-en-pdf-group-report-agent-configuration-y-group-settings' into 'develop' 
Ent 5963 10190 mala representacion de graficas en pdf group report agent configuration y group settings

See merge request artica/pandorafms!3296
 2020-07-20 15:33:53 +02:00
Daniel Rodriguez 9b83f3857e Merge branch 'ent-5443-group-report-no-funcion-bien' into 'develop' 
Ent 5443 group report no funcion bien

See merge request artica/pandorafms!3338
 2020-07-20 13:26:39 +02:00
Luis 2dc239afe9 Ent 5443 group report no funcion bien 2020-07-20 13:26:39 +02:00
Daniel Rodriguez 51f2db16cb Merge branch 'ent-5587-no-tiene-en-cuenta-las-acciones-default-filtrar-alertas' into 'develop' 
Changed query for get default actions in templates

Closes pandora_enterprise#5587

See merge request artica/pandorafms!3320
 2020-07-20 07:54:08 +02:00
Daniel Rodriguez 249e4a737a Merge branch 'ent-5806-post-process-genera-lineas-repetidas' into 'develop' 
Changed nothing option for avoid duplicates

Closes pandora_enterprise#5806

See merge request artica/pandorafms!3297
 2020-07-20 07:52:48 +02:00
Daniel Rodriguez 8915492323 Merge branch 'ent-6004-error-visual-en-el-filtrado-de-componentes-en-metaconsola' into 'develop' 
fixed visual error tag meta

See merge request artica/pandorafms!3318
 2020-07-20 07:51:57 +02:00
Daniel Rodriguez 56c1de4b04 Merge branch 'ent-5970-Columna-status-de-items-agent-configuration-y-group-settings-no-aparece-en-PDFs' into 'develop' 
fixed pdf status field

See merge request artica/pandorafms!3307
 2020-07-20 07:51:29 +02:00
artica fc6852359d Auto-updated build strings. 2020-07-20 01:00:13 +02:00
artica 85609e1e82 Auto-updated build strings. 2020-07-19 01:00:17 +02:00
artica 7cc8b9a016 Auto-updated build strings. 2020-07-18 01:00:18 +02:00
alejandro.campos@artica.es 685acf2200 Changed status displayed in pdfs 2020-07-17 11:42:42 +02:00
Alejandro Fraguas 7af972023c Merge branch 'ent-5105-9235-Error-tactical-view-consola-movil' into 'develop' 
fix mobile tactical view

See merge request artica/pandorafms!3302
 2020-07-17 11:06:24 +02:00
alejandro.campos@artica.es c6ee74e6b7 Merge branch 'develop' into ent-5105-9235-Error-tactical-view-consola-movil 2020-07-17 10:54:12 +02:00
Daniel Rodriguez f2f8debab6 Merge branch 'ent-5969-fallo-visual-en-reports-vista-html' into 'develop' 
fixed error

See merge request artica/pandorafms!3308
 2020-07-17 10:34:28 +02:00
Daniel Rodriguez b90afd38b8 Merge branch '5843-Volver-a-introducir-el-widget-Agentes-modulos-en-Dashboard' into 'develop' 
Add agent/module view in dashboard

See merge request artica/pandorafms!3343
 2020-07-17 10:33:40 +02:00
daniel bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +02:00
Alejandro Fraguas bff9bdbaea Merge branch 'ent-5573-error-downloading-file-mib-uploader' into 'develop' 
Added mib uploader to get file

See merge request artica/pandorafms!3260
 2020-07-17 10:01:10 +02:00
Luis 2c713f45dd Added mib uploader to get file 2020-07-17 10:01:10 +02:00
artica 60e0d5ec34 Auto-updated build strings. 2020-07-17 01:00:16 +02:00
marcos e221175bf4 updated changes 2020-07-16 15:57:28 +02:00
Luis Calvo 4b1d586ef0 Fixed and added strfdate formats 2020-07-16 14:07:29 +02:00
Daniel Rodriguez d6fc3a6195 Merge branch 'ent-5967-botones-de-events-responses-no-son-iguales' into 'develop' 
fixed visual style repsonse buttons

See merge request artica/pandorafms!3319
 2020-07-16 12:16:57 +02:00
Daniel Rodriguez 100db2d4db Merge branch 'ent-5920-Fallo-al-pinchar-en-visual-console-manager-en-metaconsola' into 'develop' 
Fixed error link builder in VC

See merge request artica/pandorafms!3275
 2020-07-16 12:11:51 +02:00
Daniel Rodriguez 4bf2a2fedd Merge branch 'ent-5909-el-formato-encajado-de-la-busqueda-no-tiene-sentido' into 'develop' 
fixed error

See merge request artica/pandorafms!3266
 2020-07-16 12:10:31 +02:00
Alejandro Fraguas 1fb257108c Merge branch 'ent-4425-api-cli-eventos-en-progreso' into 'develop' 
Ent 4425 api cli eventos en progreso

See merge request artica/pandorafms!3265
 2020-07-16 11:08:34 +02:00
marcos 10b2fe25ba fixed error 2020-07-16 10:57:27 +02:00
marcos c76238bdb0 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-16 09:57:14 +02:00
artica 8b85bba631 Auto-updated build strings. 2020-07-16 01:00:20 +02:00
marcos a6a97d264e changed event in progress method api refactored 2020-07-15 23:41:25 +02:00
marcos 9632b36551 changed event in progress method 2020-07-15 23:36:21 +02:00
Daniel Rodriguez d9ceb1d554 Merge branch 'ent-5824-connection-lost-warn' into 'develop' 
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
 2020-07-15 13:05:14 +02:00
Alejandro Campos 0d3d4d7d6f Merge branch 'develop' into 'ent-6100-Comando-de-alerta-Pandora-FMS-event' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
 2020-07-15 09:30:35 +02:00
alejandro-campos 4edef7099b added check to display log sources info box when log collector activated 2020-07-15 09:25:39 +02:00
artica 593ed43f10 Auto-updated build strings. 2020-07-15 01:00:17 +02:00