refs #5537 change cl c #1627

Merged

carlossa merged 2 commits from 5537-refactorFootnotes into dev 2023-06-21 11:04:03 +00:00

Conversation 0 Commits 2 Files Changed 1 +2 -3

carlossa commented 2023-06-20 08:40:57 +00:00

Member

Copy Link

No description provided.

carlossa added 1 commit 2023-06-20 08:40:58 +00:00

a7d9bbc582 refs #5537 change cl c

carlossa requested review from juan 2023-06-20 08:57:05 +00:00

juan approved these changes 2023-06-20 14:01:30 +00:00

carlossa added 78 commits 2023-06-21 10:57:09 +00:00

759a140e61 feat(print): create entry-update-comission template ...

refs #4586

31d23f7dd1 feat(print): create entry-update-comission template ...

refs #5112

d5daa172d5 refs #5112 feat(print): create entry-update-comission template

af0523a155 refs #5468 descriptor account solo lo puede ejecutar sysadmin y mail-forwarding solo el mismo o un superior

d6ff61b768 refs #5468 corregidas condiciones de autorización

2e5a43af68 refs #5468 restringido permisos 'WRITE' para sysadmin en VnUser

74d543884e refs #5468 añadido scope al modelo VnUser

c580be2790 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

37a7d02006 quitado scope

8a9e4ccefb refs #5468 fix e2e

9b13e3fd2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

1597f7ab69 refs #5468 permitir acceso al módulo 'Usuarios'

87ffd2668e refs #5468 scope para VnUser

62dd64eb89 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

74ea0ce9fd refs #5468 actualizados acls

b10f90fbe1 refs #5468 a la seccion privileges se le pasa el parametro user

3f26072787 refs #5468 eliminados getters a VnUser

b65ebc6af3 refs #5468 feat: cambiados acls

3b7b31deb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

aea39dd0b7 refs #5468 feat: modificalos acl de VnUser

9426ff204f refs #5468 fix: testFront

4bed88faf5 refs #5468 fix: e2e test

6135a8f576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

cd244daf84 refs #5468 feat: checkbox 'activo' marcado por defecto

96163cb07f refs #5468 feat: update acls

940ed29dfc refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'

191fe4ebf6 refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'

db55c3e81b refs #5468 fix: fornt test

b7e3e9fa71 refs #5468 feat: add testBack

0702e4ef43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

91207c5a3c refs #5468 fix: test e2e

c9b4c68b0c refs #5468 refactor: actualizada vista

eab329b230 refs #554 feat: actualizar el token automáticamente

834a3aa959 refs #5554 fix: eliminada transacción en el back 'renewToken'

2e69e4eea7 a

fdd22ca2d8 refs #5554 codigo eliminado de vnLayout

6010bc1253 refs #5554 movido codigo al vnLayout y parar el evento periódico

f471d62d41 refs #5554 refactor: 'renewToken' utiliza logout y createAccessToken

886c4a15b5 refs #5554 fix: manejado si la tabla accessTokenConfig esta vacía

b95ee6cbfa refs #5554 feat: add front test

91700e096e refs #5554 fix: cambiada extensión de archivos de test, y solucionado test

06d1de5a63 refs #5554 feat: add back test

32badef787 delete console.log

ea1c860a18 refs #5468 refactor: modificado acl directamente sin necesidad de crear una nueva ruta

81a8f383aa refs #5468 feat: no depender del modulo worker

7d59c6ec0c refs #5468 feat: eliminado acl nativo y añadido a salix.ACL

21448a84dd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

20cb1ea821 refs #5468 fix: te2e

4f9dae3522 refs #5468 fix: no muestra el id de contrato en worker/calendar

2b34dd19e8 refs #554 delete: test back que falla

46b6625527 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

98af8ee10f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

b144948dcf conflictos resueltos

7cf85eeef8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

3fdb546d86 refs #5554 refactor: eliminado vnTokenCreated y añadido a vnToken.created

653c37f048 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

0ab23477d1 refs #5468 move sql changes

929b29e7e4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

dfdf948c42 move sql changes

77c7e58f80 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5112-entryUpdateComission

6f3c28c4a4 refs #5468 refactor: eliminado código obsoleto

0aae1732bf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges

61f99744c9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5554-renovar_token

ddd23a9842 refs #5554 refactor: sustiuido window.localStorage por this

5d3ecfa00e refs #5554 fix: test front

068eca80ab Merge branch 'dev' into 5112-entryUpdateComission

503054fe05 refs #5112 modificaciones entry_updateComission

ffbaa45320 refs #5112 changelog

6c00e704cc refs #5697 fix: eliminado por la columna fecha, que no se formatea correctamente

62818a9414 Merge pull request '5697-monitores_quitarFiltroFecha' (!1625) from 5697-monitores_quitarFiltroFecha into dev ...

Reviewed-on: #1625
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

e83396de11 Merge branch 'dev' into 5112-entryUpdateComission

f6cb1cb130 Merge branch 'dev' into 5554-renovar_token

004bfdbe1e Merge pull request '5112-entryUpdateComission' (!1621) from 5112-entryUpdateComission into dev ...

Reviewed-on: #1621
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

556bdb52ce Merge branch 'dev' into 5554-renovar_token

3462e49d23 Merge pull request '5554-renovar_token' (!1566) from 5554-renovar_token into dev ...

Reviewed-on: #1566
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

f37974c835 Merge branch 'dev' into 5468-account_privileges

56917fbfc4 Merge pull request '5468-account_privileges' (!1552) from 5468-account_privileges into dev ...

Reviewed-on: #1552
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

9ef12d129b Merge branch 'dev' into 5537-refactorFootnotes

carlossa merged commit bb10b831ef into dev 2023-06-21 11:04:03 +00:00

carlossa deleted branch 5537-refactorFootnotes 2023-06-21 11:04:03 +00:00

carlossa referenced this issue from a commit 2023-06-21 11:04:04 +00:00

Merge pull request 'refs #5537 change cl c' (!1627) from 5537-refactorFootnotes into dev

Sign in to join this conversation.

Reviewers

No reviewers

juan

Labels

Clear labels   

CR / Tests passed

Unit tests and e2e passed

  

e2e

Implement e2e

  

Missing tests

Missing tests

  

Needs refactor

  

Simple

Simple check / No CR needed

No Label

CR / Tests passed

e2e

Missing tests

Needs refactor

Simple

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

2 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1627

No description provided.