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

5327 Commits

Author SHA1 Message Date
Javier Segarra c19585fb1b fix: quasar build warnings 2024-08-19 11:36:12 +02:00
Jon Elias 5230b8f722 Merge pull request '#7717 fix OrderCatalog' (!558) from 7717_fixOrderCatalog into dev 
Reviewed-on: verdnatura/salix-front#558
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-08-19 09:22:34 +00:00
Jon Elias ce8d12fe20 Merge branch 'dev' into 7717_fixOrderCatalog 2024-08-19 09:20:31 +00:00
Jon Elias f3d7590edf refactor: refs #7717 delete useless function and import 2024-08-19 10:49:04 +02:00
Javi Gallego ca3406fbc0 Merge branch 'dev' into 7346-invoiceOutMultilple 2024-08-19 10:27:48 +02:00
Javier Segarra 74f335b22e fix: #6336 ClaimListStates 2024-08-19 06:51:52 +00:00
Alex Moreno 00616939c6 Merge pull request 'feat(FormModel): trim data by default' (!625) from formModel_trimData into dev 
Reviewed-on: verdnatura/salix-front#625
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-16 11:13:38 +00:00
Alex Moreno fa0ca732fc feat(FormModel): trim data by default 2024-08-16 12:29:35 +02:00
Alex Moreno 4b2f4ffac1 fix(VnTable): orderBy v-model 2024-08-16 12:20:08 +02:00
Alex Moreno 2bea46b601 fix: test 2024-08-16 11:47:32 +02:00
Alex Moreno b35bf85f4a fix(claim_summary): url links 2024-08-16 10:50:45 +02:00
Alex Moreno ed29088d76 typo 2024-08-16 10:49:52 +02:00
Javi Gallego 06c0f49128 feat: refs #7346 add seriaType option 2024-08-16 10:10:40 +02:00
Alex Moreno 51ee79b7f7 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-16 09:24:24 +02:00
Alex Moreno 83a8f7e147 fix(invoiceOutGlobal): formData is object 2024-08-16 09:20:53 +02:00
Jorge Penadés a564f94e30 Merge pull request '#6900 add Serial' (!610) from 6900-addSerial into test 
Reviewed-on: verdnatura/salix-front#610
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-14 14:20:40 +00:00
Jorge Penadés ecfdf0b6b9 fix: refs #6900 improve loading 2024-08-14 15:27:36 +02:00
Jorge Penadés 3bba5db1b5 fix: refs #6900 improve logic 2024-08-14 14:52:47 +02:00
Jorge Penadés 65d893e128 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-14 14:30:47 +02:00
Jorge Penadés 760dc0e6f4 Merge branch '6900-addSerial' of https://gitea.verdnatura.es/verdnatura/salix-front into 6900-addSerial 2024-08-14 14:27:57 +02:00
Jorge Penadés 6dd9029871 fix: refs #6900 improve logic 2024-08-14 14:27:54 +02:00
Alex Moreno 895441a8e4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-14 13:40:25 +02:00
Alex Moreno c7f53635d9 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-08-14 13:40:13 +02:00
Alex Moreno a8f550fcc8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-14 13:39:54 +02:00
Jorge Penadés e07d573788 Merge branch 'test' into 6900-addSerial 2024-08-14 10:13:39 +00:00
Jorge Penadés 7a27b9808f Merge pull request '#7323 warmfix' (!621) from 7323-warmfix-fixErrors into test 
Reviewed-on: verdnatura/salix-front#621
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-14 09:02:27 +00:00
Jorge Penadés 9bb67511e6 fix: refs #7323 vnsubtoolbar css 2024-08-14 10:34:42 +02:00
Jorge Penadés d7eb3af48d fix: refs #7323 add locale 2024-08-14 10:10:22 +02:00
Jorge Penadés 32fdec2fae feat: refs #7323 improve test 2024-08-14 10:08:31 +02:00
Jorge Penadés 30cadb5697 fix: refs #7323 use workerFilter 2024-08-14 09:11:14 +02:00
Jon Elias 71068d3e62 Merge pull request 'Hotfix: InvoiceOut List and NegativeBases' (!615) from hotfix_InvoiceOut_List&NegativeBases into master 
Reviewed-on: verdnatura/salix-front#615
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-14 06:56:39 +00:00
Alex Moreno 07e4dca361 refactor(invoiceOutList): create dialog 2024-08-14 08:55:18 +02:00
Jorge Penadés e7def05d40 feat: refs #7323 add flex-wrap 2024-08-13 16:59:43 +02:00
Jorge Penadés e780dcda05 fix: refs #7323 load all opts 2024-08-13 16:45:30 +02:00
Alex Moreno e9873a43b1 Merge pull request '7848-recoveryPassword' (!617) from 7848-recoveryPassword into dev 
Reviewed-on: verdnatura/salix-front#617
Reviewed-by: Jorge Penades <jorgep@verdnatura.es>
 2024-08-13 14:43:46 +00:00
Alex Moreno 0a0e8be39f Merge branch 'dev' into 7848-recoveryPassword 2024-08-13 14:41:23 +00:00
Alex Moreno 3cbdf25410 delete name default 2024-08-13 16:40:02 +02:00
Alex Moreno fdb508de97 delete cy.logs 2024-08-13 16:31:34 +02:00
Carlos Satorres b5537d6ae5 Merge pull request '7355-accountMigration2' (!619) from 7355-accountMigration2 into dev 
Reviewed-on: verdnatura/salix-front#619
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-13 13:10:39 +00:00
Carlos Satorres c6db81ddb5 Merge pull request '#7323 use global locale' (!618) from 7323-warmfix-i18nTag into test 
Reviewed-on: verdnatura/salix-front#618
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-08-13 11:20:15 +00:00
Carlos Satorres 405092f66d fix: account subsections cards 2024-08-13 13:11:23 +02:00
Carlos Satorres aae881c24a fix(account_card): redirection 2024-08-13 12:59:22 +02:00
Jorge Penadés a24caa9393 fix: refs #7323 use global locale 2024-08-13 12:56:39 +02:00
Carlos Satorres e144f0be01 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7355-accountMigration2 2024-08-13 12:52:14 +02:00
Alex Moreno e88e7fa9db Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-08-13 12:25:47 +02:00
Alex Moreno b828fd35b7 test: add two factor e2e 2024-08-13 12:25:46 +02:00
Alex Moreno dc1accff7a test: add recover and reset password e2e 2024-08-13 12:25:37 +02:00
Alex Moreno a46198e2d0 feat: add recover password and reset password 2024-08-13 12:25:08 +02:00
Jorge Penadés e0473b589c Merge pull request 'test to dev' (!616) from test into dev 
Reviewed-on: verdnatura/salix-front#616
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-08-13 09:29:29 +00:00
Jorge Penadés ac7c939e98 Merge pull request '#7323 add my account btn & fix models log selectable' (!614) from 7323-fixWorkerLog into test 
Reviewed-on: verdnatura/salix-front#614
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-08-13 09:20:49 +00:00