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

2281 Commits

Author SHA1 Message Date
Jon Elias 6ff8b7be34 refs #6993 fix conflicts 2024-03-15 12:57:16 +01:00
Jon Elias 4c63e2f5c1 merge 2024-03-15 12:54:14 +01:00
Jon Elias 2321ca6605 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6993-HideAllPagination 2024-03-15 12:54:05 +01:00
Jon Elias 07cd07427e refs #6993 remove depen 2024-03-15 12:50:05 +01:00
Jon Elias ff5e09d315 refs #6993 fixed QTable behaviour 2024-03-15 12:45:15 +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 17df7e8b09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6905-us 2024-03-15 12:24:30 +01:00
Carlos Satorres d8419a146a refs #6905 fix userConfig 2024-03-15 10:48:02 +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
Pablo Natek a76d6dc781 Merge branch 'dev' into 6988-SummaryRefactor 2024-03-15 06:53:59 +00: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
Jorge Penadés dd91449818 feat: refs #5186 use global locales 2024-03-14 15:16:50 +01: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
Jorge Penadés f39595087a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 15:00:16 +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
Jon Elias 667359ed92 Merge branch 'dev' into 6993-HideAllPagination 2024-03-14 12:09:18 +00:00
Jon Elias a968540635 refactor: #6993 set default QTable pagination, created quasar.defaults for standards 2024-03-14 13:06:02 +01: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
Jorge Penadés 0c012ed71a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-14 08:54:21 +01:00
Jon Elias 37a2c33f9f refactor: #6993 set default QTable pagination 2024-03-14 08:51:26 +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
Jorge Penadés e793b3dd93 feat: refs #5186 use global locales 2024-03-13 15:06:02 +01:00
William Buezas 09582ab6a8 WIP 2024-03-13 09:05:23 -03:00
Jon Elias 31ac61b01f refactor: #6988 changed ticket summary view and fixed notes functionality 2024-03-13 11:33:10 +01: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
William Buezas 632049c13b Assign button change 2024-03-12 11:31:32 -03:00
William Buezas fff5e1849e Delete unused form 2024-03-12 09:59:27 -03:00
Jon Elias 64d8f86ea9 refactor(routeList): refs #6971 moved button to subtoolbar + same functionality as other subtoolbar items 2024-03-12 12:25:31 +01:00
William Buezas 433843ea09 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into CambiosSolicitadosSuppliers 2024-03-12 08:16:40 -03:00
William Buezas dad2711311 fix translation 2024-03-12 08:13:27 -03:00
William Buezas 029fc043de Change title translation 2024-03-12 08:08:20 -03:00