tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-29 05:38:47 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,402 Commits 34 Branches 30 Tags
Commit Graph

17573 Commits

Author SHA1 Message Date
José González
57eeb9a1db Fix vulnerability with directories created in upper levels 2021-05-27 16:19:51 +02:00
alejandro.campos@artica.es
7abe6d5446 created new report item 2021-05-27 11:22:01 +02:00
marcos
403f326f55 resolve merge conflcit 2021-05-27 09:57:06 +02:00
Daniel Barbero Martin
a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
artica
9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00
fbsanchez
50242d3030 OID fixes while retrieving from remote Satellite server 2021-05-26 17:55:30 +02:00
Daniel Barbero Martin
fb4358945b Wip command center 2021-05-26 17:36:02 +02:00
Daniel Rodriguez
74b38f299e Merge branch 'ent-7183-limitar-expansion-lateral-modulos-web-data-server' into 'develop' 
Resize vertical on textarea web/data server modules css

See merge request artica/pandorafms!4011
 2021-05-26 13:39:25 +00:00
Luis
8c100e8809 Resize vertical on textarea web/data server modules css 2021-05-26 13:39:25 +00:00
Daniel Rodriguez
e3cd5b6d56 Merge branch 'ent-7468-snmp-wizard-modulos-plugin-no-configuran-campo-plugin' into 'develop' 
Fixed missed parameter

Closes pandora_enterprise#7468

See merge request artica/pandorafms!4097
 2021-05-26 13:38:43 +00:00
Daniel Rodriguez
cfc70da64c Merge branch 'ent-7522-Duplicate-modules-de-tipo-remote-cmd-no-clona-la-IP' into 'develop' 
Ent 7522 duplicate modules de tipo remote cmd no clona la ip

See merge request artica/pandorafms!4123
 2021-05-26 13:38:17 +00:00
Daniel Rodriguez
693e3988b9 Merge branch 'ent-7182-barra-de-busqueda-no-funciona-correctamente' into 'develop' 
Changed search bar text

See merge request artica/pandorafms!4004
 2021-05-26 13:36:47 +00:00
Daniel Rodriguez
c3ea89597c Merge branch 'ent-7584-no-se-puede-cerrar-ventana' into 'develop' 
Improve code and fix issue with modal

Closes pandora_enterprise#7584

See merge request artica/pandorafms!4153
 2021-05-26 13:34:00 +00:00
Daniel Rodriguez
44ea35bb69 Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop' 
Email test working with data in text fields

See merge request artica/pandorafms!4090
 2021-05-26 13:30:36 +00:00
Daniel Barbero Martin
d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
artica
22a9043378 Auto-updated build strings. 2021-05-26 01:00:45 +02:00
Daniel Rodriguez
b875199f28 Merge branch 'ent-7492-bug-visual-vista-agents-alerts-no-alerts' into 'develop' 
Ent 7492 bug visual vista agents alerts no alerts

See merge request artica/pandorafms!4110
 2021-05-25 15:53:41 +00:00
Luis
eb54ce9a62 Ent 7492 bug visual vista agents alerts no alerts 2021-05-25 15:53:41 +00:00
Daniel Rodriguez
305941bb1d Merge branch 'ent-7361-fallos-visuales-agent-alerts' into 'develop' 
Fixed visual issues

Closes pandora_enterprise#7361

See merge request artica/pandorafms!4061
 2021-05-25 15:52:22 +00:00
Daniel Rodriguez
d4dceb0a6c Merge branch 'ent-7344-Selector-de-Dashboards-desplazado' into 'develop' 
Ent 7344 selector de dashboards desplazado

See merge request artica/pandorafms!4089
 2021-05-25 15:51:16 +00:00
Daniel Barbero Martin
6b248da428 Wip command center 2021-05-25 17:39:21 +02:00
José González
a36718c724 Improve code and fix issue with modal 2021-05-25 16:19:41 +02:00
José González
76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Daniel Rodriguez
bbcf140466 Merge branch 'ent-4991-API-editar-scheduled-downtimes-y-añadir-eliminar-agentes-de-ellas' into 'develop' 
Ent 4991 api editar scheduled downtimes y añadir eliminar agentes de ellas

See merge request artica/pandorafms!4069
 2021-05-25 13:40:33 +00:00
Daniel Maya
7eaaa1f371 Ent 4991 api editar scheduled downtimes y añadir eliminar agentes de ellas 2021-05-25 13:40:33 +00:00
Daniel Rodriguez
adb038dd5f Merge branch 'ent-7590-fallo-servicios-modulos-goliat' into 'develop' 
Fixed issue with webserver modules

Closes pandora_enterprise#7590

See merge request artica/pandorafms!4152
 2021-05-25 12:48:49 +00:00
José González
e69f258f8a Fixed issue with webserver modules 2021-05-25 12:50:25 +02:00
Daniel Maya
e6713c2f2c #6917 metaconsole config changes 2021-05-25 09:58:18 +00:00
Daniel Barbero Martin
933f679d27 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-25 08:51:48 +02:00
artica
f3d6dafad2 Auto-updated build strings. 2021-05-25 01:00:38 +02:00
Daniel Barbero Martin
337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
Daniel Barbero Martin
0b36853553 Wip command center 2021-05-24 17:35:15 +02:00
Daniel Rodriguez
4e16f5712d Merge branch 'ent-7104-mejoras-de-legibilidad-en-correlacion-de-eventos-2' into 'develop' 
Alert correlatioin some improvements

See merge request artica/pandorafms!4147
 2021-05-24 09:26:17 +00:00
artica
3388bfa699 Auto-updated build strings. 2021-05-24 01:00:35 +02:00
artica
5366b40ac3 Auto-updated build strings. 2021-05-23 01:00:27 +02:00
artica
01e811254e Auto-updated build strings. 2021-05-22 01:00:37 +02:00
Daniel Rodriguez
5fbfacd718 Merge branch 'ent-7558-Informe-group-event-report-no-saca-datos' into 'develop' 
Fixed issue with group events in reports

Closes pandora_enterprise#7558

See merge request artica/pandorafms!4144
 2021-05-21 12:10:04 +00:00
Daniel Rodriguez
85565ef7f9 Merge branch 'ent-7549-error-de-carga-link-publico-consolas-visuales' into 'develop' 
Ent 7549 error de carga link publico consolas visuales

See merge request artica/pandorafms!4140
 2021-05-21 12:09:30 +00:00
fbsanchez
26acafac47 Alert correlatioin some improvements 2021-05-21 12:57:48 +02:00
Daniel Barbero Martin
5bc6fa9394 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-21 08:35:49 +02:00
artica
f86c1c50c6 Auto-updated build strings. 2021-05-21 01:01:12 +02:00
Daniel Barbero Martin
03e857ffc8 Wip command center 2021-05-20 17:36:01 +02:00
José González
11d1b785b2 Fixed issue with group events in reports 2021-05-20 14:44:40 +02:00
Daniel Barbero Martin
73454dd4ea Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-20 08:21:31 +02:00
artica
63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Rodriguez
22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
Daniel Rodriguez
4ea790a649 Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop' 
Ent 7141 vulnerabilities csrf

Closes pandora_enterprise#7141

See merge request artica/pandorafms!4015
 2021-05-19 16:00:16 +00:00
fbsanchez
4711ca4856 Avoid connection accumulation 2021-05-19 17:44:07 +02:00
Daniel Maya
9559a63c3b #7555 fixed module_search with filter 2021-05-19 17:11:41 +02:00
Daniel Barbero Martin
8c0a9859a8 remove synch old and check api 2021-05-19 17:08:13 +02:00