Commit Graph

25765 Commits

Author SHA1 Message Date
Daniel Rodriguez 8471f170fb Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Fix

See merge request artica/pandorafms!3652
2020-11-25 14:40:38 +01:00
Jose Gonzalez 7187c54730 Fix 2020-11-25 14:33:52 +01:00
Jose Gonzalez da3bb9b808 Fix 2020-11-25 14:29:11 +01:00
Jose Gonzalez 5f9db9a896 Fix 2020-11-25 14:27:42 +01:00
marcos 5476c96941 update fix 2020-11-25 13:40:37 +01:00
Daniel Rodriguez b1fd90ae58 Merge branch 'ent-6542-agents-alerts-view-fallos-visuales' into 'develop'
Ent 6542 agents alerts view fallos visuales

Closes pandora_enterprise#6542

See merge request artica/pandorafms!3594
2020-11-25 13:35:17 +01:00
marcos e3e9736fc5 show and hide 2020-11-25 13:07:38 +01:00
fbsanchez d18fffb0cb Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido
Conflicts:
	pandora_console/include/class/ConsoleSupervisor.php
2020-11-25 12:07:53 +01:00
Jose Gonzalez 60ca2109f3 Solved issue with full screen 2020-11-25 11:59:03 +01:00
Jose Gonzalez 7984d9fcab Fix visual issue 2020-11-25 11:44:12 +01:00
Jose Gonzalez 912b2179bd Fix visual issues 2020-11-25 11:36:14 +01:00
marcos 06475d21ce Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 11:08:09 +01:00
marcos 73f931d516 show and hide 2fa swtich 2020-11-25 10:50:06 +01:00
Daniel Rodriguez 0b3f9fd5bd Merge branch 'ent-6353-se-pueden-crear-noticias-del-sistema-sin-añadirle-asunto' into 'develop'
requiered subject on create news

See merge request artica/pandorafms!3526
2020-11-25 10:38:38 +01:00
Marcos Alconada 481dd07e1b requiered subject on create news 2020-11-25 10:38:38 +01:00
Daniel Rodriguez 80b60d101c Merge branch 'ent-6157-Fallos-en-servicios-dinamicos' into 'develop'
Added new js file

Closes pandora_enterprise#6157

See merge request artica/pandorafms!3635
2020-11-25 10:35:47 +01:00
marcos 51322b48d7 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-25 09:31:14 +01:00
artica b6e142a442 Auto-updated build strings. 2020-11-25 01:00:20 +01:00
Daniel Rodriguez 9db3e01696 Merge branch 'ent-6769-Selector-de-agentes-sale-vacio-en-la-primera-carga-de-los-informes' into 'develop'
fix select agents builder inventory reports

See merge request artica/pandorafms!3646
2020-11-24 17:45:04 +01:00
Daniel Barbero Martin e30506a21e fix select agents builder inventory reports 2020-11-24 16:48:12 +01:00
Jose Gonzalez 0cc1da21b0 Fix errors 2020-11-24 15:53:25 +01:00
Jose Gonzalez ed1b8f9713 Fix some bugs and added surround input feature 2020-11-24 15:51:02 +01:00
fbsanchez 04f4aee7eb Export product VERSION from Tools.pm 2020-11-24 10:51:27 +01:00
marcos b42cb5a30f Merge remote-tracking branch 'origin/develop' into ent-6422-10782-Error-entity-en-informe-SQL-query 2020-11-24 08:59:44 +01:00
artica 1ce0a8cba8 Auto-updated build strings. 2020-11-24 01:00:19 +01:00
alejandro-campos f5648d734d fixed snapshot in meta 2020-11-23 17:09:58 +01:00
Daniel Rodriguez 42c0596aad Merge branch 'ent-6654-Tree-view-misma-descripcion-en-conteo-general' into 'develop'
fix tree policies description

See merge request artica/pandorafms!3584
2020-11-23 16:57:56 +01:00
daniel ac547bf57e fix tree policies description 2020-11-23 16:57:56 +01:00
Daniel Rodriguez f2383aa4a3 Merge branch 'ent-6590-comprobacion-ha-ralentiza-la-consola' into 'develop'
Avoid check ha nodes while navigating, scheduled

See merge request artica/pandorafms!3620
2020-11-23 16:55:56 +01:00
Daniel Rodriguez bafe0942ee Merge branch 'ent-6424-Cambio-menor-en-el-informe-de-inventario' into 'develop'
new options visual report inventory

See merge request artica/pandorafms!3515
2020-11-23 16:18:20 +01:00
daniel da0a18b186 new options visual report inventory 2020-11-23 16:18:20 +01:00
Daniel Rodriguez 2718558b29 Merge branch 'ent-6398-Poner-ojito-mostrar-passwords' into 'develop'
Ent 6398 poner ojito mostrar passwords

Closes pandora_enterprise#6398

See merge request artica/pandorafms!3488
2020-11-23 16:17:35 +01:00
Daniel Rodriguez ee1c9b6567 Merge branch 'ent-6655-bug-group-creation-existing-name' into 'develop'
Fixed bug allowing updating group with duplicated name

See merge request artica/pandorafms!3593
2020-11-23 16:15:02 +01:00
Daniel Rodriguez 9cd0bf7fbb Merge branch 'ent-6686-bug-en-tree-view-metaconsola' into 'develop'
Fixed agent details in MC

See merge request artica/pandorafms!3619
2020-11-23 16:14:20 +01:00
marcos 5978e46141 add toolkit on sql query report item editor 2020-11-23 13:29:35 +01:00
Daniel Rodriguez 36d63a4869 Merge branch 'ent-6436-la-columna-nombre-es-muy-pequena-discovery-task-list' into 'develop'
Minor fixes discovery tasklist usability

See merge request artica/pandorafms!3506
2020-11-23 10:44:27 +01:00
Daniel Rodriguez 69e7770e28 Merge branch 'ent-6281-paginacion-busquedas-con-espacios' into 'develop'
Fixed url with blakspace on pagination

See merge request artica/pandorafms!3527
2020-11-23 10:40:28 +01:00
Luis 6931e15dd2 Fixed url with blakspace on pagination 2020-11-23 10:40:28 +01:00
Jose Gonzalez f081a6e376 Merge remote-tracking branch 'origin/develop' into ent-6542-agents-alerts-view-fallos-visuales
Merge with last updates
2020-11-23 10:08:16 +01:00
artica 7f8324266d Auto-updated build strings. 2020-11-23 01:00:16 +01:00
artica b116f5b171 Auto-updated build strings. 2020-11-22 01:00:15 +01:00
artica 87640001dd Auto-updated build strings. 2020-11-21 01:00:20 +01:00
Daniel Rodriguez 16ada0c567 Merge branch 'ent-6411-modulos-con-caracteres-extraños-se-duplican' into 'develop'
Ent 6411 modulos con caracteres extraños se duplican

See merge request artica/pandorafms!3586
2020-11-20 13:24:22 +01:00
Daniel Rodriguez e8d628a049 Merge branch 'ent-6175-10434-problemas-con-la-creacion-y-asignacion-de-componentes-locales-en-el-campo-unit' into 'develop'
Ent 6175 10434 problemas con la creacion y asignacion de componentes locales en el campo unit

See merge request artica/pandorafms!3452
2020-11-20 13:23:12 +01:00
Daniel Rodriguez beaf311eed Merge branch 'ent-6738-modules-ifInErrors-ifOutErrors-snmp-interface-wizard' into 'develop'
Solve OIDs issues and malfunction of some modules

Closes pandora_enterprise#6738

See merge request artica/pandorafms!3633
2020-11-20 13:20:58 +01:00
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