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

4323 Commits

Author SHA1 Message Date
Javier Segarra 147d17301f remove unnussed tags 2024-07-03 01:50:45 +02:00
Javier Segarra dbbc8a4de6 test: change user 2024-07-03 01:48:06 +02:00
Javier Segarra 7e374c258e test: test:e2e 2024-07-03 01:47:14 +02:00
Javier Segarra 5c2c9d0805 perf: change field column 2024-07-02 20:41:37 +02:00
Javier Segarra 8a94701422 Merge branch 'dev' into 7648_dev_customerEntries 2024-07-02 20:32:08 +02:00
Javier Segarra 07f76de8b7 Merge pull request 'feat(VnTable): add slots for columns' (!512) from 6825-vnTable-column-slots into dev 
Reviewed-on: verdnatura/salix-front#512
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' (!509) from vnTable-fixes into dev 
Reviewed-on: verdnatura/salix-front#509
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' (!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 0384123564 fix: vntable filter where 2024-07-02 12:24:33 +02:00
Alex Moreno d714788923 test: fix intermitent e2e 2024-07-02 08:29:55 +02:00
Javier Segarra 956ccf93c0 perf: remove unnecessary code 2024-07-01 21:12:44 +02:00
Javier Segarra aa2885e6ca feat: remove isEmployee by acl.back 2024-07-01 21:12:21 +02:00
Javier Segarra f2304ab6f0 feat: myEntries 2024-07-01 19:05:59 +02:00
Javier Segarra 68298b9ba6 feat: rreplace eti by labeler 2024-07-01 19:03:17 +02:00
Javier Segarra 5d1873808d feat: restore component 2024-07-01 19:03:05 +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
Javier Segarra 79d986b9ec perf: remove warnings 2024-07-01 14:33:07 +02:00
Javier Segarra 814056d920 feat: showLabelerDialog 2024-07-01 14:20:31 +02:00
Javier Segarra d2292601de feat: use VnTable 2024-07-01 14:05:52 +02:00
Javier Segarra eeab4ed915 updates 2024-07-01 13:18:19 +02:00
Javier Segarra 0dfdb1edb0 Merge branch '7648_customerEntries' into 7648_dev_customerEntries 2024-07-01 12:27:07 +02:00
Javier Segarra 71900b15a6 feat: newsection and i18n 2024-07-01 12:18:58 +02:00
Javier Segarra 379d90d4c9 updates 2024-07-01 11:40:57 +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
Javier Segarra 666cb519c5 feat: #7648 handle EntryBuys 2024-06-29 00:08:35 +02:00
Javier Segarra 4bbf0f29d5 feat: #7648 handle EntryList 2024-06-29 00:07:09 +02:00
Javier Segarra 361024abe2 feat: #7648 handle LeftMenu 2024-06-29 00:07:00 +02:00
Javier Segarra e418a647be feat: #7648 handle NavBar 2024-06-29 00:06:49 +02:00
Alex Moreno 4cf389e00c fixes: fix vnFilter params and redirect 2024-06-28 17:45:04 +02:00