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

7314 Commits

Author SHA1 Message Date
Guillermo Bonet 9b5e8024be Merge branch 'dev' into 6724-disableEntryBooked 2024-04-18 11:18:22 +00:00
William Buezas 75dc81eba7 add column filters 2024-04-18 08:16:37 -03:00
Javier Segarra 56333937ce Merge branch '6772_reload_sections' of https://gitea.verdnatura.es/verdnatura/salix-front into 6772_reload_sections 2024-04-18 13:16:18 +02:00
Javier Segarra 3359d5b6ae refs #6772: Improve reloadRoute 2024-04-18 13:16:14 +02:00
Jon Elias 3f8cafd201 style: refs #6899 fixed style 2024-04-18 13:14:59 +02:00
Javier Segarra 33fe01ad78 Merge branch 'dev' into 6772_reload_sections 2024-04-18 11:11:23 +00:00
Javier Segarra 6ab7b4b68d Merge pull request '#7180 - Error Supplier List Scroll NOT working' (!298) from 7180_bug_supplierListScroll into dev 
Reviewed-on: verdnatura/salix-front#298
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-18 11:07:44 +00:00
Javier Segarra 82937a103d Merge branch 'dev' into 7180_bug_supplierListScroll 2024-04-18 11:06:33 +00:00
Guillermo Bonet 7eb9666c7c Merge branch 'dev' into 6724-disableEntryBooked 2024-04-18 11:06:30 +00:00
Jon Elias f3b893de67 Merge branch 'dev' into 7139-changeColumnsInRouteSummary 2024-04-18 11:06:17 +00:00
Jon Elias 1f0394b5fc refactor: refs #7139 fixed error in translation 2024-04-18 12:45:45 +02:00
Jon Elias 3233210300 Merge pull request 'fix: refs #6425 fixed vitest config to avoid testing problems' (!306) from 6425-changedVitestConfig into dev 
Reviewed-on: verdnatura/salix-front#306
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-18 10:42:50 +00:00
Jon Elias c60558420f fix: refs #6425 fixed vitest config to avoid testing problems 2024-04-18 12:38:43 +02:00
Javier Segarra e6da61c631 Merge branch 'dev' into 6772_reload_sections 2024-04-18 09:50:59 +00:00
Javier Segarra 51bc3b6cba refs #6772: Improve by ClaimDevelopment 2024-04-18 11:48:17 +02:00
Javier Segarra 7f63ea4e1c Actualizar src/composables/useArrayData.js 2024-04-18 09:37:01 +00:00
Javier Segarra 846c85ed1a Actualizar src/components/ui/VnPaginate.vue 2024-04-18 09:36:24 +00:00
Jon Elias bb97acc261 Merge pull request '#7130 - addFieldInRoutes' (!259) from 7130-addFieldInRoutes into dev 
Reviewed-on: verdnatura/salix-front#259
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-18 09:34:31 +00:00
Jorge Penadés 75975b631e feat: refs #6480 include SearchBar into VnCard 2024-04-18 11:32:03 +02:00
Jorge Penadés 90ed6ad09a fix: refs #6480 drop secondary acroos 2024-04-18 10:49:17 +02:00
Alex Moreno 69850d65e7 fix(VnNotes) refs #7226 use v-bind 2024-04-18 10:13:36 +02:00
Javier Segarra 43976e8ced fix minor bug to show 2024-04-18 07:37:19 +00:00
Alex Moreno e804af3512 Merge branch 'dev' into 7130-addFieldInRoutes 2024-04-18 07:25:32 +00:00
Javier Segarra 459328b28c Merge branch 'dev' into 6772_reload_sections 2024-04-18 08:49:33 +02:00
Jorge Penadés b71068ac64 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-18 08:44:10 +02:00
Javier Segarra 19e5694e09 Merge pull request '#6907 - input_clearable_hover' (!198) from 6907_fix_input_clearable_hover into dev 
Reviewed-on: verdnatura/salix-front#198
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-04-18 06:42:28 +00:00
Jon Elias 062d743896 refactor: refs #7139 replace warehouse with ticket 2024-04-18 08:20:20 +02:00
Javier Segarra 5382f306e2 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-18 06:18:02 +00:00
Alex Moreno 84dfd6d474 hotFix(workerDms): use undefined 2024-04-18 08:12:11 +02:00
Javier Segarra 817a8fcc71 Merge branch 'dev' into 7180_bug_supplierListScroll 2024-04-18 06:06:01 +00:00
Jon Elias ace55c554f refactor: refs #6899 corrected Lilium styles and functionalities 2024-04-18 08:03:57 +02:00
Alex Moreno 180637fefc Merge pull request '7226-testToMaster_2416' (!303) from 7226-testToMaster_2416 into master 
Reviewed-on: verdnatura/salix-front#303
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-04-18 05:41:10 +00:00
William Buezas 5addd0056d Add filter panel 2024-04-17 17:18:38 -03:00
William Buezas 2903c6a2bf table adjustments 2024-04-17 14:55:17 -03:00
Alex Moreno ebd02987b9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-04-17 16:34:06 +02:00
Alex Moreno 873d528e0d Merge pull request 'Waste breakdown' (!291) from hyervoni/salix-front-mindshore:feature/WasteBreakdown into dev 
Reviewed-on: verdnatura/salix-front#291
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-17 12:52:16 +00:00
Jorge Penadés d6508f1930 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard 2024-04-17 14:20:00 +02:00
Jon Elias 79a90c1163 fix: refs #7130 fix conflicts 2024-04-17 13:48:56 +02:00
William Buezas 5551189f2f resolve conflicts 2024-04-17 08:46:37 -03:00
Javier Segarra 13214582ac Merge pull request 'Item create view' (!285) from hyervoni/salix-front-mindshore:feature/ItemCreate into dev 
Reviewed-on: verdnatura/salix-front#285
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-04-17 11:42:50 +00:00
William Buezas f5d8e94a24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/ItemCreate 2024-04-17 08:41:13 -03:00
Javier Segarra 95cd795e7b Merge pull request 'feat(lilium): refs #6930 Undo rollback salix-back' (!301) from 6930_undo_rollback into dev 
Reviewed-on: verdnatura/salix-front#301
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-04-17 11:38:29 +00:00
Javier Segarra 5d7cee38bd feat(lilium): refs #6930 Undo rollback salix-back 2024-04-17 11:26:35 +00:00
William Buezas 1dfaef2ffa Resolve conflicts 2024-04-17 08:26:12 -03:00
Jon Elias 6839b5aac2 refactor: refs #6767 deleted <div class="col"> 2024-04-17 13:26:08 +02:00
William Buezas da06e7bc87 WIP 2024-04-17 08:13:34 -03:00
Javier Segarra 55dd401064 Merge pull request '#6930 - Revert/Undo rollback' (!299) from 6930_undo_rollback into dev 
Reviewed-on: verdnatura/salix-front#299
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-04-17 11:04:48 +00:00
Alex Moreno 52a0be449d feat: refs #6336 redesign 2024-04-17 10:58:07 +02:00
Alex Moreno c4c317ef41 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-claim_changes_v3 2024-04-17 10:53:18 +02:00
Javier Segarra 37ad84f239 perf(lilium): refs #6930 Improve setToken fn 2024-04-17 10:09:44 +02:00