Private
Public Access
1
0
Commit Graph

172 Commits

Author SHA1 Message Date
Sander Roosendaal
24c166a5d3 Merge branch 'develop' into feature/restapi 2016-12-21 13:23:28 +01:00
Sander Roosendaal
2e4a5c0621 Merge branch 'feature/cookielaw' into develop 2016-12-21 13:23:04 +01:00
Sander Roosendaal
a03848e568 Added cookie law banner 2016-12-21 13:14:08 +01:00
Sander Roosendaal
cf78976d00 nothing 2016-12-21 12:37:39 +01:00
Sander Roosendaal
cd151a7267 Merge branch 'develop' into feature/restapi 2016-12-20 16:31:14 +01:00
Sander Roosendaal
e5771f3896 Workout edit field has boat type for OTW 2016-12-20 16:30:13 +01:00
Sander Roosendaal
660bc2ebf3 recognize C2 Logbook summary 2016-12-20 15:31:10 +01:00
Sander Roosendaal
18ccda0924 Force curve plot 2016-12-20 12:45:25 +01:00
Sander Roosendaal
f802c4f490 Add Stroke profile button 2016-12-20 12:07:52 +01:00
Sander Roosendaal
d6503829b7 Merge branch 'develop' into feature/restapi 2016-12-20 11:36:05 +01:00
Sander Roosendaal
b18abc0357 typo correction 2016-12-20 10:12:37 +01:00
Sander Roosendaal
3da6f46d6e Announcements 2016-12-20 09:51:22 +01:00
Sander Roosendaal
fa542427e9 basic announcements functionality 2016-12-19 22:17:15 +01:00
Sander Roosendaal
11ffb0cc5f Merge branch 'develop' into feature/restapi 2016-12-19 19:45:37 +01:00
Sander Roosendaal
886fdc5881 updated link 2016-12-19 19:45:10 +01:00
Sander Roosendaal
64356bec26 zipfix3 2016-12-19 19:33:13 +01:00
Sander Roosendaal
ad642418e2 zipfix2 2016-12-19 19:14:51 +01:00
Sander Roosendaal
583784a90c add zipfile import to mailprocessing 2016-12-19 18:09:33 +01:00
Sander Roosendaal
485edb67ef Some error catching 2016-12-19 16:46:29 +01:00
Sander Roosendaal
766f9bdc03 tests 2016-12-19 16:07:30 +01:00
Sander Roosendaal
14e81460d2 Merge branch 'develop' into feature/restapi 2016-12-18 17:02:11 +01:00
Sander Roosendaal
4bda2f3539 Processing of zipped files 2016-12-18 16:57:42 +01:00
Sander Roosendaal
2ffd31f8a6 some more 2016-12-18 15:05:02 +01:00
Sander Roosendaal
a0a6d205cb Some error tracking with C2 log 2016-12-18 15:03:48 +01:00
Sander Roosendaal
83b39a43aa Merge branch 'develop' into feature/restapi 2016-12-16 14:21:15 +01:00
Sander Roosendaal
6f2ca05db4 add favorites to admin 2016-12-16 14:20:58 +01:00
Sander Roosendaal
846f1c0dfd Merge branch 'develop' into feature/restapi 2016-12-16 14:09:52 +01:00
Sander Roosendaal
1938506735 added notes to example workout 2016-12-16 13:21:16 +01:00
Sander Roosendaal
125e0a72b9 Thank you page + example workout 2016-12-16 13:13:59 +01:00
Sander Roosendaal
170d0e43a1 permissions 2016-12-14 22:55:23 +01:00
Sander Roosendaal
b4d7db324e Merge branch 'develop' into feature/restapi 2016-12-14 17:30:41 +01:00
Sander Roosendaal
a182988702 data cleaning improvement 2016-12-13 23:07:30 +01:00
Sander Roosendaal
972f7a2062 Added attributeerror to repairdata 2016-12-13 22:34:48 +01:00
Sander Roosendaal
9ea371f4e7 footer 2016-12-13 22:33:01 +01:00
Sander Roosendaal
52fec14a32 bug fix repair data 2016-12-13 22:20:29 +01:00
Sander Roosendaal
3474901443 Merge branch 'develop' into feature/restapi 2016-12-13 16:41:14 +01:00
Sander Roosendaal
b9db637d19 Merge tag 'editmenus' into develop
Hotfix edit menus
2016-12-13 15:53:24 +01:00
Sander Roosendaal
b59aeeee14 bug fix edit and adv edit menus 2016-12-13 15:52:21 +01:00
Sander Roosendaal
0e6fac88b5 NK Tools Force Curve 2016-12-13 10:44:02 +01:00
Sander Roosendaal
7d0d7a0fd5 added stats for SpeedCoach 2 GPS 2016-12-11 20:33:41 +01:00
Sander Roosendaal
e5cb8b856d Flex buttons on workouts list 2016-12-09 19:49:18 +01:00
Sander Roosendaal
52dcd6b24c Merge branch 'develop' into feature/restapi 2016-12-09 08:35:13 +01:00
Sander Roosendaal
2e21979e73 Bug fix 2016-12-09 08:10:20 +01:00
Sander Roosendaal
2b4b2f8f93 CSV file emailing for gzipped 2016-12-09 07:59:10 +01:00
Sander Roosendaal
0034c1bc88 gzipped 2016-12-08 23:27:19 +01:00
Sander Roosendaal
8895f61e73 gzip 2016-12-08 23:07:57 +01:00
Sander Roosendaal
ed6790387b tasks gzipped 2016-12-08 21:54:20 +01:00
Sander Roosendaal
2bff507c2d gzipped 2016-12-08 21:50:49 +01:00
Sander Roosendaal
09d6d92cbb repair stroke data 2016-12-08 17:02:06 +01:00
Sander Roosendaal
5708aebf1e Merge branch 'develop' into feature/restapi 2016-12-08 16:02:58 +01:00