Commit Graph

356 Commits

Author SHA1 Message Date
Carlos Satorres 3df0508c8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-12-03 11:31:41 +01:00
Alex Moreno 6fcfb0208d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2024-12-03 08:29:21 +01:00
Jorge Penadés 9573090318 chore: refs #6818 rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 14:49:35 +01:00
Jorge Penadés 66a87f1997 feat: refs #6818 add current country prefix
gitea/salix/pipeline/pr-master This commit looks good Details
2024-12-02 13:33:39 +01:00
Jorge Penadés fc4f5b55f7 fix: refs #6818 update country & channel 2024-12-02 12:59:37 +01:00
Ivan Mas 6d315bf84d refactor: refs #7146 route.created to route.dated
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-28 17:29:39 +01:00
Carlos Satorres 58cc28efaa fix: refs #4774 fix translation back
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-26 12:40:25 +01:00
Carlos Satorres 9a3934c572 Merge branch 'dev' of https: refs #4774//gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-26 10:27:49 +01:00
Javi Gallego 41b3f34158 fix: refs #7821 alias
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-21 16:38:11 +01:00
Javi Gallego 53673f43b8 Merge branch 'dev' into 7821-entryIsBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-21 16:20:25 +01:00
Carlos Andrés 770ace0f8e Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good Details
2024-11-21 16:11:42 +01:00
Carlos Andrés 0870a1c3d6 refs#8087 Redadas en travel test
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-21 15:09:58 +01:00
Javi Gallego 80851e094d Merge branch 'dev' into 7821-entryIsBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-21 13:28:54 +01:00
Ivan Mas 0274c01c14 Merge branch 'dev' into 7690-renameConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-20 13:54:57 +00:00
Carlos Satorres 7ab1b7d171 Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-20 13:14:26 +01:00
Ivan Mas 715cea0670 Merge branch 'dev' into 7690-renameConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-19 15:07:03 +00:00
Carlos Andrés 63c0747304 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-19 13:52:12 +01:00
Sergio De la torre d21b42a567 feat: refs #8099 refs#8099 addComplmentSalary
gitea/salix/pipeline/pr-test This commit looks good Details
2024-11-19 11:24:00 +01:00
Javi Gallego a40a5a22ab fix: refs #7821 fixtures without raid
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-18 14:27:38 +01:00
Javi Gallego 72415a4348 Merge branch 'dev' into 7821-entryIsBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-18 12:49:59 +01:00
Ivan Mas 2a1c0ef2af Merge branch 'dev' into 7690-renameConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-15 13:35:14 +00:00
Guillermo Bonet 48ffb80094 Merge branch 'dev' into 7920-itemShelving
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-15 06:40:41 +00:00
Jorge Penadés 4b659c0b48 fix: refs #6818 use right col type
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 16:39:35 +01:00
Jorge Penadés f96b914649 fix: refs #6818 use right col type 2024-11-14 16:39:26 +01:00
Jorge Penadés a37332f7be fix: refs #6818 add defaultChannel
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-14 11:18:38 +01:00
Jorge Penadés c8ab5d4344 fix: refs #6818 add defaultChannel
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-14 11:16:45 +01:00
Guillermo Bonet 9d5ef3eeb0 Merge branch 'dev' into 7920-itemShelving
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-13 10:16:57 +00:00
Carlos Satorres ac92a10167 Merge branch 'dev' of https: refs #4774//gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-13 09:43:17 +01:00
Jorge Penadés f52041eeff Merge branch 'dev' into 6818-saySimpleIntegration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-13 08:22:40 +00:00
Guillermo Bonet c2381f0feb refactor: refs #7920 Main change
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-13 07:42:58 +01:00
Ivan Mas 870882cdc1 Merge branch 'dev' into 7690-renameConfigTables
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-12 16:27:19 +00:00
Ivan Mas 20bd426704 refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-12 17:25:05 +01:00
Carlos Andrés 69d6e4a104 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 8087-nuevosCamposTravel
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-12 16:24:05 +01:00
Javi Gallego ea45d1da0a Merge branch 'dev' into 7821-entryIsBooked
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-12 09:30:40 +01:00
Pako Natek 76d072e00f fix: more data for fixture.before
gitea/salix/pipeline/pr-dev Build queued... Details
2024-11-12 08:28:26 +01:00
Jorge Penadés 186312702d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6818-saySimpleIntegration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-11 16:41:37 +01:00
Carlos Andrés cf102699d5 feat: refs#8087 Redadas en travel
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-11 14:19:11 +01:00
Alex Moreno 9f763ebae7 Merge branch 'dev' into 6828-supplier_companySize
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-11 12:41:43 +00:00
Guillermo Bonet 0dc77851c0 fix: refs #4948 Tests
gitea/salix/pipeline/head This commit looks good Details
2024-11-11 11:34:37 +01:00
Alex Moreno f7a29cd9c7 feat(Supplier): refs #6828 add companySize
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-11 10:32:17 +01:00
Carlos Satorres 0437756256 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4774-translationsVn
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-11-11 07:15:22 +01:00
Jorge Penadés 6ef1f950d1 feat: refs #6818 add config table 2024-11-08 17:47:10 +01:00
Jorge Penadés 9b28cf9130 feat: refs #6818 add records
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-08 12:51:09 +01:00
Jorge Penadés 6927f4b28d feat: refs #6818 saysimple integration
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-08 11:51:00 +01:00
Carlos Satorres c5afde3334 Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-07 12:48:05 +01:00
Alex Moreno 85ded59cb3 refactor: refs #6920 add correct role
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-11-04 13:46:54 +01:00
Carlos Satorres e0e487859f fix: refs #7529 fix models
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-29 13:59:47 +01:00
Carlos Andrés 66a5708efb Merge pull request 'feat: refs #8087 Traspasar redadas a travels' (!3147) from 8087-nuevoCampoTravel into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #3147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-10-28 14:41:01 +00:00
Carlos Satorres 75abc3c865 fix: refs #4774 back id + remove
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-28 11:52:56 +01:00
Javi Gallego fa9451ea38 feat: refs #7821 isBooked with grants
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-10-25 16:15:13 +02:00