Private
Public Access
1
0
Commit Graph

384 Commits

Author SHA1 Message Date
Sander Roosendaal
aad89cbbcb Merge branch 'release/stravafix2' 2017-01-05 21:17:47 +01:00
Sander Roosendaal
d2e8fb9f7e hotfix strava upload 2017-01-05 21:14:36 +01:00
Sander Roosendaal
33e9694b2f Merge tag 'stravafix' into develop
strava upload fix
2017-01-05 21:08:22 +01:00
Sander Roosendaal
f63a3fcdee Merge branch 'hotfix/stravafix' 2017-01-05 21:07:32 +01:00
Sander Roosendaal
76c9666b56 fix Strava upload 2017-01-05 21:06:50 +01:00
Sander Roosendaal
69527f9f75 Merge tag 'tcx_st' into develop
TCX and SportTracks bux fixes
2017-01-05 18:35:57 +01:00
Sander Roosendaal
808e8372af Merge branch 'release/tcx_st' 2017-01-05 18:35:41 +01:00
Sander Roosendaal
1f056096d7 sporttracksexport bug fixing 2017-01-05 17:10:33 +01:00
Sander Roosendaal
5f45d385f3 some more stuff related to strava bug 2017-01-05 09:03:57 +01:00
Sander Roosendaal
0300b996a3 Merge tag 'stravaerror' into develop
more strava error tracing
2017-01-04 22:33:12 +01:00
Sander Roosendaal
b024a2adb1 Merge branch 'hotfix/stravaerror' 2017-01-04 22:32:35 +01:00
Sander Roosendaal
0ca922f5a2 more error tracing around Strava 2017-01-04 22:30:59 +01:00
Sander Roosendaal
41f7ab2ff5 Chart permissions 2017-01-04 12:51:14 +01:00
Sander Roosendaal
467471437e toggle rest stroke buttons 2017-01-04 11:05:32 +01:00
Sander Roosendaal
f7d26a9e11 Merge branch 'feature/restapi2' into develop 2017-01-04 10:35:50 +01:00
Sander Roosendaal
3e833fd217 Revoke button 2017-01-04 10:33:56 +01:00
Sander Roosendaal
b0d77bbabf Merge branch 'develop' into feature/restapi2 2017-01-04 08:05:02 +01:00
Sander Roosendaal
42c4f18732 Merge tag 'analyticsblog' into develop
added link to blog
2017-01-03 22:03:07 +01:00
Sander Roosendaal
f4c1812036 Merge branch 'hotfix/analyticsblog' 2017-01-03 22:02:39 +01:00
Sander Roosendaal
c124cf043c add link to blog in footer 2017-01-03 22:01:48 +01:00
Sander Roosendaal
145435e573 Rowpro log warning message 2017-01-02 10:21:39 +01:00
Sander Roosendaal
6a300c1f28 Merge tag 'promembertext' into develop
pro membership conversion disclaimer
2017-01-02 09:52:39 +01:00
Sander Roosendaal
1bab17b6c8 Merge branch 'hotfix/promembertext' 2017-01-02 09:52:21 +01:00
Sander Roosendaal
0b1aa1677c pro membership conversion disclaimer 2017-01-02 09:51:34 +01:00
Sander Roosendaal
ab1c04f41d Merge tag 'stravasherlock' into develop
Strava error sherlock code
2016-12-27 08:57:29 +01:00
Sander Roosendaal
1ecf4e4c2c Merge branch 'hotfix/stravasherlock' 2016-12-27 08:55:45 +01:00
Sander Roosendaal
04aa40f19c Typo correction in dataprep 2016-12-27 08:52:30 +01:00
Sander Roosendaal
6b20e1c936 Code to check Strava behaviour 2016-12-27 08:50:57 +01:00
Sander Roosendaal
4f9c940b62 Merge tag 'api_rp_c2summary' into develop
RowPerfect+API+C2 summary
2016-12-25 21:12:56 +01:00
Sander Roosendaal
51c9915044 Merge branch 'release/api_rp_c2summary' 2016-12-25 21:12:31 +01:00
Sander Roosendaal
c3dbd71465 rowperfect3 2016-12-25 20:53:59 +01:00
Sander Roosendaal
d60f24c040 changed API to accept forms not json encoding 2016-12-23 09:23:35 +01:00
Sander Roosendaal
822b0045ec added fav charts and user 2016-12-23 08:47:49 +01:00
Sander Roosendaal
24ca451d01 Merge branch 'feature/c2repair' into develop 2016-12-22 20:34:39 +01:00
Sander Roosendaal
3f83e283e1 added scope 2016-12-22 20:33:55 +01:00
Sander Roosendaal
12dff27fba Merge branch 'develop' into feature/c2repair 2016-12-22 20:25:20 +01:00
Sander Roosendaal
69e5df2309 Merge branch 'feature/restapi' into develop 2016-12-22 17:28:11 +01:00
Sander Roosendaal
8ed24fec63 Draft developers info 2016-12-22 17:24:58 +01:00
Sander Roosendaal
56fc3a52d3 sorted permissions for workouts-list 2016-12-22 15:39:57 +01:00
Sander Roosendaal
24de5c681d API seems to work ok 2016-12-22 12:21:04 +01:00
Sander Roosendaal
23c3ff70b5 still not working 2016-12-22 08:29:02 +01:00
Sander Roosendaal
29de886c87 not working yet - added scope to request body 2016-12-21 22:41:33 +01:00
Sander Roosendaal
1f1c06f04d Merge tag 'morec2' into develop
C2 forensics
2016-12-21 21:33:59 +01:00
Sander Roosendaal
750ee83d4b Merge branch 'release/morec2' 2016-12-21 21:33:45 +01:00
Sander Roosendaal
5a0b145fcd Some more C2 api forensics 2016-12-21 21:28:28 +01:00
Sander Roosendaal
2701d330ce Merge branch 'develop' into feature/restapi 2016-12-21 16:18:23 +01:00
Sander Roosendaal
e4e2b65bf0 Merge tag 'tweet' into develop
tweet functionality
2016-12-21 15:52:50 +01:00
Sander Roosendaal
339165a2e0 Merge branch 'release/tweet' 2016-12-21 15:52:36 +01:00
Sander Roosendaal
0943c61e17 tweet functionality 2016-12-21 15:41:31 +01:00
Sander Roosendaal
42280cb5d9 Merge tag 'cookielaw2' into develop
Cookie Law 2
2016-12-21 13:32:20 +01:00