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

12783 Commits

Author SHA1 Message Date
Alex Moreno a937b2d3ac Merge pull request '#8449 - vnLogFilter' (!1640) from 8449-vnLogFilter into dev 
Reviewed-on: verdnatura/salix-front#1640
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-03-31 11:13:16 +00:00
Alex Moreno 2f6b98a0bf fix: refs #8449 update data-key attribute in VnTableFilter and related components 2025-03-31 12:50:32 +02:00
Alex Moreno 497eb3a8bb refactor(VnLog): refs #8449 clear filters when has userParams 2025-03-31 12:35:13 +02:00
Alex Moreno 5066cd8179 Merge branch 'dev' of https: refs #8449//gitea.verdnatura.es/verdnatura/salix-front into 8449-vnLogFilter 2025-03-31 11:44:02 +02:00
Jose Antonio Tubau c205693131 Merge pull request '8440-createVehicleNotes' (!1638) from 8440-createVehicleNotes into dev 
Reviewed-on: verdnatura/salix-front#1638
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-03-31 09:01:35 +00:00
Jose Antonio Tubau 2bd0e88e3b Merge branch 'dev' into 8440-createVehicleNotes 2025-03-31 08:39:35 +00:00
Javier Segarra 8c75ec41d8 Merge pull request '#8667: Modified ClientPayment' (!1622) from 8667-FixClientNewPayment into dev 
Reviewed-on: verdnatura/salix-front#1622
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-31 08:17:33 +00:00
Jon Elias 6cee67733d Merge branch 'dev' into 8667-FixClientNewPayment 2025-03-31 07:54:41 +00:00
Pablo Natek 6dad310665 Merge pull request 'fix: adjust styles in ExtraCommunity.vue for better layout and readability' (!1655) from fixOverFlow into dev 
Reviewed-on: verdnatura/salix-front#1655
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-31 07:54:26 +00:00
Pablo Natek 5b23a3ebc6 Merge branch 'dev' into fixOverFlow 2025-03-31 07:26:10 +00:00
Javi Gallego 9fdc8a1042 fix: update state color for 'managed' to 'loses' in ClaimList.vue 2025-03-31 08:51:37 +02:00
Jose Antonio Tubau 2d03b3a0b7 Merge branch 'dev' into 8440-createVehicleNotes 2025-03-31 06:34:06 +00:00
Benjamin Esteve c516ae1e12 Merge pull request 'refactor: refs #8673 replace VnPopup with inline display of evaNotes in ExtraCommunity.vue' (!1633) from 8673-viewEntryNotesField into dev 
Reviewed-on: verdnatura/salix-front#1633
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
 2025-03-28 11:55:33 +00:00
