 Alex Moreno
|
d43b70c971
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:30:28 +02:00 |
|
Alex Moreno
|
cf36b10763
|
refs #4815 feat: add serialNumber in deviceLog
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 14:29:48 +02:00 |
|
Alex Moreno
|
d16ae47712
|
Merge branch 'dev' into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 11:01:25 +00:00 |
 Carlos Satorres
|
c7f84ad6db
|
refs #5843 add return
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 10:36:51 +02:00 |
 Pablo Natek
|
c175bcfc97
|
refs #6159 rename spec
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 09:40:37 +02:00 |
|
Pablo Natek
|
1357b60b9b
|
refs #6159 fixFixtures
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-22 09:14:08 +02:00 |
|
Carlos Satorres
|
1f1dfae7e3
|
refs #5843 changes models
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 12:50:07 +02:00 |
|
Carlos Satorres
|
cd20a2d06d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-21 07:32:19 +02:00 |
|
Pablo Natek
|
66e851b5ea
|
refs #4131 changeStateRefactor
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-13 19:48:58 +02:00 |
|
Carlos Satorres
|
544259df9a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-09-11 10:47:21 +02:00 |
 Jorge Penadés
|
48a6bf2969
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-09-08 08:05:17 +02:00 |
|
Jorge Penadés
|
427425a750
|
ref #6119 simplifiy component
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-07 09:50:13 +02:00 |
|
Carlos Satorres
|
4918e3ccc7
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5843-quitUserFk2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-06 14:02:53 +02:00 |
|
Carlos Satorres
|
7025326e06
|
Merge branch 'dev' into 6044-fixTickCalendar
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-04 10:31:08 +00:00 |
|
Jorge Penadés
|
f46d6355dd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 6119-addMicrosipLink
|
2023-09-04 08:06:47 +02:00 |
|
Jorge Penadés
|
52d698b0eb
|
ref#6119 link fixed
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-09-01 12:38:35 +02:00 |
|
Carlos Satorres
|
9b971abb55
|
refs #6044 class scss
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 11:49:08 +02:00 |
 Sergio De la torre
|
00201197cc
|
Merge branch 'dev' into 4815-deviLogModel
gitea/salix/pipeline/head This commit looks good
Details
|
2023-09-01 05:24:55 +00:00 |
|
Jorge Penadés
|
c2a54b8c65
|
ref #6119 vnLinkPhone created
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-31 13:02:56 +02:00 |
|
Jorge Penadés
|
05f0f72c73
|
refs #6119 microsip link added
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-30 14:14:48 +02:00 |
|
Carlos Satorres
|
0b9199688e
|
refs #5843 userFk remove and vchange
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-30 12:48:57 +02:00 |
 Vicent Llopis
