743 Commits

Author	SHA1	Message	Date
Vicent Llopis	13e95bcd35	add vue commented code	2023-06-20 11:25:47 +02:00
Vicent Llopis	c3af2e3c92	refs #4734 refactor: actualizada descripcion	2023-06-20 07:19:32 +02:00
Vicent Llopis	cfe340eeff	refs #4734 feat: xml en otro archivo	2023-06-19 14:27:24 +02:00
Vicent Llopis	303be74382	refs #4734 refactor: use loopback instead of	2023-06-19 11:55:07 +02:00
Vicent Llopis	219ad75172	a	2023-06-16 14:30:33 +02:00
Vicent Llopis	ab68cb7165	refs #4734 fix: manejo errores	2023-06-16 14:27:29 +02:00
Vicent Llopis	90ce0d1c27	refs #4734 refactor: consulta con loopback	2023-06-16 14:24:47 +02:00
Vicent Llopis	998597dfcc	refs #4734 recator: cambiado nombre ruta	2023-06-16 13:49:21 +02:00
Vicent Llopis	425118d333	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4734-addViaexpress	2023-06-16 13:09:38 +02:00
Alex Moreno	5163b7b253	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-15 15:14:41 +02:00
Alex Moreno	99ad9d3afa	refs #5753 fix(change-password)	2023-06-15 11:49:39 +02:00
Alex Moreno	aa2d3be451	typo	2023-06-14 07:30:50 +02:00
Vicent Llopis	0cc5781f3f	refs #4734 feat: añadido método putExpedicionInternacional de viaexpress	2023-06-13 15:05:37 +02:00
Alex Moreno	dd4b62d0a5	description	2023-06-13 12:42:12 +02:00
Alex Moreno	92953b9aa8	refs #5094 test(docuware): adapt tests	2023-06-13 11:37:35 +02:00
Alex Moreno	a07ca62476	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5094-ticket_index_docuware	2023-06-13 07:11:39 +02:00
Alex Moreno	d3c4a6ba5c	refs #5094 feat(ticket_index): docuware multiple deliveryNote	2023-06-12 15:20:46 +02:00
Alex Moreno	1c39ad873c	resolve dev conflicts	2023-06-12 11:06:45 +02:00
Alex Moreno	5c1b867d05	WIP: d735f142a Merge branch 'dev' into 5472-user_passExpired	2023-06-12 10:46:21 +02:00
Alex Moreno	edc601fd5d	refs #5489 fix(account/sync), fix(order) catalog-search-panel popover	2023-06-07 13:34:13 +02:00
Alexandre Riera	7121b1e516	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5595-modify-loggable-tables-in-procs	2023-06-07 08:50:53 +02:00
Alex Moreno	cb50c617ee	refs #5489 deprecate account.user.password	2023-06-06 15:09:01 +02:00
Alex Moreno	91b0e3013a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-05 08:11:47 +02:00
Alex Moreno	bca7224f74	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-06-05 08:09:16 +02:00
Alex Moreno	86cd5f5237	refs #5472 fix sync	2023-06-02 15:07:02 +02:00
Guillermo Bonet	5b0a1d10bb	refs #5684 edi/updateData fix	2023-06-02 07:51:01 +02:00
Alex Moreno	9462ca90a7	refs #5472 refactor setPassword & changePassword, fix sync	2023-06-01 15:29:46 +02:00
Alex Moreno	d134ca45f1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-06-01 14:19:23 +02:00
Alexandre Riera	f9528b922c	refs #5595 added userId in options	2023-06-01 08:32:06 +02:00
Alex Moreno	c7b8e57d95	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-26 07:41:48 +02:00
Alex Moreno	37a3275b27	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2023-05-25 08:56:10 +02:00
Alex Moreno	c35e2e155f	refs #5472 test(changePassword): back	2023-05-23 15:12:28 +02:00
Alex Moreno	6f503e2a81	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-23 08:23:16 +02:00
Alex Moreno	0045edb698	refs #5094 fix get email	2023-05-23 07:39:43 +02:00
Juan Ferrer	da0aa57539	Merge branch 'test' into dev	2023-05-22 19:06:20 +02:00
Juan Ferrer	26c2ab867d	Merge pull request 'master into test' (!1546) from master into test ... Reviewed-on: #1546	2023-05-22 17:04:32 +00:00
Alex Moreno	3189799b4c	correct type	2023-05-22 14:45:00 +02:00
Alexandre Riera	e589e70e06	Merge branch 'dev' into 5655-afinar-login	2023-05-22 10:31:27 +00:00
Alex Moreno	ddab59a10c	refs #5472 refactor(changePassword): convert in async	2023-05-22 09:17:40 +02:00
Alex Moreno	c6c15d7c69	refs #5472 feat: changePassword with passExpired	2023-05-19 14:44:19 +02:00
Alex Moreno	bbc34f04ff	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5472-user_passExpired	2023-05-19 07:35:23 +02:00
Alex Moreno	15a1965a53	refs #5094 add scopes	2023-05-18 14:12:46 +02:00
Alex Moreno	6ddbd8b8ea	Merge branch 'dev' into 5488-use_checkAccessAcl	2023-05-17 11:43:25 +00:00
Juan Ferrer	30d6f56c39	refs #5667 Style fixes, model translations	2023-05-16 20:06:14 +02:00
Alex Moreno	9f0d5097fe	refs #5160 increase jasmine timeout	2023-05-16 09:14:38 +02:00
Alex Moreno	248caf8519	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 5488-use_checkAccessAcl	2023-05-15 07:20:53 +02:00
Alexandre Riera	b9ec6b93b6	Merge branch 'dev' into 5655-afinar-login	2023-05-12 07:46:10 +00:00
Javi Gallego	8a843b37bd	refs #5160 Back test timeout workaround	2023-05-11 13:54:42 +02:00
Alexandre Riera	7bcb00c127	refs #5655 removed relation	2023-05-11 08:55:11 +02:00
Alex Moreno	73fb940c63	refs #5472 try change-password	2023-05-08 10:55:16 +02:00