Sander Roosendaal
|
820bf95c8a
|
moved callback URL to external config
|
2017-12-09 11:57:05 +01:00 |
|
Sander Roosendaal
|
e47ccc191f
|
bug fix in addmanual
|
2017-12-09 11:33:35 +01:00 |
|
Sander Roosendaal
|
046a23bd94
|
Merge branch 'bugfix/listworkouts' into develop
|
2017-12-08 11:39:40 +01:00 |
|
Sander Roosendaal
|
ce8d30dba6
|
forcing first name to have at least one character in user form
|
2017-12-08 11:11:16 +01:00 |
|
Sander Roosendaal
|
be596dd060
|
show login when user first name is empty
|
2017-12-08 10:59:48 +01:00 |
|
Sander Roosendaal
|
c8a172acbc
|
list no name
|
2017-12-08 10:56:24 +01:00 |
|
Sander Roosendaal
|
fffc9e80d6
|
Merge tag 'v5.30' into develop
bug fix
|
2017-12-07 15:17:55 +01:00 |
|
Sander Roosendaal
|
4cbd24ab65
|
Merge branch 'hotfix/v5.30'
|
2017-12-07 15:17:41 +01:00 |
|
Sander Roosendaal
|
7cd3149576
|
bug fix
|
2017-12-07 15:16:33 +01:00 |
|
Sander Roosendaal
|
7ad7cb2d0c
|
Merge tag 'v5.29' into develop
reads excel template
|
2017-12-07 14:53:44 +01:00 |
|
Sander Roosendaal
|
8aa7a3b7ff
|
Merge branch 'release/v5.29'
|
2017-12-07 14:53:18 +01:00 |
|
Sander Roosendaal
|
1140c67469
|
reads excel template workout summary
|
2017-12-07 14:40:24 +01:00 |
|
Sander Roosendaal
|
dc7cb419a5
|
Merge branch 'feature/trimp' into develop
|
2017-12-07 09:57:14 +01:00 |
|
Sander Roosendaal
|
d7d1f03674
|
modified new user registration test to account for new fields
|
2017-12-07 09:44:31 +01:00 |
|
Sander Roosendaal
|
9721aa6a9c
|
TRIMP working
|
2017-12-07 09:19:36 +01:00 |
|
Sander Roosendaal
|
2f7fcf444b
|
added birth date & sex to user model
|
2017-12-07 08:39:13 +01:00 |
|
Sander Roosendaal
|
59a2efb7dc
|
Merge tag 'v5.28' into develop
bug fix
|
2017-12-04 12:12:59 +01:00 |
|
Sander Roosendaal
|
5fcd53485b
|
Merge branch 'hotfix/v5.28'
|
2017-12-04 12:11:40 +01:00 |
|
Sander Roosendaal
|
3a3d93f659
|
bug fix
read_cols_df returned two objects, not one
|
2017-12-04 12:02:06 +01:00 |
|
Sander Roosendaal
|
e6cb0916e9
|
comment in ascii
|
2017-12-04 09:54:59 +01:00 |
|
Sander Roosendaal
|
57a5da5186
|
fixes issue #236 - reverts to include rest strokes
if workout is only rest strokes, stats shown for entire workout
|
2017-12-03 21:51:21 +01:00 |
|
Sander Roosendaal
|
da4449e900
|
Merge tag 'v5.27' into develop
bug fix email processing
|
2017-12-03 20:32:01 +01:00 |
|
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 |
|