change ref master #1653

Merged

carlossa merged 2 commits from hotfix-extraCommunityEntryRef into master 2023-07-10 07:17:19 +00:00

Conversation 0 Commits 2 Files Changed 1 +1 -1

carlossa commented 2023-07-10 05:25:32 +00:00

Member

Copy Link

No description provided.

carlossa added 1 commit 2023-07-10 05:25:33 +00:00

9f2ef5c2c0 change ref master

carlossa requested review from alexm 2023-07-10 05:25:42 +00:00

alexm added 199 commits 2023-07-10 05:26:42 +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

0afc26e20c refs #5728 remove add, quit e2e

9cdaf2e519 refs #5728 fix e2e buy

7ea7816800 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5728-bugEntry/buy

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

703c224e91 refs #5513 modified-entry email

f9129afc17 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje

983081a08e Merge pull request 'test' (!1606) from test into dev ...

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

d3c4a6ba5c refs #5094 feat(ticket_index): docuware multiple deliveryNote

59642ab3ca refs #5325 defaultSearch

7127c5a3a8 refs #5325 e2e 1 smart Table

b7c8b03a65 refs #5325 e2e 2

a07ca62476 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware

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

fa9719de78 refs #5691 feat: cambiado url por data en los crudModel

72b779f5c0 refs #5528 fix: editar compras (seleccionar todas), cuando aplicas un filtro

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

5d3ecfa00e refs #5554 fix: test front

92953b9aa8 refs #5094 test(docuware): adapt tests

dd4b62d0a5 description

61ce25c1e1 refs #5325 all e2e fix smartTable

3cef6d642d refs #5325 smartTable e2e fix

66c5eda6f2 refs #5325 remove defaultSearch

5288f96836 Merge pull request '5094-ticket_index_docuware' (!1612) from 5094-ticket_index_docuware into dev ...

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

aa2d3be451 typo

c62e6fa0eb refs #5651 packingSiteAdvanced

e62a3ce166 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5528-entry.latest-buys_fixEditBuys

65108943ab refs #5528 feat: back test

9e89167d27 Merge branch 'dev' into 5691-route.index_optimizar

9b692e00d4 Merge pull request '5691-route.index_optimizar' (!1610) from 5691-route.index_optimizar into dev ...

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

98b270b885 refs #5528 feat: add back test

927c0fddc6 refs #5651

e8b98a2daf Merge branch 'dev' into 5651-packingSiteAdvanced

d086c676a2 Merge branch '5651-packingSiteAdvanced' of https://gitea.verdnatura.es/verdnatura/salix into 5651-packingSiteAdvanced

9cdc914a25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable

1f454e6219 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje

2a34abac61 refs #5513 minor fixes

5825d5e16a Merge branch '5513-back-embalaje' of https://gitea.verdnatura.es/verdnatura/salix into 5513-back-embalaje

8b832c68b3 refs #5325 fix back

a43792be26 Merge pull request 'refs #5651 packingSiteAdvanced' (!1615) from 5651-packingSiteAdvanced into dev ...

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

5163b7b253 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

e8d28ddb02 v232601

4157e30d4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5325-defaultSearch-SmartTable

7bff915a7f refs #5325 back fix correct

238a6406c5 Merge pull request '5325-defaultSearch-SmartTable' (!1613) from 5325-defaultSearch-SmartTable into dev ...

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

73133778fc Merge branch 'dev' into 5513-back-embalaje

a866b92b8c Merge pull request 'fixes #5513 Crear back para añadir funcionalidad de Embalajes de la app' (!1605) from 5513-back-embalaje into dev ...

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

068eca80ab Merge branch 'dev' into 5112-entryUpdateComission

8a2cab0e62 Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys

503054fe05 refs #5112 modificaciones entry_updateComission

ffbaa45320 refs #5112 changelog

5a6a18c76a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

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

a7d9bbc582 refs #5537 change cl c

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

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

2649db852f refs #5772 Invoice PDF size reduced

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>

38de19f044 Merge branch 'dev' into 5728-bugEntry/buy

6f9fd9bb72 refs #5772 mensajes de error

44192c0606 refs #5667 Client translations added

dfdd3a1733 Merge branch '5772-reduceInvoicePdfSize' of https://gitea.verdnatura.es/verdnatura/salix into 5772-reduceInvoicePdfSize

9ef12d129b Merge branch 'dev' into 5537-refactorFootnotes

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

Reviewed-on: #1627
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

d9afdccd9c fix: acl renewToken

ddaed3318d Merge pull request 'fix: acl renewToken' (!1631) from fix_aclRenewToken into dev ...

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

10a25ff590 refs #5772

a173cb47f0 Merge branch 'dev' into 5728-bugEntry/buy

807596f735 refs #5772

d8fe284bcd Merge branch 'dev' into 5528-entry.latest-buys_fixEditBuys

9d1a181b73 refs #5772 feat: si falla al enviar el pdf, envia un rocket al comercial

591fc14ffa refs #5772 refactor: movido codigo para enviar rocket al back

