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

4300 Commits

Author SHA1 Message Date
Carlos Satorres e695fffb30 Merge pull request 'refs #6897 fix entry summary' (!538) from hotfix-fixEntrySummary into master 
Reviewed-on: verdnatura/salix-front#538
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-09 10:32:22 +00:00
Carlos Satorres c7952092ad remove log 2024-07-09 12:20:31 +02:00
Carlos Satorres c61cf2d4bf refs #6897 fix entry summary 2024-07-09 12:09:38 +02:00
Alex Moreno ac8c3d86fc Merge pull request '7691-testToMaster' (!537) from 7691-testToMaster into master 
Reviewed-on: verdnatura/salix-front#537
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-07-09 05:39:55 +00:00
Alex Moreno 2b67b85179 add changlelog 2024-07-08 14:58:33 +02:00
Alex Moreno 6b3a1d81d5 Merge pull request '7658-devToTest_2428' (!508) from 7658-devToTest_2428 into test 
Reviewed-on: verdnatura/salix-front#508
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 d714788923 test: fix intermitent e2e 2024-07-02 08:29:55 +02:00
Javier Segarra 62d58b479f Merge pull request 'Ticket service' (!494) from hyervoni/salix-front-mindshore:feature/TicketService into dev 
Reviewed-on: verdnatura/salix-front#494
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' (!485) from hyervoni/salix-front-mindshore:feature/TicketTracking into dev 
Reviewed-on: verdnatura/salix-front#485
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' (!490) from hyervoni/salix-front-mindshore:feature/TicketVolume into dev 
Reviewed-on: verdnatura/salix-front#490
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' (!487) from hyervoni/salix-front-mindshore:feature/TicketNotes into dev 
Reviewed-on: verdnatura/salix-front#487
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 #7129 fix e2e' (!502) from 7129-fixe2e into dev 
Reviewed-on: verdnatura/salix-front#502
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 #7129 fix e2e 2024-07-01 09:18:16 +02:00
Jorge Penadés ceaf8a8865 Merge pull request '#7436 show checkbox' (!492) from 7436-showQCheckbox into dev 
Reviewed-on: verdnatura/salix-front#492
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 '#6826 added rol summary link' (!481) from 6826-RolSummary into dev 
Reviewed-on: verdnatura/salix-front#481
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 '#5447 changed warehouse out filter' (!397) from 5447-travelExtraCommunity into dev 
Reviewed-on: verdnatura/salix-front#397
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-28 12:57:02 +00:00
Jon Elias 6ee5fc954b fix: refs #6826 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 #7436 fix e2e 2024-06-28 12:46:14 +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
Jorge Penadés 86a016e375 Merge pull request '#7433 fix skeleton' (!493) from 7433-fixSkeleton into dev 
Reviewed-on: verdnatura/salix-front#493
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-06-28 08:19:46 +00:00
Jorge Penadés 2b7f3990ab Merge branch '7433-fixSkeleton' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton 2024-06-28 09:57:02 +02:00
Jorge Penadés 2c5db9716d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton 2024-06-28 09:56:57 +02:00
Jorge Penadés b8aee9738d Merge branch 'dev' into 7433-fixSkeleton 2024-06-28 07:53:15 +00:00
Alex Moreno eb3eaaa4db fix: revert cypress mjs 2024-06-28 08:37:39 +02:00
Alex Moreno ba5af7258f Merge pull request 'Revert "feat: fixes #7196"' (!496) from 7196-revertCJS into dev 
Reviewed-on: verdnatura/salix-front#496
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-06-28 06:28:14 +00:00
Alex Moreno 0a8dbe8e4d Revert "feat: fixes #7196" 
This reverts commit e8e6a88066.
 2024-06-28 08:23:11 +02:00
William Buezas db4c3a6799 Changes 2024-06-27 11:46:31 -03:00
Jorge Penadés e8c349a550 Merge branch 'dev' into 7436-showQCheckbox 2024-06-27 12:54:35 +00:00
Jorge Penadés e610013038 Merge branch 'dev' into 7433-fixSkeleton 2024-06-27 12:53:57 +00:00
Jorge Penadés 7c16137908 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton 2024-06-27 13:40:49 +02:00
Alex Moreno f78ae08550 fix: cypress.config to mjs 2024-06-27 13:39:27 +02:00
Jorge Penadés e7ad147d04 fix: refs #7433 skeleton 2024-06-27 13:16:42 +02:00