fermin831
|
56042f596d
|
[ACL API] Fixed groups in event validations
|
2018-06-19 19:53:54 +02:00 |
|
fermin831
|
0d2ee35e0f
|
[API ACL] Fixed the rest of reopened node API ACL fails
|
2018-06-19 17:05:23 +02:00 |
|
fermin831
|
2fc6b86251
|
[ACL API] Undo refix
|
2018-06-19 16:14:25 +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 |
|
Ramon Novoa
|
ad687b3823
|
Added HA config parameters to pandora_server.conf.
|
2018-06-19 12:20:02 +02:00 |
|
nramon
|
2071568b16
|
Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop'
Functionalities added - docker swarm
See merge request artica/pandorafms!1547
|
2018-06-19 11:33:07 +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 |
|
fbsanchez
|
8e2c5bf5cb
|
Functionalities added - docker swarm
|
2018-06-18 20:47:58 +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 |
|
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 |
|
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 |
|
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 |
|