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

496 Commits

Author SHA1 Message Date
Jonathan b11f047332 Change "safe" for "save" on profile duplicate 2022-12-12 10:50:59 +01:00
Rafael Ameijeiras cedee1a3fa Merge branch 'ent-9557-14267-eliminar-dashboards-privados-cuando-se-borra-el-usuario-asignado' into 'develop' 
Ent 9557 14267 eliminar dashboards privados cuando se borra el usuario asignado

See merge request artica/pandorafms!5258
 2022-12-12 08:21:16 +00:00
Jonathan 0b6d1a7840 #9903 Duplicate control profile 2022-12-09 11:37:08 +01:00
Luis Calvo cdd1569364 Fix list all private dashboards on user edition 2022-12-09 09:54:20 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
alejandro.campos@artica.es b9242b17d8 fixed bugs in meta profiles management 2022-11-23 16:29:27 +01:00
alejandro.campos@artica.es 743fef7d58 Merge remote-tracking branch 'origin/develop' into ent-9501-tenencia-de-mismos-permisos-de-manera-simultanea 2022-11-23 10:30:59 +01:00
alejandro.campos@artica.es 5accae9d47 minor changes 2022-11-23 10:30:53 +01:00
alejandro.campos@artica.es f03cd5ec8c implemented link type custom field 2022-11-22 20:40:22 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com bf1a997498 Clean footer 2022-11-22 17:41:14 +01:00
alejandro.campos@artica.es b097046fc4 constraint when creating existing profiles 2022-11-22 17:09:13 +01:00
Calvo ef7ea84beb Added enterprise hook on excludedPassword funcion in open 2022-11-16 13:26:25 +01:00
Calvo b537fd042c Added enterprise hook on excludedPassword funcion in open 2022-11-16 13:20:52 +01:00
edu.corral 47596dd300 ent 9557 delete private dashboards when deleting user 2022-11-10 12:14:44 +01:00
edu.corral ced830b52b ent 9722 exp license warning pm 2022-11-03 16:01:30 +01:00
edu.corral 1994db7f5c ent 9722 expired license warning PM 2022-11-03 15:42:13 +01:00
Alejandro Campos a58bc3bf08 Merge branch 'develop' into 'ent-9430-2FA-Authentication-sigue-saltando-tras-deshabilitar-en-consola' 
# Conflicts:
#   pandora_console/general/register.php
 2022-10-27 09:47:49 +00:00
edu.corral c32da23dd0 ent 9501 user duplicated profiles 2022-10-26 10:46:20 +02:00
jose.gonzalez@pandorafms.com 70d0e38382 Adapt views 2022-10-25 11:46:28 +02:00
jose.gonzalez@pandorafms.com 6b1906d178 Added control for user creation 2022-10-25 09:37:49 +02:00
Daniel Rodriguez 38af75ccc1 Merge branch 'ent-9266-13916-formulario-de-registro-usuario-se-restablece-tras-error' into 'develop' 
Fix user form reset if profile fails

See merge request artica/pandorafms!5137
 2022-10-17 11:27:16 +00:00
Calvo 2251062d30 Fix user profile add bugs 2022-10-17 12:26:38 +02:00
Daniel Rodriguez a36666f1fd Merge branch 'ent-9506-cambios-en-vista-de-usuarios-perfiles' into 'develop' 
Ent 9506 cambios en vista de usuarios perfiles

See merge request artica/pandorafms!5124
 2022-10-14 10:31:41 +00:00
