Commit Graph

5778 Commits

Author SHA1 Message Date
Juan Ferrer 05fec10cf2 Zone.getLeaves refactor & fixes
gitea/salix/master This commit looks good Details
2019-09-19 17:30:16 +02:00
Juan Ferrer 3efc1e766e Merge with master
gitea/salix/test This commit looks good Details
2019-09-19 15:55:06 +02:00
Juan Ferrer e0ffef70b1 Method ZoneGeo.getLeaves optimized
gitea/salix/master This commit looks good Details
2019-09-19 15:51:39 +02:00
Juan Ferrer afb06dd4a5 #1167 Fixed
gitea/salix/dev There was a failure building this commit Details
2019-09-19 12:32:34 +02:00
Joan Sanchez e17f708ea5 removed duplicated code
gitea/salix/test This commit looks good Details
2019-09-19 12:30:37 +02:00
Joan Sanchez 7daf2e4328 merge with master
gitea/salix/test This commit looks good Details
2019-09-19 11:48:41 +02:00
Joan Sanchez d6d825ebf1 fixed automerge
gitea/salix/master This commit looks good Details
2019-09-19 10:52:23 +02:00
Joan Sanchez f67006e526 changed fiscal name translation
gitea/salix/master This commit looks good Details
2019-09-19 09:44:50 +02:00
Joan Sanchez 9ce18fbd0a double start pick 2019-09-19 09:44:18 +02:00
Joan Sanchez 4d894365eb Fixed production errors #1699 2019-09-19 09:42:41 +02:00
Joan Sanchez 8cb10759d3 updated transactions 2019-09-19 09:42:32 +02:00
Joan Sanchez 2edfb66423 changed fiscal name translation
gitea/salix/dev There was a failure building this commit Details
2019-09-19 09:41:02 +02:00
Joan Sanchez fa549630c4 Bug/Test #1700
gitea/salix/dev This commit has test failures Details
2019-09-19 09:37:02 +02:00
Joan Sanchez a85e653f34 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
2019-09-19 09:24:27 +02:00
Joan Sanchez 5a4c6bf66f updated back unit tests 2019-09-19 09:17:21 +02:00
Bernat 526e4e34fa skip e2e #1702
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/master This commit looks good Details
2019-09-18 10:37:54 +02:00
Joan Sanchez 86ef44c90d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit has test failures Details
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
gitea/salix/dev This commit looks good Details
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
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/master This commit looks good Details
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
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/dev There was a failure building this commit Details
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
gitea/salix/test This commit looks good Details
2019-09-13 13:27:34 +02:00
Joan Sanchez a529efc783 getleaves fix
gitea/salix/dev This commit looks good Details
2019-09-13 13:26:50 +02:00
Joan Sanchez d30a21974d getleaves fix
gitea/salix/test This commit looks good Details
2019-09-13 13:00:33 +02:00
Joan Sanchez efcfa9c568 changed initial leaves depth
gitea/salix/test This commit looks good Details
2019-09-13 12:27:42 +02:00
Joan Sanchez a25652293d changed initial leaves depth
gitea/salix/dev This commit looks good Details
2019-09-13 12:26:37 +02:00
Joan Sanchez 19f666fee3 allowed null parent
gitea/salix/test This commit looks good Details
2019-09-13 12:17:09 +02:00
Joan Sanchez 7f23e006fa allowed null parent
gitea/salix/dev This commit looks good Details
2019-09-13 12:16:38 +02:00
Bernat 2e1b329584 #1681 delete comment
gitea/salix/dev This commit looks good Details
2019-09-13 11:27:32 +02:00
Bernat c6507fc2bb #1681 crear test para el endpoint getPossibleStowaways
gitea/salix/dev This commit looks good Details
2019-09-13 07:40:27 +02:00
Joan Sanchez 248dff2747 cherry-pick
gitea/salix/master This commit looks good Details
2019-09-12 14:18:47 +02:00
Joan Sanchez f0253fd1ce Increased max file size up to 250MB
gitea/salix/dev This commit looks good Details
2019-09-12 14:16:09 +02:00
Bernat 7d75c50b38 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details
2019-09-12 13:56:42 +02:00
Joan Sanchez 0702186b88 fixed e2e
gitea/salix/dev This commit looks good Details
2019-09-12 13:20:07 +02:00
Bernat 2172bdee4e #1689 2019-09-12 12:27:19 +02:00