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

25068 Commits

Author SHA1 Message Date
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
Daniel Rodriguez 846fd10ce1 Merge branch 'ent-5824-connection-lost-warn' into 'develop' 
Ent 5824 connection lost warn

See merge request artica/pandorafms!3326
 2020-07-14 18:10:11 +02:00
alejandro-campos b073a64c20 deleted references to table log4x 2020-07-14 17:26:47 +02:00
alejandro-campos 909d7cba58 Implemented log source status info box in agent view 2020-07-14 17:12:38 +02:00
Daniel Rodriguez 76828ba745 Merge branch 'ent-5769-borrado-de-eventos-no-pide-confirmacion' into 'develop' 
Ent 5769 borrado de eventos no pide confirmacion

See merge request artica/pandorafms!3271
 2020-07-14 11:04:03 +02:00
Daniel Rodriguez 8b8fd7bf30 Merge branch 'ent-5764-consola-visual-pantalla-completa-autohide' into 'develop' 
Restored autoHide for controls modal in visual console with full screen

Closes pandora_enterprise#5764

See merge request artica/pandorafms!3299
 2020-07-14 11:03:33 +02:00
Daniel Rodriguez 52dc38fcb2 Merge branch 'ent-5672-Graficas-gauge-no-se-muestran-bien-en-PDF' into 'develop' 
Fixed error in gauges

See merge request artica/pandorafms!3261
 2020-07-14 11:01:21 +02:00
marcos 26e0703617 Merge remote-tracking branch 'origin/develop' into ent-4425-api-cli-eventos-en-progreso 2020-07-14 10:05:18 +02:00
artica f81e66084c Auto-updated build strings. 2020-07-14 01:00:16 +02:00
Alejandro Fraguas f79dd6db43 Merge branch 'ent-no-muestra-las-imagenes-en-el-modal-de-error-del-modulo-database-maintenance-en-metaconsola' into 'develop' 
5722-fixed image not found

See merge request artica/pandorafms!3263
 2020-07-13 13:22:41 +02:00
Daniel Rodriguez 1e31eae1a2 Merge branch 'ent-6130-Errores-en-Custom-graph-Informes-de-metaconsola' into 'develop' 
Fixed errors custom graph metaconsole

See merge request artica/pandorafms!3376
 2020-07-13 13:13:29 +02:00
marcos 2a62f3328a show hidden title on setup notifications 2020-07-13 13:00:47 +02:00
Alejandro Fraguas 150e8b1ddc Merge branch 'ent-5532-Edicion-creacion-de-templates-acciones-comandos-MODO-CENTRALIZADO' into 'develop' 
Ent 5532 edicion creacion de templates acciones comandos modo centralizado

See merge request artica/pandorafms!3273
 2020-07-13 12:23:47 +02:00
daniel f3ad52e0fa Ent 5532 edicion creacion de templates acciones comandos modo centralizado 2020-07-13 12:23:46 +02:00
Daniel Barbero Martin 293cdc6c08 Fixed errors custom graph metaconsole 2020-07-13 11:48:11 +02:00
Daniel Rodriguez 492c7f90cf Merge branch 'ent-5670-no-aparecen-los-valores-introducidos-al-crear-una-platilla-de-alerta' into 'develop' 
fixed error

See merge request artica/pandorafms!3321
 2020-07-13 11:13:24 +02:00
Daniel Rodriguez ad93a7c681 Merge branch 'ent-5445-Item-prediction-date-no-funciona-correctamente-en-meta' into 'develop' 
fix prediction date item in meta

See merge request artica/pandorafms!3340
 2020-07-13 11:12:53 +02:00
Daniel Rodriguez 47686f2f51 Merge branch 'ent-5618-bug-en-nombres-de-los-usuarios-en-el-owner-de-eventos' into 'develop' 
Change owner event responses

See merge request artica/pandorafms!3294
 2020-07-13 11:12:02 +02:00