13685 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	4b54cf954b	refactor: envia el email con formato Verdnatura	2022-11-28 13:56:21 +01:00
Carlos Andrés	df6f836b59	Merge pull request '#4613 eliminar uso de portfolio' (!1178) from 4613-Eliminar-cálculo-portfolio into dev ... Reviewed-on: #1178 Reviewed-by: Alex Moreno <alexm@verdnatura.es>	2022-11-28 12:42:25 +00:00
Carlos Andrés	2a4e8cdde9	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 12:19:58 +00:00
Alex Moreno	f9c311804a	Merge pull request '4077-login_recover-password & account_verifyEmail' (!1063) from 4077-login_recover-password into dev ... fixes #4077	2022-11-28 11:34:01 +00:00
Alex Moreno	d9e4ff6772	fix: use $location	2022-11-28 11:48:25 +01:00
Carlos Andrés	6b76804913	refs #4865 Sintaxis mensajes rocket	2022-11-28 10:52:15 +01:00
Pau	6675095b45	Merge branch 'dev' into 4871-socialName-on-client-filter	2022-11-28 09:52:10 +00:00
Pau	aa100891cd	refs #4871 @1h test passed	2022-11-28 10:47:32 +01:00
Pau	0d6e424a3e	allow client search by socialname	2022-11-28 10:21:01 +01:00
Alex Moreno	e49cbbaa80	Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:14:35 +01:00
Alex Moreno	da2d1df522	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:14:16 +01:00
Carlos Andrés	bc83b9fd1f	Merge branch '4613-Eliminar-cálculo-portfolio' of https://gitea.verdnatura.es/verdnatura/salix into 4613-Eliminar-cálculo-portfolio	2022-11-28 10:07:21 +01:00
Carlos Andrés	2b0e6ab5ed	test	2022-11-28 10:07:18 +01:00
Alex Moreno	e4bbb6e83a	Merge branch 'dev' into 4613-Eliminar-cálculo-portfolio	2022-11-28 08:43:55 +00:00
Joan Sanchez	7121dcb25c	Merge pull request 'MASTER_-fix_sendMail' (!1176) from MASTER_-fix_sendMail into master ... Reviewed-on: #1176	2022-11-28 08:06:17 +00:00
Vicent Llopis	d58e567295	fix: maneja si el dms no tiene file. Simplemente borra el registro	2022-11-28 08:51:04 +01:00
Alex Moreno	804db15ece	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-28 07:53:51 +01:00
Alex Moreno	6db1a9e8ae	refs #4859 fix: fixtures db exportation	2022-11-28 07:19:30 +01:00
Alex Moreno	f5f17311df	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-25 14:14:15 +01:00
Alexandre Riera	249373972b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-25 12:56:37 +01:00
Joan Sanchez	ca0164ff18	unit test updated	2022-11-25 12:56:25 +01:00
Alexandre Riera	1a9e6d95ca	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-25 12:46:50 +01:00
Joan Sanchez	ba4ea83360	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-25 12:44:35 +01:00
Joan Sanchez	2eabe38277	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-11-25 12:44:23 +01:00
Joan Sanchez	2210f8970c	Fixes	2022-11-25 12:26:58 +01:00
Joan Sanchez	6b94922335	Fixes	2022-11-25 12:12:48 +01:00
Joan Sanchez	6af7da4793	Updated regex	2022-11-25 11:13:26 +01:00
Alexandre Riera	9f10129152	sql moved to 10510	2022-11-25 10:27:45 +01:00
Alexandre Riera	2f82619ea5	Merge branch '3963-ticket-advance' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-25 10:25:56 +01:00
Alexandre Riera	8fec0670ea	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-25 10:25:46 +01:00
Joan Sanchez	c4643c3a01	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-25 09:46:43 +01:00
Joan Sanchez	5bde9da6b6	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-11-25 09:46:12 +01:00
Carlos Andrés	8d2e532167	#4613 eliminar uso de portfolio	2022-11-25 09:32:54 +01:00
Joan Sanchez	7ea4d9c2e1	fix(rocketchat): Regex fix	2022-11-25 09:18:21 +01:00
Alex Moreno	c9347a929a	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4859-export_db	2022-11-25 08:52:11 +01:00
Joan Sanchez	db64ba48fc	fix(rocketchat): Removed parenthesis	2022-11-25 08:45:26 +01:00
Joan Sanchez	866ee4d565	fix(rocketchat): Replace invalid link characters	2022-11-25 08:36:29 +01:00
Joan Sanchez	92557ea22d	Added version 10510	2022-11-25 07:43:34 +01:00
Joan Sanchez	4e7ef47b88	SQL fixes	2022-11-25 07:41:08 +01:00
Pau	65f82c8fc1	Merge branch 'dev' into 4557-duplicate-tickets-in-routes	2022-11-25 06:05:05 +00:00
Vicent Llopis	82cc2b1208	Merge pull request 'DEV_fix_closeTicket' (!1173) from DEV_fix_closeTicket into dev ... Reviewed-on: #1173 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 13:29:42 +00:00
Vicent Llopis	e34fb3e4db	Merge branch 'dev' into DEV_fix_closeTicket	2022-11-24 12:59:29 +00:00
Joan Sanchez	0f40aa3e27	Merge pull request 'refs #4844' (!1175) from 4844-traduccion into dev ... Reviewed-on: #1175 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>	2022-11-24 12:49:53 +00:00
Vicent Llopis	d233286a3f	Merge branch 'dev' into DEV_fix_closeTicket	2022-11-24 12:44:37 +00:00
Vicent Llopis	9517063853	Merge pull request 'fixes #4682-searchbar_filter' (!1164) from 4682-searchbar_filter into dev ... Reviewed-on: #1164 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 12:44:19 +00:00
Pau	001c3ec2ac	requested changes	2022-11-24 12:06:13 +01:00
Vicent Llopis	20d0d053ac	Merge branch 'dev' into 4682-searchbar_filter	2022-11-24 11:03:23 +00:00
Vicent Llopis	8e74ddf267	Merge pull request 'fixes #4793-models_translation' (!1148) from 4793-models_translation into dev ... Reviewed-on: #1148 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 11:03:08 +00:00
Vicent Llopis	74e8789439	Merge branch 'dev' into 4793-models_translation	2022-11-24 10:54:40 +00:00
Pau	37a7a12f87	requested change	2022-11-24 11:47:32 +01:00