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

284 Commits

Author SHA1 Message Date
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
daniel fbf26fab91 Fix styles file export_data 2021-03-04 10:29:52 +00:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
Daniel Barbero Martin aa52ab01df Fix loading charts modules and interfaces 2020-12-09 14:05:40 +01:00
Daniel Barbero Martin 9c99058f30 fix custom graph 2020-11-25 17:29:09 +01:00
daniel 7d0c31885c fixed errors visual pie charts 2020-11-19 14:53:44 +01:00
Daniel Barbero Martin 170ee5b9a5 fixed csv charts 2020-10-28 15:36:38 +01:00
daniel 3455de7f85 fixed visual errors and default values 2020-10-07 16:03:52 +02:00
daniel 1b5ccfb20a Add new token chart fit to content 2020-10-05 17:03:30 +02:00
daniel a5d5a45cac add render graph to reports 2020-10-02 14:16:55 +02:00
daniel 0db539c444 fix visual windows charts 2020-10-01 15:29:54 +02:00
fbsanchez cd81e77b18 fix event legend 2020-09-15 11:13:41 +02:00
daniel c0661fc1b7 fixed legend max 10 modules for chart 2020-07-13 10:02:56 +02:00
Daniel Rodriguez b0d774524a Merge branch 'ent-5545-Valores-feos-en-graficas-de-agentes' into 'develop' 
Fixed values legend charts sparse

See merge request artica/pandorafms!3245
 2020-06-11 14:02:47 +02:00
Daniel Barbero Martin f2f1eaf58e Fixed values legend charts sparse 2020-05-26 14:44:52 +02:00
Luis Calvo 4f52a693ac CSV flot export fixes 2020-05-13 19:19:58 +02:00
alejandro-campos 80ce89e650 fix format function for X axis of custom graphs 2020-04-03 10:41:24 +02:00
alejandro-campos 0c3a7166e0 fix format function for X axis of custom graphs 2020-04-03 10:34:54 +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 Barbero Martin 5ec8c68aed fixed errors VC 2020-01-24 15:13:42 +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 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
Alejandro Fraguas d033b7d95a Merge branch 'ent-4948-posibilidad-de-añadir-fecha-hora-en-los-availability-graph' into 'develop' 
Added datetime in availability graph

See merge request artica/pandorafms!2917
 2019-12-10 16:34:33 +01:00
Tatiana Llorente 9d3426c0e9 Ent 4897 filtro erroneo de eventos al clickar en grafica events 24h de agente 2 2019-12-10 15:29:35 +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
manuel 12230c83c9 Added datetime in availability graph 2019-11-26 11:55:41 +01:00
manuel a69cfb63f1 Fixed bug in histogram graph report 2019-10-11 09:04:13 +02:00
Luis Calvo e4a69dc849 Fixed CSV custom graphs export 2019-08-30 15:28:06 +02:00
Daniel Barbero 22f125dee0 fixed error labels pie chart 2019-08-23 10:59:06 +02:00
Daniel Barbero 58cb113d40 fixed error in pdf 2019-07-08 13:23:35 +02:00
Alejandro Gallardo Escobar 94764bf92e Bugfixes 
(cherry picked from commit 3421f21cdf71447bf029028c138e203689aa38a2)
 2019-06-24 17:23:55 +02:00
fbsanchez 2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
Daniel Barbero Martin e981edfa89 fixed label reports and more fixed 
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
 2019-05-09 16:26:38 +02:00
Alejandro Gallardo Escobar 683dcf3469 Visual Console Refactor: bugfixes 
Former-commit-id: 0c06a88cc6136961cbb7622e373e5c1dfe265c27
 2019-04-17 12:29:38 +02:00
fbsanchez b1aa0fe2f2 Merge from develop 
Former-commit-id: 043b38c0e4ea96e0e39cc2480420164dd0f5d3b7
 2019-02-22 12:30:27 +01:00
samucarc 9c623148f5 Fixed conflict 
Former-commit-id: 02b3e0656041e5bdadf295177f0c29a81abf8c3f
 2019-02-06 19:14:46 +01:00
artica dc238cf74a Changed the format of the .js and .html files 
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
 2019-01-30 12:27:18 +01:00
Tatiana Llorente 0cb7aa3d0e Merge branch '3047-Error-en-etiqueta-en-gráficas-horizontales' into 'develop' 
Changed the font styles of the labels - #3047

See merge request artica/pandorafms!1982

Former-commit-id: 48a5230053344368f5858192e6eb3a4d7c42c830
 2019-01-08 12:15:05 +01:00
vgilc 411c815f19 Merge branch '3096-Error-exportar-a-CSV-en-Graph-Container' into 'develop' 
Removed unnecessary loop - #3096

See merge request artica/pandorafms!1992

Former-commit-id: 0708e60e64cd10bc27e3841f718fa64d8513b97c
 2018-12-21 10:23:09 +01:00
vgilc 5a3911d185 Merge branch '2939-Bug-en-la-vista-de-graficas-de-un-agente' into 'develop' 
Fixed bug in agent graph view

See merge request artica/pandorafms!1955
 2018-11-30 13:07:03 +01:00
daniel 3bf215782e fixed minor error slicebar 2018-11-29 17:00:55 +01:00
tatiana.llorente@artica.es 8e72f53aff Removed unnecessary loop - #3096 2018-11-19 16:07:45 +01:00
tatiana.llorente@artica.es 8956ebd3c0 Changed the font styles of the labels - #3047 2018-11-16 11:46:41 +01:00
manuel.montes 69df02da48 Fixed bug in agent graph view 2018-11-12 10:45:50 +01:00
daniel 58aa334798 fixed minor errors in graphs an license diag 2018-11-07 13:33:07 +01:00
daniel 0b0bad8a73 Merge remote-tracking branch 'origin/develop' into 2221-Actualizacion_de_Pandora_a_version_7_de_PHP 
Conflicts:
	pandora_console/extras/mr/22.sql
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_reporting.php
	pandora_console/include/functions_reporting_html.php
	pandora_console/include/graphs/fgraph.php
 2018-10-25 17:43:28 +02:00
samucarc 74b80f68a5 Fixed minor bug in pandora flot js 2018-10-25 16:52:39 +02:00
vgilc 4c4c874553 Merge branch '2630-Exportación-Gráficas-relacionado-con-CSV' into 'develop' 
Fixed bug in csv export graph

See merge request artica/pandorafms!1814
 2018-10-25 12:57:24 +02:00