12617 Commits

Author SHA1 Message Date
artica
0f908e37cb Auto-updated build strings. 2017-03-10 00:01:36 +01:00
m-lopez-f
7289996583 Add acl system in agent tab extesions 2017-03-09 12:00:56 +01:00
m-lopez-f
cff1f75b45 Fixed problems with bulk delete alerts opertation. Gitlab: #492 2017-03-09 11:42:36 +01:00
daniel
a02d6fcf3c fixed image from module incidents 2017-03-09 09:23:47 +01:00
artica
6f3ef53b3a Auto-updated build strings. 2017-03-09 00:01:40 +01:00
m-lopez-f
79e04c13c2 Add access node in auth ad method in all cases. Gitlab: #367 2017-03-08 12:09:22 +01:00
Ramon Novoa
a904e3c9b0 Document how to test console API settings in pandora_server.conf.
(cherry picked from commit 1efd180726a69b35300a538eab9bc2f11e073414)
2017-03-08 08:54:46 +01:00
artica
627b2993d4 Auto-updated build strings. 2017-03-08 00:01:37 +01:00
artica
aeb8f5adbe Auto-updated build strings. 2017-03-07 00:01:34 +01:00
Enrique Camargo
e9556e30a6 Merge branch '89-estadisticas-de-incidentes-descuadradas' into 'develop'
Resize incident by status graph to have similar size to other graphs - #89

See merge request !233
2017-03-06 18:28:24 +01:00
vgilc
ffb58e93af Merge branch '450-html_ent_gis_map' into 'pandora_6.0'
Removed html ent from gis map. Ticket #450

See merge request !229
2017-03-06 12:55:51 +01:00
vgilc
fe686df734 Merge branch 'cherry-pick-ec515db1' into 'pandora_6.0'
Fixed get module_data to get url_encode_separator

See merge request !223
2017-03-06 12:32:43 +01:00
Arturo Gonzalez
99fde02389 Removed html ent from gis map. Ticket #450 2017-03-06 12:02:11 +01:00
artica
b00cf189b9 Auto-updated build strings. 2017-03-06 09:21:18 +01:00
Ramon Novoa
ed569f7050 Revert pandora.mpi (was messed up!) 2017-03-06 09:18:02 +01:00
Ramon Novoa
ea75bc303e Fix a typo. 2017-03-06 09:14:47 +01:00
artica
4b154290db Auto-updated build strings. 2017-03-05 00:05:00 +01:00
fermin831
9be4c52c46 Fixed PHP 5.3 compatibility on GIS maps 2017-03-03 10:56:59 +01:00
artica
aab5cf1ef5 Auto-updated build strings. 2017-03-03 00:02:55 +01:00
fermin831
c4a09e6b10 Fixed monitor report (using reporting_advanced_sla function) 2017-03-02 15:07:03 +01:00
fermin831
aa66a1cc4c Fixed get module_data to get url_encode_separator 2017-03-02 11:08:58 +01:00
artica
7bebbbd6b7 Auto-updated build strings. 2017-03-02 00:01:34 +01:00
Ramon Novoa
bdb61fb356 Edit files in place.
(cherry picked from commit 15064ea3cd9e97d0276671f5d08c8f3fc7a0c0b9)
2017-03-01 15:59:59 +01:00
artica
e05daabc0b Auto-updated build strings. 2017-03-01 00:01:33 +01:00
Enrique Camargo
5b4e69ed21 Merge branch '74-muestra-last-contact-en-rojo-no-deberia-2' into 'develop'
Check interval filter agents without modules and disabled modules - #74

See merge request !217
2017-02-28 15:13:16 +01:00
vgilc
5b22363d7e Merge branch 'cherry-pick-63d58258' into 'pandora_6.0'
Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop'

See merge request !216
2017-02-28 14:47:07 +01:00
daniel
8637c50289 Merge branch '68-creacion-de-usuarios-en-ldap-falla' into 'develop'
fixed error in ldap create new users

