Commit Graph

6225 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
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 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 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
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 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 Maya 29906b3c53 #8692 Fixed remote config 2 2022-03-09 13:55:49 +01: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 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
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
Calvo 17aa669d58 Fix modificar server non ininitalisez table 2022-03-04 10:49:25 +01:00
Calvo 036e2e3d6c Fix users vulnerabilities 2022-03-03 16:35:31 +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
José González 95e8a10fe1 Clean traces 2022-02-25 08:31:14 +01:00
Calvo e95f2cd09d Fix success message position on edit report items 2022-02-24 18:02:38 +01:00
José González 08b393614a Fixed missing char 2022-02-24 14:55:47 +01:00
Calvo 39a971ad5b Fix permission vulnerabilities on profile massive operations 2022-02-24 12:17:21 +01:00
Daniel Rodriguez 3f7067fe48 Merge branch 'ent-I-do-now-like-procedures' into 'develop'
Allow both behaviours in alert time slots

See merge request artica/pandorafms!4711
2022-02-24 09:55:40 +00:00
fbsanchez cad5b8efa5 float current v 2022-02-23 17:52:09 +01:00
fbsanchez 45d1641169 Merge remote-tracking branch 'origin/develop' into ent-8319-update-manager-comprobar-que-los-oums-y-los-mr-sean-consecutivos 2022-02-23 17:45:15 +01:00
fbsanchez 5d5b0cb553 errata fix 2022-02-23 17:44:51 +01:00
fbsanchez eee355ff00 errata fix 2022-02-23 14:07:20 +01:00
fbsanchez deb46436d3 Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas
Conflicts:
	pandora_console/extras/mr/52.sql
2022-02-23 12:11:44 +01:00
fbsanchez 2f304f9250 sync with updatemanager repo 2022-02-23 10:53:33 +01:00
fbsanchez 130b077202 Minor change 2022-02-23 10:51:19 +01:00
fbsanchez be9996ab9f Weird stuff for updates 2022-02-23 10:24:01 +01:00
Daniel Barbero Martin 237a7feb98 remove procedure and retrocompatibility pandora_enterprise#3943 2022-02-22 13:20:53 +01:00
Daniel Rodriguez ffc7cb2b44 Merge branch 'ent-8455-ampliar-limite-comandos' into 'develop'
Increased field size

Closes pandora_enterprise#8455

See merge request artica/pandorafms!4706
2022-02-22 12:08:46 +00:00
Daniel Barbero Martin 93cad269c8 fixed json entities pandora_enterprise#3943 2022-02-22 12:03:22 +01:00
Daniel Rodriguez 45b97be611 Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop'
Added token local user to allow enabling local auth  at user level

See merge request artica/pandorafms!4668
2022-02-18 11:04:06 +00:00
José González e2621f6230 Increased field size 2022-02-18 11:18:01 +01:00
Calvo 5ba7b47b85 Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad 2022-02-18 09:26:55 +01:00
Jose Gonzalez 7d71c60237 Fix reports view 2022-02-17 14:20:24 +01:00
Calvo 1dbc9c72b8 Fix users count on index and user list 2022-02-17 14:12:48 +01:00
fbsanchez 934be2eaf4 Updated testing and swap messages 2022-02-17 14:07:46 +01:00
fbsanchez 6434095be5 UMC ImSureWhatImDoingWhenInstallingOfflinePatchesBecouseImGoingToIgnoreYourMessages 2022-02-17 13:41:40 +01:00
fbsanchez 3150df98c6 Error fix in report - automatic combined graphs 2022-02-17 11:02:23 +01:00
fbsanchez af45aec166 reporting_label_macro general review 2022-02-16 14:01:23 +01:00
fbsanchez 1da5534484 Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
Conflicts:
	.gitlab-ci.yml
	pandora_console/pandoradb.sql
2022-02-15 17:32:10 +01:00
fbsanchez 7c11a01b85 Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda 2022-02-15 14:32:50 +01:00