Commit Graph

25991 Commits

Author SHA1 Message Date
Daniel Rodriguez e8071f18b1 Merge branch 'ent-6795-clase-invisible-no-importa-tanto' into 'develop'
Fixed

Closes pandora_enterprise#6795

See merge request artica/pandorafms!3678
2020-12-03 12:29:22 +01:00
Daniel Rodriguez aca33ba224 Merge branch 'ent-6752-ventana-desconexion-del-servidor' into 'develop'
Changed check connection method to ajax. Check deleted from login

See merge request artica/pandorafms!3679
2020-12-03 12:27:55 +01:00
Luis 50b1fa3c56 Changed check connection method to ajax. Check deleted from login 2020-12-03 12:27:55 +01:00
Daniel Rodriguez a23d807baf Merge branch 'ent-6787-plugin-server-timeout-no-funciona-correctamente' into 'develop'
minor fixes in pluginserver

See merge request artica/pandorafms!3667
2020-12-03 11:05:22 +01:00
artica fbc14f9d95 Auto-updated build strings. 2020-12-03 01:00:16 +01:00
Daniel Rodriguez 98c5ef7142 Merge branch 'ent-6619-Remote-code-execution' into 'develop'
fixed security vulnerability

See merge request artica/pandorafms!3591
2020-12-02 17:16:05 +01:00
alejandro-campos 8aa18a1236 active user password check 2020-12-02 16:29:45 +01:00
Jose Gonzalez 77acbb1d46 Fix 2020-12-02 15:56:18 +01:00
Jose Gonzalez 4760e0b20c Fix 2020-12-02 15:49:13 +01:00
Daniel Barbero Martin 3592368a3c Fix gridstack js version 1.2 2020-12-02 14:26:20 +01:00
fbsanchez e501b018e4 Fix firefox double load of quickshell 2020-12-02 13:42:23 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Jose Gonzalez eeac1ca35e Merge 2020-12-02 11:28:46 +01:00
Daniel Rodriguez bd17efa3dd Merge branch 'ent-fix-um-permission' into 'develop'
Fixed UM permission problems.

See merge request artica/pandorafms!3675
2020-12-02 10:16:17 +01:00
Daniel Rodriguez 6ffc803060 Merge branch 'ent-6700-botones-en-alertas-correlativas-descolocados' into 'develop'
fixed visual error alert correlated alerts

See merge request artica/pandorafms!3606
2020-12-02 10:15:33 +01:00
Marcos Alconada 909645b4ab fixed visual error alert correlated alerts 2020-12-02 10:15:33 +01:00
Daniel Rodriguez 993e78d482 Merge branch 'ent-5835-9693-error-al-exportar-csv-el-log-view-parte-2' into 'develop'
Ent 5835 9693 error al exportar csv el log view parte 2

See merge request artica/pandorafms!3649
2020-12-02 10:13:22 +01:00
Daniel Maya 3a0f14e7bd Ent 5835 9693 error al exportar csv el log view parte 2 2020-12-02 10:13:22 +01:00
Daniel Rodriguez 67cdd704c4 Merge branch 'ent-6435-vista-de-nodo-en-mapas-de-red-open' into 'develop'
ticket 6435

See merge request artica/pandorafms!3512
2020-12-02 10:10:34 +01:00
Marcos Alconada f72d924f1e ticket 6435 2020-12-02 10:10:34 +01:00
Daniel Barbero Martin 1edfbd2b88 css simple value css CV 2020-12-02 08:12:22 +01:00
artica 913dc554eb Auto-updated build strings. 2020-12-02 01:00:17 +01:00
fbsanchez eb67b387b9 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery
Conflicts:
	pandora_console/include/class/CredentialStore.class.php
2020-12-01 17:32:02 +01:00
fbsanchez 7c298ae0a8 minor fixes 2020-12-01 17:19:34 +01:00
alejandro-campos bb32f40da9 added filter for bulk edition and deletion of modules 2020-12-01 15:50:52 +01:00
alejandro-campos 59e2930bec fixed global declaration in meta 2020-12-01 13:15:48 +01:00
Jose Gonzalez 82202fe620 Fixed 2020-12-01 12:39:37 +01:00
Daniel Maya 2b52b3beef Show data type 2020-12-01 12:29:53 +01:00
Daniel Rodriguez 1425b09683 Merge branch 'ent-6532-servicios-en-meta-no-cambian-de-estado-cuando-lo-creas-con-el-prediction-server-bajado' into 'develop'
Orphan service modules + control require argument select from sql

