wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
1,026 Commits 154 Branches 0 Tags 24 MiB
Commit Graph

1026 Commits

Author SHA1 Message Date
Javier Segarra 9c6de604f3 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-02 09:18:50 +00:00
Alex Moreno 7f3cfddb25 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-02 09:21:06 +01:00
Alex Moreno 24818f5daa refs #5835 fix(invoiceOutSummary): add ?. 2024-01-02 09:19:29 +01:00
Jorge Penadés 5fb5258cf9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 09:19:03 +01:00
Jorge Penadés 863a9b8213 Merge branch '5835-fixListAndSummary' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 09:06:01 +01:00
Jorge Penadés 61d69f7cf7 change btn & prevent error: refs #5835 2024-01-02 09:05:59 +01:00
Jorge Penadés 85d056b491 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 09:00:36 +01:00
Alex Moreno 1b6f2682eb Merge branch 'dev' into 5835-fixListAndSummary 2024-01-02 07:35:12 +00:00
Alex Moreno 82536847f5 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-02 07:32:56 +00:00
Alex Moreno deeebd68d1 Merge branch 'dev' into 6363_lilium_darkMode_login 2024-01-02 07:32:22 +00:00
Alex Moreno 10a3a39b03 Merge branch 'dev' into 6578-orderClaim 2024-01-02 07:31:06 +00:00
Jorge Penadés c09848a1cf Merge pull request 'logs added: refs #6605' (!139) from 6605-invoiceInLog into dev 
Reviewed-on: verdnatura/salix-front#139
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 07:31:00 +00:00
Jorge Penadés d374709d4a logs added: refs #6605 2023-12-29 08:58:32 +01:00
Carlos Satorres 191114cf85 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6256-breakWord 2023-12-26 11:54:51 +01:00
Pablo Natek 11224733e8 Merge branch '6259-ticketSmsToClientSms' of https://gitea.verdnatura.es/verdnatura/salix-front into 6259-ticketSmsToClientSms 2023-12-26 09:53:49 +01:00
Pablo Natek f9b2faf918 feat(VnSms): refs #6259 unify ticket and customer sms 2023-12-26 09:53:47 +01:00
Jorge Penadés cf99f910a5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2023-12-26 09:16:10 +01:00
Pablo Natek 0c1850626b Merge branch 'dev' into 6259-ticketSmsToClientSms 2023-12-26 06:37:42 +00:00
Javier Segarra 3cdaa57403 Merge branch 'dev' into 6098_lilium_token_copy 2023-12-22 11:25:13 +00:00
Javier Segarra e6f4bea466 Merge branch 'dev' into 6363_lilium_darkMode_login 2023-12-22 11:25:07 +00:00
Pablo Natek 8a36fc03b8 refactor(ticketsms): refs #6259 add vnSms create customerSms 2023-12-21 18:59:13 +01:00
Carlos Satorres 8761f4baaa Merge pull request 'refs #6128 recharge photo' (!134) from 6128-rechargePhotos into dev 
Reviewed-on: verdnatura/salix-front#134
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-12-21 13:19:41 +00:00
Carlos Satorres f71f341aad refs #6128 change stateColor 2023-12-21 12:15:01 +01:00
Carlos Satorres 8499bcbe19 refs #6218 refactor dmsFilter 2023-12-21 08:28:03 +01:00
Jorge Penadés f3a1800cb0 fix breadcrumbs & header: refs #5835 2023-12-20 15:43:09 +01:00
Carlos Satorres 350bc5a3c9 refs #6128 recharge photo 2023-12-20 15:25:45 +01:00
Javier Segarra ce447b4b76 refs #6363: style: remove !important darkMode for LoginMain 2023-12-20 14:12:28 +01:00
Carlos Satorres 9a4a3e846e refs #6256 remove hypens 2023-12-20 13:28:58 +01:00
Carlos Satorres d286e35f99 refs #6584 refactor 2023-12-20 13:25:55 +01:00
Carlos Satorres db1c9f8c9b refs #6578 order claimState 2023-12-20 10:00:43 +01:00
Javier Segarra bce4551847 refs #6098 feat: copy userToken to clipboard 2023-12-20 09:51:57 +01:00
Javier Segarra da5b78c2fc refs #6363: style: fix darkMode for LoginMain 2023-12-20 09:12:11 +01:00
Carlos Satorres f78d5b41a4 refs #6584 hotfix await 2023-12-20 09:11:16 +01:00
Jorge Penadés 5b79c2ace9 fix margin: refs #5835 2023-12-19 14:03:58 +01:00
Jorge Penadés c84aeed202 fix test refs #5835 2023-12-18 15:39:26 +01:00
Jorge Penadés 94278e2f53 refactor: refs #5835 2023-12-18 15:36:56 +01:00
Alex Moreno c9023449c9 refs #6062 fix: correct version 2023-12-15 08:18:48 +01:00
Alex Moreno eed3267a11 refs #6062 test: fixed e2e due to change of style in the indexes 2023-12-15 08:16:54 +01:00
Alex Moreno f5cf47b60d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2023-12-15 07:25:47 +01:00
Carlos Satorres 3eb0b38633 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix-amountClaimLines 2023-12-14 12:07:57 +01:00
Carlos Satorres 126e1323bf refs #6334 refresh 2023-12-14 12:06:25 +01:00
Alex Moreno f7ebb86960 refs #6576 fix: correct version 2023-12-14 11:42:37 +01:00
Alex Moreno a149928015 refs #6062 fix: invoiceIn translation 2023-12-13 14:44:56 +01:00
Alex Moreno 6a440e053b Merge pull request 'refs #6062 fix: migration errors' (!126) from 6062-migration-v1 into dev 
Reviewed-on: verdnatura/salix-front#126
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2023-12-13 13:40:38 +00:00
Alex Moreno bbb2dadc9d refs #6062 test: fix value name 2023-12-13 14:36:01 +01:00
Alex Moreno 7557096af6 refs #6062 fix: migration errors 2023-12-13 14:19:42 +01:00
Jorge Penadés 055f10e6ff Merge pull request 'refs #5835 migrateInvoiceIn' (!110) from 5835-migrateInvoiceIn into dev 
Reviewed-on: verdnatura/salix-front#110
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-12-13 10:25:06 +00:00
Jorge Penadés d1a5029ef7 refs #5835 refactor 2023-12-12 12:11:45 +01:00
Jorge Penadés 2c5dc276b2 refs #5835 2023-12-12 09:01:32 +01:00
Jorge Penadés 22a634e7eb refs #5835 refactor taxRate 2023-12-11 13:49:50 +01:00