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

4007 Commits

Author SHA1 Message Date
Jon Elias 4678085575 Merge branch 'dev' into 6837-moveSearchById 2024-03-22 12:48:30 +00:00
Jon Elias 17145b7fe8 fix: refs #6988 fix style 2024-03-22 13:36:31 +01:00
Jon Elias 0a2e8a7995 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6988-SummaryRefactor 2024-03-22 13:29:17 +01:00
William Buezas bdd0e657ec Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/WorkerTimeControl 2024-03-22 08:36:41 -03:00
Carlos Satorres a284f5ce5f refs #6905 fix 2024-03-22 11:56:44 +01:00
Carlos Satorres 95d943e6f5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig 2024-03-22 10:17:36 +01:00
Javier Segarra 8a82b7ab38 refs #7124 perf: avoid focus in disabled fields 2024-03-22 09:55:16 +01:00
Jon Elias 0c8f5f4888 refactor: refs #6971 moved correct button + unmade previous changes 2024-03-22 08:15:00 +01:00
Javier Segarra 7ae05a3e52 refs #6911: perf KeyCode is deprecated 2024-03-22 06:35:47 +00:00
Javier Segarra b11462e244 refs #7124 perf: avoid focus in VnFilterPanel 2024-03-22 07:32:33 +01:00
Javier Segarra c4f7b5e7c0 refs #7124 perf: use find instead findIndex 2024-03-22 07:32:21 +01:00
Javier Segarra 36a6554fb1 Merge branch 'dev' into 6907_fix_input_clearable_hover 2024-03-22 06:16:40 +00:00
William Buezas d20828ac7c remove console.logs 2024-03-21 13:15:11 -03:00
Jorge Penadés f86c331afa feat: refs #5186 use arrayData in descriptor 2024-03-21 16:38:49 +01:00
Jorge Penadés 4f242b0840 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-21 15:31:15 +01:00
William Buezas aa8e052633 QCalendar implementation test 2024-03-21 11:15:18 -03:00
Javier Segarra 561a7a5286 refs #7124 perf: whitespace 2024-03-21 15:03:48 +01:00
Javier Segarra d7d83fd886 refs #7124 feat: autofocus without property 2024-03-21 14:56:39 +01:00
Pablo Natek b3a889e8f6 Merge pull request 'fix(styles): refs #7001 create VnTitle and correct background-page color' (!238) from 7001-fixStyles into dev 
Reviewed-on: verdnatura/salix-front#238
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-21 12:43:57 +00:00
Javier Segarra fedec76b62 refs #6907 feat: merge changes 2024-03-21 13:11:22 +01:00
William Buezas 65da9a3e69 resolve conflicts 2024-03-21 08:53:42 -03:00
William Buezas fc5d858bf1 WIP 2024-03-21 08:37:11 -03:00
Javier Segarra 18d4be0ea2 refs #6907 feat: merge changes 2024-03-21 12:33:28 +01:00
Jon Elias 61e7a77882 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6971-MoveBtnToSubtoolbar 2024-03-21 12:25:04 +01:00
Jon Elias 7658573ec6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6425-translationProposal 2024-03-21 12:23:45 +01:00
Jon Elias 63c6b523fb refactor: refs #6425 new translation proposal 2024-03-21 12:14:54 +01:00
Kevin Martinez f6e3b3607a Merge branch 'salix-dev' into feature/worker-log 2024-03-21 08:01:57 -03:00
Javier Segarra f5d6c45339 refs #6907 updates 2024-03-21 10:45:30 +01:00
Pablo Natek eb799c6321 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-21 10:37:48 +01:00
Javier Segarra 4ffabaa4f2 Merge branch '6907_fix_input_clearable_hover' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover 2024-03-21 10:30:59 +01:00
Javier Segarra 85a78d847b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6907_fix_input_clearable_hover 2024-03-21 10:30:51 +01:00
Alex Moreno 13a0e683f4 Merge pull request '7118_testToMaster_2412' (!249) from 7118_testToMaster_2412 into master 
Reviewed-on: verdnatura/salix-front#249
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-03-21 06:34:43 +00:00
Carlos Fonseca 142155e14e Merge branch 'dev' into features/ms_submodulos_worker 2024-03-20 16:55:09 +00:00
carlosfonseca c06d810fe9 Soluciones a comentarios 1 2024-03-20 11:53:03 -05:00
Javier Segarra 166e40833d Merge pull request 'feature/InvoicesOutCorrections' (!232) from hyervoni/salix-front-mindshore:feature/InvoicesOutCorrections into dev 
Reviewed-on: verdnatura/salix-front#232
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-20 13:34:34 +00:00
William Buezas cb51edff04 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-20 10:32:47 -03:00
William Buezas 522b01b293 WIP 2024-03-20 10:31:42 -03:00
jcasado 2f27b8537c refactor: #6946 add table and floating button 2024-03-20 12:50:47 +01:00
Pablo Natek 12efc8dc11 Merge branch '7001-fixStyles' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-20 11:41:18 +01:00
Pablo Natek 1da314e425 fix(claimLines): refs #7001 add style to clear qchip 2024-03-20 11:41:16 +01:00
Pablo Natek 17cb91e79a Merge branch 'dev' into 7001-fixStyles 2024-03-20 10:32:37 +00:00
Pablo Natek 5580d15606 remove: refs #7001 custom chip 2024-03-20 11:30:43 +01:00
Pablo Natek 2fa5b1303d remove(vnChip): refs #7001 remove component 2024-03-20 11:28:50 +01:00
Carlos Satorres 096287b3be Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig 2024-03-20 10:20:07 +01:00
Carlos Satorres 798ffa7de3 refs #6905 fix 2024-03-20 10:20:05 +01:00
Carlos Satorres 01c3218ae4 Merge branch 'dev' into 6905-userPanelConfig 2024-03-20 08:51:09 +00:00
Carlos Satorres 0946a34422 Merge branch '6905-userPanelConfig' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-userPanelConfig 2024-03-20 09:38:14 +01:00
Carlos Satorres 89fc147ad8 refs #6905 fix traduction 2024-03-20 09:38:11 +01:00
Alex Moreno 02574ec42d Merge pull request 'test(VnPaginate) fix' (!246) from fix_VnPaginate_paginate into dev 
Reviewed-on: verdnatura/salix-front#246
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-03-20 07:23:17 +00:00
Pablo Natek 25aea39bfc fix(spec): refs #7001 fix som e2e spec 2024-03-20 08:03:25 +01:00