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
|
244ce2ea66
|
Merge tag 'smallstuff' into develop
small stuff & logbook det
|
2016-12-20 15:57:59 +01:00 |
|
Sander Roosendaal
|
36c5576c15
|
Merge branch 'release/smallstuff'
|
2016-12-20 15:57:36 +01:00 |
|
Sander Roosendaal
|
1452b6c428
|
Merge branch 'feature/smallstuff' into develop
|
2016-12-20 15:35:02 +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
|
4e8755b4fe
|
Merge tag 'messaging2' into develop
messaging2
|
2016-12-20 10:14:20 +01:00 |
|
Sander Roosendaal
|
2a56e86988
|
Merge branch 'release/messaging2'
|
2016-12-20 10:14:08 +01:00 |
|
Sander Roosendaal
|
b18abc0357
|
typo correction
|
2016-12-20 10:12:37 +01:00 |
|
Sander Roosendaal
|
b0ee4b35c6
|
Merge tag 'messaging' into develop
messaging
|
2016-12-20 10:01:58 +01:00 |
|
Sander Roosendaal
|
5603db67b3
|
Merge branch 'release/messaging'
|
2016-12-20 10:01:41 +01:00 |
|
Sander Roosendaal
|
eff83024e5
|
Merge branch 'feature/messaging' into develop
|
2016-12-20 09:55:25 +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
|
3d0583f2d5
|
Merge tag 'zipfix3' into develop
zipfix3
|
2016-12-19 19:35:28 +01:00 |
|
Sander Roosendaal
|
987dbce5fe
|
Merge branch 'hotfix/zipfix3'
|
2016-12-19 19:35:10 +01:00 |
|
Sander Roosendaal
|
64356bec26
|
zipfix3
|
2016-12-19 19:33:13 +01:00 |
|
Sander Roosendaal
|
ebd06b29fd
|
Merge tag 'zipfix2' into develop
zipfix2
|
2016-12-19 19:17:09 +01:00 |
|
Sander Roosendaal
|
87b0f3963b
|
Merge branch 'hotfix/zipfix2'
|
2016-12-19 19:15:54 +01:00 |
|
Sander Roosendaal
|
ad642418e2
|
zipfix2
|
2016-12-19 19:14:51 +01:00 |
|
Sander Roosendaal
|
b8d03118e8
|
Merge tag 'zip2' into develop
zipfix
|
2016-12-19 18:10:33 +01:00 |
|
Sander Roosendaal
|
9682db1dbb
|
Merge branch 'hotfix/zip2'
|
2016-12-19 18:10:10 +01:00 |
|
Sander Roosendaal
|
583784a90c
|
add zipfile import to mailprocessing
|
2016-12-19 18:09:33 +01:00 |
|
Sander Roosendaal
|
7599d5b4d3
|
Merge tag 'zips' into develop
zips
|
2016-12-19 17:58:31 +01:00 |
|
Sander Roosendaal
|
9b876385f2
|
Merge branch 'release/zips'
|
2016-12-19 17:58:21 +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
|
f5236d429e
|
Merge tag 'c2sync' into develop
c2sync error tracing (prepare for bugfix)
|
2016-12-18 15:06:24 +01:00 |
|
Sander Roosendaal
|
fe9efff99e
|
Merge branch 'hotfix/c2sync'
|
2016-12-18 15:05:40 +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
|
1b37af4306
|
Merge tag 'favoriteadmin' into develop
Favorite Admin
|
2016-12-16 14:27:44 +01:00 |
|
Sander Roosendaal
|
f4fc9b67be
|
Merge branch 'release/favoriteadmin'
|
2016-12-16 14:27:32 +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
|
c15ece930a
|
Merge tag 'newusers' into develop
New users get new workout
|
2016-12-16 13:28:24 +01:00 |
|
Sander Roosendaal
|
d711aa76ae
|
Merge branch 'release/newusers'
|
2016-12-16 13:28:07 +01:00 |
|
Sander Roosendaal
|
15c8954b18
|
Merge branch 'feature/videoredirect' into develop
|
2016-12-16 13:23:47 +01:00 |
|
Sander Roosendaal
|
cdb843a7b9
|
settings
|
2016-12-16 13:23:10 +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 |
|