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

4513 Commits

Author SHA1 Message Date
Jon Elias e5a590a9f9 feat: refs #7154 new item descriptor field 2024-06-11 13:48:15 +02:00
Alex Moreno 59e72dcd50 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-11 12:53:50 +02:00
Javier Segarra 25f4d1f654 fix: point 3 2024-06-11 11:58:27 +02:00
Javier Segarra fe2412f6d9 fix: point 1 2024-06-11 11:58:20 +02:00
Javier Segarra 4e2358d722 fix: point 3 2024-06-11 11:58:06 +02:00
Alex Moreno f753eddc43 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-11 11:40:58 +02:00
Javier Segarra 57eadbc74e Merge pull request 'Account connections' (!424) from hyervoni/salix-front-mindshore:feature/AccountConnections into dev 
Reviewed-on: verdnatura/salix-front#424
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-11 08:53:26 +00:00
Carlos Satorres ba0364e799 refs #6897 fix BasicData 2024-06-11 10:30:42 +02:00
Javier Segarra fac9b6a439 Merge branch 'dev' into feature/AccountConnections 2024-06-11 07:39:41 +00:00
Javier Segarra fde004af3c Merge pull request 'Worker descriptor menu' (!433) from hyervoni/salix-front-mindshore:feature/WorkerDescriptorMenu into dev 
Reviewed-on: verdnatura/salix-front#433
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 07:39:05 +00:00
Javier Segarra adbc9dee2c Merge branch 'dev' into feature/WorkerDescriptorMenu 2024-06-11 07:37:06 +00:00
Jorge Penadés 0624f8dfb7 Merge pull request '#6243 generalize cmr section' (!349) from 6243-generalizeCmrSection into dev 
Reviewed-on: verdnatura/salix-front#349
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 07:36:38 +00:00
Jorge Penadés 11bcfb0d2d Merge branch 'dev' into 6243-generalizeCmrSection 2024-06-11 07:34:34 +00:00
Jorge Penadés 31081bd471 Merge pull request '#6598 create useAcl composable' (!345) from 6598-getUserAcl into dev 
Reviewed-on: verdnatura/salix-front#345
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-06-11 07:32:46 +00:00
Jorge Penadés 205e7d82a6 Merge branch 'dev' into 6598-getUserAcl 2024-06-11 07:31:15 +00:00
Carlos Satorres 31afa22de8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-EntryMigration 2024-06-11 09:20:23 +02:00
Jorge Penadés 0cfaef2520 Merge pull request '#6273 fix redirect' (!434) from 6273-fixRedirect into dev 
Reviewed-on: verdnatura/salix-front#434
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-11 07:18:14 +00:00
Jorge Penadés c5889b2170 Merge branch 'dev' into 6273-fixRedirect 2024-06-11 07:16:59 +00:00
Carlos Satorres 8e9656f96a refs #7366 remove warning 2024-06-11 09:10:25 +02:00
Jorge Penadés 01658ee100 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl 2024-06-11 09:10:19 +02:00
Carlos Satorres 313395ef7c refs #7366 fix travelMigration 2024-06-11 09:06:09 +02:00
Jorge Penadés f9b688fc37 Merge branch 'dev' into 6243-generalizeCmrSection 2024-06-11 07:02:37 +00:00
Alex Moreno 9cfdbb3a8b hotFix: increase version 2024-06-11 08:54:30 +02:00
Carlos Satorres b07f7b0003 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7366-travelMigration 2024-06-11 08:35:35 +02:00
Alex Moreno 92531216d1 Merge pull request '7565-testToMaster' (!431) from 7565-testToMaster into master 
Reviewed-on: verdnatura/salix-front#431
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-06-11 06:32:59 +00:00
Alex Moreno 0289c167ee refactor: unnecessary computed 2024-06-11 08:30:18 +02:00
Alex Moreno 5e7ef68439 feat: simplify html 2024-06-11 08:22:26 +02:00
Javi Gallego b83285000b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-11 08:03:41 +02:00
Javi Gallego d847b33def minor change 2024-06-11 08:03:35 +02:00
Jon Elias 83a4e9c75f Merge branch 'dev' into 6739-invoiceOut 2024-06-11 05:18:59 +00:00
Jon Elias 2365ce6857 Merge branch 'dev' into 5447-travelExtraCommunity 2024-06-11 05:17:51 +00:00
Javier Segarra fbecbd0c08 Merge remote-tracking branch 'origin/dev' into feature/WorkerDescriptorMenu 2024-06-10 17:10:05 +02:00
Jorge Penadés 992249c638 fix: refs #6273 redirect 2024-06-10 17:06:28 +02:00
William Buezas c1df20a09b Worker descriptor menu 2024-06-10 11:21:23 -03:00
Alex Moreno 1b82ca9243 feat: add changelog 2024-06-10 15:55:22 +02:00
Jorge Penadés 348310bc34 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6243-generalizeCmrSection 2024-06-10 15:37:08 +02:00
Jorge Penadés 9bcfd5c58a Merge pull request '#6273 create freelance form option' (!347) from 6273-createFreelanceFormOpt into dev 
Reviewed-on: verdnatura/salix-front#347
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-10 13:34:59 +00:00
Jorge Penadés a5b71ecebc feat: refs #6273 delete prop 2024-06-10 15:32:38 +02:00
Jorge Penadés a64cd6fa73 refactor: refs #6273 update locale 2024-06-10 15:21:28 +02:00
Javi Gallego 3f94eabc3d feat: refs #7548 añado link grafana 2024-06-10 14:47:43 +02:00
Jorge Penadés 9c72597c2c fix: refs #6273 tests 2024-06-10 14:42:41 +02:00
Jorge Penadés 9eed6e55be Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6273-createFreelanceFormOpt 2024-06-10 14:24:25 +02:00
Jorge Penadés 5869ad220c feat: refs #6273 wip: add locale 2024-06-10 14:17:22 +02:00
Jorge Penadés 5e96ed3bd3 fix: refs #6273 fix arrayData changed 2024-06-10 14:03:57 +02:00
Jorge Penadés d81ce9fe95 feat: refs #6273 add test & improve form 2024-06-10 13:54:02 +02:00
Alex Moreno 1dd1a67657 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-10 13:15:17 +02:00
Alex Moreno ed07b4d620 fix(url): redirect 2024-06-10 13:14:24 +02:00
Jon Elias 15bb9f596c Merge branch 'dev' into 6464-fixNegativeBases 2024-06-10 10:00:42 +00:00
Jon Elias 4b2d977542 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-10 11:59:34 +02:00
Alex Moreno 9db390e904 Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-10 11:58:05 +02:00