369 Commits

Author SHA1 Message Date
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
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
Daniel Maya
693c5d5044 #9172 Changed configure user 2022-06-27 16:48:00 +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