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

628 Commits

Author SHA1 Message Date
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 c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +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
daniel 51104136a9 fixed errors in automatic combined graph 2020-07-07 16:07:13 +02:00
alejandro-campos b13cab3e2a fix prediction date item in meta 2020-06-29 17:21:23 +02:00
Daniel Barbero Martin 595339613b fixed weight legend 2020-06-29 15:37:37 +02:00
Manuel Montes 1c8a80923d Fixed visual bug in agent acccess rate from treview 2020-05-26 13:40:59 +02:00
Daniel Barbero Martin 14d78421a9 Fixed errors in vartical and gauges graph 2020-05-20 10:00:38 +02:00
Daniel Barbero Martin 0c53ff58b2 Fix tree 2020-04-13 16:42:46 +02:00
daniel 709201bf23 dashboards 2020-03-26 12:29:38 +01:00
Tatiana Llorente 4777ecd4bf Ent 5439 error grafica eventos de agente 2020-03-24 10:12:14 +01:00
Daniel Rodriguez 6faac04672 Merge branch 'ent-5267-Fechas-erroneas-en-availability-graph' into 'develop' 
Fixed date in availability graph

See merge request artica/pandorafms!3027
 2020-02-10 10:46:55 +01:00
Daniel Barbero Martin 6ddb501b08 fixed errors VC 2020-01-27 16:15:54 +01:00
Daniel Maya 1998db3317 Fixed date in availability graph 2020-01-27 11:52:13 +01:00
Daniel Barbero Martin 89e83e38e0 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2020-01-21 08:28:00 +01:00
Daniel Barbero Martin c3ae3f08a7 Fixed errors VC 2020-01-15 14:28:43 +01:00
Alejandro Campos dcd2aae3c5 Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/extras/mr/35.sql
 2020-01-14 10:28:55 +01:00
Tatiana Llorente 2c019f04ee Fixed bug in auto combined graph 2020-01-08 11:37:44 +01:00
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024' 
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
 2020-01-07 12:00:27 +01:00
vgilc 8d0b86c420 Merge branch 'ent-4481-entities-en-graficas-personalizadas-bullet-chart' into 'develop' 
remove entities custom graph bullet chart

See merge request artica/pandorafms!2640
 2019-12-10 11:50:57 +01:00
Luis 2b03b00223 Fixed agent event graph bar and link to event list 2019-12-10 11:28:56 +01:00
alejandro-campos 5880bec88a changes in module data formatting when printed across the application and new setup options 2019-12-05 17:41:44 +01:00
marcos be3dcccc4d out entities 2019-12-04 17:45:58 +01:00
marcos d6090771ef Merge remote-tracking branch 'origin/develop' into ent-4481-entities-en-graficas-personalizadas-bullet-chart 2019-12-04 17:32:38 +01:00
manuel deb217906c Fixed bug in templates 2019-10-22 15:41:13 +02:00
manuel 93bca4673f Fixed bugs in reports 2019-10-09 13:15:07 +02:00
Daniel Rodriguez e6724752ff Merge branch 'ent-4661-leyenda-de-las-graficas-en-classic-mode' into 'develop' 
Fixed Error

See merge request artica/pandorafms!2767
 2019-10-07 19:21:28 +02:00
Alejandro Fraguas e42932ad19 Merge branch 'ent-4543-Bug-en-Graficas-Personalizadas-con-Average-series-Visual' into 'develop' 
fixed summatory series custom graph

See merge request artica/pandorafms!2754
 2019-10-03 13:38:18 +02:00
marcos.alconada 4c93ca3d60 fixed minor error 2019-09-27 12:07:40 +02:00
marcos.alconada cc18d5d1ed Fixed Error 2019-09-26 17:51:26 +02:00
Daniel Barbero Martin 43aa13b4e5 fixed summatory series custom graph 2019-09-24 17:39:11 +02:00
Daniel Barbero Martin 84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +02:00
marcos.alconada 0414b4033e fixed visual error 2019-08-19 10:05:06 +02:00
marcos.alconada 762a8ad4ca remove entities custom graph bullet chart 2019-08-07 11:39:16 +02:00
Daniel Rodriguez c97074ea74 Merge branch 'ent-4354-Revision_completa_de_macros_de_reports' into 'develop' 
fixed macros reports

See merge request artica/pandorafms!2595
 2019-07-17 13:49:38 +02:00
Daniel Rodriguez 791d8f512a Merge branch 'ent-4311-Fallos_en_graficas_al_descargar_informes' into 'develop' 
fixed error in pdf

See merge request artica/pandorafms!2585
 2019-07-15 16:53:07 +02:00
Daniel Barbero Martin 2f110b8e2e Merge remote-tracking branch 'origin/develop' into ent-4354-Revision_completa_de_macros_de_reports 2019-07-15 11:37:02 +02:00
Daniel Barbero Martin ed0688f853 fixed macros reports 2019-07-10 18:20:43 +02:00
Daniel Barbero 58cb113d40 fixed error in pdf 2019-07-08 13:23:35 +02:00
alejandro-campos 58009b43c6 fix bug: custom graphs not showing properly 2019-06-21 13:39:48 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
Luis Calvo d3016a2839 Fixed sum/avg graph infinite loop 2019-06-18 14:04:38 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
manuel 5ba2ba1ef3 Fixed bug in time comparison graphs 2019-06-03 15:37:05 +02:00
fbsanchez 7a09a80ace style review 2019-06-03 14:30:23 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
Daniel Barbero Martin ae11ea18c9 Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas 
Conflicts:
	pandora_console/include/functions_graph.php


Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
 2019-05-14 12:27:02 +02:00
Daniel Barbero Martin ab2bf737d5 Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas 
Conflicts:
	pandora_console/include/functions.php


Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
 2019-05-10 12:18:10 +02:00
Daniel Barbero Martin e981edfa89 fixed label reports and more fixed 
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
 2019-05-09 16:26:38 +02:00