2d21da1faa Merge pull request '5528-entry.latest-buys_fixEditBuys' (!1611) from 5528-entry.latest-buys_fixEditBuys into dev ...

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

b7cd32f4ce refs #5772 eliminar tags en report invoice

12aa9c6b4b Merge branch 'dev'

389b53ceff refs #5772 fix: back test

d4dceac74c Merge pull request '5772-reduceInvoicePdfSize' (!1632) from 5772-reduceInvoicePdfSize into dev ...

Reviewed-on: #1632
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

344ba298f8 refs #5832 232801 init

757360f3d1 Merge branch 'dev' into 5728-bugEntry/buy

cce837686d Merge pull request 'refs #5728 remove add, quit e2e' (!1598) from 5728-bugEntry/buy into dev ...

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

47a4a9950f refs #5772 Parallelism added to PDF generation

8c0e8e9e12 refs #5772 Fixes fetching parallelism from front

2fec5bf2aa Merge pull request 'refs #5772 test into dev' (!1633) from test into dev ...

Reviewed-on: #1633

c9f11830a2 refs #5772 smtp.send() error throw flow fix

665339c8d2 refs #5772 Fix for unhandled ENOENT error

7660d76850 refs #5772 Test environment fix

f70df714df refs #5772, #5900 InvoiceOut back test removed, logs improved

98301f8e70 refs #5900 Small fixes & code clean

21988fba8c refs #5900 Hide PIT button on insert actions

df049201f1 refs #5900 Optimization: remove unnecessary watcher

57277ceb2e refs #5900 Show user every 6 changes, model info margin fix

d31d1e5a13 refs #5900 User avatar margin fix

fd69d69ff0 refs #5900 Style: margin adjustments

631c0e3121 refs #5900 Log grouping fix

c15d9a4753 refs #5900 Log order fix

efe0966069 refs #5900 Removed code to split user changes based on date

e32a29fc09 refs #5900 Remove duplicated logs

d69cbe0ad4 refs #5900 Origin separator style fix

544445c4ae refs #5800 Origin separator style more clear

630ce40ef7 Merge branch 'test' into 5900-removeDuplicatedLogs

cc5021a75f refs #5684 Removed xxxLog.create and dependences

e54e0784bf Merge branch '5816-noCreateLog' into 5900-removeDuplicatedLogs

c42b38c5cc refs #5900 Code clean, refactor & accurated

88e845b511 change applyFilters

e980717d14 refs #5900, #5772 Changelog updated

ef8e1c4169 refs #5531 refs #5753 fix travelConfig sql

ecf742959c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test

15c45bb544 Merge branch 'test' into hotfix-filterScopeDays

de62dd9ffd refs # e2e fix

878e9c4fe9 Merge branch 'hotfix-filterScopeDays' of https://gitea.verdnatura.es/verdnatura/salix into hotfix-filterScopeDays

15e39b5fec Merge pull request 'change applyFilters' (!1636) from hotfix-filterScopeDays into test ...

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

46ffd8d95a refs #5554 console.log

1cf5ff9a62 refs #5554 new Date()

8e5a6dbab3 fix warn

7e542f93a1 Merge branch 'test' into warnFix_travel_summary_entry

fe53abb24f Merge pull request 'fix warn' (!1641) from warnFix_travel_summary_entry into test ...

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

f8a972c2f2 refs #5094 fix translation

a67cd5ba64 refs #5900 User avatar with sticky position

c5d2e87cb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into test

12481b5f3d refs #5900 CSS fix

d200a1a695 refs #5900 CSS fixes

840a88bdc1 refs #5833 remove console.logs

1d993c74e5 refs #5590 fix total invoiceOut

3bd890c343 refs #5554 fix: solo llama al back cuando se tiene q renovar

79823605f6 refs #5554 fix: no te tira al hacer F5

1093d29fb6 Merge pull request 'test_hotfix_renewToken' (!1645) from test_hotfix_renewToken into test ...

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

273c06a210 refs #5833 deploy: test to master 232601

bc4058512a Merge branch 'test' into 5900-removeDuplicatedLogs

82e762ac09 Merge pull request 'refs #5816 Remove duplicated logs' (!1634) from 5900-removeDuplicatedLogs into test ...

Reviewed-on: #1634
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

7eb8460ba0 refs #5816 remove unforeseen dev

fc39b8f692 refs #5816 comment e2e

02aafbc7f4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix

e651ddc4a0 refs #5816 unfocus e2e

d941e2e18f Merge branch 'master' into hotfix-extraCommunityEntryRef

alexm approved these changes 2023-07-10 05:41:16 +00:00

carlossa merged commit ce8927a714 into master 2023-07-10 07:17:19 +00:00

carlossa deleted branch hotfix-extraCommunityEntryRef 2023-07-10 07:17:19 +00:00

carlossa referenced this issue from a commit 2023-07-10 07:17:19 +00:00

Merge pull request 'change ref master' (!1653) from hotfix-extraCommunityEntryRef into master

Sign in to join this conversation.

Reviewers

No reviewers

alexm

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#1653

No description provided.