21394 Commits

Author SHA1 Message Date
Tatiana Llorente
92dc7d4e8c Truncate long title in modal dialogs - #4112 2019-06-14 13:48:35 +02:00
Daniel Rodriguez
4eab732c94 Merge branch 'ent-4179-No-se-guarda-certificado-SSL-en-el-setup-de-la-consola' into 'develop'
fix bug: path of ssl certificate not being set on general settings

See merge request artica/pandorafms!2501
2019-06-14 13:38:39 +02:00
Daniel Rodriguez
4362bf3131 Merge branch 'ent-3429-event-report-options-saving' into 'develop'
Added missing options parameters

See merge request artica/pandorafms!2173
2019-06-14 13:19:43 +02:00
Daniel Rodriguez
5c7b45173b Merge branch 'ent-4185-Problema-editar-item-availability-en-report-metaconsole' into 'develop'
fix bug in item edition in metaconsole

See merge request artica/pandorafms!2500
2019-06-14 13:05:27 +02:00
Alejandro Fraguas
b2dc732712 Merge branch '3702-bug-en-plugin-dns-servidor' into 'develop'
DNS plugin updated

See merge request artica/pandorafms!2261
2019-06-14 12:42:16 +02:00
Alejandro Fraguas
6c4dcdac87 Merge branch 'ent-4199-Fallo-estilo-visual-en-autoconfiguración-de-agentes-y-discovery-vmware' into 'develop'
Ent 4199 fallo estilo visual en autoconfiguración de agentes y discovery vmware

See merge request artica/pandorafms!2498
2019-06-14 10:14:27 +02:00
artica
8f25aa09fc Auto-updated build strings. 2019-06-14 00:01:08 +02:00
Alejandro Fraguas
beea6941e5 Merge branch 'ent-4200-visual-console-omnipresent-group-summary' into 'develop'
Fixed the omnipresent group summary bug

See merge request artica/pandorafms!2496
2019-06-13 13:25:50 +02:00
alejandro-campos
52b1c5e39b fix bug: path of ssl certificate not being set on general settings 2019-06-13 13:18:17 +02:00
alejandro-campos
8554baef20 fix bug in item edition in metaconsole 2019-06-13 11:11:39 +02:00
Alejandro Fraguas
fef1441d9f Merge branch 'ent-4197-#8171-Permisos-en-consolas-visuales-con-ACLS' into 'develop'
Fixed bug in visual consoles permissions with ACLS

See merge request artica/pandorafms!2492
2019-06-13 10:46:39 +02:00
artica
60ee0dd0fd Auto-updated build strings. 2019-06-13 00:01:07 +02:00
Tatiana Llorente
af62bb1ae3 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:47:53 +02:00
Tatiana Llorente
7d54a37e13 Fixed visual bug in discovery vmware - #4199 2019-06-12 16:44:09 +02:00
Alejandro Fraguas
d0e7a03926 Merge branch 'ent-3809-error-sql-eventos-de-grupos-de-agentes' into 'develop'
Changed sql error

See merge request artica/pandorafms!2321
2019-06-12 16:00:58 +02:00
Daniel Rodriguez
1780341524 Merge branch 'ent-4183-Ayudas-vacias' into 'develop'
Removed empty helps - #4183

See merge request artica/pandorafms!2491
2019-06-12 14:34:40 +02:00
Daniel Rodriguez
f399023d46 Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop'
Solucionado pantalla en blanco

See merge request artica/pandorafms!2269
2019-06-12 14:25:58 +02:00
Alejandro Fraguas
b930588f84 Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop'
Ent 3892 bug en bulk operations de plugins

See merge request artica/pandorafms!2389
2019-06-12 13:54:09 +02:00
Alejandro Fraguas
1305e267de Merge branch 'ent-3437-Guardar-user-password-modulos-WMI' into 'develop'
Remove autocomplete user and password in the form to create wmi modules - #3437

See merge request artica/pandorafms!2485
2019-06-12 13:03:56 +02:00
marcos.alconada
c1d1c23a4f Merge remote-tracking branch 'origin/develop' into ent-3644-bug-redireccion-de-static-graph 2019-06-12 12:37:52 +02:00
marcos.alconada
608f079ca0 now you need put an agent or visual console, else you cant create or update a Static Grap 2019-06-12 12:36:56 +02:00
Daniel Rodriguez
faba28f61b Merge branch 'ent-4202-visualizacion-de-graficas-combinadas' into 'develop'
Fixed the visualization of the combined graph item from the new visual console

