2176 Commits

Author SHA1 Message Date
Daniel Rodriguez
a3dc8be0e5 Merge branch 'ent-9254-13891-encriptar-contrasenas-en-replicacion-de-bbdd' into 'develop'
Ent 9254 13891 encriptar contrasenas en replicacion de bbdd

See merge request artica/pandorafms!5140
2022-10-21 10:42:16 +00: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 Barbero
6ef3505eab event multiple operations pandora_enterprise#9671 2022-10-19 16:20:49 +02:00
Jimmy Olano
aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop'
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
2022-10-19 11:00:04 +00:00
Daniel Barbero
40dc913aca Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard 2022-10-18 12:53:28 +02:00
Daniel Rodriguez
38af75ccc1 Merge branch 'ent-9266-13916-formulario-de-registro-usuario-se-restablece-tras-error' into 'develop'
Fix user form reset if profile fails

See merge request artica/pandorafms!5137
2022-10-17 11:27:16 +00:00
Diego Muñoz-Reja
4c74f1bee7 Merge branch 'ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo' into 'develop'
fixed response events pandora_enterprise#9423

See merge request artica/pandorafms!5141
2022-10-17 10:49:01 +00:00
Calvo
2251062d30 Fix user profile add bugs 2022-10-17 12:26:38 +02:00
Daniel Barbero
370852066f Merge remote-tracking branch 'origin/develop' into ent-8620-copiando-a-grafana-3-grouped-meter-graphs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/functions_modules.php
2022-10-14 11:46:20 +02:00
Daniel Barbero
004f5c4763 Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento
Conflicts:
	pandora_console/include/visual-console-client/vc.main.min.js
	pandora_console/include/visual-console-client/vc.main.min.js.map
2022-10-14 11:03:11 +02:00
Daniel Rodriguez
095732eab5 Merge branch 'ent-9467-no-se-pueden-cambiar-umbrales-warning-y-critical-en-ciertos-modulos' into 'develop'
Ent 9467 no se pueden cambiar umbrales warning y critical en ciertos modulos

See merge request artica/pandorafms!5148
2022-10-14 08:17:34 +00:00
Daniel Barbero
19cfc84a39 add mode maintenance VC pandora_enterprise#4822 2022-10-13 17:45:44 +02:00
Daniel Barbero
3099ffa7cb add mode maintenance VC pandora_enterprise#4822 2022-10-13 13:44:39 +02:00
Daniel Barbero
9c93a99fb2 add mode maintenance VC pandora_enterprise#4822 2022-10-13 11:03:49 +02:00
edu.corral
40c9ed762c ent 9117 mouseover service tree 2022-10-10 16:16:00 +02:00
Daniel Maya
bf0d7ff687 #4043 added wizard snmp 2022-10-10 13:27:19 +02:00
Daniel Barbero
ce823dca38 new widget grouped meter graphs pandora_enterprise#8620 2022-10-10 11:20:03 +02:00
Calvo
b29f7eb160 Fix planned downtime issues 2022-09-30 14:54:16 +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
edu.corral
b43d548312 ent 9467 warning and critical thresholds 2022-09-28 15:02:11 +02:00
Daniel Barbero
755432b381 Merge remote-tracking branch 'origin/develop' into ent-9423-respuestas-de-evento-en-metaconsola-usan-configuracion-de-nodo 2022-09-28 08:52:43 +02:00
Daniel Barbero
fbce8b7533 fixed response events pandora_enterprise#9423 2022-09-27 09:51:37 +02:00
Daniel Barbero
225646cd9d fixed response events pandora_enterprise#9423 2022-09-23 13:55:01 +02:00
Daniel Maya
795308367f #9254 load password with ajax 2022-09-23 13:24:46 +02:00
edu.corral
af7ad37b50 ent 8659 fullname event owner 2022-09-16 11:04:01 +02:00
Ramon Novoa
9f30d66328 Merge remote-tracking branch 'origin/develop' into ent-8898-anida-mapas-de-red-no-actualizan-bien 2022-09-02 14:06:50 +02:00
Daniel Maya
bb691c2e16 #8889 Fixed refresh and duplicate relations 2022-08-31 10:08:20 +02:00
Daniel Maya
d3612439fb #8898 conflict resolved 2022-08-29 14:06:15 +02:00
alejandro.campos@artica.es
de55200659 Merge remote-tracking branch 'origin/develop' into ent-5319-9412-mas-personalizacion-de-paradas-planificada 2022-08-29 10:06:41 +02:00
Daniel Maya
cebaba4575 #8898 networkmap 2 2022-08-29 10:02:16 +02:00
Daniel Maya
16554cfc7a #8898 networkmap 2022-08-29 09:39:47 +02:00
Daniel Maya
182bb2d2c4 8898 Refresh time 2022-08-23 11:17:48 +02:00
Daniel Maya
b58b0d6c51 #9348 fixed update relations 2022-08-17 12:52:02 +02:00
alejandro.campos@artica.es
ded2fb08ff implemented cron based scheduled downtimes 2022-08-16 18:42:51 +02:00
Daniel Maya
6cf8fdad39 #9348 improved usability 2022-08-16 14:07:25 +02:00
Daniel Maya
4d7329f1fd #9347 central node deletion 2022-08-12 09:44:16 +02:00
Daniel Maya
2f9d1de8b4 #9343 Not closing the modal window 2022-08-11 12:46:25 +02:00
Daniel Maya
9b3661bca1 #9344 Fix fictional node 2022-08-10 13:59:48 +02:00
Daniel Barbero Martin
e58bc4f96a move massive aperation edit agent pandora_enterprise#8564 2022-07-14 16:06:51 +02:00
Daniel Barbero Martin
033027f360 modal sound events pandora_enterprise#9095 2022-07-04 17:09:30 +02:00
Daniel Barbero Martin
2dc16a2a19 modal sound events pandora_enterprise#9095 2022-07-01 13:08:39 +02:00
Daniel Barbero Martin
e28bfe9f3f modal sound events pandora_enterprise#9095 2022-06-30 17:17:05 +02:00
Daniel Barbero Martin
a92d50303d fix color tabs and block histogram pandora_enterprise#8621 2022-06-30 14:09:29 +02:00
José González
c3dc1d820d Frontend changes 2022-06-28 17:24:49 +02:00
Daniel Barbero Martin
867c6a1415 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/javascript/pandora.js
2022-06-28 17:02:01 +02:00
daniel
4ca27cd5a9 Merge branch 'ent-7960-filtros-de-alertas-sonoras-sound-events-2' into 'develop'
events sound pandora_enterprise#7960

See merge request artica/pandorafms!4923
2022-06-28 13:47:05 +00:00
Daniel Barbero Martin
941d477403 fixed size modal pandora_enterprise#8827 2022-06-27 18:07:01 +02:00
Daniel Barbero Martin
1c051f88bc Merge remote-tracking branch 'origin/develop' into ent-7960-filtros-de-alertas-sonoras-sound-events-2
Conflicts:
	pandora_console/include/functions_events.php
2022-06-27 16:07:19 +02:00
Daniel Barbero Martin
ebe5f0de7c Merge remote-tracking branch 'origin/develop' into ent-8827-cambios-visuales-en-widget-agents-modules 2022-06-27 09:48:18 +02:00
Daniel Barbero Martin
24305b40b0 Merge remote-tracking branch 'origin/develop' into ent-8621-copiando-a-grafana-4-color-tabs-como-widget-en-dashboard
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/lib/Dashboard/Widget.php
	pandora_console/include/styles/dashboards.css
2022-06-27 08:38:50 +02:00