Commit Graph

151 Commits

Author SHA1 Message Date
Daniel Rodriguez b290e6c896 Merge branch 'ent-8332-post-configurar-un-segundo-servidor-ldap' into 'develop'
Ent 8332 post configurar un segundo servidor ldap

See merge request artica/pandorafms!4823
2022-04-19 12:42:43 +00:00
Calvo 1fad2944a6 Merge remote-tracking branch 'origin/develop' into ent-7621-autenticacion-local-usuarios-solo-api 2022-04-18 17:46:36 +02:00
Luis eceb60e12c Update mysql.php 2022-03-29 17:03:05 +00:00
Calvo 7f0dbb0476 Added secondary ldap server 2022-03-29 18:59:27 +02:00
alejandro.campos@artica.es 709f17ee7f reverted changes 2022-03-21 17:47:08 +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
Calvo 3d02febd22 Fix local login with local user token enabled 2022-02-16 14:25:25 +01:00
Calvo 34a9c2f1f2 Added token local user to allow enabling local auth at user level 2022-02-01 09:37:02 +01:00
fbsanchez 35184c4eb6 ws php8 2022-01-21 17:39:11 +01:00
Daniel Rodriguez 3054c2d028 Merge branch 'ent-8124-Administradores-globales-usan-autenticacion-remota' into 'develop'
prevent global admins to log in remotely

See merge request artica/pandorafms!4497
2021-11-16 15:36:36 +00:00
Daniel Rodriguez 7c7402e5fb Merge branch 'ent-8066-errores-ldap-con-simbolos-en-la-pass-PHP' into 'develop'
Fix ldap auth php function passwords with special chars

See merge request artica/pandorafms!4444
2021-11-16 14:12:27 +00: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
alejandro.campos@artica.es b4c21cfdca fixed several bugs in AD authentication in metaconsole 2021-10-29 16:12:23 +02:00
alejandro.campos@artica.es 40aec564af prevent global admins to log in remotely 2021-10-22 14:38:20 +02:00
alejandro.campos@artica.es 14076efc69 minor fix 2021-10-20 12:48:42 +02:00
alejandro.campos@artica.es e7d730ba0d fix bug with ldap login in metaconsole 2021-10-19 19:19:55 +02:00
Calvo 47348524a7 Local auth when remote enabled only api 2021-10-19 13:59:59 +02:00
Calvo 9802a59c5f Merge remote-tracking branch 'origin/develop' into ent-7621-autenticacion-local-usuarios-solo-api 2021-10-19 13:55:42 +02:00
Calvo 1fca24d8dc Fix ldap auth php function passwords with special chars 2021-10-05 18:00:16 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Jose Gonzalez a1869fcef0 Fix io_safe_output for ldap admin pass 2021-09-16 12:08:46 +02:00
Calvo 8c30ca8c36 Fix ldaps authentication 2021-07-27 19:11:04 +02:00
Calvo 65d31b3263 Fix api local auth 2021-07-02 11:19:21 +02:00
Daniel Barbero Martin 8c0a9859a8 remove synch old and check api 2021-05-19 17:08:13 +02:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez 749b729c0c fix local auth 2021-01-11 15:08:07 +01:00
Daniel Rodriguez 38dd3b960e Merge branch 'ent-4953-local-admin-nunca-prueba-remotos-meta' into 'develop'
Force try remote before falling back to local if admin user

See merge request artica/pandorafms!3715
2021-01-11 09:22:14 +01:00
fbsanchez 4d2b890712 minor fixes 2020-12-11 11:31:18 +01:00
fbsanchez 79c8c852b3 Force try remote before falling back to local if admin user 2020-12-11 11:26:45 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
Daniel Rodriguez b0ccfc89b1 Merge branch 'ent-6472-graficas-con-phantomjs-y-saml' into 'develop'
SAML with pandora sessions

See merge request artica/pandorafms!3533
2020-11-04 18:42:42 +01:00
fbsanchez ef50b47269 avoid useless messages 2020-10-22 15:15:46 +02:00
fbsanchez ca9b167741 SAML with pandora sessions 2020-10-16 14:00:38 +02:00
Marcos Alconada 85a41af644 Ent 5296 anadir boton guardar contrasena en active directory 2020-09-18 14:50:50 +02:00
alejandro-campos 43701f953d fixed ad authentication 2020-06-03 17:37:12 +02:00
Alejandro Fraguas 8242bf34b8 Revert "Merge branch 'ent-3693-pete-php-pantalla-en-blanco-con-auth-saml' into 'develop'"
This reverts merge request !2562
2019-07-05 14:55:22 +02:00
marcos.alconada 6349c29eb5 Add message for autenticaition error SAML 2019-07-01 13:45:42 +02:00
Daniel Maya e828fd6690 Fixed Advanced Permissions LDAP 2019-06-20 09:49:54 +02:00
Alejandro Fraguas cd1f8d0c10 Merge branch 'ent-3760-Error-de-login-LDAP' into 'develop'
Fixed function ldapsearch

See merge request artica/pandorafms!2301
2019-06-10 18:08:18 +02:00
Daniel Rodriguez d0e99e1018 Merge branch 'ent-3576-ldap-advanced-remote-user-unchecked' into 'develop'
Fixed ldap adv. perms continues apliying when autocreate remote is unselected

See merge request artica/pandorafms!2221
2019-06-03 15:09:15 +02:00
marcos.alconada 91d388c8b3 Changed for create new user with advanced config enabled and forced automaticly disabled 2019-05-27 17:47:45 +02:00
marcos.alconada 07b42f7241 Changed for metaconsole 2019-05-22 13:57:31 +02:00
marcos.alconada 0c9f8892e0 Changed evaluates permissions 2019-05-17 13:58:34 +02:00
marcos.alconada 43547267a0 Changed condition for ldap Force automatically create profile user
Former-commit-id: caa1218b7ae4dc09649a6a4bb54b158255ea268f
2019-05-14 15:59:35 +02:00
manuel 61552bc201 Fixed ldap login
Former-commit-id: bd94a6112a88b3143973ab7f915de40995149ca8
2019-04-12 10:03:18 +02:00
manuel 0f78d87504 Fixed bug in save profile users
Former-commit-id: 8f79e2c3de0e7cedb581d90e53f39ef176afe040
2019-04-10 16:12:22 +02:00
manuel 1efedd26ce Fixed bug in LDAP authentication
Former-commit-id: 4e0b2d46d5bcd71ea63e9d09e7c0d8865735227f
2019-04-09 13:39:30 +02:00
manuel db13ecbb39 Added token save profile user
Former-commit-id: 442a51cfbe7ac9730e9fd9c2c1ee16b6609e5f6a
2019-04-08 11:55:58 +02:00
samucarc de3934ddb8 Fixed function ldapsearch
Former-commit-id: 36678038a878673a3aae86ed014ee189775829db
2019-03-27 15:18:37 +01:00