verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity
18,470 Commits 259 Branches 0 Tags 122 MiB
Commit Graph

18470 Commits

Author SHA1 Message Date
Javier Segarra 08228c065c Merge pull request '#5878 - Remove . for This ticket is locked' (!1894) from 6172_transfer_ticket_message_error into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1894
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-12-20 11:14:33 +00:00
Javier Segarra acb0ec508f refs #5499 feat: claimObservation 2023-12-20 12:09:01 +01:00
Javier Segarra 01e6e7dc39 Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 11:02:00 +00:00
Javier Segarra cb35c36328 refs #6434 test: update tests
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 10:59:36 +00:00
Pablo Natek 2185b4ddc0 Merge branch 'dev' into 6259-ticketSmsJoinClientSms
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 09:57:18 +00:00
Javier Segarra 57b3d96628 refs #6434 fix: bad throw error
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 09:27:25 +00:00
Javier Segarra c3b91e1719 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 09:25:15 +00:00
Javier Segarra 19bd02f952 Merge pull request '#6264 - renewToken' (!1824) from 6264-renewToken into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1824
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-12-20 09:22:25 +00:00
Juan Ferrer 10bfafdd3c Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 09:05:53 +00:00
Alex Moreno 351a12204a Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 08:07:30 +00:00
David Domenech f33e343acb Merge pull request 'refs #6398' (!1896) from 6398-changes into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1896
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-12-20 08:01:09 +00:00
Guillermo Bonet 753c6e9ec5 feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 07:28:54 +01:00
Guillermo Bonet 516a3760a1 feat: refs #6582 Added traductions
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 07:27:13 +01:00
Alex Moreno e4dcdc0a72 refs #5739 feat(docker): run back tests
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 15:32:39 +01:00
Alex Moreno 7777696cf7 refs #6589 fix(worker_absences): fix started hours
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 13:58:08 +01:00
David Domenech 5936a129da refs #6398
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 12:58:20 +01:00
David Domenech 86f340248f Merge pull request 'fix: refs #6398 Changed alias of views' (!1895) from 6398-fix into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1895
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-12-19 10:04:56 +00:00
Guillermo Bonet 17e177b788 fix: refs #6398 Fix tests back
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 10:12:03 +01:00
David Domenech d60f2a7f88 fix: refs #6398 Changed alias of views
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 09:43:09 +01:00
Javier Segarra 5151cdca48 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-19 07:06:36 +00:00
Carlos Satorres 6ff7edfada Merge pull request '6220-addressFilter' (!1886) from 6220-addressFilter into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1886
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-12-18 11:45:09 +00:00
Carlos Satorres 22a9ffc163 refs #6291 dni
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 12:33:04 +01:00
Carlos Satorres e4de704b4c Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 11:16:58 +00:00
Javier Segarra 7723b244d0 Merge branch 'dev' into 6172_transfer_ticket_message_error
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 07:17:51 +00:00
Javier Segarra 1810377738 Merge pull request '#2051 - DMS unify methods' (!1888) from 2051_dms_methods_refactor into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-on: #1888
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-12-18 07:14:35 +00:00
Javier Segarra 8d650cf6c0 refs #6172 test: remove message code
gitea/salix/pipeline/head This commit looks good Details
2023-12-18 08:09:44 +01:00
Javier Segarra 1515b55f7d Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 12:06:07 +00:00
Javier Segarra 29a7d9b941 Merge branch '2051_dms_methods_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 13:01:47 +01:00
Javier Segarra dc98436b85 refs #2051 perf: rename variable 2023-12-15 13:01:44 +01:00
Javier Segarra c9af8cba81 refs #5878 feat: remove . for this message
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 12:50:05 +01:00
Alex Moreno d47a4a7c16 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-15 11:12:47 +00:00
Alex Moreno 356fe68696 refs #5914 fix: remove unnecessary translation
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 08:57:09 +01:00
Alex Moreno 59f2e3d0e6 refs #5914 fix: remove unnecessary
gitea/salix/pipeline/head Build queued... Details
2023-12-15 08:54:41 +01:00
Alex Moreno c755b1e6fa refs #5914 fix: correct sql version
gitea/salix/pipeline/head This commit looks good Details
2023-12-15 08:50:22 +01:00
Javi Gallego 3a37e6dfc8 Merge branch 'dev' into 3979-abonarTicketsSinAlmacen 2023-12-15 07:37:29 +01:00
Alex Moreno 21a1dbeae7 refs #5914 fix: ticket canBeInvoiced and optimized invoiceTickets
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 15:56:49 +01:00
Alex Moreno 1ce1af82fe Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 5914-hotFix-transferInvoice 2023-12-14 15:55:21 +01:00
Guillermo Bonet e89ec55839 fix: refs #6172
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 15:09:07 +01:00
Carlos Satorres fe184156a1 Merge branch 'dev' into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 13:51:09 +00:00
Carlos Satorres f73f3813b3 Merge branch '6220-addressFilter' of https://gitea.verdnatura.es/verdnatura/salix into 6220-addressFilter
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 14:37:22 +01:00
Carlos Satorres bbb9f58a9e refs #6220 fix(client_filter): fix where 2023-12-14 14:37:14 +01:00
Javier Segarra 043c411f68 Merge branch 'dev' into 2051_dms_methods_refactor
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 11:41:11 +00:00
Javier Segarra 9316c31180 refs #6264 perf: rename variable when destroy ids
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:36:36 +01:00
Javier Segarra 1939c65fab refs #6264 test: remove force describe for dms test 2023-12-14 12:35:54 +01:00
Javier Segarra d0af29c0c5 refs #6264 test: remove force describe for dms test
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:28:41 +01:00
Javier Segarra d2461d67c9 refs #6264 test: perf renew-token.spec.js
gitea/salix/pipeline/head This commit looks good Details
2023-12-14 12:25:40 +01:00
Javier Segarra acf192f7e4 Merge branch '6264-renewToken' of https://gitea.verdnatura.es/verdnatura/salix into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 12:21:12 +01:00
Javier Segarra 8d29850917 refs #6264 perf: remove UserError exception 2023-12-14 12:21:07 +01:00
Javier Segarra dddc749744 Merge branch 'dev' into 6264-renewToken
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 11:05:00 +00:00
Javier Segarra 61a323078b refs #6264 fix: remove DEFAULT_COURTESY_TIME
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-14 12:04:05 +01:00