tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,501 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

20090 Commits

Author SHA1 Message Date
fbsanchez 29ac13815a preload env required files (css,js) 2020-09-28 15:56:17 +02:00
fbsanchez d4e837b7e6 Group all management, "all" selected instead "none" if included 2020-09-28 15:47:38 +02:00
Daniel Rodriguez 8df5fab69f Merge branch 'ent-6022-uptime-incorrecto-en-politica-mejorada-windows' into 'develop' 
Ent 6022 uptime incorrecto en politica mejorada windows

See merge request artica/pandorafms!3315
 2020-09-28 10:39:59 +02:00
Daniel Rodriguez 6d319cbe5d Merge branch 'ent-5847-optimizacion-recomendada-Gautier' into 'develop' 
Added indexes

Closes pandora_enterprise#5847

See merge request artica/pandorafms!3462
 2020-09-28 08:39:31 +02:00
artica fe4916c0c3 Auto-updated build strings. 2020-09-28 01:00:14 +02:00
artica 0cbec13ec6 Auto-updated build strings. 2020-09-27 01:00:17 +02:00
artica bc7b0ae798 Auto-updated build strings. 2020-09-26 01:00:19 +02:00
Kevin b1c4a9890e Merge branch 'master' of brutus.artica.es:artica/pandorafms into ent-6022-uptime-incorrecto-en-politica-mejorada-windows 2020-09-25 11:46:08 +02:00
José González 0d8e2d5021 Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier' 
# Conflicts:
#   pandora_console/extras/mr/42.sql

Solved conflicts.
 2020-09-25 11:27:41 +02:00
Luis ef043a169a Increased number of max macro data fields from 15 to 20 2020-09-25 10:47:36 +02:00
Daniel Rodriguez 5af6718941 Merge branch 'ent-6336-ifHCXXXX-nuevo-wizard-snmp-interfaces' into 'develop' 
Added x64 interface modules to wizard

See merge request artica/pandorafms!3478
 2020-09-25 10:46:39 +02:00
artica 6854c13aec Auto-updated build strings. 2020-09-25 01:00:51 +02:00
Manuel Montes f78ae89a99 Ent 6177 mejoras para el public link de dashboards 2020-09-24 16:20:13 +02:00
alejandro-campos 4662fba06a fixed bug when node is disabled 2020-09-24 13:05:17 +02:00
Daniel Rodriguez 04215ba582 Merge branch 'ent-5435-9411-filtro-por-defecto-para-snmp-console' into 'develop' 
default values for date intervals (trap view)

See merge request artica/pandorafms!3469
 2020-09-24 10:57:43 +02:00
Daniel Rodriguez b3a29263e0 Merge branch 'ent-6338-Mensaje-perdida-conexion-aparece-siempre' into 'develop' 
Added lost connection data in stat_win file

Closes pandora_enterprise#6338

See merge request artica/pandorafms!3474
 2020-09-24 10:57:20 +02:00
Daniel Rodriguez 0c78b09891 Merge branch 'ent-6334-10699-10652-Wizard-WMI-SNMP-no-añade-modulos-o-incluye-los-que-quiera' into 'develop' 
fixed modules selection in agent wizard

See merge request artica/pandorafms!3472
 2020-09-24 10:56:51 +02:00
artica ba598d6d80 Auto-updated build strings. 2020-09-24 01:00:24 +02:00
Daniel Rodriguez 4d9956f4c5 Merge branch 'ent-6327-10666-Llamada-a-la-API-add-cluster-agent-no-funciona' into 'develop' 
fixed api calls

See merge request artica/pandorafms!3467
 2020-09-23 14:08:18 +02:00
Daniel Rodriguez 4880cbd29b Merge branch 'ent-6134-cambio-visual-en-checkbox-de-informes' into 'develop' 
Ent 6134 cambio visual en checkbox de informes

See merge request artica/pandorafms!3448
 2020-09-23 14:07:07 +02:00
