Sander Roosendaal
|
1d9dc829ae
|
Merge tag 'v1.21' into develop
fix - compare chart now checks if id exists
|
2017-02-23 16:18:35 +01:00 |
|
Sander Roosendaal
|
b815ca84b8
|
Merge branch 'hotfix/v1.21'
|
2017-02-23 16:18:11 +01:00 |
|
Sander Roosendaal
|
1182e1f4c7
|
added check if workouts exist in comparisonview
|
2017-02-23 16:16:38 +01:00 |
|
Sander Roosendaal
|
a81baa669b
|
Merge tag '1.2' into develop
v1.2
|
2017-02-23 15:48:28 +01:00 |
|
Sander Roosendaal
|
ce03ec378c
|
Merge branch 'release/1.2'
|
2017-02-23 15:48:07 +01:00 |
|
Sander Roosendaal
|
eb7b3a14b1
|
Merge branch 'feature/multicompare3' into develop
|
2017-02-23 15:31:46 +01:00 |
|
Sander Roosendaal
|
44367c1270
|
added callouts tooltips to multi compare
|
2017-02-23 15:24:39 +01:00 |
|
Sander Roosendaal
|
393dc6bbf8
|
compare fixed
|
2017-02-23 15:16:41 +01:00 |
|
Sander Roosendaal
|
2b49407af3
|
some improvement in compare plot
|
2017-02-23 15:03:56 +01:00 |
|
Sander Roosendaal
|
27acec196a
|
comment notifications
|
2017-02-23 12:13:55 +01:00 |
|
Sander Roosendaal
|
edf9709fa2
|
Merge tag 'v1.11' into develop
v1.11 - error checking in C2 token fetch
|
2017-02-23 08:15:52 +01:00 |
|
Sander Roosendaal
|
554fb3351f
|
Merge branch 'hotfix/v1.11'
|
2017-02-23 08:13:11 +01:00 |
|
Sander Roosendaal
|
610cc7dda4
|
some error checking in the get_token C2 routine
|
2017-02-23 08:11:34 +01:00 |
|
Sander Roosendaal
|
eddf28f9d2
|
Merge tag 'v1.1' into develop
v1.1
|
2017-02-22 18:06:37 +01:00 |
|
Sander Roosendaal
|
a46efa2831
|
Merge branch 'release/v1.1'
|
2017-02-22 18:05:04 +01:00 |
|
Sander Roosendaal
|
77798fe999
|
chart axes choice on multi compare view
|
2017-02-22 17:57:07 +01:00 |
|
Sander Roosendaal
|
e32e2e2db5
|
Merge tag 'v1.01' into develop
v1.01
|
2017-02-22 10:20:17 +01:00 |
|
Sander Roosendaal
|
66a88f257a
|
Merge branch 'hotfix/v1.01'
|
2017-02-22 10:19:59 +01:00 |
|
Sander Roosendaal
|
3711d2140e
|
changed duration check in dataprep (h>23, min>59, etc)
|
2017-02-22 10:19:00 +01:00 |
|
Sander Roosendaal
|
65ef45f01a
|
Merge branch 'feature/metar2' into develop
|
2017-02-21 15:22:18 +01:00 |
|
Sander Roosendaal
|
ebb5aab316
|
some time zone stuff
|
2017-02-21 15:21:32 +01:00 |
|
Sander Roosendaal
|
bfbdbb8a1e
|
changed timetuple to utctimetuple
|
2017-02-20 22:40:09 +01:00 |
|
Sander Roosendaal
|
04f7f765bb
|
Merge tag 'metar' into develop
metar
|
2017-02-20 21:28:13 +01:00 |
|
Sander Roosendaal
|
580cd771f8
|
Merge branch 'release/metar'
|
2017-02-20 21:27:29 +01:00 |
|
Sander Roosendaal
|
3a203f9f1d
|
Merge branch 'feature/metars' into develop
|
2017-02-20 20:48:32 +01:00 |
|
Sander Roosendaal
|
64d506fde5
|
added error checking
|
2017-02-20 20:45:51 +01:00 |
|
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 |
|