Sander Roosendaal
|
952e7384bb
|
Merge branch 'hotfix/v9.65' into develop
|
2019-04-03 21:08:54 +02:00 |
|
Sander Roosendaal
|
815ef34491
|
bug fix tombstones
|
2019-04-03 21:08:25 +02:00 |
|
Sander Roosendaal
|
c8f7d5541c
|
fix #455
|
2019-04-03 18:21:51 +02:00 |
|
Sander Roosendaal
|
5181f6c6ab
|
fix #454
|
2019-04-03 16:27:51 +02:00 |
|
Sander Roosendaal
|
b8008a7c12
|
Merge branch 'release/v9.64'
|
2019-04-02 22:34:23 +02:00 |
|
Sander Roosendaal
|
0a4d775a9e
|
bug fix
|
2019-04-02 22:34:06 +02:00 |
|
Sander Roosendaal
|
75df39aaf2
|
Merge branch 'release/v9.63' into develop
|
2019-04-02 22:18:06 +02:00 |
|
Sander Roosendaal
|
6586581609
|
Merge branch 'release/v9.63'
|
2019-04-02 22:17:53 +02:00 |
|
Sander Roosendaal
|
114663c542
|
tested
|
2019-04-02 22:17:44 +02:00 |
|
Sander Roosendaal
|
8b02c86890
|
Merge branch 'feature/curve' into develop
|
2019-04-02 22:08:42 +02:00 |
|
Sander Roosendaal
|
c433d493c6
|
parsing error check
|
2019-04-02 22:08:30 +02:00 |
|
Sander Roosendaal
|
50b7af86e1
|
working sliders on line collection (force curve)
|
2019-04-02 21:31:58 +02:00 |
|
Sander Roosendaal
|
03c1923828
|
Merge branch 'feature/forcecurve' into develop
|
2019-04-02 19:07:23 +02:00 |
|
Sander Roosendaal
|
ea649d2a49
|
line collection - averages do strange on sliders
|
2019-04-02 19:05:39 +02:00 |
|
Sander Roosendaal
|
d251b1ddd4
|
force curve with lines
|
2019-04-02 19:00:00 +02:00 |
|
Sander Roosendaal
|
e735d98dcf
|
working force plot
|
2019-04-02 17:31:45 +02:00 |
|
Sander Roosendaal
|
d0ffaa8d49
|
Merge branch 'develop' into feature/forcecurve
|
2019-04-02 13:48:36 +02:00 |
|
Sander Roosendaal
|
2f69b34bc1
|
force curve improvements
|
2019-04-02 13:41:56 +02:00 |
|
Sander Roosendaal
|
47d4121854
|
plotting some help lines and data points force curve
|
2019-04-02 09:29:45 +02:00 |
|
Sander Roosendaal
|
8462e086dd
|
force curve chart with 5-95 and 25-75 percentile areas
|
2019-04-01 13:51:01 +02:00 |
|
Sander Roosendaal
|
e3564fd309
|
adding left and right carets
|
2019-03-31 21:10:30 +02:00 |
|
Sander Roosendaal
|
3a530fc897
|
alphabetical x selectors for flex chart
|
2019-03-31 21:06:15 +02:00 |
|
Sander Roosendaal
|
f0a4cf5639
|
style changes force curve
|
2019-03-31 20:33:31 +02:00 |
|
Sander Roosendaal
|
60da5c2331
|
annotations & slider annotations at empower force chart
|
2019-03-31 20:25:39 +02:00 |
|
Sander Roosendaal
|
64cb556730
|
adding slider annotation to box chart
|
2019-03-31 17:07:44 +02:00 |
|
Sander Roosendaal
|
b97990b905
|
adding slider annotation to trend flex
|
2019-03-31 17:02:14 +02:00 |
|
Sander Roosendaal
|
b654a1f1a9
|
cum flex chart slider annotations
|
2019-03-31 16:32:44 +02:00 |
|
Sander Roosendaal
|
af5ffe7b0d
|
adding tombstones
|
2019-03-29 13:57:49 +01:00 |
|
Sander Roosendaal
|
bda7ff1d2d
|
Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop
|
2019-03-29 12:31:47 +01:00 |
|
Sander Roosendaal
|
bc40ce42a4
|
Merge branch 'release/v9.62'
|
2019-03-28 21:13:17 +01:00 |
|
Sander Roosendaal
|
6ca4039a5b
|
fix #466
|
2019-03-28 21:10:14 +01:00 |
|
Sander Roosendaal
|
73fcd8da07
|
Merge branch 'feature/flexchartimprovements' into develop
|
2019-03-27 21:12:24 +01:00 |
|
Sander Roosendaal
|
83f92a4951
|
tested
|
2019-03-27 21:12:12 +01:00 |
|
Sander Roosendaal
|
47c3b91137
|
some flex chart improvements
|
2019-03-27 21:05:41 +01:00 |
|
Sander Roosendaal
|
c8e74b72ea
|
Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop
|
2019-03-27 08:09:45 +01:00 |
|
Sander Roosendaal
|
c34e77f5d5
|
checking in test file
|
2019-03-27 08:09:10 +01:00 |
|
Sander Roosendaal
|
f8303427a2
|
Merge branch 'release/v9.61'
|
2019-03-26 21:45:50 +01:00 |
|
Sander Roosendaal
|
4a68b55052
|
tested
|
2019-03-26 21:43:42 +01:00 |
|
Sander Roosendaal
|
e79206c7c1
|
fxix #464
|
2019-03-26 21:08:40 +01:00 |
|
Sander Roosendaal
|
20af0e1aa2
|
Merge branch 'develop' of bitbucket.org:sanderroosendaal/rowsandall into develop
|
2019-03-26 20:34:26 +01:00 |
|
Sander Roosendaal
|
3bc962071d
|
improving css for flex charts on mobile
|
2019-03-26 16:44:50 +01:00 |
|
Sander Roosendaal
|
0838f0de66
|
fix #461
|
2019-03-26 11:55:11 +01:00 |
|
Sander Roosendaal
|
70cd7bb060
|
Merge branch 'feature/attachments' into develop
|
2019-03-26 11:48:31 +01:00 |
|
Sander Roosendaal
|
4582128128
|
re tested
|
2019-03-26 11:46:36 +01:00 |
|
Sander Roosendaal
|
c9b2ad15a5
|
adding ignoring ATT files
|
2019-03-26 11:20:45 +01:00 |
|
Sander Roosendaal
|
61e9af1208
|
change submit to select workouts
|
2019-03-25 20:58:51 +01:00 |
|
Sander Roosendaal
|
b0901f8ac9
|
Merge branch 'feature/searchfix' into develop
|
2019-03-25 20:49:55 +01:00 |
|
Sander Roosendaal
|
84cdf0433b
|
fixes #448
|
2019-03-25 20:49:43 +01:00 |
|
Sander Roosendaal
|
2e77366b94
|
fixes #447
|
2019-03-25 20:44:13 +01:00 |
|
Sander Roosendaal
|
61982d24ce
|
added django2 virtualenv to gitignore
|
2019-03-25 20:19:25 +01:00 |
|