Daniel Rodriguez f8bfd6c99b Merge branch 'ent-6119-cambiar-critical-warning-status-por-critical-warning-threshold' into 'develop' 
Ent 6119 cambiar critical warning status por critical warning threshold

See merge request artica/pandorafms!3423
 2020-09-23 14:06:09 +02:00
alejandro-campos a0dad4812e fixed error messages 2020-09-23 13:10:10 +02:00
Daniel Maya a07f1d891f Ent 6262 um operaciones masivas 2020-09-23 11:36:15 +02:00
alejandro-campos 86cf99ac81 fixed api call check when cluster id does not exist 2020-09-23 11:31:28 +02:00
Daniel Rodriguez d8daf9f063 Merge branch 'ent-6361-10708-bug-en-visualizacion-de-eventos-con-standar-user' into 'develop' 
fixes

See merge request artica/pandorafms!3468
 2020-09-23 09:42:20 +02:00
Daniel Rodriguez dadba4f81d Merge branch 'ent-6257-proyectos-imagenes-de-iso-de-demos-en-producto' into 'develop' 
Ent 6257 proyectos imagenes de iso de demos en producto

See merge request artica/pandorafms!3449
 2020-09-23 09:41:05 +02:00
Daniel Rodriguez 12bc9e2b4e Merge branch 'ent-6195-10482-entities-en-tabla-de-auditoria' into 'develop' 
Ent 6195 10482 entities en tabla de auditoria

See merge request artica/pandorafms!3411
 2020-09-23 09:38:29 +02:00
