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

12647 Commits

Author SHA1 Message Date
Benjamin Esteve 033ef0adb0 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-26 12:01:23 +00:00
Jon Elias 415d44a33a Merge pull request '#7358: Added chip in Navbar to show environment' (!1618) from 7358-AddChipInNavbar into dev 
Reviewed-on: verdnatura/salix-front#1618
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-26 11:44:56 +00:00
Jon Elias bbcdb1c361 Merge branch 'dev' into 7358-AddChipInNavbar 2025-03-26 11:22:56 +00:00
Benjamin Esteve 55503b0f65 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-26 10:36:15 +00:00
Benjamin Esteve ceb18df7ff Merge pull request 'feat: refs #8118 add VnDropdown component and integrate it into Claim and Ticket summaries' (!1517) from 8118-createComponentVnDropdown into dev 
Reviewed-on: verdnatura/salix-front#1517
Reviewed-by: Jorge Penadés <jorgep@verdnatura.es>
 2025-03-26 10:32:29 +00:00
Jon Elias 97a143fa4d Merge branch 'dev' into 7358-AddChipInNavbar 2025-03-26 10:21:23 +00:00
Benjamin Esteve bb77f771da Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-26 09:45:12 +00:00
Benjamin Esteve c20dd788d9 Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-26 09:45:10 +00:00
Jorge Penadés 40418c421b Merge pull request '#8388 fix invoice-in' (!1587) from 8388-fixInvoiceIn into dev 
Reviewed-on: verdnatura/salix-front#1587
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-03-26 09:41:44 +00:00
Jorge Penadés c3299d967b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-03-26 10:10:39 +01:00
Alex Moreno 1b280ef9fc refactor: rename cardDescriptor to vnDescriptor in localization files 2025-03-26 10:03:53 +01:00
Alex Moreno 4e83c31d35 feat: refs #6994 create ParkingDescriptorProxy to VnLog 2025-03-26 09:59:11 +01:00
Benjamin Esteve bd1a38fd0e Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-26 08:30:21 +00:00
Benjamin Esteve 243bf2062a Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-26 08:30:20 +00:00
Alex Moreno 382432636f Merge pull request 'fix(VnLog): refs #6994 simplify value binding and improve descriptor handling' (!1636) from 6994-fix_vnLogValue_whenIsString into dev 
Reviewed-on: verdnatura/salix-front#1636
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-03-26 08:29:35 +00:00
Benjamin Esteve 22deec8c40 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-26 08:11:07 +00:00
Benjamin Esteve c85c84e50a Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-26 08:10:55 +00:00
Alex Moreno e4bb2938e2 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-26 08:07:23 +00:00
Benjamin Esteve e3084ea39c Merge pull request 'fix: refs #8790 format code and update default SMS message in SendSmsDialog component' (!1619) from 8790-smsPredefinedText into dev 
Reviewed-on: verdnatura/salix-front#1619
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-03-26 08:02:14 +00:00
Alex Moreno 74b8bbc189 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-26 07:53:39 +00:00
Benjamin Esteve ee0b5558ad Merge branch 'dev' into 8790-smsPredefinedText 2025-03-26 07:40:58 +00:00
Benjamin Esteve eef88a471e Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-26 07:38:51 +00:00
Benjamin Esteve c35b8fa293 Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-26 07:38:34 +00:00
Alex Moreno 209a3caac9 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-26 08:32:00 +01:00
Alex Moreno bbc03ddcad fix: remove duplicated department selection from MonitorTicketFilter 2025-03-26 08:30:20 +01:00
Alex Moreno f402350188 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-26 07:14:35 +00:00
Alex Moreno 659d73e11a test: skip RouteAutonomous tests temporarily 2025-03-26 08:13:42 +01:00
Alex Moreno 9666570cdd Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-26 06:29:21 +00:00
Alex Moreno be5550c31d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-03-26 07:22:36 +01:00
Javier Segarra 654834f04f Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-25 21:56:21 +00:00
Jorge Penadés 73c6b7dea9 fix: refs #8388 update tooltip message in InvoiceInSummary to include total taxable base 2025-03-25 17:34:10 +01:00
Jorge Penadés 4e728cfa40 Merge branch 'dev' of https: refs #8388//gitea.verdnatura.es/verdnatura/salix-front into 8388-fixInvoiceIn 2025-03-25 17:32:34 +01:00
Jon Elias dc34bc70ad Merge branch 'dev' into 7358-AddChipInNavbar 2025-03-25 15:05:52 +00:00
Javier Segarra ed95f0fad9 Merge pull request 'Add serve comand in README.md' (!1635) from update_readme into dev 
Reviewed-on: verdnatura/salix-front#1635
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-25 15:00:42 +00:00
Jon Elias ef3a2c0ee9 refactor: refs #7358 use location.hostname 2025-03-25 15:10:57 +01:00
Alex Moreno 492f77be08 Merge branch 'dev' into 6994-fix_vnLogValue_whenIsString 2025-03-25 13:44:34 +00:00
Javier Segarra 77543ff690 Merge branch 'dev' into update_readme 2025-03-25 13:40:28 +00:00
Pablo Natek 77f0e7b492 Merge pull request 'fix: update default DMS code and improve filter handling in various components' (!1637) from someHotFixes into master 
Reviewed-on: verdnatura/salix-front#1637
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-25 13:32:41 +00:00
Jon Elias 611e65a353 Merge branch '7358-AddChipInNavbar' of https://gitea.verdnatura.es/verdnatura/salix-front into 7358-AddChipInNavbar 2025-03-25 14:20:40 +01:00
Jon Elias 90f6486fc1 refactor: refs #7358 use QBadge instead of QChip 2025-03-25 14:20:38 +01:00
Alex Moreno a6bd91c918 Merge pull request 'refactor: refs #8683 enhance sorting logic in VnSelect component' (!1522) from 8683-vnSelectSortByOptionLabel into dev 
Reviewed-on: verdnatura/salix-front#1522
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-25 13:14:59 +00:00
Pablo Natek 31205d40d3 fix: update default DMS code and improve filter handling in various components 2025-03-25 14:01:29 +01:00
Benjamin Esteve 6e1a0266fd Merge branch 'dev' into 8118-createComponentVnDropdown 2025-03-25 12:45:43 +00:00
Benjamin Esteve 1e5932882c Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-25 12:45:41 +00:00
Benjamin Esteve 5bb5957a1f Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 12:45:40 +00:00
Benjamin Esteve 15a55cfe26 Merge branch 'dev' into 8790-smsPredefinedText 2025-03-25 12:45:39 +00:00
Jon Elias f5bbada06b Merge pull request '#8326 Unify card names' (!1518) from 8326-UnifyCardTitles into dev 
Reviewed-on: verdnatura/salix-front#1518
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-03-25 12:43:44 +00:00
Benjamin Esteve 70c0e9d1ff Merge branch 'dev' into 8790-smsPredefinedText 2025-03-25 12:31:26 +00:00
Benjamin Esteve b7a511f44e Merge branch 'dev' into 8683-vnSelectSortByOptionLabel 2025-03-25 12:31:23 +00:00
Benjamin Esteve 55d6784987 Merge branch 'dev' into 8673-viewEntryNotesField 2025-03-25 12:31:20 +00:00