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

10596 Commits

Author SHA1 Message Date
PAU ROVIRA ROSALENY 6365fc7477 Merge pull request 'feat: #8497 added availabled on travel module' (!1410) from 8497-travelAvailabled into dev 
Reviewed-on: verdnatura/salix-front#1410
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-17 15:17:16 +00:00
PAU ROVIRA ROSALENY 039f075187 Merge branch 'dev' into 8497-travelAvailabled 2025-02-17 15:12:17 +00:00
Javi Gallego be76de2fa2 Merge pull request 'fix test: OrderCatalog e2e' (!1413) from fix_orderCatalog_e2e into dev 
Reviewed-on: verdnatura/salix-front#1413
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-02-17 14:44:58 +00:00
Javier Segarra 43181cb1f7 test: remove unnussed click 2025-02-17 14:42:34 +00:00
Javier Segarra 306658c470 fix: computed attrs 2025-02-17 14:05:56 +00:00
Jon Elias b7f4e2d1b6 Merge pull request '#8246: Use new addressFk field' (!1362) from 8246-UseAddressFk into test 
Reviewed-on: verdnatura/salix-front#1362
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-02-17 13:58:52 +00:00
PAU ROVIRA ROSALENY 88167d8c2d Merge branch 'dev' into 8497-travelAvailabled 2025-02-17 13:50:43 +00:00
PAU ROVIRA ROSALENY e2c4954a11 feat: refs #8497 added availabled on travel module 2025-02-17 14:49:46 +01:00
Javier Segarra 50019a298c Merge pull request 'feat: i18n frenchMothersDay' (!1408) from fix_frenchMothersDay_i18n into dev 
Reviewed-on: verdnatura/salix-front#1408
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-02-17 13:44:00 +00:00
Jon Elias 3e111d144e refactor: refs #8246 fetch options efficiently and deleted unused data 2025-02-17 14:03:51 +01:00
Jon Elias f2335d7bda Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8246-UseAddressFk 2025-02-17 14:00:23 +01:00
Jon Elias 10abc4ddae Merge branch 'dev' into fix_frenchMothersDay_i18n 2025-02-17 12:41:16 +00:00
Guillermo Bonet e6f6577fc1 Merge branch 'test' into dev 2025-02-17 13:33:16 +01:00
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
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 c212b8e21c Merge branch 'test' into warmfix_ticketList 2025-02-17 08:52:31 +00: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 3e3713a937 perf: remove unnussed import 2025-02-16 23:47:31 +01:00
Javier Segarra 443a2747cc style: remove proposal 2025-02-16 23:46:05 +01:00
Javier Segarra 33d6662f97 feat: same searchbar logic filter in VnFilterPanel 2025-02-16 23:35:56 +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 2ec5c2b49f fix: ticketList columnfilter 2025-02-16 03:18:10 +01:00
Javier Segarra 1972e921df test: fix getAddresses 2025-02-16 00:52:37 +01:00
Javier Segarra ab3ac4fdeb fix: remove bad code 2025-02-16 00:50:39 +01:00
Javier Segarra b998aab6dd test: add test 2025-02-16 00:46:20 +01:00
Javier Segarra 70fe95661a style: remove optionId and optionLabel 2025-02-16 00:00:24 +01:00
Javier Segarra 3b3332f15c feat: use clientFK in dialog 2025-02-15 23:59:22 +01:00
Javier Segarra cad6b077f0 fix: ticketfilter from and to 2025-02-15 17:45:06 +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