Commit Graph

324 Commits

Author SHA1 Message Date
Jon Elias 8c870f177d fix: refs #8326 conflicts 2025-03-25 13:11:22 +01:00
Jon Elias 53f6f5278f refactor: refs #8326 requested changes 2025-03-24 12:08:24 +01:00
Javier Segarra 0fd36279fd Merge branch 'dev' into 8131-filer-style
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-24 08:01:49 +00:00
Javier Segarra cfa98dd683 Merge branch 'dev' into 8131-filer-style
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 11:55:52 +01:00
Alex Moreno 4c980cb805 Merge branch 'dev' of https: refs #8463//gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 11:33:14 +01:00
Jon Elias bd8c610ce8 Merge branch 'dev' of https: refs #8326//gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-21 08:14:36 +01:00
Alex Moreno d9d40da4f1 Merge branch 'dev' of https: refs #8463//gitea.verdnatura.es/verdnatura/salix-front into 8463-CardDescriptor_useCard
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit Details
2025-03-18 14:45:11 +01:00
Jon Elias ff39addd67 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones 2025-03-18 07:57:45 +01:00
Alex Moreno d744b22119 feat: integrate vue-router to enhance routing capabilities in ZoneCard component
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-17 14:24:24 +01:00
Alex Moreno e0e15b3b3f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-17 14:05:48 +01:00
Alex Moreno 0b3130b4de feat: update URL generation in ZoneCard component to include route parameter
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-17 14:03:23 +01:00
Javier Segarra 3fdf82258e style: refs #8131 remove outlined from filterPanel
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-14 11:45:48 +01:00
Javier Segarra e92fbb1e85 style: refs #8131 replace rounded by filled 2025-03-14 11:43:01 +01:00
Alex Moreno f7046be50d fix: refs #8463 fix name 2025-03-14 09:15:50 +01:00
Alex Moreno 1139035e45 refactor: refs #8463 replace CardDescriptor with EntityDescriptor in multiple components 2025-03-14 09:13:45 +01:00
Jon Elias 4730485324 fix: refs #7869 fixed locations e2e
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-13 11:51:48 +01:00
Jon Elias 7027715c3c refactor: refs #7869 skipped failing e2es 2025-03-13 08:44:58 +01:00
Jon Elias e3252f4079 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones 2025-03-13 08:09:13 +01:00
Jon Elias 1765688ee4 fix: refs #7869 fixed translation
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 13:59:19 +01:00
Jon Elias 4ed2e6235e Merge branch '7869-ModifyZones' of https://gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-12 13:49:40 +01:00
Jon Elias 807d5f12fa refactor: refs #7869 modified max months data 2025-03-12 13:49:38 +01:00
Alex Moreno d078969dd6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-12 12:48:07 +01:00
Jon Elias b9e5ed7346 fix: fixed node fetching and adapted to back data
gitea/salix-front/pipeline/pr-master This commit is unstable Details
2025-03-11 15:07:10 +01:00
Jon Elias f8358fc361 Merge branch 'dev' into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-11 11:21:45 +00:00
Jon Elias e162ee720d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8326-UnifyCardTitles 2025-03-11 11:00:00 +01:00
Alex Moreno 434696581b refactor: refs #8197 rename VnCardBeta to VnCard
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-10 09:10:56 +01:00
Jon Elias dd5356f45c fix: refs #7869 fixed dated when adding an indefinetely or range event
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 13:13:18 +01:00
Jon Elias 268d723eb1 refactor: refs #7869 merged changes with #8606
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 12:29:03 +01:00
Jon Elias 74692a6107 Merge branch 'dev' of https: refs #7869//gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones 2025-03-07 12:28:48 +01:00
Jon Elias 69e5495ccb refactor: refs #8606 requested changes
gitea/salix-front/pipeline/pr-dev This commit looks good Details
2025-03-07 11:23:34 +01:00
Jon Elias 504f70ab55 refactor: refs #8606 deleted code and fixed translation 2025-03-07 07:44:31 +01:00
Jon Elias 16521d7848 Merge branch 'dev' of https: refs #7869//gitea.verdnatura.es/verdnatura/salix-front into 7869-ModifyZones
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-07 07:11:49 +01:00
Jon Elias 590e764cc2 feat: refs #7869 added include and exclude event from list
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-07 07:09:07 +01:00
Jon Elias ac84537e19 refactor: refs #8606 clear some warnings
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-03-06 13:49:32 +01:00
Jon Elias 6ffb62497b refactor: refs #8606 merged previous and e2e changes and corrected minor errors
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-03-06 13:46:56 +01:00
Jon Elias 1057e1d469 Merge branch 'dev' of https: refs #8606//gitea.verdnatura.es/verdnatura/salix-front into 8606-FixZoneModuleV2 2025-03-06 12:21:10 +01:00
Jon Elias 04b2cfe541 Merge branch 'dev' of https: refs #8600//gitea.verdnatura.es/verdnatura/salix-front into 8600-CreateZoneE2E 2025-03-06 11:40:45 +01:00
Jon Elias 86244b74c4 fix: fixed select not filtering when typing
gitea/salix-front/pipeline/pr-test This commit looks good Details
2025-03-05 10:03:44 +01:00
Alex Moreno 49140b5fe6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test
gitea/salix-front/pipeline/head This commit looks good Details
2025-03-04 15:08:18 +01:00
Jon Elias 66d9d5f760 Merge branch 'master' into Hotfix-ZoneBasicDataDistributionPoint
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-04 12:39:57 +00:00
Jon Elias a9f27b4e52 fix: fixed distribution point options and e2e
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-04 13:37:50 +01:00
Alex Moreno 56e65aee4a 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-test Something is wrong with the build of this commit Details
2025-03-04 12:04:56 +01:00
Javier Segarra 7e174a4306 Merge branch 'master' into hotfix_agencyModes_sortBy
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-04 09:33:30 +01:00
Javier Segarra 15d94ca165 fix: add order and sortBy
gitea/salix-front/pipeline/pr-master This commit looks good Details
2025-03-03 23:10:44 +01:00
Jon Elias 0bfb1344dc feat: refs #8326 wip added new style
gitea/salix-front/pipeline/pr-dev This commit is unstable Details
2025-02-28 12:03:23 +01:00
Jon Elias d8a0a4833c Merge branch 'dev' of https: refs #8600//gitea.verdnatura.es/verdnatura/salix-front into 8600-CreateZoneE2E
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 10:13:25 +01:00
Alex Moreno c67ae3e17e Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34"
gitea/salix-front/pipeline/head There was a failure building this commit Details
This reverts commit 223a1ea449.
2025-02-25 09:53:02 +01:00
Alex Moreno b9b5bd4c8a Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34"
gitea/salix-front/pipeline/pr-test This commit looks good Details
This reverts commit 223a1ea449.
2025-02-25 09:40:46 +01:00
Jon Elias 3b66ff7b14 Merge branch 'dev' of https: refs #8600//gitea.verdnatura.es/verdnatura/salix-front into 8600-CreateZoneE2E
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details
2025-02-25 08:35:20 +01:00
Alex Moreno f2eedce55f fix: merge test to dev
gitea/salix-front/pipeline/head This commit looks good Details
2025-02-25 08:01:10 +01:00