Commit Graph

1540 Commits

Author SHA1 Message Date
Alex Moreno 31eb2c86b5 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit looks good Details
2022-11-15 09:20:26 +00:00
Vicent Llopis b5f67425ff Merge branch 'dev' into jenkins_backTest_solved
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:54:05 +00:00
Alex Moreno 6fdcb52e2a Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-15 08:43:19 +00:00
Vicent Llopis 0637050375 fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-11-14 15:11:33 +01:00
Pau 9004839e00 Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 14:53:14 +01:00
Pau 01fe8c8997 requested changes 2022-11-10 14:53:08 +01:00
Alex Moreno 37d412bf3b refactor: delete unnecessary test
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 14:38:37 +01:00
Alex Moreno 32701794bc Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-10 13:34:43 +01:00
Pau c15d40b237 Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 08:45:15 +00:00
Pau 2704017486 check default true
gitea/salix/pipeline/head This commit looks good Details
2022-11-10 09:43:19 +01:00
Joan Sanchez 5a56fb4b6a Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1079
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-11-10 07:50:10 +00:00
Pau c4044ff70d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-10 07:40:14 +00:00
Guillermo Bonet 6804c1a756 Merge branch 'dev' into 4550-printServer
gitea/salix/pipeline/head This commit looks good Details
2022-11-09 16:55:29 +01:00
Guillermo Bonet 6744b3f797 added collection-label
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 14:40:38 +01:00
Pau f1e832ee66 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:06:30 +00:00
Pau 0da6bd44e7 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 07:06:27 +00:00
Pau 2df195764d Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head This commit looks good Details
2022-11-08 08:05:13 +01:00
Vicent Llopis b1eb7d469f fix: error duplicated key
gitea/salix/pipeline/head There was a failure building this commit Details
2022-11-07 09:51:33 +01:00
Alex Moreno 03ec8e27e6 feat(ticket_isEditable): use ticketWeekly
gitea/salix/pipeline/head This commit is unstable Details
2022-11-07 09:19:20 +01:00
Pau a975f37fc3 Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 07:27:15 +00:00
Alex Moreno 28edb2e53a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-11-04 08:09:15 +01:00
Pau 42dd56a78c Merge branch 'dev' into 4490-transfer-tickets-between-clients
gitea/salix/pipeline/head This commit looks good Details
2022-11-04 06:46:23 +00:00
Alexandre Riera 8e5f518eb6 refs #4753 texto y fecha sms cambiados
gitea/salix/pipeline/head This commit looks good Details
2022-11-03 14:16:11 +01:00
Alex Moreno e6e8f15d64 Merge branch 'dev' into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head This commit is unstable Details
2022-11-03 08:39:10 +00:00
Vicent Llopis 3cc89c170c Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 13:55:07 +00:00
Vicent Llopis 8a4aa6285b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3888-ticket.expedition_moveExpedition
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 14:49:39 +01:00
Joan Sanchez 34997b72f5 Merge branch 'dev' into 3811-ticket.sale_updatePrice
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 11:55:47 +00:00
Joan Sanchez 177b448441 Merge branch 'dev' into 4616-ticket.sale_mana
gitea/salix/pipeline/head This commit looks good Details
2022-11-02 06:42:35 +00:00
Alex Moreno e7047e982f fix e2e
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 15:07:22 +01:00
Alex Moreno b37c257885 feat(canEdit): use checkAccess
gitea/salix/pipeline/head This commit is unstable Details
2022-10-31 14:13:06 +01:00
Alex Moreno 445c6f1cc9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-28 09:32:08 +02:00
Pau c576e503cf fix httpBack.flush error 2022-10-27 09:05:05 +02:00
Pau 04514804b7 fix tests
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-27 08:51:22 +02:00
Pau d4a22f7962 Apply requested changes 2022-10-27 08:46:22 +02:00
Vicent Llopis c671540a7f refactor: renombrada variable
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 09:04:53 +02:00
Vicent Llopis d1e2b1f7d5 refactor: tranducciones 2022-10-26 09:02:54 +02:00
Vicent Llopis d4e2783630 refactor: corregidas traducciones, eliminado destroyAll y añadida transacción
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:39:07 +02:00
Vicent Llopis 925565d3d2 refator: borrada variable global y añadida Promesa al array
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:23:36 +02:00
Vicent Llopis a8dfc9d06f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-26 08:11:15 +02:00
Alex Moreno 342832c475 try
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 15:02:22 +02:00
Alex Moreno e1e13468a9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 11:58:43 +02:00
Alex Moreno 3fd10dfc64 Merge branch 'dev' into 4075-ticket_boxing
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:58:17 +00:00
Pau d937a1b505 Add acl
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:45:09 +02:00
Joan Sanchez 8f0b566935 Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk
gitea/salix/pipeline/head Something is wrong with the build of this commit Details
2022-10-25 07:25:07 +00:00
Pau a43e642ff7 Add transferclient
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-25 09:23:46 +02:00
Vicent Llopis f968b19d1e fix: testFront
gitea/salix/pipeline/head This commit looks good Details
2022-10-21 09:08:17 +02:00
Vicent Llopis c33cab7b10 fix: test back
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 09:01:08 +02:00
Vicent Llopis 2d0cb60b50 feat: check if uses mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:55:05 +02:00
Vicent Llopis e7261573d7 delete focus
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:01:22 +02:00
Vicent Llopis 6f31bea21f feat: update testBack
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-21 08:00:48 +02:00