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

258 Commits

Author SHA1 Message Date
William Buezas 4ee8c45fdc resolve conflicts 2024-04-03 11:22:52 -03:00
Alex Moreno 181bff6c0c Merge branch 'dev' into 6514-gestDocSupplier 2024-03-28 07:17:28 +00:00
Kevin Martinez 0dee7e8cc9 Create worker calendar submodule 2024-03-27 16:51:44 -03:00
Jorge Penadés 9c83c4cd6c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-27 08:30:37 +01:00
Jon Elias 1ec54d7664 feat: #6514 create supplierDms lilium 2024-03-26 08:55:01 +01:00
Jorge Penadés d2efbb204f feat: refs #5186 use arrayData in summary 2024-03-22 14:57:36 +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
Kevin Martinez f6e3b3607a Merge branch 'salix-dev' into feature/worker-log 2024-03-21 08:01:57 -03:00
Kevin Martinez cf25476a5d Create worker log 2024-03-18 21:04:52 -03:00
Jorge Penadés dd91449818 feat: refs #5186 use global locales 2024-03-14 15:16:50 +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
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
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
Javi Gallego 4bc57d0287 Merge branch 'dev' into CambiosSolicitadosSuppliers 2024-03-13 14:37:06 +00: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 319295f2c2 Workers PDA 2024-03-11 16:53:33 -03:00
Jorge Penadés 37f155aa85 fix: refs #5186 css, required files & routes 2024-03-11 10:06:11 +01:00
Jorge Penadés 33ef118dea Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-11 09:32:30 +01:00
Jorge Penadés 300e384f75 feat: refs #5186 add e2e 2024-03-08 10:32:41 +01:00
Pablo Natek e5e0d8f806 Merge branch 'dev' into 6349-removeRma 2024-03-08 07:08:36 +00:00
Jorge Penadés d8a0adb852 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-03-07 15:57:54 +01:00
William Buezas b994d39369 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/InvoicesOutCorrections 2024-03-07 08:44:30 -03:00
Kevin Martinez d3a93da849 Merge branch 'salix-dev' into feature/route-module 
# Conflicts:
#	src/components/ui/VnPaginate.vue
 2024-03-06 23:19:47 -03:00
William Buezas 6a105d5d38 resolve conflicts 2024-03-06 08:35:49 -03:00
William Buezas 859c87940d Several changes 2024-03-06 08:15:50 -03:00
Alex Moreno 4484f431bf refs #6336 feat: polish claims 2024-03-04 14:42:15 +01:00
Kevin Martinez 31911be3ba Remove unused route 2024-03-03 23:36:30 -03:00
Jorge Penadés ebbe38a14e fix: refs #5186 parking routes 2024-03-01 11:05:34 +01:00
Jorge Penadés c18e395f6f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5186-CreateParkingSection 2024-02-29 15:52:43 +01:00
Pablo Natek b49db55892 Merge branch 'dev' into 6349-removeRma 2024-02-29 06:50:18 +00:00
Kevin Martinez 64490f7e5b Merge remote-tracking branch 'salix/dev' into feature/route-module 
# Conflicts:
#	src/i18n/en/index.js
#	src/i18n/es/index.js
 2024-02-28 21:27:01 -03:00
William Buezas b0d43edbce Route summary link logic improvement 2024-02-28 12:02:38 -03:00
Pablo Natek 546df84db1 remove(claimRma): refs #6349 remove all references 2024-02-26 19:06:21 +01:00
Kevin Martinez 185de3c931 Add roadmap stops 2024-02-23 00:46:57 -03:00
Alex Moreno de184e9cf8 refs #5509 feat(DMS): change icon 2024-02-22 10:57:11 +01:00
Jorge Penadés ddb6bdeb47 fix: refs #5186 parking routes 2024-02-21 11:31:25 +01:00
Jorge Penadés 1af5b270a0 fear: refs #5186 WIP parking section 2024-02-21 10:26:20 +01:00
Kevin Martinez 75733fd530 Fix autonomous route 2024-02-20 20:51:25 -03:00
Kevin Martinez 0a03ef69ea Create roadmap basic data page 2024-02-20 08:00:17 -03:00
Kevin Martinez 343269fc02 Create roadmap summary page 2024-02-20 08:00:12 -03:00
Kevin Martinez 45d7b021a6 Create roadmap create page 2024-02-20 07:58:14 -03:00
Kevin Martinez 8ffa3b7626 Create roadmap list page 2024-02-20 07:57:59 -03:00
Kevin Martinez 046ac0406b Create invoice in autonomous page 2024-02-19 10:13:17 -03:00
Kevin Martinez e846582606 Create route autonomous 2024-02-19 10:13:00 -03:00
Kevin Martinez 76dd84fd87 Create route logs 2024-02-19 09:58:33 -03:00
Kevin Martinez 67f862ebe3 Create route tickets 2024-02-19 09:57:49 -03:00
Alex Moreno 1d4179cfa1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-13 08:09:25 +01:00
William Buezas cd2eb71efd Fix view icon 2024-02-12 08:14:10 -03:00
Alex Moreno cb6ba483d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 14:43:50 +01:00