13494 Commits

All Branches

Search

Author	SHA1	Message	Date
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
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
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
Joan Sanchez	ca0164ff18	unit test updated	2022-11-25 12:56:25 +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
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
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
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
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	8e6d0bd6b0	Merge pull request 'fixes #4457 hasInvoiceElectronic-para-cliente' (!1116) from 4457-hasInvoiceElectronic-para-cliente into dev ... Reviewed-on: #1116 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 09:45:43 +00:00
Vicent Llopis	b8c6734798	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:40:43 +00:00
Pau	f74b257d75	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-24 09:27:49 +00:00
Pau	c17435f6c4	Merge pull request 'closes #4789 hasInvoice on ticket searchbar' (!1153) from 4789-search-ticket-without-invoice into dev ... Reviewed-on: #1153 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 09:27:18 +00:00
Pau	6a30074a6a	Merge branch 'dev' into 4789-search-ticket-without-invoice	2022-11-24 09:23:00 +00:00
Vicent Llopis	927b5a63ec	Merge branch 'dev' into 4793-models_translation	2022-11-24 09:14:01 +00:00
Alexandre Riera	a2e08c5907	Merge pull request 'fixes #4547 check compensation and tests' (!1161) from 4547-fix-compensation into dev ... Reviewed-on: #1161 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 08:48:40 +00:00
Alexandre Riera	5124b3b681	Merge branch 'dev' into 4547-fix-compensation	2022-11-24 08:42:09 +00:00
Alexandre Riera	e3831cc1e3	Merge pull request 'fixes #3949 invoiceIn basic-data añadir campo docFk' (!1172) from 3949-invoiceIn-add-docFk into dev ... Reviewed-on: #1172 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-24 08:40:35 +00:00
Alexandre Riera	23cf2d9aaf	Merge branch 'dev' into 3949-invoiceIn-add-docFk	2022-11-24 08:33:39 +00:00
Vicent Llopis	7ccf37c079	Merge branch 'dev' into 4793-models_translation	2022-11-24 08:08:56 +00:00
Alex Moreno	7651dcb473	feat: resetPasswordRequest use more params	2022-11-23 14:43:18 +01:00
Alex Moreno	30a25664de	out-layout component	2022-11-23 13:49:50 +01:00
Vicent Llopis	7f89899d6c	fix: closeTicket	2022-11-23 12:54:52 +01:00
Alexandre Riera	164b797ab8	front and e2e tests done	2022-11-23 11:09:32 +01:00
Vicent Llopis	9a47b2fea4	Merge branch 'dev' into 4682-searchbar_filter	2022-11-23 10:00:27 +00:00
Pau	a8520f851c	Merge branch 'dev' into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:28:07 +00:00
Pau	ad38f50ae3	Merge branch '4457-hasInvoiceElectronic-para-cliente' of https://gitea.verdnatura.es/verdnatura/salix into 4457-hasInvoiceElectronic-para-cliente	2022-11-23 08:55:46 +01:00