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

13003 Commits

Author SHA1 Message Date
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 2c535bb747 Fixed labels mode classic 2020-07-21 15:06:41 +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
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
Luis 2dc239afe9 Ent 5443 group report no funcion bien 2020-07-20 13:26:39 +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.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 bd1c6b95ec Add agent/module view in dashboard 2020-07-17 10:33:40 +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
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
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
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
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 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
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
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 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
Alejandro Fraguas bd6904b99f Merge branch 'ent-6002-pandora-communty-vulnerabilities' into 'develop' 
Fixed xss event comments vulnerabiluty and some acls on event ajax

See merge request artica/pandorafms!3335
 2020-07-13 10:06:26 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
artica 313607efdf Auto-updated build strings. 2020-07-13 01:00:12 +02:00
artica e80252287c Auto-updated build strings. 2020-07-12 01:00:12 +02:00
artica 9d16783254 Auto-updated build strings. 2020-07-11 01:00:19 +02:00
Daniel Barbero Martin b87c2d986f Fixed errors po and mo 2020-07-10 12:36:57 +02:00
Daniel Rodriguez 9d6fff0850 Merge branch 'ent-5369-parseo-de-event-name-en-exportar-elementos' into 'develop' 
Deleted columns s, options and m on csv datatables events

See merge request artica/pandorafms!3313
 2020-07-10 10:16:34 +02:00
Daniel Rodriguez a83b10ff97 Merge branch 'ent-1957-Informe-agrupado-general' into 'develop' 
Implemented all-in-row data for grouped general report

See merge request artica/pandorafms!3351
 2020-07-10 10:11:57 +02:00
Daniel Rodriguez 0d68dde3db Merge branch 'ent-1940-Peso-en-graficas-personalizadas' into 'develop' 
fixed weight legend

See merge request artica/pandorafms!3339
 2020-07-10 10:10:42 +02:00
artica 941dfc2b62 Auto-updated build strings. 2020-07-10 01:00:16 +02:00
fbsanchez 009d5c7bc0 Merge remote-tracking branch 'origin/develop' into ent-6000-operaciones-masivas-de-servicios 2020-07-09 16:51:50 +02:00
fbsanchez 865c2eb208 allowed service create propagate exceptions 2020-07-09 11:35:04 +02:00
artica a410ebffb4 Auto-updated build strings. 2020-07-09 01:00:14 +02:00
Alejandro Fraguas df9ab22fc1 Merge branch 'ent-6012-servicios-dinamicos' into 'develop' 
MR change smart services

See merge request artica/pandorafms!3316
 2020-07-08 18:01:16 +02:00