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

8560 Commits

Author SHA1 Message Date
PAU ROVIRA ROSALENY e0bf2db42e Merge branch 'dev' into 8243-arreglarSkeletonSummary 2025-01-16 11:41:04 +00:00
PAU ROVIRA ROSALENY 4b3c78dd65 fix: refs #8243 fixed SkeletonSummary 2025-01-16 12:40:28 +01:00
Guillermo Bonet 9b1554b123 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-16 09:34:14 +01:00
Guillermo Bonet 86169d980c feat: refs #7882 Added coords to create a address 2025-01-16 09:34:12 +01:00
PAU ROVIRA ROSALENY 71daac1c9d Merge pull request 'feat: #7077 created test for VnInputTime' (!1163) from 7077-testVnInputTime into dev 
Reviewed-on: verdnatura/salix-front#1163
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-16 08:24:02 +00:00
PAU ROVIRA ROSALENY 8d508c82a0 Merge branch 'dev' into 7077-testVnInputTime 2025-01-16 06:18:40 +00:00
PAU ROVIRA ROSALENY f20c1f9422 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime 2025-01-16 07:18:07 +01:00
PAU ROVIRA ROSALENY 82e6cc0790 refactor: refs #7077 removed some comments 2025-01-16 07:18:05 +01:00
PAU ROVIRA ROSALENY 4b9453380a Merge pull request 'feat: #7087 created CardSummary test' (!1197) from 7087-testCardSummary into dev 
Reviewed-on: verdnatura/salix-front#1197
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-16 06:16:45 +00:00
PAU ROVIRA ROSALENY a0f7905983 Merge branch 'dev' into 7087-testCardSummary 2025-01-16 06:15:51 +00:00
PAU ROVIRA ROSALENY ce7e529776 Merge branch 'dev' into 7077-testVnInputTime 2025-01-16 06:15:36 +00:00
Alex Moreno c6d7008ed5 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1149) from 8316-orderCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1149
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 11:41:35 +00:00
Alex Moreno a153dd8860 fix: refs #8316 use section-searchbar 2025-01-15 12:11:10 +01:00
Alex Moreno 3cef713058 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:06:17 +01:00
Alex Moreno 56e0965499 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-15 12:05:38 +01:00
Alex Moreno a15d052589 Merge pull request '8197-fix_searchbar_teleport' (!1204) from 8197-fix_searchbar_teleport into test 
Reviewed-on: verdnatura/salix-front#1204
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-01-15 11:05:33 +00:00
Alex Moreno 7661f9e633 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-15 11:04:39 +00:00
Alex Moreno 9765066493 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 12:03:02 +01:00
Jon Elias 6724818ebe Merge pull request '#8247: Fixed acls and added lost options' (!1159) from 8247-EnableAccount into dev 
Reviewed-on: verdnatura/salix-front#1159
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-15 10:53:10 +00:00
Jon Elias c193ce33f6 Merge branch 'dev' into 8247-EnableAccount 2025-01-15 10:51:33 +00:00
Alex Moreno 7e0096cf30 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8316-orderCardWithVnCardBeta 2025-01-15 11:50:11 +01:00
PAU ROVIRA ROSALENY 979353119a refactor: refs #7087 removed unused imports 2025-01-15 09:56:43 +01:00
PAU ROVIRA ROSALENY 01b6e94008 Merge branch '7077-testVnInputTime' of https://gitea.verdnatura.es/verdnatura/salix-front into 7077-testVnInputTime 2025-01-15 09:56:01 +01:00
PAU ROVIRA ROSALENY 6a88cad903 fix: refs #7077 removed unused imports 2025-01-15 09:55:59 +01:00
PAU ROVIRA ROSALENY 46bfd3b115 Merge branch 'dev' into 7077-testVnInputTime 2025-01-15 08:54:58 +00:00
PAU ROVIRA ROSALENY 76968fe6bd fix: refs #7087 fixed some tests 2025-01-15 09:01:37 +01:00
PAU ROVIRA ROSALENY 8e4a92b6be Merge branch 'dev' into 7087-testCardSummary 2025-01-15 07:58:00 +00:00
PAU ROVIRA ROSALENY d435a44faa Merge branch '7087-testCardSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary 2025-01-15 08:55:19 +01:00
PAU ROVIRA ROSALENY 6ecbaf1a04 Merge branch '7087-testCardSummary' of https: refs #7087//gitea.verdnatura.es/verdnatura/salix-front into 7087-testCardSummary 2025-01-15 08:55:16 +01:00
PAU ROVIRA ROSALENY 54867597aa feat: refs #7087 added new test 2025-01-15 08:52:43 +01:00
Alex Moreno 6de8687be1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-15 07:12:09 +01:00
Alex Moreno dd41141cf1 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-15 07:11:51 +01:00
PAU ROVIRA ROSALENY 698c20550f Merge branch 'dev' into 7077-testVnInputTime 2025-01-14 13:49:32 +00:00
Jon Elias 372a43b17e Merge pull request 'Fix: Fixed CustomerDescriptor' (!1212) from Fix-CustomerIcons into dev 
Reviewed-on: verdnatura/salix-front#1212
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-14 11:03:39 +00:00
Javier Segarra ed483baef6 Merge pull request 'Hotfix: VnLocation' (!1211) from hotfix_vnLocation_selectValue into master 
Reviewed-on: verdnatura/salix-front#1211
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-14 11:01:50 +00:00
Javier Segarra 4c4d5649ba Merge branch 'dev' into Fix-CustomerIcons 2025-01-14 11:01:43 +00:00
Javier Segarra 6f50d44772 Merge branch 'master' into hotfix_vnLocation_selectValue 2025-01-14 11:00:38 +00:00
Jose Antonio Tubau a36c2ec32a Merge pull request 'test: refs #7076 added new test for VnInputDate' (!1188) from 7076-createTestVnInputDate into dev 
Reviewed-on: verdnatura/salix-front#1188
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-14 09:10:40 +00:00
Jose Antonio Tubau ec44bfbc11 Merge branch 'dev' into 7076-createTestVnInputDate 2025-01-14 08:43:15 +00:00
Jon Elias 8dc2955109 Merge branch 'dev' into Fix-CustomerIcons 2025-01-14 08:18:24 +00:00
Jon Elias 25dd028487 fix: modified setData in customerDescriptor to show the icons 2025-01-14 09:15:53 +01:00
Alex Moreno e61ce651ca Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-14 09:10:35 +01:00
Alex Moreno 6af26f0310 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-14 08:09:55 +00:00
Alex Moreno 30e501610d fix: parallelism 2025-01-14 09:09:26 +01:00
Javier Segarra 8b7337f9ee fix: vnlocation 2025-01-14 08:37:10 +01:00
Alex Moreno 0dc0c9efd0 Merge branch 'test' into dev 2025-01-14 08:18:49 +01:00
Alex Moreno 837c389f64 feat(cliamList): add auto-load, in this case they need it 2025-01-14 08:16:44 +01:00
Jose Antonio Tubau bd9c2ad4dc refactor: refs #8316 remove unused OrderSearchbar component 2025-01-14 07:57:54 +01:00
Jon Elias 6e5b703018 fix: refs #8247 conflicts 2025-01-14 07:47:33 +01:00
Jon Elias 179571e3e9 Merge branch 'dev' of https: refs #8247//gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount 2025-01-14 07:46:34 +01:00