Sander Roosendaal
|
f17caf37b9
|
Merge tag 'v2.8' into develop
Box Chart with workout picker
|
2017-05-14 15:00:45 +02:00 |
|
Sander Roosendaal
|
1719731110
|
Merge branch 'release/v2.8'
|
2017-05-14 15:00:19 +02:00 |
|
Sander Roosendaal
|
271f6a4f1a
|
C2 message
|
2017-05-14 14:56:25 +02:00 |
|
Sander Roosendaal
|
00afa9b9ea
|
Merge branch 'feature/boxplotpicker' into develop
|
2017-05-14 14:47:48 +02:00 |
|
Sander Roosendaal
|
d1fe31a0c8
|
MVP version of box charts
|
2017-05-14 14:46:59 +02:00 |
|
Sander Roosendaal
|
6208110a0a
|
boxplot sort of working
|
2017-05-14 14:19:23 +02:00 |
|
Sander Roosendaal
|
218fecdb73
|
sporttracksstuff
|
2017-05-14 12:13:00 +02:00 |
|
Sander Roosendaal
|
341112b6d5
|
pop workoutid in stats
|
2017-05-13 18:06:39 +02:00 |
|
Sander Roosendaal
|
67023c03dd
|
Merge tag 'v2.76' into develop
lbston confusion
|
2017-05-13 18:04:46 +02:00 |
|
Sander Roosendaal
|
a298caec6a
|
Merge branch 'hotfix/v2.76'
|
2017-05-13 17:49:11 +02:00 |
|
Sander Roosendaal
|
3cfc7597d9
|
lbston confusion
|
2017-05-13 17:47:54 +02:00 |
|
Sander Roosendaal
|
e09b4d2f2b
|
Merge tag 'v2.75' into develop
lbstoN corrections
|
2017-05-12 21:10:45 +02:00 |
|
Sander Roosendaal
|
dcb2bcc3ae
|
Merge branch 'hotfix/v2.75'
|
2017-05-12 21:10:21 +02:00 |
|
Sander Roosendaal
|
2340b17500
|
further correction
|
2017-05-12 21:09:17 +02:00 |
|
Sander Roosendaal
|
c23542154c
|
double lbstoN correction
|
2017-05-12 21:07:25 +02:00 |
|
Sander Roosendaal
|
1c849e8357
|
Merge tag 'v2.74' into develop
stats, box chart, bug fixes
|
2017-05-12 19:30:07 +02:00 |
|
Sander Roosendaal
|
c8a57f79ef
|
Merge branch 'release/v2.74'
|
2017-05-12 19:29:22 +02:00 |
|
Sander Roosendaal
|
79149ca7a3
|
stats DF empty behavior
|
2017-05-12 19:22:46 +02:00 |
|
Sander Roosendaal
|
d58c653d0f
|
Merge branch 'feature/boxchart' into develop
|
2017-05-12 19:12:03 +02:00 |
|
Sander Roosendaal
|
3c0157475f
|
minimum viable version of improved stats
|
2017-05-12 19:10:13 +02:00 |
|
Sander Roosendaal
|
50faf1ff1f
|
first version of box chart (wash only)
|
2017-05-12 15:48:47 +02:00 |
|
Sander Roosendaal
|
29f84d6e25
|
added HR drift, normalized power, training score
|
2017-05-12 14:19:50 +02:00 |
|
Sander Roosendaal
|
e1893ab4ff
|
different row summary in dataprep
|
2017-05-12 11:03:38 +02:00 |
|
Sander Roosendaal
|
0830c7bc6c
|
make PDF scrollable on ipad
|
2017-05-12 08:50:20 +02:00 |
|
Sander Roosendaal
|
13848546ff
|
Merge tag 'v2.73' into develop
hotfix sporttracks callback
|
2017-05-11 21:09:19 +02:00 |
|
Sander Roosendaal
|
7cb79381f0
|
Merge branch 'hotfix/v2.73'
|
2017-05-11 20:50:52 +02:00 |
|
Sander Roosendaal
|
f03892f1c7
|
sporttracks callback
|
2017-05-11 20:49:57 +02:00 |
|
Sander Roosendaal
|
697b10291d
|
Merge tag 'v2.72' into develop
hotfix import pages
|
2017-05-11 16:11:45 +02:00 |
|
Sander Roosendaal
|
0ae926536f
|
Merge branch 'hotfix/v2.72'
|
2017-05-11 16:11:20 +02:00 |
|
Sander Roosendaal
|
cc1df7a403
|
third party import ids
|
2017-05-11 16:06:46 +02:00 |
|
Sander Roosendaal
|
01bda31818
|
Merge tag 'v2.71' into develop
notifications on workout comments
|
2017-05-11 15:34:42 +02:00 |
|
Sander Roosendaal
|
95f77202de
|
Merge branch 'release/v2.71'
|
2017-05-11 15:34:27 +02:00 |
|
Sander Roosendaal
|
1e7a833da1
|
notifications for comments
|
2017-05-11 15:24:55 +02:00 |
|
Sander Roosendaal
|
c6de8d9068
|
Merge tag 'v2.7' into develop
messaging improved
|
2017-05-11 13:29:45 +02:00 |
|
Sander Roosendaal
|
e610798a12
|
Merge branch 'release/v2.7'
|
2017-05-11 13:29:20 +02:00 |
|
Sander Roosendaal
|
5ad43026c7
|
removed exp code
|
2017-05-11 13:21:45 +02:00 |
|
Sander Roosendaal
|
892eee32ff
|
Merge branch 'feature/messaging' into develop
|
2017-05-11 12:08:09 +02:00 |
|
Sander Roosendaal
|
85fd6759ea
|
finalizing
|
2017-05-11 12:06:44 +02:00 |
|
Sander Roosendaal
|
4a10584733
|
some fixes after testing
|
2017-05-11 11:58:44 +02:00 |
|
Sander Roosendaal
|
514e54e814
|
bug fixes after testing
|
2017-05-11 11:03:17 +02:00 |
|
Sander Roosendaal
|
bbe9ae4770
|
completely mmigrated to django messages
|
2017-05-11 10:27:38 +02:00 |
|
Sander Roosendaal
|
80ebb91255
|
messages for upload
|
2017-05-11 09:21:07 +02:00 |
|
Sander Roosendaal
|
33e185912e
|
some error checking in interactive plot
|
2017-05-11 08:47:42 +02:00 |
|
Sander Roosendaal
|
ab138f29ef
|
Merge tag 'v2.68' into develop
works on develop
|
2017-05-10 22:36:15 +02:00 |
|
Sander Roosendaal
|
edd1186dfc
|
Merge branch 'release/v2.68'
|
2017-05-10 22:36:03 +02:00 |
|
Sander Roosendaal
|
d3315c2ed9
|
works on develop
|
2017-05-10 22:34:03 +02:00 |
|
Sander Roosendaal
|
7ac85c37b1
|
Merge tag 'v2.67' into develop
with RQ
|
2017-05-10 21:27:05 +02:00 |
|
Sander Roosendaal
|
59ec866877
|
Merge branch 'release/v2.67'
|
2017-05-10 21:26:54 +02:00 |
|
Sander Roosendaal
|
51dd0ef926
|
with RQ
|
2017-05-10 21:25:23 +02:00 |
|
Sander Roosendaal
|
926eb06ee5
|
Merge tag 'v2.66' into develop
without RQ
|
2017-05-10 21:22:45 +02:00 |
|