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

8538 Commits

Author SHA1 Message Date
Javier Segarra 0da3bcdf40 Merge branch 'dev' into 7308_warning 2025-01-15 20:10:05 +00:00
Javier Segarra 2d8dd46d15 fix: remove console 2025-01-15 20:09:56 +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
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
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
Alex Moreno 63a6073cce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-14 07:37:37 +01:00
Jon Elias 3adec919dc Merge branch '8247-EnableAccount' of https://gitea.verdnatura.es/verdnatura/salix-front into 8247-EnableAccount 2025-01-14 07:37:22 +01:00
Jon Elias e5d8bfcf3a refactor: refs #8247 use new acl for sysadmin 2025-01-14 07:37:17 +01:00
Alex Moreno bce40834a5 Merge pull request '8389-testToMaster' (!1207) from 8389-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1207
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-01-14 06:32:35 +00:00
Alex Moreno 099ea793bd fix: refs #8389 minor bugs 2025-01-14 07:29:44 +01:00
PAU ROVIRA ROSALENY b8344f3b22 Merge pull request 'feat: refs #7055 created FilterItemForm test' (!1187) from 7055-testFilterItemForm into dev 
Reviewed-on: verdnatura/salix-front#1187
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-14 06:03:50 +00:00
PAU ROVIRA ROSALENY 34442c8577 Merge branch 'dev' into 7055-testFilterItemForm 2025-01-14 05:59:53 +00:00
Jorge Penadés 8d1a095302 Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-13 15:15:23 +00:00
Alex Moreno dbafd5d689 build: refs #8389 changelog 2025-01-13 15:24:20 +01:00
Alex Moreno 863d6deb10 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-13 14:49:15 +01:00
Alex Moreno 5a58012f80 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-13 14:49:02 +01:00
Alex Moreno 01a6d714eb Merge branch 'test' into 8197-fix_searchbar_teleport 2025-01-13 13:36:56 +00:00
Jon Elias 07ecd93fe0 Merge pull request 'Warmfix: Redirect to TicketSales when confirming lines' (!1203) from Warmfix-OrderProblems into test 
Reviewed-on: verdnatura/salix-front#1203
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 13:33:35 +00:00
Alex Moreno 671f308006 revert: revert header 2025-01-13 13:29:39 +01:00
Javier Segarra 7f281b8630 perf: refs #7308 call 1 time useSession 2025-01-13 12:30:07 +01:00
PAU ROVIRA ROSALENY 50008ce7f1 fix: refs #7055 #7055 #7055 fixed some tests 2025-01-13 12:27:26 +01:00
Jorge Penadés a32ec49efd Merge pull request 'fix: refs #8110 prevent form submit' (!1205) from 8110-hotfix-solveConflicts into master 
Reviewed-on: verdnatura/salix-front#1205
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-13 11:25:23 +00:00
Jorge Penadés ac589a8626 fix: refs #8110 prevent form submit 2025-01-13 12:21:33 +01:00
Javier Segarra 70000e3eca Merge branch 'dev' into 7308_warning 2025-01-13 12:19:44 +01:00