0
0
Fork 0
Commit Graph

4320 Commits

Author SHA1 Message Date
Jon Elias e114bd7523 Merge branch '7543-StandarizeDescriptors' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 08:20:18 +02:00
Jon Elias 363abb899f fix: refs fix changed descriptors 2024-07-03 08:20:16 +02:00
Jon Elias e13f98dffb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7543-StandarizeDescriptors 2024-07-03 07:12:07 +02:00
Jon Elias 0d4ba3bf27 Merge pull request ' translation proposal' () from 7030-FixTranslations into dev
Reviewed-on: 
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
2024-07-03 05:06:53 +00:00
Jon Elias d5b934a239 Merge branch 'dev' into 7030-FixTranslations 2024-07-03 05:06:01 +00:00
Javier Segarra 0dcd2a861b Merge branch 'dev' into 7543-StandarizeDescriptors 2024-07-02 18:59:43 +00:00
Javier Segarra 07f76de8b7 Merge pull request 'feat(VnTable): add slots for columns' () from 6825-vnTable-column-slots into dev
Reviewed-on: 
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-07-02 13:03:26 +00:00
Alex Moreno 6d12c0f00c feat(VnTable): add selected funcitionality 2024-07-02 15:01:43 +02:00
Alex Moreno 22f42ca7f9 feat(VnTable): add slots for columns 2024-07-02 14:55:32 +02:00
Alex Moreno 73ec367987 Merge pull request 'fix: vntable filter where' () from vnTable-fixes into dev
Reviewed-on: 
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
2024-07-02 12:12:05 +00:00
Alex Moreno 1ca47c1c6c Merge branch 'dev' into vnTable-fixes 2024-07-02 11:49:48 +00:00
Alex Moreno 2961c813a5 build: increase version 2430 2024-07-02 12:41:25 +02:00
Alex Moreno 6b3a1d81d5 Merge pull request '7658-devToTest_2428' () from 7658-devToTest_2428 into test
Reviewed-on: 
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
2024-07-02 10:38:19 +00:00
Alex Moreno 82234aa7ec test 2024-07-02 12:35:30 +02:00
Alex Moreno 0384123564 fix: vntable filter where 2024-07-02 12:24:33 +02:00
Jon Elias c0e65ff3b7 fix: refs solve conflicts 2024-07-02 11:50:07 +02:00
Alex Moreno d714788923 test: fix intermitent e2e 2024-07-02 08:29:55 +02:00
Javier Segarra 62d58b479f Merge pull request 'Ticket service' () from hyervoni/salix-front-mindshore:feature/TicketService into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-07-01 12:53:51 +00:00
Javier Segarra 0cbd7c9cae Merge branch 'dev' into feature/TicketService 2024-07-01 14:53:08 +02:00
Javier Segarra 2aabe75343 Merge pull request 'Ticket tracking' () from hyervoni/salix-front-mindshore:feature/TicketTracking into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-07-01 12:51:10 +00:00
Javier Segarra 527c565ca9 Merge branch 'dev' into feature/TicketTracking 2024-07-01 14:50:23 +02:00
Javier Segarra 6f7b678f8d Merge pull request 'Ticket volume' () from hyervoni/salix-front-mindshore:feature/TicketVolume into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-07-01 12:48:59 +00:00
Javier Segarra 9bb75b8305 Merge branch 'dev' into feature/TicketVolume 2024-07-01 14:48:12 +02:00
Javier Segarra fc7f4fda49 Merge pull request 'Ticket notes' () from hyervoni/salix-front-mindshore:feature/TicketNotes into dev
Reviewed-on: 
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-01 12:45:26 +00:00
Javier Segarra e34904ea70 Merge branch 'dev' into feature/TicketNotes 2024-07-01 12:44:38 +00:00
Javier Segarra ae71321339 fix: map selected 2024-07-01 14:43:39 +02:00
Alex Moreno 731169053c test: fix vnSearchbar adapt to vnTable 2024-07-01 09:29:55 +02:00
Pablo Natek ccb51b64de Merge pull request 'fix: refs fix e2e' () from 7129-fixe2e into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-07-01 07:28:10 +00:00
Alex Moreno b234760044 Merge branch 'dev' into 7129-fixe2e 2024-07-01 07:24:35 +00:00
Pablo Natek a4a64eebb4 fix: refs fix e2e 2024-07-01 09:18:16 +02:00
Jorge Penadés ceaf8a8865 Merge pull request ' show checkbox' () from 7436-showQCheckbox into dev
Reviewed-on: 
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
2024-07-01 07:01:37 +00:00
Jorge Penadés 84d6785a4c Merge branch 'dev' into 7436-showQCheckbox 2024-07-01 07:00:51 +00:00
Alex Moreno 3b18375cdb fix(TicketService): pay use selected 2024-07-01 08:13:49 +02:00
Alex Moreno 7b9e26528a feat(TicketService): use correct format 2024-07-01 08:08:41 +02:00
Alex Moreno 128303939b fix(ticket router): typo 2024-07-01 07:41:58 +02:00
Alex Moreno 4cf389e00c fixes: fix vnFilter params and redirect 2024-06-28 17:45:04 +02:00
Jon Elias 685267e177 Merge pull request ' added rol summary link' () from 6826-RolSummary into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-28 12:59:37 +00:00
Jon Elias 9664978733 Merge branch 'dev' into 6826-RolSummary 2024-06-28 12:58:51 +00:00
Jon Elias 3722ad0995 Merge pull request ' changed warehouse out filter' () from 5447-travelExtraCommunity into dev
Reviewed-on: 
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2024-06-28 12:57:02 +00:00
Jon Elias 6ee5fc954b fix: refs fix redirect 2024-06-28 13:26:53 +02:00
Javier Segarra 946a2d4823 Merge branch 'dev' into feature/TicketService 2024-06-28 13:24:24 +02:00
Jon Elias 25e4494266 Merge branch 'dev' into 5447-travelExtraCommunity 2024-06-28 11:17:10 +00:00
Jon Elias a3704ce456 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6826-RolSummary 2024-06-28 13:13:53 +02:00
Jorge Penadés 63a05130e3 chore: refs fix e2e 2024-06-28 12:46:14 +02:00
Jon Elias 93c109b70d refactor: new translations 2024-06-28 11:25:38 +02:00
Javier Segarra 68552b8da9 perf: add QBtn in CardDescriptor instead each ModuleDescriptor 2024-06-28 11:07:32 +02:00
Jon Elias 8e9b238eaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7030-FixTranslations 2024-06-28 10:58:57 +02:00
Jon Elias 369cb9dc75 refactor: refs added translations 2024-06-28 10:56:09 +02:00
Jorge Penadés e8ade1fd1d Merge branch '7436-showQCheckbox' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox 2024-06-28 10:21:50 +02:00
Jorge Penadés 97c84f7aaa Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox 2024-06-28 10:21:47 +02:00