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

5412 Commits

Author SHA1 Message Date
Jorge Penadés a382d8278c Merge branch 'dev' into testToDev 2024-09-02 13:11:08 +00:00
Javier Segarra d65b52804d Merge pull request '#7889 - Implmenet main shortcuts' (!655) from 7889_main_shortcuts into dev 
Reviewed-on: verdnatura/salix-front#655
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-02 13:03:19 +00:00
Javier Segarra 5d511c7b1b Merge branch 'dev' into 7889_main_shortcuts 2024-09-02 13:02:07 +00:00
Javier Segarra c51af96ca7 fix: module icon 2024-09-02 12:56:44 +00:00
Jorge Penadés 200481414f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into testToDev 2024-09-02 13:21:40 +02:00
Jorge Penadés 63f5f85e8d Merge pull request 'fix: refs #7524 dynamic fetching' (!662) from 7524-warmfix-useLimit into test 
Reviewed-on: verdnatura/salix-front#662
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-02 08:54:27 +00:00
Jorge Penadés 56d226b36b fix: refs #7524 dynamic fetching 2024-09-02 10:03:01 +02:00
Jorge Penadés d55bf0ff75 Merge pull request '#7524 useLimit' (!645) from 7524-useLimit into test 
Reviewed-on: verdnatura/salix-front#645
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-09-02 07:50:45 +00:00
Javier Segarra 6854b2f3c7 Merge branch '7889_main_shortcuts' of https://gitea.verdnatura.es/verdnatura/salix-front into 7889_main_shortcuts 2024-09-02 09:34:35 +02:00
Javier Segarra d3ab56184b perf: remove console.log 2024-09-02 09:34:33 +02:00
Jorge Penadés f0055d7b36 Merge pull request '#7353 fine tunning monitors' (!624) from 7353-fineTunningMonitor into dev 
Reviewed-on: verdnatura/salix-front#624
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-09-02 07:33:42 +00:00
Jorge Penadés ed2167e199 refactor: refs #7353 ease logic 2024-09-02 09:30:15 +02:00
Jorge Penadés a8fc5a8d73 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-09-02 09:09:27 +02:00
Javier Segarra af9a58a3df Merge branch 'dev' into 7889_main_shortcuts 2024-08-30 22:12:21 +00:00
Carlos Satorres 5b0df1124e Merge pull request '7355-accountMigrationFixes2' (!658) from 7355-accountMigrationFixes2 into dev 
Reviewed-on: verdnatura/salix-front#658
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-08-30 10:58:09 +00:00
Carlos Satorres 874cbfea9b refs #7366 fix travel hours 2024-08-30 12:31:42 +02:00
Carlos Satorres 859eb918cd refs #6897 fix entry 2024-08-30 11:50:05 +02:00
Jorge Penadés f9a509ac67 feat: refs #7353 add no one opt 2024-08-30 11:40:55 +02:00
Carlos Satorres f33733c7f2 refs #7355 fix total 2024-08-30 11:25:00 +02:00
Carlos Satorres 8dd462531a Merge branch '7355-accountMigrationFixes2' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigrationFixes2 2024-08-30 11:18:51 +02:00
Carlos Satorres 1544513a3e refs #7355 #7366 fix account, summary, list, travelList, tooltip 2024-08-30 11:18:48 +02:00
Carlos Satorres fa36f8d8af Merge branch 'dev' into 7355-accountMigrationFixes2 2024-08-30 07:55:09 +00:00
Carlos Satorres 76cb8c6b28 refs #7355 remove bug 2024-08-30 09:54:16 +02:00
Carlos Satorres d555b89598 refs #7355 remove bad code 2024-08-30 09:53:42 +02:00
Carlos Satorres 278f691ed2 refs #7355 fix views summarys, entryList, travelList refact 2024-08-30 09:52:43 +02:00
Jorge Penadés 90b2cf09b9 feat: refs #7353 add right icons 2024-08-29 16:54:09 +02:00
Jorge Penadés 6062c2d845 feat: refs #7353 salesPerson nickname & id 2024-08-29 16:51:55 +02:00
Jorge Penadés 956230d708 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-29 16:40:34 +02:00
Jorge Penadés a845190768 Merge pull request 'fix: refs #7356 create claim dialog' (!656) from 7356-fixCreateClaimDialog into dev 
Reviewed-on: verdnatura/salix-front#656
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-29 14:38:45 +00:00
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