438 Commits

Author SHA1 Message Date
fermin831
001861b746 Hide policy edition on centralized management on node 2018-07-17 08:51:39 +02:00
daniel
23ef9c8f53 Merge remote-tracking branch 'origin/develop' into ent-2076-ue-mejoras-en-gestion-de-politicas-desde-metaconsola 2018-07-12 14:49:59 +02:00
daniel
fce669ae21 fixed minor errors in legend charts 2018-07-10 17:53:19 +02:00
fermin831
aaf8173b8a Added is_central_policies function 2018-07-10 17:49:46 +02:00
Alejandro Gallardo Escobar
de58fe7b90 Fixes 2018-07-06 14:03:05 +02:00
daniel
0dd39f1f00 fixed errors in graph slice for uncompresed 2018-07-05 11:52:52 +02:00
daniel
eaf5abd476 fixed keep alive bool type module 100 2018-06-25 15:35:12 +02:00
daniel
aa4f13d17a fixed errors in graphs 2018-06-20 11:31:43 +02:00
fbsanchez
73567f1859 Trying to adjust graph render sizes 2018-06-19 19:19:38 +02:00
danielmaya
4214577eea Added new token for static graph height 2018-06-19 18:27:04 +02:00
danielmaya
9bff4f28f4 Fixed graph with https 2018-06-19 15:00:39 +02:00
daniel
7d4a29cbe2 fixed errors in meta and windows 2018-06-14 19:19:58 +02:00
daniel
9e229e6228 fixed minor errors 2018-06-14 18:14:54 +02:00
daniel
80ddcbe1b6 fixed security error phantomjs 2018-06-14 16:47:23 +02:00
daniel
46c23f9deb fixed minor errors in graphs: tree, labels, tocken meta 2018-06-14 12:17:16 +02:00
daniel
05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
daniel
9ecc770519 remove only average for all graphs and add zoom for sparse graph in stat-win and stat-win-interfaces 2018-06-13 11:02:58 +02:00
daniel
25942907cf Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 15:46:41 +02:00
daniel
2d6fa8d0e0 fixed errors graphs 2018-06-12 15:46:05 +02:00
vgilc
24ec62b807 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
fixed errors agent access and other fix

See merge request artica/pandorafms!1525
2018-06-12 12:13:46 +02:00
daniel
6eba3250da fixed errors agent access and other fix 2018-06-12 12:08:04 +02:00
Alejandro Gallardo Escobar
f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar
fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
daniel
abad4f4f4b fixed minor errorstime graphs 2018-06-11 15:35:04 +02:00
daniel
adf9e4d1fe fixed minor errors 2018-06-11 13:53:10 +02:00
daniel
f85a8b513a fixed errors 2018-06-08 14:30:15 +02:00
daniel
eb7cdc7c90 fixed errors in graph delete to image pdf 2018-06-08 08:58:18 +02:00
daniel
7834869977 fixed water mark in graphs 2018-06-07 09:15:45 +02:00
daniel
d7da009804 fixed errors in graphs 2018-06-06 17:23:32 +02:00
daniel
badfd83b0d 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
2018-06-06 11:57:02 +02:00
daniel
89a481c452 fixed errors in graphs 2018-06-06 11:18:39 +02:00
Junichi Satoh
5142112ae5 Fixed error and white screen with php7.2. 2018-06-05 11:34:19 +09:00
daniel
47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
daniel
a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
daniel
dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
daniel
02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
fermin831
88e060893a Merge branch 'develop' into 2106-intracom-rebranding
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
2018-05-28 12:12:16 +02:00
daniel
16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
2018-05-23 12:46:12 +02:00
fermin831
e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
2018-05-22 19:29:46 +02:00
Alejandro Gallardo Escobar
dcdce9c8fc Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-05-22 17:58:47 +02:00
Alejandro Gallardo Escobar
37f19dc9fd Fixed a column name 2018-05-22 16:17:08 +02:00
daniel
78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +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
fermin831
614db8b523 [Rebranding] Added product name and copyright notice to setup 2018-05-09 11:49:12 +02:00
fermin831
57fb63bd91 Fixed snapshots view in string data 2018-05-07 19:40:38 +02:00
Alejandro Gallardo Escobar
f1985313ab The audit view and csv now use the user defined timezone 2018-05-07 16:10:31 +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
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