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

8202 Commits

Author SHA1 Message Date
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
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
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 7fe2dd9ca7 Merge branch 'test' into 8197-perf_redirection 2025-01-03 12:50:59 +00: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
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 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 cec7de7fc6 Merge branch 'dev' into Fix-ItemFixedPrice 2025-01-03 10:12:59 +00:00
Alex Moreno 9a631a61f9 fix: refs #8197 redirection 2025-01-03 10:46:43 +01:00
Alex Moreno e7a0c826c7 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-03 09:25:56 +01:00
Alex Moreno cd44a443c2 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-03 09:25:45 +01:00
Alex Moreno 80a99d1261 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-03 09:24:06 +01:00
Pablo Natek ef201a8322 Merge pull request 'feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component' (!1161) from 7301-warmFix into test 
Reviewed-on: verdnatura/salix-front#1161
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-03 08:02:50 +00:00
Jon Elias a6ac9c9d3f refactor: item fixedPrice 2025-01-03 08:12:50 +01:00
Pablo Natek 7eb11c497b Merge branch 'test' into 7301-warmFix 2025-01-02 13:48:39 +00:00
Jon Elias 1eaa81d243 Merge pull request 'Hotfix: ZoneExlcusion dated field' (!1165) from Hotfix-ZoneEventExclusionDate into master 
Reviewed-on: verdnatura/salix-front#1165
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-01-02 13:38:02 +00:00
Jon Elias 272d69d9e1 fix: dated field 2025-01-02 14:33:09 +01:00
Pablo Natek 6e38a23852 Merge pull request 'Warmfix: Zone exclusion dated field' (!1164) from Warmfix-ZoneExclusionEvent into test 
Reviewed-on: verdnatura/salix-front#1164
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-01-02 13:24:49 +00:00
Jon Elias e648b82ecc fix: dated field 2025-01-02 14:23:13 +01:00
Pablo Natek fb21bcc02e feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component 2025-01-02 11:38:04 +01:00
Jon Elias 1cecea4aee feat: refs #7202 added new field 2025-01-02 10:04:57 +01:00
Alex Moreno d7b7850f62 fix: duplicate transalation after test to dev 2025-01-02 08:04:39 +01:00
Alex Moreno a7e04557dc Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-02 07:52:47 +01:00
Alex Moreno a65b8432d8 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-02 07:51:39 +01:00
Jon Elias 16065b6342 Merge pull request 'Hotfix: zone events postcode select' (!1154) from Hotfix-ZoneEventSelect into master 
Reviewed-on: verdnatura/salix-front#1154
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-12-31 12:34:38 +00:00
Jon Elias 9525eef025 Merge branch 'master' into Hotfix-ZoneEventSelect 2024-12-31 12:33:33 +00:00
Jon Elias 27bbd7695f Merge pull request 'Hotfix: use mapKey prop to show all ocurrencies' (!1157) from Hotfix-VnSms into master 
Reviewed-on: verdnatura/salix-front#1157
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-31 12:28:35 +00:00
Jon Elias 65a54b12e6 fix: use map-key prop to show all ocurrencies 2024-12-31 13:11:59 +01:00
Javier Segarra d7bcc5b358 Merge pull request 'hotfix: CustomerConsumption campaignFilter' (!1156) from hotfix_customerConsumption_campaignFilter into master 
Reviewed-on: verdnatura/salix-front#1156
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-12-31 09:59:18 +00:00