741 Commits

All Branches

Search

Author	SHA1	Message	Date
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: #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
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
Jorge Penadés	81ff6a68da	Merge pull request 'ref #5417 filter fixed' (!102) from 5417-fixPaymentsFilter into dev ... Reviewed-on: #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: #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	71701aaa40	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5417-fixCustomerPayments	2023-10-13 12:29:49 +02:00
Alex Moreno	a5710e66e1	Merge pull request '5673-hotFix_improve_crudModel_vnSelect' (!100) from 5673-hotFix_improve_crudModel_vnSelect into master ... Reviewed-on: #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
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	2b10278901	ref #5417 fix refresh method	2023-10-02 09:02:15 +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
Alex Moreno	11305fc4c8	Merge pull request '5673-claim-development & crudModel' (!71) from 5673-claim-development into dev ... Reviewed-on: #71 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-28 07:46:01 +00: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
Alex Moreno	1637921fab	refs #5673 fix: VnSelect update model, feat(claimDevelopment) add reload function	2023-09-25 12:06:49 +02:00
Alex Moreno	685c835d13	refs #5673 fix(crudModel): fix formData watcher and removed useState	2023-09-21 15:04:21 +02:00
Guillermo Bonet	9fad8bf78d	Merge branch 'master' into test	2023-09-20 08:12:28 +02:00
Guillermo Bonet	b8f329afe1	Merge pull request '5995-improvedExternalCmr' (!88) from 5995-improvedExternalCmr into master ... Reviewed-on: #88 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2023-09-20 06:08:21 +00:00
Alex Moreno	52fcbdb689	refs #5673 feat(crudModel): add saveFn prop	2023-09-19 10:21:24 +02:00
Alex Moreno	ea8a7de6d2	refs #5673 feat(crudModel): works with null values	2023-09-18 14:56:14 +02:00
Alex Moreno	3a5002b3a7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 5673-claim-development	2023-09-18 10:41:31 +02:00
Guillermo Bonet	394a7f7bb7	Merge branch 'master' into 5995-improvedExternalCmr	2023-09-18 05:17:30 +00:00
Javi Gallego	5e8a2c4121	Merge pull request 'dev' (!95) from dev into test ... Reviewed-on: #95	2023-09-14 08:31:32 +00:00
Javi Gallego	edc0a013a9	Merge pull request 'test' (!94) from test into dev ... Reviewed-on: #94	2023-09-14 08:30:16 +00:00
Javi Gallego	f1af3b80bd	Merge pull request 'test' (!92) from test into master ... Reviewed-on: #92	2023-09-07 07:51:36 +00:00
Javi Gallego	d1a88776f2	Merge branch 'master' into test	2023-09-07 09:48:47 +02:00
Jorge Penadés	db733e63af	Merge pull request '6105-createClaimNotes' (!90) from 6105-createClaimNotes into dev ... Reviewed-on: #90 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2023-09-01 13:06:26 +00:00
Jorge Penadés	a7cea458a2	ref #6105 fix test	2023-09-01 13:42:53 +02:00
Jorge Penadés	0882c3440d	ref #6105 fix dialog	2023-09-01 13:09:30 +02:00
Guillermo Bonet	71c6b865b6	refs #5995 Improved external CMR	2023-09-01 12:11:56 +02:00
Javi Gallego	777e45a0cd	Merge pull request 'dev' (!89) from dev into test ... Reviewed-on: #89	2023-08-31 09:12:53 +00:00
Guillermo Bonet	6786ac97e4	refs #5995 Improved external CMR	2023-08-30 12:53:18 +02:00