Commit Graph

281 Commits

Author SHA1 Message Date
Alex Moreno bbf027ede5 fix(operator): neq error 2024-06-03 15:01:06 +02:00
Alex Moreno 8ec2a10cbf deploy: dump
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-28 12:05:09 +02:00
Pablo Natek 86a6211cd8 fix: refs #7187 fix duplicate
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-23 12:23:31 +02:00
Pablo Natek 2142b78deb feat: refs #7187 Add support for multiple PDAs per user
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-21 19:25:18 +02:00
Carlos Satorres cbbd488674 Merge pull request 'refs #7396 fix worker model' (!2474) from 7396-addBasicDataWorker into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-20 06:27:33 +00:00
Carlos Satorres dd7ee27e9b refs #7396 fix worker model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-17 14:28:28 +02:00
Pablo Natek 1372f817bd fix: refs #7187 model
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:05:22 +02:00
Pablo Natek b299e842b9 fix: refs #7187 model foreignKey
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-16 14:04:21 +02:00
Pablo Natek b41104432c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 13:57:55 +02:00
Pablo Natek bcb3ea4837 feat: refs #7187 new method available pda
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-16 10:23:33 +02:00
Jorge Penadés 1f39330041 fix: refs #5919 drop focus 2024-05-13 14:00:19 +02:00
Jorge Penadés e16e5e3db3 feat: refs #5919 back test 2024-05-13 13:19:28 +02:00
Pablo Natek a797fca2dd feat: refs #7187 merge dev
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-13 08:30:20 +02:00
Jorge Penadés 8943bc7115 fix: refs #5919 back tests 2024-05-10 14:04:34 +02:00
Jorge Penadés af11bb8663 feat: refs #5919 hook 2024-05-10 13:04:12 +02:00
Jorge Penadés 7f4965879c fix: refs #5919 get locker by relation 2024-05-09 15:54:34 +02:00
Pablo Natek 98e28b8d50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7187-addPdaFreelancers 2024-05-09 09:09:00 +02:00
Jorge Penadés dc45527e1d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-09 08:45:17 +02:00
Carlos Satorres f64e899061 Merge pull request 'refs #6882 absence' (!2271) from 6682-notHolidays into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2271
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:27:20 +00:00
Carlos Satorres fa2c4de562 Merge pull request 'refs #6842 worker' (!2404) from 6842-errorCalendar into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2404
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-08 10:21:19 +00:00
Jorge Penadés 26ff5e8fa9 feat; refs #5919 WIP acls 2024-05-08 11:03:18 +02:00
Jorge Penadés d0c9e83504 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-08 10:35:07 +02:00
Carlos Satorres c0b4a931a6 Merge branch 'dev' into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 07:55:26 +00:00
Carlos Satorres 8637488fc1 refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-08 08:48:19 +02:00
Guillermo Bonet 6e9ea9665d Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details
2024-05-07 13:18:46 +02:00
Guillermo Bonet 0d7d4917a7 Merge branch 'master' into test 2024-05-07 13:18:28 +02:00
Jorge Penadés 0f5e2dcc54 fix: refs #6938 rollback
gitea/salix/pipeline/pr-master This commit looks good Details
2024-05-07 11:47:22 +02:00
Carlos Satorres 19c729d5fd Merge branch 'dev' into 6842-errorCalendar
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-07 06:55:05 +00:00
Carlos Satorres fe300f0f24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev Build queued... Details
2024-05-06 09:26:14 +02:00
Carlos Satorres e15b8eee30 refs #6842 worker
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-05-03 14:54:12 +02:00
Pablo Natek 699684bd65 feat: refs #7187 add sim column to the model and id 2024-05-03 14:22:48 +02:00
Pablo Natek 4c55ae40ef Merge pull request 'test' (!2402) from test into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-dev This commit looks good Details
Reviewed-on: #2402
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-05-03 10:58:42 +00:00
Pablo Natek 6152820078 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into 6005-fix-runtime-error 2024-05-03 12:47:14 +02:00
Pablo Natek 48bfba71de fix: refs #6005 runtime
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-03 12:33:59 +02:00
Carlos Satorres f77cf619db refs #6682 holidays conditional
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-05-03 12:27:19 +02:00
Pablo Natek 8b11a4a290 fix: refs #6005 time issue
gitea/salix/pipeline/pr-test This commit looks good Details
2024-05-03 12:08:22 +02:00
Jorge Penadés 63655a4dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-05-02 08:58:51 +02:00
Jorge Penadés 8adb52aac4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5919-locker 2024-04-29 09:24:10 +02:00
Guillermo Bonet 1044a24bc7 refactor: #6997 Deleted vn.client.eypbc
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-23 12:00:23 +02:00
Javier Segarra f6199f8f8e Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:56:05 +00:00
Javier Segarra 283d27e1c5 Actualizar modules/worker/back/models/worker.json
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-22 06:22:36 +00:00
Javier Segarra 30d0db163e feat(salix): refs #6930 minor updates 2024-04-19 10:50:14 +02:00
Jorge Penadés 3e1218463c fix: refs #6938 filters & scope
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-15 14:44:18 +02:00
Jorge Penadés d7b06fe637 fix: refs #6938 scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 12:47:27 +02:00
Jorge Penadés 200cbd8d74 fix: refs #6938 acls & scope
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 11:03:57 +02:00
Jorge Penadés a68b8431c5 feat: refs #6938 add scope & acls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-04-15 10:21:59 +02:00
Pablo Natek da037c5235 refactor: refs #6005 delay on productionConfig 2024-04-09 13:34:33 +02:00
Pablo Natek 638b715ee5 fix: refs #6005 move logic to hook
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-04-09 09:30:28 +02:00
Pablo Natek 4b4aaa9e10 feat: refs #6005 move logic from report to hook 2024-04-05 08:04:53 +02:00
Pablo Natek e3b7c7bb60 Merge branch 'dev' into 6005-backupLabeler
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-03-14 09:39:13 +00:00