12846 Commits

All Branches

Search

Author	SHA1	Message	Date
Vicent Llopis	c01b1c06a7	Merge pull request '4616-ticket.sale_mana' (!1088) from 4616-ticket.sale_mana into dev ... Reviewed-on: #1088 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 13:48:18 +00:00
Vicent Llopis	7eaafa36a0	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 13:42:26 +00:00
Alex Moreno	6ed5ef7d1b	Merge pull request 'fix changes folder' (!1118) from changesInCorrectFolder into dev	2022-11-02 13:16:23 +00:00
Alex Moreno	c1ed0f2226	Merge branch 'dev' into changesInCorrectFolder	2022-11-02 12:58:32 +00:00
Alex Moreno	40b6f64468	Merge pull request '4146-claim_pickup_order' (!1090) from 4146-claim_pickup_order into dev	2022-11-02 12:08:05 +00:00
Alex Moreno	2a8a8ed84a	Merge branch 'dev' into 4146-claim_pickup_order	2022-11-02 12:01:11 +00:00
Vicent Llopis	bf21467125	Merge pull request '4155-close_tickets_fix2' (!1092) from 4155-close_tickets_fix2 into dev ... Reviewed-on: #1092 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 11:59:21 +00:00
Joan Sanchez	e2101db706	Merge branch 'dev' into 4155-close_tickets_fix2	2022-11-02 11:53:47 +00:00
Joan Sanchez	177b448441	Merge branch 'dev' into 4616-ticket.sale_mana	2022-11-02 06:42:35 +00:00
Joan Sanchez	33c92a0f24	Merge pull request '4563-Worker-Description-workerDisableExcluded-checkbox' (!1076) from 4563-Worker-Description-workerDisableExcluded-checkbox into dev ... Reviewed-on: #1076 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 06:34:49 +00:00
Alex Moreno	fc7a39e910	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-11-02 07:33:07 +01:00
Alex Moreno	18341a24dc	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into changesInCorrectFolder	2022-11-02 07:29:12 +01:00
Alex Moreno	a7b1ee85fe	fix changes folder	2022-11-02 07:27:57 +01:00
Joan Sanchez	ea5c081a73	Merge pull request 'refs #4716 tipos actualizados' (!1115) from 4716-tipos-aceptados into dev ... Reviewed-on: #1115 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-02 06:26:03 +00:00
Joan Sanchez	ac6fbd07a9	Upgraded node version	2022-10-31 13:24:39 +01:00
Joan Sanchez	231575d23e	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-31 12:40:07 +01:00
Joan Sanchez	d34936015b	Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix into test	2022-10-31 12:39:54 +01:00
Joan Sanchez	463d3e6e12	Fixes	2022-10-31 12:39:26 +01:00
Alexandre Riera	57e74fab38	refs #4716 tipos actualizados	2022-10-28 15:53:57 +02:00
Alex Moreno	70c97120b3	Merge pull request 'MASTER_4073-user_hasGrant' (!1107) from 4073-user-hasGrant-master into master ... Reviewed-on: #1107 Reviewed-by: Juan Ferrer <juan@verdnatura.es>	2022-10-28 11:15:55 +00:00
Alex Moreno	9170c22d6f	fix send email	2022-10-28 09:21:28 +02:00
Alex Moreno	e9731c4ac0	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-28 09:11:40 +02:00
Vicent Llopis	264b56378a	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-28 06:31:12 +00:00
Alex Moreno	9c9db3250e	Merge pull request '4075-ticket_boxing' (!1070) from 4075-ticket_boxing into dev ... Reviewed-on: #1070 Reviewed-by: Joan Sanchez <joan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-10-28 06:29:56 +00:00
Alex Moreno	9eb3b09be1	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4075-ticket_boxing	2022-10-28 08:26:45 +02:00
Alex Moreno	ad1b429d10	check if user has role from userToUpdate	2022-10-28 08:09:47 +02:00
Alex Moreno	88dda4523f	Merge pull request '4320-notificationQueue' (!1087) from 4320-notificationQueue into dev ... Reviewed-on: #1087 Reviewed-by: Juan Ferrer <juan@verdnatura.es> Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-10-28 06:06:01 +00:00
Alex Moreno	80617dd578	Merge branch 'dev' into 4320-notificationQueue	2022-10-28 05:33:45 +00:00
Alex Moreno	9225e8f176	fix tests	2022-10-27 15:11:57 +02:00
Alex Moreno	9d85389691	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:35:16 +02:00
Alex Moreno	da78b39874	Merge branch 'dev' into 4075-ticket_boxing	2022-10-27 07:29:39 +00:00
Alex Moreno	5c65314162	use findById	2022-10-27 09:27:50 +02:00
Joan Sanchez	714fe32552	Fix error	2022-10-27 09:26:02 +02:00
Joan Sanchez	51f95f0261	Fixed error	2022-10-27 09:23:08 +02:00
Joan Sanchez	6a2bc5b593	Disabled back tests	2022-10-27 09:18:32 +02:00
Alex Moreno	926ab0e35c	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order	2022-10-27 09:05:05 +02:00
Alex Moreno	3ffc098b56	feat(privileges): check if user has role from userToUpdate	2022-10-27 09:01:09 +02:00
Alex Moreno	f65d06fc7d	fixes #4073	2022-10-26 08:27:28 +02:00
Vicent Llopis	5e0f976ad2	Merge branch 'dev' into 4155-close_tickets_fix2	2022-10-26 06:25:18 +00:00
Vicent Llopis	925565d3d2	refator: borrada variable global y añadida Promesa al array	2022-10-26 08:23:36 +02:00
Vicent Llopis	a8dfc9d06f	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana	2022-10-26 08:11:15 +02:00
Alex Moreno	607e9010e6	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 12:36:35 +00:00
Joan Sanchez	4334907d91	fix(database): updated sql files	2022-10-25 14:09:21 +02:00
Joan Sanchez	418ba65c2e	Merge pull request '2612-create-supplier' (!1089) from 2612-create-supplier into dev ... Reviewed-on: #1089 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-10-25 10:42:05 +00:00
Alex Moreno	ac8c4b8ef0	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 10:39:50 +00:00
Pau	296a743d8a	Fix test, remove console log	2022-10-25 12:25:56 +02:00
Pau	7b04464848	Merge branch 'dev' into 2612-create-supplier	2022-10-25 10:00:13 +00:00
Joan Sanchez	1196125350	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev	2022-10-25 11:58:47 +02:00
Alex Moreno	3fd10dfc64	Merge branch 'dev' into 4075-ticket_boxing	2022-10-25 09:58:17 +00:00
Pau	76d248131c	Merge branch 'dev' into 2612-create-supplier	2022-10-25 09:45:25 +00:00