Commit Graph

1267 Commits

Author SHA1 Message Date
Alex Moreno eaa62909ff chore: simplify 2024-12-09 14:30:45 +01:00
Alex Moreno 9403588d7b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test 2024-12-09 14:30:03 +01:00
Carlos Satorres fb40e25c7c fix: remove ctx 2024-12-02 10:47:44 +01:00
Carlos Satorres 4e6b83809b fix: workerHoliday hr 2024-12-02 10:29:12 +01:00
Carlos Satorres cf862202ff fix: hotfix 7323 createAbsence 2024-12-02 10:12:56 +01:00
Jorge Penadés b97058735c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile 2024-11-22 10:25:28 +01:00
Ivan Mas b2fa7e7caf Merge branch 'dev' into 7690-renameConfigTables 2024-11-21 09:11:06 +00:00
Alex Moreno 0ac46882be Merge branch 'dev' into 6924-NotifyOnlyToBoss 2024-11-21 06:54:00 +00:00
Jorge Penadés e125dee691 refactor: refs #7229 desestructure 2024-11-20 16:51:14 +01:00
Ivan Mas 0274c01c14 Merge branch 'dev' into 7690-renameConfigTables 2024-11-20 13:54:57 +00:00
Jorge Penadés 16111220fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7229-fixDownloadFile 2024-11-20 13:52:55 +01:00
Jorge Penadés bbb7815765 fix: refs #7229 set right urls 2024-11-20 13:52:24 +01:00
Carlos Satorres 7ab1b7d171 Merge branch 'dev' of https: refs #7529//gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT 2024-11-20 13:14:26 +01:00
Ivan Mas 715cea0670 Merge branch 'dev' into 7690-renameConfigTables 2024-11-19 15:07:03 +00:00
Jon Elias 492c79de46 Merge branch 'dev' into 6924-NotifyOnlyToBoss 2024-11-19 12:42:53 +00:00
Jon Elias f145649fc7 fix: refs #6924 requested change 2024-11-19 13:40:31 +01:00
Jorge Penadés f89080d373 fix: refs #7323 add remaining fields 2024-11-19 11:53:12 +01:00
Ivan Mas 2a1c0ef2af Merge branch 'dev' into 7690-renameConfigTables 2024-11-15 13:35:14 +00:00
Ivan Mas 6a11416838 refactor: refs #7690 copy acls and remove worker-time-control-params.json 2024-11-15 14:30:32 +01:00
Jon Elias 7be1bc385f perf: refs #6924 deleted useless relation 2024-11-14 08:35:28 +01:00
Jon Elias ea4adbea85 refactor: refs #6924 deleted department check 2024-11-13 08:45:44 +01:00
Ivan Mas 20bd426704 refactor: refs #7690 unify workerTimeControlParams with workerTimeControlConfig 2024-11-12 17:25:05 +01:00
Jon Elias 25891e0bad feat: refs #6924 notify absences only to department boss 2024-11-11 10:42:06 +01:00
Pablo Natek 50a73c98a2 feat: refs #7743 add try catch stmt to the test 2024-11-11 08:12:07 +01:00
Pablo Natek d6349f113c feat: refs #7743 add simple spec for sendMail 2024-11-11 08:06:22 +01:00
Carlos Satorres e0e487859f fix: refs #7529 fix models 2024-10-29 13:59:47 +01:00
Carlos Satorres 6b10f60933 fix: refs #7529 mod model 2024-10-29 08:03:18 +01:00
Carlos Satorres 248ae64872 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT 2024-10-28 13:31:37 +01:00
Jorge Penadés d8e241740f feat: refs #7524 restrict fields 2024-10-27 13:47:52 +01:00
Jorge Penadés 8f10260795 feat: refs #7943 return just the required content 2024-10-25 11:37:45 +02:00
Carlos Satorres 0a726a8fe7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT 2024-10-18 11:16:06 +02:00
Carlos Satorres 37d3ef5f16 Merge branch 'dev' into 7986-workerMoto 2024-10-16 12:10:13 +00:00
Carlos Satorres 099fe8f950 fix: refs #7986 fix model 2024-10-15 14:42:35 +02:00
Alex Moreno 5b938a6f78 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-10-15 08:00:39 +02:00
Jorge Penadés f3b5a70b67 feat: refs #7323 show right error 2024-10-14 14:41:25 +02:00
Carlos Satorres 68469e2ba8 Merge branch 'dev' of https: refs #7986//gitea.verdnatura.es/verdnatura/salix into 7986-workerMoto 2024-10-14 13:52:08 +02:00
Sergio De la torre 06b7d56837 fix: refs #6861 assignCollection&isOnReservationMode 2024-10-14 13:01:30 +02:00
Carlos Satorres 39e808bca7 fix: refs #7986 fix model 2024-10-08 16:06:38 +02:00
Jorge Penadés 3755c5a15b Merge branch 'dev' into 7207-showPbx 2024-10-07 14:27:09 +00:00
Jorge Penadés 23d2d2b1ea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7207-showPbx 2024-10-03 15:39:37 +02:00
Carlos Satorres 60375d153f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7529-workerPIT 2024-10-03 13:02:07 +02:00
Jorge Penadés 0311069f00 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-03 07:16:55 +00:00
Sergio De la torre b4a2be660d fix: refs #6868 handleUser addIsOnReservationMode 2024-10-01 07:08:11 +02:00
Jorge Penadés 5e56034105 fix: refs #7323 rollback 2024-09-26 09:48:07 +02:00
Jorge Penadés 1c42303a75 chore: refs #7207 drop useless relation 2024-09-25 09:18:10 +02:00
Jorge Penadés 78b500e452 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker 2024-09-24 10:15:25 +02:00
Jorge Penadés 6ff76fd74b feat: refs #7207 show queue in worker summary 2024-09-23 14:40:38 +02:00
Jorge Penadés 8ff0dc06fe Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 7323-fineTunningWorker 2024-09-23 09:29:51 +02:00
Ivan Mas 06f8f8e95e refactor: refs #7725 deprecate worker.isF11Allowed 2024-09-22 08:39:19 +02:00
Alex Moreno ccb60eee87 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2024-09-19 12:42:12 +02:00