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

1923 Commits

Author SHA1 Message Date
Jon Elias 4ddcbaeacd refactor: refs #7239 fixed errors 2024-04-23 07:15:39 +02:00
Jon Elias dd74c7d507 refactor: refs #7239 changed translations 2024-04-22 13:17:22 +02:00
Jon Elias 8fadccce92 Merge branch 'dev' into 7139-changeColumnsInRouteSummary 2024-04-18 12:48:02 +00:00
Guillermo Bonet 9b5e8024be Merge branch 'dev' into 6724-disableEntryBooked 2024-04-18 11:18:22 +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 c60558420f fix: refs #6425 fixed vitest config to avoid testing problems 2024-04-18 12:38:43 +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
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
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
Javier Segarra 817a8fcc71 Merge branch 'dev' into 7180_bug_supplierListScroll 2024-04-18 06:06:01 +00: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
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
William Buezas 1dfaef2ffa Resolve conflicts 2024-04-17 08:26:12 -03:00
Javier Segarra 37ad84f239 perf(lilium): refs #6930 Improve setToken fn 2024-04-17 10:09:44 +02:00
Javier Segarra b95d44c05d feat(lilium): refs #6930 Undo rollback lilium 2024-04-17 10:07:44 +02:00
Guillermo Bonet b4462fcdb5 Merge branch 'dev' into 6968-groupingModeRefactor 2024-04-17 06:44:24 +00:00
Javier Segarra 248416b676 fix(lilium) #7180 SupplierList Scroll 2024-04-17 08:41:47 +02:00
William Buezas a397c6ed30 remove component import 2024-04-16 12:18:36 -03:00
Alex Moreno 4f286cd032 Merge branch 'dev' into 6425-fixDevTranslations 2024-04-16 12:32:46 +00:00
William Buezas 2ab7a45114 resolve conflicts 2024-04-16 08:49:34 -03:00
Javier Segarra adb31497e5 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-16 10:20:25 +00:00
Jon Elias b216112d2a refactor: refs #6425 fix failed tests 2024-04-16 11:42:43 +02:00
Guillermo Bonet 7b29832966 feat: refs #6968 Changed groupingMode to enum 2024-04-16 11:12:23 +02:00
Jon Elias 73c5a5b7d2 fix: refs #6425 fixed dev translations 2024-04-16 11:00:38 +02:00
Robert Ferrús 81f29d815d Merge branch '6679-addCreateIcon' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 09:33:58 +02:00
Robert Ferrús 87ae6870a9 feat: refs #6679 add icon 2024-04-16 09:33:56 +02:00
Robert Ferrús 130869dcdb Merge branch 'dev' into 6679-addCreateIcon 2024-04-16 07:30:27 +00:00
Robert Ferrús d178d7dc6a feat: refs #6679 add icon 2024-04-16 08:04:57 +02:00
Robert Ferrús d70da976c2 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6679-addCreateIcon 2024-04-16 08:04:23 +02:00
Guillermo Bonet 46fa06cf1e feat: refs #6724 Restriction QCheckbox entry isBooked 2024-04-16 07:14:00 +02:00
Guillermo Bonet de68af5e13 feat: refs #6724 Disabled QCheckbox entry isBooked 2024-04-15 14:17:23 +02:00
William Buezas d9d868a6af Waste breakdown 2024-04-15 09:02:35 -03:00
William Buezas c50741b4bf Remove single quotes 2024-04-15 08:51:48 -03:00
Jorge Penadés b2211369ea fix: refs #6938 remove personal phone 2024-04-15 13:30:42 +02:00
Jorge Penadés 1e77e82784 fix: refs #6938 id filter 2024-04-15 13:28:10 +02:00
Robert Ferrús 058ddc8e9a feat: refs #6500 2024-04-15 13:18:39 +02:00
Javier Segarra e1716b9ea4 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-04-15 13:11:21 +02:00
Jorge Penadés 68069ba9c6 feat: refs #6938 hide personal phone 2024-04-15 12:48:07 +02:00
Alex Moreno 6e0510f0bd feat(supplierSummary): refs #6898 use VnTitle 2024-04-15 08:58:39 +02:00
William Buezas beaffbf685 delete old i18n files and adapt branch to the new ones 2024-04-12 10:20:05 -03:00
William Buezas d38c85a0ef resolve conflicts 2024-04-12 09:39:34 -03:00
William Buezas b4d92d4f97 Fix Options item labels 2024-04-12 09:35:57 -03:00
Jon Elias 5cd32ec2fe Merge branch 'dev' into 6425-translationProposal 2024-04-12 12:21:41 +00:00