Daniel Maya 3e9e04642d resolved conflict 2022-10-14 09:10:25 +02:00
Daniel Maya f3bc5427ba #9506 Fixed meta ajax 2022-10-13 13:22:36 +02:00
Daniel Maya fbc222155e Merge branch 'develop' into ent-9506-cambios-en-vista-de-usuarios-perfiles 2022-10-13 12:31:15 +02:00
Calvo 1c157ba2e4 Fix reset user creation form on error 2022-10-07 13:15:44 +02:00
Daniel Maya 83ac81ab23 #9506 Fixed meta 2022-10-07 10:56:12 +02:00
Calvo eed28bc668 Fix user form reset if profile fails 2022-09-22 17:07:43 +02:00
alejandro.campos@artica.es 76f7761373 fixes in double auth 2022-09-22 08:59:39 +02:00
Daniel Maya 29c06a17f7 #9506 Fixed show profiles 2022-09-21 11:19:00 +02:00
Daniel Maya d46174adb8 #9527 Fixed new user 2022-09-20 17:40:20 +02:00
Daniel Maya 9b79ea7912 #9506 Fixed um 2022-09-20 16:05:27 +02:00
Daniel Maya 9e90c8da07 #9506 Changes in user profiles 2022-09-20 13:56:36 +02:00
José González 9164f1e681 IP Allow control 2022-09-12 12:41:09 +02:00
Daniel Maya 86052ff28a #8769 Fixed conflict 2022-07-06 09:49:39 +02:00
Daniel Maya e839d82e00 resolved conflict 2022-07-04 13:40:06 +02:00
José González 8ffc5aef97 Minor improvements 2022-06-29 09:14:21 +02:00
José González c3dc1d820d Frontend changes 2022-06-28 17:24:49 +02:00
Daniel Maya 693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +02:00
José González 8d05accb7b Improve changes 2022-06-17 12:30:59 +02:00
José González b871c1fb55 Added token view and generation in user views 2022-06-17 12:13:23 +02:00
Daniel Maya c9b94273be #8769 removed metaconsole_assigned_server 2022-06-07 15:21:07 +02:00
alejandro.campos@artica.es 0c9fdf8a18 changed field max length 2022-06-03 12:25:24 +02:00
Calvo 6ac7488ca4 Fix sql error when user has no profile 2022-03-11 15:42:06 +01: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
Calvo 036e2e3d6c Fix users vulnerabilities 2022-03-03 16:35:31 +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
Calvo 1dbc9c72b8 Fix users count on index and user list 2022-02-17 14:12:48 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Calvo 34a9c2f1f2 Added token local user to allow enabling local auth at user level 2022-02-01 09:37:02 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Rodriguez cb3bba0a0d Merge branch 'ent-8125-Usuarios-globales-se-borran-si-les-borras-todos-los-perfiles' into 'develop' 
prevent from deleting global admin users when removing all of their profiles

See merge request artica/pandorafms!4493
 2021-11-16 14:55:05 +00:00
Calvo c47799a4f1 Fix missing visual console profile tokens 2021-11-15 18:58:54 +01:00
Calvo 7e36a678e9 Fix file erorrs and warns 2021-11-15 18:54:28 +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 c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Daniel Rodriguez 56ae68a034 Merge branch 'ent-7951-Bloqueo-auto-creacion-usuarios-desde-nodo-en-entornos-centralizado' into 'develop' 
Ent 7951 bloqueo auto creacion usuarios desde nodo en entornos centralizado

See merge request artica/pandorafms!4487
 2021-11-03 09:34:49 +00:00
alejandro.campos@artica.es b4c21cfdca fixed several bugs in AD authentication in metaconsole 2021-10-29 16:12:23 +02:00
fbsanchez dabd7f53fe minor fixes 2021-10-25 14:05:11 +02:00
alejandro.campos@artica.es 07c7c7a387 prevent from deleting global admin users when removing all of their profiles 2021-10-22 09:48:00 +02:00
fbsanchez bb8dbc9332 NCM 2021-10-21 02:17:17 +02:00
Daniel Rodriguez 16f2c776f2 Merge branch 'ent-8035-12446-fallos-filtros-personalizados-eventos' into 'develop' 
show only events filter in acl groups

See merge request artica/pandorafms!4451
 2021-10-08 08:09:19 +00:00
marcos d4108c4e8b show only events fetch with user groups 2021-10-07 16:11:23 +02:00
marcos f55a6685bd show only events filter in acl groups 2021-10-07 14:09:02 +02:00
marcos afb9cea67f add new filter fot litghbulb_off 2021-10-07 12:42:58 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola 
Conflicts:
	pandora_console/install.php
 2021-09-29 13:47:10 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Daniel Rodriguez 42700e9033 Merge branch 'ent-7785-input-email-con-fondo-blanco-y-texto-negro' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4284
 2021-09-22 09:10:09 +00:00
