22438 Commits

Author SHA1 Message Date
alejandro-campos
0df2447770 added comment management and fixed some errors in incident edition 2019-09-20 12:37:47 +02:00
Tatiana Llorente
375bfca6ff New view - Dashboard details of Integria IMS tickets - #4644 2019-09-20 12:27:36 +02:00
Daniel Rodriguez
409ac061e0 Merge branch 'ent-4047-Simplificacion-de-la-configuracion-del-sistema-de-email' into 'develop'
Ent 4047 simplificacion de la configuracion del sistema de email

See merge request artica/pandorafms!2712
2019-09-20 11:57:58 +02:00
Ramon Novoa
0bdf967259 Temporarily disable cert verification for STARTTLS too. 2019-09-20 10:36:56 +02:00
artica
d8ab1defcb Auto-updated build strings. 2019-09-20 00:01:09 +02:00
Daniel Rodriguez
28559f4fcb Merge branch 'ent-4435-consola-visual-host-alive-keep-alive' into 'develop'
Add new visual console Host Alive Keep Alive

See merge request artica/pandorafms!2701
2019-09-19 16:10:33 +02:00
Ramon Novoa
274b6b9327 Disable certificate verification until it can be turned on/off from the console. 2019-09-19 15:27:46 +02:00
Ramon Novoa
0e281c7a0a Send sendmail errors to pandora_server.error. 2019-09-19 12:43:31 +02:00
Marcos Alconada
6107d141c0 Update pandoradb_data.sql 2019-09-19 12:40:53 +02:00
Daniel Rodriguez
91117e3d60 Merge branch 'ent-3878-report-sumation-no-funciona-bien' into 'develop'
Fixed bug

See merge request artica/pandorafms!2741
2019-09-19 12:17:35 +02:00
Luis Calvo
37fd876a22 Fixed bug 2019-09-19 10:31:54 +02:00
alejandro-campos
e09db0b9a9 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-19 10:24:58 +02:00
alejandro-campos
1177cce25f added attached files section to incident edition 2019-09-19 10:24:43 +02:00
fbsanchez
6def88472a Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
#   pandora_console/extras/mr/32.sql
2019-09-19 10:18:15 +02:00
artica
14f73f147f Auto-updated build strings. 2019-09-19 00:01:10 +02:00
Tatiana Llorente
8acdde9f3a Added date filter - #4642 2019-09-18 18:19:29 +02:00
Daniel Rodriguez
d939bf9e93 Merge branch 'ent-3878-Report-type-summation-not-working-properly-migratesql' into 'develop'
Ent 3878 report type summation not working properly migratesql

See merge request artica/pandorafms!2738
2019-09-18 17:54:17 +02:00
fbsanchez
42c0fa9a5a web2image control phantomjs flow 2019-09-18 16:58:02 +02:00
Alejandro Fraguas
4adf584827 Merge branch 'ent-4655-nomenclatura-licencia' into 'develop'
Changed caption Expires

See merge request artica/pandorafms!2736
2019-09-18 16:49:55 +02:00
Luis
0c72fe718c Update pandoradb_migrate_6.0_to_7.0.mysql.sql 2019-09-18 16:42:09 +02:00
Luis Calvo
4628e41f69 Added missing changes to pandora_migratte 2019-09-18 16:39:05 +02:00
Jose Gonzalez
be1cde5466 Deleted tests 2019-09-18 15:41:20 +02:00
Jose Gonzalez
a4e22d325d Solved issue 2019-09-18 15:39:33 +02:00
Tatiana Llorente
eb271a93eb Added button for export to csv - #4642 2019-09-18 15:32:36 +02:00
Daniel Rodriguez
c81cb1d222 Merge branch 'ent-3878-Report-type-summation-not-working-properly' into 'develop'
Ent 3878 report type summation not working properly

