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 |
Alex Moreno
|
f84e85e443
|
Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-20 09:48:34 +02:00 |
Jorge Penadés
|
6967aa9811
|
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-19 13:40:09 +02:00 |
Carlos Satorres
|
e404688042
|
refs #7407 create models
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-18 10:12:22 +02:00 |
Alex Moreno
|
e8c7b55329
|
fix(WorkerIncome): refs #7409 fix models
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-17 14:17:43 +02:00 |
Carlos Satorres
|
fa8c1b3879
|
acls, fixtures, models
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-17 13:50:07 +02:00 |
Jorge Penadés
|
4bc62a30bd
|
fix: refs #6744 back test
gitea/salix/pipeline/pr-master This commit looks good
Details
|
2024-06-17 12:23:01 +02:00 |
Carlos Satorres
|
54b6ef491f
|
refs #7409 back
|
2024-06-17 10:23:30 +02:00 |
Guillermo Bonet
|
9b80ef73a8
|
Merge branch 'test' into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2024-06-14 12:48:00 +02:00 |
Carlos Satorres
|
189c67bd2d
|
warmFix change if
gitea/salix/pipeline/pr-test This commit looks good
Details
|
2024-06-14 09:43:10 +02:00 |
Jon Elias
|
61a588b57c
|
refactor: refs #6436 fixed test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-14 08:39:57 +02:00 |
Jorge Penadés
|
784bd91e04
|
fix: refs #6286 update WorkerTimeControl permissions
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-13 13:43:28 +02:00 |
Jorge Penadés
|
7480f5ecb3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6286-setRightWorkerTimeControlAcls
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-12 16:54:03 +02:00 |
Jon Elias
|
84a51d3e8d
|
feat: refs #6436 changed tests
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-12 12:23:37 +02:00 |
Jon Elias
|
944355d54f
|
refactor: refs #6436 end first wave of changes in modules
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-11 13:17:19 +02:00 |
Alex Moreno
|
3b44bdd2bf
|
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-11 12:56:56 +02:00 |
Jon Elias
|
7df7382346
|
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-11 09:41:26 +02:00 |
Jon Elias
|
f0ad012835
|
refactor: refs #6436 first wave
|
2024-06-11 09:39:06 +02:00 |
Carlos Satorres
|
1a01b3e587
|
refs #7529 back models acls
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-10 10:42:52 +02:00 |
Jorge Penadés
|
479e4f3f8a
|
feat: refs #6273 required payMethod for internals
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 13:55:56 +02:00 |
Jorge Penadés
|
310c2383cb
|
fix: refs #6286 replace id for reason
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 09:08:21 +02:00 |
Jorge Penadés
|
1912fdd45d
|
refactor: refs #6286 replace name
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-06 17:26:23 +02:00 |
Jorge Penadés
|
14afd8246a
|
feat: refs #6273 add back test
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-05 17:38:48 +02:00 |
Jorge Penadés
|
8188bdbcb0
|
fix: refs #6273 use userId
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-05 17:12:37 +02:00 |
Jorge Penadés
|
a79285cd3d
|
feat: refs #6273 register freelance
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-06-05 16:27:00 +02:00 |
Alex Moreno
|
bbf027ede5
|
fix(operator): neq error
|
2024-06-03 15:01:06 +02:00 |
Carlos Satorres
|
b95009899c
|
refs #7406 fix back
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-28 12:22:11 +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 |
Carlos Satorres
|
578b8a2c71
|
refs #7406 changes sql, modelconfig model
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 14:28:13 +02:00 |
Carlos Satorres
|
208409acb2
|
refs #7406 add relation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 11:50:15 +02:00 |
Carlos Satorres
|
723327918b
|
refs #7406 worker formation
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 15:55:23 +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
|
4cf5457690
|
fix: refs #7187 remove focus on spec
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 14:01:41 +02:00 |
Pablo Natek
|
1abacdc42b
|
fix: refs #7187 method
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-16 14:00:42 +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
|
b902a1a7f7
|
Merge branch 'dev' into 5919-locker
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-13 12:02:17 +00: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 |
Carlos Satorres
|
0f52fe65d3
|
refs #7360 fix error weekly
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-09 09:46:40 +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
|
7b298c1baf
|
refs #6882 fix tback
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 12:24:05 +02: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 |
Carlos Satorres
|
8a7d124066
|
refs #6882 fix traductions
gitea/salix/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-08 12:17:44 +02:00 |
Carlos Satorres
|
0709a64dca
|
refs #6882 fix back
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 12:05:47 +02:00 |
Carlos Satorres
|
269c42e5c9
|
Merge branch '6682-notHolidays' of https://gitea.verdnatura.es/verdnatura/salix into 6682-notHolidays
gitea/salix/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 11:47:06 +02:00 |
Carlos Satorres
|
c355595384
|
refs #6882 fix back, tback te2e
|
2024-05-08 11:47:04 +02: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 |