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
Carlos Satorres 4dd1ed3a3d refs #7366 remove summary 2024-06-27 10:12:04 +02:00
Carlos Satorres 99628d2cf8 refs #7366 remove code 2024-06-27 10:08:17 +02:00
Carlos Satorres 95a9805a84 refs #7366 fix icons actions 2024-06-27 09:53:42 +02:00
Jon Elias f6e0cb41ce Merge branch 'dev' into 6464-fixNegativeBases 2024-06-27 07:36:02 +00:00
Javi Gallego 01e44753e4 Merge pull request 'feat: fixes #7196' (!463) from 7196-cjsToEsm into dev 
Reviewed-on: verdnatura/salix-front#463
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-27 06:22:34 +00:00
Javi Gallego a8c3f1d9e5 Merge branch 'dev' into 7196-cjsToEsm 2024-06-27 06:20:03 +00:00
William Buezas 0e8106af17 Resolve conflicts 2024-06-26 17:21:31 -03:00
William Buezas 826e8ed068 changes 2024-06-26 17:19:07 -03:00
William Buezas 5b07f3015d small change 2024-06-26 17:02:21 -03:00
Carlos Satorres aaee96d6bb refs #7366 VnTable 2024-06-26 15:09:26 +02:00
Jon Elias 6bf2a8c2f6 Merge branch 'dev' into 7543-StandarizeDescriptors 2024-06-26 12:29:18 +00:00
Jon Elias 452d1000bc refactor: refs #7543 requested changes 2024-06-26 14:28:21 +02:00
Javier Segarra a5a3945582 feat: remove button from panel 2024-06-26 12:26:05 +00:00
Javier Segarra defd26fe91 feat: define Sticky Button 2024-06-26 12:25:01 +00:00
Jorge Penadés 152bd5ff08 Merge pull request '#7623 add updateRoute prop in VnPaginate' (!475) from 7623-fix-redirection into dev 
Reviewed-on: verdnatura/salix-front#475
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-26 12:21:59 +00:00
Jorge Penadés 92f9869a36 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-26 14:18:57 +02:00
William Buezas fd03336c7a Resolve conflicts 2024-06-26 09:12:23 -03:00
William Buezas ae73dd047f changes 2024-06-26 08:55:30 -03:00
William Buezas 8ee4fa2e7d Resolve conflicts 2024-06-26 08:39:56 -03:00
William Buezas cd01ba8fe1 changes 2024-06-26 08:36:17 -03:00
William Buezas ad950f33c6 WIP 2024-06-26 08:27:36 -03:00
Jorge Penadés 2cb6d21ade feat: refs #7197 add correcting filter 2024-06-26 11:47:14 +02:00
Carlos Satorres 44ba965feb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-06-26 11:42:38 +02:00
Carlos Satorres efa8791b9d refs #6898 remove comment 2024-06-26 11:40:59 +02:00
Carlos Satorres 98b125281c Merge pull request '7409-workerBalance' (!451) from 7409-workerBalance into dev 
Reviewed-on: verdnatura/salix-front#451
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-26 09:40:36 +00:00
Carlos Satorres c570f2058b Merge branch 'dev' into 7409-workerBalance 2024-06-26 09:37:52 +00:00
Carlos Satorres def8d4222b refs #6898 fix warnings 2024-06-26 11:33:02 +02:00
Carlos Satorres 1f41f8e564 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6898-supplierMigration 2024-06-26 10:10:00 +02:00
Carlos Satorres 6f2573880c refs #7409 fix balance and formation 2024-06-26 09:59:37 +02:00
Jorge Penadés 98bc7cbf0d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7197-fixInvoiceIn 2024-06-26 09:46:38 +02:00
Jorge Penadés 752f3ace58 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-26 09:38:37 +02:00
Jon Elias de2c3cc244 fix: refs #6826 fix roleDescriptor 2024-06-26 08:56:17 +02:00
Jon Elias 677e71d1a7 refactor: refs #7543 standarized descriptors 2024-06-26 08:26:04 +02:00
Jon Elias f596a9b5f7 fix: refs #7014 fix wagon module 2024-06-26 07:26:35 +02:00
Jon Elias 42df3894ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7014-RefactorQDrawer 2024-06-26 07:16:42 +02:00
Javier Segarra 120a119b38 Merge branch 'dev' into feature/TicketTracking 2024-06-25 23:05:11 +02:00
Javier Segarra 2313f8ca0d Merge pull request 'Weekly tickets' (!459) from hyervoni/salix-front-mindshore:feature/WeeklyTickets into dev 
Reviewed-on: verdnatura/salix-front#459
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-25 21:02:08 +00:00
Javier Segarra 151978160b fix: ticket order 2024-06-25 23:01:26 +02:00
Javier Segarra ff02e5d160 Merge branch 'dev' into feature/WeeklyTickets 2024-06-25 22:59:16 +02:00
Javier Segarra d409b9ea86 fix: WorkerSelect option format 2024-06-25 22:51:26 +02:00
Javier Segarra 7a2b334a64 Merge branch 'dev' into feature/TicketTracking 2024-06-25 22:41:15 +02:00
Javier Segarra 22ccd4adfd Merge pull request 'Ticket purchase request' (!479) from hyervoni/salix-front-mindshore:feature/TicketPurchaseRequest into dev 
Reviewed-on: verdnatura/salix-front#479
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-25 20:36:52 +00:00
Javier Segarra 56560d4b50 fix: merge dev 2024-06-25 22:35:20 +02:00
Javier Segarra 4e4563d481 fix: merge dev 2024-06-25 22:34:19 +02:00
Javier Segarra c45c24e983 Merge branch 'dev' into feature/TicketPurchaseRequest 2024-06-25 22:31:52 +02:00
Javier Segarra d60ddfac6f Merge pull request 'Ticket basic data' (!474) from hyervoni/salix-front-mindshore:feature/TicketBasicData into dev 
Reviewed-on: verdnatura/salix-front#474
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-06-25 20:28:00 +00:00
Javier Segarra 5419bc4d52 Merge branch 'feature/TicketBasicData' of https://gitea.verdnatura.es/hyervoni/salix-front-mindshore into feature/TicketBasicData 2024-06-25 22:27:21 +02:00
Javier Segarra 1a2b4739c3 Merge branch 'dev' into feature/TicketBasicData 2024-06-25 22:27:18 +02:00
William Buezas 6e6c6301d2 fix log view not refreshing when changing id param 2024-06-25 15:27:48 -03:00
William Buezas 1529e2dd4f Add tooltip to add state button 2024-06-25 12:58:49 -03:00