Commit Graph

76 Commits

Author SHA1 Message Date
Jonathan b1ddaecccc #12997 remove skins from every site 2024-03-19 10:50:24 +01:00
Rafael Ameijeiras bfee610b4f Merge branch 'ent-12621-meter-tips-de-ayuda-en-la-interfaz' into 'develop'
Ent 12621 meter tips de ayuda en la interfaz

See merge request artica/pandorafms!6904
2024-02-26 11:51:37 +00:00
Jonathan b22ad532b2 #12621 new tips 2024-02-19 12:07:31 +01:00
Jonathan 9084a34514 #12695 wip removing warnings 2024-02-08 12:31:55 +01:00
Jonathan f43279acc3 #12777 qr name remove entities 2024-01-22 09:27:02 +01:00
Jonathan 3d1492b6a3 Merge branch 'develop' into ent-12435-metaconsola-external-links-recorta-enlaces-muy-largos 2024-01-18 13:50:27 +01:00
Daniel Cebrian 3044ef4823 #12419 fixed external url and changed size field 2024-01-02 10:26:36 +01:00
Jonathan c6d29ea60e #12435 external link users fix 2023-12-14 16:59:39 +01:00
Matias Didier 9511d82692 Merge branch 'ent-11714-15928-pantalla-personalizada-del-usuario-error-al-establecer-link-externo-como-homescreen' into 'develop'
Ent 11714 15928 pantalla personalizada del usuario error al establecer link externo como homescreen

See merge request artica/pandorafms!6250
2023-11-29 09:29:43 +00:00
Daniel Cebrian ead68be05a Merge branch 'develop' into ent-12517-cambiar-nombre-al-token-allow-all-ips 2023-11-27 16:59:29 +01:00
Daniel Cebrian 139d884525 #12517 fixed permission 2023-11-27 16:59:21 +01:00
Daniel Cebrian afa6a7d415 #12517 allow ip limited to user admin 2023-11-27 13:55:08 +01:00
miguel angel rasteu 167be52f5f #11714 Resolve conflict 2023-11-27 13:11:38 +01:00
Rafael Ameijeiras 8865f0394e Merge branch 'ent-12218-bug-del-boton-show-hide-password-de-usuarios' into 'develop'
Ent 12218 bug del boton show hide password de usuarios

See merge request artica/pandorafms!6553
2023-11-27 12:00:28 +00:00
Daniel Cebrian c16992f69a #12517 hide allowlist if token is disabled 2023-11-23 15:29:26 +01:00
daniel 76721a9445 Fix home screen external link pandora_enterprise#12413 2023-11-07 13:20:08 +01:00
daniel 7b7370659e Fix home screen external link pandora_enterprise#12413 2023-11-07 11:11:08 +01:00
miguel angel rasteu 3e20ff7eaa #12218 Fix show hide password button 2023-10-11 09:59:26 +02:00
miguel angel rasteu 133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/styles/pandora.css
2023-09-25 17:06:08 +02:00
Pablo Aragon bed83f1406 11839-Add max in User->Block size pagination 2023-09-18 08:23:05 +02:00
daniel a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
2023-08-21 08:08:34 +02:00
Jorge Rincon 3b50481c28 Merge branch develop into ent-11543-pantalla-de-login-en-modo-blanco 2023-08-18 09:49:27 +02:00
daniel 7f82273dc4 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/65.sql
2023-08-09 08:59:01 +02:00
Jonathan 84df4e1195 #11571 fix for firefox margin api token span 2023-08-01 11:11:24 +02:00
Jonathan 629f43c8f5 Merge branch 'develop' into ent-11571-contact-details 2023-08-01 10:27:40 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
miguel angel rasteu 10a5cd496f #11714 Fix external link 2023-07-14 13:53:52 +02:00
daniel a3eefacc80 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-12 16:35:24 +02:00
daniel 524bb7fdbb Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-11 08:26:20 +02:00
Miguel Angel Rasteu 3001cc90ce Merge branch 'develop' into 'ent-11161-campo-innecesario-y-no-solicitado-al-cambiar-contrasena-de-usuario-3-errores-distintos'
# Conflicts:
#   pandora_console/godmode/users/user_management.php
2023-07-10 09:45:11 +00:00
Jorge Rincon d25a5e2b89 #11543 Added login screen changes in white mode 2023-07-03 17:37:01 +02:00
miguel angel rasteu 2e110fb162 #11670 Fix home page 2023-06-28 15:08:09 +02:00
daniel 6e3eddff08 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-06-27 08:23:46 +02:00
Rafael Ameijeiras c5bd2819c3 Merge branch 'ent-11619-al-crear-nuevo-usuario-te-dice-que-estas-editando-el-tuyo' into 'develop'
Ent 11619 al crear nuevo usuario te dice que estas editando el tuyo

See merge request artica/pandorafms!6165
2023-06-26 07:29:39 +00:00
Jorge Rincon c5ad0309cf #11619 fixed the error in both node and metaconsole 2023-06-22 10:51:26 +02:00
Jonathan bc2bd68689 #11571 text QR 2023-06-21 13:49:34 +02:00
daniel d84299d3ab wip api integration pandora #1355 2023-06-20 08:43:10 +02:00
daniel e82c1e6881 wip integration integriaIMS pandora_enterprise#11471 2023-06-16 13:47:25 +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
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 5470e4d749 Merge branch 'develop' into 'ent-11117-edicion-usuario-entorno-meta-nodo'
# Conflicts:
#   pandora_console/extras/mr/64.sql
#   pandora_console/godmode/users/user_management.php
2023-05-19 10:25:31 +00:00
miguel angel rasteu efc2990a5c #11117 Fix homscreen in metaconsole 2023-05-19 10:49:16 +02:00
Rafael Ameijeiras 04a3d89dcb Merge branch 'ent-11159-guardia-15520-problema-al-almacenar-contrasena-de-usuario-de-mas-de-45-caracteres' into 'develop'
Ent 11159 guardia 15520 problema al almacenar contrasena de usuario de mas de 45 caracteres

See merge request artica/pandorafms!5871
2023-05-17 08:04:23 +00:00
miguel angel rasteu ec658476b2 #10081 Fix homescreen 2023-05-11 16:44:11 +02:00
miguel angel rasteu c3d8aa39bd #11161 Fix conditional to evaluate user_admin. Fix style CSS. Fix process_user_log 2023-05-11 14:48:06 +02:00
Daniel Maya 0fe67bf05a #11159 incresed size password 2023-05-10 10:41:59 +02:00