Commit Graph

29113 Commits

Author SHA1 Message Date
Rafael Ameijeiras f8c99c6ada Merge branch 'ent-11213-plugin-sap-para-discovery-2-0' into 'develop'
Added SAP plugin to MR

See merge request artica/pandorafms!6511
2023-10-11 10:15:20 +00:00
Rafael Ameijeiras dda7c2a0c0 Merge branch 'ent-12205-interfaz-configuracion-ehorus-pandora-rc-a-nivel-de-usuario-ha-desaparecido' into 'develop'
Ent 12205 interfaz configuracion ehorus pandora rc a nivel de usuario ha desaparecido

See merge request artica/pandorafms!6544
2023-10-11 07:18:34 +00:00
artica f4487dee5a Auto-updated build strings. 2023-10-11 01:00:28 +02:00
miguel angel rasteu f22fd10659 #12205 Fix url 2023-10-10 13:44:57 +02:00
alejandro.campos@artica.es 8cc34d2199 visual change 2023-10-10 13:24:27 +02:00
alejandro.campos@artica.es 295654d26b revert changes 2023-10-10 12:38:56 +02:00
miguel angel rasteu 23c5836ddc #12205 Change ehorus images 2023-10-10 11:34:11 +02:00
alejandro.campos@artica.es 10d94daf30 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-10 11:09:53 +02:00
Enrique Martin 1856d31b9c Merge branch 'ent-11607-migracion-de-discovery-bajo-demanda' into 'develop'
Discovery migration. Console visual cahnges

See merge request artica/pandorafms!6404
2023-10-10 08:47:07 +00:00
Calvo c790b48fd7 Fix discovery list network column for disco ext 2023-10-10 10:40:37 +02:00
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
alejandro.campos@artica.es 6a58a2e86f ip check 2023-10-10 09:10:42 +02:00
artica bbcc8ee7ef Auto-updated build strings. 2023-10-10 01:00:24 +02:00
alejandro.campos@artica.es c059f83420 some changes in gotty 2023-10-09 18:56:02 +02:00
Calvo a822f6db86 Fix discovery migration bugs 2023-10-09 16:52:52 +02:00
Enrique Martin 62b52b901a Fixed SQL migration scripts 2023-10-09 14:37:31 +02:00
alejandro.campos@artica.es 0e0b5bba43 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-09 14:17:25 +02:00
alejandro.campos@artica.es 025abbed93 add timeout 2023-10-09 14:17:16 +02:00
artica 64a17cb59d Auto-updated build strings. 2023-10-09 01:00:21 +02:00
artica b41ec6f30b Auto-updated build strings. 2023-10-08 01:00:19 +02:00
artica a21f85276c Auto-updated build strings. 2023-10-07 01:00:27 +02:00
Matias Didier 3f74126495 Merge branch 'ent-12087-guardia-16249-error-500-en-reportes' into 'develop'
Ent 12087 guardia 16249 error 500 en reportes

See merge request artica/pandorafms!6526
2023-10-06 11:25:48 +00:00
Rafael Ameijeiras e1d8f862ae Merge branch 'ent-12166-estilos-calendarios' into 'develop'
Ent 12166 estilos calendarios

See merge request artica/pandorafms!6529
2023-10-06 07:32:11 +00:00
Matias Didier ee6ef65da6 Merge branch 'ent-12029-vista-heatmap-tamano-de-texto-muy-grande' into 'develop'
Ent 12029 vista heatmap tamano de texto muy grande

See merge request artica/pandorafms!6534
2023-10-06 07:07:30 +00:00
artica c616d2cf49 Auto-updated build strings. 2023-10-06 01:00:29 +02:00
Calvo d091ee8194 Migration dicovery fix bugs and changed script paths 2023-10-05 10:52:52 +02:00
alejandro.campos@artica.es 780d29fce3 ssh by default 2023-10-05 09:08:20 +02:00
artica 8225384e55 Auto-updated build strings. 2023-10-05 01:00:25 +02:00
alejandro.campos@artica.es 17f5b0dede quick shell changes 2023-10-04 18:00:19 +02:00
Jorge Rincon 80807ae085 #12166 fixed style of selected item in calendar 2023-10-04 16:46:43 +02:00
Calvo db291c77f5 Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda 2023-10-04 16:21:29 +02:00
Daniel Maya ae0bb2022d #12029 Fixed font size 2023-10-04 15:42:19 +02:00
miguel angel rasteu 27bee15d50 #12172 Change truncate event name limit to description_size_text 2023-10-04 12:56:28 +02:00
artica b9f94050a2 Auto-updated build strings. 2023-10-04 01:00:26 +02:00
Daniel Maya a842c8249f #12087 Fixed report with fatal error 2023-10-03 15:44:27 +02:00
Jorge Rincon a685a04493 #12166 fixed calendar button and border styles 2023-10-03 15:42:57 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
Calvo 134aa82330 Deleted mysql app added by mistake 2023-10-03 12:12:50 +02:00
Calvo 7e20e6b048 Changed migration scripts and migration ini path 2023-10-03 12:10:53 +02:00
Enrique Martin 67df5ee92a Fixed vmware app issue, updated migrate code and removed xenserver insert sql 2023-10-03 11:45:59 +02:00
Matias Didier 9e4903e545 Merge branch 'ent-12145-16086-gis-no-carga-en-mapas' into 'develop'
Ent 12145 16086 gis no carga en mapas

See merge request artica/pandorafms!6514
2023-10-03 08:52:21 +00:00
artica 19821c4a40 Auto-updated build strings. 2023-10-03 01:00:30 +02:00
alejandro.campos@artica.es 0771094e85 minor changes 2023-10-02 16:42:32 +02:00
alejandro.campos@artica.es 12fbd1e522 some functional changes in gotty 2023-10-02 13:57:11 +02:00
Rafael Ameijeiras b0d12c8a18 Merge branch 'ent-12081-añadir-el-lapso-de-tiempo-none-para-el-filtro-de-los-informes-en-la-vista-HTML-por-defecto' into 'develop'
Ent 12081 añadir el lapso de tiempo none para el filtro de los informes en la vista html por defecto

See merge request artica/pandorafms!6496
2023-10-02 11:23:35 +00:00
Rafael Ameijeiras 958c428e91 Merge branch 'ent-12142-error-500-cuando-la-consola-no-conecta-con-la-DB' into 'develop'
Ent 12142 error 500 cuando la consola no conecta con la db

See merge request artica/pandorafms!6515
2023-10-02 10:02:50 +00:00
Enrique Martin 22769342b8 Merge remote-tracking branch 'origin/develop' into ent-11213-plugin-sap-para-discovery-2-0
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/pandoradb_data.sql
2023-10-02 10:24:31 +02:00
Enrique Martin c19a76e58e Merge branch 'ent-10923-scripts-cloud-para-el-nuevo-discovery-2' into 'develop'
added discovery cloud plugins in MR

See merge request artica/pandorafms!6513
2023-10-02 07:54:54 +00:00
Rafael Ameijeiras 439d5b54aa Merge branch 'ent-11961-16159-activar-show-all-events-24h-por-defecto-en-vista-de-ultimos-eventos-de-agente' into 'develop'
Agents show events 24h switch checked default

See merge request artica/pandorafms!6405
2023-10-02 07:08:52 +00:00
artica 323572a4c7 Auto-updated build strings. 2023-10-02 01:00:18 +02:00