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

8302 Commits

Author SHA1 Message Date
Jon Elias 7e15d3c7a4 Merge branch 'master' into Hotfix-ZoneEventSelect 2024-12-30 13:05:27 +00:00
Jon Elias 3c7880d02f fix: zone events postcode select 2024-12-30 14:02:23 +01:00
Javi Gallego 55ab9fea3e test: refs #7052 remove .only from EditTableCellValueForm test suite 2024-12-30 08:55:00 +01:00
Jose Antonio Tubau fc648530bb Merge pull request '#8266 change expedition item name' (!1073) from 8266-changeExpeditionItemNameFront into dev 
Reviewed-on: verdnatura/salix-front#1073
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-30 07:04:32 +00:00
Jose Antonio Tubau 3cd861edee Merge branch 'dev' into 8266-changeExpeditionItemNameFront 2024-12-30 07:03:36 +00:00
Javi Gallego 5784c079ce Merge pull request '7924-itemInsepction' (!1114) from 7924-itemInsepction into dev 
Reviewed-on: verdnatura/salix-front#1114
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-29 09:10:43 +00:00
Javi Gallego 286e460638 Merge branch 'dev' into 7924-itemInsepction 2024-12-29 09:09:30 +00:00
Javi Gallego 1e0d444e85 refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests 2024-12-29 10:06:30 +01:00
Javi Gallego 53c1040cd8 refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage 2024-12-29 10:05:56 +01:00
Javi Gallego 6acf6f8131 Merge branch 'dev' into 7052-testEditTableCellValueForm 2024-12-29 09:44:12 +01:00
Jose Antonio Tubau 120f7892a8 Merge branch 'dev' into 8266-changeExpeditionItemNameFront 2024-12-27 14:06:33 +00:00
Javier Segarra a297bb7f4a Merge pull request 'perf: remove unused variables' (!1138) from warmfix_noUsedVars into test 
Reviewed-on: verdnatura/salix-front#1138
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-12-27 12:40:25 +00:00
Javier Segarra 7cc4d760dd perf: remove unused variables 2024-12-27 12:02:34 +01:00
Jon Elias ad64c4ea0c Merge pull request 'Hotfix: Remove params when searching by id on VnSearchbar' (!1102) from Hotfix-VnSearchbarRemoveParams into master 
Reviewed-on: verdnatura/salix-front#1102
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-27 11:00:53 +00:00
PAU ROVIRA ROSALENY d4eb61116a Merge pull request 'fix: fixed translations' (!1136) from hotfix_unhandledTranslations into test 
Reviewed-on: verdnatura/salix-front#1136
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-27 10:55:19 +00:00
Jon Elias 93047ab179 Merge pull request '#8201: Fix descriptor icons error' (!1080) from 8201-DescriptorIcons into dev 
Reviewed-on: verdnatura/salix-front#1080
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-27 09:55:46 +00:00
Jon Elias fad3e49e2f Merge branch 'dev' into 8201-DescriptorIcons 2024-12-27 09:55:02 +00:00
Javier Segarra 0211aeb5cf Merge pull request 'fix: discount class' (!1137) from fix_discount_class into dev 
Reviewed-on: verdnatura/salix-front#1137
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-27 09:49:59 +00:00
Jon Elias d73b03f757 Merge branch 'master' into Hotfix-VnSearchbarRemoveParams 2024-12-27 09:48:39 +00:00
Javier Segarra d81daf8c66 fix: fixed translations 2024-12-27 10:42:41 +01:00
Jon Elias 0e9c342b88 Merge pull request 'Hotfix: modified VnTable bottom icon to display when no data in the table' (!1103) from Hotfix-VnTableBottomButton into master 
Reviewed-on: verdnatura/salix-front#1103
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-12-27 09:41:17 +00:00
Jon Elias 976b891a75 Merge branch 'master' into Hotfix-VnSearchbarRemoveParams 2024-12-27 09:40:16 +00:00
Jon Elias a4f6974e69 Merge branch 'master' into Hotfix-VnTableBottomButton 2024-12-27 09:39:36 +00:00
Jon Elias c7f358115f Merge branch 'dev' into 8201-DescriptorIcons 2024-12-27 09:39:05 +00:00
Jon Elias 894b0d3dee Merge branch '8201-DescriptorIcons' of https://gitea.verdnatura.es/verdnatura/salix-front into 8201-DescriptorIcons 2024-12-27 10:36:04 +01:00
Jon Elias de30725322 perf: refs #8201 onDataSaved fetch 2024-12-27 10:36:03 +01:00
PAU ROVIRA ROSALENY 9d89f6c5d1 fix: discount class 2024-12-27 09:24:39 +00:00
PAU ROVIRA ROSALENY 470e0cc08a fix: fixed translations 2024-12-27 10:08:28 +01:00
Javier Segarra d1fdb1777d Merge pull request 'fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component' (!1135) from 7935-dropDuplicateCol into dev 
Reviewed-on: verdnatura/salix-front#1135
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-27 08:23:23 +00:00
Jon Elias ceb470fc0f Merge branch 'dev' into 8201-DescriptorIcons 2024-12-27 08:20:36 +00:00
Jon Elias 1ff54d7423 refactor: refs #8201 deleted condition 2024-12-27 09:18:29 +01:00
Jorge Penadés be71e66075 fix: refs #7935 remove unused 'companyFk' column from InvoiceInList component 2024-12-26 17:59:42 +01:00
Jose Antonio Tubau 494b8440d6 Merge pull request '#7050 testCrudModel' (!1077) from 7050-testCrudModel into dev 
Reviewed-on: verdnatura/salix-front#1077
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2024-12-26 11:14:15 +00:00
Jose Antonio Tubau c27a7fc206 Merge branch 'dev' into 7050-testCrudModel 2024-12-26 11:13:13 +00:00
Jose Antonio Tubau 33cf755782 Merge remote-tracking branch 'origin/dev' into 7050-testCrudModel 2024-12-26 12:10:26 +01:00
Jorge Penadés 1d7927a604 Merge pull request '#7056 update route meta information and add FormModel tests' (!1122) from 7056-formModelTest into dev 
Reviewed-on: verdnatura/salix-front#1122
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-26 11:07:20 +00:00
Jorge Penadés 90500538e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7056-formModelTest 2024-12-26 12:06:00 +01:00
Jose Antonio Tubau 435d9750ca Merge branch 'dev' into 8266-changeExpeditionItemNameFront 2024-12-26 07:43:32 +00:00
PAU ROVIRA ROSALENY bd5daa8368 Merge pull request 'feat: #7079 created VnLocation front test' (!1126) from 7079-testVnLocation into dev 
Reviewed-on: verdnatura/salix-front#1126
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-24 13:08:10 +00:00
PAU ROVIRA ROSALENY 37f16cb762 Merge branch 'dev' into 7079-testVnLocation 2024-12-24 13:07:06 +00:00
Jose Antonio Tubau 87cf722c5f Merge branch 'dev' into 8266-changeExpeditionItemNameFront 2024-12-24 12:03:14 +00:00
Jose Antonio Tubau 638bd1dc26 refactor: refs #7050 removed blank spaces 2024-12-24 12:59:40 +01:00
Jose Antonio Tubau 790c82926b Merge pull request 'feat: refs #7074 tests for fns setData(), parseDms() and showFormDialog()' (!1092) from 7074-makeFrontTestToVnDmsList into dev 
Reviewed-on: verdnatura/salix-front#1092
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-24 11:45:59 +00:00
Javier Segarra 9d03333e37 Merge branch 'dev' into 7074-makeFrontTestToVnDmsList 2024-12-24 12:31:24 +01:00
PAU ROVIRA ROSALENY 89acb338a9 refactor: refs #7079 removed useless code 2024-12-24 12:18:36 +01:00
PAU ROVIRA ROSALENY 7d1f25563d Merge branch 'dev' into 7079-testVnLocation 2024-12-24 11:15:29 +00:00
Alex Moreno 9c899a65e6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-24 12:04:17 +01:00
Alex Moreno 9dabe11cd0 fix(AccountList): use $refs 2024-12-24 12:02:58 +01:00
PAU ROVIRA ROSALENY 4f60544a1e Merge branch 'dev' into 7079-testVnLocation 2024-12-24 10:59:36 +00: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