Commit Graph

766 Commits

Author SHA1 Message Date
Sergio De la torre b4a2be660d fix: refs #6868 handleUser addIsOnReservationMode
gitea/salix/pipeline/pr-test This commit looks good Details
2024-10-01 07:08:11 +02:00
Ivan Mas 06f8f8e95e refactor: refs #7725 deprecate worker.isF11Allowed
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-22 08:39:19 +02:00
Alex Moreno ccb60eee87 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2024-09-19 12:42:12 +02:00
Jorge Penadés 22af34c0cb feat: refs #7323 use scopes
gitea/salix/pipeline/pr-master This commit looks good Details
2024-09-19 09:27:05 +02:00
Jorge Penadés 0a0701f7c2 Merge branch 'dev' into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-16 10:24:36 +00:00
Jorge Penadés 2dc55a706c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 09:20:57 +02:00
Sergio De la torre e80fe1d0dc feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-13 07:10:47 +02:00
Sergio De la torre 2d4e667009 feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-13 07:02:30 +02:00
Sergio De la torre 05b6c75a19 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-09-13 07:02:15 +02:00
Sergio De la torre 93e7163858 feat: refs #6868 refs# 6868 handleUser 2024-09-12 17:09:27 +02:00
Alex Moreno 1abf6a14f9 fix: workerDms filter workerFk 2024-09-12 13:26:09 +02:00
Jorge Penadés edccd95fa1 fix: refs #7828 rollback
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-09-12 10:29:03 +02:00
Jorge Penadés b2bc095caa fix: refs #7828 rollback
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 10:28:29 +02:00
Jorge Penadés 74fafdf330 fix: refs #7828 filter mail access
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 10:27:18 +02:00
Jorge Penadés 6f81ca08db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7828-makeCorrectCalls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-12 09:55:03 +02:00
Alex Moreno 9435ce8c5b Merge pull request '7182-workerDms_optimization' (!2946) from 7182-workerDms_optimization into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #2946
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
2024-09-12 07:28:07 +00:00
Jorge Penadés f1f10d1367 refactor: refs #7828 wip 2024-09-12 09:15:07 +02:00
Guillermo Bonet 728c40916c refactor: refs #7895 workerDocument to workerDms
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 14:38:58 +02:00
Alex Moreno c21da8d258 fix: refs #7182 function name 2024-09-11 10:31:43 +02:00
Alex Moreno fbfbf21e06 fix: refs #7182 unnesesary file
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-11 08:17:18 +02:00
Alex Moreno 8dc83e2444 feat: refs #7182 optimize workerDms filter 2024-09-11 08:16:21 +02:00
Sergio De la torre f7f7df55f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6868_createLogin 2024-09-11 08:00:07 +02:00
Alex Moreno 1aa888b1a3 feat(WorkerDms_filter): refs #7182 split code. fix: filter 2024-09-09 15:11:09 +02:00
Jorge Penadés ba2c5cb209 chore: refs #7323 filter data
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 17:49:45 +02:00
Jorge Penadés 18d93d93a6 chore: refs #7323 worker changes
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-06 10:40:16 +02:00
Sergio De la torre 36cf6b1aee feat: refs #6868 refs# 6868 handleUser
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-03 16:50:55 +02:00
Carlos Satorres 28a34fa5af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-09-02 14:07:01 +02:00
Jorge Penadés a733560649 feat: refs #7323 add locale
gitea/salix/pipeline/pr-test This commit looks good Details
2024-08-13 10:26:36 +02:00
Guillermo Bonet af62c2e807 fix: refs #7664 No insert editorFk 2024-07-25 08:57:18 +02:00
Alex Moreno a1f481deb1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 14:17:17 +02:00
Alex Moreno 021d315a01 fix: weeklyHourRecordEmail workerId prop and correct request in frontend
gitea/salix/pipeline/head This commit looks good Details
2024-07-17 13:30:47 +02:00
Alex Moreno b871615e8f fix: worker new if not has provinceFk
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 10:42:08 +02:00
Alex Moreno 4fa9f057de Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
gitea/salix/pipeline/pr-test This commit looks good Details
2024-07-16 07:41:21 +02:00
Alex Moreno 896d273da8 fix(worker_new): fix countryFk
gitea/salix/pipeline/pr-master This commit looks good Details
2024-07-12 12:06:37 +02:00
Jon Elias 4bdbb3b08e Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-03 07:13:21 +00:00
Sergio De la torre 5992d7f53f Merge branch 'dev' into 6861-Reservas-front
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 14:39:19 +00:00
Jon Elias 0e84749c07 Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 10:22:11 +00:00
Alex Moreno ebdd6bd08c fix merge dev
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-07-01 11:50:20 +02:00
Alex Moreno a26f6eaf21 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-07-01 11:32:21 +02:00
Jorge Penadés 2b0df02f20 Merge branch 'dev' into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-27 08:34:53 +00:00
Sergio De la torre cbc00b90b9 feat front-reservas refs #6861
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-26 14:02:25 +02:00
Jorge Penadés 1f6fd8d6d1 feat: refs #6286 check if is teamBoss
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 17:27:00 +02:00
Jorge Penadés 93f2995d39 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 16:26:13 +02:00
Carlos Satorres d1ed4b4459 refs #7409 fix back
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-25 16:03:59 +02:00
Carlos Satorres ffff851d1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome 2024-06-25 14:49:32 +02:00
Alex Moreno 95a23ad9fc Merge branch 'dev' into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
2024-06-25 11:43:42 +00:00
Carlos Satorres 424e0c430c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7409-workerIncome
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 09:50:29 +02:00
Carlos Satorres cf4a7c8fba Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7407-workerMedical
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 09:11:40 +02:00
Carlos Satorres a80b0c3b4c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7406-workerFormation
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-21 08:36:50 +02:00
Jon Elias 419de69690 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6436_jasmine_beforeAll
gitea/salix/pipeline/pr-dev This commit looks good Details
2024-06-20 12:24:06 +02:00