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

6503 Commits

Author SHA1 Message Date
Javi Gallego 3e06f604bb feat: refs #8298 add price optimum input and update translations for bonus and price optimum 2025-01-08 10:32:15 +01:00
Jorge Penadés 08d20d3e7a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 15:35:45 +01:00
Alex Moreno 5dcf77a226 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 15:05:44 +01:00
Alex Moreno 621d98b32b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-07 15:05:33 +01:00
Jorge Penadés 8f418dcb4b style: refs #7957 update VnSearchbar padding for improved layout 2025-01-07 14:31:38 +01:00
Jorge Penadés b289ba3196 Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 14:11:44 +01:00
Jon Elias 33ba6d3142 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:48:26 +00:00
PAU ROVIRA ROSALENY 8e1f888134 Merge branch 'dev' into 8322-worker 2025-01-07 12:24:44 +00:00
Jon Elias ea89cf4062 Merge branch 'dev' into 8220-ItemsE2E 2025-01-07 12:22:32 +00:00
Jon Elias 548db113eb refactor: refs #8220 requested changes 2025-01-07 13:16:05 +01:00
Jon Elias 5de2805fa9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2025-01-07 13:13:12 +01:00
Alex Moreno 62cdc2b4f7 Merge branch 'dev' into 8322-worker 2025-01-07 12:02:22 +00:00
Alex Moreno 02973cc7d6 fix: refs #8322 unnecessary section 2025-01-07 13:02:04 +01:00
Alex Moreno 5440d94df2 chore: refs #8322 unnecessary prop 2025-01-07 13:00:42 +01:00
Alex Moreno 245530b542 refactor: refs #8322 set department inside worker 2025-01-07 13:00:00 +01:00
Jorge Penadés 73c133c62b fix: refs #7957 css 2025-01-07 12:26:05 +01:00
Jorge Penadés d925e3f8b4 fix: refs #7957 css 2025-01-07 12:24:32 +01:00
Jorge Penadés 7b9731a4c8 fix: refs #7957 css 2025-01-07 12:22:21 +01:00
Jorge Penadés 30bdf42f3f Merge branch 'dev' of https: refs #7957//gitea.verdnatura.es/verdnatura/salix-front into 7957-monitorChanges 2025-01-07 12:16:39 +01:00
PAU ROVIRA ROSALENY 07222f9fb8 fix: refs #8338 removed chipLocale property/added more translations 2025-01-07 11:43:39 +01:00
Jorge Penadés da0e31b978 fix: refs #7323 update getAbsences to handle multiple years for absence data 2025-01-07 11:17:56 +01:00
PAU ROVIRA ROSALENY e8bad89008 Merge branch 'dev' into 8338-traduccionesVnTable 2025-01-07 09:42:16 +00:00
Jorge Penadés e0179d99d6 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7936-hotfix-hideCaption 2025-01-07 10:33:05 +01:00
Jorge Penadés 59c755329a fix: refs #7936 update VnSelect to conditionally render option caption 2025-01-07 10:29:37 +01:00
Jon Elias 04f1a805ab Merge branch 'dev' into Fix-EntrySummary 2025-01-07 09:24:00 +00:00
PAU ROVIRA ROSALENY e7f2d6ae7f Merge branch 'dev' into 8322-worker 2025-01-07 09:22:40 +00:00
Jon Elias 48ba567489 Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-07 09:09:35 +00:00
Jon Elias 2373404d90 Merge branch 'dev' into 7202-AddCustomAgentFkColumn2 2025-01-07 09:02:13 +00:00
Jorge Penadés 13d51bedc9 fix: refs #7936 disable option caption in EditTableCellValueForm 2025-01-07 10:00:29 +01:00
Jon Elias bc2b8fff0f Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-07 08:58:19 +00:00
Alex Moreno 1d92e84227 fix: claimList order 2025-01-07 09:51:36 +01:00
Alex Moreno ddc2f99efd Merge branch 'test' of https: refs #8356//gitea.verdnatura.es/verdnatura/salix-front into 8356-devToTest 2025-01-07 09:33:47 +01:00
Alex Moreno c645a8b4b6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 09:07:08 +01:00
Alex Moreno e46b4b0b97 fix: vnNotes filter & fix: itemFixedPrice order 2025-01-07 09:06:41 +01:00
Jon Elias 582e1de8df Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-07 07:55:20 +01:00
Jon Elias 5c839b2dfa Merge branch 'dev' into 8246-ZoneAddressFk 2025-01-07 06:22:27 +00:00
Alex Moreno 3b0c31f68c Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 07:20:30 +01:00
Alex Moreno d23e077af0 fix: refs #8197 mapKey 2025-01-07 07:15:40 +01:00
Jon Elias b0cb3597de feat: refs #8246 added new field in list 2025-01-07 07:11:04 +01:00
Alex Moreno 17db5ac882 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 07:02:04 +01:00
Alex Moreno 940e67b963 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 8197-perf_vnTableInside 2025-01-07 07:01:51 +01:00
Alex Moreno af7c6a0aaf test: refs #8197 fix e2e 2025-01-06 18:59:48 +01:00
Alex Moreno 1a8368c4ce fix(VnDmsList): refs #8197 add mapKey 2025-01-06 18:31:19 +01:00
Alex Moreno cc4295e722 feat: refs #8197 keepData in VnSection 2025-01-03 15:40:19 +01:00
Alex Moreno f3835a1d83 fix: refs #8197 vnPaginate when change :id 2025-01-03 15:31:00 +01:00
Alex Moreno 7fe2dd9ca7 Merge branch 'test' into 8197-perf_redirection 2025-01-03 12:50:59 +00:00
Alex Moreno 4900935e73 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-03 13:46:18 +01:00
Alex Moreno 64e8eec854 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-03 13:45:16 +01:00
Alex Moreno dc8fe65558 fix: redirection vnTable VnTableFilter 2025-01-03 13:45:07 +01:00
Alex Moreno 81116b4b13 Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-03 13:43:12 +01:00