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

883 Commits

Author SHA1 Message Date
Jorge Penadés 1d9663637c Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6248-createBreadCrumbs 2023-10-30 13:52:10 +01:00
Pablo Natek 2dab91ea19 Merge pull request 'refs #6118 importSalixVariables' (!93) from 6118-responsiveFixes into dev 
Reviewed-on: verdnatura/salix-front#93
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-10-30 10:32:13 +00:00
Carlos Satorres abb1b3f7c1 refs #6157 card 2023-10-30 11:28:48 +01:00
Jorge Penadés 27bddff445 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6248-createBreadCrumbs 2023-10-30 09:32:36 +01:00
Pablo Natek f7a68fed88 Merge branch '6118-responsiveFixes' of https://gitea.verdnatura.es/verdnatura/salix-front into 6118-responsiveFixes 2023-10-26 15:02:19 +02:00
Pablo Natek 1a44937898 fix(CustomerBasicData): refs #6118 correct component format 2023-10-26 15:02:19 +02:00
Pablo Natek e1340b59d2 Merge branch 'dev' into 6118-responsiveFixes 2023-10-26 08:24:44 +00:00
Pablo Natek 53a86a2401 Merge pull request 'refs #6303 sms fix' (!101) from 6303-smsDialogFix into dev 
Reviewed-on: verdnatura/salix-front#101
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-10-26 07:32:05 +00:00
Alex Moreno b67f86a307 refs #6350 feat: change version to 23.42 2023-10-26 09:20:11 +02:00
Alex Moreno 46e6edaa57 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2023-10-26 08:07:04 +02:00
Pablo Natek 8e93d9c100 Merge branch '6303-smsDialogFix' of https://gitea.verdnatura.es/verdnatura/salix-front into 6303-smsDialogFix 2023-10-25 21:00:30 +02:00
Pablo Natek 065d2307f8 fix(ticketDescriptorMenu): refs #6303 remove console.log modify clientLang 2023-10-25 21:00:29 +02:00
Pablo Natek b3df66b566 remove(div): refs #6118 unificar los divs en el componente 2023-10-25 18:55:20 +02:00
Pablo Natek d31757e63d remove(vnRow): refs #6118 remove html custom elemnt 2023-10-25 18:51:38 +02:00
Pablo Natek 157a2b854e fix(vnRow): refs #6118 remove script label 2023-10-25 18:49:44 +02:00
Pablo Natek 36cf762857 feat(VnRow): add new conponenet VnRow refs #6118 2023-10-25 18:45:29 +02:00
Alex Moreno d70166bae3 Merge pull request 'refs #5673 feat(claimDevelopment): tab on add button makes focus on save' (!105) from 5673-warmFix_claimDevelopment_tabFocus into test 
Reviewed-on: verdnatura/salix-front#105
Reviewed-by: Carlos Satorres Adam <carlossa@verdnatura.es>
 2023-10-25 12:08:41 +00:00
Carlos Satorres 8a6a3083a3 refs #6157 cardDescriptor 2023-10-25 14:06:15 +02:00
Alex Moreno 83f364949e refs #5673 feat(claimDevelopment): tab on add button makes focus on save 2023-10-25 08:20:06 +02:00
Carlos Satorres dfa29875d5 refs #6157 store 2023-10-22 07:19:33 +02:00
Pablo Natek 91a88d148d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6118-responsiveFixes 2023-10-20 14:38:05 +02:00
Pablo Natek 8c3998ea40 feat(vnRow): se cambia de vn-horizontal vnRow por el kebab case refs #6118 2023-10-20 14:22:02 +02:00
Pablo Natek 87094fbdde Merge branch 'dev' into 6303-smsDialogFix 2023-10-20 05:17:46 +00:00
Carlos Satorres cea811903e refs #6157 icon mobile 2023-10-19 17:07:06 +02:00
Pablo Natek edf6de2510 feat(app.scss): vn-horizontal flex direction column refs #6118 2023-10-19 14:51:22 +02:00
Carlos Satorres 841ed5d81a refs #6157 change hide, descriptor, development 2023-10-19 14:29:38 +02:00
Carlos Satorres 6dc1767b56 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-10-19 14:00:03 +02:00
Alex Moreno 824c266241 Merge pull request 'refs #6067 feat: outLayout verifyEmail' (!98) from 6067-vverifyEmailSection into dev 
Reviewed-on: verdnatura/salix-front#98
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-10-19 11:36:10 +00:00
Alex Moreno eb3f9aa4b0 Merge branch 'dev' into 6067-vverifyEmailSection 2023-10-19 08:50:09 +00:00
Jorge Penadés 5f12d64e73 ref #6248 refactor breadcrumbs 2023-10-19 09:31:50 +02:00
Pablo Natek 9dd69dbcb7 feat(vnRow): new component vnRow refs #6118 2023-10-19 08:45:40 +02:00
Jorge Penadés eed1c68819 ref #6248 merge and fix conflicts 2023-10-19 08:37:40 +02:00
Carlos Satorres 5418ac069b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6157-actionClaim 2023-10-18 15:34:57 +02:00
Pablo Natek 081fdcaba5 feat(vnrow): create component vnrow refs #6118 2023-10-18 13:31:23 +02:00
Pablo Natek f53f8c93db Merge branch 'dev' into 6303-smsDialogFix 2023-10-18 11:25:40 +00:00
Jorge Penadés 81ff6a68da Merge pull request 'ref #5417 filter fixed' (!102) from 5417-fixPaymentsFilter into dev 
Reviewed-on: verdnatura/salix-front#102
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-10-18 10:41:48 +00:00
Jorge Penadés ff9bd2e1e6 ref #5417 filter fixed 2023-10-18 12:29:56 +02:00
Jorge Penadés 59b5daed51 Merge pull request 'ref #5417 fix filters and view' (!97) from 5417-fixCustomerPayments into dev 
Reviewed-on: verdnatura/salix-front#97
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2023-10-18 07:25:28 +00:00
Alex Moreno b4fb049cdf refs #6067 feat(verifyEmail): use urls/get-by-user 2023-10-18 09:04:48 +02:00
Alex Moreno 4193876917 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6067-vverifyEmailSection 2023-10-18 07:47:25 +02:00
Carlos Satorres f230fcbca2 refs #6157 claimAction 2023-10-17 17:32:47 +02:00
Pablo Natek 23747f5029 Merge branch 'dev' into 6303-smsDialogFix 2023-10-16 06:51:07 +00:00
Pablo Natek 8904893528 fix(sms): se importa workerDescriptro y se maneja el error refs #6303 2023-10-16 08:50:58 +02:00
Pablo Natek 7c20ee2a42 refs #6118 modelfixes 2023-10-13 13:10:29 +02:00
Jorge Penadés 0c930e5de1 ref #6248 test fixed 2023-10-13 12:36:25 +02:00
Jorge Penadés 71701aaa40 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5417-fixCustomerPayments 2023-10-13 12:29:49 +02:00
Jorge Penadés e60a7e28bb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6248-createBreadCrumbs 2023-10-13 12:29:25 +02:00
Alex Moreno a5710e66e1 Merge pull request '5673-hotFix_improve_crudModel_vnSelect' (!100) from 5673-hotFix_improve_crudModel_vnSelect into master 
Reviewed-on: verdnatura/salix-front#100
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2023-10-13 07:13:25 +00:00
Alex Moreno 46bb1d86db refs #5673 test(claimDevelopment): e2e 2023-10-13 09:04:14 +02:00
Alex Moreno ff347db37a refs #5673 fix crudModel, claimDevelopment and VnSelect 2023-10-11 15:59:41 +02:00