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

5768 Commits

Author SHA1 Message Date
Alex Moreno fd9caea5c1 Merge pull request '6336-migrationClaim-v5' (!531) from 6336-migrationClaim-v5 into dev 
Reviewed-on: verdnatura/salix-front#531
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-09 09:42:42 +00:00
Alex Moreno bb8f0b43f0 Merge branch 'dev' into 6336-migrationClaim-v5 2024-07-09 09:27:16 +00:00
Alex Moreno 66a5516116 warmFix: delete params.filter url query 2024-07-09 10:34:15 +02:00
Javier Segarra 38dd54b2f5 fix: i18n components 2024-07-09 10:18:01 +02:00
Javier Segarra 4eaab6f4ae fix warning when quasar build 2024-07-09 10:07:22 +02:00
Javier Segarra a9e19309ee fix warning 2024-07-09 09:59:39 +02:00
Javier Segarra c5c96bf51b Merge branch 'dev' into feature/SaleTracking 2024-07-09 09:41:45 +02:00
Javier Segarra 3f2b675d07 feat: change ticketDms leftMenuItem position 2024-07-09 09:15:20 +02:00
Javier Segarra cededb54e8 Merge branch 'dev' into feature/TicketDms 2024-07-09 09:14:40 +02:00
Javier Segarra 6482dbad22 fix: TicketDmsImportForm 2024-07-09 09:13:44 +02:00
Carlos Satorres 31056ea5c9 refs #7355 fix lists redirects summary 2024-07-09 07:56: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
Jon Elias 1869e318ca Merge pull request '#6896 Order migration' (!525) from 6896_Order_End into dev 
Reviewed-on: verdnatura/salix-front#525
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-09 05:28:33 +00:00
Javier Segarra 6bd119abc3 Merge branch 'dev' into 6896_Order_End 2024-07-08 13:01:34 +00:00
Javier Segarra 20eb26127a fix: Right menu double icon 2024-07-08 15:00:45 +02:00
Javier Segarra 286fbc5aba fix: Right menu double icon 2024-07-08 14:59:12 +02:00
Alex Moreno 2b67b85179 add changlelog 2024-07-08 14:58:33 +02:00
Alex Moreno 092909512a feat(ClaimSummary): add workerDescriptor in development 2024-07-08 14:25:50 +02:00
Alex Moreno 75b8cca2e0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6336-migrationClaim-v5 2024-07-08 14:25:01 +02:00
Javier Segarra 339fba72a7 updates 2024-07-08 14:15:24 +02:00
Alex Moreno b23915ea2d fix: vnTable filter class 2024-07-08 14:14:24 +02:00
Alex Moreno 0c84d7d0ef Merge pull request 'feat(VnTable): add visibleColumns' (!536) from 6825-visibleColumns into dev 
Reviewed-on: verdnatura/salix-front#536
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-07-08 12:07:42 +00:00
Alex Moreno 54ca806ad9 Merge branch '6825-visibleColumns' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-visibleColumns 2024-07-08 13:51:57 +02:00
Alex Moreno dd872dba3b fix: areAllChecksMarked 2024-07-08 13:51:56 +02:00
Alex Moreno 4588897752 Merge branch 'dev' into 6825-visibleColumns 2024-07-08 11:47:23 +00:00
Javi Gallego b437630b62 Merge pull request 'feat: refs #7348 add checkbox' (!530) from 7348-client-hasDailyInvoice into dev 
Reviewed-on: verdnatura/salix-front#530
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 11:29:26 +00:00
Alex Moreno 4a8493f035 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6825-visibleColumns 2024-07-08 13:25:14 +02:00
Alex Moreno 41deb82174 feat(VnTable): add visibleColumns 2024-07-08 13:23:42 +02:00
Jon Elias 960c011024 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323_WorkerMigration_End 2024-07-08 13:16:06 +02:00
Jon Elias e70adce488 feat: refs #7323 fix descriptors, added VnTable and minor changes 2024-07-08 13:15:14 +02:00
Javi Gallego 32d2087bce feat: #7348 restore template 2024-07-08 12:56:34 +02:00
Javi Gallego 815a544244 Merge branch 'dev' into 7348-client-hasDailyInvoice 2024-07-08 12:44:06 +02:00
Javier Segarra 7393e51a94 fix: when param not exists 2024-07-08 12:41:00 +02:00
Javier Segarra e9ab0154fe Merge branch 'dev' into feature/TicketAdvanceFilter 2024-07-08 12:35:13 +02:00
Jon Elias 03d47d0145 Merge pull request '#6899 end invoiceOut migration with VnTable' (!513) from 6899_InvoiceOut_End into dev 
Reviewed-on: verdnatura/salix-front#513
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 09:34:43 +00:00
Jon Elias 7d90b536b0 Merge branch 'dev' into 6899_InvoiceOut_End 2024-07-08 09:32:32 +00:00
Javier Segarra a73892723f Merge pull request '#6825 - vnTable_searchBtn_sticky' (!488) from 6825_vnTable_searchBtn_sticky into dev 
Reviewed-on: verdnatura/salix-front#488
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-08 09:07:16 +00:00
Javier Segarra fcbe6827e3 Merge branch 'dev' into 6825_vnTable_searchBtn_sticky 2024-07-08 11:06:31 +02:00
Javier Segarra 67e6386939 Merge pull request '#7185 - Multiple toast errors when logout' (!521) from 7185_logoutErrorsToast into dev 
Reviewed-on: verdnatura/salix-front#521
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-08 08:58:48 +00:00
Javier Segarra 500d582100 Merge branch 'dev' into 7185_logoutErrorsToast 2024-07-08 08:57:51 +00:00
Javier Segarra 9b0fb8001f Merge pull request 'Ticket packages' (!528) from hyervoni/salix-front-mindshore:feature/TicketPackages into dev 
Reviewed-on: verdnatura/salix-front#528
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 08:56:00 +00:00
Javier Segarra aabd575854 Merge branch 'dev' into feature/TicketPackages 2024-07-08 10:55:14 +02:00
Javier Segarra 869fd66840 Merge pull request 'Ticket components' (!522) from hyervoni/salix-front-mindshore:feature/TicketComponents into dev 
Reviewed-on: verdnatura/salix-front#522
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 08:15:00 +00:00
Javier Segarra 84462fe201 Merge branch 'dev' into feature/TicketComponents 2024-07-08 10:14:13 +02:00
Javier Segarra 5a09caa3b5 Merge pull request 'Ticket photos' (!534) from hyervoni/salix-front-mindshore:feature/TicketPhotos into dev 
Reviewed-on: verdnatura/salix-front#534
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-07-08 08:11:09 +00:00
Javier Segarra f87b806406 Merge branch 'dev' into feature/TicketPhotos 2024-07-08 10:10:24 +02:00
Javier Segarra 22faaf8186 Merge pull request 'Ticket expedition' (!499) from hyervoni/salix-front-mindshore:feature/TicketExpedition into dev 
Reviewed-on: verdnatura/salix-front#499
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-07-08 08:06:15 +00:00
Javier Segarra a303942f76 Merge branch 'dev' into feature/TicketExpedition 2024-07-08 08:05:33 +00:00
Carlos Satorres a43a6aec82 refs #7355 fix Rol, alias 2024-07-08 09:59:07 +02:00
Alex Moreno d2c4c65b00 fix 2024-07-08 09:05:03 +02:00