Commit Graph

16818 Commits

Author SHA1 Message Date
Vicent Llopis 0ab411ddc4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5609-ticket.index_searchByFilter
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 13:45:03 +02:00
Vicent Llopis c9b4c68b0c refs #5468 refactor: actualizada vista
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:41:13 +02:00
Vicent Llopis 91207c5a3c refs #5468 fix: test e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:33:27 +02:00
Carlos Satorres 2d06f42493 refs #5639 defaulterView
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:33:06 +02:00
Alex Moreno f0b3177e21 Merge branch 'dev' into salix-node20
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:32:03 +00:00
Alex Moreno 9a5511f083 REFACTOR(node_version)! update to v20
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:31:09 +02:00
Carlos Satorres 4f5bd95d21 refs #5639 order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:23:46 +02:00
Vicent Llopis 0702e4ef43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:08:19 +02:00
Vicent Llopis b7e3e9fa71 refs #5468 feat: add testBack
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 13:08:10 +02:00
Vicent Llopis db55c3e81b refs #5468 fix: fornt test
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:49:34 +02:00
Vicent Llopis 191fe4ebf6 refs #5468 feat: añadidas comprobaciones acls en el back en 'Alias de correo'
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 12:40:49 +02:00
Carlos Satorres e2bea16e68 refs #5639 select country, paymethod
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:31:02 +02:00
Vicent Llopis 940ed29dfc refs #5468 feat: comprobacion de acl en el back en 'Reenvío de correo'
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 12:21:35 +02:00
Carlos Satorres db7d3b6868 refs #5639 payMethodFk
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:32:26 +02:00
Carlos Satorres 7fd2927ec9 refs #5639 smart-table country
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 11:26:31 +02:00
Vicent Llopis 96163cb07f refs #5468 feat: update acls
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:43:46 +02:00
Carlos Satorres 766d809523 Merge pull request 'refs #5599 remove returns' (!1511) from 5599-ticketColors into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1511
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-23 08:23:55 +00:00
Vicent Llopis cd244daf84 refs #5468 feat: checkbox 'activo' marcado por defecto
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 10:04:31 +02:00
Vicent Llopis 6135a8f576 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges 2023-05-23 10:03:40 +02:00
Vicent Llopis 4bed88faf5 refs #5468 fix: e2e test
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:44:07 +02:00
Carlos Satorres 84abba5566 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:38:01 +00:00
Alex Moreno 64fbd5d2c7 Merge pull request 'refs #5579 fix(route_index): order' (!1551) from 5579-fix-order into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1551
2023-05-23 07:28:21 +00:00
Alexandre Riera 73c2ae9fdc refs #5581 changelog
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:17:37 +02:00
Alex Moreno 9500e99b86 Merge branch 'dev' into 5579-fix-order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:17:25 +00:00
Alex Moreno 53e55de605 refs #5579 fix(route_index): order
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:15:31 +02:00
Carlos Satorres d7d94796d6 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:13:47 +00:00
Vicent Llopis 9426ff204f refs #5468 fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:12:27 +02:00
Carlos Satorres 0c673e43bc refs #5639 smart-tabla defaulter
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 09:02:05 +02:00
Carlos Satorres ec1a203430 Merge pull request 'refs #5648 create vn-confirm' (!1508) from 5648-sureClaim into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1508
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2023-05-23 07:00:13 +00:00
Vicent Llopis aea39dd0b7 refs #5468 feat: modificalos acl de VnUser
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 08:45:03 +02:00
Alexandre Riera bf8d82f3c6 refs #5581 refresh model
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 08:43:31 +02:00
Vicent Llopis 3b7b31deb1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5468-account_privileges
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 08:31:52 +02:00
Alex Moreno dc244b5567 refs #5488 remove State_seeFilteredEditableStates
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 08:23:52 +02:00
Carlos Satorres ee8685329f Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 06:23:19 +00:00
Alex Moreno 6f503e2a81 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-23 08:23:16 +02:00
Carlos Satorres 8ee581eb67 Merge branch 'dev' into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 06:02:17 +00:00
Alexandre Riera b9f6dc0a39 Merge branch 'dev' into 5581-transferir-lineas
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 05:54:12 +00:00
Alex Moreno 6f0c3eeb29 Merge pull request 'refs #5094 fix get email' (!1548) from 5094-fix_email into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1548
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-23 05:53:29 +00:00
Alexandre Riera 0e11bfab0b refs #5581 ticketId != id
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:53:25 +02:00
Alex Moreno 0045edb698 refs #5094 fix get email
gitea/salix/pipeline/head This commit looks good Details
2023-05-23 07:39:43 +02:00
Vicent Llopis b65ebc6af3 refs #5468 feat: cambiados acls
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-23 07:09:51 +02:00
Juan Ferrer da0aa57539 Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 19:06:20 +02:00
Juan Ferrer 26c2ab867d Merge pull request 'master into test' (!1546) from master into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1546
2023-05-22 17:04:32 +00:00
Alex Moreno f030ecd2a7 Merge pull request '5579-db-export' (!1526) from 5579-db-export into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1526
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-22 14:44:37 +00:00
Carlos Satorres 71ba45c580 Merge branch '5648-sureClaim' of https://gitea.verdnatura.es/verdnatura/salix into 5648-sureClaim
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 15:56:16 +02:00
Carlos Satorres 3994e65040 refs #5648 spaces fix2 2023-05-22 15:56:14 +02:00
Carlos Satorres a7c59f51b9 Merge branch 'dev' into 5599-ticketColors
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 13:51:35 +00:00
Alex Moreno 380287b819 Merge pull request 'correct type' (!1545) from 5094-fix_id_type into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1545
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
2023-05-22 13:05:29 +00:00
Alex Moreno 3189799b4c correct type
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 14:45:00 +02:00
Alex Moreno c42400a637 Merge branch 'dev' into 5579-db-export
gitea/salix/pipeline/head This commit looks good Details
2023-05-22 12:43:57 +00:00