artica 0b6d87e317 Auto-updated build strings. 2020-09-23 01:00:23 +02:00
Luis Calvo a7db77d4fb Added x64 interface modules to wizard 2020-09-22 16:45:34 +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
fbsanchez 0e0c529b7e missed css file 2020-09-22 12:01:37 +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
fbsanchez 04aa92ca0d Updated field number for WMI checks (new installations) 2020-09-22 10:35:56 +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
fbsanchez c43c331d58 pandoradb_data.sql review, column selected in wmi modules 2020-09-21 18:13:18 +02:00
Jose Gonzalez 7f45a2133d Added lost connection data in stat_win file 2020-09-21 17:40:54 +02:00
alejandro-campos b1bb1e2aa0 fixed modules selection in agent wizard 2020-09-21 16:22:17 +02:00
Daniel Barbero Martin c6165fbdee fixed mobile console donut charts 2020-09-21 15:13:07 +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
fbsanchez 6f2eb57587 Switched from time range to hours old selector (SNMP console) 2020-09-18 15:07:31 +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
fbsanchez 7f0cc64193 default values for date intervals (trap view) 2020-09-18 14:03:28 +02:00
fbsanchez 724de97818 removed extra content 2020-09-18 11:53:16 +02:00
fbsanchez ca8683dd22 removed traces 2020-09-18 11:51:31 +02:00
fbsanchez 696b58544c fixes 2020-09-18 11:47:50 +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
alejandro-campos 57b06be302 fixed api calls 2020-09-18 09:33:10 +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
fbsanchez 4fb69f343a minor fix 2020-09-17 19:32:28 +02:00
fbsanchez 5c511bb88e Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-09-17 16:57:56 +02:00
fbsanchez 92da78496b Added module custom id to general tab in event details 2020-09-17 16:54:40 +02:00
fbsanchez bc166dfba2 module custom id in event list + minor fixes 2020-09-17 16:51: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
fbsanchez 867fccf604 Custom id improvements 2020-09-17 14:38:01 +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
Jose Gonzalez da01f9abd5 Fix alter index 2020-09-16 17:32:05 +02:00
Jose Gonzalez dbb1ec6b84 Too long name fix 2020-09-16 17:19:07 +02:00
Jose Gonzalez ed4ba27158 Fixed index 2020-09-16 17:11:19 +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
Jose Gonzalez e8efd228c0 Added indexes 2020-09-16 14:33:20 +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
artica d4b081bef7 Auto-updated build strings. 2020-09-15 01:00:21 +02:00
fbsanchez 19831f833c more accurate fix 2020-09-14 17:59:41 +02:00
fbsanchez adafaa4db2 Applying date format from configuration to date specification 2020-09-14 17:56:09 +02:00
fbsanchez 589d9c1d7c minor fixes 2020-09-14 17:48:38 +02:00
fbsanchez d86d0ff090 Avoid deleting profiles while pressing enter in user details (management) 2020-09-14 17:42:04 +02:00
fbsanchez fcb23b1efc Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-09-14 16:20:26 +02:00
alejandro-campos 5bd208a95c checkd option by default on creation 2020-09-14 13:43:18 +02:00
fbsanchez d52fbac943 Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos 2020-09-14 09:03:24 +02:00
artica 410d517a92 Auto-updated build strings. 2020-09-14 01:00:17 +02:00
artica 807eb5ee82 Auto-updated build strings. 2020-09-13 01:00:17 +02:00
artica eb4a4c17fe Auto-updated build strings. 2020-09-12 01:00:19 +02:00
fbsanchez c2238ac295 minor changes 2020-09-11 15:30:18 +02:00
fbsanchez 09a5bad4f1 Fixes in visualization (groups selection) 2020-09-11 15:17:08 +02:00
fbsanchez da7f286b22 fixed pagination (final page) 2020-09-11 15:09:52 +02:00
fbsanchez 017333c46a fixed pagination (final page) 2020-09-11 15:03:40 +02:00
fbsanchez a72002dc0e fixed pagination (final page) 2020-09-11 14:56:32 +02:00
fbsanchez 426286b8b5 fixed pagination (started by 1 instead 0, select2 requirement) 2020-09-11 14:53:29 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
manuel.montes 0ff915e823 Added images 2020-09-11 10:22:51 +02:00
artica 100c1297fb Auto-updated build strings. 2020-09-11 01:00:18 +02:00
manuel.montes 4b531a96c2 Changed checkbox switch 2020-09-10 17:48:07 +02:00
artica 3a95c3dd58 Auto-updated build strings. 2020-09-10 01:00:17 +02:00
manuel.montes eaa4924a0f Fixed visual bug 2020-09-09 17:16:25 +02:00
Jose Gonzalez 58f521e8b5 Avoid XSS in Edit OS form. 2020-09-09 15:28:11 +02:00
Jose Gonzalez 99bb0eb809 Avoid XSS in Remote components form. 2020-09-09 14:44:19 +02:00
manuel.montes bcf5d3ca05 Fixed visual bug 2020-09-09 14:32:02 +02:00
Jose Gonzalez 8f477b1833 Avoid XSS in List of special days. Added control for only show help tip if description has data 2020-09-09 12:49:43 +02:00
Jose Gonzalez e833c318a5 Avoid XSS in Module templates 2020-09-09 12:35:28 +02:00
Jose Gonzalez de49530fd1 Avoid XSS in User management 2020-09-09 11:58:09 +02:00
Jose Gonzalez b9b94e1382 Avoid XSS in Private Enterprise Numbers 2020-09-09 11:44:26 +02:00
Jose Gonzalez 6a192433cb Avoid XSS in Net Scan scripts 2020-09-09 11:27:08 +02:00
alejandro-campos 77496bd5a2 added warning message 2020-09-09 09:35:21 +02:00
artica cbed2ef758 Auto-updated build strings. 2020-09-09 01:00:18 +02:00
artica 0ee9ed5dfa Updated version and build strings. 2020-09-08 15:00:36 +02:00
Luis Calvo 4a93f6c3a6 Fixed metaconsole SNMP interface graphs 2020-09-08 11:48:27 +02:00
artica 958c485f9d Auto-updated build strings. 2020-09-08 01:00:23 +02:00
Jose Gonzalez 18a993145e Fixed type array warning messages 2020-09-07 14:38:43 +02:00
Jose Gonzalez aecbab5c36 Fix variable type for array_flip instruction 2020-09-07 14:13:53 +02:00
Jose Gonzalez 42a615166e Fixed object definitions 2020-09-07 13:54:18 +02:00
Jose Gonzalez e3e7f3b313 Fixed error message "Invalid argument supplied for foreach()" and "in_array() expects parameter 2 to be array" 2020-09-07 12:58:09 +02:00
fbsanchez 9d3a209fc8 Merge remote-tracking branch 'origin/develop' into ent-5735-9752-problema-no-inicializados-modulos-de-tipo-log 2020-09-07 09:26:47 +02:00
artica 5093d94db3 Auto-updated build strings. 2020-09-07 01:00:14 +02:00
artica d86b11deb4 Auto-updated build strings. 2020-09-06 01:00:15 +02:00
artica 6433fadddd Auto-updated build strings. 2020-09-05 01:00:23 +02:00
alejandro-campos c4e192f7f7 fix agents selector check 2020-09-04 13:54:07 +02:00
marcos 6f02ee8206 fixed error with refresh in events filter 2020-09-04 12:38:46 +02:00
artica 44033aff20 Auto-updated build strings. 2020-09-04 01:00:18 +02:00
Marcos Alconada b02d44ced5 fixed error with snmp interfaces 2020-09-03 11:17:04 +02:00
artica 4c8e468437 Auto-updated build strings. 2020-09-03 01:00:17 +02:00
Luis Calvo 3d947ef77b Fixed credential store error message on required inputs 2020-09-02 11:20:31 +02:00
artica ba681816c1 Auto-updated build strings. 2020-09-02 01:00:16 +02:00
Luis Calvo 8314a25830 Fixed custom login background on Edge and IE 2020-09-01 17:52:36 +02:00
alejandro-campos d4b44d33a0 fix snmp version update 2020-09-01 17:39:25 +02:00
Alejandro Fraguas 7d3bc0b67f Merge branch 'ent-6211-Revisar-actualizacion-online-open' into 'develop' 
fixed open online update

