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

2162 Commits

Author SHA1 Message Date
Carlos Satorres e3e0439d7e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6763-vnTreeRefact 2024-02-12 14:07:08 +01:00
Carlos Satorres a9c288e6ea refs #6795 fix url, details 2024-02-12 13:58:13 +01:00
Alex Moreno f38b5845ff Merge pull request 'feature/TravelExtraCommunityCorrections' (!188) from hyervoni/salix-front-mindshore:feature/TravelExtraCommunityCorrections into dev 
Reviewed-on: verdnatura/salix-front#188
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-12 12:39:32 +00:00
William Buezas cd2eb71efd Fix view icon 2024-02-12 08:14:10 -03:00
William Buezas df620566ef Invoice out globals corrections 2024-02-12 08:11:44 -03:00
William Buezas 4810e02907 add basic order to table 2024-02-09 20:50:33 -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
William Buezas 254d5a291f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into feature/TravelExtraCommunityCorrections 2024-02-09 10:43:09 -03:00
Alex Moreno 80a3d646a4 Merge branch 'dev' into 6797-deployDev-useBun 2024-02-09 13:25:56 +00:00
Javier Segarra c250f2c154 Merge pull request 'feature/FaltantesModuloTravel' (!185) from hyervoni/salix-front-mindshore:feature/FaltantesModuloTravel into dev 
Reviewed-on: verdnatura/salix-front#185
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-09 13:11:22 +00:00
William Buezas 399f47b17c merge with salix-front dev branch and resolve conflicts 2024-02-09 08:59:46 -03:00
William Buezas 1b31657338 Add tooltip to VnSelegDialog Action icon and small corrections 2024-02-09 08:51:39 -03:00
Carlos Satorres b08f4f5ded Merge pull request 'refs #6791 change field' (!187) from 6791-negativeNickname into dev 
Reviewed-on: verdnatura/salix-front#187
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-09 11:49:46 +00:00
Carlos Satorres 587e0a53e7 refs #6791 change field 2024-02-09 12:17:35 +01:00
Carlos Satorres c87f49b86e refs #6795 popup item 2024-02-09 11:46:47 +01:00
Carlos Satorres b355d4aa0f refs #6795 remove watch 2024-02-09 10:15:36 +01:00
Alex Moreno 34e907eb32 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-09 09:41:21 +01:00
Carlos Satorres d13bf60ea3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6795-claimRefact 2024-02-09 09:08:56 +01:00
Carlos Satorres b3251967b8 refs #6795 fix descriptor 2024-02-09 09:07:54 +01:00
Jorge Penadés 18a84f2d61 Merge pull request '#4466 invoiceInCorrection' (!176) from 4666-invoiceInCorrection into dev 
Reviewed-on: verdnatura/salix-front#176
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
 2024-02-09 07:46:15 +00:00
William Buezas c67f4cf858 Thermograph create form and general improvements 2024-02-08 23:30:08 -03:00
Alex Moreno 2fb1688af4 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 17:30:47 +00:00
Alex Moreno 54e7e9c1e3 Merge pull request 'bugfix/shelving-154' (!168) from hyervoni/salix-front-mindshore:bugfix/shelving-154 into dev 
Reviewed-on: verdnatura/salix-front#168
Reviewed-by: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-08 17:28:04 +00:00
Kevin Martinez 4e42a6ab74 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# Conflicts:
#	src/pages/Route/RouteList.vue
 2024-02-08 10:22:58 -03:00
Carlos Satorres 2f081841f9 refs #6795 fix claims 2024-02-08 13:59:37 +01:00
Jorge Penadés 2eceb226a9 Merge branch '4666-invoiceInCorrection' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-08 13:30:21 +01:00
Jorge Penadés 97b8b0fa37 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-08 13:30:15 +01:00
Jorge Penadés 5d90939288 Merge pull request '#6657 fixSummaryDescriptor' (!175) from 6657-fixSummaryDescriptor into dev 
Reviewed-on: verdnatura/salix-front#175
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-02-08 12:22:52 +00:00
Javier Segarra 242a8e25a8 refs #4466 fix: change VnSearchBar placeholder 2024-02-08 13:02:14 +01:00
Kevin Martinez a0ba4ac017 Fix LeftMenu Unit test 2024-02-08 08:32:35 -03:00
Jorge Penadés 1080ad537c fix: refs #6657 drop summaryDialogs 2024-02-08 12:32:28 +01:00
William Buezas f24b9f5a75 Adjust thermograph notify 2024-02-08 08:26:36 -03:00
William Buezas 770f17a362 Fix edit thermograph id problem 2024-02-08 08:21:41 -03:00
Jorge Penadés 2ac20d5f15 feat: refs #6657 create component & composable 2024-02-08 12:11:12 +01:00
Alex Moreno 04ec81e852 Merge branch 'dev' into 4666-invoiceInCorrection 2024-02-08 11:03:30 +00:00
William Buezas c8153b6414 Add action to qfile icon 2024-02-08 08:01:16 -03:00
William Buezas 4dc31bfdce Travel summary corrections 2024-02-08 07:58:52 -03:00
Jorge Penadés 9393e05bd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6657-fixSummaryDescriptor 2024-02-08 11:57:18 +01:00
William Buezas 5312a4e43a WIP 2024-02-08 07:24:24 -03:00
Carlos Satorres 1cc9502328 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-08 10:11:00 +01:00
Carlos Satorres 481b022786 fix(VnSelecFilter) filter 2024-02-08 10:10:43 +01:00
Carlos Satorres 10fc95c6bc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-02-08 09:54:42 +01:00
Carlos Satorres 78b484baeb fix(VnSelecFilter) filter 2024-02-08 09:54:17 +01:00
Alex Moreno 76680dd715 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5509-entryDms 2024-02-08 07:26:27 +01:00
Alex Moreno 18b76e5e12 refs #5509 feat: VnDmsList 2024-02-08 07:25:23 +01:00
Kevin Martinez 15f7f85734 Merge remote-tracking branch 'salix/dev' into bugfix/shelving-154 
# Conflicts:
#	src/components/ui/VnSearchbar.vue
#	src/pages/Route/RouteList.vue
 2024-02-07 22:38:57 -03:00
William Buezas f59c2409f1 travels corrections and improvements 2024-02-07 15:01:51 -03:00
Jorge Penadés 75b527207f refacto: refs #4466 replace composable name 2024-02-07 15:59:25 +01:00
Jorge Penadés e2facf3330 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 4666-invoiceInCorrection 2024-02-07 15:53:14 +01:00
Jorge Penadés 1f9aef96ca fix: refs #6657 full-width 2024-02-07 14:42:51 +01:00