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

8560 Commits

Author SHA1 Message Date
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
Jorge Penadés 0703a8c105 Merge pull request 'fix: refs #7323 update getAbsences to handle multiple years for absence data' (!1181) from 7323-hotfix-getNextYearAbsences into master 
Reviewed-on: verdnatura/salix-front#1181
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 11:05:20 +00:00
PAU ROVIRA ROSALENY 07222f9fb8 fix: refs #8338 removed chipLocale property/added more translations 2025-01-07 11:43:39 +01:00
Carlos Satorres 8c2f102414 Merge branch '7699-refactroViewPassword' of https://gitea.verdnatura.es/verdnatura/salix-front into 7699-refactroViewPassword 2025-01-07 11:18:19 +01:00
Carlos Satorres 3953721424 fix: refs #7699 fix component 2025-01-07 11:18:16 +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 c6ccbd98b1 Merge pull request 'fix: refs #7936 disable option caption in EditTableCellValueForm' (!1180) from 7936-hotfix-hideCaption into master 
Reviewed-on: verdnatura/salix-front#1180
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 09:39:26 +00:00
Jon Elias 6250894355 Merge pull request 'Fix: EntrySummary view' (!1155) from Fix-EntrySummary into dev 
Reviewed-on: verdnatura/salix-front#1155
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 09:33:32 +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 c27700db4d Merge pull request 'Fix: Broken E2E tests' (!1171) from Fix-IntegrationE2ETests into dev 
Reviewed-on: verdnatura/salix-front#1171
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 09:12:55 +00:00
Jon Elias 48ba567489 Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-07 09:09:35 +00:00
Jon Elias 9e59383493 Merge pull request '#7202 added new field in InvoiceOut' (!1160) from 7202-AddCustomAgentFkColumn2 into dev 
Reviewed-on: verdnatura/salix-front#1160
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-07 09:05:27 +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
Jon Elias 86e9594fe9 fix: skip failling e2e 2025-01-07 09:56:50 +01:00
Alex Moreno 1d92e84227 fix: claimList order 2025-01-07 09:51:36 +01:00
Alex Moreno 1c787130b3 build: add new version 2025-01-07 09:44:55 +01:00
PAU ROVIRA ROSALENY 7eb62ce23c Merge branch 'dev' into 7088-testFetchedTags 2025-01-07 08:44:22 +00:00
PAU ROVIRA ROSALENY a14f3153b0 Merge branch 'dev' into 7078-testVnJsonValue 2025-01-07 08:44:05 +00:00
Alex Moreno 3a0d545b94 Merge pull request '8356-devToTest' (!1179) from 8356-devToTest into test 
Reviewed-on: verdnatura/salix-front#1179
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-07 08:39:23 +00: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
Alex Moreno 97fee8d1d0 perf: order 2025-01-07 08:26:33 +01:00
Alex Moreno d8c3e6bce7 perf: revert processData 2025-01-07 08:24:37 +01:00
Alex Moreno e06d5df89f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 08:23:01 +01:00
Alex Moreno 76b9fbc267 perf: redirect transition list to card 2025-01-07 08:21:09 +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 52f09357d0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-07 07:55:18 +01:00
Alex Moreno cc6ee7ce30 Merge pull request '8355-testToMaster' (!1177) from 8355-testToMaster into master 
Reviewed-on: verdnatura/salix-front#1177
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2025-01-07 06:46:54 +00:00
Jon Elias 1bc0a6dcdf Merge pull request '#8246: Added new field in list' (!1176) from 8246-ZoneAddressFk into dev 
Reviewed-on: verdnatura/salix-front#1176
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-07 06:40:46 +00:00
Alex Moreno ea157eaf73 build: refs #8355 add changelog 2025-01-07 07:30:44 +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 266eccb814 Merge pull request '8197-perf_vnTableInside' (!1175) from 8197-perf_vnTableInside into test 
Reviewed-on: verdnatura/salix-front#1175
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-07 06:17:43 +00: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
PAU ROVIRA ROSALENY 09cc12667c Merge branch 'dev' into 7088-testFetchedTags 2025-01-07 06:07:55 +00:00
PAU ROVIRA ROSALENY 29614ce335 fix: refs #7088 changed wrapper to vm 2025-01-07 07:06:23 +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 d0e73caefd Merge pull request 'fix: refs #8197 redirection' (!1170) from 8197-perf_redirection into test 
Reviewed-on: verdnatura/salix-front#1170
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-07 06:01:34 +00:00