Commit Graph

198 Commits

Author SHA1 Message Date
Rafael Ameijeiras 06d3664b2f Merge branch 'ent-10254-15114-anadir-timeout-y-secondary-server-a-ad' into 'develop'
Ent 10254 [#15114]Añadir timeout y secondary server a AD

See merge request artica/pandorafms!6091
2023-07-18 10:14:29 +00:00
Daniel Cebrian 8aaa98a741 #10254 added message timeout 2023-07-17 14:10:08 +02:00
Matias Didier 203446af70 Merge branch 'ent-11475-cambiar-copyrights-backend-agentes' into 'develop'
Ent 11475 cambiar copyrights backend agentes

See merge request artica/pandorafms!6172
2023-07-04 08:49:14 +00:00
miguel angel rasteu 2e110fb162 #11670 Fix home page 2023-06-28 15:08:09 +02:00
Félix Suárez ce11a6521c Replace "Artica ST" 2023-06-23 15:37:27 -06:00
Daniel Cebrian 8678df6982 #10254 added secondary server in ad 2023-06-13 12:37:28 +02:00
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Rafael Ameijeiras 84216432bb Merge branch 'ent-10355-13815-controlar-la-llamada-de-ldap-si-el-propio-ldap-no-la-cierra' into 'develop'
Ent 10355 13815 controlar la llamada de ldap si el propio ldap no la cierra

See merge request artica/pandorafms!5832
2023-05-30 11:09:48 +00:00
miguel angel rasteu 33d95ef00e #11117 Add new field in tusuario for metaconsole event default and fix selectors 2023-05-22 12:08:27 +02:00
miguel angel rasteu efc2990a5c #11117 Fix homscreen in metaconsole 2023-05-19 10:49:16 +02:00
miguel angel rasteu 1860baac0c #11117 Fix unset values 2023-05-18 16:30:17 +02:00
miguel angel rasteu ee427d2694 #11117 Add conditional to exclude some values from metaconsole 2023-05-08 16:54:27 +02:00
Daniel Cebrian 8ee97ba7e0 #10355 fixed ldap timeout 2023-05-04 14:15:58 +02:00
Daniel Cebrian f5c31b0daf #10420 fixed fullname user in ldap 2023-04-11 14:49:34 +02:00
Daniel Cebrian da2ede8627 #10420 fixed login ldap with quotes 2023-04-11 13:12:48 +02:00
Jonathan cf29caedcd Conflict solution 2023-03-06 11:04:05 +01:00
Jonathan 181b172ba8 #9529 timezone visual for new users 2023-02-01 16:57:48 +01:00
Daniel Cebrian 96efef07d2 #10115 changed function for control special character in mysql.php 2023-01-26 09:28:29 +01:00
Daniel Cebrian 8fb5fc0d85 #10115 fixed special character in fullname if user have permission 2023-01-26 09:16:02 +01:00
Daniel Cebrian 783f9a1793 #10115 fixed login with special character in ldap 2023-01-25 17:01:28 +01:00
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