17573 Commits

Author SHA1 Message Date
Luis
7716157b8d Merge remote-tracking branch 'origin/develop' into ent-9586-acls-en-llamada-a-funcion-get_tree_agent-de-la-api 2022-12-14 16:25:36 +01:00
Rafael Ameijeiras
50b7fc7c7a Merge branch 'ent-9349-14050-authtoken-hash-se-ve-en-treeview-metaconsola' into 'develop'
Hide meta treeview user hash

See merge request artica/pandorafms!5225
2022-12-14 10:48:38 +00:00
Daniel Maya
52e2ccba54 #9783 Fixed networkmap 2 2022-12-14 11:27:51 +01:00
jose.gonzalez@pandorafms.com
d41ee38ba2 Fixed images 2022-12-14 09:09:46 +01:00
artica
37c6a8a67b Auto-updated build strings. 2022-12-14 01:00:18 +01:00
alejandro.campos@artica.es
e3f4842e60 visual change 2022-12-13 16:00:35 +01:00
alejandro.campos@artica.es
45e91762a9 visual change 2022-12-13 15:27:58 +01:00
alejandro.campos@artica.es
e5f2c83120 minor change 2022-12-13 15:25:16 +01:00
Rafael Ameijeiras
f6b4631b50 Merge branch 'ent-9597-derivado-del-trabajo-q-a-765-cambiar-el-puerto-por-defecto-en-la-integracion-con-ehorus' into 'develop'
Changed eHorus default port

See merge request artica/pandorafms!5324
2022-12-13 14:22:47 +00:00
Rafael Ameijeiras
44e22d1675 Merge branch 'ent-9498-14180-perfil-de-usuario-sin-grupo-asignado-en-llamada-por-api' into 'develop'
Check group and profile exist on api add permission user to group

See merge request artica/pandorafms!5223
2022-12-13 14:22:16 +00:00
Alejandro Campos
867e1cc2b3 Merge branch 'develop' into 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional'
# Conflicts:
#   pandora_console/extras/mr/60.sql
2022-12-13 11:42:41 +00:00
alejandro.campos@artica.es
79e9597dd5 implemented alert warning in visual consoles 2022-12-13 12:03:13 +01:00
Rafael Ameijeiras
30eac6dc6e Merge branch 'ent-10000-error-500-en-llamada-api-tree_agents' into 'develop'
Ent 10000 error 500 en llamada api tree agents

See merge request artica/pandorafms!5325
2022-12-13 10:48:15 +00:00
Daniel Barbero
14f548aa3a fixed error format data datamatrix pandora_enterprise#8619 2022-12-13 11:06:42 +01:00
Daniel Barbero
eecda4560a fixed error pagination datamatrix pandora_enterprise#8619 2022-12-13 10:41:38 +01:00
Daniel Barbero
2d638a61cf Merge remote-tracking branch 'origin/develop' into ent-8619-copiando-a-grafana-2-data-table-como-widget-en-dashboard 2022-12-13 09:59:30 +01:00
Daniel Barbero
a0ddad63b8 Merge remote-tracking branch 'origin/develop' into ent-9135-buscar-por-nombre-de-usuario-en-eventos
Conflicts:
	pandora_console/extras/mr/59.sql
2022-12-13 09:17:39 +01:00
Daniel Barbero
5f91d2b077 new chart chartjs pandora_enterprise#9554 2022-12-13 09:11:29 +01:00
Daniel Barbero
01d14ae3b8 new chart chartjs pandora_enterprise#9554 2022-12-13 09:10:13 +01:00
artica
1ebe09698b Auto-updated build strings. 2022-12-13 01:00:57 +01:00
Rafael Ameijeiras
884e07d11e Merge branch 'ent-9747-14463-faltan-eventos-en-la-consola-cuando-se-seleccionan-todos' into 'develop'
Ent 9747 14463 faltan eventos en la consola cuando se seleccionan todos

See merge request artica/pandorafms!5251
2022-12-12 22:54:27 +00:00
Rafael Ameijeiras
d3a079765d Merge branch 'ent-9246-13884-habilitar-_groupcontact_-en-las-respuestas-de-eventos' into 'develop'
add new macro event response group_contact pandora_enterprise#9246

