Private
Public Access
1
0
Commit Graph

1004 Commits

Author SHA1 Message Date
Sander Roosendaal
7ad8ffe0af moved error templates 2017-04-22 14:45:07 +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
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
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
ee162437b0 anonymous user cannot save favorite 2017-04-18 09:00:13 +02:00
Sander Roosendaal
16ecb0ffa1 faster download of workout types 2017-04-17 10:36:36 +02:00
Sander Roosendaal
e4768ee9ce Merge tag 'v2.15' into develop
fixed UA cap to 10 points
2017-04-17 09:30:59 +02:00
Sander Roosendaal
845c131206 Merge branch 'release/v2.15' 2017-04-17 09:30:18 +02:00
Sander Roosendaal
6cd18f424c removed reduction to 10 datapoints UA 2017-04-17 09:26:57 +02:00
Sander Roosendaal
4d08f1d043 Merge tag 'v2.14' into develop
bugfix UA
2017-04-17 09:23:16 +02:00
Sander Roosendaal
c8ef6a776d Merge branch 'hotfix/v2.14' 2017-04-17 09:22:40 +02:00
Sander Roosendaal
a593787adc bug fix underarmour import list 2017-04-17 09:21:57 +02:00
Sander Roosendaal
4e1ac61819 Merge tag 'v2.13' into develop
hotfix rower instance saving fav chart
2017-04-17 09:16:37 +02:00
Sander Roosendaal
6fbd9be04c Merge branch 'hotfix/v2.13' 2017-04-17 09:16:12 +02:00
Sander Roosendaal
968aa6be59 underarmour redirect 2017-04-17 09:15:16 +02:00
Sander Roosendaal
92311d0687 added rower instance database call when saving fav chart 2017-04-17 09:11:18 +02:00
Sander Roosendaal
ea75374335 Merge tag 'v2.12' into develop
struggling with callback uri
2017-04-16 20:28:01 +02:00
Sander Roosendaal
bddda6188a Merge branch 'release/v2.12' 2017-04-16 20:27:39 +02:00
Sander Roosendaal
12be355449 underarmour callback uri??? 2017-04-16 20:25:49 +02:00
Sander Roosendaal
7b3f0be7bf Merge tag 'v2.11' into develop
corrected callback link
2017-04-16 20:14:01 +02:00
Sander Roosendaal
52a1de221b Merge branch 'release/v2.11' 2017-04-16 20:13:36 +02:00
Sander Roosendaal
dce1466e31 correct callback URI in settings 2017-04-16 20:11:53 +02:00
Sander Roosendaal
95eb43566a Merge tag 'v2.10' into develop
Under Armour basic functionality
2017-04-16 20:08:46 +02:00
Sander Roosendaal
52d8f49735 Merge branch 'release/v2.10' 2017-04-16 20:08:25 +02:00
Sander Roosendaal
7252579c9c last minute button changes 2017-04-16 20:03:00 +02:00
Sander Roosendaal
c2a72f3ec5 landing page (two images) 2017-04-16 19:52:53 +02:00
Sander Roosendaal
9d2ff35865 Merge branch 'feature/underarmour' into develop 2017-04-16 19:50:35 +02:00
Sander Roosendaal
d7c8cb38b9 no location data 2017-04-16 19:46:55 +02:00
Sander Roosendaal
845710c7b4 export works somehow (no coordinates) 2017-04-16 19:42:37 +02:00
Sander Roosendaal
b77f24e13b upload works partially 2017-04-16 17:29:29 +02:00
Sander Roosendaal
f9f9732e90 token refresh works 2017-04-16 16:06:58 +02:00
Sander Roosendaal
2712b5d502 Merge branch 'develop' into feature/underarmour 2017-04-16 14:18:19 +02:00
Sander Roosendaal
d70df62b63 import working 2017-04-16 14:14:20 +02:00
Sander Roosendaal
bf2e7ee0ec error checking in dataprep 2017-04-15 13:01:09 +02:00
Sander Roosendaal
58f74e3760 one extra sleep for email processing 2017-04-15 12:42:09 +02:00
Sander Roosendaal
6e1185366e Merge tag 'v2.06' into develop
fix email processing (hopefully)
2017-04-15 12:34:28 +02:00
Sander Roosendaal
cde3f1bf0b Merge branch 'hotfix/v2.06' 2017-04-15 12:34:13 +02:00
Sander Roosendaal
c496b851c2 improved email flow 2017-04-15 12:33:29 +02:00
Sander Roosendaal
cb7d43487e underarmour 2017-04-14 20:44:32 +02:00
Sander Roosendaal
2889e63e37 Merge branch 'develop' into feature/underarmour 2017-04-14 20:43:48 +02:00
Sander Roosendaal
bf9457dfb6 Merge tag 'v2.05' into develop
better zip email processing
2017-04-14 16:42:26 +02:00
Sander Roosendaal
56bf308c55 Merge branch 'release/v2.05' 2017-04-14 16:41:25 +02:00