Benjamin Esteve 89d9c22c6a Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-28 11:34:12 +00:00
Alex Moreno e05d3140a3 Merge branch 'dev' into 8449-vnLogFilter 2025-03-28 10:55:43 +00:00
Pablo Natek ff30ca898c fix: adjust styles in ExtraCommunity.vue for better layout and readability 2025-03-28 11:07:34 +01:00
Javier Segarra ec723a884b fix: vnMoreOptions label 2025-03-28 09:52:23 +01:00
Benjamin Esteve feec9a7100 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-28 08:36:52 +00:00
Alex Moreno ea694a606a Merge pull request 'feat: refs #8534 implement navigation and state query guards for improved routing control' (!1621) from 8534-wait_queries into dev 
Reviewed-on: verdnatura/salix-front#1621
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-28 08:32:16 +00:00
Benjamin Esteve cc41c90d8e Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-28 07:39:20 +00:00
Alex Moreno 7648fc6743 refactor: refs #8534 simplify stateQueryGuard usage and improve test structure 2025-03-28 08:06:51 +01:00
Alex Moreno 5c2c761eb0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8534-wait_queries 2025-03-28 07:18:51 +01:00
Javier Segarra 195fc7efd2 Merge branch 'dev' into 8667-FixClientNewPayment 2025-03-27 20:16:36 +00:00
Alex Moreno f5dd0834b4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-27 14:49:06 +01:00
Alex Moreno 69da78b655 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-03-27 14:48:58 +01:00
Alex Moreno 6e27edcf54 Merge branch 'dev' into 8449-vnLogFilter 2025-03-27 13:14:55 +00:00
Jose Antonio Tubau 1805e1e553 Merge branch 'dev' into 8440-createVehicleNotes 2025-03-27 12:59:27 +00:00
Jon Elias c743ad4ac1 Merge branch 'dev' into 8667-FixClientNewPayment 2025-03-27 12:37:25 +00:00
Benjamin Esteve c1536bd762 refactor: refs #8673 simplify evaNotes display logic in ExtraCommunity.vue 2025-03-27 12:54:52 +01:00
Pablo Natek ba875ba5da Merge pull request 'fix: correct badge color logic in EntryList based on time difference' (!1646) from fixColorOnEntryList into master 
Reviewed-on: verdnatura/salix-front#1646
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-27 11:46:54 +00:00
Benjamin Esteve 0d1f2f33e0 refactor: refs #8673 enhance display of evaNotes in ExtraCommunity.vue with conditional rendering 2025-03-27 12:27:42 +01:00
Benjamin Esteve 0b6ee4ba70 Merge branch 'dev' of https: refs #8673//gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField 2025-03-27 12:13:11 +01:00
Pablo Natek e06201c3d0 Merge branch 'master' into fixColorOnEntryList 2025-03-27 11:08:36 +00:00
Pablo Natek 07cb49f7a1 fix: comment out checkBadgeDate function in entryList.spec.js for clarity 2025-03-27 11:41:51 +01:00
Pablo Natek 3caa4abe9e Merge pull request 'refactor: refs #8699 adjust column alignment in ExtraCommunity.vue for better readability' (!1647) from 8699-align-correctly-extra-comunity-columns into dev 
Reviewed-on: verdnatura/salix-front#1647
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-27 10:39:43 +00:00
Javier Segarra d45990c4a1 fix: monitorClients and monitorOrders descriptors 2025-03-27 10:37:26 +01:00
Pablo Natek 169ebbe593 refactor: refs #8699 adjust alignment and sortable property for percentage column in ExtraCommunity.vue 2025-03-27 09:43:00 +01:00
Pablo Natek 04b0bb1db9 refactor: refs #8699 remove sortable property from percentage column in ExtraCommunity.vue 2025-03-27 09:40:36 +01:00
Alex Moreno 75a20f7ca7 Merge branch 'dev' into 8449-vnLogFilter 2025-03-27 08:39:31 +00:00
Pablo Natek 321493b6b6 refactor: refs #8699 adjust column alignment in ExtraCommunity.vue for better readability 2025-03-27 09:37:04 +01:00
Benjamin Esteve 4765fda63b Merge branch '8673-viewEntryNotesField' of https://gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField 2025-03-27 09:32:08 +01:00
Benjamin Esteve 04cc5e80f3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8673-viewEntryNotesField 2025-03-27 09:31:46 +01:00
Pablo Natek 5966fe5390 fix: correct badge color logic in EntryList based on time difference 2025-03-27 09:09:50 +01:00
Benjamin Esteve e2baac843b Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-27 07:38:50 +00:00
Alex Moreno fff43b2260 Merge branch 'dev' into 8534-wait_queries 2025-03-27 06:54:00 +00:00
Alex Moreno a0313cb957 Merge branch '8534-wait_queries' of https://gitea.verdnatura.es/verdnatura/salix-front into 8534-wait_queries 2025-03-27 07:53:18 +01:00
Alex Moreno 9d53418e21 fix: refs #8534 enhance stateQueryGuard to handle identical routes and improve test coverage 2025-03-27 07:53:17 +01:00
Javier Segarra a398f87f62 Merge pull request '#8772 - update VnLinkPhone for displaying phone numbers' (!1603) from 8772-align_linkPhone into dev 
Reviewed-on: verdnatura/salix-front#1603
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-27 06:24:19 +00:00
Javier Segarra e0bac2c033 Merge branch 'dev' into 8772-align_linkPhone 2025-03-26 19:04:56 +00:00
Javier Segarra 90a49a8513 Merge pull request 'hotfix_rowClickActions' (!1643) from hotfix_rowClickActions into master 
Reviewed-on: verdnatura/salix-front#1643
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-26 15:32:02 +00:00