Commit Graph

21561 Commits

Author SHA1 Message Date
Jorge Penadés 0998b5bf2c add locale and refactor: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 13:58:33 +01:00
Javier Segarra 774514f8c7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5858-fiscalData-validations
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 13:13:56 +01:00
Javier Segarra 6b37f23349 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5666-loggable_to_mixin
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 13:06:52 +01:00
Javier Segarra ec9e1e6d43 refs #5878 test: update test 2023-12-21 13:06:32 +01:00
Javier Segarra 100936d40b Merge branch 'dev' into 5858-zone_Collisions
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 12:05:27 +00:00
Carlos Satorres 73d1c1698b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6291-comprobarDNI 2023-12-21 12:38:58 +01:00
Alex Moreno 9951e911ae refs #5925 feat(docuware_upload): use userConfig.tabletFk
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 10:39:46 +01:00
Javier Segarra dc661f298b refs #6434 test: update tests
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 09:10:18 +00:00
Guillermo Bonet 0f20f95dc5 refactor: refs #6433 Deleted isPreviousPrepared* columns in model
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 10:08:17 +01:00
Alex Moreno d30dcd7d70 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5925-docuwareTablet 2023-12-21 09:22:49 +01:00
Javier Segarra 0feb8e5a16 Merge branch '6434-signIn_issue' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 09:01:07 +01:00
Javier Segarra daef9ee59a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6434-signIn_issue 2023-12-21 09:01:02 +01:00
Jorge Penadés f384616d69 move changes: refs #6274
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 08:57:46 +01:00
Jorge Penadés f5cc2cd75b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 08:38:33 +01:00
Alex Moreno 38279b0786 refs #6594 deploy: init version 24.02
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 08:37:30 +01:00
Alex Moreno f4489a7b56 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-12-21 08:34:44 +01:00
Alex Moreno 7b0c5fe0a0 refs #5739 fix: sql
gitea/salix/pipeline/head This commit looks good Details
2023-12-21 08:33:50 +01:00
Javier Segarra 3c8ff346e2 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 06:58:09 +00:00
Alex Moreno 7b65ebb58b Merge branch 'dev' into 5854-itemShelvingTraduciones
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-21 06:50:45 +00:00
Alex Moreno 3094c330df Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2023-12-21 07:47:07 +01:00
Alex Moreno f2dcbe214a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into test 2023-12-21 07:44:41 +01:00
Guillermo Bonet f64cddd374 Merge pull request 'feat: refs #6582 routesMonitorTraduction' (!1899) from 6582-routesMonitorTraduction into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1899
Reviewed-by: Carlos Andrés <carlosap@verdnatura.es>
2023-12-20 13:56:35 +00:00
Javier Segarra adc7608b25 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5499_claim_rocketMessage_comercial
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 14:40:42 +01:00
Javier Segarra 748d4724b5 Merge branch 'dev' into 6434-signIn_issue
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 13:29:29 +00:00
Javier Segarra 5c5be788c1 refs #5499 feat: trigger for all changes
gitea/salix/pipeline/head There was a failure building this commit Details
2023-12-20 14:08:11 +01:00
Guillermo Bonet 5f83fc158c Merge branch 'dev' into 6582-routesMonitorTraduction
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 13:03:57 +00:00
Jorge Penadés 542b09073e changes moved: refs #6274
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 14:02:05 +01:00
Jorge Penadés 5d75592627 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6274-loginWorkerTimeControl
gitea/salix/pipeline/head This commit looks good Details
2023-12-20 12:19:10 +01:00
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
Javier Segarra d864dfd899 refs #5878 test: init test 2023-12-20 06:45:40 +01:00
Pablo Natek c10a79493a Merge branch '6005-backupLabeler' of https://gitea.verdnatura.es/verdnatura/salix into 6005-backupLabeler
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2023-12-19 14:07:48 +01:00
Pablo Natek 88739542fe move(version): refs #6005 move backupLabeler 2023-12-19 14:07:46 +01:00
Pablo Natek 3e2cac5544 Merge branch 'dev' into 6005-backupLabeler 2023-12-19 14:05:45 +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
Javier Segarra 3e30e77728 Merge branch '5858-zone_Collisions' of https://gitea.verdnatura.es/verdnatura/salix into 5858-zone_Collisions
gitea/salix/pipeline/head This commit looks good Details
2023-12-19 12:57:59 +01:00
Javier Segarra 38a5337f68 refs #5858 test: execute test 2023-12-19 12:57:10 +01:00
Javier Segarra 243319b113 refs #5858 feat zoneIncludedCheck model 2023-12-19 12:55:27 +01:00