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

10376 Commits

Author SHA1 Message Date
Javier Segarra 7265ac6fc0 Merge branch 'fix_frenchMothersDay_i18n' of https://gitea.verdnatura.es/verdnatura/salix-front into fix_frenchMothersDay_i18n 2025-02-17 13:32:31 +01:00
Javier Segarra 873e31da43 feat: not update dates when non campaign 2025-02-17 13:32:27 +01:00
Javier Segarra 9227f935b0 Merge branch 'warmfix_style_vnTable_card' of https://gitea.verdnatura.es/verdnatura/salix-front into warmfix_style_vnTable_card 2025-02-17 13:29:40 +01:00
Javier Segarra c93f0bdf11 style: change colors 2025-02-17 13:29:38 +01:00
Javier Segarra 38df9c27ae Merge pull request 'Warmfix: #6943 addressPropagate' (!1389) from 6943_re_propagate into test 
Reviewed-on: verdnatura/salix-front#1389
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-17 12:20:34 +00:00
Jon Elias 8b6c0c05d6 refactor: refs #8606 modified table width and order 2025-02-17 12:57:37 +01:00
Javier Segarra 2177cd3979 Merge branch 'test' into warmfix_style_vnTable_card 2025-02-17 11:43:56 +00:00
Javier Segarra 1bfbdd2d0d Merge branch 'dev' into fix_frenchMothersDay_i18n 2025-02-17 11:36:40 +00:00
Javier Segarra 4dd180a983 feat: i18n frenchMothersDay 2025-02-17 12:36:18 +01:00
Javier Segarra 985eac702f Merge branch 'test' into 6943_re_propagate 2025-02-17 11:20:03 +00:00
Javier Segarra 1d3be4856b fix: refs #6943 required 2025-02-17 12:18:43 +01:00
Pablo Natek d99253ab79 Merge pull request 'feat: refs #6897 update table column widths and alignment, enhance input' (!1407) from 6897-e2eFixAndMinorfixes into dev 
Reviewed-on: verdnatura/salix-front#1407
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-17 10:29:07 +00:00
Pablo Natek a5b4341c97 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6897-e2eFixAndMinorfixes 2025-02-17 11:13:22 +01:00
Pablo Natek 533b41ad78 feat: refs #6897 update table column widths and alignment, enhance input 2025-02-17 10:53:45 +01:00
Javier Segarra 8daf425adf Merge pull request 'Warmfix labels and monitorRisk' (!1406) from warmfix_labels into test 
Reviewed-on: verdnatura/salix-front#1406
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-17 08:52:10 +00:00
Jon Elias 05d4b08979 Merge branch 'test' into warmfix_labels 2025-02-17 07:40:48 +00:00
Alex Moreno accea946d1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-02-17 07:54:54 +01:00
Alex Moreno 0c79f7f5d2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-02-17 07:54:22 +01:00
Jose Antonio Tubau 75f6a31c8c Merge pull request 'refactor: refs #7524 remove limit and sort parameters from FetchData components' (!1344) from 7524-hotfix-removeFetchData into master 
Reviewed-on: verdnatura/salix-front#1344
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-17 06:48:16 +00:00
Jose Antonio Tubau 8cd8d90925 Merge branch 'master' into 7524-hotfix-removeFetchData 2025-02-17 06:08:52 +00:00
Javier Segarra a3804d5e10 Merge branch 'test' into 6943_re_propagate 2025-02-17 00:40:08 +01:00
Javier Segarra 54b4791849 test: refs #6943 fix tests 2025-02-17 00:38:28 +01:00
Javier Segarra a8dbcfbd74 feat: toCurrency in risk icon 2025-02-16 03:35:23 +01:00
Javier Segarra 3d7cb05661 fix: replace labels 2025-02-16 03:34:00 +01:00
Javier Segarra fc80946817 fix: refs #6943 minor changes 2025-02-14 17:18:36 +01:00
Jorge Penadés 63659a1a77 Merge pull request 'fix: refs #8247 allow password change for users themselves in AccountDescriptorMenu' (!1401) from 8247-hotfix-showOpt into master 
Reviewed-on: verdnatura/salix-front#1401
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-14 13:37:19 +00:00
Alex Moreno fb0cc0272f build: empty commit 2025-02-14 14:32:55 +01:00
Jon Elias 7c6112c896 refactor: refs #8606 modified table height and deleted void file 2025-02-14 14:16:26 +01:00
Jorge Penadés fff129e913 fix: refs #8247 allow password change for users themselves in AccountDescriptorMenu 2025-02-14 13:48:04 +01:00
Alex Moreno 4492b9e70f fix: commit error 2025-02-14 13:39:54 +01:00
Alex Moreno 886213c95e build: add Docker Compose command for Cypress setup in Jenkinsfile 2025-02-14 13:39:36 +01:00
Jon Elias 0d7ae72c64 Merge pull request '#8604: TicketFuture to VnTable' (!1395) from 8604-FixTicketFuture into dev 
Reviewed-on: verdnatura/salix-front#1395
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-02-14 12:13:59 +00:00
Jon Elias b7c05d700b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8604-FixTicketFuture 2025-02-14 12:55:09 +01:00
Guillermo Bonet 872e9ade02 fix: refs #8172 2025-02-14 12:49:11 +01:00
Jon Elias 3a8d15030f Merge branch 'dev' into 8604-FixTicketFuture 2025-02-14 11:43:52 +00:00
Guillermo Bonet 4eee490a6c Merge branch 'test' into dev 2025-02-14 12:43:26 +01:00
Jon Elias 2c2498d2b2 Merge branch '8604-FixTicketFuture' of https://gitea.verdnatura.es/verdnatura/salix-front into 8604-FixTicketFuture 2025-02-14 12:43:21 +01:00
Jon Elias 04ef8e1886 perf: refs #8604 changed lines and deleted useless code 2025-02-14 12:43:20 +01:00
Guillermo Bonet bf6bb954bb Merge branch 'master' into test 2025-02-14 12:42:04 +01:00
Javier Segarra bc42d892ed Merge pull request 'Warmfix: show descriptors when click on it' (!1394) from warmfix_vnTable_card_descriptor into test 
Reviewed-on: verdnatura/salix-front#1394
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-02-14 11:39:58 +00:00
Javier Segarra 11dc113213 Merge branch 'dev' into 8604-FixTicketFuture 2025-02-14 11:39:47 +00:00
Javier Segarra 60bbf4f8ad Merge branch 'test' into warmfix_vnTable_card_descriptor 2025-02-14 11:38:59 +00:00
Javier Segarra eb9512fafb style: refs #8604 update styles 2025-02-14 12:37:16 +01:00
Jon Elias 90a34d56f7 refactor: refs #8604 changed origin/destination values 2025-02-14 12:36:14 +01:00
Guillermo Bonet 7f64fbb368 Merge branch 'test' into dev 2025-02-14 12:35:22 +01:00
Guillermo Bonet d3e4b32bee fix: refs #8172 Remove unused row and column fields from ParkingBasicData 2025-02-14 12:32:32 +01:00
Jon Elias 029c9157e7 Merge branch '8604-FixTicketFuture' of https://gitea.verdnatura.es/verdnatura/salix-front into 8604-FixTicketFuture 2025-02-14 12:17:07 +01:00
Jon Elias 69e77b57ba refactor: refs #8604 requested changes 2025-02-14 12:17:04 +01:00
Javier Segarra 96a04d20b1 style: refs #8604 fix style 2025-02-14 12:13:11 +01:00
Javier Segarra caa8682180 style: fix card mode 2025-02-14 11:44:19 +01:00