17679 Commits

Author SHA1 Message Date
artica
8d39712be4 Auto-updated build strings. 2018-06-19 00:01:25 +02:00
fbsanchez
e0fa002cd2 Modified functions api 2018-06-18 21:11:53 +02:00
fbsanchez
8e2c5bf5cb Functionalities added - docker swarm 2018-06-18 20:47:58 +02:00
fermin831
fec5299179 Fixed secondary groups configuration in agent creation 2018-06-18 13:46:13 +02:00
nramon
c21cb2634b Merge branch '1827-Graficas-TIP-eje-x-no-mantiene-ratio-dev' into 'develop'
Changed link to phantomjs configuration

See merge request artica/pandorafms!1544
2018-06-18 13:44:55 +02:00
danielmaya
14f4070558 Changed link to phantomjs configuration 2018-06-18 13:22:20 +02:00
manuel.montes
7da00bca8a Fixed bug in realtime_graphs.php 2018-06-18 11:12:38 +02:00
nramon
72f9bc754c Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1542
2018-06-18 10:48:34 +02:00
artica
b29dd4eb8a Auto-updated build strings. 2018-06-18 00:01:21 +02:00
artica
a47f7b7e97 Auto-updated build strings. 2018-06-17 00:01:21 +02:00
artica
2926c7789e Auto-updated build strings. 2018-06-16 00:01:21 +02:00
artica
76bc8ad280 Auto-updated build strings. 2018-06-15 00:01:24 +02:00
daniel
651347897c fixed minor error add link phantomjs 2018-06-14 20:15:04 +02:00
daniel
7d4a29cbe2 fixed errors in meta and windows 2018-06-14 19:19:58 +02:00
vgilc
2bc4ed4ff2 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1541
2018-06-14 18:19:09 +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
vgilc
7d03558f35 Merge branch '2290-seguridad-en-la-api-2' into 'develop'
Fixed module functions ACL check

See merge request artica/pandorafms!1540
2018-06-14 16:17:04 +02:00
fermin831
d3c0b0473f Fixed module functions ACL check 2018-06-14 16:04:50 +02:00
vgilc
c9b2da9513 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1539
2018-06-14 12:45:39 +02:00
daniel
85570dedba Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-14 12:17:31 +02:00
daniel
46c23f9deb fixed minor errors in graphs: tree, labels, tocken meta 2018-06-14 12:17:16 +02:00
vgilc
3a4f3a38be Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1538
2018-06-14 10:12:05 +02:00
daniel
84999a5fe0 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-14 10:02:57 +02:00
daniel
9d2f069d20 fixed font and font-family 2018-06-14 10:02:26 +02:00
artica
d7f59d4fd3 Auto-updated build strings. 2018-06-14 00:01:24 +02:00
daniel
fc970b9b8e fixed minor error 2018-06-13 19:22:22 +02:00
daniel
05d8d0ccf5 fixed errors graph 2018-06-13 19:13:42 +02:00
danielmaya
9af4b25f31 Changed permission AW for VR in visual console 2018-06-13 17:28:03 +02:00
vgilc
822fc05258 Merge branch '2042-HA_cluster-dev' into 'develop'
2042 ha cluster dev

See merge request artica/pandorafms!1524
2018-06-13 16:14:29 +02:00
danielmaya
6f689f0d0e Added mr 17 and update migrate 2018-06-13 15:39:31 +02:00
vgilc
7d0249ee12 Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1536
2018-06-13 12:03:24 +02:00
daniel
ead978ea60 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-13 11:56:03 +02:00
daniel
92204c4ec2 fixed minor error alert phantomjs 2018-06-13 11:55:05 +02:00
vgilc
d0ea2f6f7f Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
remove setup resolution graph

See merge request artica/pandorafms!1535
2018-06-13 11:42:54 +02:00
daniel
7fe88d761e remove setup resolution graph 2018-06-13 11:32:03 +02:00
vgilc
0e199a377e Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1534
2018-06-13 11:14:31 +02:00
daniel
ef95d9c68c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-13 11:03:51 +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
artica
7a26aa3b38 Auto-updated build strings. 2018-06-13 00:01:26 +02:00
manuel.montes
c8b5ecad06 Fixed submenu2 in functions_menu.php 2018-06-12 17:41:46 +02:00
artica
e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
vgilc
d761a8895b Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
fixed minor errors size stat-win

See merge request artica/pandorafms!1532
2018-06-12 17:04:47 +02:00
daniel
e07da64c5d fixed minor errors size stat-win 2018-06-12 16:54:45 +02:00
vgilc
946ad40f2a Merge branch '1827-Graficas_TIP_eje_x_no_mantiene_ratio' into 'develop'
1827 graficas tip eje x no mantiene ratio

See merge request artica/pandorafms!1531
2018-06-12 16:45:06 +02:00
vgilc
bfabcfdc50 Merge branch 'ent-2237-5672-modificacion-en-network-server-solicitada-para-evitar-reinicios' into 'develop'
Added trace with module id to tcp network server checks

See merge request artica/pandorafms!1530
2018-06-12 16:42:05 +02:00
daniel
57503a2d3b Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-12 16:37:57 +02:00
daniel
dfc43a35ab fixed errors grid black in vbars and hbars 2018-06-12 16:37:41 +02:00
fermin831
27700d820e Added trace with module id to tcp network server checks 2018-06-12 16:09:04 +02:00
vgilc
d42d8a2fd7 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports-2' into 'develop'
Always group All in custom reports and custom graphs

See merge request artica/pandorafms!1528
2018-06-12 15:56:09 +02:00