5864 Commits

All Branches

Search

Author	SHA1	Message	Date
Joan Sanchez	5a4c6bf66f	updated back unit tests	2019-09-19 09:17:21 +02:00
Bernat	526e4e34fa	skip e2e #1702	2019-09-19 09:05:11 +02:00
Joan Sanchez	73b1f18759	Fixed production errors #1699	2019-09-19 08:58:42 +02:00
Bernat	c773ddc499	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-19 06:56:47 +02:00
Joan Sanchez	335f92173c	updated transactions	2019-09-18 15:11:09 +02:00
Bernat	86d793b9ed	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 11:11:53 +02:00
Bernat	7af4f3626d	#1691 item.basicData - Añadir campo hasKgPrice	2019-09-18 11:11:47 +02:00
Joan Sanchez	f56e4f4b7d	pick	2019-09-18 10:37:54 +02:00
Joan Sanchez	86ef44c90d	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 10:35:49 +02:00
Joan Sanchez	031dbcb63a	Unlocked from autocomplete city and postcode fields #1703	2019-09-18 10:35:46 +02:00
Carlos Jimenez Ruiz	4c33f07e42	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-18 09:42:45 +02:00
Carlos Jimenez Ruiz	b12d0388c9	#1074 Undo changes button for forms	2019-09-18 09:41:25 +02:00
Bernat	d66d2f16c0	#1693 fix e2e test	2019-09-17 14:17:15 +02:00
Bernat	6b136898ce	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-17 14:08:37 +02:00
Bernat	cbbce91def	#1693 export structure, data and fix back test	2019-09-17 13:52:29 +02:00
Joan Sanchez	c7423f5580	pick2	2019-09-17 07:15:34 +02:00
Joan Sanchez	dd0c34d31b	allowed null parent	2019-09-17 07:13:37 +02:00
Joan Sanchez	043fe80254	cherry 1	2019-09-17 07:12:45 +02:00
Carlos Jimenez Ruiz	4f99907ee3	includeSubdomains deprecated Use includeSubDomains	2019-09-16 13:13:25 +02:00
Bernat	40cfa19d01	bug claimDms	2019-09-16 12:51:51 +02:00
Carlos Jimenez Ruiz	206dec59a3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz	2251fb65ad	#1615 migrar karma a jest	2019-09-13 16:09:14 +02:00
Joan Sanchez	42aceaaf70	pick	2019-09-13 13:27:34 +02:00
Joan Sanchez	a529efc783	getleaves fix	2019-09-13 13:26:50 +02:00
Joan Sanchez	d30a21974d	getleaves fix	2019-09-13 13:00:33 +02:00
Joan Sanchez	efcfa9c568	changed initial leaves depth	2019-09-13 12:27:42 +02:00
Joan Sanchez	a25652293d	changed initial leaves depth	2019-09-13 12:26:37 +02:00
Joan Sanchez	19f666fee3	allowed null parent	2019-09-13 12:17:09 +02:00
Joan Sanchez	7f23e006fa	allowed null parent	2019-09-13 12:16:38 +02:00
Bernat	2e1b329584	#1681 delete comment	2019-09-13 11:27:32 +02:00
Bernat	c6507fc2bb	#1681 crear test para el endpoint getPossibleStowaways	2019-09-13 07:40:27 +02:00
Joan Sanchez	248dff2747	cherry-pick	2019-09-12 14:18:47 +02:00
Joan Sanchez	f0253fd1ce	Increased max file size up to 250MB	2019-09-12 14:16:09 +02:00
Bernat	7d75c50b38	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-12 13:56:42 +02:00
Joan Sanchez	0702186b88	fixed e2e	2019-09-12 13:20:07 +02:00
Bernat	2172bdee4e	#1689	2019-09-12 12:27:19 +02:00
Joan Sanchez	8b8463e936	Updated dms colums size #1692	2019-09-12 12:12:39 +02:00
Joan Sanchez	524c4e59ed	merge	2019-09-12 11:49:25 +02:00
Joan Sanchez	f6bd915ae6	Ticket dms CSS fixes #1692	2019-09-12 11:47:56 +02:00
Joan Sanchez	e16d43b2fc	Allow disable log on model properties	2019-09-12 09:49:02 +02:00
Joan Sanchez	9bf54f34dd	Added fruit translation	2019-09-12 07:26:15 +02:00
Joan Sanchez	5d980f5129	Added fruit translation	2019-09-12 07:25:05 +02:00
Bernat	6d64fdc19e	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-12 07:22:24 +02:00
Bernat	a1e0da8905	Tarea #1689 exportat procedimientos a local desde produccion	2019-09-12 07:22:12 +02:00
Joan Sanchez	ac26d224dd	updated fonts & added "Fruit" item category #1688	2019-09-12 07:21:43 +02:00
Joan Sanchez	28ca32175e	updated fonts & added "Fruit" item category #1688	2019-09-12 07:20:48 +02:00
Bernat	c344d8088b	merge	2019-09-11 14:18:21 +02:00
Joan Sanchez	ff626764d8	fixed back unit tests	2019-09-11 08:24:28 +02:00
Joan Sanchez	342886942f	fixed sale loggable transaction error #1686	2019-09-11 08:12:27 +02:00
Bernat	03c44d4ef9	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev	2019-09-10 14:43:10 +02:00