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

1447 Commits

Author SHA1 Message Date
Jorge Penadés 1d7316dd6d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6654-stickySubToolbar 2024-01-29 14:10:58 +01:00
Carlos Satorres 510d9d1731 Merge pull request 'refs #6664 popup' (!153) from 6664-portesClaim into dev 
Reviewed-on: verdnatura/salix-front#153
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-29 11:36:42 +00:00
Alex Moreno 05c6825141 Merge branch 'dev' into 6664-portesClaim 2024-01-29 11:32:06 +00:00
Carlos Satorres afcfd645ce Merge branch '6664-portesClaim' of https://gitea.verdnatura.es/verdnatura/salix-front into 6664-portesClaim 2024-01-29 11:48:20 +01:00
Carlos Satorres 324d6da3a3 refs #6664 claimfix 2024-01-29 11:48:18 +01:00
Jorge Penadés 0edfe24a85 fix: refs #6654 fix css 2024-01-29 10:25:59 +01:00
Alex Moreno f715c615d2 Merge pull request 'refs #6681 - PR3 - Resolve conflicts' (!166) from hyervoni-PR-3 into dev 
Reviewed-on: verdnatura/salix-front#166
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-01-29 08:29:43 +00:00
Alex Moreno 935211a71f refs #6681 try fix jenkins 2024-01-29 08:41:38 +01:00
Alex Moreno 70e912fc92 refs #6681 try fix jenkins 2024-01-29 08:38:55 +01:00
Alex Moreno 30ff6e52cc Empty commit 2024-01-29 08:30:41 +01:00
Alex Moreno f8e7ba4dac Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into hyervoni-PR-3 2024-01-29 08:15:25 +01:00
carlosfonseca 9a23bb2ed2 Se corrige comentario 39968 2024-01-26 11:08:45 -05:00
Jorge Penadés d86ac6f31b feat: refs #6654 sticky class 2024-01-26 16:08:49 +01:00
Carlos Satorres 2fd0cef161 Merge branch 'dev' into 6664-portesClaim 2024-01-25 14:07:04 +00:00
Carlos Satorres 67d95f9ad0 refs #6664 vnConfirm og 2024-01-25 14:44:41 +01:00
Carlos Satorres 35aa0ba20a refs #6664 claimPortes 2024-01-25 13:48:42 +01:00
Alex Moreno 55916deaab Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-25 08:59:41 +01:00
Alex Moreno 47fd0b2dfd refs #6745 fix(claimDescriptor= claimRatio label. fix(TicketSummary): state can be null 2024-01-25 08:46:51 +01:00
Carlos Satorres 8ae7756e9a refs #6664 btn 2024-01-24 14:58:33 +01:00
Carlos Satorres e47561df86 refs #6664 disable 2024-01-24 13:50:04 +01:00
Carlos Satorres 4992acbbde Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6664-portesClaim 2024-01-24 09:44:15 +01:00
Carlos Satorres 976c6aabda Merge pull request 'refs #6655 remove clickStop' (!162) from 6655-clickNames into dev 
Reviewed-on: verdnatura/salix-front#162
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-23 09:06:09 +00:00
carlosfonseca 3fc1bff213 Se hace correccion solicitada en issuecomment-39650 2024-01-22 11:27:48 -05:00
carlosfonseca 23210600ac Se hace correccion solicitada en issuecomment-39539 2024-01-22 11:00:03 -05:00
William Buezas 4731bdbabd Make card-list a global class 2024-01-22 12:25:59 -03:00
William Buezas 29dac7c372 Merge branch 'PR-3' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into PR-3 2024-01-22 12:12:14 -03:00
William Buezas def175bee2 move QList element and classes inside VnFilterPanel 2024-01-22 12:11:51 -03:00
carlosfonseca 30c90e534c Se hace correccion solicitada en issuecomment-39493 2024-01-22 08:44:15 -05:00
Carlos Satorres 676b178892 refs #6655 remove clickStop 2024-01-22 14:24:01 +01:00
carlosfonseca 9d4d3bf84d Se hace correccion solicitada en issuecomment-39488 2024-01-22 07:55:30 -05:00
carlosfonseca 9c2267e116 Se hace correccion solicitada en issuecomment-39487 2024-01-22 07:01:41 -05:00
carlosfonseca 2400eca1e3 Se hace correccion solicitada en issuecomment-39495 2024-01-22 06:53:47 -05:00
William Buezas 533435c7ba Remove pre tag in WorkerCreate component 2024-01-19 15:16:36 -03:00
William Buezas a888472ad2 Fix tooltip label in supplier agency term 2024-01-19 11:34:07 -03:00
William Buezas 5d0290f585 Fix QFile label translation in entry buys 2024-01-19 11:29:43 -03:00
William Buezas cae42486c8 apply nowrap to QTooltip 2024-01-19 11:25:19 -03:00
William Buezas c7b9f4ce5b Change entry buys plural translation logic 2024-01-19 11:16:35 -03:00
William Buezas 862dc20bcd Add translation to SupplierCard search-bar 2024-01-19 10:48:23 -03:00
Alex Moreno b3fc865c18 refs #6718 fix: useArrayDataStore 2024-01-18 15:45:44 +01:00
William Buezas 9588ffb54b remove log 2024-01-18 11:20:21 -03:00
William Buezas f66af0e663 Merge pull request 'Create Route module' (#73) from feature/routes into dev 
Reviewed-on: hyervoni/salix-front-mindshore#73
 2024-01-18 13:22:20 +00:00
Kevin Martinez 661e9d4368 Create route summary 2024-01-18 08:45:41 -04:00
William Buezas 553dfceca8 Merge pull request 'feature/ApplyFilterSectionToEntryList' (#76) from feature/ApplyFilterSectionToEntryList into dev 
Reviewed-on: hyervoni/salix-front-mindshore#76
 2024-01-18 12:22:47 +00:00
William Buezas 161bfab443 Add subfilter to entry list view and entry descriptor improvements 2024-01-18 08:58:04 -03:00
Javier Segarra cf6a26b742 Merge pull request '#6074 ArrayData.Skip filter bug' (!156) from 6704_fixArrayDataSkipFilter into dev 
Reviewed-on: verdnatura/salix-front#156
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-18 07:44:18 +00:00
Kevin Martinez 8f47a0bc2b Update router list 2024-01-17 18:02:39 -04:00
William Buezas 4b69c69253 Merge pull request 'feature/ms-141-EntrySubmoduleNotes' (#74) from feature/ms-141-EntrySubmoduleNotes into dev 
Reviewed-on: hyervoni/salix-front-mindshore#74
 2024-01-17 20:37:55 +00:00
William Buezas d818dd745a merge with dev and resolve conflicts 2024-01-17 17:37:12 -03:00
William Buezas 13de9a4b23 Merge pull request 'feature/ms-138-EntryDescriptor' (#72) from feature/ms-138-EntryDescriptor into dev 
Reviewed-on: hyervoni/salix-front-mindshore#72
 2024-01-17 20:35:48 +00:00
Carlos Fonseca 039a9332a9 Merge pull request 'Se crea la tarjeta de creditos, listado y creacion' (#75) from features/ms_119_credits_card into dev 
Reviewed-on: hyervoni/salix-front-mindshore#75
 2024-01-17 20:27:30 +00:00