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

4794 Commits

Author SHA1 Message Date
Alex Moreno ae5ec1328b hotFix: myEntries 2024-07-24 19:55:13 +02:00
Pablo Natek beaddf0199 Merge pull request 'test' (!564) from test into master 
Reviewed-on: verdnatura/salix-front#564
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2024-07-24 17:54:27 +00:00
Alex Moreno 38437aa2f9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-23 14:46:27 +02:00
Alex Moreno db3813ccf0 warmFix: orderBy tableActions false 2024-07-23 14:46:05 +02:00
Alex Moreno 451619fb88 hotFix(VnTable): add ctrl + click 2024-07-23 10:09:42 +02:00
Alex Moreno ad87fd8311 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:36:23 +02:00
Alex Moreno ca9425cfb7 hotfix(entry_latest-buys): refs #6897 img 2024-07-23 09:14:22 +02:00
Alex Moreno c7d54668e6 hotfix(entry_latest-buys): refs #6897 redirect to entry 2024-07-23 08:45:54 +02:00
Alex Moreno 53d59ee75c Merge pull request '7773-testToMaster_2430' (!561) from 7773-testToMaster_2430 into master 
Reviewed-on: verdnatura/salix-front#561
Reviewed-by: Guillermo Bonet <guillermo@verdnatura.es>
 2024-07-23 06:24:04 +00:00
Pablo Natek a421c96e85 Merge pull request '#7129 - fixFilters' (!559) from 7129-fixFilters into test 
Reviewed-on: verdnatura/salix-front#559
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-22 16:00:14 +00:00
Pablo Natek 1a091e5b5a Merge branch '7129-fixFilters' of https://gitea.verdnatura.es/verdnatura/salix-front into 7129-fixFilters 2024-07-22 17:50:59 +02:00
Pablo Natek 3ceb0771a7 fix: refs #7129 remove templates 2024-07-22 17:50:58 +02:00
Pablo Natek f2b56c92c6 Merge branch 'test' into 7129-fixFilters 2024-07-22 15:37:35 +00:00
Pablo Natek 5f0c4fea3c feat: refs #7129 add e2e 2024-07-22 13:19:41 +02:00
Pablo Natek 6f959ff99c fix: refs #7129 fix filters 2024-07-22 09:18:53 +02:00
Pablo Natek af6a20729b fix: refs #7129 fixFilters 2024-07-22 09:12:56 +02:00
Guillermo Bonet 580777af65 Deleted repeated labeler i18n 2024-07-22 08:20:08 +02:00
Guillermo Bonet c5903e29e8 Merge branch 'master' into test 2024-07-19 13:08:41 +02:00
Guillermo Bonet 50c8b3c672 fix: refs #7648 Fix order property 2024-07-19 13:07:30 +02:00
Javier Segarra a0350fe5e4 Merge pull request '7648_myEntries' (!555) from 7648_myEntries into master 
Reviewed-on: verdnatura/salix-front#555
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-07-19 10:28:36 +00:00
Javier Segarra 569b86c2c1 Merge branch 'master' into 7648_myEntries 2024-07-19 10:27:57 +00:00
Alex Moreno bcf4f34862 Merge pull request '6825-fix_vnSelectCache_and_autoload' (!557) from 6825-fix_vnSelectCache_and_autoload into test 
Reviewed-on: verdnatura/salix-front#557
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-19 06:01:56 +00:00
Alex Moreno f8026dd3f6 feat: improve VnSelectCache add find by Object 2024-07-18 13:54:22 +02:00
Alex Moreno 5833b4d856 fix(VnTable): autoload when has url parameters 2024-07-18 13:53:57 +02:00
Alex Moreno 1c006a278e Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-07-17 14:19:08 +02:00
Alex Moreno 3999d93268 fix(WorkerTimeControl): url 2024-07-17 14:17:00 +02:00
Alex Moreno 725b7053f7 fix(workerTimeControl): correct request 'updateMailState' 2024-07-17 13:32:04 +02:00
Javier Segarra c7c6f0f1c6 filter: vnfilterPanel 2024-07-16 13:50:16 +02:00
Javier Segarra 86a84784b1 feat: userPanel 2024-07-16 13:50:07 +02:00
Alex Moreno 3decadc64f Merge pull request '#6917 - inputDate_inputTime_improviments' (!552) from 6917-inputDate_inputTime_improviments into test 
Reviewed-on: verdnatura/salix-front#552
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-16 11:12:54 +00:00
Javier Segarra f7135008a2 feat: entryBuys 2024-07-16 12:22:08 +02:00
Javier Segarra ace529a4ba feat: vnTable template 2024-07-16 12:22:01 +02:00
Javier Segarra 5fbbd27273 fat: i18n 2024-07-16 12:21:50 +02:00
Javier Segarra d467657928 feat: myEntries 2024-07-16 12:21:36 +02:00
Alex Moreno 4f36a78681 feat: curso in start when is 00:00 2024-07-16 12:13:16 +02:00
Alex Moreno f01e6d74f8 test: better command if is date 2024-07-16 10:42:35 +02:00
Alex Moreno 9cc11f0a28 variable 2024-07-16 10:18:28 +02:00
Alex Moreno c13f7fe237 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inputTime_improviments 2024-07-16 10:11:50 +02:00
Alex Moreno 493081254d feat: improve to set time 2024-07-16 10:11:27 +02:00
Alex Moreno 62347eb54c Merge pull request '7729-devToTest_2430' (!554) from 7729-devToTest_2430 into test 
Reviewed-on: verdnatura/salix-front#554
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-07-16 07:17:03 +00:00
Alex Moreno 4f802a4786 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-16 07:40:51 +02:00
Alex Moreno b488a013c7 fix(arrayData): reset 2024-07-15 14:55:06 +02:00
Alex Moreno 39bf7e55c0 fix: e2e 2024-07-15 13:11:24 +02:00
Alex Moreno ea3effd7f4 feat: VnInputDate & VnInputTime improviments 2024-07-15 12:33:58 +02:00
Alex Moreno 1ccf515509 fix: editable columns 2024-07-15 12:33:33 +02:00
Javier Segarra a0b6455b4c Merge pull request 'Ticket advance filter' (!533) from hyervoni/salix-front-mindshore:feature/TicketAdvanceFilter into dev 
Reviewed-on: verdnatura/salix-front#533
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-15 09:54:06 +00:00
Javier Segarra be86b69079 fix: ticket menu order and i18n 2024-07-15 11:53:10 +02:00
Javier Segarra 5d58676288 Merge branch 'dev' into feature/TicketAdvanceFilter 2024-07-15 09:31:22 +00:00
Javier Segarra 9c6722a6fd Merge pull request 'Ticket Dms' (!495) from hyervoni/salix-front-mindshore:feature/TicketDms into dev 
Reviewed-on: verdnatura/salix-front#495
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-15 09:30:57 +00:00
Javier Segarra 8ea1fb6793 Merge branch 'dev' into feature/TicketDms 2024-07-15 09:30:10 +00:00