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

13428 Commits

Author SHA1 Message Date
fermin831 a072cd34de Fixed tree view meta secondary groups repeated agents 2018-06-20 12:09:32 +02:00
slerena 1948cdd3e4 Merge branch '1827-Graficas-TIP-eje-x-dev' into 'develop' 
1827 graficas tip eje x dev

See merge request artica/pandorafms!1555
 2018-06-20 11:36:58 +02:00
daniel aa4f13d17a fixed errors in graphs 2018-06-20 11:31:43 +02:00
artica 2c6ad942cb Auto-updated build strings. 2018-06-20 00:01:24 +02:00
fbsanchez 73567f1859 Trying to adjust graph render sizes 2018-06-19 19:19:38 +02:00
fbsanchez b625f2e5c8 Changed GET to POST in web2image 2018-06-19 19:07:36 +02:00
danielmaya 4214577eea Added new token for static graph height 2018-06-19 18:27:04 +02:00
slerena 41d57dd18a Merge branch 'ent-1859-database-changes' into 'develop' 
Added a new inventory module to the database

See merge request artica/pandorafms!1552
 2018-06-19 18:23:44 +02:00
slerena c168ad1be0 Merge branch '2290-seguridad-en-la-api-3' into 'develop' 
[API ACL] Fixed the rest of reopened node API ACL fails

See merge request artica/pandorafms!1554
 2018-06-19 17:18:39 +02:00
fermin831 0d2ee35e0f [API ACL] Fixed the rest of reopened node API ACL fails 2018-06-19 17:05:23 +02:00
slerena b56cb02761 Merge branch '2290-seguridad-en-la-api-3' into 'develop' 
2290 seguridad en la api 3

See merge request artica/pandorafms!1546
 2018-06-19 16:23:09 +02:00
fermin831 2fc6b86251 [ACL API] Undo refix 2018-06-19 16:14:25 +02:00
Alejandro Gallardo Escobar faccbec12d Added a new inventory module to the database 2018-06-19 15:55:33 +02:00
nramon 3614e5caeb Merge branch '1827-Graficas-TIP-eje-x-no-mantiene-ratio-dev' into 'develop' 
Fixed graph with https

See merge request artica/pandorafms!1551
 2018-06-19 15:04:42 +02:00
danielmaya 9bff4f28f4 Fixed graph with https 2018-06-19 15:00:39 +02:00
Alejandro Gallardo Escobar 04aad98871 Added the database changes for the custom fields of the remote inventory modules 2018-06-19 13:49:36 +02:00
fermin831 c11a8b3d2e Merge branch 'develop' into 2290-seguridad-en-la-api-3 2018-06-19 13:38:13 +02:00
fermin831 a5112929fd [API ACL] Fixed get agent_module_last_value (and related) and get policies 2018-06-19 13:37:37 +02:00
nramon 28b84be756 Merge branch '2294-requisitos-api-cluster' into 'develop' 
Modified functions api

See merge request artica/pandorafms!1548
 2018-06-19 11:32:06 +02:00
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
danielmaya 14f4070558 Changed link to phantomjs configuration 2018-06-18 13:22:20 +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
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
fermin831 d3c0b0473f Fixed module functions ACL check 2018-06-14 16:04:50 +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 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
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
daniel 92204c4ec2 fixed minor error alert phantomjs 2018-06-13 11:55:05 +02:00
daniel 7fe88d761e remove setup resolution graph 2018-06-13 11:32:03 +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
artica e4461273ab Updated version and build strings. 2018-06-12 17:28:15 +02:00
daniel e07da64c5d fixed minor errors size stat-win 2018-06-12 16:54:45 +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