Commit Graph

26778 Commits

Author SHA1 Message Date
Daniel Barbero Martin c3f85d4caa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-24 09:06:25 +01:00
artica 00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
José González 561060cdda Reverted change over mysqldriver 2021-03-23 20:37:28 +00:00
Daniel Rodriguez 2597c2c7fc Merge branch 'ent-7188-bug-visual-en-tactical-view-metaconsola' into 'develop'
fixed visual error

See merge request artica/pandorafms!3940
2021-03-23 15:56:02 +00:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop'
add tooltip service name

See merge request artica/pandorafms!3783
2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
Jose Gonzalez 910154389e Fix 2021-03-23 16:15:57 +01:00
marcos 90c825888a fixed visual error 2021-03-23 15:12:57 +01:00
Daniel Rodriguez fbd41b086d Merge branch 'ent-7102-ventana-de-refresco-visual-console-no-desaparece' into 'develop'
Fixed refresh auto hide on visual console

See merge request artica/pandorafms!3883
2021-03-23 12:04:28 +00:00
José González 6fbd40ea74 Merge branch 'develop' into 'ent-5929-revision-general-logstash'
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
2021-03-23 12:00:45 +00:00
Daniel Rodriguez 0a31f7f165 Merge branch 'ent-7185-snmp-browser-ventana-de-info-de-OID-descuadrada' into 'develop'
fixed visual error

See merge request artica/pandorafms!3942
2021-03-23 09:29:39 +00:00
Daniel Rodriguez f92c75639a Merge branch 'ent-7089-11446-trazas-en-el-codigo-de-release' into 'develop'
Removed extra verbosity

See merge request artica/pandorafms!3899
2021-03-23 09:29:05 +00:00
Daniel Barbero Martin 68d9390519 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-23 08:41:39 +01:00
artica b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
Daniel Rodriguez 67c0968864 Merge branch 'ent-7190-bug-icono-wux-en.vista-de-modulos' into 'develop'
fixed visual error

See merge request artica/pandorafms!3941
2021-03-22 16:59:57 +00:00
marcos 51ea2d569d fixed visual error 2021-03-22 17:02:30 +01:00
marcos 69fe389afc fixed visual error 2021-03-22 16:42:19 +01:00
marcos adadd40399 fixed visual error 2021-03-22 16:34:29 +01:00
marcos b6c02bd95c fixed visual error 2021-03-22 15:21:09 +01:00
Daniel Rodriguez 6294910e29 Merge branch 'ent-6583-Bug-estado-de-elementos-consola-visual' into 'develop'
Mode ghost for disabled modules and agents

See merge request artica/pandorafms!3889
2021-03-22 14:10:14 +00:00
daniel b258f409b9 Mode ghost for disabled modules and agents 2021-03-22 14:10:14 +00:00
Daniel Rodriguez 390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop'
fixed visuals errors black theme

See merge request artica/pandorafms!3937
2021-03-22 12:48:39 +00:00
Daniel Rodriguez 8f33c767b7 Merge branch 'ent-7132-bug-en-vista-agents-alerts' into 'develop'
fixed visual error

See merge request artica/pandorafms!3911
2021-03-22 12:46:58 +00:00
Daniel Rodriguez 8db123d364 Merge branch 'ent-7180-spinner-de-snmp-browere-ha-desaparecido' into 'develop'
fixed spinner bug

See merge request artica/pandorafms!3933
2021-03-22 12:46:02 +00:00
Daniel Rodriguez a7b19bd347 Merge branch 'ent-6865-uniway-funcionalidad-password-en-grupos-no-compatible-con-discovery-plugins-xml' into 'develop'
Ent 6865 uniway funcionalidad password en grupos no compatible con discovery plugins xml

See merge request artica/pandorafms!3761
2021-03-22 12:39:59 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00
artica 49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica 2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica 3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
marcos ebf912437b fixed error with sort function 2021-03-18 18:05:53 +01:00
Daniel Rodriguez da4c5a1c28 Merge branch 'ent-7167-meta-varios-botones-y-ventanas-descuadradas' into 'develop'
fixed visual errors

See merge request artica/pandorafms!3925
2021-03-18 17:05:50 +00:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
Daniel Barbero Martin 6d6b9fe5b9 fixed visuals errors black theme 2021-03-18 17:32:21 +01:00
Daniel Rodriguez 8eb06d8adc Merge branch 'ent-6753-consistencia-en-el-selector-de-grupos' into 'develop'
group selector updates for report, required

See merge request artica/pandorafms!3763
2021-03-18 16:05:16 +00:00
Daniel Rodriguez 3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop'
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
2021-03-18 16:02:56 +00:00
Daniel Rodriguez 0082e818a0 Merge branch 'ent-6852-integrar-edicion-de-sistema-de-credencial-boxes-con-edicion-de-coniguracion-del-satelite-en-la-misma-vista' into 'develop'
Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista

See merge request artica/pandorafms!3758
2021-03-18 16:00:14 +00:00
Daniel Maya 6a9dff3355 Ent 6852 integrar edicion de sistema de credencial boxes con edicion de coniguracion del satelite en la misma vista 2021-03-18 16:00:14 +00:00
marcos bfaaba9dbd fixed spinner bug 2021-03-18 12:08:02 +01:00
fbsanchez ddb58f56e9 errata fix 2021-03-18 11:48:52 +01:00
marcos b55ebd69f0 fixed visual error 2021-03-18 11:30:53 +01:00
marcos 82d435c295 fixed visual error 2021-03-18 11:05:40 +01:00
Daniel Rodriguez c2f297c26a Merge branch 'ent-6574-mensaje-borrado-agentes-meta' into 'develop'
Fixed api agent delete and show correct message when called by meta wizard

See merge request artica/pandorafms!3892
2021-03-18 10:01:22 +00:00
Luis 085b5ece87 Fixed api agent delete and show correct message when called by meta wizard 2021-03-18 10:01:21 +00:00
Daniel Rodriguez cb1da6d7ba Merge branch 'ent-7062-vulneravilidad-xx-en-mensajes' into 'develop'
fixed xss vulnerability

See merge request artica/pandorafms!3861
2021-03-18 10:00:35 +00:00
Marcos Alconada 9040e832b8 fixed xss vulnerability 2021-03-18 10:00:34 +00:00
Daniel Rodriguez de175ec755 Merge branch 'ent-7081-snmp-wizard-con-muchas-interfaces-da-error-de-php' into 'develop'
POST/GET reloaded if empty in ajax

See merge request artica/pandorafms!3867
2021-03-18 09:59:55 +00:00
Daniel Rodriguez 9c4a6a56c7 Merge branch 'ent-5331-implementar-monitorizacion-de-ms-SQL-Server-en-discovery-como-el-de-oracle' into 'develop'
add discovery_app_microsoft_sql_serve on task list

See merge request artica/pandorafms!3058
2021-03-18 09:56:31 +00:00
marcos bac8b98ad2 fixed visual error 2021-03-18 10:48:44 +01:00
fbsanchez 38695482c0 Validate custom text 2021-03-18 10:35:41 +01:00