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

8245 Commits

Author SHA1 Message Date
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
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
Jon Elias 04f1a805ab Merge branch 'dev' into Fix-EntrySummary 2025-01-07 09:24:00 +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
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 1c787130b3 build: add new version 2025-01-07 09:44:55 +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 e06d5df89f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-07 08:23:01 +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
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
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 388ad8d187 test: ticketExpedition working 2025-01-03 13:52:36 +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
Alex Moreno ac2336064b test: fix expedition e2e 2025-01-03 13:43:10 +01:00
Jon Elias 5fda8e0c89 Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-03 12:21:20 +00:00
Jon Elias 27f7b6ce29 Merge pull request 'Fix: ItemFixedPrice' (!1167) from Fix-ItemFixedPrice into dev 
Reviewed-on: verdnatura/salix-front#1167
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-03 10:53:30 +00:00
Jon Elias dddfb62a95 Merge branch 'dev' into Fix-ItemFixedPrice 2025-01-03 10:48:10 +00:00
Alex Moreno b156662fba Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-03 10:44:25 +00:00
Alex Moreno dd8664eebf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-03 11:44:19 +01:00
Alex Moreno 6d7053b1b5 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-03 11:43:19 +01:00
Alex Moreno eb8fbe23ce fix: add data-key 2025-01-03 11:39:28 +01:00
Jon Elias 55aa678bb7 Merge branch 'Fix-IntegrationE2ETests' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-IntegrationE2ETests 2025-01-03 11:14:56 +01:00
Jon Elias 143d8bea4a refactor: skip intermitent failing test 2025-01-03 11:14:52 +01:00
Jon Elias cec7de7fc6 Merge branch 'dev' into Fix-ItemFixedPrice 2025-01-03 10:12:59 +00:00
Jon Elias 551498e0a5 Merge branch 'dev' into Fix-IntegrationE2ETests 2025-01-03 10:12:52 +00:00
Jon Elias c9179c101e fix: e2e tests 2025-01-03 11:11:04 +01:00