12597 Commits

Author SHA1 Message Date
artica
e9702517ea Auto-updated build strings. 2017-03-19 00:01:30 +01:00
artica
5e33719639 Auto-updated build strings. 2017-03-18 00:01:38 +01:00
vgilc
1b02b0b8ed Merge branch '528-informes-pdf-no-muestra-titulo-por-defecto-en-los-items-6-open' into 'pandora_6.0'
Show agent - module in pdf reports items / 6 / open - #528

See merge request !272
2017-03-17 10:32:23 +01:00
artica
e966098254 Auto-updated build strings. 2017-03-17 00:01:36 +01:00
vgilc
4219144d43 Merge branch 'cherry-pick-b580793d' into 'pandora_6.0'
Merge branch '95-query-sql-con-usuario-especifico-en-consola-snmp' into 'develop'

See merge request !259
2017-03-16 16:28:43 +01:00
enriquecd
f05970f383 Show agent - module in pdf reports items / 6 / open - #528 2017-03-16 16:20:04 +01:00
artica
ac8c83903d Auto-updated build strings. 2017-03-16 00:01:41 +01:00
Enrique Camargo
879a94faa7 Merge branch '95-query-sql-con-usuario-especifico-en-consola-snmp' into 'develop'
Filter snmp console sql sentence by user profile and group - #95

See merge request !255
2017-03-15 15:14:42 +01:00
vgilc
e3deb5f31c Merge branch 'problems-html-tag-events' into 'pandora_6.0'
Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529

See merge request !256
2017-03-15 14:28:45 +01:00
vgilc
b7984d8c0d Merge branch 'cherry-pick-ce576441' into 'pandora_6.0'
Not stop pandora_server service on windows when send XML PARSER error in data consumer. Gitlab: #518

See merge request !254
2017-03-15 13:51:53 +01:00
m-lopez-f
22138f620e Fixed problems with htmld tags in list events and other view that include list of events. Gitlab: #529 2017-03-15 12:07:06 +01:00
m-lopez-f
b4a53120e5 Not stop pandora_server service on windows when send XML PARSER error in data consumer. Gitlab: #518 2017-03-15 11:42:52 +01:00
vgilc
281fa976f8 Merge branch 'cherry-pick-cdd23639' into 'pandora_6.0'
ticket 348. Fixed problem of access to the database

See merge request !251
2017-03-15 11:21:14 +01:00
vgilc
54b599212c Merge branch 'cherry-pick-13a51f45' into 'pandora_6.0'
Merge branch '89-estadisticas-de-incidentes-descuadradas' into 'develop'

See merge request !234
2017-03-15 11:20:54 +01:00
vgilc
00ce6b041e Merge branch 'cherry-pick-1cf87e77' into 'pandora_6.0'
Fixed PHP 5.3 compatibility on GIS maps

See merge request !226
2017-03-15 11:20:26 +01:00
vgilc
b1b6bf98ae Merge branch 'cherry-pick-c8ebcafc' into 'pandora_6.0'
Fixed monitor report (using reporting_advanced_sla function)

See merge request !225
2017-03-15 11:20:04 +01:00
vgilc
006bb55e72 Merge branch 'cherry-pick-cba93067' into 'pandora_6.0'
Merge branch '74-muestra-last-contact-en-rojo-no-deberia-2' into 'develop'

See merge request !218
2017-03-15 11:19:50 +01:00
vgilc
23bf6e4f8e Merge branch 'cherry-pick-b0bdcbb3' into 'pandora_6.0'
Merge branch '80-pandora-en-windows-no-muestra-la-hora-en-el-footer' into 'develop'

See merge request !210
2017-03-15 11:17:22 +01:00
vgilc
776f04ed56 Merge branch 'cherry-pick-023f4b17' into 'pandora_6.0'
Fixed setcookie() usage.

See merge request !205
2017-03-15 11:17:04 +01:00
vgilc
ccc0cbea19 Merge branch 'cherry-pick-59135bb1' into 'pandora_6.0'
Merge branch '65-la-version-del-cliente-de-ehorus-es-vieja-hablar-con-fermin' into 'develop'

See merge request !177
2017-03-15 11:16:43 +01:00
artica
58338bf004 Auto-updated build strings. 2017-03-15 00:01:36 +01:00
Daniel Maya
7664c3eb81 ticket 348. Fixed problem of access to the database 2017-03-14 13:16:13 +01:00
artica
dc89e16ac6 Auto-updated build strings. 2017-03-14 00:01:37 +01:00
vgilc
5be69260bb Merge branch 'ad-metaconsole-pandora' into 'pandora_6.0'
Add access node in auth ad method in all cases. Gitlab: #367

See merge request !236
2017-03-13 12:56:11 +01:00
vgilc
3a41b8aa0d Merge branch 'cherry-pick-baf16db1' into 'pandora_6.0'
Fixed problems with bulk delete alerts opertation. Gitlab: #492

See merge request !239
2017-03-13 12:54:05 +01:00
vgilc
2d3af34aea Merge branch 'acl_in_extension_agent_tab' into 'pandora_6.0'
Add acl system in agent tab extesions

See merge request !240
2017-03-13 12:53:51 +01:00
vgilc
9522e656cc Merge branch '382-change-image' into 'pandora_6.0'
fixed image from module incidents

See merge request !238
2017-03-13 08:29:02 +01:00
artica
01ebdd9f4e Auto-updated build strings. 2017-03-13 00:01:36 +01:00
artica
c65bb4f4d6 Auto-updated build strings. 2017-03-12 00:01:34 +01:00
artica
0d60657893 Auto-updated build strings. 2017-03-11 00:01:36 +01:00
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