Private
Public Access
1
0
Commit Graph

922 Commits

Author SHA1 Message Date
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
Sander Roosendaal
6e5f63a4ce fix zero dt 2017-04-11 12:30:57 +02:00
Sander Roosendaal
9e89e06984 landing page image 2017-04-10 22:02:54 +02:00
Sander Roosendaal
a4a07ed79b Merge tag 'v1.94' into develop
bug fix recalc summary
2017-04-10 08:19:50 +02:00
Sander Roosendaal
39f3ccec65 Merge branch 'hotfix/v1.94' 2017-04-10 08:19:17 +02:00
Sander Roosendaal
ca74109421 bug fix in bug fix 2017-04-10 08:18:35 +02:00
Sander Roosendaal
1f40893b00 metrics definitions in separate file 2017-04-09 11:04:20 +02:00
Sander Roosendaal
276c1637a1 site-announcements and price increase 2017-04-07 10:56:43 +02:00
Sander Roosendaal
5cbd28a26d Merge tag 'v1.93' into develop
some bug fixes for anonymous users
2017-04-07 08:37:33 +02:00
Sander Roosendaal
16391338eb Merge branch 'hotfix/v1.93' 2017-04-07 08:25:21 +02:00
Sander Roosendaal
8658176cc9 some error catching around has-teams and api permissions 2017-04-07 08:24:10 +02:00
Sander Roosendaal
b90b5960bd Merge branch 'feature/redesign2' into develop 2017-04-06 23:14:54 +02:00
Sander Roosendaal
06aa14d38f redesign 2 part 2 front page 2017-04-06 23:05:20 +02:00
Sander Roosendaal
f7795eaf1d redesign part I base.html 2017-04-06 23:00:01 +02:00
Sander Roosendaal
d5353caab7 Merge branch 'develop' into feature/redesign2 2017-04-06 22:36:28 +02:00
Sander Roosendaal
6e1268fd31 Merge tag 'v1.92' into develop
removed reverse teams
2017-04-06 22:32:38 +02:00
Sander Roosendaal
70fdd5452e Merge branch 'hotfix/v1.92' 2017-04-06 22:29:18 +02:00
Sander Roosendaal
3b95572689 removed teams from reverse calls 2017-04-06 22:28:13 +02:00
Sander Roosendaal
ee12f8caaa dataprep 2017-04-06 22:23:56 +02:00
Sander Roosendaal
ffd198dd23 Merge tag 'v1.91' into develop
bugfix for team managers
2017-04-06 22:05:50 +02:00
Sander Roosendaal
83b2e65974 Merge branch 'hotfix/v1.91' 2017-04-06 22:05:13 +02:00
Sander Roosendaal
811f1a65ab added teams button if you are not team member 2017-04-06 22:01:35 +02:00
Sander Roosendaal
979cf48618 new logo 2017-04-06 15:37:57 +02:00
Sander Roosendaal
8306d5d2d9 Merge tag 'v1.90' into develop
allow duration > 1 hr in ranking pieces
2017-04-06 08:40:40 +02:00
Sander Roosendaal
6c0fa1efc2 Merge branch 'hotfix/v1.90' 2017-04-06 08:40:16 +02:00
Sander Roosendaal
f42468b2a4 ranking duration > 1hr bug fixed 2017-04-06 08:35:29 +02:00
Sander Roosendaal
33cd6b6713 Merge tag 'v1.89' into develop
hotfix recalc stats
2017-04-05 11:39:39 +02:00
Sander Roosendaal
f42425f07c Merge branch 'hotfix/v1.89' 2017-04-05 11:39:09 +02:00
Sander Roosendaal
3951b3f764 bug fix recalc stats for nonexisting row 2017-04-05 11:37:44 +02:00
Sander Roosendaal
7190567b2f Merge branch 'feature/newlogo' into develop 2017-04-05 10:52:37 +02:00
Sander Roosendaal
6366c89911 updated layout 2017-04-05 10:51:54 +02:00
Sander Roosendaal
f76e3efa32 first attempt at landing page 2017-04-04 23:14:22 +02:00
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