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

5509 Commits

Author SHA1 Message Date
Jorge Penadés b335da8ff6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356-fixCreateClaimDialog 2024-08-29 16:36:23 +02:00
Carlos Satorres 36a7618ef5 refs #7355 previews 2024-08-29 15:06:09 +02:00
Carlos Satorres 691c9a8e81 refs #7355 fix roles filters 2024-08-29 14:57:27 +02:00
Carlos Satorres 9899d73566 refs #7355 fix accounts, vnTable 2024-08-29 14:45:47 +02:00
Jorge Penadés 7bac607746 fix: refs #7524 add sort-by 2024-08-29 14:20:52 +02:00
Jorge Penadés 42e7629c40 fix: refs #7524 use limit ticket section 2024-08-29 13:53:10 +02:00
Jorge Penadés 35829c743b Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 7524-useLimit 2024-08-29 13:18:37 +02:00
Jorge Penadés 71c3e9095a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-29 13:06:33 +02:00
Jorge Penadés 58e47b3f24 refactor: refs #7353 order correction 2024-08-29 13:04:54 +02:00
Jorge Penadés 76fa89c8bd refactor: refs #7353 clients correction 2024-08-29 12:32:00 +02:00
Jorge Penadés 7a34309ec6 refactor: refs #7353 clients correction wip 2024-08-29 12:01:41 +02:00
Jorge Penadés ef1ba2ea4f feat: refs #7353 imporve toDateFormat 2024-08-29 12:01:23 +02:00
Jorge Penadés 966667bab7 refactor: refs #7353 tickets correction 2024-08-29 11:40:42 +02:00
Carlos Satorres 2134b9f8c2 Merge pull request 'refs #6896 fix searchbar' (!657) from 6896-orderMigrationFixes into dev 
Reviewed-on: verdnatura/salix-front#657
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-29 08:19:02 +00:00
Carlos Satorres 3de3a1ad33 Merge branch 'dev' into 6896-orderMigrationFixes 2024-08-29 08:18:14 +00:00
Carlos Satorres 8300109394 refs #6896 fix searchbar 2024-08-29 09:30:10 +02:00
Jorge Penadés eef127ddc8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-29 09:29:39 +02:00
Jorge Penadés 7b015d8768 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356-fixCreateClaimDialog 2024-08-29 09:24:35 +02:00
Jorge Penadés 77c9311760 fix: refs #7524 use limit travels section 2024-08-28 17:39:39 +02:00
Javi Gallego 3051b13478 warmFix fields with wrong name 2024-08-28 17:31:39 +02:00
Javi Gallego 28fa876806 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-28 17:25:58 +02:00
Javi Gallego 306d7c6289 feat: fields with wrong name 2024-08-28 17:25:53 +02:00
Jorge Penadés 3fce76f2e2 Merge branch 'test' of https: refs #7524//gitea.verdnatura.es/verdnatura/salix-front into 7524-useLimit 2024-08-28 17:18:13 +02:00
Jorge Penadés c4665f6cc1 chore: refs #7356 fix type 2024-08-28 17:06:16 +02:00
Jorge Penadés 041b6561f8 fix: refs #7356 colors 2024-08-28 17:03:37 +02:00
Jorge Penadés 23bf9657aa fix: refs #7356 colors 2024-08-28 17:01:50 +02:00
Jorge Penadés 174c34b4e0 fix: refs #7356 create claim dialog 2024-08-28 16:17:34 +02:00
Javier Segarra d8e3f9dfd9 feat: apply mixin 2024-08-28 16:11:25 +02:00
Jorge Penadés 495cd2cc2f fix: refs #7353 iron out ticket table 2024-08-28 12:46:34 +02:00
Jorge Penadés 1312dbe2af fix: refs #7353 iron out filter 2024-08-28 12:13:58 +02:00
Jorge Penadés ede1966449 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-28 09:41:05 +02:00
Javier Segarra ae70256b5e Merge pull request '#6772 - Reload data section when change Id' (!192) from 6772_reload_sections into dev 
Reviewed-on: verdnatura/salix-front#192
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-27 15:17:44 +00:00
Javier Segarra 50de0aa072 fix: InvoiceIn sections 2024-08-27 14:55:36 +02:00
Javier Segarra ec979d11e0 Merge branch 'dev' into 6772_reload_sections 2024-08-27 14:50:01 +02:00
Javier Segarra 714b9063fd Merge pull request '7896_down_devToTest_2436' (!651) from 7896_down_devToTest_2436 into dev 
Reviewed-on: verdnatura/salix-front#651
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-27 12:33:01 +00:00
Javier Segarra f88dc4a59d feat: update changelog 2024-08-27 14:01:48 +02:00
Javier Segarra 636861234b fix: remove property 2024-08-27 14:00:21 +02:00
Javier Segarra 7567f1b13f Merge branch 'dev' into 7896_down_devToTest_2436 2024-08-27 13:59:06 +02:00
Javier Segarra 137ed40f33 feat: update version and changelog 2024-08-27 13:53:45 +02:00
Javier Segarra 61ae3edf18 Merge pull request '#7896 - 24.36 Dev To Test' (!648) from 7896_devToTest_2436 into test 
Reviewed-on: verdnatura/salix-front#648
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-27 10:33:01 +00:00
Carlos Satorres 65d77b1d4e Merge pull request '6899-fixInvoiceOutMigration' (!650) from 6899-fixInvoiceOutMigration into dev 
Reviewed-on: verdnatura/salix-front#650
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-27 08:59:22 +00:00
Carlos Satorres c81cf638bc Merge branch 'dev' into 6899-fixInvoiceOutMigration 2024-08-27 08:49:22 +00:00
Carlos Satorres 0257e12e6b Merge pull request '7355-fixesAccountMigration' (!643) from 7355-fixesAccountMigration into dev 
Reviewed-on: verdnatura/salix-front#643
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-08-27 08:46:10 +00:00
Javier Segarra d4dc461e41 Merge branch 'dev' into 7355-fixesAccountMigration 2024-08-27 08:40:00 +00:00
Javier Segarra ceec78da17 test: ticketDescriptorMenu 2024-08-27 10:27:51 +02:00
Javier Segarra 4a81598883 fix: ticketDescriptorMenu 2024-08-27 10:27:43 +02:00
Carlos Satorres 72e4f10287 refs #6899 fix order 2024-08-27 10:17:06 +02:00
Carlos Satorres 39656ee3f5 refs #7355 remove privileges 2024-08-27 10:11:38 +02:00
Javier Segarra b7c6c92ff8 Merge branch 'dev' into 6772_reload_sections 2024-08-27 08:04:59 +00:00
Carlos Satorres 64e776d311 refs #6899 fix invoiceFix 2024-08-27 10:02:59 +02:00