Private
Public Access
1
0
Commit Graph

2122 Commits

Author SHA1 Message Date
Sander Roosendaal
53c63ff317 Merge branch 'release/v5.27' 2017-12-03 20:31:30 +01:00
Sander Roosendaal
fdbabd57ab fixed email processing bug 2017-12-03 20:18:24 +01:00
Sander Roosendaal
faac0f689b Merge tag 'v5.26' into develop
bug fix mail processing empty bodies
2017-12-03 19:31:05 +01:00
Sander Roosendaal
7a61703378 Merge branch 'release/v5.26' 2017-12-03 18:59:54 +01:00
Sander Roosendaal
0146555d1b bugfix email pull 2017-12-03 18:24:25 +01:00
Sander Roosendaal
6fd94cb3f5 Merge tag 'v5.25' into develop
hotfix
2017-12-03 09:45:04 +01:00
Sander Roosendaal
13801659b3 Merge branch 'hotfix/v5.25' 2017-12-03 09:44:31 +01:00
Sander Roosendaal
64bbfb42da hotfix flex chart slash 2017-12-03 09:40:44 +01:00
Sander Roosendaal
0e4269b7d4 Merge tag 'v5.24' into develop
bug fix
2017-12-01 17:13:16 +01:00
Sander Roosendaal
c95285fdf8 Merge branch 'release/v5.24' 2017-12-01 17:12:30 +01:00
Sander Roosendaal
21b8f9b22f bug fix 2017-12-01 17:07:28 +01:00
Sander Roosendaal
0266bf6309 Merge tag 'v5.23' into develop
bug fixing
2017-12-01 12:05:42 +01:00
Sander Roosendaal
1f39a05c08 Merge branch 'release/v5.23' 2017-12-01 12:04:59 +01:00
Sander Roosendaal
519effd8c2 bug fix 2017-12-01 09:56:15 +01:00
Sander Roosendaal
b0ca9418e5 corrected typo in advanced page title 2017-11-30 11:31:39 +01:00
Sander Roosendaal
b649650f33 Merge tag 'v5.22' into develop
additional metrics
2017-11-29 16:02:42 +01:00
Sander Roosendaal
2052e90034 Merge branch 'release/v5.22' 2017-11-29 16:00:33 +01:00
Sander Roosendaal
6e15c6f715 Merge branch 'feature/additionalmetrics' into develop 2017-11-29 15:43:04 +01:00
Sander Roosendaal
a80df03d60 additional metrics are available in flex chart 2017-11-29 13:26:29 +01:00
Sander Roosendaal
4e5b661923 first bit of plotting extra metrics
Need to look at the data duplication - where does it come from
2017-11-28 23:12:32 +01:00
Sander Roosendaal
79d20bb860 added warning message in config.yaml 2017-11-28 13:50:43 +01:00
Sander Roosendaal
69ae507618 Merge tag 'v5.21' into develop
hotfix
2017-11-28 10:19:19 +01:00
Sander Roosendaal
fe64a6df21 Merge branch 'hotfix/v5.21' 2017-11-28 10:18:07 +01:00
Sander Roosendaal
91a6b0f261 bug fix upload empty file name 2017-11-28 10:15:57 +01:00
Sander Roosendaal
bfb3d64792 Merge tag 'v5.20' into develop
powercurve
2017-11-27 22:14:25 +01:00
Sander Roosendaal
d8f4a3b49c Merge branch 'release/v5.20' 2017-11-27 22:13:51 +01:00
Sander Roosendaal
e7a192ddc0 added link to power curve on advanced erg 2017-11-27 22:12:04 +01:00
Sander Roosendaal
86faa3a681 Merge tag 'v5.19' into develop
powercurve for boatcoach
2017-11-27 22:05:59 +01:00
Sander Roosendaal
eb16f2bd61 Merge branch 'release/v5.19' 2017-11-27 22:05:19 +01:00
Sander Roosendaal
6012463a4d power curve 2017-11-27 22:01:12 +01:00
Sander Roosendaal
d155d6250d Merge tag 'v5.18' into develop
some changes because of dev
2017-11-27 21:01:38 +01:00
Sander Roosendaal
0af9a4e2fc Merge branch 'release/v5.18' 2017-11-27 21:00:46 +01:00
Sander Roosendaal
fd8076b161 Merge branch 'feature/accelerationcurves' into develop 2017-11-27 20:47:51 +01:00
Sander Roosendaal
8ef65bcea5 moved site_url to config.yaml 2017-11-27 20:41:35 +01:00
Sander Roosendaal
60ac117fb4 added static plot of in stroke from geeky page 2017-11-27 18:14:40 +01:00
Sander Roosendaal
dddbcad037 changed reading of non painsled to get better data 2017-11-27 10:39:15 +01:00
Sander Roosendaal
cf8d15cdca Merge tag 'v5.17' into develop
fix
2017-11-26 20:50:26 +01:00
Sander Roosendaal
782fce87bf Merge branch 'release/v5.17' 2017-11-26 20:49:56 +01:00
Sander Roosendaal
ee88de09fc restored settings.py 2017-11-26 20:15:28 +01:00
Sander Roosendaal
8b565d9057 Merge tag 'v5.16' into develop
dev fix
2017-11-26 20:08:08 +01:00
Sander Roosendaal
2ff4347f65 Merge branch 'hotfix/v5.16' 2017-11-26 20:07:35 +01:00
Sander Roosendaal
4a9447991b dev test 2017-11-26 20:05:27 +01:00
Sander Roosendaal
7fc5c8f35a Merge tag 'v5.15' into develop
model change for dev
2017-11-26 19:34:48 +01:00
Sander Roosendaal
8a4ddcb6d5 Merge branch 'hotfix/v5.15' 2017-11-26 19:34:08 +01:00
Sander Roosendaal
6dd8dc06fc team model change for dev 2017-11-26 19:32:16 +01:00
Sander Roosendaal
37430488ec Merge tag 'v5.14' into develop
hotfix
2017-11-26 19:15:33 +01:00
Sander Roosendaal
dcd4ddc705 Merge branch 'hotfix/v5.14' 2017-11-26 19:15:07 +01:00
Sander Roosendaal
33af6176a3 bug fix 2017-11-26 18:09:32 +01:00
Sander Roosendaal
7c4010e162 Merge tag 'v5.13' into develop
hotfix join
2017-11-26 15:48:08 +01:00
Sander Roosendaal
c2fc846530 Merge branch 'hotfix/v5.13' 2017-11-26 15:47:28 +01:00