See merge request artica/pandorafms!5240
2022-12-12 22:53:21 +00:00
Daniel Maya
198f539901 #10000 Fixed api call tree_agents 2022-12-12 16:39:14 +01:00
Calvo
0eb33032ac Changed eHorus default port 2022-12-12 16:17:11 +01:00
Calvo
6913f237dc Fix sql error on widget search 2022-12-12 15:48:10 +01:00
Rafael Ameijeiras
8a6e3e5e06 Merge branch 'ent-8854-13786-alertas-sonoras-en-metaconsola' into 'develop'
add sound events to metaconsole pandora_enterprise#8854

See merge request artica/pandorafms!5246
2022-12-12 14:02:36 +00:00
Diego Muñoz-Reja
31919d4d2c Merge branch 'ent-9801-bloqueo-de-boton-en-generacion-de-ficheros-pdf-csv-json-varias-secciones' into 'develop'
Prepare download control

See merge request artica/pandorafms!5276
2022-12-12 08:29:51 +00:00
Rafael Ameijeiras
75be3a0c66 Merge branch 'ent-9508-superposicion-de-texto-en-dashboards' into 'develop'
Fix dashboard dialog tranlations and search bar size

See merge request artica/pandorafms!5314
2022-12-12 08:19:39 +00:00
Rafael Ameijeiras
7ea46174c1 Merge branch 'ent-9496-14178-bug-api-validacion-valores-de-entrada' into 'develop'
Fix module type validadion on api set create network module

See merge request artica/pandorafms!5224
2022-12-12 08:14:08 +00:00
Rafael Ameijeiras
dab898aaa0 Merge branch 'ent-9873-14572-imagenes-personalizadas-en-elementos-servicios-de-consola-visual-desaparecen' into 'develop'
Ent 9873 14572 imagenes personalizadas en elementos servicios de consola visual desaparecen

See merge request artica/pandorafms!5301
2022-12-12 08:10:10 +00:00
artica
ccde106851 Auto-updated build strings. 2022-12-12 01:00:47 +01:00
artica
e57b0af2a3 Auto-updated build strings. 2022-12-11 01:00:15 +01:00
jose.gonzalez@pandorafms.com
caad626c39 Minor changes 2022-12-10 14:39:17 +01:00
artica
bdbd313a0d Auto-updated build strings. 2022-12-10 01:00:15 +01:00
alejandro.campos@artica.es
39920692ef Merge remote-tracking branch 'origin/develop' into ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional 2022-12-09 12:49:04 +01:00
Jonathan
0b6d1a7840 #9903 Duplicate control profile 2022-12-09 11:37:08 +01:00
Luis Calvo
cdd1569364 Fix list all private dashboards on user edition 2022-12-09 09:54:20 +01:00
artica
f2ad934c92 Auto-updated build strings. 2022-12-09 01:00:14 +01:00
artica
7cba39d358 Auto-updated build strings. 2022-12-08 01:00:15 +01:00
jose.gonzalez@pandorafms.com
5a2e969b85 Module type changes 2022-12-07 18:17:11 +01:00
jose.gonzalez@pandorafms.com
63e6fac6a4 Minor changes 2022-12-07 18:16:47 +01:00
Daniel Maya
3351b6b9bd #9783 Fixed networkmap 2022-12-07 15:54:40 +01:00
Calvo
51e6e5b0a1 Fix alert list tag filter 2022-12-07 11:24:09 +01:00
artica
4f194134cc Auto-updated build strings. 2022-12-07 01:00:41 +01:00
artica
0f9977acca Auto-updated build strings. 2022-12-06 01:00:13 +01:00
jose.gonzalez@pandorafms.com
e57f9b8794 Some changes 2022-12-05 17:31:08 +01:00
Calvo
c5c36dab8b Fix dashboard dialog tranlations and search bar size 2022-12-05 17:20:08 +01:00
jose.gonzalez@pandorafms.com
912f1d0d7a Module manager upgrade 2022-12-05 13:39:51 +01:00
jose.gonzalez@pandorafms.com
445a8161cf Merge 2022-12-05 09:44:35 +01:00
artica
d91ba1b4e1 Auto-updated build strings. 2022-12-05 01:00:14 +01:00