Commit Graph

5379 Commits

Author SHA1 Message Date
Daniel Rodriguez 4b51e26086 Merge branch 'ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery' into 'develop'
discovery.cloud.gcp

See merge request artica/pandorafms!3479
2020-12-09 13:54:25 +01:00
fbsanchez b4bb0a1dcf warn while no instances are shown in map quick preview (discovery GCP) 2020-12-09 12:23:49 +01:00
fbsanchez d45a72f355 minor fix PM -> UM for cred access (managemnt) 2020-12-04 13:32:42 +01:00
Daniel Maya 369002cb96 inventory alerts 2020-12-04 10:31:22 +01:00
Daniel Maya 296cb9125e Ent 5316 anadir seccion credential store al menu de discovery 2020-12-03 14:48:12 +01:00
Daniel Rodriguez 9aaae58cc7 Merge branch 'ent-2323-Modo-Debug-instantáneo' into 'develop'
Added QueryResult ui type

See merge request artica/pandorafms!3517
2020-12-03 14:43:44 +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
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +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 Maya 3a0f14e7bd Ent 5835 9693 error al exportar csv el log view parte 2 2020-12-02 10:13:22 +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
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
Junichi Satoh 75e070ebb0 Fixed UM permission problems. 2020-12-01 16:46:09 +09: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
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 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 ff37a43035 fix errors metaconsole, report group settings 2020-11-30 14:27:13 +01:00
marcos 1ce48c812f updated 2fa all user 2020-11-26 18:11:30 +01:00
Daniel Rodriguez d08e60f13a Merge branch 'ent-6741-Vulnerabilidad-SQL-injection' into 'develop'
Fix vulnerability

Closes pandora_enterprise#6741

See merge request artica/pandorafms!3622
2020-11-26 18:07:20 +01:00
Jose Gonzalez 8c26892e55 Allow add text 2020-11-26 16:58:02 +01:00
marcos af863a45de updates 2020-11-26 16:25:21 +01:00
Jose Gonzalez dbfe52e383 Fix issues with alert fields 2020-11-26 13:39:17 +01:00
fbsanchez df03b77b60 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 12:57:37 +01:00
fbsanchez 146f3b44d9 Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo 2020-11-26 11:30:39 +01:00
marcos c824972c8c updates 2020-11-26 11:02:48 +01:00
marcos 5476c96941 update fix 2020-11-25 13:40:37 +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
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
Marcos Alconada 481dd07e1b requiered subject on create news 2020-11-25 10:38:38 +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
Daniel Barbero Martin e30506a21e fix select agents builder inventory reports 2020-11-24 16:48:12 +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
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
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 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 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
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 7d0c31885c fixed errors visual pie charts 2020-11-19 14:53:44 +01:00
Luis Calvo 64ed945a90 Fxed update manager offline missing include 2020-11-19 14:23:12 +01:00
Daniel Barbero Martin b7d4144904 fix remove debug 2020-11-18 17:37:33 +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
Jose Gonzalez e0404d565a Fix vulnerability 2020-11-17 14:49:26 +01:00
Daniel Maya ea0e229951 Fixed license expired and license trial 2020-11-10 12:10:25 +01:00