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

5037 Commits

Author SHA1 Message Date
Jon Elias 89aa987c58 Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-19 06:20:57 +00:00
Jon Elias 26cdae2384 refactor: refs #7323 hidden column filter proposal 2024-07-19 08:18:41 +02:00
Alex Moreno dbe56fa3a0 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-19 08:02:58 +02: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 9b1636355d fix: customerNotifications filter 2024-07-19 07:58:34 +02:00
Jon Elias 6f6ab74220 Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-19 07:42:59 +02:00
Jon Elias f171774605 fix: refs #7323 fixed left filter 2024-07-19 07:42:58 +02:00
Alex Moreno 3fe566796b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-18 14:01:28 +02: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
Jon Elias f4fa9b3c1f Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-18 10:14:26 +00:00
Jon Elias 4a544b0b6c Merge branch '7323_WorkerMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-18 12:13:39 +02:00
Jon Elias 901a9e1f6d fix: refs #7323 fix department & email table filter 2024-07-18 12:13:38 +02:00
Jon Elias 81121833c6 Merge pull request '#7356 End Tickets migration' (!556) from 7356_TicketMigration_End into dev 
Reviewed-on: verdnatura/salix-front#556
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-18 10:10:37 +00:00
Jon Elias 108375bb69 perf: refs #7356 TicketList state column 2024-07-18 12:05:10 +02:00
Jon Elias c36e2cd3c9 Merge branch '7356_TicketMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-18 10:53:46 +02:00
Jon Elias 78e074d2fb refactor: refs #7356 requested changes 2024-07-18 10:53:44 +02:00
Alex Moreno b2520a238e Merge branch '6943-fixCustomer' of https://gitea.verdnatura.es/verdnatura/salix-front into 6943-fixCustomer 2024-07-18 08:31:24 +02:00
Alex Moreno 08e170bc17 unnecessary test 2024-07-18 08:31:23 +02:00
Alex Moreno 71d6e57ea5 Merge branch 'dev' into 6943-fixCustomer 2024-07-18 06:26:19 +00:00
Alex Moreno 83596daf76 fix: customerDefaulter correct functionality 2024-07-18 08:19:08 +02:00
Javier Segarra ac89c4f328 Merge branch 'dev' into 7323_WorkerMigration_End 2024-07-18 05:49:58 +00:00
Javier Segarra 359c44dc08 Merge branch 'dev' into 7356_TicketMigration_End 2024-07-17 18:59:36 +00:00
Jon Elias b2b613a1d4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-17 14:58:25 +02:00
Alex Moreno ea5fef9d7f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-17 14:19:25 +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
Jon Elias a544ea224b Merge branch '7356_TicketMigration_End' of https://gitea.verdnatura.es/verdnatura/salix-front into 7356_TicketMigration_End 2024-07-17 13:02:22 +02:00
Jon Elias 1e959307d8 refactor: refs #7356 fixed VnTable filters 2024-07-17 13:02:21 +02:00
Jon Elias 0d60f63771 Merge branch 'dev' into 7356_TicketMigration_End 2024-07-17 06:52:42 +00:00
Jon Elias cb610608df feat: refs #7356 list & weekly to VnTable and style fixes 2024-07-17 08:49:38 +02:00
Jon Elias 9e78d30a4c Merge branch dev of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-17 07:45:24 +02:00
Alex Moreno c253959e01 feat: customerPayments card view 2024-07-16 14:08:03 +02:00
Alex Moreno 3cd185360b fix: columns style 2024-07-16 14:03:14 +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 90db8b403f Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-07-16 13:15:17 +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
Javier Segarra e921e36ce9 Merge pull request '#7353 - Monitors requested changes' (!507) from hyervoni/salix-front-mindshore:7353-MonitorsFixes into dev 
Reviewed-on: verdnatura/salix-front#507
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-16 07:28:55 +00:00
Javier Segarra d2a17bc376 Merge branch 'dev' into 7353-MonitorsFixes 2024-07-16 07:28:14 +00:00