Commit Graph

107 Commits

Author SHA1 Message Date
Rafael Ameijeiras c18ace2aae Merge branch 'ent-10152-no-permite-agregar-grupos-a-notificaciones' into 'develop'
Ent 10152 no permite agregar grupos a notificaciones

See merge request artica/pandorafms!5424
2023-01-26 07:03:33 +00:00
Daniel Rodriguez 0a4ddc480a Merge branch 'ent-10106-borrar-sesion-de-usuario-cuando-se-borra-un-usuario' into 'develop'
Ent 10106 borrar sesion de usuario cuando se borra un usuario

See merge request artica/pandorafms!5397
2023-01-23 15:28:19 +00:00
Daniel Cebrian e16ef7063a #10152 fixed error 500 message notification groups 2023-01-17 11:17:20 +01:00
Daniel Cebrian bc5e1c7541 #10152 fixed error 500 in notifications group 2023-01-17 11:05:43 +01:00
Daniel Cebrian a7fccc2f77 #10106 deleted session when user is deleted 2023-01-11 10:59:52 +01:00
Calvo f84f9733e3 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-20 12:15:10 +01:00
Diego Muñoz-Reja 9bb8d4cc8b Merge branch 'ent-9166-13760-guardia-usuario-no-ve-vista-ncm' into 'develop'
Fix ACL for ncm

See merge request artica/pandorafms!4966
2022-10-20 13:02:54 +00:00
Daniel Maya fbc222155e Merge branch 'develop' into ent-9506-cambios-en-vista-de-usuarios-perfiles 2022-10-13 12:31:15 +02:00
Daniel Maya 9b79ea7912 #9506 Fixed um 2022-09-20 16:05:27 +02:00
José González 51a2da89c9 Fixed control for IP Ranges 2022-09-12 18:29:58 +02:00
José González 8ffc5aef97 Minor improvements 2022-06-29 09:14:21 +02:00
José González ded27ce411 Backend changes 2022-06-28 17:24:22 +02:00
Calvo 49df65e69a Fix ACL for ncm 2022-06-17 15:02:57 +02:00
José González b871c1fb55 Added token view and generation in user views 2022-06-17 12:13:23 +02: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 283dadc72d Select group search filter working on groups' child 2021-11-18 11:33:34 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
fbsanchez 40e97f6cf6 Removed warnings 2021-02-09 10:25:08 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Jose Gonzalez f2a94b9aa5 Merge 2020-12-02 11:38:22 +01:00
Junichi Satoh 75e070ebb0 Fixed UM permission problems. 2020-12-01 16:46:09 +09:00
Luis 734341bf2d Ent 6148 new report permissions 2020-11-30 14:52:03 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
alejandro-campos def59508ae changed behavior of all group acl check and fixed acl vulnerabilities 2020-10-22 12:00:44 +02:00
fbsanchez f44b614f54 Fix cache hit users_get_groups 2020-10-01 15:17:06 +02:00
fbsanchez 3374a89ae0 Group selection improvement 2020-09-11 14:34:41 +02:00
Marcos Alconada f75a0a98f1 add condition in UM if group equals 0 2020-09-01 13:26:10 +02:00
Daniel Maya 9f2e722787 Ent 6034 improvement of the um profile 2020-07-23 13:26:39 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
Daniel Barbero Martin 3dee6888d6 fix 2019-10-24 17:42:37 +02:00
Daniel Rodriguez f08b5204c7 Merge branch 'ent-3673-bug-webchat-consola' into 'develop'
Modified jquery window function

See merge request artica/pandorafms!2550
2019-07-18 12:50:56 +02:00
Jose Gonzalez b7c662d3f9 Added session control for unexpected or forced logouts 2019-07-16 17:55:44 +02:00
Daniel Maya 63e0df4434 Fixed unordered groups 2019-06-28 12:11:25 +02:00
fbsanchez 132076198d minor fixes and event ACL - groups 2019-06-14 13:20:34 +02:00
artica b3da2803a4 Changed the format of the .php files
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
fermin831 015d7eea09 [Tags performance] Fixed acl propagation in child groups 2018-09-28 12:37:11 +02:00
danielmaya aceb67dd69 [Tags performance] Improve event view 2018-09-27 18:11:13 +02:00
danielmaya 631c38ca84 [Tags performance] Improve monitor detail (aka status_monitor) 2018-09-27 12:46:45 +02:00
fermin831 48798d4af5 Added some secondary groups checks to meta 2018-09-20 17:59:12 +02:00
fermin831 10a4268bbc Implemented no_hierarchy profile in users_et_groups function 2018-08-08 09:26:07 +02:00
fermin831 188733962f Changed is_secondary by no_hierarchy on tusuario_perfil table 2018-08-07 08:31:40 +02:00
manuel.montes bc98327bb4 Fixed cache in functions_users.php 2018-05-28 17:33:35 +02:00
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
fermin831 058bdbe0d9 [Console] Fixed function users_can_manage_group_all 2018-02-26 10:12:14 +01:00
daniel b419f71e7c fixed error in acl combined profile 2018-02-12 16:10:29 +01:00