Private
Public Access
1
0
Commit Graph

967 Commits

Author SHA1 Message Date
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
Sander Roosendaal
ccd4603c05 improved zip processing 2017-04-13 14:34:03 +02:00
Sander Roosendaal
3ec060e30e Merge tag 'v2.02' into develop
improved team functionality
2017-04-13 13:24:11 +02:00
Sander Roosendaal
734d9477a3 Merge branch 'release/v2.02' 2017-04-13 13:23:42 +02:00
Sander Roosendaal
e5bc04ab3e playing with cookielaw banner 2017-04-13 13:16:18 +02:00
Sander Roosendaal
fe46211dc7 Merge branch 'feature/betterteams' into develop 2017-04-13 11:56:48 +02:00
Sander Roosendaal
e407797a28 export by manager to correct Strava/ST/RK 2017-04-13 11:54:03 +02:00
Sander Roosendaal
d16aef396b changed url for failed upload - tests 2017-04-13 11:43:20 +02:00
Sander Roosendaal
35f1fb5b59 team manager can upload on behalf of team member 2017-04-13 11:39:51 +02:00
Sander Roosendaal
a03c25cc98 add indication of club size to manager 2017-04-12 17:39:18 +02:00
Sander Roosendaal
065f4e6828 experimenting with landing pages 2017-04-12 08:02:13 +02:00
Sander Roosendaal
29a0f37e03 improved Facebook link 2017-04-11 19:25:35 +02:00
Sander Roosendaal
ab5fa8fb1d Merge branch 'feature/multiplebg' into develop 2017-04-11 19:22:57 +02:00
Sander Roosendaal
d4516af433 only landing1.jpg background image 2017-04-11 19:21:29 +02:00
Sander Roosendaal
f6ceb46f6a alternating background images 2017-04-11 19:18:31 +02:00
Sander Roosendaal
153e2b3d25 Merge tag 'v2.01' into develop
added link to facebook group
2017-04-11 18:16:18 +02:00
Sander Roosendaal
61ab6b3c65 Merge branch 'release/v2.01' 2017-04-11 18:16:01 +02:00
Sander Roosendaal
a28cc91e5b added facebook to communication channels 2017-04-11 18:08:21 +02:00
Sander Roosendaal
da7f5cc651 Merge tag 'v2.0' into develop
new looks
2017-04-11 15:06:04 +02:00
Sander Roosendaal
2f4b6a343e Merge branch 'release/v2.0' 2017-04-11 15:05:07 +02:00
Sander Roosendaal
637d5c330b top of front page lighter transparent 2017-04-11 14:55:27 +02:00
Sander Roosendaal
aa0b3dde68 updated favicons 2017-04-11 14:00:43 +02:00
Sander Roosendaal
7e49abb365 Merge tag 'v1.95' into develop
zero dt catch in dataprep
2017-04-11 12:32:14 +02:00
Sander Roosendaal
7ae3d1a615 Merge branch 'hotfix/v1.95' 2017-04-11 12:31:53 +02:00