Sander Roosendaal
|
3f83e283e1
|
added scope
|
2016-12-22 20:33:55 +01:00 |
|
Sander Roosendaal
|
12dff27fba
|
Merge branch 'develop' into feature/c2repair
|
2016-12-22 20:25:20 +01:00 |
|
Sander Roosendaal
|
69e5df2309
|
Merge branch 'feature/restapi' into develop
|
2016-12-22 17:28:11 +01:00 |
|
Sander Roosendaal
|
8ed24fec63
|
Draft developers info
|
2016-12-22 17:24:58 +01:00 |
|
Sander Roosendaal
|
56fc3a52d3
|
sorted permissions for workouts-list
|
2016-12-22 15:39:57 +01:00 |
|
Sander Roosendaal
|
24de5c681d
|
API seems to work ok
|
2016-12-22 12:21:04 +01:00 |
|
Sander Roosendaal
|
23c3ff70b5
|
still not working
|
2016-12-22 08:29:02 +01:00 |
|
Sander Roosendaal
|
29de886c87
|
not working yet - added scope to request body
|
2016-12-21 22:41:33 +01:00 |
|
Sander Roosendaal
|
1f1c06f04d
|
Merge tag 'morec2' into develop
C2 forensics
|
2016-12-21 21:33:59 +01:00 |
|
Sander Roosendaal
|
750ee83d4b
|
Merge branch 'release/morec2'
|
2016-12-21 21:33:45 +01:00 |
|
Sander Roosendaal
|
5a0b145fcd
|
Some more C2 api forensics
|
2016-12-21 21:28:28 +01:00 |
|
Sander Roosendaal
|
2701d330ce
|
Merge branch 'develop' into feature/restapi
|
2016-12-21 16:18:23 +01:00 |
|
Sander Roosendaal
|
e4e2b65bf0
|
Merge tag 'tweet' into develop
tweet functionality
|
2016-12-21 15:52:50 +01:00 |
|
Sander Roosendaal
|
339165a2e0
|
Merge branch 'release/tweet'
|
2016-12-21 15:52:36 +01:00 |
|
Sander Roosendaal
|
0943c61e17
|
tweet functionality
|
2016-12-21 15:41:31 +01:00 |
|
Sander Roosendaal
|
42280cb5d9
|
Merge tag 'cookielaw2' into develop
Cookie Law 2
|
2016-12-21 13:32:20 +01:00 |
|
Sander Roosendaal
|
3ea5d7678b
|
Merge branch 'release/cookielaw2'
|
2016-12-21 13:31:21 +01:00 |
|
Sander Roosendaal
|
7929461ed3
|
Merge tag 'cookielaw' into develop
cookielaw
|
2016-12-21 13:27:06 +01:00 |
|
Sander Roosendaal
|
75eb0102d2
|
Merge branch 'release/cookielaw'
|
2016-12-21 13:26:47 +01:00 |
|
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
|
ddc6a32606
|
Merge tag 'workouteditform' into develop
add boat type to OTW workout edit form
|
2016-12-20 16:34:47 +01:00 |
|
Sander Roosendaal
|
2ff5f0a42a
|
Merge branch 'release/workouteditform'
|
2016-12-20 16:34:29 +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
|
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 |
|