See merge request !186
2017-02-28 13:32:28 +01:00
vgilc
1dd09da582 Merge branch 'revert-f6028640' into 'pandora_6.0'
Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria…

See merge request !214
2017-02-28 10:32:50 +01:00
daniel
7ac23cb9b5 Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'"
This reverts commit f6028640d34064db9d0def4245bf4b7b791d1f79
2017-02-28 09:13:14 +01:00
artica
45332abbe6 Auto-updated build strings. 2017-02-28 00:01:33 +01:00
Ramon Novoa
07ada97ee7 Add a configuration option for the Sync Server's block size.
(cherry picked from commit e2022297bb34df932f399356d5c948cab7a88f8b)
2017-02-27 16:16:55 +01:00
Ramon Novoa
8e7cb12593 Update the Tentacle clients.
(cherry picked from commit 2109fcc8756bd83748bd2c741b37469035d827a9)
2017-02-27 16:16:55 +01:00
vgilc
bc03261efe Merge branch 'fixed_setgid' into 'pandora_6.0'
Fixed setgid

See merge request !211
2017-02-27 16:03:22 +01:00
vgilc
2ce30a3015 Merge branch 'cherry-pick-d16138c6' into 'pandora_6.0'
Modified GIS Maps to print OpenMaps on empty google license

See merge request !209
2017-02-27 15:54:58 +01:00
vgilc
a2c4d4a2e0 Merge branch '385-api_reports_no_data' into 'pandora_6.0'
Fixed api get module data. Ticket #385

See merge request !213
2017-02-27 15:37:03 +01:00
Arturo Gonzalez
6d3cb8ebc3 Fixed api get module data. Ticket #385
(cherry picked from commit 938dc40f77802859111e24a51aee0241d6ac3424)
2017-02-27 14:59:26 +01:00
fbsanchez
39e1028e8c Revert "Fixed crontab references in pandora_server_installer"
This reverts commit 3e977465fa101e009bd5e5b94c45bbc35a9b4da4.
2017-02-27 13:41:14 +01:00
fbsanchez
3e977465fa Fixed crontab references in pandora_server_installer 2017-02-27 13:16:18 +01:00
fbsanchez
4e851a567e Fixed setgid (rpm & pandora_server_installer) 2017-02-27 13:14:04 +01:00
Enrique Camargo
918d3ec98e Merge branch '80-pandora-en-windows-no-muestra-la-hora-en-el-footer' into 'develop'
Change data function to show in footer windows compatible - #80

See merge request !208
2017-02-27 12:38:08 +01:00
fermin831
f6816fa7f0 Modified GIS Maps to print OpenMaps on empty google license 2017-02-27 12:14:26 +01:00
vgilc
2ccfedf9a5 Merge branch '378-Exception_in_get_module_data_api' into 'pandora_6.0'
Fixed exception in datetime object. Functions api get_module_data. Ticket #378

See merge request !206
2017-02-27 11:58:08 +01:00
Arturo Gonzalez
66db2e68a7 Fixed exception in datetime object. Functions api get_module_data. Ticket #378
(cherry picked from commit fc7e2f69b7d0fddd569d072f35324065d8942c5e)
2017-02-27 11:06:54 +01:00
Junichi Satoh
51abaa0363 Fixed setcookie() usage.
(cherry picked from commit 023f4b1703275bf168bf3784c58f5ad54a32f5bc)
2017-02-27 13:54:04 +09:00
artica
023148cacb Auto-updated build strings. 2017-02-27 00:01:32 +01:00
artica
e5f3524304 Auto-updated build strings. 2017-02-26 00:01:31 +01:00
artica
d4befa47d1 Auto-updated build strings. 2017-02-25 00:01:34 +01:00
Ramon Novoa
6a2833b9a4 SSL_verify_mode must be a number. 2017-02-24 16:39:05 +01:00
Ramon Novoa
c6bc284b21 Update all the Tentacle servers. 2017-02-24 15:55:07 +01:00
Ramon Novoa
d569d5b121 Add Sync Server SSL configuration parameters to Config.pm. 2017-02-24 08:19:37 +01:00