Private
Public Access
1
0
Commit Graph

1045 Commits

Author SHA1 Message Date
Sander Roosendaal
fd52eef007 Merge tag 'v2.28' into develop
improved TP refreshing of tokens
2017-04-25 20:54:26 +02:00
Sander Roosendaal
a4d9e878ea Merge branch 'release/v2.28' 2017-04-25 20:53:57 +02:00
Sander Roosendaal
3e21fd9175 more sofisticated TP authorization/refresh 2017-04-25 17:49:46 +02:00
Sander Roosendaal
94c8759c9b Merge tag 'v2.27' into develop
zero duration try/except
2017-04-24 08:56:44 +02:00
Sander Roosendaal
764cde060e Merge branch 'hotfix/v2.27' 2017-04-24 08:55:00 +02:00
Sander Roosendaal
f5f6918bed added try/except for elapsed time 2017-04-24 08:44:51 +02:00
Sander Roosendaal
056523e335 Merge tag 'v2.26' into develop
strava device name support
2017-04-23 10:17:34 +02:00
Sander Roosendaal
6e7127deca Merge branch 'release/v2.26' 2017-04-23 10:17:06 +02:00
Sander Roosendaal
0d7df5ba76 Merge branch 'feature/stravadevice' into develop 2017-04-23 10:11:27 +02:00
Sander Roosendaal
60dda2ab1c Merge branch 'develop' into feature/stravadevice 2017-04-23 09:58:11 +02:00
Sander Roosendaal
fb1100c98e Merge tag 'v2.25' into develop
check column against StrokeData model
2017-04-23 09:51:42 +02:00
Sander Roosendaal
814b928366 Merge branch 'hotfix/v2.25' 2017-04-23 09:51:25 +02:00
Sander Roosendaal
0874a3109e datacolumn check against StrokeData model 2017-04-23 09:50:31 +02:00
Sander Roosendaal
84610bf0c9 Merge tag 'v2.24' into develop
TP callback
2017-04-22 21:05:01 +02:00
Sander Roosendaal
f2e65c1956 Merge branch 'release/v2.24' 2017-04-22 21:04:09 +02:00
Sander Roosendaal
07cac2e205 updated TP callback 2017-04-22 20:59:37 +02:00
Sander Roosendaal
71a04ba57f Merge tag 'v2.23' into develop
emergency bug fix
2017-04-22 20:46:33 +02:00
Sander Roosendaal
dcb621e5eb Merge branch 'hotfix/v2.23' 2017-04-22 20:46:11 +02:00
Sander Roosendaal
a5a6124c5e backwards compatibility 2017-04-22 20:45:17 +02:00
Sander Roosendaal
0876524807 Merge tag 'v2.22' into develop
TP testing
2017-04-22 20:35:49 +02:00
Sander Roosendaal
38fd639987 Merge branch 'release/v2.22' 2017-04-22 20:35:37 +02:00
Sander Roosendaal
82188b4fde Merge branch 'feature/tp' into develop 2017-04-22 19:42:10 +02:00
Sander Roosendaal
b71937d0db tested refresh TP token 2017-04-22 19:40:32 +02:00
Sander Roosendaal
646894cad2 add TP to export logos 2017-04-22 17:11:01 +02:00
Sander Roosendaal
69b9a2b287 Merge tag 'v2.21' into develop
UA bug fix
2017-04-22 16:30:10 +02:00
Sander Roosendaal
4851593ea9 Merge branch 'hotfix/v2.21' 2017-04-22 16:29:37 +02:00
Sander Roosendaal
0bd615ab7d underarmour return if not succesful 2017-04-22 16:28:47 +02:00
Sander Roosendaal
32b862c90d removed some stuff used for debugging 2017-04-22 16:26:35 +02:00
Sander Roosendaal
9c9355c626 Merge branch 'develop' into feature/tp 2017-04-22 16:09:08 +02:00
Sander Roosendaal
04a3595a0b some error checking for invalid y metrics 2017-04-22 15:01:47 +02:00
Sander Roosendaal
9769685253 settings_dev 2017-04-22 14:47:41 +02:00
Sander Roosendaal
94ed66065e Merge tag 'v2.20' into develop
moved error templates
2017-04-22 14:46:50 +02:00
Sander Roosendaal
ebebac7639 Merge branch 'hotfix/v2.20' 2017-04-22 14:46:13 +02:00
Sander Roosendaal
7ad8ffe0af moved error templates 2017-04-22 14:45:07 +02:00
Sander Roosendaal
96b109266d Merge tag 'v2.19' into develop
base templates fixes
2017-04-22 14:09:52 +02:00
Sander Roosendaal
864d230c95 Merge branch 'release/v2.19' 2017-04-22 14:09:34 +02:00
Sander Roosendaal
eae2b8ac4b extended templates 2017-04-22 12:32:13 +02:00
Sander Roosendaal
d963b8f5b2 Merge tag 'v2.18' into develop
hotfix user check save favorite
2017-04-22 08:43:22 +02:00
Sander Roosendaal
d55914da91 Merge branch 'hotfix/v2.18' 2017-04-22 08:43:06 +02:00
Sander Roosendaal
77434f5fd6 save favorite user check bug fix 2017-04-22 08:41:55 +02:00
Sander Roosendaal
35ce1c7049 added authorization link 2017-04-21 15:05:59 +02:00
Sander Roosendaal
a34d969892 Merge tag 'v2.17' into develop
bug hotfix
2017-04-21 08:53:54 +02:00
Sander Roosendaal
5a69544d14 Merge branch 'hotfix/v2.17' 2017-04-21 08:53:33 +02:00
Sander Roosendaal
1d97b2ee88 added isnan to f determination 2017-04-21 08:52:39 +02:00
Sander Roosendaal
3b6591c6ae replaced fitsummarydata with FitSummaryData 2017-04-19 16:25:53 +02:00
Sander Roosendaal
88761f36f3 replaced fitsummarydata with FitSummaryData 2017-04-19 16:23:48 +02:00
Sander Roosendaal
0effcc2ffe Merge tag 'v2.16' into develop
faster strava and UnderArmour
2017-04-19 08:21:48 +02:00
Sander Roosendaal
8e60660a0c Merge branch 'release/v2.16' 2017-04-19 08:18:47 +02:00
Sander Roosendaal
64da35a6f8 Strava uploads now use gzip 2017-04-19 08:11:51 +02:00
Sander Roosendaal
cda887fe40 fixed access scope from write to file:write 2017-04-18 21:58:54 +02:00