Commit Graph

324 Commits

Author SHA1 Message Date
Alex Moreno c89178e6a5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-25 07:23:18 +01:00
Javier Segarra 223a1ea449 revert 1015acefb7
gitea/salix-front/pipeline/pr-test This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
revert Merge branch 'test' into master
2025-02-24 15:52:21 +00:00
Jon Elias 705ca0402a feat: refs #8606 adapt module to VnCatdBeta
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-21 10:14:59 +01:00
PAU ROVIRA ROSALENY c7d5db0ce8 feat: refs #8600 added new tests for zoneSummary & zoneLocations 2025-02-20 15:01:04 +01:00
Jon Elias 21d2438c5d feat: refs #8600 added calendar e2e and modified basic data
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-19 16:15:22 +01:00
Javi Gallego 8b238d0098 Merge pull request 'test' (!1439) from test into dev
gitea/salix-front/pipeline/head This commit looks good Details
Reviewed-on: #1439
Reviewed-by: Jon Elias <jon@verdnatura.es>
2025-02-19 07:56:43 +00:00
Jon Elias c52f13e35a Warmfix[ZoneBasicData]: fixed basic data and address column in list
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-19 07:33:52 +00:00
Jon Elias a2bb7c44f3 Merge branch 'dev' into 8606-FixZoneModule
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-18 10:36:52 +00:00
Jon Elias 927c40e356 refactor: refs #8606 translations
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-18 11:34:53 +01:00
Jon Elias 8955c3c1a6 refactor: refs #8606 modified upcoming deliveries view
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-18 09:48:33 +01:00
Jon Elias 5ce7c7f597 fix: refs #8606 fixed list e2e test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-18 09:05:38 +01:00
Alex Moreno bbaca64cc9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-18 08:57:39 +01:00
Jon Elias 3e111d144e refactor: refs #8246 fetch options efficiently and deleted unused data
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-17 14:03:51 +01:00
Jon Elias 8b6c0c05d6 refactor: refs #8606 modified table width and order
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-17 12:57:37 +01:00
Jon Elias 7c6112c896 refactor: refs #8606 modified table height and deleted void file
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 14:16:26 +01:00
PAU ROVIRA ROSALENY 2d22b8c28a fix: fixed ZoneBasicData not working
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-14 09:16:58 +00:00
Jon Elias 701cb875d3 refactor: refs #7451 deleted module prop in CardSummary and modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-11 16:44:55 +01:00
Jon Elias 6ae6b86dbf Merge branch 'test' of https: refs #8246//gitea.verdnatura.es/verdnatura/salix-front into 8246-UseAddressFk
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-02-10 10:27:55 +01:00
Jon Elias 66559a1c9e feat: refs #8246 use new addressFk field
gitea/salix-front/pipeline/pr-test There was a failure building this commit Details
2025-02-10 10:25:49 +01:00
Jon Elias 1395c0da80 Merge branch 'dev' of https: refs #8246//gitea.verdnatura.es/verdnatura/salix-front into 8246-ZoneAddressFk2 2025-02-06 14:21:12 +01:00
Alex Moreno 063ac0cb7b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-02-06 11:00:10 +01:00
Alex Moreno 671018ea2e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-02-06 10:59:30 +01:00
Jorge Penadés 848d00a8b3 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-02-06 10:32:00 +01:00
Jorge Penadés 6732effe0c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-hotfix-removeLimit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 10:30:16 +01:00
Alex Moreno ab2d3fc4dc fix: use userFilter to keep includes
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 10:12:52 +01:00
Jorge Penadés 80337c61df fix: refs #7524 dynamic fetch
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-02-06 10:09:30 +01:00
Jon Elias 41c8760707 refactor: refs #8246 added filter to searchbar due to data key 2025-02-05 14:40:04 +01:00
Javier Segarra af940c67c6 perf: replace shortcut=+ by v-shortcut=+ 2025-01-30 20:29:45 +01:00
Jorge Penadés abe894c8bd Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-28 14:33:34 +01:00
Jon Elias faacff875a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8246-ZoneAddressFk2 2025-01-27 13:39:47 +01:00
Javier Segarra a3acb3b190 Merge branch 'dev' into 8339_fix_preview
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-24 07:51:20 +00:00
Alex Moreno 55d86d3153 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-24 08:40:50 +01:00
Alex Moreno e6279ff261 build: merge master in test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-24 08:38:24 +01:00
Javier Segarra 58fd5a8326 perf: refs #8339 removew preview tag 2025-01-24 08:09:14 +01:00
Alex Moreno 7054ad1d40 feat: refs #7196 update vite and q-calendar
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-01-21 14:15:57 +01:00
Jon Elias 05a310d9af fix: refs #8246 fix list field and modified basic-data to adapt to requirements
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-17 13:04:14 +01:00
Jon Elias 2f3b0c59ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8246-ZoneAddressFk2 2025-01-17 08:18:41 +01:00
Jon Elias 4826b681ce refactor: refs #8246 modified addressFk field to use dashIfEmpty filter
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 14:58:47 +01:00
Jorge Penadés 3ad63ed354 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 10:35:49 +01:00
Alex Moreno bb8e9c5baa Merge branch 'dev' into 8225-UseSameMoreOptions
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-13 09:14:24 +00:00
Jon Elias ac1515e107 feat: refs #8225 added worker and zone modules
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-10 10:27:03 +01:00
Javi Gallego 3e06f604bb feat: refs #8298 add price optimum input and update translations for bonus and price optimum
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-08 10:32:15 +01:00
Jorge Penadés f4b1e18582 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData 2025-01-07 14:05:21 +01:00
Jon Elias b0cb3597de feat: refs #8246 added new field in list
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-01-07 07:11:04 +01:00
Alex Moreno 80a99d1261 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-03 09:24:06 +01:00
Jon Elias e648b82ecc fix: dated field
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-01-02 14:23:13 +01:00
Alex Moreno a7e04557dc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head There was a failure building this commit Details
2025-01-02 07:52:47 +01:00
Alex Moreno a65b8432d8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
gitea/salix-front/pipeline/head This commit looks good Details
2025-01-02 07:51:39 +01:00
Jon Elias 7e15d3c7a4 Merge branch 'master' into Hotfix-ZoneEventSelect
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-30 13:05:27 +00:00
Jon Elias 3c7880d02f fix: zone events postcode select
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-30 14:02:23 +01:00
PAU ROVIRA ROSALENY 470e0cc08a fix: fixed translations
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-27 10:08:28 +01:00
Alex Moreno 9c899a65e6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-24 12:04:17 +01:00
Alex Moreno 774afbec06 Merge branch 'beta' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-12-24 11:57:39 +01:00
Pablo Natek 3eaaea4503 Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake 2024-12-19 10:32:44 +01:00
Alex Moreno 44ee641414 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into beta
gitea/salix-front/pipeline/pr-master This commit looks good Details
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-18 12:07:41 +01:00
Alex Moreno 17527cb4e7 test: refs #8315 fix VnSelect in e2e
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-18 11:22:04 +01:00
Jon Elias afe3795e39 Merge branch 'master' into Hotfix-VnSearchbarRemoveParams
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 07:20:43 +00:00
Jon Elias 2ee4f0e65c fix: remove params when searching by id on VnSearchbar
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-18 08:19:07 +01:00
Alex Moreno adce872f15 Merge branch 'dev' into 8004-liliumStyleRemake 2024-12-17 10:27:59 +00:00
Alex Moreno e6ced7b2f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-test This commit looks good Details
2024-12-17 10:36:39 +01:00
Alex Moreno a0a6746db4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-17 10:36:25 +01:00
Jon Elias 4dff5a2eec refactor: use teleport to avoid qdrawer overlapping
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-17 09:03:09 +01:00
Carlos Satorres a3ea359b01 fix: remove useless try catch
gitea/salix-front/pipeline/head This commit looks good Details
2024-12-17 07:02:44 +01:00
Alex Moreno 846eabfceb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into beta
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-16 13:56:34 +01:00
Pablo Natek 0c7d5baa76 Merge branch 'dev' of https: refs #8004//gitea.verdnatura.es/verdnatura/salix-front into 8004-liliumStyleRemake
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-16 12:35:59 +01:00
Jon Elias 1e76d5fd3f refactor: ignore params when searching by id on searchbar
gitea/salix-front/pipeline/pr-beta This commit looks good Details
2024-12-16 12:03:57 +01:00
Guillermo Bonet 06329ef857 feat: refs #7882 Added distribution point 2024-12-12 08:14:58 +01:00
Jon Elias 309033c6de fix: fixed panel function
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-12-11 06:05:38 +01:00
Jon Elias 1de74dec8e fix: fix conflicts 2024-12-09 13:24:34 +01:00
Jon Elias 92b05db9d2 refactor: deleted useless hidden tag
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 11:27:30 +01:00
Jon Elias 0c88db5931 refactor: deleted onUnmounted code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-09 08:20:35 +01:00
Jorge Penadés ebcb356230 Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-12-02 13:42:14 +01:00
Jorge Penadés b00a3d7acf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into performance_mixins 2024-12-02 11:55:54 +01:00
Jon Elias 6263481a3e refactor: exclusionCreate function and translations
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-28 13:42:22 +01:00
Jon Elias 61d0d71538 fix: fixed functionality like Salix
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-28 12:26:33 +01:00
Jon Elias aaab41fe97 fix: translations
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-28 07:37:50 +01:00
Jon Elias 1a0406b5b1 fix: fixed exclusionCreate when excluding an event already excluded 2024-11-28 07:21:02 +01:00
Jon Elias e94c99662d Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-27 12:53:08 +01:00
Jon Elias e764f4066f fix: ticket notes translation and deleted useless code 2024-11-27 12:53:07 +01:00
Jon Elias 6b95df0202 Merge branch 'master' into Hotfix-ZoneEventsExclusion
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-27 07:13:18 +00:00
Jon Elias 07ba02aec8 fix: fixed delete event and dated value when excluding a day
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-27 08:02:18 +01:00
Pablo Natek 9078417746 feat: refs #8004 merge dev
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-26 10:13:37 +01:00
Alex Moreno fbd57dc96b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 13:02:58 +01:00
Alex Moreno 8e7cb9c46e fix: zoneLocationsTree check selected sons
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 12:54:15 +01:00
Jon Elias d191d88e81 refactor: modified button to prevent submit
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 12:19:20 +01:00
Jon Elias c558636799 refactor: requested changes
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 11:12:11 +01:00
Jon Elias 1dedf00fef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ZoneLocationsTree2
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-25 09:24:58 +01:00
Jon Elias a1aa9337c8 fix: show data and fixed search button when excluding a location
gitea/salix-front/pipeline/pr-master There was a failure building this commit Details
2024-11-25 09:21:20 +01:00
Alex Moreno e10e0d01e6 fix: zoneEventExclusion form dated
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-24 11:53:40 +01:00
Alex Moreno 367f660508 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-22 10:52:30 +01:00
Alex Moreno bf29be1c5f fix: remove all try catch(err) (error) console.error
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-22 08:39:46 +01:00
Alex Moreno bf0bda0e27 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2024-11-21 10:26:29 +01:00
Jon Elias 747bc4af76 Merge branch 'master' into Hotfix-ZoneLocationsTree
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-21 09:13:42 +00:00
Jon Elias 5ff95c2b93 fix: locations tree
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-21 10:10:44 +01:00
Jorge Penadés 26e777cdd5 fix: test
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 13:36:58 +01:00
Jorge Penadés 06b61a52f6 chore: refs #6919 drop useless code
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 11:24:14 +01:00
Jorge Penadés 51b3283ff7 feat: refs #6919 sync zone
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-19 11:22:32 +01:00
Jorge Penadés a44ea9384a Merge branch 'dev' of https: refs #6919//gitea.verdnatura.es/verdnatura/salix-front into 6919-syncData
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2024-11-18 16:25:51 +01:00
Javier Segarra 0c36d385ec Merge branch 'test' into solveConflicts_test_to_dev 2024-11-18 10:50:42 +01:00
Jon Elias a64575c7cc Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneLocationsTree
gitea/salix-front/pipeline/pr-master This commit looks good Details
2024-11-18 09:48:02 +01:00