Commit Graph

496 Commits

Author SHA1 Message Date
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
Daniel Cebrian 496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
Matias Didier add65eca5d Merge branch 'ent-9162-10821-modificar-columnas-widget-eventos' into 'develop'
Ent 9162 10821 modificar columnas widget eventos

See merge request artica/pandorafms!5843
2023-07-06 08:35:35 +00:00
Gorka Sanchez a4d6f29701 Merge branch 'ent-11383-cuando-se-crea-un-usuario-con-el-autorefresh-activado-este-no-se-habilita-correctamente' into 'develop'
Ent 11383 cuando se crea un usuario con el autorefresh activado este no se habilita correctamente

See merge request artica/pandorafms!5997
2023-07-04 08:40:15 +00:00
miguel angel rasteu 2e110fb162 #11670 Fix home page 2023-06-28 15:08:09 +02:00
Rafael Ameijeiras a3ef14c50b Merge branch 'ent-11347-15666-mensaje-del-visor-de-tokens-de-api-tiene-mojibake' into 'develop'
Ent 11347 15666 mensaje del visor de tokens de api tiene mojibake

See merge request artica/pandorafms!6084
2023-06-26 07:36:22 +00: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
miguel angel rasteu 2b2f9b983e #11347 Fix decode base 64 for japanese characters 2023-06-12 16:18:28 +02:00
Daniel Cebrian 1980458572 #11437 added new control session 2023-06-08 14:06:15 +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
Jorge Rincon 162c33733f #11430 Added a validation that checks if the User id already exists 2023-06-01 10:31:14 +02:00
miguel angel rasteu 202c9b5ea7 #11383 Add autorefresh_white_list value 2023-05-30 16:26:06 +02:00
Rafael Ameijeiras a43b013fb4 Merge branch 'ent-11300-perdida-de-node-access-al-actualizar-los-datos-de-usuario-propio-no-admin' into 'develop'
Ent 11300 perdida de node access al actualizar los datos de usuario propio no admin

See merge request artica/pandorafms!5934
2023-05-25 15:00:34 +00:00
Rafael Ameijeiras 16336a5cde Merge branch 'ent-11242-error-500-al-intentar-editar-un-usuario-en-metaconsola-tyr' into 'develop'
Ent 11242 error 500 al intentar editar un usuario en metaconsola tyr

See merge request artica/pandorafms!5933
2023-05-24 15:41:56 +00:00
Daniel Cebrian 0f9384326e #11300 fixed access metaconsole when user not admin update her config 2023-05-22 17:12:35 +02:00
Daniel Cebrian 761feed0dd #11300 fixed node access token in users not admin, meta 2023-05-22 15:01:04 +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
Jorge Rincon 0def9b252e #11242 validate autorefresh_list field that allows to load the view, edit user 2023-05-22 11:54:43 +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
Matias Didier 2db1eddc11 Merge branch 'ent-10326-bearer-token-permite-conectar-con-pandora1234-por-defecto' into 'develop'
Ent 10326 bearer token permite conectar con pandora1234 por defecto

See merge request artica/pandorafms!5782
2023-05-19 07:00:38 +00:00
Rafael Ameijeiras 5bd875d005 Merge branch 'ent-10998-15445-problemas-edicion-usuarios-con-acl-enterprise-en-la-nueva-ui' into 'develop'
Ent 10998 15445 problemas edicion usuarios con acl enterprise en la nueva ui

See merge request artica/pandorafms!5775
2023-05-17 14:45:00 +00: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
Rafael Ameijeiras 688454617f Merge branch 'ent-11217-fallo-al-deshabilitar-usuario-en-771' into 'develop'
Ent 11217 fallo al deshabilitar usuario en 771

See merge request artica/pandorafms!5893
2023-05-17 08:01:28 +00:00
Diego Muñoz-Reja 506ce4e24d Merge branch 'ent-11130-no-se-pueden-borrar-perfiles-de-usuarios' into 'develop'
Ent 11130 no se pueden borrar perfiles de usuarios

See merge request artica/pandorafms!5847
2023-05-16 16:02:08 +00:00
miguel angel rasteu 0505d24828 #11217 Comment CSRF Validator 2023-05-12 12:48:53 +02: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
Jonathan ef2c62861b #11130 fix remove permisions users 2023-05-08 11:03:21 +02:00
Daniel Cebrian 042591c57b #9162 added new select for order columns in widgets 2023-05-08 10:35:59 +02:00
miguel angel rasteu c1e35a5d17 #10081 Add option homescreen in metaconsole again 2023-04-28 09:51:30 +02:00
Daniel Cebrian d28cd1577b #10326 regenerate api token when update password 2023-04-25 15:43:02 +02:00
Daniel Cebrian e1f995744b #10998 fixed acl edit my user 2023-04-25 10:57:21 +02:00
daniel 976633bc4f fix profiles and users pandora_enterprise#10803 2023-04-14 10:02:41 +02:00
Pablo Aragon a3ed2b1f6b 10320-Confirm delete user 2023-04-10 16:10:44 +02:00
Pablo Aragon e4c8097e9c 10402 remove passwords box & 10856 vcard 2023-04-04 09:24:29 +02:00
Pablo Aragon 3a2cbb7a62 Datatables & styles fix 2023-03-30 16:50:30 +02:00
Pablo Aragon 2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
daniel 19ddbdc30a fixed styles 2023-03-28 08:34:05 +02:00
daniel ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
daniel 0461881420 fixed styles 2023-03-27 17:13:23 +02:00
Daniel Cebrian fd9dfcf08f Merge branch 'develop' into 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500'
# Conflicts:
#   pandora_console/install.php
2023-03-27 11:01:24 +00:00
Daniel Cebrian aeab39737b Merge branch 'develop' into ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500 2023-03-27 12:11:59 +02:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
daniel a9633085bc fixed styles 2023-03-17 12:00:51 +01:00