13131 Commits

All Branches

Search

Author	SHA1	Message	Date
Pau	192d7336a4	change test	2022-11-15 14:22:09 +01:00
Pau	6e58b1de8b	refs #4511 Changed fixtures to fix broken test @30min	2022-11-15 14:17:24 +01:00
Pau	56893ea58b	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-15 13:42:06 +01: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	55f3d26dd0	Trigger jenkins build	2022-11-14 12:02:50 +01:00
Joan Sanchez	500d12f5a0	Enabled back unit tests	2022-11-14 10:13:26 +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
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
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
Joan Sanchez	6a2977a2cf	Fixed SQL changes	2022-11-10 14:19:20 +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
Joan Sanchez	800d98a5b5	Removed unused components	2022-11-10 13:34:23 +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
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
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
Joan Sanchez	89e49c3843	Template component	2022-11-10 07:48:24 +01:00
Guillermo Bonet	6804c1a756	Merge branch 'dev' into 4550-printServer	2022-11-09 16:55:29 +01:00
Alexandre Riera	175e7b128a	Merge pull request 'refs #4547 informe y email generados' (!1114) from 4547-informe-compensacion into dev ... Reviewed-on: #1114 Reviewed-by: Vicent Llopis <vicent@verdnatura.es>	2022-11-09 12:34:33 +00:00
Alexandre Riera	ff2ee4401e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4547-informe-compensacion	2022-11-09 13:26:54 +01:00
Vicent Llopis	be46f30dd7	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-09 10:32:24 +01:00
Joan Sanchez	f9eee431b4	fix(driver-route): routes with empty lines	2022-11-09 10:27:00 +01:00
Guillermo Bonet	6744b3f797	added collection-label	2022-11-08 14:40:38 +01:00
Joan Sanchez	8607ab7ccc	Merge pull request 'MASTER_hotfix_deleteTrashFiles2' (!1130) from MASTER_hotfix_deleteTrashFiles2 into master ... Reviewed-on: #1130	2022-11-08 12:52:06 +00:00
Vicent Llopis	9890db820b	feat: borra los dms sin file y elimina registros aunq no se pueda eliminar la carpeta	2022-11-08 12:48:09 +01:00
Pau	5dafdd5daa	Merge pull request '4490-transfer-tickets-between-clients' (!1104) from 4490-transfer-tickets-between-clients into dev ... Reviewed-on: #1104 Reviewed-by: Joan Sanchez <joan@verdnatura.es>	2022-11-08 08:52:11 +00:00
Pau	f45eaa07f9	refs #4511 fixed test, changed drop to rename @1h	2022-11-08 09:45:56 +01:00
Pau	d1be14605b	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4511-kkear-expedition.itemFk	2022-11-08 09:32:09 +01:00
Pau	78e6c8da15	Merge branch 'dev' into 4511-kkear-expedition.itemFk	2022-11-08 09:08:06 +01:00
Pau	f1e832ee66	Merge branch 'dev' into 4490-transfer-tickets-between-clients	2022-11-08 08:06:30 +00:00
Vicent Llopis	9cd57bfde9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3928-worker.time-control_sendMail	2022-11-08 08:56:56 +01:00
Vicent Llopis	4d81991d86	delete focus test	2022-11-08 08:47:08 +01:00