Commit Graph

1131 Commits

Author SHA1 Message Date
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
Daniel Maya c0e5706d85 #9880 Fixed network usage map 2022-11-29 15:41:10 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com 8e0e249b81 Fixed views and styles 2022-11-21 14:49:07 +01:00
Calvo 43fd43d0d5 Updated php versopm notifications to php8 2022-11-15 10:29:15 +01:00
Rafael Ameijeiras 43690d3aa6 Merge branch 'ent-9745-XSS' into 'develop'
fixed vulnerability in load of help iframes

See merge request artica/pandorafms!5245
2022-11-08 11:49:46 +00:00
Jimmy Olano a548d2a798 Merge branch 'ent-9722-cartel-de-licencia-expirada' into 'develop'
Ent 9722 cartel de licencia expirada

#9722

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9722

See merge request artica/pandorafms!5237
2022-11-04 10:07:56 +00:00
edu.corral fb4b42e6c5 ent 9722 expired license notifications 2022-11-03 13:55:06 +01:00
alejandro.campos@artica.es 2c7d7e4044 fixed vulnerability in load of help iframes 2022-11-03 13:53:10 +01:00
Daniel Rodriguez e52da7d379 Merge branch 'ent-9105-poder-anadir-colecciones-al-satellite-server' into 'develop'
Ent 9105 poder anadir colecciones al satellite server

See merge request artica/pandorafms!5202
2022-11-03 10:28:32 +00:00
jose.gonzalez@pandorafms.com 32466c6906 Changes 2022-11-03 10:18:17 +01:00
edu.corral 8d34ef88c5 ent 9722 expired licence notification 2022-11-02 09:19:15 +01:00
jose.gonzalez@pandorafms.com 195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
Daniel Maya 382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
jose.gonzalez@pandorafms.com edbf7ff249 Adapted views 2022-10-26 17:04:50 +02:00
jose.gonzalez@pandorafms.com 5aaa415ed9 Several fixes 2022-10-25 17:11:18 +02:00
jose.gonzalez@pandorafms.com dd7f378354 WelcomeWindow buttons 2022-10-25 16:25:34 +02:00
jose.gonzalez@pandorafms.com 13b0c7d0c8 Fixed views 2022-10-25 13:13:52 +02:00
jose.gonzalez@pandorafms.com 00de0faac3 Adapted views 2022-10-24 19:55:22 +02:00
Daniel Rodriguez f57876b332 Merge branch 'ent-9591-mejoras-vista-administracion-agentes-satellite' into 'develop'
Ent 9591 mejoras vista administracion agentes satellite

See merge request artica/pandorafms!5190
2022-10-21 11:09:21 +00:00
Diego Muñoz-Reja 423d4b8763 Merge branch 'ent-9641-mejorar-heatmaps' into 'develop'
Ent 9641 mejorar heatmaps

See merge request artica/pandorafms!5196
2022-10-21 09:29:40 +00:00
Daniel Rodriguez 77cb8be6cc Merge branch 'ent-2190-filtros-en-migracion-de-agentes-metaconsola' into 'develop'
Added id to form on html print form grid

See merge request artica/pandorafms!5181
2022-10-21 09:26:26 +00:00
Calvo 2d71c75405 Added title to printFormAsGrid 2022-10-20 13:42:08 +02:00
Daniel Rodriguez 35fcfa275f Merge branch 'ent-9117-diferencia-de-estilos-en-mouseovers-del-tree-view-de-servicios' into 'develop'
Ent 9117 diferencia de estilos en mouseovers del tree view de servicios

See merge request artica/pandorafms!5185
2022-10-20 07:13:39 +00:00
Daniel Maya bfc1289ba6 #9105 Added collections satellite 2022-10-19 13:59:16 +02:00
Diego Muñoz-Reja dfb5776f68 Merge branch 'ent-8648-Improvement-for-SNMP-interface-wizard' into 'develop'
Added default definition for SNMP Interface Wizard

See merge request artica/pandorafms!5168
2022-10-18 09:25:17 +00:00
Daniel Maya 0db0b50ebd #9641 heatmap changes 2 2022-10-17 10:32:28 +02:00
Daniel Maya f3bae30f55 #9641 heatmap changes 2022-10-14 13:53:05 +02:00
Jimmy Olano 0fb44c923a Merge branch 'ent-9303-derivado-del-trabajo-q-a-764-icono-show-extended-info-en-system-audit-log-no-funciona' into 'develop'
Ent 9303 derivado del trabajo q a 764 icono show extended info en system audit log no funciona

#9303

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9303

See merge request artica/pandorafms!5139
2022-10-13 16:27:51 +00:00
Daniel Maya 5e062b2a51 #9591 added dialog 2022-10-11 17:22:53 +02:00
edu.corral a078fb790a ent 9117 service tree mouseover 2022-10-11 09:46:53 +02:00
Daniel Maya bf0d7ff687 #4043 added wizard snmp 2022-10-10 13:27:19 +02:00
Daniel Maya 7f220eae19 #4043 Added wizard WMI 2022-10-07 10:06:35 +02:00
Calvo 7eb1aa5549 Added id to form on html print form grid 2022-10-06 19:58:28 +02:00
Daniel Maya e743c57a71 #4043 added SNMP 2022-10-05 15:47:49 +02:00
Daniel Maya eefb872c47 #9604 Fixed delete_host and ignore_host 2 2022-10-04 13:16:39 +02:00
Daniel Maya 66e083a964 #9604 Fixed delete_host and ignore_host 2022-10-04 10:58:30 +02:00
Daniel Maya 767ca3732b #4043 Added WMI 2022-10-04 09:57:31 +02:00
Daniel Maya c1b4501da5 resolved conflict 2022-10-03 14:41:14 +02:00
José González 9f800df034 Added default definition for SNMP Interface Wizard 2022-10-03 12:41:55 +02:00
Daniel Rodriguez 74e291696a Merge branch 'ent-9334-mejorar-seccion-de-administrar-host-para-la-configuracion-remota-del-satellite' into 'develop'
Ent 9334 mejorar seccion de administrar host para la configuracion remota del satellite

See merge request artica/pandorafms!5117
2022-09-30 09:41:57 +00:00
Daniel Maya 2d31c7b116 #9334 fixed regex 2022-09-30 09:16:31 +02:00
Daniel Maya ee83cbf155 #9334 Fixed satellite host 2 2022-09-29 16:17:41 +02:00
Daniel Rodriguez 637fae3e8d Merge branch 'ent-8898-anida-mapas-de-red-no-actualizan-bien' into 'develop'
Ent 8898 anida mapas de red no actualizan bien

See merge request artica/pandorafms!5143
2022-09-29 12:36:37 +00:00
Daniel Maya 6babb50608 #9334 Fixed satellite host 2022-09-28 15:00:46 +02:00
Diego Muñoz-Reja 4fba7077ec Merge branch 'ent-9255-error-en-notificacion-consola-php-8-y-mysql-8' into 'develop'
Ent 9255 error en notificacion consola php 8 y mysql 8

See merge request artica/pandorafms!5081
2022-09-26 13:07:50 +00:00
Daniel Maya 67c8a945bf resolved conflict 2022-09-26 11:08:18 +02:00
edu.corral 6a93b4d554 ent 9303 audit log extended info 2022-09-23 11:35:17 +02:00
Daniel Maya 96f81475f7 resolved conflict 2022-09-23 09:20:59 +02:00