Commit Graph

23636 Commits

Author SHA1 Message Date
Daniel Rodriguez e66e738072 Merge branch 'ent-8663-error-500-en-docker' into 'develop'
Ent 8663 error 500 en docker

See merge request artica/pandorafms!4740
2022-03-11 10:03:50 +00:00
Daniel Rodriguez a67b6647f7 Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop'
bulk operation edit agents add secundary groups pandora_enterprise#2152

See merge request artica/pandorafms!4677
2022-03-11 08:51:33 +00:00
Daniel Rodriguez 83b7173fc6 Merge branch 'ent-8351-error-visual-en-mensaje-de-exito-de-la-edicion-de-items-de-informes' into 'develop'
Fix success message position on edit report items

See merge request artica/pandorafms!4720
2022-03-11 08:51:02 +00:00
Daniel Barbero Martin 1a6a75390d fixed error massive operation agents #2152 2022-03-11 09:20:20 +01:00
artica 36aea89db6 Auto-updated build strings. 2022-03-11 01:00:18 +01:00
Daniel Barbero Martin 7ffca83b29 fixed error massive operation agents #2152 2022-03-10 20:06:45 +01:00
Daniel Rodriguez ef98f5bdef Merge branch 'ent-8611-vulnerabilidad-en-bulk-operations' into 'develop'
Fix permission vulnerabilities on profile massive operations

See merge request artica/pandorafms!4717
2022-03-10 13:54:10 +00:00
Daniel Rodriguez edd76aa959 Merge branch 'ent-8591-envio-de-feedback-no-funciona' into 'develop'
Fix error/success from send feedback dialog

See merge request artica/pandorafms!4713
2022-03-10 13:53:40 +00:00
Daniel Rodriguez 8218df83d7 Merge branch 'ent-8633-escalada-de-privilegios-en-la-seccion-de-gestion-de-usuarios' into 'develop'
Fix users vulnerabilities

See merge request artica/pandorafms!4734
2022-03-10 10:49:12 +00:00
Calvo 176a94ce99 Fix tactical view user count when user is in group 2022-03-10 08:26:22 +01:00
Calvo 78ab628c8b Fix tactical view user count when user is in group 2022-03-10 08:22:45 +01:00
Calvo 565cb588ac Merge remote-tracking branch 'origin/develop' into ent-8447-conteo-erroneo-de-usuarios-en-index 2022-03-10 08:07:51 +01:00
Calvo aaf01c6a01 User list php format 2022-03-10 08:03:47 +01:00
Calvo ec9936bd59 Fix users vulnerabilities and bugs 2022-03-10 07:57:34 +01:00
artica 047f40a3f0 Auto-updated build strings. 2022-03-10 01:00:17 +01:00
Luis 81da96ac33 Merge branch 'develop' into 'ent-8611-vulnerabilidad-en-bulk-operations'
# Conflicts:
#   pandora_console/include/functions_groups.php
2022-03-09 16:24:06 +00:00
Daniel Barbero Martin 2d2d10c489 fixed server name selector agent in metaconsole #7653 2022-03-09 17:05:03 +01:00
Daniel Barbero Martin 28047f2348 Merge remote-tracking branch 'origin/develop' into ent-7653-Nuevo-informe-de-estados-de-modulos-de-agentes 2022-03-09 16:49:02 +01:00
Daniel Barbero Martin 0d6570ea24 fixed error massive operation agents #2152 2022-03-09 15:12:26 +01:00
Daniel Rodriguez e637c74dbf Merge branch 'ent-8692-Faltan-iconos-de-configuración-del-agente-en-760' into 'develop'
Ent 8692 faltan iconos de configuración del agente en 760

See merge request artica/pandorafms!4752
2022-03-09 13:20:12 +00:00
Daniel Rodriguez ebdc7e4fce Merge branch 'ent-8689-Error-500-en-wizard-de-agente' into 'develop'
Ent 8689 error 500 en wizard de agente

See merge request artica/pandorafms!4751
2022-03-09 12:57:20 +00:00
Daniel Maya 29906b3c53 #8692 Fixed remote config 2 2022-03-09 13:55:49 +01:00
Daniel Rodriguez 9f7dd951e5 Merge branch 'ent-8386-usuario-sin-acceso-a-servidores-ve-icono-con-info-de-servidores' into 'develop'
Do not show servers header icon if user has no permission node

