Private
Public Access
1
0
Commit Graph

5626 Commits

Author SHA1 Message Date
Sander Roosendaal
f4fdac21b6 Merge branch 'release/v12.38' 2020-05-10 19:55:58 +02:00
Sander Roosendaal
c34058aae8 datetime corrections 2020-05-10 19:55:44 +02:00
Sander Roosendaal
5e9a707e45 Merge branch 'release/v12.37' 2020-05-10 18:54:51 +02:00
Sander Roosendaal
0dfa016d31 date in iso 2020-05-10 18:54:33 +02:00
Sander Roosendaal
7afcd7b7ad Merge branch 'release/v12.36' 2020-05-10 17:57:01 +02:00
Sander Roosendaal
ed1fa6fc59 Merge branch 'feature/activitychart' into develop 2020-05-10 17:56:48 +02:00
Sander Roosendaal
24735d4cc0 better dates 2020-05-10 17:56:35 +02:00
Sander Roosendaal
988da6ded8 adding bar chart 2020-05-10 14:17:54 +02:00
Sander Roosendaal
6d648c7c18 activity chart without save 2020-05-10 13:40:32 +02:00
Sander Roosendaal
45ffeb76ee adding past 12 months 2020-05-10 13:35:27 +02:00
Sander Roosendaal
10e996f8f5 Merge branch 'release/v12.35' 2020-05-10 11:59:36 +02:00
Sander Roosendaal
e60c6373f8 bug fix 2020-05-10 11:59:16 +02:00
Sander Roosendaal
b9f830f5a9 Merge branch 'release/v12.34' 2020-05-10 11:54:34 +02:00
Sander Roosendaal
5a309d1ba3 bug fix 2020-05-10 11:54:18 +02:00
Sander Roosendaal
96adc01f80 Merge branch 'release/v12.33' 2020-05-10 11:26:25 +02:00
Sander Roosendaal
d01c42af2e total time instead of perc 2020-05-10 11:25:52 +02:00
Sander Roosendaal
98b45d910e beautified pies 2020-05-10 11:00:32 +02:00
Sander Roosendaal
8b115d5615 Merge branch 'release/v12.32' 2020-05-09 16:43:33 +02:00
Sander Roosendaal
69f50afd3a fix bug 2020-05-09 16:43:18 +02:00
Sander Roosendaal
74903dc978 Merge branch 'release/v12.31' 2020-05-09 16:01:01 +02:00
Sander Roosendaal
fba28baf74 fix 2020-05-09 16:00:37 +02:00
Sander Roosendaal
d4654eabcc Merge branch 'feature/workouttype' into develop 2020-05-09 15:51:03 +02:00
Sander Roosendaal
24750be04e different pie chart for types 2020-05-09 15:50:52 +02:00
Sander Roosendaal
95739145a9 first version workouttype chart 2020-05-09 15:12:32 +02:00
Sander Roosendaal
2da68a7c7f Merge branch 'release/v12.30' 2020-05-08 16:52:37 +02:00
Sander Roosendaal
f3a62408e3 fixing date issues 2020-05-08 16:41:08 +02:00
Sander Roosendaal
461f914cfd Merge branch 'release/v12.29' 2020-05-06 22:22:22 +02:00
Sander Roosendaal
9e672ef44d bug fix 2020-05-06 22:21:58 +02:00
Sander Roosendaal
f4c2297547 Merge branch 'release/v12.28' 2020-05-06 22:17:57 +02:00
Sander Roosendaal
86eea03db2 bug fix 2020-05-06 22:17:31 +02:00
Sander Roosendaal
754b1fcaaa Merge branch 'release/v12.27' 2020-05-06 22:14:15 +02:00
Sander Roosendaal
3f6acc3a85 Merge branch 'feature/historyget' into develop 2020-05-06 22:13:39 +02:00
Sander Roosendaal
6c1d176c40 all dicts through ajax 2020-05-06 22:13:30 +02:00
Sander Roosendaal
4711a9f860 totaldisct in ajax call 2020-05-06 21:56:19 +02:00
Sander Roosendaal
cf47afe538 ajax call for history chart 2020-05-06 21:41:10 +02:00
Sander Roosendaal
3e8753e557 history data 2020-05-06 21:15:18 +02:00
Sander Roosendaal
e9f1fe7a21 history post to get plus predefined links 2020-05-06 21:09:25 +02:00
Sander Roosendaal
cd0508a334 Merge branch 'release/v12.26' 2020-05-06 13:29:25 +02:00
Sander Roosendaal
bf5f76e2ea better time sum in pie chart 2020-05-06 13:18:06 +02:00
Sander Roosendaal
42ae036488 adding iform 2020-05-06 11:20:55 +02:00
Sander Roosendaal
fea71febb3 trying to make start/end dates the same 2020-05-06 11:18:47 +02:00
Sander Roosendaal
b2550e67b9 Merge branch 'release/v12.25' 2020-05-06 10:03:41 +02:00
Sander Roosendaal
bbd86ccd10 a 2020-05-06 09:56:34 +02:00
Sander Roosendaal
010712721c Merge branch 'release/v12.24' 2020-05-06 09:51:42 +02:00
Sander Roosendaal
40315f831e adding try and except 2020-05-06 09:50:41 +02:00
Sander Roosendaal
f752e07d77 submitting race result when arriving at upload page from race page 2020-05-06 08:46:03 +02:00
Sander Roosendaal
959d0238d1 Merge branch 'release/v12.23' 2020-05-05 20:02:36 +02:00
Sander Roosendaal
265bf8e99c small improv 2020-05-05 20:01:45 +02:00
Sander Roosendaal
2629a35eb1 small improvements 2020-05-05 19:27:39 +02:00
Sander Roosendaal
d56167bb74 Merge branch 'release/v12.22' into develop 2020-05-05 19:17:27 +02:00