Commit Graph

25831 Commits

Author SHA1 Message Date
Jose Gonzalez 063bf967f4 Added new js file 2020-11-20 10:24:15 +01:00
Daniel Rodriguez 436a88e2f4 Merge branch 'ent-6758-update-manager-offline-meta-doesnt-work' into 'develop'
Fxed update manager offline missing include

See merge request artica/pandorafms!3634
2020-11-20 10:24:00 +01:00
artica f4c5d2ef6d Auto-updated build strings. 2020-11-20 01:00:18 +01:00
José González 32dcd8a7ca Merge branch 'develop' into 'ent-6398-Poner-ojito-mostrar-passwords'
# Conflicts:
#   pandora_console/include/javascript/pandora_ui.js
2020-11-19 15:21:58 +01:00
Daniel Rodriguez e955bc7b96 Merge branch 'ent-6253-10593-Cambiar-option-ANY-de-las-bulk-operatiosn-por-ALL' into 'develop'
fixed errors in massive operations

See merge request artica/pandorafms!3451
2020-11-19 14:55:53 +01:00
Daniel Rodriguez 0fca71aa56 Merge branch 'ent-6132-Pie-chart-no-muestra-leyenda-en-primera-carga-de-la-gráfica' into 'develop'
fixed errors visual pie charts

See merge request artica/pandorafms!3510
2020-11-19 14:53:44 +01:00
daniel 7d0c31885c fixed errors visual pie charts 2020-11-19 14:53:44 +01:00
Daniel Rodriguez 1df3c4f595 Merge branch 'ent-5266-modulos-host-alive-se-ejecutan-y-obtienen-datos-sin-tener-ip-configurada' into 'develop'
Avoid host latency "fake" value 0

See merge request artica/pandorafms!3509
2020-11-19 14:51:16 +01:00
Luis Calvo 64ed945a90 Fxed update manager offline missing include 2020-11-19 14:23:12 +01:00
Jose Gonzalez 8706ec060c Solve OIDs issues and malfunction of some modules 2020-11-19 13:31:32 +01:00
artica e9259da802 Auto-updated build strings. 2020-11-19 01:00:19 +01:00
vgilc 5177180fce Merge branch 'ent-6750-Borrar-trazas-de-debug' into 'develop'
fix remove debug

See merge request artica/pandorafms!3632
2020-11-18 17:54:30 +01:00
Daniel Barbero Martin b7d4144904 fix remove debug 2020-11-18 17:37:33 +01:00
Jose Gonzalez 31f23a7994 Fix bug with macro fields 2020-11-18 13:16:04 +01:00
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
fbsanchez 952de36aab Merge remote-tracking branch 'origin/develop' into ent-5266-modulos-host-alive-se-ejecutan-y-obtienen-datos-sin-tener-ip-configurada 2020-11-18 12:02:17 +01:00
marcos 96387a874f remove console log 2020-11-18 10:38:49 +01:00
artica ce814ba580 Auto-updated build strings. 2020-11-18 01:00:20 +01:00
Daniel Rodriguez 38c9dafa1b Merge branch 'ent-6061-vmware-view' into 'develop'
Discovery task instead Recon task in some places

See merge request artica/pandorafms!3507
2020-11-17 16:38:29 +01:00
Jose Gonzalez e0404d565a Fix vulnerability 2020-11-17 14:49:26 +01:00
fbsanchez f9ab987825 Avoid check ha nodes while navigating, scheduled 2020-11-17 11:44:52 +01:00
artica 9bfdfa87f6 Auto-updated build strings. 2020-11-17 01:00:35 +01:00
fbsanchez 8bcbe0ab77 Fixed agent details in MC 2020-11-16 19:16:25 +01:00
Daniel Rodriguez 26006fe33b Merge branch 'ent-6493-provisioning-server-autoconfiguracion-de-agentes-no-es-funcional' into 'develop'
Ent 6493 provisioning server autoconfiguracion de agentes no es funcional

See merge request artica/pandorafms!3600
2020-11-16 18:51:08 +01:00
artica 810db1eec4 Auto-updated build strings. 2020-11-16 01:00:30 +01:00
artica efa96ab947 Auto-updated build strings. 2020-11-15 01:00:31 +01:00
artica 26ab48073b Auto-updated build strings. 2020-11-14 01:00:30 +01:00
Jose Gonzalez 86d2290961 Solve issue 2020-11-13 14:53:31 +01:00
artica 6fcc1107ec Auto-updated build strings. 2020-11-13 01:00:33 +01:00
Rafael Ameijeiras dda7912511 Merge branch 'ent-6732-change-docker-compose' into 'develop'
change compose to use latest

See merge request artica/pandorafms!3609
2020-11-12 15:45:03 +01:00
rafael 023c72b44b change compose to use latest 2020-11-12 15:42:43 +01:00
artica 834b102ad2 Auto-updated build strings. 2020-11-12 01:00:32 +01:00
alejandro-campos 2632256c10 fixed agent creation with unique ip condition 2020-11-11 17:45:21 +01:00
artica 33fbdd1819 Auto-updated build strings. 2020-11-11 01:00:32 +01:00
fbsanchez edb0ebd508 minor changes 2020-11-10 19:31:14 +01:00
fbsanchez 7ea84a4384 added tentacle common dir, TODO clean copies, group in CICD tasks 2020-11-10 19:24:08 +01:00
fbsanchez b8fde5e8f5 Tools (trim) added 2020-11-10 17:56:56 +01:00
Jose Gonzalez d172aad1d2 Fix error with category 2020-11-10 16:51:28 +01:00
Jose Gonzalez 702b5025e9 Ended development 2020-11-10 16:48:09 +01:00
Daniel Rodriguez bc8d769c73 Merge branch 'ent-6706-Faltan-varias-ventanas-modales-al-acceder-por-primera-vez-a-la-consola' into 'develop'
Ent 6706 faltan varias ventanas modales al acceder por primera vez a la consola

See merge request artica/pandorafms!3598
2020-11-10 15:53:36 +01:00
Jose Gonzalez 665deaa5c8 WIP: Backup upload 2020-11-10 12:23:50 +01:00
Daniel Maya ea0e229951 Fixed license expired and license trial 2020-11-10 12:10:25 +01:00
Jose Gonzalez f501d19539 Solved issue with main view 2020-11-10 10:58:06 +01:00
artica 2046689b00 Auto-updated build strings. 2020-11-10 01:01:19 +01:00
artica 767397ceb6 Auto-updated build strings. 2020-11-09 01:00:33 +01:00
artica 4887dc3e3d Auto-updated build strings. 2020-11-08 01:00:36 +01:00
artica 5010cd7313 Auto-updated build strings. 2020-11-07 01:00:30 +01:00
Jose Gonzalez 8a6a11fee6 WIP: Backup upload 2020-11-06 12:38:35 +01:00
Jose Gonzalez 22ae632850 Added html_print_anchor function for link tags 2020-11-06 12:38:06 +01:00
artica 2cbe4643bc Auto-updated build strings. 2020-11-06 01:00:35 +01:00