vgilc
|
001ac8faf2
|
Merge branch '96-availability-report-icons-on-pdf-6' into 'pandora_6.0'
Not show graph legend icons - #96
See merge request !268
|
2017-03-27 10:20:14 +02:00 |
|
vgilc
|
7c047deffc
|
Merge branch '532-autenticacion-doble-en-metaconsola' into 'pandora_6.0'
Fixed bug in qr
See merge request !270
|
2017-03-27 10:14:06 +02:00 |
|
artica
|
c9baba07e5
|
Auto-updated build strings.
|
2017-03-27 00:01:35 +02:00 |
|
artica
|
151dce6177
|
Auto-updated build strings.
|
2017-03-26 00:01:45 +01:00 |
|
artica
|
1a7b74f4bf
|
Auto-updated build strings.
|
2017-03-25 00:02:26 +01:00 |
|
vgilc
|
bd28085b5c
|
Merge branch '562-problema-acls-politicas-6-open' into 'pandora_6.0'
Change sec param in policies section, gpolicies to gmodules /6 / open - #562
See merge request !300
|
2017-03-24 13:20:28 +01:00 |
|
enriquecd
|
a6018f90b5
|
Change sec param in policies section, gpolicies to gmodules /6 / open - #562
|
2017-03-24 12:44:51 +01:00 |
|
vgilc
|
08db662eb6
|
Merge branch '101-fallo-en-el-filtro-de-eventos-en-el-filtrado-de-cadena' into 'pandora_6.0'
Added safe output to free search at loading event filter
See merge request !297
|
2017-03-24 10:49:07 +01:00 |
|
fermin831
|
e0a9401959
|
Added safe output to free search at loading event filter
|
2017-03-24 10:14:06 +01:00 |
|
artica
|
0c59c913a5
|
Auto-updated build strings.
|
2017-03-24 00:01:37 +01:00 |
|
artica
|
03ddd3dfbe
|
Auto-updated build strings.
|
2017-03-23 00:01:36 +01:00 |
|
artica
|
7ea246734b
|
Auto-updated build strings.
|
2017-03-22 00:01:37 +01:00 |
|
vgilc
|
b1881c9df4
|
Merge branch '517-footer-metaconsola-vs-footer-consola-6-open' into 'pandora_6.0'
Print metaconsole footer in buttom and change marks order - 6 - open - #517
See merge request !274
|
2017-03-21 10:36:57 +01:00 |
|
vgilc
|
66c3c0f8b9
|
Merge branch '98-agentes-codificados-en-vista-de-gis-data-dentro-de-la-vista-de-agente-6' into 'pandora_6.0'
Show agent alias in gis maps with entities - #98
See merge request !282
|
2017-03-21 10:36:03 +01:00 |
|
artica
|
af24c1c7fb
|
Auto-updated build strings.
|
2017-03-21 00:01:33 +01:00 |
|
artica
|
944dde6265
|
Auto-updated build strings.
|
2017-03-20 00:01:33 +01:00 |
|
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 |
|
enriquecd
|
8c4ac12ddb
|
Show agent alias in gis maps with entities - #98
|
2017-03-17 12:01:07 +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 |
|
enriquecd
|
a16803fa56
|
Print metaconsole footer in buttom and change marks order - 6 - open - #517
|
2017-03-16 17:22:07 +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 |
|
Daniel Maya
|
eb9f19c2de
|
Fixed bug in qr
|
2017-03-16 16:04:16 +01:00 |
|
enriquecd
|
e1842cabbe
|
Not show graph legend icons - #96
|
2017-03-16 12:22:14 +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 |
|