See merge request artica/pandorafms!4723
2022-03-09 12:55:31 +00:00
Daniel Rodriguez 671dc5e923 Merge branch 'ent-8610-vulnerabilidad-en-gestion-de-usuarios-perfiles' into 'develop'
Fix credential store ACL, only accces to PM or UM

See merge request artica/pandorafms!4719
2022-03-09 12:54:41 +00:00
Daniel Rodriguez c1dd265085 Merge branch 'ent-8381-Bug-interfaces-view' into 'develop'
Fixed issues with interfaces view and limited to show only agents with ifaces

See merge request artica/pandorafms!4712
2022-03-09 12:54:04 +00:00
Daniel Rodriguez d73bd92157 Merge branch 'ent-8112-icono-collapse-recortado' into 'develop'
Fix issue with collapse icon

Closes pandora_enterprise#8112

See merge request artica/pandorafms!4689
2022-03-09 12:50:17 +00:00
Daniel Rodriguez 09ba16c593 Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop'
clean file planned_downtime pandora_enterprise#5886

See merge request artica/pandorafms!4688
2022-03-09 12:48:47 +00:00
Daniel Rodriguez b6ffab0f43 Merge branch 'ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas' into 'develop'
external alerts new filters pandora_enterprise#7933

See merge request artica/pandorafms!4687
2022-03-09 12:48:04 +00:00
Daniel Maya 0a7238fe33 #8692 Fixed remote config 2022-03-09 12:06:21 +01:00
Daniel Barbero Martin 640d93045f Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios
Conflicts:
	pandora_console/godmode/massive/massive_edit_agents.php
2022-03-09 09:28:08 +01:00
artica 18e6bd1c22 Auto-updated build strings. 2022-03-09 01:00:14 +01:00
Daniel Maya 0e70bc9f67 #8689 Fixed wizard 2022-03-08 18:00:09 +01:00
Daniel Rodriguez 6e98545bda Merge branch 'ent-8415-lista-templates-descuadrada-usuario-sin-RM' into 'develop'
Fix reports view

Closes pandora_enterprise#8415

See merge request artica/pandorafms!4703
2022-03-08 15:36:37 +00:00
Daniel Rodriguez 24da0283ee Merge branch 'ent-8524-se-pueden-crear-respuestas-de-eventos-sin-nombre' into 'develop'
Event response creation name required

See merge request artica/pandorafms!4685
2022-03-08 15:33:57 +00:00
Daniel Barbero Martin dee5f092c9 Merge remote-tracking branch 'origin/develop' into ent-7933-filtro-de-busqueda-de-modulo-en-alertas-externas 2022-03-08 15:47:33 +01:00
José González d511d75b8d Merge branch 'develop' into 'ent-8112-icono-collapse-recortado'
# Conflicts:
#   pandora_console/general/main_menu.php
2022-03-08 08:53:00 +00:00
artica 223475d546 Auto-updated build strings. 2022-03-08 01:00:06 +01:00
artica 3a5d412588 Updated version and build strings. 2022-03-07 12:21:14 +01:00
artica d9f7ea4038 Auto-updated build strings. 2022-03-07 01:00:15 +01:00
artica 5f08afca26 Auto-updated build strings. 2022-03-06 01:00:16 +01:00
artica 69be7b1b55 Auto-updated build strings. 2022-03-05 01:00:19 +01:00
Calvo 17aa669d58 Fix modificar server non ininitalisez table 2022-03-04 10:49:25 +01:00
artica e3c80e015d Auto-updated build strings. 2022-03-04 01:00:14 +01:00
fbsanchez 8d049a0ad5 removed invalid components from pandoradb_data 2022-03-03 18:26:28 +01:00
Calvo 036e2e3d6c Fix users vulnerabilities 2022-03-03 16:35:31 +01:00
artica 4a7160ce39 Auto-updated build strings. 2022-03-03 01:00:15 +01:00
artica f34722841f Auto-updated build strings. 2022-03-02 01:00:07 +01:00
Daniel Rodriguez f69ade2ca0 Merge branch 'ent-8653-No-funciona-selector-de-grupos-en-apartado-de-perfil-en-creacion-edicion-de-usuario' into 'develop'
fix group selector in user creation and user edition view

See merge request artica/pandorafms!4728
2022-03-01 15:12:41 +00:00
alejandro.campos@artica.es 69749e9498 fix group selector in user creation and user edition view 2022-03-01 15:12:28 +01:00
Daniel Rodriguez 953aa2887c Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop'
some tools for policy-auto-application

See merge request artica/pandorafms!4526
2022-03-01 12:53:36 +00:00