|
00b1746fd8
|
Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-25 11:32:58 +00:00 |
|
Vicent Llopis
|
b304210e8f
|
Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-25 08:47:12 +00:00 |
|
Vicent Llopis
|
c4cf5f3a4f
|
Merge branch 'dev' into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-25 08:04:42 +00:00 |
|
Vicent Llopis
|
9da5c4c1db
|
refs #5918 refacotr: cambiado nombre variable
|
2023-08-25 10:04:27 +02:00 |
|
Vicent Llopis
|
9a12169ba4
|
Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 07:33:07 +00:00 |
|
Vicent Llopis
|
beeebbdf9c
|
refs #6013 refactor: siempre se crea una tranacción para cada dia
gitea/salix/pipeline/head Build queued...
Details
|
2023-08-24 09:33:58 +02:00 |
|
Vicent Llopis
|
1f63648697
|
refs #5918 fix: muestra los botones en una línea y no carga todos los datos de workerTimeControlMail de la semana
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-24 09:10:04 +02:00 |
|
Vicent Llopis
|
f8fd2bbd17
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5918-worker.time-control_resend
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-24 07:50:24 +02:00 |
|
Vicent Llopis
|
3cffdca0c7
|
Merge branch 'dev' into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-24 05:39:48 +00:00 |
|
Vicent Llopis
|
dad792cb76
|
refs #5244 move changes sql
gitea/salix/pipeline/head Build queued...
Details
|
2023-08-24 07:40:37 +02:00 |
|
Alex Moreno
|
7349d4496f
|
refs #5351 hotFix(worker_sip): use worker.id not worker.userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-23 07:34:01 +02:00 |
|
Vicent Llopis
|
dd1dbcbd4a
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 13:39:09 +02:00 |
|
Vicent Llopis
|
c7c17e6e4a
|
Merge branch 'dev' into 6013-sendMail_fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-22 11:18:08 +00:00 |
|
Carlos Satorres
|
b1b6bd13ea
|
refs #5843 change userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-22 10:45:41 +02:00 |
|
Sergio De la torre
|
8d0b3efa11
|
refs #4815 feat:DeviceLog Model
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-14 09:39:40 +02:00 |
|
Sergio De la torre
|
a6047d257b
|
refs #5134 feat:modelsSalix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-11 12:45:18 +02:00 |
|
Alex Moreno
|
4191d2529d
|
refs #5712 warnFix: getById condition
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-07 07:57:38 +02:00 |
|
Carlos Satorres
|
3388fd7c59
|
fix test back
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-03 10:26:29 +02:00 |
|
Carlos Satorres
|
4fb0ad415c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head Build queued...
Details
|
2023-08-03 10:03:15 +02:00 |
|
Carlos Satorres
|
183fdacefc
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5640-mayusFiscalDate
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-08-03 10:01:11 +02:00 |
|
Alex Moreno
|
fd9b842e6f
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2023-08-02 13:58:40 +02:00 |
|
Alex Moreno
|
56cd94feaa
|
refs #5843 fix(timeControl_filter): not use userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-02 13:26:42 +02:00 |
|
Alex Moreno
|
b8780dfbbf
|
Merge branch 'master' into hotifx-loadDataDepartment
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-01 12:12:17 +00:00 |
|
Carlos Satorres
|
40607a42cf
|
hotfix-loadData
gitea/salix/pipeline/head This commit looks good
Details
|
2023-08-01 10:25:44 +02:00 |
|
Vicent Llopis
|
81dc163819
|
ya no muestra error en el front
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-28 14:40:03 +02:00 |
|
Alex Moreno
|
e253dd7982
|
refs #5351 fix(worker_model): remove required userFk
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-28 14:39:01 +02:00 |
|
Vicent Llopis
|
251ed36eca
|
refs #6013 feat: mostrar error en el mail
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-28 10:51:48 +02:00 |
|
Carlos Satorres
|
af60412232
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5660-changeRolDeliveryAssistant
|
2023-07-27 17:24:50 +02:00 |
|
Vicent Llopis
|
0054f2d82f
|
refs #6013 fix: codigo no bloqueante
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-27 15:07:10 +02:00 |
|
Vicent Llopis
|
7367d1cdfe
|
refs #6013 fix: add await
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-27 14:41:53 +02:00 |
|
Vicent Llopis
|
8267daef3a
|
refs #5918 fix: permite reenviar el correo si ha dado fallo
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-21 12:58:44 +02:00 |
|
Alex Moreno
|
23308d7ae3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
|
2023-07-21 12:40:59 +02:00 |
|
Vicent Llopis
|
d6a27741b5
|
a
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-20 09:50:56 +02:00 |
|
Vicent Llopis
|
04ca5743a2
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-20 09:40:41 +02:00 |
|
Alex Moreno
|
8c84f006b0
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-20 07:15:30 +02:00 |
|
Carlos Satorres
|
6f3cdd3508
|
refs #5640 fix e2e back
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-17 12:30:48 +02:00 |
|
Carlos Satorres
|
b113052b5c
|
refs #5640 fixtures and test fix
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-14 13:48:36 +02:00 |
|
Vicent Llopis
|
6980392ba1
|
fix: tabulacion
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-14 13:11:09 +02:00 |
|
Vicent Llopis
|
5716acaa3c
|
fix: test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-14 13:01:31 +02:00 |
|
Vicent Llopis
|
4f183d1c6a
|
fix: worker.basic-data el boton guardar estava activo al hacer F5
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-14 12:18:41 +02:00 |
|
Vicent Llopis
|
4a7cfe9122
|
fix: workCenter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-14 11:51:15 +02:00 |
|
Vicent Llopis
|
75a66571ba
|
refs #5244 refactor: modificados todos los url='activeWith...'
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 12:59:39 +02:00 |
|
Vicent Llopis
|
c876719a5c
|
refs #5244 fix: corregidos errores
|
2023-07-13 12:59:02 +02:00 |
|
Vicent Llopis
|
1d7f0e2135
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 11:42:49 +02:00 |
|
Vicent Llopis
|
01dc26f64e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-13 09:42:53 +02:00 |
|
Vicent Llopis
|
954c2f5435
|
refs #5244 feat: carga valor inicial
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-12 13:12:51 +02:00 |
|
Vicent Llopis
|
bd85cf4e90
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-12 12:29:17 +02:00 |
|
Vicent Llopis
|
a831a1534b
|
Merge branch 'dev' into 4770-routes_roadmap2
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-11 11:50:15 +00:00 |
|
Vicent Llopis
|
7030be3efa
|
fix
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-07 09:30:04 +02:00 |
|
Carlos Satorres
|
3d9f0e1497
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
|
2023-07-06 05:48:45 +02:00 |
|
Alex Moreno
|
d7fca07446
|
Merge branch 'dev' into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 10:17:42 +00:00 |
|
Alex Moreno
|
5d933da28a
|
refs #5712 fix empty data
gitea/salix/pipeline/head Build queued...
Details
|
2023-07-05 12:14:26 +02:00 |
|
Alex Moreno
|
444b08c566
|
refs #5712 test(docuware)
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-05 12:09:52 +02:00 |
|
Alex Moreno
|
1a18ba66a9
|
refs #5712 fix(workerDms): filter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-04 15:18:57 +02:00 |
|
Vicent Llopis
|
e58d4e5db3
|
refs #4770 feat: añadida sección 'Troncales'
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-04 14:42:51 +02:00 |
|
Carlos Satorres
|
5000e05e05
|
refs #5334 merge + e2e solve
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-04 09:57:16 +02:00 |
|
Carlos Satorres
|
f1502139ac
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
|
2023-07-04 09:56:38 +02:00 |
|
Alex Moreno
|
4f616397a2
|
refs #5712 use dmsType readRole
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 15:05:39 +02:00 |
|
Carlos Satorres
|
983d028d06
|
refs #5334 popover y basic data
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 13:58:40 +02:00 |
|
Alex Moreno
|
c7b9d0827e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 13:42:54 +02:00 |
|
Pablo Natek
|
8ef6f0dd17
|
Merge branch 'dev' into 5347-clientCreateRefactor
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-07-03 11:35:50 +00:00 |
|
Carlos Satorres
|
5e68363312
|
refs #5334 onsearch postlink
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 09:38:36 +02:00 |
|
Carlos Satorres
|
dc10c20fe3
|
refs #5334 email validate
gitea/salix/pipeline/head This commit looks good
Details
|
2023-07-03 07:29:58 +02:00 |
|
Carlos Satorres
|
dc36c6fd9d
|
refs #5334 basicData solve e2e
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-30 13:52:46 +02:00 |
|
Alex Moreno
|
f636c3b1ab
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-30 11:57:56 +02:00 |
|
Carlos Satorres
|
3d93043b98
|
Merge branch '5334-editDepartment' of https://gitea.verdnatura.es/verdnatura/salix into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-30 09:40:15 +02:00 |
|
Carlos Satorres
|
83b096c206
|
refs #5334 fix errors
|
2023-06-30 09:40:12 +02:00 |
|
Carlos Satorres
|
6b4501146d
|
refs #5334 fix errors
|
2023-06-30 09:39:48 +02:00 |
|
Vicent Llopis
|
f3e771747a
|
refs #5244 fix: getItemTypeWorker permite filtrar por id
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-29 15:56:07 +02:00 |
|
Vicent Llopis
|
3cedef6f16
|
refs #5244 fix: add id
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-29 15:22:53 +02:00 |
 Javi Gallego
