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

1331 Commits

Author SHA1 Message Date
Carlos Satorres 6304776fac Merge pull request 'refs #6353 remove rating' (!155) from 6353-ratingItems into dev 
Reviewed-on: verdnatura/salix-front#155
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-12 10:55:07 +00:00
Carlos Satorres 334b4dc928 refs #6353 remove rating 2024-01-12 09:13:36 +01:00
Carlos Satorres 2148c18952 Merge pull request 'refs #6325 claimRatio' (!151) from 6325-tasaClaim into dev 
Reviewed-on: verdnatura/salix-front#151
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-12 08:00:28 +00:00
Carlos Satorres bcc35ca0e7 Merge branch 'dev' into 6325-tasaClaim 2024-01-12 07:47:39 +00:00
Jorge Penadés 486c477b31 Merge pull request '#6630 fix css vnLog' (!150) from 6630-fixCssVnLog into dev 
Reviewed-on: verdnatura/salix-front#150
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-12 07:28:45 +00:00
Alex Moreno c265465b1d Merge branch 'dev' into 6325-tasaClaim 2024-01-12 06:54:00 +00:00
Jorge Penadés 14e6854881 fix: refs #6630 fix invoiceInList test 2024-01-11 16:42:41 +01:00
Jorge Penadés 3f720e0571 fix: refs #6630 fix flush selectfilter in vnlog 2024-01-11 16:29:20 +01:00
Jorge Penadés ae94ff014d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6630-fixCssVnLog 2024-01-11 15:59:04 +01:00
Jorge Penadés 8df915e0ef fix: refs #6630 remove autoload 2024-01-11 15:53:31 +01:00
Javier Segarra 76b3f2295a Merge pull request '#6384 Redirect to summary when route changes' (!149) from 6384_vnSearchbar_redirect into dev 
Reviewed-on: verdnatura/salix-front#149
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-11 12:47:28 +00:00
Javier Segarra 0f1cfc0041 Merge branch 'dev' into 6384_vnSearchbar_redirect 2024-01-11 12:37:35 +00:00
Javier Segarra 96fdd3f410 refs #6384 perf: remove unused dependencie 2024-01-11 12:35:58 +00:00
Alex Moreno 969cec9bd3 Merge pull request 'refs #6595 - PR2 - Resolve conflicts' (!144) from hyervoni-branch-PR-2 into dev 
Reviewed-on: verdnatura/salix-front#144
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-01-11 12:22:27 +00:00
Alex Moreno b3f412a6f7 Merge branch 'dev' into hyervoni-branch-PR-2 2024-01-11 12:13:02 +00:00
Alex Moreno 489ea94d3f refs #6595 fix invoiceInBasicData 2024-01-11 13:12:55 +01:00
Carlos Satorres 30c1f8d1f5 Merge pull request 'remove ID' (!148) from removeId into dev 
Reviewed-on: verdnatura/salix-front#148
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-11 11:30:05 +00:00
Carlos Satorres 98810657a1 Merge branch 'dev' into removeId 2024-01-11 11:29:08 +00:00
Alex Moreno 13d24e936e Merge branch 'dev' into 6384_vnSearchbar_redirect 2024-01-11 11:22:14 +00:00
Alex Moreno 7b974a2f32 refs #6595 fix: remove duplicated 2024-01-11 12:13:38 +01:00
Alex Moreno bc46435299 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into hyervoni-branch-PR-2 2024-01-11 12:09:16 +01:00
Jorge Penadés 77d4e72968 fix: refs #6630 fix click event propagation 2024-01-11 12:08:06 +01:00
Alex Moreno c362b31fb8 refs #6595 fix: VnSelectFilter fix: invoiceIn 2024-01-11 12:05:29 +01:00
Jorge Penadés 88b68ef399 fix: refs #6630 large click event 2024-01-11 12:02:33 +01:00
Jorge Penadés 1bc2abdab2 fix: refs #6630 drop unused imports 2024-01-11 11:44:53 +01:00
Carlos Satorres 375154b18d refs #6325 claimingRate 2024-01-11 10:26:15 +01:00
Jorge Penadés 3c8022ac45 feat: refs #6630 VnAvatar letter feature added 2024-01-10 16:49:09 +01:00
Jorge Penadés cdadb57af3 fix: refs #6630 resolve conficts 2024-01-10 15:41:00 +01:00
Jorge Penadés 0eb7d0f1b0 fix: refs #6630 resolve conficts 2024-01-10 15:35:01 +01:00
Jorge Penadés 0a940e2cfb Merge pull request '#6643 create vnUserLink' (!147) from 6643-VnUserLink into dev 
Reviewed-on: verdnatura/salix-front#147
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-01-10 13:56:59 +00:00
Jorge Penadés fb4c371371 fix: refs #6643 remove console log 2024-01-10 14:36:30 +01:00
Jorge Penadés 315c089936 fix: refs #6643 fix tests 2024-01-10 14:01:36 +01:00
Jorge Penadés 2555d2b2d1 feat: refs #6643 create VnUserLink 2024-01-10 11:21:02 +01:00
Jorge Penadés 7b8ad3720e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6643-VnUserLink 2024-01-10 10:41:49 +01:00
Carlos Satorres ceeba871ce Merge pull request 'refs #6420 change url' (!136) from 6420-claimNotesSummary into dev 
Reviewed-on: verdnatura/salix-front#136
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-10 07:27:18 +00:00
Carlos Satorres fa62eb0292 Merge branch 'dev' into 6420-claimNotesSummary 2024-01-10 07:23:42 +00:00
Carlos Satorres 2825001bca Merge pull request 'refs #6383 darkMode' (!152) from 6383-darkMode into dev 
Reviewed-on: verdnatura/salix-front#152
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-10 07:23:29 +00:00
Javier Segarra d4968d060b Revert "refs #6384 perf: replace code with VnSubToolbar" 
This reverts commit d139d670f1.
 2024-01-09 17:02:21 +01:00
Javier Segarra 988c47677b refs #6384 test: fix vitest 2024-01-09 17:01:11 +01:00
Javier Segarra ef8e77904d refs #6384 test: vitest 2024-01-09 16:54:07 +01:00
Jorge Penadés 57eca9b267 fix: refs #6630 getLogTree grouping fixed 2024-01-09 15:21:26 +01:00
Carlos Satorres b83a773278 refs #6420 fix pr 2024-01-09 14:55:52 +01:00
Carlos Satorres a4a7a48fb6 refs #6383 fix 2024-01-09 14:48:47 +01:00
Carlos Satorres 9e314276bd refs #6383 set dark 2024-01-09 14:37:44 +01:00
Jorge Penadés 5438ce5c33 fix: refs #6630 fix css 2024-01-09 14:34:25 +01:00
Jorge Penadés 3e8744c837 fix: refs #6630 fix css 2024-01-09 14:24:29 +01:00
Carlos Satorres bdbc34d4e7 refs #6325 claimRatio 2024-01-09 14:00:51 +01:00
Javier Segarra b4f330a237 refs #6384 test: e2e 2024-01-09 12:20:56 +01:00
Javier Segarra 762daa620b refs #6384 test: e2e 2024-01-09 12:06:17 +01:00
Javier Segarra d139d670f1 refs #6384 perf: replace code with VnSubToolbar 2024-01-09 10:37:59 +01:00