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

8367 Commits

Author SHA1 Message Date
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
Alex Moreno 9a631a61f9 fix: refs #8197 redirection 2025-01-03 10:46:43 +01:00
PAU ROVIRA ROSALENY e0a9a5ca72 Merge branch 'dev' into 8322-route 2025-01-03 09:37:03 +00: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
PAU ROVIRA ROSALENY d1466746de feat: refs #7078 created test for VnJsonValue 2025-01-03 08:33:38 +01:00
Jon Elias a6ac9c9d3f refactor: item fixedPrice 2025-01-03 08:12:50 +01:00
PAU ROVIRA ROSALENY a53ac3d6cc fix: refs #8322 fixed route creation url 2025-01-03 07:21:31 +01:00
Jose Antonio Tubau bf23895c03 Merge branch 'dev' into 7100-createVnNotesSpec 2025-01-02 14:13:58 +00:00
Jose Antonio Tubau 23afe3276c refactor: refs #7100 added const mockData 2025-01-02 15:13:36 +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
PAU ROVIRA ROSALENY 93ba88f236 feat: refs #8322 added department changes 2025-01-02 13:31:37 +01:00
Jon Elias 49198f794c refactor: refs #8220 skip failling test and modifed tag test 2025-01-02 13:15:36 +01:00
Jon Elias 13d9705f69 Merge branch '8219-InvoiceOutE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2025-01-02 13:13:44 +01:00
Jon Elias 1941e896e8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8219-InvoiceOutE2E 2025-01-02 13:10:25 +01:00
PAU ROVIRA ROSALENY 8eccf557f0 Merge branch 'dev' into 8322-worker 2025-01-02 12:04:55 +00: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 e0fca5d24b Merge branch '8220-ItemsE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2024-12-31 12:16:20 +01:00
Javier Segarra 738bb76e10 fix: refs #8220 itemTag test 2024-12-31 12:16:17 +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
Javier Segarra b6161a41e8 perf: use dateRange 2024-12-31 10:48:07 +01:00
Javier Segarra 229130409a fix: init fix 2024-12-31 10:45:37 +01:00
Jon Elias 4c5319eacf Merge branch '8220-ItemsE2E' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2024-12-31 08:07:49 +01:00
Jon Elias 843710255e refactor: refs #8220 requested changes 2024-12-31 08:07:47 +01:00
Jon Elias a98c1b38e7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8220-ItemsE2E 2024-12-31 06:52:35 +01:00
Jon Elias 582b4f68e0 Merge branch 'dev' into Fix-EntrySummary 2024-12-31 05:36:01 +00:00
Jon Elias 90c5aefac3 fix: entry summary view and build warnings 2024-12-31 06:14:23 +01:00
Javi Gallego fdc0a856ad Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-12-30 14:53:11 +01:00
Javi Gallego d67ae3cafb style: update CustomerBalance.vue to set label color 2024-12-30 14:53:08 +01:00
Javi Gallego cea24f4720 Merge pull request 'test: refs #7052 add unit tests for EditTableCellValueForm component' (!1104) from 7052-testEditTableCellValueForm into dev 
Reviewed-on: verdnatura/salix-front#1104
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-12-30 13:37:10 +00:00