15522 Commits

Author SHA1 Message Date
daniel
c30b05f409 fixed error in event fields 2017-10-18 10:27:20 +02:00
artica
157670c21c Auto-updated build strings. 2017-10-18 00:01:15 +02:00
vgilc
a6ba78ca20 Merge branch '1427-Fixed-minor-error-in-networkmaps-dev' into 'develop'
Added minor fix

See merge request !930
2017-10-17 15:36:47 +02:00
Arturo Gonzalez
504201b822 Added minor fix 2017-10-17 13:44:36 +02:00
vgilc
56cd90d43a Merge branch '1241-change-text-in-advanced-permissions-ldap-dev' into 'develop'
Text changed

See merge request !926
2017-10-17 09:50:56 +02:00
artica
fc762719c9 Auto-updated build strings. 2017-10-17 00:01:21 +02:00
vgilc
4bd7c7fb1f Merge branch 'reinicio-automatico-de-recon-ext-4100' into 'develop'
Do not automatically restart manual recon tasks.

See merge request !928
2017-10-16 17:21:23 +02:00
vgilc
27746eedc0 Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'"
This reverts merge request !862
2017-10-16 16:44:44 +02:00
vgilc
1838a6b30a Revert "Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'"
This reverts merge request !863
2017-10-16 16:44:16 +02:00
Ramon Novoa
e649815624 Do not automatically restart manual recon tasks.
Ref pandora_enterprise#1274.
2017-10-16 15:52:00 +02:00
vgilc
db11068838 Merge branch '1350-Eliminación-y-mejora-de-las-secciones-de-diagnóstico-de-pandora-3b' into 'develop'
Change db maintenance sections buttons location - #1350

See merge request !927
2017-10-16 13:35:01 +02:00
enriquecd
da4a277625 Change db maintenance sections buttons location - #1350 2017-10-16 13:26:30 +02:00
vgilc
4c3e200946 Merge branch '145-plain-text-mail-cannot-be-send-by-email_problems_mr' into 'develop'
fixed error in function check mr

See merge request !921
2017-10-16 10:26:31 +02:00
Arturo Gonzalez
8f7cb910ac Text changed 2017-10-16 08:34:39 +02:00
artica
6c11b68d3d Auto-updated build strings. 2017-10-16 00:01:18 +02:00
artica
606697a405 Auto-updated build strings. 2017-10-15 00:01:19 +02:00
artica
6bfc11be4a Auto-updated build strings. 2017-10-14 00:01:20 +02:00
slerena
551704a0bf Updated description to be more precise in the comments of web server configuration token. 2017-10-13 17:10:48 +02:00
vgilc
cd0a15906f Merge branch 'ent-1455-auto-sla-no-funciona-cuando-esta-asignada-a-un-agente' into 'develop'
Fixed auto SLA item on visual console when no module is selected

See merge request !922
2017-10-13 14:54:23 +02:00
vgilc
b22fe4bd36 Merge branch '1449-No_mostrar_check_para_graficas_TIP_en_modulos_de_tipo_prediction_rev' into 'develop'
fixed minor errors

See merge request !923
2017-10-13 14:53:44 +02:00
daniel
8fbe360333 fixed minor errors 2017-10-13 14:44:12 +02:00
fermin831
befb859e23 Fixed auto SLA item on visual console when no module is selected 2017-10-13 14:16:37 +02:00
daniel
48e68b1264 fixed error in function check mr 2017-10-13 14:08:50 +02:00
vgilc
4d5a129ec4 Merge branch 'configuracion-remota-en-32-bits' into 'develop'
Replace a 32 bit shift with two 16 bit shifts.

See merge request !875
2017-10-13 12:02:59 +02:00
artica
3fb49f294d Auto-updated build strings. 2017-10-13 00:02:12 +02:00
vgilc
c1fe2a3447 Merge branch '1425-new-improvements-in-route-analyzer-feature-dev' into 'develop'
1425 new improvements in route analyzer feature dev

