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

2117 Commits

Author SHA1 Message Date
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
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 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
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
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
Pablo Natek 22eef14bb3 feat(light theme): refs #7001 add light theme 2024-03-19 11:15:54 +01:00
Alex Moreno 9094ae8c88 test(VnPaginate) fix 2024-03-18 15:02:50 +01: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
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
Javier Segarra de5260b563 Merge branch 'dev' into 6930_fix_bug 2024-03-15 13:09:01 +00:00
Alex Moreno 79b242f3a6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-03-15 14:08:30 +01:00
Javier Segarra 55ef37584a refs #6993 fix test front 2024-03-15 14:07:28 +01:00
Javier Segarra 63d195cbbf refs #6930 perf: refactor destroy method 2024-03-15 13:21:26 +01:00
Javier Segarra 0d3d002baf refs #6930 perf: replace label 2024-03-15 12:43:56 +01:00
Javier Segarra 445d95057a refs #6930 feat: trycatchfinally logout 2024-03-15 12:42:08 +01:00
Alex Moreno 0fe0a6385b hotFix(Readme): change bun to pnpm 2024-03-15 10:43:25 +01:00
Javier Segarra 26e54923de Merge pull request '#6930 - Use ScopedToken when share Multimedia files' (!202) from 6930_scopedToken_Multimedia into dev 
Reviewed-on: verdnatura/salix-front#202
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-15 09:08:20 +00:00
Javier Segarra efb3ae6e2a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6930_scopedToken_Multimedia 2024-03-15 09:47:13 +01:00
Javier Segarra 4f441ad5bc Merge pull request 'HOTFIX vnlocation.spec' (!240) from hotfix_spec_vnlocation into test 
Reviewed-on: verdnatura/salix-front#240
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-15 06:18:29 +00:00
Pablo Natek 077fa7e2a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7001-fixStyles 2024-03-14 15:10:41 +01:00
Pablo Natek 00a47cd5b2 refactor(style): refs #7001 add style font vnTitle vnChip 2024-03-14 15:06:06 +01:00
William Buezas 22c49d9cf7 resolve conflicts 2024-03-14 09:50:27 -03:00
Javier Segarra 278ebbe070 Merge pull request 'Modulo de rutas' (!195) from hyervoni/salix-front-mindshore:feature/route-module into dev 
Reviewed-on: verdnatura/salix-front#195
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-14 12:44:43 +00:00
Kevin Martinez 8587d46943 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/pages/Route/Card/RouteSummary.vue
 2024-03-14 08:05:51 -03:00
Javier Segarra f1d21915eb fix vnlocation.spec 2024-03-14 09:28:28 +00:00
Alex Moreno 78e3cff397 refs #7033 deploy: init version 2414 2024-03-14 09:08:27 +01:00
Alex Moreno 09e18dfc01 refs #7033 deploy(2412): dev to test 2024-03-14 09:07:34 +01:00
Alex Moreno c39afd0b75 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-03-14 08:18:53 +01:00
Alex Moreno 1d401ed537 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-03-14 08:18:36 +01:00
Alex Moreno 7a75238695 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-03-14 08:16:15 +01:00
Alex Moreno ab8e1fdc04 Merge pull request 'CambiosSolicitadosEntries' (!201) from hyervoni/salix-front-mindshore:CambiosSolicitadosEntries into dev 
Reviewed-on: verdnatura/salix-front#201
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-14 06:39:45 +00:00
William Buezas f26d14e875 resolve conflicts 2024-03-13 12:57:41 -03:00
Javi Gallego e1cf13076f Merge pull request 'CambiosSolicitadosSuppliers' (!214) from hyervoni/salix-front-mindshore:CambiosSolicitadosSuppliers into dev 
Reviewed-on: verdnatura/salix-front#214
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-03-13 14:37:59 +00:00
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers 2024-03-13 14:37:06 +00:00
Javi Gallego 9e87365bd7 Merge pull request 'Workers PDA' (!234) from hyervoni/salix-front-mindshore:feature/WorkerPDA into dev 
Reviewed-on: verdnatura/salix-front#234
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-03-13 14:36:48 +00:00
Kevin Martinez 77e29a2b87 Fix tickets feedback 2024-03-12 21:26:17 -03:00
Kevin Martinez e4553659cf Update translation from population to city 2024-03-12 21:23:46 -03:00
William Buezas ff0b0c8131 Remove innecesary prop 2024-03-12 12:38:44 -03:00
William Buezas 06fa4aebc5 add invoice out list download icon 2024-03-12 11:40:06 -03:00
William Buezas bd5eb1a1c3 remove assignPDA translation 2024-03-12 11:34:38 -03:00