Private
Public Access
1
0
Commit Graph

4355 Commits

Author SHA1 Message Date
Sander Roosendaal
becd773273 Merge branch 'release/v9.56' 2019-03-17 11:04:57 +01:00
Sander Roosendaal
e9487c111e tested 2019-03-17 11:04:47 +01:00
Sander Roosendaal
5726833c7d Merge branch 'feature/fixbokeh' into develop 2019-03-17 11:01:31 +01:00
Sander Roosendaal
7a56b49278 tested 2019-03-17 11:01:22 +01:00
Sander Roosendaal
290b624a8b fixed cum_flex sliders and fixed #439 2019-03-17 10:58:14 +01:00
Sander Roosendaal
ae1e12a511 fixed flex chart 2019-03-17 10:45:48 +01:00
Sander Roosendaal
7bc99b4084 fix #440 2019-03-17 09:44:22 +01:00
Sander Roosendaal
865a047a0b Merge branch 'release/v9.55' into develop 2019-03-15 19:20:13 +01:00
Sander Roosendaal
235dd251bc Merge branch 'release/v9.55' 2019-03-15 19:20:00 +01:00
Sander Roosendaal
7dd156c8e3 fixed url 2019-03-15 19:19:38 +01:00
Sander Roosendaal
f7a4a6b976 paid plan info for basic empower users 2019-03-15 18:23:02 +01:00
Sander Roosendaal
a5064d6422 Merge branch 'feature/dragedit' into develop 2019-03-15 11:14:58 +01:00
Sander Roosendaal
4fe6470fce passing tests 2019-03-15 11:13:57 +01:00
Sander Roosendaal
f0caba6d4f bug fix in test 2019-03-15 10:56:15 +01:00
Sander Roosendaal
85a023ce5c fix #433 2019-03-15 10:33:47 +01:00
Sander Roosendaal
3fae33f366 adding drag factor 2019-03-15 10:27:35 +01:00
Sander Roosendaal
7fb5eb555a Merge branch 'feature/goals' into develop 2019-03-15 08:52:11 +01:00
Sander Roosendaal
dfea13b8f9 bugs fixed (passing tests) 2019-03-15 08:50:55 +01:00
Sander Roosendaal
e5a38c8802 fitness chart popup yyyy-mm-dd 2019-03-15 08:23:06 +01:00
Sander Roosendaal
528da3bce8 tools above 2019-03-15 08:22:18 +01:00
Sander Roosendaal
8d46cd1e93 Merge branch 'develop' into feature/goals 2019-03-15 08:00:27 +01:00
Sander Roosendaal
c97b7dabed Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop 2019-03-15 07:58:25 +01:00
Sander Roosendaal
6a00853554 fiddling with style & layout 2019-03-15 07:57:00 +01:00
Sander Roosendaal
72227fd6f2 Merge branch 'release/v9.54' 2019-03-14 21:41:31 +01:00
Sander Roosendaal
2b148b442b correcting stars 2019-03-14 21:41:07 +01:00
Sander Roosendaal
b617cadad9 Merge branch 'release/v9.53' into develop 2019-03-14 21:31:38 +01:00
Sander Roosendaal
5d6dee7fcd Merge branch 'release/v9.53' 2019-03-14 21:31:28 +01:00
Sander Roosendaal
343ae24918 tested 2019-03-14 21:31:19 +01:00
Sander Roosendaal
8958d4430f issue #437 fixed 2019-03-14 21:28:23 +01:00
Sander Roosendaal
3041e59e1d tasks - added csvfile= argument to rowingdata 2019-03-14 15:23:59 +01:00
Sander Roosendaal
81f9320787 Merge tag 'v9.52' into develop
bug fix c2 export
2019-03-14 10:43:02 +01:00
Sander Roosendaal
d31f62c978 Merge branch 'release/v9.52' 2019-03-14 10:42:44 +01:00
Sander Roosendaal
c2426014d2 losing #436 2019-03-14 10:41:01 +01:00
Sander Roosendaal
4c25d378c1 Merge branch 'bugfix/c2' into develop 2019-03-14 09:30:49 +01:00
Sander Roosendaal
acf9faff38 fixed 2019-03-14 09:29:26 +01:00
Sander Roosendaal
fb5e0d38a8 fixed c2 export 2019-03-14 08:24:47 +01:00
Sander Roosendaal
daf9692d39 tested 2019-03-13 21:44:33 +01:00
Sander Roosendaal
7e747ed616 Merge tag 'v9.51' into develop
bug fix
2019-03-13 17:54:47 +01:00
Sander Roosendaal
874c05f543 Merge branch 'hotfix/v9.51' 2019-03-13 17:54:08 +01:00
Sander Roosendaal
fd0b9361b0 small bug fix 2019-03-13 17:52:32 +01:00
Sander Roosendaal
c8742bb543 small bug fix 2019-03-13 16:52:24 +01:00
Sander Roosendaal
c304268dbe Merge branch 'release/v9.50' 2019-03-12 18:27:53 +01:00
Sander Roosendaal
8416c46763 tested 2019-03-12 18:26:54 +01:00
Sander Roosendaal
caa8aca92a fixes #435 2019-03-12 17:05:13 +01:00
Sander Roosendaal
bec981cb94 breadcrumb with non opaque reference 2019-03-12 08:46:57 +01:00
Sander Roosendaal
10391cb632 handle_makeplot in high queue 2019-03-11 20:35:25 +01:00
Sander Roosendaal
9e06059126 improved activity chart 2019-03-11 20:18:13 +01:00
Sander Roosendaal
96277463a7 Merge tag 'v9.49' into develop
changing coverage rc
2019-03-11 16:00:23 +01:00
Sander Roosendaal
ed90dd9d30 Merge branch 'hotfix/v9.49' 2019-03-11 15:59:27 +01:00
Sander Roosendaal
e1c4fede6a no real changes 2019-03-11 15:58:28 +01:00