wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
3,764 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

375 Commits

Author SHA1 Message Date
Javier Segarra ec5d5e52f4 Merge branch 'dev' into feature/ZoneCalendar 2024-06-07 09:32:51 +02:00
Javier Segarra 2a85fe21b0 Merge branch 'dev' into 6911-saveOnEnter 2024-06-07 00:46:42 +02:00
Jorge Penadés 2a61ca4dbb refactor: refs #6891 drop isHeaderMounted condition 2024-06-03 14:11:40 +02:00
Javier Segarra d5dc9d974c fix: ClaimBasicData form 2024-05-31 13:20:55 +02:00
jcasado 96719884fb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6911-saveOnEnter 2024-05-22 12:46:56 +02:00
jcasado 4de9895b38 refs: #6911-saveOnEnter 2024-05-22 12:07:27 +02:00
Jorge Penadés 288f776c9c Merge branch 'dev' into 7274-fixCustomer 2024-05-16 07:01:08 +00:00
Jorge Penadés a6c761c031 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_Customer_1 2024-05-14 13:42:38 +02:00
Jorge Penadés d55dc638d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6891-showRightSideFilterPanel 2024-05-13 15:23:37 +02:00
Jorge Penadés 29e567d405 fix: refs #6891 use new props 2024-05-07 16:42:09 +02:00
Alex Moreno a139c11a22 Merge branch 'test' into fix_Customer_1 2024-05-07 07:05:25 +00:00
Jorge Penadés 036ef72593 fix: refs #6891 showFilterPanel 2024-05-06 17:27:30 +02:00
Jorge Penadés b1147f00d3 refactor: refs #6891 use Teleport | slot 2024-05-06 16:16:00 +02:00
Jon Elias 8f0af24f50 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6767-deleteDivCol 2024-05-03 08:56:38 +02:00
Javier Segarra 1675919801 fix: minor build bugs 2024-05-02 14:33:24 +02:00
Javier Segarra ce0c9ebd98 Merge branch 'test' into fix_Customer_1 2024-05-02 11:52:11 +00:00
Jon Elias c1a464d9ae fix: refs #6887 fix conflicts 2024-05-02 13:02:59 +02:00
Carlos Satorres 73ade834e9 Merge branch 'dev' into 7172-fixClaimBasicData 2024-05-02 08:21:43 +00:00
Alex Moreno f3387cf120 fix: refs #6336 fix reload and disable button when is loading 2024-04-30 12:39:50 +02:00
Jon Elias d5762f65b3 refactor: refs #6887 fixed errors 2024-04-30 10:34:48 +02:00
Jon Elias 5b15558dbf refactor: refs #6887 fixed errors 2024-04-30 10:32:32 +02:00
Carlos Satorres acb4e2d98e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-30 09:44:06 +02:00
Alex Moreno 8390a8b7b0 Merge branch 'dev' into 6336-claims_v4 2024-04-30 05:37:46 +00:00
Javier Segarra b3aaf35c6a Merge branch 'dev' into 6887-endClaimMigration 2024-04-29 09:58:26 +00:00
Alex Moreno b71aeb1d07 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-29 10:39:44 +02:00
Alex Moreno 5378ed6f2e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-04-29 10:34:48 +02:00
Alex Moreno 806f3a13d5 fix(claimLines): refs #6336 fix total calc 2024-04-29 10:33:32 +02:00
Jon Elias b8380bc9c5 Merge branch 'dev' into 6887-endClaimMigration 2024-04-29 07:51:16 +00:00
Carlos Satorres abd1f72340 Merge branch '7172-fixClaimBasicData' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-29 09:49:32 +02:00
Carlos Satorres a78c920ec8 refs #7172 fix VnSelect 2024-04-29 09:49:29 +02:00
Jon Elias 6ae38d2611 refactor: refs #6887 pending claim changes 2024-04-29 09:49:06 +02:00
Carlos Satorres 76a1227c0e Merge branch 'dev' into 7172-fixClaimBasicData 2024-04-29 07:38:59 +00:00
Carlos Satorres e3237ee4f1 refs #7172 refact VnSelect 2024-04-29 09:35:57 +02:00
Alex Moreno 8b55044891 feat: refs #6336 add ItemDescriptor 2024-04-29 08:56:35 +02:00
Carlos Satorres 76cd79173c refs #7172 fix select 2024-04-26 13:50:11 +02:00
Alex Moreno 88e1e577c4 hotFix: refs #6636 fix ref optionsList 2024-04-26 13:10:29 +02:00
Javier Segarra be1857bb94 fix: FilterPanel menu icon 2024-04-26 11:28:09 +02:00
Javier Casado 8864048a56 Merge branch 'dev' into 6641-myTeamFilterClaim 2024-04-26 09:14:54 +00:00
Jon Elias e6dc7b9862 refactor: refs #6767 fix all conflicts 2024-04-26 09:47:44 +02:00
Carlos Satorres 022fd6caa4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7172-fixClaimBasicData 2024-04-26 09:17:23 +02:00
Javier Casado 6d5e0484cd Merge branch 'dev' into 6697-changeClaimQuantity 2024-04-26 05:32:32 +00:00
jcasado c6c925a105 refs: #6764 fixConflicts 2024-04-25 08:50:12 +02:00
jcasado 4b3df372cd refs: #6764 fixConflicts 2024-04-25 08:49:40 +02:00
jcasado c9ab98471e refs #6697 fix changes 2024-04-24 12:01:55 +02:00
jcasado 5103b5b365 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6697-changeClaimQuantity 2024-04-24 12:01:15 +02:00
jcasado 6391ed1360 refs #6697 changes claim 2024-04-24 11:26:32 +02:00
jcasado 716dd4e28f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6764-rename-VnSelectFilter 2024-04-24 08:02:19 +02:00
jcasado 7f07b9780c refs: #6764 rename VnSelectFilter 2024-04-23 13:03:32 +02:00
Jorge Penadés f3c1608403 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-23 09:17:41 +02:00
Alex Moreno 99af402281 fix(VnNotes): refs #6336 fix v-for key 2024-04-22 08:42:38 +02:00