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
|
1a1087e311
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/66.sql
|
2023-09-04 08:16:48 +02:00 |
|
Pablo Aragon
|
ba964dfb16
|
11817-Remove Network maps from autorefresh user list
|
2023-08-29 08:52:50 +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 |
|
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 |
|
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 |
|
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
|
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 |
|
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
|
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 |
|