See merge request artica/pandorafms!3420
 2020-09-01 15:55:33 +02:00
manuel.montes f8e36620e8 Added icon 2020-09-01 15:01:15 +02:00
Marcos Alconada f75a0a98f1 add condition in UM if group equals 0 2020-09-01 13:26:10 +02:00
manuel.montes 05fadd167d Changed names 2020-09-01 12:30:55 +02:00
manuel.montes 51ed420d77 Fixed visual bug 2020-09-01 12:18:10 +02:00
alejandro-campos 0345d36d08 fixed open online update 2020-09-01 08:12:57 +02:00
artica 21c879c74f Auto-updated build strings. 2020-09-01 01:00:18 +02:00
Alejandro Fraguas b1402c1ad7 Merge branch 'ent-6248-10587-Error-SQL-graficas-interface-information-SNMP' into 'develop' 
fix bug in combined graphs

See merge request artica/pandorafms!3410
 2020-08-31 14:20:38 +02:00
Alejandro Fraguas d2df6fa00a Merge branch 'ent-6264-10617-No-se-crean-las-graficas-Interface-Information-SNMP' into 'develop' 
Fixed module types check

See merge request artica/pandorafms!3417
 2020-08-31 13:19:45 +02:00
daniel fe8e7b7d0c Add new filter search actions 2020-08-31 12:48:00 +02:00
daniel b96cade165 new options 24x7 sla,availavility reports 2020-08-31 12:33:41 +02:00
alejandro-campos 24d1522bd0 Fixed module types check 2020-08-31 12:12:52 +02:00
artica a4e0bfe38e Auto-updated build strings. 2020-08-31 01:00:15 +02:00
artica cd5c4ac63a Auto-updated build strings. 2020-08-30 01:00:18 +02:00
artica 2c81502c11 Auto-updated build strings. 2020-08-29 01:00:25 +02:00
manuel.montes f7fe604914 Fixed entities in resource exporting 2020-08-28 14:43:20 +02:00
manuel.montes f477919433 Fixed entities in query 2020-08-28 13:56:15 +02:00
artica 20a1436711 Auto-updated build strings. 2020-08-28 01:00:19 +02:00
artica 881a8e6a01 Auto-updated build strings. 2020-08-27 01:00:18 +02:00
alejandro-campos a92c3c7ca3 fix bug in combined graphs 2020-08-26 11:47:54 +02:00
Jose Gonzalez 5565d839c3 Merge remote-tracking branch 'origin/develop' into ent-6093-error-fields-en-alertas-snmp 2020-08-26 09:00:35 +02:00
artica 24eeebd6be Auto-updated build strings. 2020-08-26 01:00:18 +02:00
Jose Gonzalez 516de686cf Fixed issue 2020-08-25 15:03:19 +02:00
Jose Gonzalez 1b14d83fd4 Added None value 2020-08-25 10:58:26 +02:00
artica 223774875c Auto-updated build strings. 2020-08-25 01:00:17 +02:00
Luis 0d27296b79 Fixed acl enterprise acl gextensions 2020-08-24 10:16:25 +02:00
artica 022167fa9c Auto-updated build strings. 2020-08-24 01:00:14 +02:00
artica 07c7d917c8 Auto-updated build strings. 2020-08-23 01:00:14 +02:00
artica b5752f1b2d Auto-updated build strings. 2020-08-22 01:00:41 +02:00
marcos 195f09a7cf fixed error on delete agent api 2020-08-21 09:40:24 +02:00
artica f0a91cce56 Auto-updated build strings. 2020-08-21 01:00:18 +02:00
Daniel Rodriguez 0512149ee4 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' into 'develop' 
Ent 6102 edicion nombre sincronizacion alertas metaconsola