See merge request artica/pandorafms!3571
2020-12-01 12:11:33 +01:00
Daniel Rodriguez e2bffd30c1 Merge branch 'ent-6692-error-CLI-update-group' into 'develop'
Fixed CLI update_group

See merge request artica/pandorafms!3596
2020-12-01 11:57:07 +01:00
Daniel Rodriguez 0d657ab354 Merge branch 'ent-6179-csv-decimal-separator' into 'develop'
Add decimal separator to all pandora csv

See merge request artica/pandorafms!3434
2020-12-01 11:56:15 +01:00
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
Daniel Rodriguez f869fbb7cd Merge branch 'ent-6406-No-se-ven-los-datos-string-en-el-tree' into 'develop'
fixed bad module id reference

See merge request artica/pandorafms!3505
2020-12-01 11:55:56 +01:00
Daniel Rodriguez ff2f7c32f0 Merge branch 'ent-6399-no-funciona-extension-de-chrome' into 'develop'
fixes chrome extension credentials using POST instead GET

See merge request artica/pandorafms!3514
2020-12-01 11:55:08 +01:00
Junichi Satoh 75e070ebb0 Fixed UM permission problems. 2020-12-01 16:46:09 +09:00
artica e0266b53ba Auto-updated build strings. 2020-12-01 01:00:46 +01:00
fbsanchez 54d5529599 removed duplicated methods (unified in HTML class) added minor improvements 2020-11-30 17:50:36 +01:00
Daniel Rodriguez f861744229 Merge branch 'ent-6422-10782-Error-entity-en-informe-SQL-query' into 'develop'
SQL query do not need to be cleaned

Closes pandora_enterprise#6422

See merge request artica/pandorafms!3496
2020-11-30 17:26:15 +01:00
Daniel Rodriguez ec91ea7387 Merge branch 'ent-6291-cambio-uso-macros-informes' into 'develop'
Report macros now apply on showing report

See merge request artica/pandorafms!3460
2020-11-30 17:25:22 +01:00
Daniel Rodriguez a24bc6d15c Merge branch 'ent-6148-new-report-permissions' into 'develop'
Ent 6148 new report permissions

See merge request artica/pandorafms!3490
2020-11-30 14:52:03 +01:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Daniel Rodriguez b334e817b3 Merge branch 'ent-6747-campos-15-a-20-macro-fields-snmp-no-funcionan' into 'develop'
Fix bug with macro fields

Closes pandora_enterprise#6747

See merge request artica/pandorafms!3628
2020-11-30 14:32:14 +01:00
Daniel Rodriguez 64509df179 Merge branch 'ent-6536-servicios-item-tipo-agente-desconocido-en-mapa-de-servicio' into 'develop'
Ent 6536 servicios item tipo agente desconocido en mapa de servicio

See merge request artica/pandorafms!3574
2020-11-30 14:29:43 +01:00
Daniel Rodriguez 3801fffa6e Merge branch 'ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario' into 'develop'
F2 feature

See merge request artica/pandorafms!3493
2020-11-30 14:28:03 +01:00
Daniel Rodriguez 76a9d6fa36 Merge branch 'ent-6166-Errores-en-report-Group-Settings' into 'develop'
fix errors metaconsole, report group settings

See merge request artica/pandorafms!3651
2020-11-30 14:27:13 +01:00
daniel ff37a43035 fix errors metaconsole, report group settings 2020-11-30 14:27:13 +01:00
Daniel Rodriguez 7fe7b5f639 Merge branch 'ent-5949-Graficas-en-tiempo-real-para-SNMP-v3' into 'develop'
fix SNMP v3 show realtime charts

See merge request artica/pandorafms!3486
2020-11-30 14:26:49 +01:00
daniel 35bfd765f3 fix SNMP v3 show realtime charts 2020-11-30 14:26:49 +01:00
Daniel Rodriguez b1d2e7bba0 Merge branch 'ent-5572-9625-añadir-configuración-periodo-de-silencio-trap-storm-protection' into 'develop'
Ent 5572 9625 añadir configuración periodo de silencio trap storm protection

See merge request artica/pandorafms!3580
2020-11-30 14:26:23 +01:00
Daniel Rodriguez efe6123031 Merge branch 'ent-5145-omnishell-agentes-windows' into 'develop'
Omnishell common libraries

See merge request artica/pandorafms!3492
2020-11-30 14:25:34 +01:00