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

5232 Commits

Author SHA1 Message Date
Jorge Penadés 1bbc6c1840 chore: refs #7353 fix warnings 2024-08-23 15:55:56 +02:00
Jorge Penadés fdacdf1a12 feat: refs #7353 add filter & fix customTags 2024-08-23 12:43:27 +02:00
Jorge Penadés 2d05d5e03c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-23 09:11:35 +02:00
Javier Segarra 03ebf28712 Merge pull request '#7323 - Handle workerPhoto' (!633) from 7323_workerPhoto into dev 
Reviewed-on: verdnatura/salix-front#633
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-23 07:09:19 +00:00
Jorge Penadés b0c27027c0 chore: refs #7353 use Vue component nomenclature 2024-08-22 13:41:53 +02:00
Javier Segarra 89eaf02800 feat: #7323 handle workerPhoto 2024-08-21 11:45:26 +02:00
Jorge Penadés 79c96199f3 Merge branch 'dev' of https: refs #7353//gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-21 11:35:16 +02:00
Jorge Penadés 03baef8231 fix: refs #7353 css 2024-08-20 12:14:05 +02:00
Javier Segarra f9fd1c1f90 Merge pull request '#6336 - FIX ClaimList states' (!627) from 6336_claim_fix_states into dev 
Reviewed-on: verdnatura/salix-front#627
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-08-20 09:42:41 +00:00
Javier Segarra a5fc366081 Merge branch 'dev' into 6336_claim_fix_states 2024-08-20 09:34:46 +00:00
Jorge Penadés 206253ac6b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-19 16:03:23 +02:00
Jorge Penadés 1ec7b7a8c1 fix: refs #7353 css 2024-08-19 16:02:30 +02:00
Jorge Penadés 3f9bdfcc9c fix: refs #7353 saleTicketMonitors 2024-08-19 14:21:36 +02:00
Jorge Penadés e6e61e5717 fix: refs #7353 vnTable colors 2024-08-19 13:40:35 +02:00
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
Jorge Penadés 9a4a51fadb refactor: refs #7353 simplify code 2024-08-19 10:29:55 +02:00
Jorge Penadés ada1c948f6 feat: refs #7353 split sections 2024-08-19 10:14:02 +02:00
Javier Segarra 74f335b22e fix: #6336 ClaimListStates 2024-08-19 06:51:52 +00:00
Jorge Penadés bd9aea767a fix: refs #7353 salesorderTable 2024-08-16 18:10:10 +02:00
Jorge Penadés 1cca504c87 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7353-fineTunningMonitor 2024-08-16 15:18:20 +02:00
Jorge Penadés a69f41834e fix: refs #7353 padding 2024-08-16 14:19:02 +02:00
Jorge Penadés a13ea900ce fix: refs #7353 salesClientTable 2024-08-16 13:54:37 +02: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 ed29088d76 typo 2024-08-16 10:49:52 +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 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