artica
|
5042fedfd6
|
Auto-updated build strings.
|
2017-01-21 00:01:16 +01:00 |
Enrique Camargo
|
65da4818c7
|
Merge branch '23-general-report-hay-un-error-de-traduccion-en-el-campo-operation-integria-4366' into 'develop'
Change item minimum / maximum title in general reports - #23
See merge request !68
|
2017-01-20 17:35:10 +01:00 |
enriquecd
|
29af08169f
|
Change item minimum / maximum title in general reports - #23
|
2017-01-20 17:32:27 +01:00 |
|
Enrique Camargo
|
9916419f05
|
Merge branch '15-mejora_visuales_en_consola_visual_2_fixed_error_merge_pandoracss' into 'develop'
Improve_visual_console_fix_pandoracss - #15
See merge request !67
|
2017-01-20 16:05:35 +01:00 |
|
enriquecd
|
e6dd14fcb6
|
Improve_visual_console_fix_pandoracss - #15
|
2017-01-20 16:02:34 +01:00 |
vgilc
|
3d6277178b
|
Merge branch 'cherry-pick-add928bd' into 'develop'
Merge branch '4261_no_meter_archivos_open' into 'pandora_6.0'
See merge request !66
|
2017-01-20 14:52:32 +01:00 |
|
vgilc
|
2086eba5c5
|
Merge branch '4261_no_meter_archivos_open' into 'pandora_6.0'
fixed errors
See merge request !65
|
2017-01-20 14:52:14 +01:00 |
daniel
|
45938463cf
|
Merge branch '22-graficas-estaticas-en-correos-con-problemas' into 'develop'
fixed error in legend graph selected
See merge request !60
|
2017-01-20 11:16:35 +01:00 |
|
daniel
|
e4f8fa8341
|
fixed error in legend graph selected
|
2017-01-20 11:15:50 +01:00 |
|
Enrique Camargo
|
8ed84bf780
|
Merge branch '21-mensaje-no-access-solo-aparece-con-alertas-integria-4368' into 'develop'
21-Mensaje no access solo aparece con alertas [INTEGRIA: #4368]
See merge request !58
|
2017-01-20 11:09:35 +01:00 |
|
enriquecd
|
6f0a1dfb00
|
Mensaje no access solo aparece con alertas [INTEGRIA: #4368]
|
2017-01-20 11:00:32 +01:00 |
|
artica
|
f154705317
|
Auto-updated build strings.
|
2017-01-20 00:01:17 +01:00 |
|
enriquecd
|
75177057e7
|
Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop
|
2017-01-19 16:29:00 +01:00 |
|
enriquecd
|
919119e7be
|
Add definition_file content to bd for web modules - #4261
|
2017-01-19 16:27:53 +01:00 |
|
daniel
|
688cec8f42
|
Merge branch 'fixed-errors-in-net_tools-open' into 'develop'
fixed minor error in net_tool
See merge request !54
|
2017-01-19 13:26:47 +01:00 |
|
daniel
|
f3d18132f3
|
fixed minor error in net_tool
|
2017-01-19 13:24:57 +01:00 |
|
daniel
|
0f4c640f7b
|
Merge branch '20-codificacion-de-nombre-en-el-tree-view-malas' into 'develop'
fixed errors in tree-view
See merge request !52
|
2017-01-19 12:46:23 +01:00 |
|
daniel
|
0ba7e76152
|
fixed errors in tree-view
|
2017-01-19 12:44:44 +01:00 |
|
artica
|
fea876396a
|
Auto-updated build strings.
|
2017-01-19 00:01:12 +01:00 |
|
daniel
|
3ddff5c19e
|
Merge branch '135-informe-de-eventos-sale-agrupado-int-4330-open' into 'develop'
fixed errors in events reports #135
See merge request !6
|
2017-01-18 17:40:20 +01:00 |
|
daniel
|
1b26423867
|
Merge branch 'develop' into 135-informe-de-eventos-sale-agrupado-int-4330-open
|
2017-01-18 17:39:04 +01:00 |
|
daniel
|
dd58ea3ee0
|
Merge branch '157-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208-parte2-open' into 'develop'
ip dinamic in policies
See merge request !49
|
2017-01-18 17:23:07 +01:00 |
|
daniel
|
c8a33eb115
|
ip dinamic in policies
|
2017-01-18 17:20:55 +01:00 |
|
Enrique Camargo
|
5f3071e30e
|
Merge branch '110-Mejoras_visuales_en_consola_Visual_2' into 'develop'
15-Improve visual console 2 - #15
See merge request !48
|
2017-01-18 15:42:05 +01:00 |
|
enriquecd
|
3f7109c347
|
Improve visual console 2 - #15
|
2017-01-18 15:39:04 +01:00 |
mlopez
|
2019c975d7
|
Merge branch '19-usuario-con-not-login-puede-entrar-int-4355' into 'develop'
Add logout from session if user have a not login active
See merge request !46
|
2017-01-18 11:58:02 +01:00 |
|
m-lopez-f
|
12f28a00b2
|
Add logout from session if user have a not login active
|
2017-01-18 11:57:15 +01:00 |
|
daniel
|
8006c1fc0b
|
fixed pdf reports events
|
2017-01-18 10:37:08 +01:00 |
Junichi Satoh
|
34f4b434c2
|
Set default module action threshold to 0.
|
2017-01-18 10:56:08 +09:00 |
|
artica
|
e0a3dec263
|
Auto-updated build strings.
|
2017-01-18 00:01:11 +01:00 |
|
mlopez
|
362ea41ea2
|
Merge branch '10-sincronizacion-usuarios-metaconsola-active-directory' into 'develop'
Add select profile, group and tags when autocreate user in few options.
See merge request !43
|
2017-01-17 15:14:46 +01:00 |
|
m-lopez-f
|
24c0c8c12b
|
Add select profile, group and tags when autocreate user in few options. And add metaconsole replication users in node
|
2017-01-17 15:09:23 +01:00 |
Arturo Gonzalez
|
d3f5a62814
|
Fixed threshold in interface graphs. Ticket #156
|
2017-01-17 14:29:42 +01:00 |
|
Enrique Camargo
|
45079cea86
|
Merge branch '15-mejora_visuales_en_consola_visual_2' into 'develop'
15-mejora_visuales_en_consola_visual_2
See merge request !40
|
2017-01-17 12:56:03 +01:00 |
|
enriquecd
|
a9ab6a58a3
|
15-Improve_visual_console_2
|
2017-01-17 12:54:29 +01:00 |
|
enriquecd
|
774d6bf231
|
15-Improve_visual_console_2
|
2017-01-17 12:47:03 +01:00 |
|
Arturo Gonzalez
|
1f07d8a022
|
Added module value control to shows units in max, min and avg values. Ticket #159
|
2017-01-17 11:38:00 +01:00 |
|
Arturo Gonzalez
|
2cbe165d25
|
Filter with not init history db. Ticket #158
|
2017-01-17 10:50:46 +01:00 |
|
daniel
|
e2b749a34d
|
Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'
Allow dinamic ip
Closes #17
See merge request !34
|
2017-01-17 09:22:36 +01:00 |
|
daniel
|
9e391e0210
|
Allow dinamic ip
|
2017-01-17 09:21:46 +01:00 |
|
daniel
|
2aba5dde02
|
Merge branch 'revert-981273b2' into 'develop'
Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria…
See merge request !33
|
2017-01-17 09:09:23 +01:00 |
|
daniel
|
cf2c0a87b6
|
Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'"
This reverts merge request !31
|
2017-01-17 09:03:17 +01:00 |
|
Junichi Satoh
|
d16aa71c53
|
Added missing ';'.
|
2017-01-17 16:14:17 +09:00 |
|
artica
|
42487d8a6d
|
Auto-updated build strings.
|
2017-01-17 00:01:13 +01:00 |
|
daniel
|
981273b2b6
|
Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'
Allow automatic ip
Closes #17
See merge request !31
|
2017-01-16 17:47:55 +01:00 |
|
daniel
|
7261b50a4e
|
Allow automatic ip
|
2017-01-16 17:46:59 +01:00 |
|
Enrique Camargo
|
1ca30286ab
|
Merge branch '110-Mejoras_visuales_en_consola_Visual' into 'develop'
110 mejoras visuales en consola visual
#110
See merge request !29
|
2017-01-16 14:44:24 +01:00 |
|
enriquecd
|
897da6d5da
|
Improve visual console - #110
|
2017-01-16 14:42:03 +01:00 |
Ramon Novoa
|
a27f72168d
|
Change the input encoding once,not on every run.
|
2017-01-16 13:59:02 +01:00 |
|
enriquecd
|
e7ffa47b0a
|
Improve visual console - #110
|
2017-01-16 13:32:28 +01:00 |