Sander Roosendaal
|
e49a4e8f0e
|
added METAR
|
2017-02-20 20:38:12 +01:00 |
|
Sander Roosendaal
|
6d674f7d4a
|
detection of nearest METAR
|
2017-02-20 17:30:52 +01:00 |
|
Sander Roosendaal
|
7fc82a8b9e
|
Merge tag 'teamcomparetime' into develop
bugfix pace and time axes
|
2017-02-19 18:05:35 +01:00 |
|
Sander Roosendaal
|
c3f1d24b0a
|
Merge branch 'hotfix/teamcomparetime'
|
2017-02-19 18:05:09 +01:00 |
|
Sander Roosendaal
|
65b2dbd8f7
|
pace y axis
|
2017-02-19 18:02:46 +01:00 |
|
Sander Roosendaal
|
0ddcd77947
|
time axis bugfix compare
|
2017-02-19 17:56:24 +01:00 |
|
Sander Roosendaal
|
59b3f339b0
|
Merge tag 'teamcomparefix' into develop
w.id to int(w.id)
|
2017-02-19 17:04:21 +01:00 |
|
Sander Roosendaal
|
8b34ce7933
|
Merge branch 'hotfix/teamcomparefix'
|
2017-02-19 17:03:56 +01:00 |
|
Sander Roosendaal
|
45dcebe82b
|
w.id to int(w.id)
|
2017-02-19 17:02:52 +01:00 |
|
Sander Roosendaal
|
1775f0a8ac
|
Merge tag 'teamcompare' into develop
teamcompare
|
2017-02-19 16:56:53 +01:00 |
|
Sander Roosendaal
|
f74baeca3f
|
Merge branch 'release/teamcompare'
|
2017-02-19 16:56:39 +01:00 |
|
Sander Roosendaal
|
b195afde47
|
Merge branch 'feature/teamcompare' into develop
|
2017-02-19 16:47:16 +01:00 |
|
Sander Roosendaal
|
0f49402023
|
rough version of comparison
|
2017-02-19 16:45:53 +01:00 |
|
Sander Roosendaal
|
e0b719da4e
|
added links to strava, st, c2 under button
|
2017-02-19 10:45:48 +01:00 |
|
Sander Roosendaal
|
2181f69d8b
|
Merge branch 'develop' into feature/teamcompare
|
2017-02-19 10:09:20 +01:00 |
|
Sander Roosendaal
|
ad1f182f60
|
Merge tag 'fitfiles' into develop
hotfixes
|
2017-02-19 09:34:13 +01:00 |
|
Sander Roosendaal
|
c19448a2c1
|
Merge branch 'hotfix/fitfiles'
|
2017-02-19 09:33:59 +01:00 |
|
Sander Roosendaal
|
35e853aea1
|
hotfix fit functionality, strava timeout, team invite
|
2017-02-19 09:29:00 +01:00 |
|
Sander Roosendaal
|
ab5fce874d
|
Merge tag 'afewerrors' into develop
a few errors fixed
|
2017-02-18 20:28:43 +01:00 |
|
Sander Roosendaal
|
d4daa8c924
|
Merge branch 'hotfix/afewerrors'
|
2017-02-18 20:28:07 +01:00 |
|
Sander Roosendaal
|
209a9e193c
|
bugfix promember check
|
2017-02-18 20:26:36 +01:00 |
|
Sander Roosendaal
|
91d82703f7
|
multi plot sort of functions
|
2017-02-18 13:25:21 +01:00 |
|
Sander Roosendaal
|
46358ba4d4
|
draft view and chart for multi comparison
|
2017-02-18 11:55:14 +01:00 |
|
Sander Roosendaal
|
33afb8800b
|
Initial version of workout choice field
|
2017-02-18 09:50:09 +01:00 |
|
Sander Roosendaal
|
a36b2f1693
|
Merge tag 'stravaerror2' into develop
stravastuff remove error catching
|
2017-02-17 21:40:58 +01:00 |
|
Sander Roosendaal
|
7cea43738c
|
Merge branch 'hotfix/stravaerror2'
|
2017-02-17 21:40:37 +01:00 |
|
Sander Roosendaal
|
901398be76
|
removing error catching in stravastuff
|
2017-02-17 21:39:28 +01:00 |
|
Sander Roosendaal
|
d43eb11ce7
|
Merge tag 'commentsfix2' into develop
bugfx2
|
2017-02-17 19:27:46 +01:00 |
|
Sander Roosendaal
|
fc5e86c171
|
Merge branch 'hotfix/commentsfix2'
|
2017-02-17 19:27:06 +01:00 |
|
Sander Roosendaal
|
1456dc7a4b
|
bugfx2
|
2017-02-17 19:26:02 +01:00 |
|
Sander Roosendaal
|
61b83316fc
|
Merge tag 'commentsfix' into develop
bugfix comment notifications
|
2017-02-17 19:14:28 +01:00 |
|
Sander Roosendaal
|
94c8f7d2ee
|
Merge branch 'hotfix/commentsfix'
|
2017-02-17 19:14:03 +01:00 |
|
Sander Roosendaal
|
b7b3518de2
|
bugfix comment notification
|
2017-02-17 19:10:26 +01:00 |
|
Sander Roosendaal
|
92accdfc85
|
Merge tag 'bugfixcomment' into develop
bugfix comments
|
2017-02-17 16:52:52 +01:00 |
|
Sander Roosendaal
|
d0506bf51a
|
Merge branch 'release/bugfixcomment'
|
2017-02-17 16:52:33 +01:00 |
|
Sander Roosendaal
|
e564d3e167
|
bugfix
|
2017-02-17 16:51:24 +01:00 |
|
Sander Roosendaal
|
025df88d25
|
Merge tag 'workoutcomments' into develop
added workout comments
|
2017-02-17 16:40:34 +01:00 |
|
Sander Roosendaal
|
3e844b5c50
|
Merge branch 'release/workoutcomments'
|
2017-02-17 16:40:18 +01:00 |
|
Sander Roosendaal
|
781392866a
|
Merge branch 'feature/teammessages' into develop
|
2017-02-17 16:36:41 +01:00 |
|
Sander Roosendaal
|
cee6179416
|
added comment functionality
|
2017-02-17 16:35:34 +01:00 |
|
Sander Roosendaal
|
53f51c456f
|
implemented comments page
|
2017-02-17 16:13:34 +01:00 |
|
Sander Roosendaal
|
7ffaf18379
|
created WorkoutComment model
|
2017-02-17 10:27:45 +01:00 |
|
Sander Roosendaal
|
fd10f14660
|
removing some strava error catching code - I want tracebacks
|
2017-02-17 07:37:31 +01:00 |
|
Sander Roosendaal
|
5c81734d63
|
strava callback catch error code
|
2017-02-17 07:33:27 +01:00 |
|
Sander Roosendaal
|
dd280df523
|
Merge tag 'emptyuserform' into develop
empty user form field hotfix
|
2017-02-16 22:22:22 +01:00 |
|
Sander Roosendaal
|
1c88d89fcf
|
Merge branch 'hotfix/emptyuserform'
|
2017-02-16 22:21:32 +01:00 |
|
Sander Roosendaal
|
b7a031945a
|
hotfix emtpy field on user form
|
2017-02-16 22:19:30 +01:00 |
|
Sander Roosendaal
|
009f358df3
|
added test for upload of logcard
|
2017-02-16 19:24:54 +01:00 |
|
Sander Roosendaal
|
274e5d953f
|
Merge tag 'logcard' into develop
bug hotfix c2 logcard summary
|
2017-02-16 19:13:13 +01:00 |
|
Sander Roosendaal
|
1781ab4e47
|
Merge branch 'hotfix/logcard'
|
2017-02-16 19:12:36 +01:00 |
|