See merge request artica/pandorafms!2495
2019-06-12 11:06:24 +02:00
Alejandro Gallardo Escobar
8793e2debd Fixed the omnipresent group summary bug 2019-06-12 09:16:47 +02:00
Alejandro Gallardo Escobar
d3da3747dd Fixed the visualization of the combined graph item from the new visual console 2019-06-12 08:48:51 +02:00
artica
51d5e1d951 Auto-updated build strings. 2019-06-12 00:01:07 +02:00
Alejandro Fraguas
fdce139f84 Merge branch 'ent-4186-Error-en-add-map-connection-al-crear-mapas-gis' into 'develop'
fix bug when adding connection maps in gis map builder

See merge request artica/pandorafms!2490
2019-06-11 18:01:54 +02:00
Daniel Rodriguez
4cf0fda28c Merge branch 'ent-3300-Error-borrado-masivo-de-informes' into 'develop'
Fix bug in report massive deletion

See merge request artica/pandorafms!2493
2019-06-11 17:17:14 +02:00
Alejandro Fraguas
cb6d71b930 Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop'
Ent 3474 exportar a csv custom field view

See merge request artica/pandorafms!2483
2019-06-11 17:06:14 +02:00
Alejandro Campos
cc9a7553bc Merge branch 'develop' into 'ent-3300-Error-borrado-masivo-de-informes'
# Conflicts:
#   pandora_console/godmode/reporting/reporting_builder.php
2019-06-11 16:18:29 +02:00
manuel
40119f6d2e Fixed bug in visual consoles permissions with ACLS 2019-06-11 12:55:43 +02:00
Daniel Rodriguez
1436ec0782 Merge branch 'ent-4088-Falta-campo-estado-en-modulos-plugin-erroneos' into 'develop'
Added image for unknown and no data status - 4088

See merge request artica/pandorafms!2484
2019-06-11 12:07:45 +02:00
Alejandro Fraguas
3c698abcad Merge branch '205-anadida-ruta-en-appdata-local-temp-por-defecto-para-windows-en-plugin-grep_log' into 'develop'
Resolve "Añadida ruta en Appdata/Local/TEMP por defecto para windows en plugin grep_log"

See merge request artica/pandorafms!2187
2019-06-11 10:53:42 +02:00
ismael.moreno
f0c3b2feca grep_log binary for windows agents 2019-06-11 10:34:29 +02:00
ismael.moreno
400fab0bcd Merge remote-tracking branch 'origin/develop' into 205-anadida-ruta-en-appdata-local-temp-por-defecto-para-windows-en-plugin-grep_log 2019-06-11 10:03:22 +02:00
Tatiana Llorente
80ed5dc9c1 Removed empty helps - #4183 2019-06-11 09:33:43 +02:00
artica
4a2688d6ac Auto-updated build strings. 2019-06-11 00:01:06 +02:00
Daniel Rodriguez
9d71c10308 Merge branch 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' into 'develop'
Redolved ticket

See merge request artica/pandorafms!2273
2019-06-10 18:47:23 +02:00
Alejandro Fraguas
cd1f8d0c10 Merge branch 'ent-3760-Error-de-login-LDAP' into 'develop'
Fixed function ldapsearch

See merge request artica/pandorafms!2301
2019-06-10 18:08:18 +02:00
alejandro-campos
577ddef8b3 fix bug when adding connection maps in gis map builder 2019-06-10 17:04:36 +02:00
marcos.alconada
a40e420de0 Removed , from numer format 2019-06-10 16:59:05 +02:00
Daniel Rodriguez
81ac4e5bef Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop'
Ent 3466 ad advanced perms fixed

See merge request artica/pandorafms!2194
2019-06-10 16:05:21 +02:00
marcos.alconada
58ba42cec1 Changed code for conversión 2019-06-10 14:53:47 +02:00
marcos.alconada
55db61bfae Merge branch 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:47:04 +02:00
marcos.alconada
cf84c3f579 Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:43:08 +02:00
Marcos Alconada
a2c530cccd Merge branch 'develop' into 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info'
# Conflicts:
#   pandora_console/extras/pandora_diag.php
2019-06-10 12:41:08 +02:00
Alejandro Fraguas
d14ad39785 Merge branch 'ent-3915-7828-servicio-hijo-de-otro-no-borra-todos-los-modulos-del-agente-al-elminarlo' into 'develop'
Node deleted disapear in tree view

See merge request artica/pandorafms!2486
2019-06-10 10:51:26 +02:00
artica
7bf087dd25 Auto-updated build strings. 2019-06-10 00:01:06 +02:00
artica
ab4039fe5b Auto-updated build strings. 2019-06-09 00:01:06 +02:00
artica
0ee04ecb21 Auto-updated build strings. 2019-06-08 00:01:07 +02:00
Alejandro Fraguas
6edd6ac2dd Merge branch 'ent-3626-referencias-log4x-2' into 'develop'
Ent 3626 referencias log4x 2

See merge request artica/pandorafms!2488
2019-06-07 11:34:30 +02:00