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

4364 Commits

Author SHA1 Message Date
Alex Moreno 8b55acf667 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6917-inputDate_inpuTime 2024-06-28 08:35:28 +02:00
Alex Moreno ba5af7258f Merge pull request 'Revert "feat: fixes #7196"' (!496) from 7196-revertCJS into dev 
Reviewed-on: verdnatura/salix-front#496
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-06-28 06:28:14 +00:00
Alex Moreno 0a8dbe8e4d Revert "feat: fixes #7196" 
This reverts commit e8e6a88066.
 2024-06-28 08:23:11 +02:00
William Buezas db4c3a6799 Changes 2024-06-27 11:46:31 -03:00
Jorge Penadés e8c349a550 Merge branch 'dev' into 7436-showQCheckbox 2024-06-27 12:54:35 +00:00
Jorge Penadés e610013038 Merge branch 'dev' into 7433-fixSkeleton 2024-06-27 12:53:57 +00:00
Alex Moreno 381a9c6d1d feat: remake vnInputDate and fix: FormModel has changes when error 2024-06-27 13:56:20 +02:00
Jorge Penadés 7c16137908 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7433-fixSkeleton 2024-06-27 13:40:49 +02:00
Alex Moreno f78ae08550 fix: cypress.config to mjs 2024-06-27 13:39:27 +02:00
Jorge Penadés e7ad147d04 fix: refs #7433 skeleton 2024-06-27 13:16:42 +02:00
Jon Elias 56e63852ed Merge pull request '#6464 correct negativeBases' (!373) from 6464-fixNegativeBases into dev 
Reviewed-on: verdnatura/salix-front#373
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-06-27 10:30:19 +00:00
Jorge Penadés 6d71aef9e9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7436-showQCheckbox 2024-06-27 12:27:35 +02:00
Jorge Penadés ed642b299e feat: refs #7436 show checkbox 2024-06-27 12:27:04 +02:00
Jon Elias 95f70ba765 Merge branch '6464-fixNegativeBases' of https://gitea.verdnatura.es/verdnatura/salix-front into 6464-fixNegativeBases 2024-06-27 10:15:18 +02:00
Jon Elias fd744158ac fix: refs 6464 deleted useless class in checkbox 2024-06-27 10:15:17 +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 5b07f3015d small change 2024-06-26 17:02:21 -03: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
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 6f2573880c refs #7409 fix balance and formation 2024-06-26 09:59:37 +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
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
William Buezas a57df459a6 Add pay button 2024-06-25 12:54:21 -03:00
Carlos Satorres 6e33a2930b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7409-workerBalance 2024-06-25 17:04:47 +02:00
Jorge Penadés fbef6f3eb1 fix: refs #7623 test 2024-06-25 16:18:53 +02:00
Jorge Penadés ca96e4e6e0 fix: refs #7623 bugs & tests 2024-06-25 16:07:26 +02:00
Jorge Penadés 121204fee4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7623-fix-redirection 2024-06-25 15:37:00 +02:00