Commit Graph

294 Commits

Author SHA1 Message Date
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
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
William Buezas fcaca42b1f resolve conflicts
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-05-27 12:35:59 -03: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