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

6828 Commits

Author SHA1 Message Date
Jorge Penadés ff9bd2e1e6 ref #5417 filter fixed 2023-10-18 12:29:56 +02:00
Jorge Penadés e977467eff ref #6104 refactor e2e tests 2023-10-18 10:18:25 +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
Jorge Penadés 98de713341 ref #5876 spinner wihout counter 2023-10-17 12:30:37 +02:00
Jorge Penadés 562fe18b65 ref #5876 2023-10-17 11:28:58 +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
Jorge Penadés b29d326797 ref #6104 vnSelectFilter added 2023-10-13 12:26:37 +02:00
Jorge Penadés 84960b8a5b ref #6104 fix conflicts 2023-10-13 11:05:34 +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
Jorge Penadés e5ffd2faad ref #5417 params fixed 2023-10-11 12:32:33 +02:00
Jorge Penadés 6d116b9798 ref #5417 search and refresh fixed 2023-10-11 10:54:11 +02:00
Jorge Penadés d9b4ee006d ref #5417 refresh fixed 2023-10-11 10:46:34 +02:00
Jorge Penadés 0aefe13935 ref #5417 fix autoload and filters 2023-10-11 10:40:13 +02:00
Jorge Penadés 318e2f2277 ref #6248 breadcrumbs created 2023-10-06 09:11:29 +02:00
Jorge Penadés 128d7ab10d ref #6104 console logs removed 2023-10-04 15:52:40 +02:00
Jorge Penadés 868ecdf680 ref #6104 mock axios test call and refactor e2e 2023-10-04 15:46:15 +02:00
Alex Moreno 0f1dee42ec refs #6067 refactor: getUrl 2023-10-03 09:25:28 +02:00
Alex Moreno 468ed95702 refs #6067 feat: add transalation 2023-10-02 14:58:42 +02:00
Alex Moreno 91de6eb56e refs #6067 feat: outLayout verifyEmail 2023-10-02 14:54:00 +02:00
Jorge Penadés 8d28a5f82c ref #5417 locales 2023-10-02 10:10:08 +02:00
Jorge Penadés 801ed8ab50 ref #6104 remove css 2023-10-02 09:19:08 +02:00
Jorge Penadés 2b10278901 ref #5417 fix refresh method 2023-10-02 09:02:15 +02:00
Jorge Penadés 970226f012 ref #6104 test e2e fixed 2023-09-29 15:13:19 +02:00
Jorge Penadés 288a50b296 ref #6104 fix validations,css and tests 2023-09-29 15:03:02 +02:00
Jorge Penadés f14702ca9f Merge branch '5417-fixCustomerPayments' of https://gitea.verdnatura.es/verdnatura/salix-front into 5417-fixCustomerPayments 2023-09-29 13:59:09 +02:00
Jorge Penadés 98b76b2f53 ref #5417 autoload and filters reload fixed 2023-09-29 13:59:06 +02:00
Jorge Penadés 462be6584a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5417-fixCustomerPayments 2023-09-29 12:55:58 +02:00
Alex Moreno 8ba25314aa refs #6224 deploy: dev to test 23.40 2023-09-29 12:43:34 +02:00
Jorge Penadés d1fe9bbe25 Merge branch 'dev' into 5417-fixCustomerPayments 2023-09-29 06:32:18 +00:00
Jorge Penadés 9551be36fb Merge branch '6175-addMicrosipLink' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-09-29 08:30:45 +02:00
Jorge Penadés dd09683802 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6175-addMicrosipLink 2023-09-29 08:30:42 +02:00
Jorge Penadés 9a06a1296c ref #6104 conflicts fixed 2023-09-28 13:57:39 +02:00
Jorge Penadés 30791acba6 ref #6104 replace color vars 2023-09-28 13:56:21 +02:00
Jorge Penadés d0de690dc0 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6104-changeVnLog 2023-09-28 13:55:38 +02:00
Jorge Penadés 4995c993bd ref #6104 validations store created 2023-09-28 13:45:14 +02:00
Alex Moreno 11305fc4c8 Merge pull request '5673-claim-development & crudModel' (!71) from 5673-claim-development into dev 
Reviewed-on: verdnatura/salix-front#71
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
 2023-09-28 07:46:01 +00:00
Jorge Penadés 41eccd2885 ref #6104 fix claimNotes test 2023-09-27 14:07:49 +02:00
Jorge Penadés 36a0f36f8a ref #6104 fix conflicts 2023-09-27 14:05:37 +02:00
Jorge Penadés 7ae098d779 ref #5417 fix filters and view 2023-09-27 13:41:50 +02:00
Alex Moreno 149e611ae3 Merge branch 'dev' into 5673-claim-development 2023-09-26 12:59:46 +00:00