|
bc4058512a
|
Merge branch 'test' into 5900-removeDuplicatedLogs
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 12:43:16 +00:00 |
|
Vicent Llopis
|
011db142d3
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5244-component_workerAutocomplete
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-29 12:49:55 +02:00 |
|
Carlos Satorres
|
bb4951bbc8
|
Merge branch 'dev' into 5334-editDepartment
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 07:47:41 +00:00 |
|
Carlos Satorres
|
9dc52b6011
|
refs #5334 fix labels trad
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-29 09:44:21 +02:00 |
|
Pablo Natek
|
bbc5ed2683
|
Merge branch 'dev' into 5347-clientCreate-→-client_create
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-29 05:22:06 +00:00 |
|
Alex Moreno
|
befa385830
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5712-workerDms_integrateDocuware
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-28 14:30:20 +02:00 |
|
Vicent Llopis
|
6894da7e22
|
refs #5688 fix: front test
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-28 13:27:18 +02:00 |
|
Alex Moreno
|
da50ea1dd0
|
Merge branch 'dev' into 5688-worker.calendar_workCenter
gitea/salix/pipeline/head There was a failure building this commit
Details
|
2023-06-28 11:10:51 +00:00 |
|
Carlos Satorres
|
f02019d64d
|
refs #5334 fix words
gitea/salix/pipeline/head This commit looks good
Details
|
2023-06-28 11:52:53 +02:00 |