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

4174 Commits

Author SHA1 Message Date
Carlos Satorres a705245783 refs #7406 fix pr 2024-06-25 12:18:02 +02:00
Jorge Penadés 3c810254a4 fix: refs #7623 redirect 2024-06-25 11:40:07 +02:00
Javier Segarra d10f6b4d6c replace value sale.itemFk 2024-06-25 10:33:15 +02:00
Javier Segarra 5a66af341f fix: state translations 2024-06-25 10:07:36 +02:00
Javier Segarra ea7ee97867 proposals 2024-06-25 09:35:21 +02:00
Alex Moreno 86524fe9e2 Merge pull request '7631_testToMaster_2426' (!480) from 7631_testToMaster_2426 into master 
Reviewed-on: verdnatura/salix-front#480
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-06-25 06:40:04 +00:00
Alex Moreno d421cefeb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-25 07:32:17 +02:00
Jorge Penadés cdf3a588af fix: refs #7623 updating skip param 2024-06-24 16:55:09 +02:00
Jorge Penadés 0765166423 fix: refs #7623 disable router update 2024-06-24 13:56:50 +02:00
Jorge Penadés 9169b793a9 fix: refs #7623 update add updateRoute prop in VnPaginate 2024-06-24 12:51:44 +02:00
Jon Elias 50d135f282 refactor: refs #6977 fix VnImg props 2024-06-24 09:20:47 +02:00
Jon Elias da20abf34c Merge branch '6977-ClonedURL' of https://gitea.verdnatura.es/verdnatura/salix-front into 6977-ClonedURL 2024-06-24 08:30:07 +02:00
Jon Elias 82cc844ddd refactor: refs #6977 refactor VnImg 2024-06-24 08:30:06 +02:00
William Buezas 3d0cbcfd12 remove form model expose 2024-06-21 16:57:51 -03:00
William Buezas 3d9d41afcb Add deep true 2024-06-21 16:55:33 -03:00
William Buezas dfb67f6f2b refactor 2024-06-21 16:51:29 -03:00
Jorge Penadés 0daf61608d Merge pull request '#6238 show notes & create vnPopup' (!470) from 6238-addNotes into test 
Reviewed-on: verdnatura/salix-front#470
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-21 13:49:22 +00:00
Javier Segarra ec7b0c1416 Merge pull request '7323 # FIX Department descriptor and routerLink' (!435) from 7323_department_descriptor_routerLink into dev 
Reviewed-on: verdnatura/salix-front#435
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-21 12:53:10 +00:00
Javier Segarra 01816613f2 Merge branch 'dev' into 7323_department_descriptor_routerLink 2024-06-21 12:50:14 +00:00
Javier Segarra d083319f34 Merge pull request 'Ticket log' (!465) from hyervoni/salix-front-mindshore:feature/TicketLog into dev 
Reviewed-on: verdnatura/salix-front#465
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-21 12:49:46 +00:00
William Buezas 5cf183607d WIP 2024-06-21 09:20:03 -03:00
Jorge Penadés 44d762694a fix: refs 6238 replace style 2024-06-21 13:53:35 +02:00
Jorge Penadés 606c629d77 feat: refs #6238 function name 2024-06-21 13:47:42 +02:00
Jorge Penadés bebb20c76f fix: refs 6238 drop locale 2024-06-21 13:07:43 +02:00
Jorge Penadés 891c0d2347 feat: refs 6238 show notes & create vnPopup 2024-06-21 13:05:28 +02:00
Javier Segarra 63b8ca46a3 Merge branch 'dev' into feature/TicketLog 2024-06-21 11:33:29 +02:00
Javier Segarra febc7f1f46 fix: notify icon style 2024-06-21 11:33:14 +02:00
Javier Segarra 9ce49bf108 fix: TravelLog 2024-06-21 11:31:09 +02:00
Alex Moreno 961c8140af Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-06-21 10:53:57 +02:00
Jorge Penadés 93407d8219 Merge pull request '#6243 show rightPanel' (!468) from 6243-warmfix-showRightPanel into test 
Reviewed-on: verdnatura/salix-front#468
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-21 08:52:56 +00:00
Carlos Satorres 9d38c1ff1c Merge pull request 'refs #6504 fix formModel claimFilter claimCard' (!464) from 6504-fixCardClaim into dev 
Reviewed-on: verdnatura/salix-front#464
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-21 08:51:12 +00:00
Carlos Satorres 0f2f688f16 Merge branch 'dev' into 6504-fixCardClaim 2024-06-21 08:49:15 +00:00
Jorge Penadés 6aa920b70e fix: refs #6243 show rightPanel 2024-06-21 10:47:09 +02:00
Carlos Satorres 79bafdee20 Merge branch '7406-workerFormation' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-21 08:43:00 +02:00
Carlos Satorres fdedf7bf57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7406-workerFormation 2024-06-21 08:42:57 +02:00
Alex Moreno d23dbca7bf fix(EntryBuys): fix VnSubtoolbar 2024-06-21 08:12:03 +02:00
Jon Elias ff75808a28 Merge branch 'dev' into 6977-ClonedURL 2024-06-21 05:25:56 +00:00
Jon Elias f41161a28e refactor: refs #6977 use VnImg 2024-06-21 07:24:23 +02:00
Javier Segarra 159b386d2c fix: comment 4 2024-06-21 00:07:26 +02:00
Javier Segarra 0faa663169 fix: comments 2024-06-21 00:03:26 +02:00
William Buezas 633b13b076 Basic data form 2024-06-20 16:51:07 -03:00
Alex Moreno bcda488aae Merge pull request '#6825 - VnTable V1' (!396) from 6825-vnTable into dev 
Reviewed-on: verdnatura/salix-front#396
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-06-20 13:08:55 +00:00
William Buezas 47768faea4 Change model 2024-06-20 09:42:32 -03:00
William Buezas 9f1dd4d74d WIP 2024-06-20 09:41:53 -03:00
Alex Moreno 1b3828ceba Merge branch 'dev' into 6825-vnTable 2024-06-20 12:35:35 +00:00
Jon Elias b60fa62c99 Merge pull request '#6896 end orders migration' (!400) from 6896-EndOrderMigration into dev 
Reviewed-on: verdnatura/salix-front#400
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-20 12:31:45 +00:00
Alex Moreno 09545cb2c0 fix: WorkerNotificationsManager test 2024-06-20 14:25:45 +02:00
William Buezas 00ebbbfc78 Ticket log 2024-06-20 08:40:05 -03:00
William Buezas 0ba415c0ea small changes 2024-06-20 07:57:39 -03:00
Alex Moreno e8296d0edd Merge branch '6825-vnTable' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-vnTable 2024-06-20 12:33:05 +02:00