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 |
|
Sander Roosendaal
|
3d3f41b163
|
Merge branch 'feature/zipworker' into develop
|
2017-04-14 16:29:14 +02:00 |
|
Sander Roosendaal
|
ef398dcaee
|
email zip processing improved
|
2017-04-14 15:12:35 +02:00 |
|
Sander Roosendaal
|
5bc69b3a49
|
works but runs into email rate limiting
|
2017-04-14 08:57:46 +02:00 |
|
Sander Roosendaal
|
34b5d420ee
|
Merge tag 'v2.04' into develop
dataprep fixes for f=0
|
2017-04-14 07:48:59 +02:00 |
|
Sander Roosendaal
|
a1b3f5c833
|
Merge branch 'hotfix/v2.04'
|
2017-04-14 07:48:40 +02:00 |
|
Sander Roosendaal
|
22988cdbc0
|
improved data processing in zip archive
|
2017-04-14 07:42:35 +02:00 |
|
Sander Roosendaal
|
9033cddbea
|
get_userid successful. Couldn't get workouts list to work
|
2017-04-13 21:36:46 +02:00 |
|
Sander Roosendaal
|
9c5ed87241
|
token exchange works
|
2017-04-13 17:40:39 +02:00 |
|
Sander Roosendaal
|
d1ac11bfa0
|
added second landing page image
|
2017-04-13 15:06:02 +02:00 |
|
Sander Roosendaal
|
43697e719b
|
Merge branch 'feature/bg2' into develop
|
2017-04-13 15:05:08 +02:00 |
|
Sander Roosendaal
|
2c1e7d878a
|
second background image
|
2017-04-13 15:04:21 +02:00 |
|
Sander Roosendaal
|
da0d9f3d0b
|
Merge branch 'develop' into feature/bg2
|
2017-04-13 15:02:28 +02:00 |
|
Sander Roosendaal
|
6531eb37f8
|
Merge tag 'v2.03' into develop
bug fix and improved zip file processing
|
2017-04-13 14:48:43 +02:00 |
|
Sander Roosendaal
|
7b58d43278
|
Merge branch 'release/v2.03'
|
2017-04-13 14:48:11 +02:00 |
|