Daniel Rodriguez 8a574a2f93 Merge branch 'ent-7920-metacosola-gestion-de-usuarios-locales' into 'develop' 
Re-enabled user management in MC while not in centralised environment

See merge request artica/pandorafms!4369
 2021-08-24 12:28:03 +00:00
fbsanchez 4ff6b8a1bb Re-enabled user management in MC while not in centralised environment 2021-08-23 12:29:17 +02:00
marcos 244d7f6c8b solved conflicts 2021-08-23 08:25:12 +02:00
marcos ff60a4ec62 fixed visual error 2021-07-12 10:58:51 +02:00
fbsanchez 017e12c751 Use metaconsole_access_node to allow or deny access to node for a user created and synchronized from MC 2021-06-25 15:41:34 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
marcos 716c82bd30 fixed error with pagination user filter 2021-06-16 10:41:12 +02:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
Daniel Rodriguez f01eec72dc Merge branch 'ent-7460-fallo-visual-en-error-creacion-usuario' into 'develop' 
Fixed visual bug on user creation error

See merge request artica/pandorafms!4088
 2021-05-25 15:51:49 +00:00
Daniel Barbero Martin 6c305833bf fix groups, module_groups, network_components user_edit synch 2021-05-18 17:18:54 +02:00
Daniel Barbero Martin ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
Daniel Barbero Martin a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
 2021-05-18 08:39:06 +02:00
Daniel Barbero Martin 4c12c6e770 fix profiles and user synch 2021-05-17 17:57:08 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Rodriguez 514a91c853 Merge branch 'ent-6541-quitar-id-usuario-url-seccion-usuario' into 'develop' 
Ent 6541 quitar id usuario url seccion usuario

Closes pandora_enterprise#6541

See merge request artica/pandorafms!3990
 2021-05-10 09:08:59 +00:00
José González ce5934b9a1 Added form-type buttons for user-actions 2021-05-06 14:46:58 +02:00
Calvo 4aea645735 Fixed visual bug on user creation error 2021-04-29 11:15:20 +02:00
marcos 87362d07f4 fixed visual error selects home view 2021-04-13 15:37:44 +02:00
Daniel Rodriguez eeff80638f Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop' 
multiple fixes

See merge request artica/pandorafms!3812
 2021-04-12 10:39:41 +00:00
Daniel Rodriguez 8ebaddc233 Merge branch 'ent-6941-Problemas-de-rendimiento-en-la-vista-Manage-users' into 'develop' 
Ent 6941 problemas de rendimiento en la vista manage users

See merge request artica/pandorafms!3799
 2021-04-06 17:33:38 +00:00
Calvo 847fc44b14 Fixed user/profile newline on users_list 2021-03-30 13:34:38 +02:00
fbsanchez a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect 
Conflicts:
	pandora_console/godmode/users/user_list.php
 2021-03-26 13:52:01 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez 51404eda8d Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop' 
Ent 7077 no funciona doble auth meta

See merge request artica/pandorafms!3866
 2021-03-02 12:24:03 +00:00
Luis 93a4a90dd6 Ent 7077 no funciona doble auth meta 2021-03-02 12:24:03 +00:00
Daniel Rodriguez 341fc212d5 Merge branch 'ent-6610-links-ayuda-configuración-metaconsola' into 'develop' 
Removed metaconsole empty help links

See merge request artica/pandorafms!3702
 2021-03-01 10:59:50 +00:00
Daniel Rodriguez 4de4709f9f Merge branch 'ent-6401-Espacio-entre-label-e-ID-en-actualización-de-usuario-metaconsola' into 'develop' 
Ent 6401 espacio entre label e id en actualización de usuario metaconsola

See merge request artica/pandorafms!3701
 2021-03-01 10:50:39 +00:00
fbsanchez 0ddc1929fa multiple fixes 2021-02-02 11:25:26 +01:00
Daniel Maya d9f360016b user_list optimization 2021-01-26 09:06:49 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Daniel Rodriguez b75d1149e0 Merge branch 'ent-4025-Cambio-de-contrase-en-user-edit-no-pide-contraseña-actual' into 'develop' 
active user password check

See merge request artica/pandorafms!3689
 2020-12-17 16:48:26 +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
