Commit Graph

16195 Commits

Author SHA1 Message Date
Alex Moreno 9ab850b34d Merge pull request 'test(e2e_order): fiter optimized' (!1510) from fix_orders_e2e into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1510
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-10 09:41:43 +00:00
Carlos Satorres 61d6f47162 refs #5599 remove returns
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 11:31:58 +02:00
Alex Moreno e97d063832 Merge branch 'test' into fix_orders_e2e
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 08:17:37 +00:00
Juan Ferrer df1803a2e3 refs #5517 Front test fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 10:11:52 +02:00
Alex Moreno 706c62f624 typo
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 09:26:33 +02:00
Alex Moreno 3b8cafc783 fix(ticketConfigSql): correct folder
gitea/salix/pipeline/head Build queued... Details
2023-05-10 09:22:33 +02:00
Alex Moreno 8c0deb6cfa test(e2e_order): fiter optimized
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-10 09:16:19 +02:00
Carlos Satorres a8bb0aa196 Merge pull request 'refs #5580 add button, yml' (!1503) from 5580-buttonLink into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1503
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2023-05-10 06:58:58 +00:00
Carlos Satorres eb3003e0f5 Merge branch 'dev' into 5580-buttonLink
gitea/salix/pipeline/head This commit looks good Details
2023-05-10 06:46:39 +00:00
Alex Moreno ca8373d7f7 feat(acl): add specifics acls to ticket, claim, state and worker
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 14:04:39 +02:00
Vicent Llopis 313c641cd7 move chages sql
gitea/salix/pipeline/head This commit looks good Details
2023-05-09 12:26:29 +02:00
Vicent Llopis 461966d73e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5594-sendPdf_whenMakeInvoice
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-09 11:33:28 +02:00
Juan Ferrer 7a668adf18 refs #5517 pagination fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 16:50:20 +02:00
Juan Ferrer 35a888a968 refs #5517 Pagination spinner fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 16:48:05 +02:00
Juan Ferrer a2e71b57a2 refs #5517 Front test fix
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 16:33:35 +02:00
Juan Ferrer 2aaded4ed4 refs #5517 Fix: Show spinner when loading
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2023-05-08 16:30:21 +02:00
Alex Moreno 3b8d670c5b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 13:43:31 +02:00
Carlos Satorres 0b2c91466e refs #5648 create vn-confirm
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 13:25:42 +02:00
Juan Ferrer 9f02fc66c8 refs #5517 Show spinner when loading
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 13:10:51 +02:00
Alex Moreno 3f414e28cc Merge pull request '231801_test_to_dev' (!1507) from 231801_test_to_dev into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1507
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-08 11:06:47 +00:00
Alex Moreno e019ab4160 deploy(232001): add changes folder, package and changelog
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 12:40:52 +02:00
Alex Moreno dde62f8971 Merge pull request '231801_dev_to_test' (!1501) from 231801_dev_to_test into test
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1501
Reviewed-by: Vicent Llopis <vicent@verdnatura.es>
2023-05-08 10:29:06 +00:00
Alex Moreno 90465c275a correct folder
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 12:21:20 +02:00
Alex Moreno ad3c34bd35 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 231801_dev_to_test
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 12:08:00 +02:00
Alex Moreno ebbc860ba3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-08 12:03:53 +02:00
Juan Ferrer 68b1b6c5bd refs #5517 E2E fixes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 12:03:27 +02:00
Alex Moreno 7273dd4f1e Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 08:56:06 +00:00
Alex Moreno 73fb940c63 refs #5472 try change-password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 10:55:16 +02:00
Carlos Satorres 96b5749e1e refs #5297 cambio actual
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 10:17:35 +02:00
Carlos Satorres 2c6f71b4c4 Merge branch 'dev' 2023-05-08 10:16:57 +02:00
Alexandre Riera a2055d35fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5513-backs-embalajes
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:48:09 +02:00
Alexandre Riera 372b9a2ce2 refs #5513 test getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:46:56 +02:00
Alexandre Riera d21b949ffb refs #5513 fix getItemsPackaging
gitea/salix/pipeline/head This commit looks good Details
2023-05-08 09:18:53 +02:00
Carlos Satorres 7e63bc0004 refs #5297 quit fdescribe
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-08 09:18:22 +02:00
Juan Ferrer a51481c00e Merge pull request 'refs #5517 Fix e2e' (!1502) from 5517-e2eFix into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1502
2023-05-05 13:33:45 +00:00
Alex Moreno 728ef965c4 refs #5472 feat(out_login): change-password
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-05 14:50:20 +02:00
Alex Moreno 8423968013 Merge branch '5488-use_checkAccessAcl' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-05-05 14:13:13 +02:00
Alex Moreno 456e1d5912 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl 2023-05-05 14:11:47 +02:00
Alex Moreno 6b4b8565f9 Merge branch 'dev' into 5488-use_checkAccessAcl
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 11:58:57 +00:00
Alex Moreno 97da5e6e24 refs #5488 feat(isRoleAdvanced): use Acl instead of method
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 13:58:11 +02:00
Juan Ferrer 6f5c5963d0 refs #5517 fdescribe removed
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 13:03:01 +02:00
Juan Ferrer bfae4940f5 Merge branch '5517-e2eFix' of https://gitea.verdnatura.es/verdnatura/salix into 5517-e2eFix
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 13:00:48 +02:00
Juan Ferrer ea5b032b40 refs #5517 Travel create E2E fixes 2023-05-05 13:00:45 +02:00
Alex Moreno 030cedbb3c amend
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 12:24:03 +02:00
Alex Moreno 0f08ea1852 Merge branch '5517-e2eFix' of https://gitea.verdnatura.es/verdnatura/salix into 5517-e2eFix
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 12:22:40 +02:00
Alex Moreno ea3110dc2e refs #5517 test(e2e): fix ticket future and advance 2023-05-05 12:22:36 +02:00
Alex Moreno c5dcc39375 refs #5517 test(e2e): fix ticket future and advance
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 12:20:41 +02:00
Juan Ferrer 805e678ca7 Merge branch 'dev' into 5517-e2eFix
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 08:14:13 +02:00
Juan Ferrer 4a84961c19 refs #5517 Removed focus from test
gitea/salix/pipeline/head This commit looks good Details
2023-05-05 08:13:06 +02:00
Juan Ferrer a48e197e46 refs #5517 E2E fixes 2023-05-05 08:12:38 +02:00