Commit Graph

19880 Commits

Author SHA1 Message Date
fbsanchez b2d819aa29 Minor fixes 2020-09-25 19:35:19 +02:00
fbsanchez 9ce54213b6 WIP GCP 2020-09-23 14:07:23 +02:00
fbsanchez 4ceeb61c87 Merge remote-tracking branch 'origin/develop' into ent-4231-crear-plugin-para-google-cloud-y-anadirlo-a-discovery 2020-09-22 16:56:11 +02:00
fbsanchez 4394a8cf6a wip discovery.cloud.gcp 2020-09-22 16:55:46 +02:00
Marcos Alconada a9b2c6beb8 Ent 5898 secciones en diagnostico aparecen 2 veces 2020-09-22 12:16:31 +02:00
Daniel Rodriguez bf1d3f4af3 Merge branch 'ent-6278-SQL-Injection-ajax-cg_items' into 'develop'
Solved ajax sql injection

Closes pandora_enterprise#6278

See merge request artica/pandorafms!3465
2020-09-22 12:15:43 +02:00
Marcos Alconada 48e19f3b59 add condition 2020-09-22 12:15:05 +02:00
Daniel Rodriguez 49d8d1da9a Merge branch 'ent-6159-entities-al-exportar-ficheros-ptr-de-politicas' into 'develop'
Ent 6159 entities al exportar ficheros ptr de politicas

See merge request artica/pandorafms!3414
2020-09-22 12:14:19 +02:00
Daniel Rodriguez 6f6c18ef7b Merge branch 'ent-6127-corregir-feedback-esp' into 'develop'
Ent 6127 corregir feedback esp

See merge request artica/pandorafms!3422
2020-09-22 12:13:55 +02:00
Daniel Rodriguez 422b0ac71d Merge branch 'ent-6050-tamano-de-la-ventana-de-front-page-for-custom-reports-muy-pequeno-en-los-visual-styles' into 'develop'
Ent 6050 tamano de la ventana de front page for custom reports muy pequeno en los visual styles

See merge request artica/pandorafms!3446
2020-09-22 11:11:26 +02:00
Daniel Rodriguez cc62975202 Merge branch 'ent-6118-create-user-user-id' into 'develop'
Ent 6118 create user user

See merge request artica/pandorafms!3444
2020-09-22 10:09:59 +02:00
artica 6a525deeea Auto-updated build strings. 2020-09-22 01:00:23 +02:00
artica 89714f3fd1 Auto-updated build strings. 2020-09-21 01:00:14 +02:00
artica 76a5be406f Auto-updated build strings. 2020-09-20 01:00:17 +02:00
artica 36121333e5 Auto-updated build strings. 2020-09-19 01:00:21 +02:00
Marcos Alconada 85a41af644 Ent 5296 anadir boton guardar contrasena en active directory 2020-09-18 14:50:50 +02:00
Daniel Rodriguez b18bbbf237 Merge branch 'ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador' into 'develop'
mc search nodes

See merge request artica/pandorafms!3463
2020-09-18 14:37:10 +02:00
Daniel Rodriguez d450213b95 Merge branch 'ent-6322-10688-edicion-usuarios-tecla-intro-borra-perfil' into 'develop'
Avoid deleting profiles while pressing enter in user details (management)

See merge request artica/pandorafms!3456
2020-09-18 14:35:32 +02:00
Daniel Rodriguez f8152d5ee5 Merge branch 'ent-5971-10211-error-click-en-el-evento-de-grafica-modulo' into 'develop'
fix event legend

See merge request artica/pandorafms!3458
2020-09-18 10:05:35 +02:00
fbsanchez adceae8dda minor fixes 2020-09-18 09:40:26 +02:00
Daniel Rodriguez 0d19f500b1 Merge branch 'ent-6153-AADCM-Reset-counter-for-non-sustained-alerts' into 'develop'
checkd option by default on creation

See merge request artica/pandorafms!3454
2020-09-18 09:27:22 +02:00
Daniel Rodriguez 12356695a6 Merge branch 'ent-6197-login-background-doestn-work-on-edge' into 'develop'
Fixed custom login background on Edge and IE

See merge request artica/pandorafms!3427
2020-09-18 09:26:51 +02:00
Daniel Rodriguez 957eae39f7 Merge branch 'ent-6169-10444-Bulk-Operations-sobre-modulo-SNMP-no-funciona' into 'develop'
fix snmp version update

See merge request artica/pandorafms!3426
2020-09-18 09:25:46 +02:00
artica 53da45e3c1 Auto-updated build strings. 2020-09-18 01:00:23 +02:00
Daniel Rodriguez 02d364b66c Merge branch 'ent-6176-10390-Problema-de-permisos-en-los-dashboard' into 'develop'
added acl checks on dashboard update