See merge request artica/pandorafms!2599
2019-09-18 14:41:35 +02:00
Luis Calvo
ad10d5dff3 Fixed notifiation text misprint 2019-09-18 13:41:31 +02:00
Jose Gonzalez
73a341912f Changed caption Expires 2019-09-18 13:35:11 +02:00
Daniel Barbero Martin
056bbb7348 fixed minor error 2019-09-18 13:16:05 +02:00
Luis Calvo
43af2269ee Fixed default values uncompress data 2019-09-18 11:51:01 +02:00
Daniel Barbero Martin
84d1979c9e fixed error percentil label 2019-09-18 11:15:55 +02:00
Daniel Rodriguez
c20fcd6366 Merge branch 'ent-4419-error-sql-filtrar-instrucciones-de-evento' into 'develop'
Event column instructions maked unsortabe

See merge request artica/pandorafms!2733
2019-09-18 10:58:36 +02:00
artica
47be6a611f Auto-updated build strings. 2019-09-18 00:01:11 +02:00
Luis Calvo
0c60f13ccd Event column instructions maked unsortabe 2019-09-17 19:54:34 +02:00
alejandro-campos
f2a6dbb60e Merge remote-tracking branch 'origin/ent-4642-Listado-de-tickets-integración-Integria' into ent-4461-Configuracion-integracion-integria 2019-09-17 14:56:54 +02:00
alejandro-campos
979f7beca4 created ajax file to manage incident fields autocompletion 2019-09-17 13:41:21 +02:00
alejandro-campos
87f8badc18 completed integria setup and incident creation and update 2019-09-17 13:38:17 +02:00
Tatiana Llorente
326b053f23 New view - List of Integria IMS tickets - #4642 2019-09-17 13:03:36 +02:00
Tatiana Llorente
027f9fd9d4 New view - List of Integria IMS tickets - #4642 2019-09-17 12:59:29 +02:00
Luis Calvo
e409b33c6c Added changes to treport_content_template to db 2019-09-17 12:32:07 +02:00
Daniel Rodriguez
66a97f2f66 Merge branch 'ent-4508-desajustes-y-en-bug-en-open' into 'develop'
fixed visual error

See merge request artica/pandorafms!2669
2019-09-17 11:36:07 +02:00
Daniel Rodriguez
1ad8c6fe2e Merge branch 'ent-4280-Nombres-duplicados-SNMP-console-y-trap-generator-en-ACL-Enterprise' into 'develop'
Fixed duplicated names - #4280

See merge request artica/pandorafms!2658
2019-09-17 10:47:05 +02:00
Alejandro Fraguas
d9b697d076 Merge branch 'ent-4635-8710-Monitor-Report-informes-muestra-el-dato-al-reves' into 'develop'
Fixed bug in item type monitor report

See merge request artica/pandorafms!2726
2019-09-17 09:48:15 +02:00
artica
15a5d6f2e5 Auto-updated build strings. 2019-09-17 00:01:57 +02:00
Daniel Rodriguez
c7b62e8404 Merge branch 'ent-3314-Agents/Modules-item-error-on-report' into 'develop'
Ent 3314 agents/modules item error on report

See merge request artica/pandorafms!2296
2019-09-16 15:37:58 +02:00
Alejandro Fraguas
f86e2cdae4 Merge branch 'ent-4650-modifaciones-qa-env' into 'develop'
exclude publishing while QA_ENV is active

See merge request artica/pandorafms!2730
2019-09-16 14:38:26 +02:00
Luis Calvo
0b8ff69a36 Fixed modules first load on edit agent/module item report 2019-09-16 12:57:37 +02:00
Luis Calvo
b79cf8fda5 Merge remote-tracking branch 'origin/develop' into ent-3314-Agents/Modules-item-error-on-report 2019-09-16 11:42:47 +02:00
Luis Calvo
e89efea022 Added column 'uncompressed_module' to 'treport_content' 2019-09-16 11:18:01 +02:00
fbsanchez
1596078bcb exclude publishing while QA_ENV is active 2019-09-16 11:14:00 +02:00
Luis Calvo
a04268b33c Merge remote-tracking branch 'origin/develop' into ent-3878-Report-type-summation-not-working-properly 2019-09-16 11:02:18 +02:00