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

159 Commits

Author SHA1 Message Date
Calvo d8428a46a7 Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2023-01-13 10:12:21 +01:00
Daniel Maya 0e6d02acbe #10101 Fixed password_hash 2 2023-01-04 16:23:56 +01:00
Daniel Maya 13aa76af1e #10101 Fixed password_hash 2023-01-03 17:08:28 +01:00
Calvo 88aed19d30 Api auth bearer token working 2022-12-30 16:11:49 +01:00
Calvo 6d9149e11b Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API 2022-12-29 17:39:12 +01:00
alejandro.campos@artica.es bd7480a1e1 bcrypt implementation 2022-12-20 12:22:43 +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
alejandro.campos@artica.es 4ea10b5a5b changed user password hashing 2022-12-15 13:24:51 +01:00
Daniel Maya 1ffac9bc80 #9894 Fixed ldap_search 2022-11-24 12:07:48 +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 fb4b42e6c5 ent 9722 expired license notifications 2022-11-03 13:55:06 +01:00
edu.corral 5eee3ade4a ent 9722 expired license 2022-11-03 11:36:28 +01:00
Calvo 36f58579be Fix entities ldap admin pass 2022-10-25 18:46:49 +02:00
Daniel Rodriguez 8aa6ea8bc8 Merge branch 'ent-8725-lista-exclusion-passwords' into 'develop' 
Added exclude words for passwords control

See merge request artica/pandorafms!5174
 2022-10-25 09:07:08 +00:00
Diego Muñoz-Reja 3f37e2556c Merge branch 'ent-9457-14121-llamadas-api-no-funcionan-con-usuario-ldap-con-login-error' into 'develop' 
API and LDAP remote user fix with login error fix

See merge request artica/pandorafms!5135
 2022-10-21 11:24:31 +00:00
Diego Muñoz-Reja 92c01531e7 Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop' 
Added ldap timeout

See merge request artica/pandorafms!5134
 2022-10-21 10:28:04 +00:00
José González 984fd10897 Merge branch 'develop' into 'ent-8725-lista-exclusion-passwords' 
# Conflicts:
#   pandora_console/include/auth/mysql.php
 2022-10-21 06:44:47 +00:00
Calvo 391ff40c93 Fix var name misspell 2022-10-17 12:47:54 +02:00
jose.gonzalez@pandorafms.com a10aa7a258 Added control for add the notifications by default to users 2022-10-14 13:29:26 +02:00
José González 381dea9b54 Added excluded password utility 2022-10-04 16:54:34 +02:00
Calvo 9499da3176 API and LDAP remote user fix with login error fix 2022-09-22 12:34:40 +02:00
Calvo 8a1740ddfb Added ldap timeout 2022-09-22 09:27:08 +02:00
José González ded27ce411 Backend changes 2022-06-28 17:24:22 +02:00
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