Carlos Satorres
|
0107c21789
|
refs #7409 fix trad
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-21 09:57:01 +02:00 |
Carlos Satorres
|
87a9ee5ccb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-21 09:50:38 +02:00 |
Carlos Satorres
|
fdedf7bf57
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation
|
2024-06-21 08:42:57 +02:00 |
Jon Elias
|
ff75808a28
|
Merge branch 'dev' into 6977-ClonedURL
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-21 05:25:56 +00:00 |
Jon Elias
|
f41161a28e
|
refactor: refs #6977 use VnImg
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-21 07:24:23 +02:00 |
Alex Moreno
|
09545cb2c0
|
fix: WorkerNotificationsManager test
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-20 14:25:45 +02:00 |
Carlos Satorres
|
84378187be
|
Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-18 08:56:23 +02:00 |
Carlos Satorres
|
0ccfd9ae75
|
refs #7409 columns trad
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-17 15:50:33 +02:00 |
Carlos Satorres
|
25ab5a1b9f
|
refs #7409 front section
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-17 13:55:16 +02:00 |
Javier Segarra
|
648546888d
|
fix: DeleteDepartment VnConfirm
|
2024-06-13 14:56:19 +02:00 |
William Buezas
|
b0e4dc99b0
|
Fix worker department create modal did not open
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-12 08:47:32 -03:00 |
Alex Moreno
|
d7237463ea
|
feat(WorkerFormation): is-editable and use-model
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-12 11:00:10 +02:00 |
Alex Moreno
|
c3409a9d5c
|
Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation
|
2024-06-12 07:50:41 +02:00 |
Javier Segarra
|
d0759cb654
|
Merge branch 'dev' into feature/AccountFormsView
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-11 21:12:13 +02:00 |
Alex Moreno
|
14e27f193e
|
feat: adapt tu VnTable → CrudModel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-11 15:00:03 +02:00 |
Alex Moreno
|
59e72dcd50
|
Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-11 12:53:50 +02:00 |
Javier Segarra
|
adbc9dee2c
|
Merge branch 'dev' into feature/WorkerDescriptorMenu
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-11 07:37:06 +00:00 |
Javier Segarra
|
fbecbd0c08
|
Merge remote-tracking branch 'origin/dev' into feature/WorkerDescriptorMenu
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-10 17:10:05 +02:00 |
Jorge Penadés
|
992249c638
|
fix: refs #6273 redirect
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-10 17:06:28 +02:00 |
William Buezas
|
c1df20a09b
|
Worker descriptor menu
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-10 11:21:23 -03:00 |
Jorge Penadés
|
a5b71ecebc
|
feat: refs #6273 delete prop
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-10 15:32:38 +02:00 |
Jorge Penadés
|
d81ce9fe95
|
feat: refs #6273 add test & improve form
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-10 13:54:02 +02:00 |
Alex Moreno
|
aa2601ac45
|
feat(WorkerFormation): add columnFilter
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-10 09:15:17 +02:00 |
Jorge Penadés
|
8d89fc2d90
|
feat: refs #6273 set payMethod to 0
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 14:08:18 +02:00 |
William Buezas
|
4c84fd9326
|
resolve conflicts
|
2024-06-07 09:03:41 -03:00 |
Jorge Penadés
|
213ba4ba52
|
chore: refs #6273 Add default pay method for internal
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 12:24:48 +02:00 |
Jorge Penadés
|
8b93dbc57d
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 12:15:04 +02:00 |
Javier Segarra
|
ec5d5e52f4
|
Merge branch 'dev' into feature/ZoneCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-07 09:32:51 +02:00 |
Javier Segarra
|
e178778264
|
fix: styles
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-06 23:46:26 +02:00 |
Jorge Penadés
|
382591fb11
|
fix: refs #6273 set paymethodFk to 0 if it is external
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-05 17:13:52 +02:00 |
Jorge Penadés
|
7e0ceca623
|
feat: refs #6273 freelance form & vnRadio
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-04 17:38:04 +02:00 |
Jorge Penadés
|
0b0754f76e
|
refactor: refs #6273 replace QBtnGroup with QRadio for worker type selection
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-04 09:33:51 +02:00 |
Jorge Penadés
|
de4ea6271b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-06-04 09:00:57 +02:00 |
Jorge Penadés
|
2a61ca4dbb
|
refactor: refs #6891 drop isHeaderMounted condition
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-06-03 14:11:40 +02:00 |
Alex Moreno
|
2b6612317c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation
|
2024-05-29 14:05:42 +02:00 |
Alex Moreno
|
5965e70740
|
Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation
|
2024-05-29 07:50:15 +02:00 |
Jorge Penadés
|
0de575bb6b
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-28 13:14:11 +02:00 |
Carlos Satorres
|
264d887fb4
|
refs #7406 fix Tb components create
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-28 12:09:03 +02:00 |
Carlos Satorres
|
ffe15da7cf
|
refs #7406 fix VnTable columns
|
2024-05-28 10:41:24 +02:00 |
Carlos Satorres
|
d8512e2033
|
refs #7406 fix trad
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-27 18:23:33 +02:00 |
William Buezas
|
fcaca42b1f
|
resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 12:35:59 -03:00 |
Carlos Satorres
|
947496e0a1
|
refs #7406 fix components
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-27 14:43:03 +02:00 |
Carlos Satorres
|
d207482e3a
|
refs #7406 fix url
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-27 11:27:33 +02:00 |
Carlos Satorres
|
c865bc2ed4
|
refs #7406 fix props
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 10:07:32 +02:00 |
Carlos Satorres
|
d4fbd99473
|
refs #7406 table formation
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 09:40:48 +02:00 |
Jorge Penadés
|
3b799efa22
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-27 08:57:34 +02:00 |
Carlos Satorres
|
ba5407310f
|
refs #7396 fix summary
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 13:40:00 +02:00 |
Jorge Penadés
|
933e0be028
|
fix: refs #6942 e2e tests
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-24 12:10:27 +02:00 |
Alex Moreno
|
b531370e2c
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good
Details
|
2024-05-24 08:33:27 +02:00 |
Carlos Satorres
|
bfdd319366
|
Merge branch 'dev' into 6332-calendarMods
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-23 12:36:36 +00:00 |
Pablo Natek
|
410012df55
|
fix: refs #7187 fix div
gitea/salix-front/pipeline/pr-test This commit looks good
Details
|
2024-05-23 14:24:58 +02:00 |
Javier Segarra
|
e2b72f132c
|
Merge remote-tracking branch 'origin/dev' into feature/ZoneLocations
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 15:49:23 +02:00 |
Carlos Satorres
|
499e104daa
|
Merge branch 'dev' into fix-CalendarTimeControlRightPanel
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 10:49:43 +00:00 |
Javier Segarra
|
d900ed3764
|
Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 10:22:05 +02:00 |
Javier Segarra
|
f6051472ef
|
style: color transparent when is fetive
|
2024-05-22 10:21:06 +02:00 |
Carlos Satorres
|
c1bcc0379d
|
refs #6332 fix festive
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 09:35:56 +02:00 |
Javier Segarra
|
eaa0288f25
|
update
|
2024-05-22 09:27:48 +02:00 |
Javier Segarra
|
a0ca26ad9b
|
Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 08:56:10 +02:00 |
Javier Segarra
|
0e0f649ff9
|
fix: 9-12
|
2024-05-22 08:54:37 +02:00 |
Carlos Satorres
|
81f7e06143
|
refs #6332 fix calendar
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 08:35:01 +02:00 |
Javier Segarra
|
3d6fac5338
|
Merge branch '6332-calendarMods' of https://gitea.verdnatura.es/verdnatura/salix-front into 6332-calendarMods
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-22 08:28:51 +02:00 |
Javier Segarra
|
2094506baf
|
fix: WorkerCalendarItem
|
2024-05-22 08:27:09 +02:00 |
Pablo Natek
|
d2d80645d0
|
fix: refs #7187 fix responsive
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-test This commit looks good
Details
|
2024-05-21 19:12:40 +02:00 |
Carlos Satorres
|
27c86288e1
|
refs #6332 color red button
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 16:14:55 +02:00 |
Carlos Satorres
|
bacc07a4ca
|
remove right
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 12:04:56 +02:00 |
Carlos Satorres
|
99d16d215f
|
refs #6332 colors
|
2024-05-21 11:56:30 +02:00 |
Pablo Natek
|
e32e922c45
|
Merge branch 'dev' into 7187-refactorWokerPda
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 23:06:07 +00:00 |
Pablo Natek
|
45f56078d7
|
feat: refs #7187 add vnconfirm on delete
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 01:04:52 +02:00 |
Pablo Natek
|
9468e409ea
|
fix: refs #7187 fix reload
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-21 00:34:03 +02:00 |
William Buezas
|
7466d03f15
|
resolve conflicts
|
2024-05-20 08:46:08 -03:00 |
Carlos Satorres
|
ce72b8099b
|
Merge branch 'dev' into 7396-addBasicDataWorker
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-20 07:20:29 +00:00 |
Carlos Satorres
|
4199fc0dc5
|
refs #7396 fix basicData, summary, change deleteDepartment
|
2024-05-20 09:00:54 +02:00 |
William Buezas
|
202473158c
|
resolve conflicts
|
2024-05-19 14:21:32 -03:00 |
Carlos Satorres
|
d359063e5d
|
refs #7396 fix summary
|
2024-05-17 14:23:00 +02:00 |
Carlos Satorres
|
cd21d7817d
|
refs #7396 fix summary basicData
|
2024-05-17 14:16:06 +02:00 |
Carlos Satorres
|
d7e3303d68
|
refs #7396 add fiDueDate, machine
|
2024-05-17 13:19:59 +02:00 |
Carlos Satorres
|
067df2d56b
|
Merge branch 'dev' into 6914-fixWorkerCreateErrors
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-17 11:15:25 +00:00 |
William Buezas
|
a35ccb5b51
|
Zone Locations
|
2024-05-16 16:38:27 -03:00 |
Carlos Satorres
|
660577c9fe
|
refs #6914 fix vnLocation workerCreate
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 16:02:38 +02:00 |
Pablo Natek
|
a5dd7c817e
|
Merge branch 'dev' into 7187-refactorWokerPda
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 12:08:51 +00:00 |
Pablo Natek
|
108533d475
|
fix: delete translates
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 12:57:35 +02:00 |
Jorge Penadés
|
ed9310cbb1
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 08:58:00 +02:00 |
Robert Ferrús
|
ca5cf66f56
|
Merge branch 'dev' into 7039-country-country
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 06:46:32 +00:00 |
Robert Ferrús
|
b7fce0917e
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7039-country-country
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-16 07:29:07 +02:00 |
Pablo Natek
|
c24062fccb
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7187-refactorWokerPda
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-15 22:18:40 +02:00 |
Pablo Natek
|
bc9c1fdf8e
|
feat: pda duplicates
|
2024-05-15 22:17:40 +02:00 |
Carlos Satorres
|
adde8d1ab8
|
refs #6332 fix colors
|
2024-05-15 16:00:56 +02:00 |
Jorge Penadés
|
3cb02d5e5f
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7281-solveTerminalWarnings
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-15 15:42:13 +02:00 |
Jorge Penadés
|
628fc888ba
|
fix: refs #7281 fix warnings
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-15 14:31:51 +02:00 |
Jorge Penadés
|
d55dc638d9
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-13 15:23:37 +02:00 |
Jorge Penadés
|
ad14d2e776
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
|
2024-05-13 08:55:03 +02:00 |
Jorge Penadés
|
a692ca4a18
|
feat: refs #5919 test & set workerFk null.
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-10 16:01:32 +02:00 |
Jorge Penadés
|
7fd4c43b8b
|
feat: refs #5919 workerlocker
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-10 13:07:58 +02:00 |
Jon Elias
|
2183385e58
|
Merge branch 'dev' into 6767-deleteDivCol
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-10 09:39:31 +00:00 |
Pablo Natek
|
4e8f524f49
|
feat: add new list form with popup
|
2024-05-09 22:47:13 +02:00 |
Jorge Penadés
|
ac935b9020
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5919-locker
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-09 08:48:28 +02:00 |
Jorge Penadés
|
f803a210a6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-08 13:26:05 +02:00 |
Jorge Penadés
|
a1f785ccbe
|
feat: refs #5919 WIP workerlocker
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 11:02:40 +02:00 |
Carlos Satorres
|
3d3f72757a
|
Merge branch 'dev' into 6842-errorCalendar
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
|
2024-05-08 08:10:37 +00:00 |
Jorge Penadés
|
7504e5d12c
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
|
2024-05-07 16:36:34 +02:00 |