Private
Public Access
1
0
Commit Graph

886 Commits

Author SHA1 Message Date
Sander Roosendaal
acc4fc3c31 removed all gradients from buttons 2017-04-04 21:06:16 +02:00
Sander Roosendaal
dc499dbda4 sharp cornered buttons 2017-04-04 20:37:19 +02:00
Sander Roosendaal
943346b23b new logo testing 2017-04-04 20:17:55 +02:00
Sander Roosendaal
421ca7a877 Merge tag 'v1.88' into develop
error catching in dataprep
2017-04-03 20:12:13 +02:00
Sander Roosendaal
468d9bcb11 Merge branch 'hotfix/v1.88' 2017-04-03 20:09:54 +02:00
Sander Roosendaal
07a3ba6c1c error catching around non painsled parsers 2017-04-03 20:02:49 +02:00
Sander Roosendaal
826e5db8e7 Merge tag 'v1.87' into develop
fixed distance import for strava
2017-04-01 15:51:17 +02:00
Sander Roosendaal
6da296365d Merge branch 'hotfix/v1.87' 2017-04-01 15:50:05 +02:00
Sander Roosendaal
3e79336fc8 Strava import - imported time instead of distance 2017-04-01 15:49:14 +02:00
Sander Roosendaal
330d78ba2b Merge tag 'v1.86' into develop
bugfix email processing painsled
2017-03-30 22:13:46 +02:00
Sander Roosendaal
9fec0ebd03 Merge branch 'hotfix/v1.86' 2017-03-30 22:12:52 +02:00
Sander Roosendaal
c5f7973dbf bugfix email for painsled files 2017-03-30 22:11:42 +02:00
Sander Roosendaal
a4a8213b86 Merge tag 'v1.85' into develop
bug fix and updated partners blurb
2017-03-30 15:01:06 +02:00
Sander Roosendaal
bc2fb8712d Merge branch 'hotfix/v1.85' 2017-03-30 13:46:34 +02:00
Sander Roosendaal
3131a9fdab improved partners text and bugfix on cumstats page 2017-03-30 13:41:31 +02:00
Sander Roosendaal
cc79ed1005 Merge tag 'v1.84' into develop
partner info page and bug fix on c2 sync
2017-03-29 12:54:02 +02:00
Sander Roosendaal
9a5c2f1834 Merge branch 'release/v1.84' 2017-03-29 12:53:34 +02:00
Sander Roosendaal
200ea43ae1 Merge branch 'feature/partnerpage' into develop 2017-03-29 11:22:58 +02:00
Sander Roosendaal
c692f4f7b5 initial text of partnership page 2017-03-29 11:20:03 +02:00
Sander Roosendaal
c621af57f7 Merge branch 'develop' into feature/partnerpage 2017-03-28 15:55:26 +02:00
Sander Roosendaal
b3301402f7 Merge tag 'v1.83' into develop
bugfix emailprocessing zip
2017-03-28 14:53:40 +02:00
Sander Roosendaal
5cec9cf4a8 Merge branch 'hotfix/v1.83' 2017-03-28 14:53:18 +02:00
Sander Roosendaal
61df4685ce improved mail processing (zip) 2017-03-28 14:52:20 +02:00
Sander Roosendaal
82f31c2c43 Merge tag 'v1.82' into develop
bug fix google analytics
2017-03-28 14:04:12 +02:00
Sander Roosendaal
4d9131c68b Merge branch 'hotfix/v1.82' 2017-03-28 14:03:19 +02:00
Sander Roosendaal
c0a3e7b994 link to google analytics js 2017-03-28 14:02:31 +02:00
Sander Roosendaal
3923f69933 nothing 2017-03-28 14:01:37 +02:00
Sander Roosendaal
0b51a7d519 first version of partnerparge 2017-03-28 13:12:50 +02:00
Sander Roosendaal
9b2a2deec3 Merge tag 'v1.81' into develop
fixed zip file processing
2017-03-28 10:05:07 +02:00
Sander Roosendaal
cdad417a20 Merge branch 'hotfix/v1.81' 2017-03-28 10:04:52 +02:00
Sander Roosendaal
294d18662b fixed zip file 2017-03-28 10:04:04 +02:00
Sander Roosendaal
36f13cb0a4 Merge tag 'v1.8' into develop
v1.8 - Google Analytics
2017-03-28 08:02:17 +02:00
Sander Roosendaal
b00f924c24 Merge branch 'release/v1.8' 2017-03-28 08:01:50 +02:00
Sander Roosendaal
a13bed1205 added Google Analytics 2017-03-28 07:53:46 +02:00
Sander Roosendaal
d8c5454ac4 Merge tag 'v1.71' into develop
hotfix RK token export page
2017-03-24 19:30:07 +01:00
Sander Roosendaal
f3f92af1cf Merge branch 'hotfix/v1.71' 2017-03-24 19:29:42 +01:00
Sander Roosendaal
60a26f2d6f hotfix export page (RK token) 2017-03-24 19:29:00 +01:00
Sander Roosendaal
bf2eb72fe4 Merge tag 'v1.7' into develop
RunKeeper Support
2017-03-24 11:36:38 +01:00
Sander Roosendaal
a03d168b28 Merge branch 'release/v1.7' 2017-03-24 11:08:12 +01:00
Sander Roosendaal
89f33ea804 completed functionality and tested 2017-03-24 10:49:54 +01:00
Sander Roosendaal
44afa5ef47 Merge branch 'feature/runkeeper' into develop 2017-03-23 21:41:34 +01:00
Sander Roosendaal
9573f60d3a added RunKeeper to export page 2017-03-23 21:11:54 +01:00
Sander Roosendaal
08c0838d85 runkeeper functionality complete (not fully tested) 2017-03-23 20:07:10 +01:00
Sander Roosendaal
d89219a2df working on workout import (auth and workout list done) 2017-03-22 15:55:13 +01:00
Sander Roosendaal
01fe1e8807 added receiver on Rower change (removes teams) 2017-03-22 12:23:26 +01:00
Sander Roosendaal
bb23251c79 Merge tag 'v1.63' into develop
fixed bug in ote-bests (blank form)
2017-03-21 19:02:48 +01:00
Sander Roosendaal
cb3a25ae5a Merge branch 'hotfix/v1.63' 2017-03-21 19:02:02 +01:00
Sander Roosendaal
fd91d34af9 fix zero or blank value in date form ote-bests view 2017-03-21 19:01:03 +01:00
Sander Roosendaal
a84c223033 remove password from registration email 2017-03-19 21:04:42 +01:00
Sander Roosendaal
c25814a376 Merge tag 'v1.62' into develop
bugfix comment
2017-03-12 23:34:41 +01:00