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

6693 Commits

Author SHA1 Message Date
Carlos Satorres 92ff8c188e Merge branch 'dev' into 7283-itemMigration 2024-10-24 11:39:33 +00:00
Carlos Satorres 551b81e421 Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-24 13:38:16 +02:00
Carlos Satorres 671d9fd6fb fix: refs #7283 itemtype fix 2024-10-24 13:38:13 +02:00
Javier Segarra 3f640c650b perf: refs #7283 #7283 handle i18n 2024-10-24 12:32:15 +02:00
Javier Segarra 87d2e0a39b perf: refs #7283 #7283 handle composable i18n 2024-10-24 10:36:48 +02:00
Javier Segarra 45e6d2011f Merge branch '7283-itemMigration' of https://gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-24 10:35:24 +02:00
Alex Moreno 32b4636706 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-24 07:49:10 +02:00
Alex Moreno f26976b744 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-24 07:49:01 +02:00
Carlos Satorres 56ef811584 fix: refs #7283 order translation 2024-10-24 07:47:26 +02:00
Javier Segarra 1c8eabe293 perf: refs #7283 #7283 declare composable inst4ead code duplicated 2024-10-24 00:39:35 +02:00
Javi Gallego a0a37a68a0 Merge pull request '#8083 hotfix-insertRecord' (!859) from 8083-hotfix-insertRecord into master 
Reviewed-on: verdnatura/salix-front#859
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-23 14:25:00 +00:00
Jorge Penadés 1bfede4a55 fix: refs #8083 drop useless code 2024-10-23 16:13:32 +02:00
Jorge Penadés 4e31566ddd fix: refs #8083 drop useless code 2024-10-23 16:13:04 +02:00
Jorge Penadés 33ee1ea01b fix: refs #8083 drop useless code 2024-10-23 16:11:58 +02:00
Jorge Penadés 126bb3f039 feat: refs #8083 insert 2024-10-23 16:10:14 +02:00
Jorge Penadés 9673f7be1e fix: refs #8083 update rightly 2024-10-23 15:17:06 +02:00
Alex Moreno d1e4017869 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-23 13:59:11 +02:00
Alex Moreno 5d4b5ad598 Merge pull request 'fix: refs #8010 footer class' (!857) from 8010-fix_vnTable_footer_class into test 
Reviewed-on: verdnatura/salix-front#857
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-10-23 11:58:46 +00:00
Alex Moreno 0528474250 chore: refs #8010 kebab-case 2024-10-23 13:13:00 +02:00
Carlos Satorres d8b80cfa6d fix: refs #7283 fix pr 2024-10-23 12:30:04 +02:00
Alex Moreno e7acdfd4f7 fix: refs #8010 footer class 2024-10-23 10:48:30 +02:00
Carlos Satorres d2da1e3544 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-23 09:54:25 +02:00
Carlos Satorres b40af0ce7b fix: refs #7283 fix pr 2024-10-23 09:49:48 +02:00
Carlos Satorres 84dae53d66 Merge branch 'dev' of https: refs #7283//gitea.verdnatura.es/verdnatura/salix-front into 7283-itemMigration 2024-10-23 07:53:02 +02:00
Javi Gallego 3cbd294168 Merge pull request '#7943 -permisosWorker' (!855) from 7349-permisosWorker into dev 
Reviewed-on: verdnatura/salix-front#855
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-23 05:52:48 +00:00
Javi Gallego 1bf1844c8f fix: refs #7349 dependencia no usada 2024-10-23 07:46:52 +02:00
Javi Gallego ae56c06628 feat: refs #7349 usa back con permisos 2024-10-23 07:45:00 +02:00
Alex Moreno 735ee09ef8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:20 +02:00
Alex Moreno aaf749db6c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 15:08:11 +02:00
Alex Moreno 81a55a9e7a chore: test gitea 2024-10-22 14:55:47 +02:00
Jorge Penadés 41509c60dd Merge pull request '#8083 add change state btn' (!854) from 8083-hotfix-changeState into master 
Reviewed-on: verdnatura/salix-front#854
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-22 12:47:58 +00:00
Jorge Penadés 033d6bddbe fix: refs #8083 move expeditions 2024-10-22 14:43:43 +02:00
Jorge Penadés da4c1e9c12 fix: refs #8083 add order 2024-10-22 14:36:30 +02:00
Jorge Penadés 9f3c834ce4 Merge branch 'master' of https: refs #8083//gitea.verdnatura.es/verdnatura/salix-front into 8083-hotfix-changeState 2024-10-22 14:24:41 +02:00
Jorge Penadés b1a511ff6f fix: refs #8083 delete btn & redirect 2024-10-22 14:21:03 +02:00
Javi Gallego 93025007f1 Merge pull request '#7524 add my team filter' (!849) from 7524-hotfix-myTeamFilter into master 
Reviewed-on: verdnatura/salix-front#849
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-10-22 12:00:03 +00:00
Jorge Penadés f751408de2 feat: refs #8083 add change state btn 2024-10-22 13:22:43 +02:00
Javier Segarra 49c0d64c07 fix: refs #7283 #7283 ItemSummary bugs 2024-10-22 12:13:43 +02:00
Javier Segarra fff3310658 fix: refs #7283 tooltips !Item 2024-10-22 12:09:32 +02:00
Javier Segarra d6b8d41b6c fix: refs #7283 #7283 ItemSummary bugs 2024-10-22 12:09:19 +02:00
Javier Segarra f3a6209189 fix: refs #7283 #7283 bugs 2024-10-22 12:00:11 +02:00
Carlos Satorres c799d17e19 Merge pull request '8144-devToTest_2444' (!852) from 8144-devToTest_2444 into test 
Reviewed-on: verdnatura/salix-front#852
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-10-22 08:55:43 +00:00
Alex Moreno 36221121f5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-22 07:43:07 +02:00
Alex Moreno b4d4844100 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-22 07:42:54 +02:00
Jorge Penadés 0fbd5f45e1 fix: refs #7524 select department 2024-10-21 14:29:29 +02:00
Javier Segarra 29a7f3b2fe fix: refs #7283 #7283 ItemDiary subToolbar 2024-10-21 13:48:43 +02:00
Jon Elias 665e84d338 Merge pull request '#7356: Changes to fix ticket section' (!806) from Fix-TicketsModule into dev 
Reviewed-on: verdnatura/salix-front#806
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-21 11:41:08 +00:00
Jon Elias cd4b17048c Merge branch 'dev' into Fix-TicketsModule 2024-10-21 11:40:02 +00:00
Javier Segarra bc1a082fe1 Merge pull request '#7679 Improve NewPostCodeForm' (!787) from 7679_improve_newPostcode_form into dev 
Reviewed-on: verdnatura/salix-front#787
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-21 11:17:47 +00:00
Javier Segarra e5064e8a37 Merge branch 'dev' into 7679_improve_newPostcode_form 2024-10-21 11:17:01 +00:00