14067 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	5c249dcbcc	refs #4767 @1h30m	2022-11-15 08:24:10 +01:00
Alex Moreno	bcab493f37	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit	2022-11-15 07:33:53 +01:00
Pau	29b299f36a	Merge branch 'dev' into 4507-greuge-add-userFk	2022-11-15 06:10:31 +00:00
Pau	e6e70703a6	Merge branch 'dev' into 4157-send-sms-to-routes	2022-11-15 06:09:40 +00:00
Pau	3610b3bf19	Merge branch 'dev' into 4492-item.create-same-as-item.isLaid	2022-11-15 06:07:56 +00:00
Pau	6eaee8faca	Merge branch 'master' into 4609-Refactor-www.verdnatura.es-and-shop.verdnatura.es	2022-11-15 06:06:20 +00:00
Vicent Llopis	63142a8861	refactor	2022-11-14 15:16:21 +01:00
Vicent Llopis	0637050375	fix: frontTest	2022-11-14 15:11:33 +01:00
Vicent Llopis	216108a576	refactor	2022-11-14 15:01:22 +01:00
Vicent Llopis	386e304958	fix: modelo incorreto para la transacción	2022-11-14 14:52:08 +01:00
Alexandre Riera	23ed6c6031	refs #3963 test front done	2022-11-14 14:30:35 +01:00
Alexandre Riera	99aa674995	refs #3963 working on mockup	2022-11-14 14:29:40 +01:00
Vicent Llopis	a30f50ffe5	refactor: borrado console.log	2022-11-14 12:20:27 +01:00
Joan Sanchez	f6e14db9f4	Merge branch 'dev' into 4090-global_invoincing	2022-11-14 11:19:01 +00:00
Joan Sanchez	04eefc7dbe	Merge pull request '4725-jenkins_agent' (!1141) from 4725-jenkins_agent into dev ... Reviewed-on: #1141	2022-11-14 11:17:13 +00:00
Joan Sanchez	b048b5e7f4	Merge pull request 'TEST_hotfix_usesMana' (!1140) from TEST_hotfix_usesMana into test ... Reviewed-on: #1140 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-14 11:07:46 +00:00
Joan Sanchez	55f3d26dd0	Trigger jenkins build	2022-11-14 12:02:50 +01:00
Vicent Llopis	d6a0580203	feat: traducciones modelo Ticket	2022-11-14 11:08:23 +01:00
Vicent Llopis	6e94d7f68e	fix: nombre variable incorrecto	2022-11-14 11:00:13 +01:00
Joan Sanchez	500d12f5a0	Enabled back unit tests	2022-11-14 10:13:26 +01:00
Alexandre Riera	dc06ba7d89	Merge branch '4700-split-tour' of https://gitea.verdnatura.es/verdnatura/salix into 3963-ticket-advance	2022-11-14 09:58:18 +01:00
Alexandre Riera	7dd87b1ea8	refs #4700 icons future	2022-11-14 09:56:23 +01:00
Alex Moreno	362857cce8	Merge pull request 'TEST_feat: creat email/vehicle-event-expired' (!1137) from hotFix_emailVehicleEventExpired into test ... Reviewed-on: #1137 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-14 08:16:04 +00:00
Alexandre Riera	05f0eba741	Merge branch 'split-tour' into 3963-ticket-advance	2022-11-14 09:06:51 +01:00
Alexandre Riera	03ea2b4f11	refs #4700 translations	2022-11-14 08:55:27 +01:00
Pau	3c771fc771	refactor missing URL's refs #4609	2022-11-14 08:53:00 +01:00
Alexandre Riera	0ef64481b9	refs #4700 e2e finished	2022-11-14 08:51:15 +01:00
Alex Moreno	d1dce73a33	feat: creat email/vehicle-event-expired	2022-11-14 08:50:38 +01:00
Alexandre Riera	c16210dd8a	refs #4700 working on e2e	2022-11-11 15:58:11 +01:00
Pau	58c90b3bbc	refs #288	2022-11-11 13:41:22 +01:00
Vicent Llopis	7e50f23563	refacor code	2022-11-11 08:55:56 +01:00
Vicent Llopis	a5b20bfb03	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4090-global_invoincing	2022-11-11 08:53:10 +01:00
Joan Sanchez	163f7fd284	Added version 10503	2022-11-11 08:31:45 +01:00
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