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

996 Commits

Author SHA1 Message Date
Alex Moreno ac371049d5 refs #5739 feat: run docker in local 2024-01-04 15:43:58 +01:00
Alex Moreno 4306226e5c refs #6635 feat: correct version 2024-01-04 08:08:28 +01:00
Javier Segarra 8bde0073f0 Merge pull request '#6098 - Show Toast when copy token' (!141) from 6098_lilium_token_copy into dev 
Reviewed-on: verdnatura/salix-front#141
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-01-03 10:44:26 +00:00
Javier Segarra 6a6e38bb60 Merge branch '6098_lilium_token_copy' of https://gitea.verdnatura.es/verdnatura/salix-front into 6098_lilium_token_copy 2024-01-03 09:39:31 +01:00
Javier Segarra c4cf9842cb refs #6098 perf: add vite-ignore 2024-01-03 09:39:28 +01:00
Javier Segarra e05a49e7b7 Merge branch 'dev' into 6098_lilium_token_copy 2024-01-03 08:22:20 +00:00
Javier Segarra b00b2941c7 refs #6098 perf: define locale equivalences in i18n folder 2024-01-03 09:18:35 +01:00
Carlos Satorres 013a00d653 Merge pull request 'refs #6256 lv breakword' (!104) from 6256-breakWord into dev 
Reviewed-on: verdnatura/salix-front#104
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-03 08:18:14 +00:00
Javier Segarra 899ccc097a refs #6098 perf: remove import.meta.glob 2024-01-03 09:18:13 +01:00
Javier Segarra ac660fadd7 refs #6098 feat: add translate for copyToken 2024-01-03 09:17:28 +01:00
Carlos Satorres be02a1f47a Merge branch 'dev' into 6256-breakWord 2024-01-03 08:16:56 +00:00
Jorge Penadés e711040876 Merge pull request 'refactor: refs #5835' (!129) from 5835-fixListAndSummary into dev 
Reviewed-on: verdnatura/salix-front#129
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2024-01-03 08:04:37 +00:00
Alex Moreno 09cd5464fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-03 09:00:42 +01:00
Alex Moreno 0a44c43715 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-01-03 09:00:39 +01:00
Alex Moreno ba0b3f260f Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-01-03 09:00:13 +01:00
Jorge Penadés a93ffda59b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-03 08:59:09 +01:00
Carlos Satorres 9f4962750f Merge pull request 'refs #6578 order claimState' (!133) from 6578-orderClaim into dev 
Reviewed-on: verdnatura/salix-front#133
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-03 07:55:34 +00:00
Carlos Satorres de57e6400b Merge pull request 'refs #6584 hotfix await' (!132) from 6584-hotfixRegularize into master 
Reviewed-on: verdnatura/salix-front#132
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-03 07:10:46 +00:00
Alex Moreno 046b69d89e warmFix(ticketSummary): change this. → .value 2024-01-03 07:47:38 +01:00
Alex Moreno 41066387f9 Merge branch 'dev' into 6578-orderClaim 2024-01-03 06:45:19 +00:00
Jorge Penadés c6f8bbd616 Merge pull request 'add filter: refs #6606' (!140) from 6606-fixExportBtn into dev 
Reviewed-on: verdnatura/salix-front#140
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 11:49:20 +00:00
Jorge Penadés 34e71c1900 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5835-fixListAndSummary 2024-01-02 12:48:03 +01:00
Jorge Penadés 9b069fbddd add filter: refs #6606 2024-01-02 11:38:43 +01:00
Javier Segarra a6484964dd Merge pull request 'refs #6363 - Fix style in LoginMain when darkmode is activated' (!131) from 6363_lilium_darkMode_login into dev 
Reviewed-on: verdnatura/salix-front#131
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 09:23:54 +00:00
Javier Segarra 855164015a Merge branch 'dev' into 6363_lilium_darkMode_login 2024-01-02 09:22:12 +00:00
Javier Segarra 1b5fd42b96 Merge pull request 'Add button to copy current token' (!130) from 6098_lilium_token_copy into dev 
Reviewed-on: verdnatura/salix-front#130
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-01-02 09:21:30 +00:00
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
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
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
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