See merge request !919
2017-10-11 17:40:55 +02:00
vgilc
9b4288501a Merge branch '1449-No_mostrar_check_para_graficas_TIP_en_modulos_de_tipo_prediction' into 'develop'
fixed errors in setup tip AND prediction modules

See merge request !918
2017-10-11 16:14:42 +02:00
daniel
e912e151a9 fixed errors in setup tip AND prediction modules 2017-10-11 13:17:29 +02:00
artica
6bc0949942 Auto-updated build strings. 2017-10-11 00:01:25 +02:00
vgilc
9181d1ca16 Merge branch '1389-Filtro-de-Tags-dev' into 'develop'
Fixed search by tags

See merge request !912
2017-10-10 13:46:29 +02:00
Daniel Maya
fc9a5c4662 Fixed search by tags 2017-10-10 13:39:44 +02:00
vgilc
f72e6887d4 Merge branch '1266-Checkbox-All-modules-en-operaciones-masivas-4472-onenet-2b' into 'develop'
Only unselect any option in module bulks operation multiselect when select any and others at the same time - #1266

See merge request !911
2017-10-10 12:59:35 +02:00
vgilc
bd29622bb7 Merge branch '1442-fix-purgado-de-datos-string' into 'develop'
Fix pandora_db string data purge

See merge request !909
2017-10-10 12:58:32 +02:00
enriquecd
8525426763 Only unselect any option in mulselect when select any and others at the same time - #1266 2017-10-10 12:36:47 +02:00
Arturo Gonzalez
1e6f3a9d9b Borja fix this error 2017-10-10 11:44:15 +02:00
fbsanchez
4fc33ec58b Fix pandora_db string data purge 2017-10-10 11:26:04 +02:00
artica
ec95400043 Auto-updated build strings. 2017-10-10 00:01:23 +02:00
Arturo Gonzalez
391655f6fe Added images and Borsha fix 2017-10-09 17:11:08 +02:00
vgilc
cf075dadb9 Merge branch '1350-Eliminacion-y-mejora-de-las-secciones-de-diagnostico-de-pandora-3' into 'develop'
Delete system info section file - #1350

See merge request !906
2017-10-09 16:11:13 +02:00
enriquecd
5812b56e0b Delete system info section file - #1350 2017-10-09 15:50:51 +02:00
vgilc
a3b0f5c86c Merge branch '1350-Eliminacion-y-mejora-de-las-secciones-de-diagnostico-de-pandora-2b' into 'develop'
Fix pandora diag texts and delete old sections files - #1350

See merge request !905
2017-10-09 15:42:28 +02:00
enriquecd
c86bd5cc3c Fix pandora diag texts and delete old secitons files - #1350 2017-10-09 15:36:28 +02:00
vgilc
b8809b2c36 Merge branch '1424-Usuarios-estándar-no-pueden-cambiar-el-rango-de-tiempo-en-Gráficas-de-Agentes-dev' into 'develop'
Changed period in functions_html

See merge request !901
2017-10-09 13:16:58 +02:00
Daniel Maya
076e9cfec0 Changed period in functions_html 2017-10-09 12:25:01 +02:00
vgilc
f8023bf44a Merge branch '145-plain-text-mail-cannot-be-send-by-email' into 'develop'
add send mail plain/text

See merge request !862
2017-10-09 10:11:27 +02:00
vgilc
80495ddaf7 Merge branch '145-plain-text-mail-cannot-be-send-by-email_mr' into 'develop'
create mr8 for send mail plain/text

See merge request !863
2017-10-09 10:11:07 +02:00
vgilc
35f2b4fa6e Merge branch '177-WUX-console-no-se-ve-por-una-errata-dev' into 'develop'
fixed wux_console_view

See merge request !883
2017-10-09 10:09:33 +02:00
artica
2553494696 Auto-updated build strings. 2017-10-09 00:01:22 +02:00
artica
406ceaf8d3 Auto-updated build strings. 2017-10-08 00:01:32 +02:00
vgilc
1008912e94 Merge branch '1260-Mensajes_DB_status' into 'develop'
fixed minor error in db status

See merge request !891
2017-10-06 09:46:37 +02:00