Luis Calvo 8fd46b390f Removed metaconsole empty help links 2020-12-09 16:39:00 +01:00
Daniel Maya 631ebcbc2f Added space in User ID 2020-12-09 15:23:16 +01:00
alejandro-campos 8aa18a1236 active user password check 2020-12-02 16:29:45 +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
marcos 13d90bb1c5 Merge remote-tracking branch 'origin/develop' into ent-5719-9894-2fa-forzar-habilitado-y-no-poder-ser-desactivado-por-el-usuario 2020-11-18 12:05:57 +01:00
fbsanchez 8202839888 warn while updating user admin > standar 2020-11-03 10:14:17 +01:00
fbsanchez 5ddb3f4421 title for dialog (user form) 2020-11-03 10:11:18 +01:00
fbsanchez 8b01565948 Avoid confirm dialog while profiles are assigned to user 2020-11-03 10:08:23 +01:00
fbsanchez 20fa959a0c Merge remote-tracking branch 'origin/develop' into ent-6577-creacion-de-usuario-con-global-profile-administrator-no-deberia-necesitar-anadirle-mas-perfiles 
Conflicts:
	pandora_console/godmode/users/configure_user.php
 2020-10-29 17:26:05 +01:00
fbsanchez f2143545b3 Able to create users without profile assignment 2020-10-22 13:35:42 +02:00
Daniel Maya 335e74c26b Fixed warning message in metaconsole 2020-10-22 09:53:59 +02:00
marcos 848f60229a updates on 2FA all users feature 2020-10-06 17:02:58 +02:00
Daniel Maya a07f1d891f Ent 6262 um operaciones masivas 2020-09-23 11:36:15 +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
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
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 adceae8dda minor fixes 2020-09-18 09:40:26 +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
manuel.montes bcf5d3ca05 Fixed visual bug 2020-09-09 14:32:02 +02:00
Jose Gonzalez de49530fd1 Avoid XSS in User management 2020-09-09 11:58:09 +02:00
Marcos Alconada f75a0a98f1 add condition in UM if group equals 0 2020-09-01 13:26:10 +02:00
manuel.montes f477919433 Fixed entities in query 2020-08-28 13:56:15 +02:00
Marcos Alconada 86bfcbcd90 changes on user list 2020-08-12 13:20:53 +02:00
Daniel Maya 9f2e722787 Ent 6034 improvement of the um profile 2020-07-23 13:26:39 +02:00
Daniel Rodriguez a8328bd4f1 Merge branch 'ent-5568-case-insensitive-para-el-buscador-de-usuarios' into 'develop' 
Ent 5568 case insensitive para el buscador de usuarios

See merge request artica/pandorafms!3244
 2020-06-11 14:00:52 +02:00
Alejandro Fraguas a8bf9843ee Merge branch 'ent-5728-bug-standard-users-pandora-administrator' into 'develop' 
Fixed user list for UM

See merge request artica/pandorafms!3241
 2020-06-08 10:46:37 +02:00
Manuel Montes 611291c217 Ent 5428 revision total de ayudas hint wiki 2020-05-29 11:37:06 +02:00
Manuel Montes 2ae11577ce Added case insensitive in agent search 2020-05-26 14:42:06 +02:00
Luis Calvo 24ddb370a7 Fixed user list for UM 2020-05-26 13:38:03 +02:00
alejandro-campos 7abd17285a Merge branch 'develop' into ent-5415-Bugs-password-policy 2020-05-19 17:39:55 +02:00
alejandro-campos 706738d801 fixed password length check in user update for admin user 2020-05-19 15:58:41 +02:00
Tatiana Llorente b99298786e Ent 5754 editor de usuarios de godmode que sea visualmente similar al editor de usuarios el propio usuario 2020-05-19 08:20:04 +02:00
Tatiana Llorente 1f16abd4bd Ent 5701 quitar feature de chat 2020-05-08 15:39:24 +02:00
tatiana 490213dfed Changed path in a required file 2020-05-05 12:50:15 +02:00
alejandro-campos 6d6b891650 minor visual changes 2020-04-01 17:32:22 +02:00
alejandro-campos 297672ec48 fix password checkings when pass policy is enabled 2020-03-31 15:12:39 +02:00