14134 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	5e0a31f244	Merge pull request '3928-worker.time-control_sendMail' (!1129) from 3928-worker.time-control_sendMail into dev ... Reviewed-on: #1129	2022-11-11 07:30:01 +00:00
Vicent Llopis	9d06f5c0f0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-11 07:47:29 +01:00
Joan Sanchez	676f2e1584	Removed prettier from config	2022-11-11 07:36:23 +01:00
Joan Sanchez	b044d74106	Removed prettier	2022-11-11 07:35:53 +01:00
Juan Ferrer	e7f26e8502	Merge branch 'master' into test	2022-11-11 00:56:20 +01:00
Juan Ferrer	5d955e1568	Merge pull request 'refs #4609' (!1134) from 4609-hotfixPackageLockDockerNpmUpdate into master ... Reviewed-on: #1134	2022-11-10 23:32:20 +00:00
Juan Ferrer	163d704d3b	refs #4609 Jasmine updated	2022-11-11 00:13:57 +01:00
Juan Ferrer	edc1f213c7	refs #4609 sharp updated	2022-11-10 23:51:14 +01:00
Juan Ferrer	c2b4187b97	refs #4609	2022-11-10 23:46:03 +01:00
Juan Ferrer	e4a02042a7	Merge pull request '4609-Refactor to verdnatura.es and shop.verdnatura.es' (!1072) from 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es into master ... Reviewed-on: #1072 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-10 19:42:40 +00:00
Juan Ferrer	ad741ba738	Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es	2022-11-10 20:37:11 +01:00
Alexandre Riera	117e2c03f5	refs #4700 tests back y empezando e2e	2022-11-10 15:54:00 +01:00
Pau	9004839e00	Merge branch '4484-ticket-withOutNegatives-default-true' of https://gitea.verdnatura.es/verdnatura/salix into 4484-ticket-withOutNegatives-default-true	2022-11-10 14:53:14 +01:00
Pau	01fe8c8997	requested changes	2022-11-10 14:53:08 +01:00
Joan Sanchez	1f05e6fb3b	Label without header & footer	2022-11-10 14:50:08 +01:00
Vicent Llopis	918ea3030d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-10 14:41:12 +01:00
Alex Moreno	4c216c4556	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4077-login_recover-password	2022-11-10 14:40:55 +01:00
Alex Moreno	37d412bf3b	refactor: delete unnecessary test	2022-11-10 14:38:37 +01:00
Joan Sanchez	6a2977a2cf	Fixed SQL changes	2022-11-10 14:19:20 +01:00
Alex Moreno	8d731946f6	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-10 13:58:18 +01:00
Joan Sanchez	02cd705fbf	Merge pull request '4810-print_template' (!1133) from 4810-print_template into dev ... Reviewed-on: #1133	2022-11-10 12:56:00 +00:00
Joan Sanchez	55b90d8a80	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4810-print_template	2022-11-10 13:43:04 +01:00
Pau	56201f4c1a	Start implementing method refs #3681 @3h	2022-11-10 13:37:16 +01:00
Alex Moreno	32701794bc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-10 13:34:43 +01:00
Joan Sanchez	800d98a5b5	Removed unused components	2022-11-10 13:34:23 +01:00
Alex Moreno	517422be8c	refactor: not use axios	2022-11-10 13:32:07 +01:00
Joan Sanchez	83590b3adf	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-11-10 11:54:05 +01:00
Joan Sanchez	303020a731	Attachment fixes	2022-11-10 11:51:14 +01:00
Pau	a237375db6	Merge branch 'dev' into 3681-move-sign_save-to-salix	2022-11-10 10:42:53 +01:00
Joan Sanchez	133897c29f	Updated templates	2022-11-10 10:38:54 +01:00
Joan Sanchez	83798dfadb	Email template slots	2022-11-10 09:51:28 +01:00
Pau	c15d40b237	Merge branch 'dev' into 4484-ticket-withOutNegatives-default-true	2022-11-10 08:45:15 +00:00
Pau	2704017486	check default true	2022-11-10 09:43:19 +01:00
Joan Sanchez	b8add5b0bc	Report template	2022-11-10 08:57:42 +01:00
Joan Sanchez	5a56fb4b6a	Merge pull request '4590-Refactor-isBox-freightItemFk' (!1079) from 4590-Refactor-isBox-freightItemFk into dev ... Reviewed-on: #1079 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-10 07:50:10 +00:00
Joan Sanchez	abe816bbe5	Merge pull request '4550-printServer' (!1131) from 4550-printServer into dev ... Reviewed-on: #1131 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-10 07:44:32 +00:00
Pau	772ea00777	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-10 07:43:25 +00:00
Alexandre Riera	817f231a29	Merge pull request 'refs #2596 drag and drop implementado' (!1119) from 2596-arrastrar-ficheros into dev ... Reviewed-on: #1119 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-11-10 07:41:58 +00:00
Pau	c4044ff70d	Merge branch 'dev' into 4590-Refactor-isBox-freightItemFk	2022-11-10 07:40:14 +00:00
Alexandre Riera	897a7d079d	Merge branch 'dev' into 2596-arrastrar-ficheros	2022-11-10 07:40:10 +00:00
Pau	8b06243041	Fix link being the whole column	2022-11-10 08:36:26 +01:00
Pau	8dd6012b1f	Added worker descriptor popover	2022-11-10 08:27:47 +01:00
Pau	c53e309071	Fix typo	2022-11-10 08:19:54 +01:00
Pau	1327f0ae9d	Added requested changes, refs #4507 @1:20h	2022-11-10 08:18:05 +01:00
Joan Sanchez	89e49c3843	Template component	2022-11-10 07:48:24 +01:00
Pau	eab9289408	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-10 06:26:05 +00:00
Pau	b1a068ea48	Merge branch '4157-send-sms-to-routes' of https://gitea.verdnatura.es/verdnatura/salix into 4157-send-sms-to-routes	2022-11-10 07:23:10 +01:00
Pau	891cd6b474	Added requestes changes refs #4157	2022-11-10 07:23:08 +01:00
Pau	747404521a	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-10 06:22:24 +00:00
Pau	da8ebf1509	Merge branch '4492-item.create-same-as-item.isLaid' of https://gitea.verdnatura.es/verdnatura/salix into 4492-item.create-same-as-item.isLaid	2022-11-10 07:17:57 +01:00