See merge request artica/pandorafms!3364
 2020-08-20 14:43:17 +02:00
artica 06f17b5d0b Auto-updated build strings. 2020-08-20 01:00:18 +02:00
Daniel Rodriguez 37c8cb74ce Merge branch 'ent-6123-Estado-de-los-log-source-de-agente' into 'develop' 
Implemented log source status info box in agent view

See merge request artica/pandorafms!3379
 2020-08-19 10:36:00 +02:00
alejandro-campos 29026ef3be changed tooltip 2020-08-19 09:10:17 +02:00
artica 2231fcab72 Auto-updated build strings. 2020-08-19 01:00:14 +02:00
artica c1c2fb3b57 Auto-updated build strings. 2020-08-18 01:00:16 +02:00
Daniel Rodriguez 55986ede39 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop' 
fix parameter macros in event responses

See merge request artica/pandorafms!3405
 2020-08-17 09:38:47 +02:00
artica b4b3fc5866 Auto-updated build strings. 2020-08-17 01:00:14 +02:00
artica fbb0699bf7 Auto-updated build strings. 2020-08-16 01:00:14 +02:00
artica c4dd6d2395 Auto-updated build strings. 2020-08-15 01:00:20 +02:00
alejandro-campos 0917a631ee fix parameter macros in event responses 2020-08-14 14:48:34 +02:00
Daniel Rodriguez 42c6989d5e Merge branch 'ent-5685-Historico-de-eventos-en-Metaconsola-no-tiene-paginacion-correcta' into 'develop' 
fix event pagination when events history is activated

See merge request artica/pandorafms!3401
 2020-08-14 11:47:19 +02:00
Daniel Rodriguez 4ada69a804 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop' 
Ent 6201 10495 macro en event response no funciona

See merge request artica/pandorafms!3403
 2020-08-14 11:47:11 +02:00
Marcos Alconada 77142a0c1a fixed vulnerability 2020-08-14 11:42:49 +02:00
artica 177341e6af Auto-updated build strings. 2020-08-14 01:00:18 +02:00
alejandro-campos 8f96ca0805 fix parameter macros in event responses 2020-08-13 14:13:12 +02:00
alejandro-campos 90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
alejandro-campos 6b989109d8 fix event pagination when events history is activated 2020-08-13 10:34:31 +02:00
artica e510d517f2 Auto-updated build strings. 2020-08-13 01:00:18 +02:00
Marcos Alconada 86bfcbcd90 changes on user list 2020-08-12 13:20:53 +02:00