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

4186 Commits

Author SHA1 Message Date
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
William Buezas 2ea6fd2ea6 Change vnconfirm export name 2024-03-19 13:50:15 -03:00
William Buezas 7ff8bc642e WIP 2024-03-19 13:39:46 -03:00
Pablo Natek 22eef14bb3 feat(light theme): refs #7001 add light theme 2024-03-19 11:15:54 +01:00
Kevin Martinez cf25476a5d Create worker log 2024-03-18 21:04:52 -03:00
Alex Moreno 9094ae8c88 test(VnPaginate) fix 2024-03-18 15:02:50 +01:00
Carlos Fonseca 5867649d0c Merge branch 'dev' into features/ms_submodulos_worker 2024-03-18 13:50:06 +00:00
carlosfonseca 844cd0e12b Desarrollo de los submodulos basic data, notes y pbx 2024-03-18 08:39:10 -05:00
Pablo Natek 2386090c15 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-18 13:56:18 +01:00
Alex Moreno e4cbaf303e Merge pull request '#6930 - FIX bug logout' (!242) from 6930_fix_bug into dev 
Reviewed-on: verdnatura/salix-front#242
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-18 12:35:01 +00:00
Alex Moreno 4b03405474 Merge branch 'dev' into 6930_fix_bug 2024-03-18 12:33:20 +00:00
Alex Moreno 62253e2282 refs #6546 test(VnPaginate) skip 2024-03-18 13:33:02 +01:00
Alex Moreno e99b727b77 Merge branch 'dev' into 6993-HideAllPagination 2024-03-18 11:01:23 +00:00
Javier Segarra fd0d0283a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-18 10:53:12 +01:00
Jon Elias d365a36c7e fixed useless variable 2024-03-18 09:51:30 +01:00
Jon Elias fe7d370a0a refactor: refs #6837 move travel search like other sections 2024-03-18 09:48:27 +01:00
Jorge Penadés f0e414e160 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-18 09:47:06 +01:00
Jorge Penadés 5803b8392b feat: refs #6951 clone ticket 2024-03-15 16:30:12 +01:00
William Buezas 643e068863 remove tabs in docker-compose.yml 2024-03-15 10:51:20 -03:00
William Buezas dce974eba4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-15 10:20:46 -03:00
William Buezas d12fa85d73 WIP 2024-03-15 10:20:07 -03:00
Jon Elias 8ebf4be807 refs: #6993 deleted useless files 2024-03-15 14:09:05 +01:00