Commit Graph

519 Commits

Author SHA1 Message Date
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
daniel 727b173392 fixed error library pdf example 2018-05-22 13:15:09 +02:00
fbsanchez 9f140e6197 Applied lukasr patch for pchart 2018-05-22 10:51:03 +02:00
daniel 25666e1bff fixed errors 2018-05-22 10:50:38 +02:00
daniel b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
daniel 79354a0ebf fixed graphs 2018-05-18 14:22:39 +02:00
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
2018-05-10 08:52:45 +02:00
daniel f758124531 fixed treshold graph 2018-05-10 08:43:09 +02:00
fermin831 2885885cc4 Fixed a JS error (invalid parameter in pandoraAreaGraph) 2018-05-03 13:02:17 +02:00
daniel b11e256c8b fixed custom graph 2018-04-27 13:51:13 +02:00
daniel 30dc841bae custom graph 2018-04-27 10:03:05 +02:00
daniel 2a81703a68 fixed minor error custom graph 2018-04-26 10:24:37 +02:00
daniel 3fbd9adc38 fixed graph 2018-04-24 13:19:24 +02:00
daniel e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
2018-04-23 12:21:11 +02:00
vgilc f7ae6f78b1 Merge branch '1980-error-en-dashboards-con-custom-graphs-dev' into 'develop'
Fixed issue in dashboard with firefox

See merge request artica/pandorafms!1431
2018-04-18 11:11:35 +02:00
danielmaya e6dc7799c8 Fixed issue in dashboard with firefox 2018-04-18 10:30:24 +02:00
fermin831 4d78256937 Fixed Y-axis label decimals 2018-04-17 11:54:52 +02:00
fbsanchez dcaae924fc Decreased limit to reduceText call in some graphs 2018-04-03 16:41:21 +02:00
enriquecd 09d712d1ab Not blink separatos points in visual console digital clock - #2026 2018-03-28 18:42:59 +02:00
fbsanchez 526bd5f8c5 Merge remote-tracking branch 'origin/develop' into 2096-shorten_labels_in_hbars 2018-03-23 11:08:48 +01:00
vgilc 9e276aa8a2 Merge branch '2026-5413-Quitar-el-parpadeo-del-reloj-digital' into 'develop'
Not blink separator dots for digital clocks - #2026

See merge request artica/pandorafms!1356
2018-03-22 10:04:04 +01:00
fbsanchez 835e791ef1 Fixed label shortener in hbar 2018-03-21 13:40:15 +01:00
fermin831 d38df88c79 [Pie charts] Adding more space in legend 2018-03-13 19:07:31 +01:00
danielmaya 64b62edd90 Fixed shorten axis units 2018-03-09 10:18:02 +01:00
enriquecd 97bcaec720 Not blink separator dots for digital clocks - #2026 2018-03-08 11:58:31 +01:00
fermin831 52e6503018 [Vertical Bar Charts] Fixed strpos check 2018-03-01 17:07:55 +01:00
fermin831 b6688dda1c [SQL charts reports] Added top n report to set the maximum number of elements 2018-03-01 16:49:50 +01:00
fermin831 4719742ba2 [Pie Charts] Maximized the number of elements 2018-03-01 13:19:58 +01:00
fermin831 287d28de4e [Vertical Bar Charts] Preserve order after truncate label 2018-03-01 13:16:36 +01:00
fermin831 d0bf68888e [SQL charts] Fixed SQL vertical chart 2018-03-01 12:02:08 +01:00
daniel 738776ef7e merge develop 2018-03-01 10:13:55 +01:00
daniel 815e9c6759 fixed errors graph 2018-03-01 09:46:52 +01:00
danielmaya 9d36887a02 Fixed graph precision 2018-02-28 14:33:22 +01:00
daniel 3910b455ca fixed errors 2018-02-28 10:02:06 +01:00
daniel 51f22413a8 fixed errors in graphs 2018-02-28 08:46:51 +01:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
daniel 688acb8a4b fixed error graphs 2018-02-23 14:31:00 +01:00
daniel f69fb8a5f9 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-21 14:00:14 +01:00
daniel 4b654bd87d fixed errors grapgh 2018-02-21 11:54:24 +01:00
enriquecd 9a525f3b2e Change visual console digital clock colors - #1403 2018-02-19 19:17:53 +01:00
daniel 8be776e3ea fixed errrors graphs 2018-02-19 09:31:45 +01:00
daniel b6798bf31c update flot.js 2018-02-16 13:41:31 +01:00
daniel 2417cae01d Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-02-12 12:47:53 +01:00
daniel af9e11ffca reconfigure charts 2018-02-08 15:47:12 +01:00
enriquecd a04f941a55 Merge branch 'develop' into 1403-Añadir-relojes-a-consolas-visuales-com1
Conflicts:
	pandora_console/include/styles/pandora.css
2018-02-07 17:02:15 +01:00
daniel 63e5d23288 change xasis to time 2018-02-02 12:25:23 +01:00
daniel d79bd6973f Merge branch 'develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-01-31 15:29:37 +01:00
vgilc d9825c08b5 Merge branch '1660-WUX-stats-charts-dev' into 'develop'
Fixed jquery error

See merge request artica/pandorafms!1151
2018-01-29 13:31:19 +01:00
vgilc 2e486ffac0 Merge branch '1727-Gráficas-horizontales-texto' into 'develop'
Fix hbar grpahs label - #1727

See merge request artica/pandorafms!1246
2018-01-29 13:25:04 +01:00
vgilc 94e2e0b908 Merge branch 'fix-module-graph-decimals' into 'develop'
Resolve: "Fix module graph decimals"

See merge request artica/pandorafms!1121
2018-01-29 12:58:13 +01:00