See merge request artica/pandorafms!3461
2020-09-17 16:33:15 +02:00
Daniel Rodriguez 48fff2ff4f Merge branch 'ent-6320-10385-bug-timestamp-general-consola' into 'develop'
Applying date format from configuration to date specification

See merge request artica/pandorafms!3457
2020-09-17 16:00:30 +02:00
Daniel Rodriguez 8ef5e7cb9f Merge branch 'ent-6138-credentials-without-identifier-error-message' into 'develop'
Fixed credential store error message on required inputs

See merge request artica/pandorafms!3428
2020-09-17 15:17:03 +02:00
Daniel Rodriguez 4c8414cda5 Merge branch 'ent-4292-TinyMCE-status-bar' into 'develop'
Solved issue with TinyMCE status bar. Now can view it properly

See merge request artica/pandorafms!2910
2020-09-17 15:14:33 +02:00
Jose Gonzalez 1258a1a635 Solved ajax sql injection 2020-09-17 15:14:03 +02:00
Daniel Rodriguez 536e24d09e Merge branch 'ent-6288-No-se-puede-generar-Log-Report-item-en-informes' into 'develop'
fix agents selector check

See merge request artica/pandorafms!3433
2020-09-17 12:45:36 +02:00
fbsanchez 79bedb4982 Merge remote-tracking branch 'origin/develop' into ent-3357-7329-comision-europea-ordenar-consolas-por-nombre-en-metaconsola-y-anadir-buscador 2020-09-17 11:51:29 +02:00
fbsanchez 90c7de86a3 RC1 filtering, ordering and pagination in node list view (MC) 2020-09-17 11:42:53 +02:00
Jose Gonzalez 0e3c10a698 Merge 2020-09-17 10:35:18 +02:00
Daniel Rodriguez cfe2b108af Merge branch 'ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log' into 'develop'
Entity with enterprise capabilites

See merge request artica/pandorafms!3373
2020-09-17 10:19:00 +02:00
Daniel Rodriguez 4174d9910f Merge branch 'ent-6279-vulnerabilidades-XSS' into 'develop'
Ent 6279 vulnerabilidades xss

See merge request artica/pandorafms!3445
2020-09-17 10:17:11 +02:00
artica 21b3a5ad2a Auto-updated build strings. 2020-09-17 01:00:20 +02:00
Jose Gonzalez b97014f577 Cleaned traces 2020-09-16 17:40:18 +02:00
fbsanchez 9d40f900ba WIP mc search nodes 2020-09-16 15:54:43 +02:00
Jose Gonzalez 9ac9a75658 Fixed mistake with update in os list 2020-09-16 14:47:33 +02:00
Daniel Rodriguez 81cdfdbaa1 Merge branch 'ent-6289-Item-import-text-from-url-tiene-que-ser-items-de-la-ruta-de-consola-si-no-falla' into 'develop'
added warning message

See merge request artica/pandorafms!3442
2020-09-16 13:32:37 +02:00
Luis 12735f6ace Fixed module templates submit button value 2020-09-16 12:41:49 +02:00
alejandro-campos 8a6920a973 minor change 2020-09-16 11:43:53 +02:00
alejandro-campos 05a0a3a366 fixed bug 2020-09-16 10:09:23 +02:00
alejandro-campos 5bb50acfb1 added acl checks on dashboard update 2020-09-16 10:00:05 +02:00
artica a400e5b5d7 Auto-updated build strings. 2020-09-16 01:00:19 +02:00
Daniel Rodriguez aceedbe795 Merge branch 'ent-6250-Errores-log-consola' into 'develop'
Ent 6250 errores log consola

Closes pandora_enterprise#6250

See merge request artica/pandorafms!3436
2020-09-15 15:30:07 +02:00
Daniel Rodriguez 56c79c8024 Merge branch 'ent-6234-10501-borrado-de-filtros-en-eventos' into 'develop'
fixed error with refresh in events filter

See merge request artica/pandorafms!3431
2020-09-15 15:29:04 +02:00
Daniel Rodriguez 1649757975 Merge branch 'ent-6276-graficas-snmp-metaconsola' into 'develop'
Fixed metaconsole SNMP interface graphs

See merge request artica/pandorafms!3439
2020-09-15 11:56:35 +02:00
Daniel Rodriguez feaa5a800d Merge branch 'ent-5328-falta-icono-mainframe-en-networks-maps' into 'develop'
Ent 5328 falta icono mainframe en networks maps

See merge request artica/pandorafms!3424
2020-09-15 11:20:36 +02:00
fbsanchez cd81e77b18 fix event legend 2020-09-15 11:13:41 +02:00