Private
Public Access
1
0
Commit Graph

761 Commits

Author SHA1 Message Date
Sander Roosendaal
a8d2827fd7 Merge tag 'v1.28' into develop
v1.28
2017-02-26 20:01:33 +01:00
Sander Roosendaal
4d92160f7b Merge branch 'hotfix/v1.28' 2017-02-26 20:00:48 +01:00
Sander Roosendaal
db0eadc7c0 v1.28 2017-02-26 19:59:36 +01:00
Sander Roosendaal
cbd038a9a0 Merge tag 'v1.27' into develop
v1.27
2017-02-26 19:55:40 +01:00
Sander Roosendaal
6514f2f08a Merge branch 'hotfix/v1.27' 2017-02-26 19:55:09 +01:00
Sander Roosendaal
0e26631cb5 v1.27 2017-02-26 19:53:53 +01:00
Sander Roosendaal
e17202ff8e Merge tag 'v1.26' into develop
v1.26
2017-02-26 19:50:08 +01:00
Sander Roosendaal
95f5ceb2d0 Merge branch 'hotfix/v1.26' 2017-02-26 19:46:49 +01:00
Sander Roosendaal
15f91eff88 write response to error file 2017-02-26 19:45:55 +01:00
Sander Roosendaal
8dc72edbce Merge tag 'c2response' into develop
v1.25
2017-02-26 19:31:07 +01:00
Sander Roosendaal
4482477125 Merge branch 'hotfix/c2response' 2017-02-26 19:29:37 +01:00
Sander Roosendaal
333fd7f98a v1.25 2017-02-26 19:27:53 +01:00
Sander Roosendaal
0bdec7fa86 Merge tag 'v1.24' into develop
v1.24
2017-02-25 20:02:52 +01:00
Sander Roosendaal
54728c1db3 Merge branch 'hotfix/v1.24' 2017-02-25 20:02:25 +01:00
Sander Roosendaal
7d4d0c08a8 catching attributeerror 2017-02-25 20:01:37 +01:00
Sander Roosendaal
4b76a30271 Merge tag 'c2fix' into develop
v1.23
2017-02-25 19:57:30 +01:00
Sander Roosendaal
4a4869afb4 Merge branch 'hotfix/c2fix' 2017-02-25 19:54:47 +01:00
Sander Roosendaal
a4b98ed852 more fancy error catching in c2stuff 2017-02-25 19:50:51 +01:00
Sander Roosendaal
00634aba7c nothing 2017-02-25 19:46:00 +01:00
Sander Roosendaal
5ddc463d6e nothing 2017-02-25 19:41:25 +01:00
Sander Roosendaal
6f02e86e63 Merge tag 'v1.22' into develop
v1.22 - fixed a few bugs in messaging
2017-02-23 18:21:06 +01:00
Sander Roosendaal
60ffe17d6b Merge branch 'release/v1.22' 2017-02-23 18:20:47 +01:00
Sander Roosendaal
7dcdaa516b a few fixes on comments 2017-02-23 18:14:43 +01:00
Sander Roosendaal
1d9dc829ae Merge tag 'v1.21' into develop
fix - compare chart now checks if id exists
2017-02-23 16:18:35 +01:00
Sander Roosendaal
b815ca84b8 Merge branch 'hotfix/v1.21' 2017-02-23 16:18:11 +01:00
Sander Roosendaal
1182e1f4c7 added check if workouts exist in comparisonview 2017-02-23 16:16:38 +01:00
Sander Roosendaal
a81baa669b Merge tag '1.2' into develop
v1.2
2017-02-23 15:48:28 +01:00
Sander Roosendaal
ce03ec378c Merge branch 'release/1.2' 2017-02-23 15:48:07 +01:00
Sander Roosendaal
eb7b3a14b1 Merge branch 'feature/multicompare3' into develop 2017-02-23 15:31:46 +01:00
Sander Roosendaal
44367c1270 added callouts tooltips to multi compare 2017-02-23 15:24:39 +01:00
Sander Roosendaal
393dc6bbf8 compare fixed 2017-02-23 15:16:41 +01:00
Sander Roosendaal
2b49407af3 some improvement in compare plot 2017-02-23 15:03:56 +01:00
Sander Roosendaal
27acec196a comment notifications 2017-02-23 12:13:55 +01:00
Sander Roosendaal
edf9709fa2 Merge tag 'v1.11' into develop
v1.11 - error checking in C2 token fetch
2017-02-23 08:15:52 +01:00
Sander Roosendaal
554fb3351f Merge branch 'hotfix/v1.11' 2017-02-23 08:13:11 +01:00
Sander Roosendaal
610cc7dda4 some error checking in the get_token C2 routine 2017-02-23 08:11:34 +01:00
Sander Roosendaal
eddf28f9d2 Merge tag 'v1.1' into develop
v1.1
2017-02-22 18:06:37 +01:00
Sander Roosendaal
a46efa2831 Merge branch 'release/v1.1' 2017-02-22 18:05:04 +01:00
Sander Roosendaal
77798fe999 chart axes choice on multi compare view 2017-02-22 17:57:07 +01:00
Sander Roosendaal
e32e2e2db5 Merge tag 'v1.01' into develop
v1.01
2017-02-22 10:20:17 +01:00
Sander Roosendaal
66a88f257a Merge branch 'hotfix/v1.01' 2017-02-22 10:19:59 +01:00
Sander Roosendaal
3711d2140e changed duration check in dataprep (h>23, min>59, etc) 2017-02-22 10:19:00 +01:00
Sander Roosendaal
65ef45f01a Merge branch 'feature/metar2' into develop 2017-02-21 15:22:18 +01:00
Sander Roosendaal
ebb5aab316 some time zone stuff 2017-02-21 15:21:32 +01:00
Sander Roosendaal
bfbdbb8a1e changed timetuple to utctimetuple 2017-02-20 22:40:09 +01:00
Sander Roosendaal
04f7f765bb Merge tag 'metar' into develop
metar
2017-02-20 21:28:13 +01:00
Sander Roosendaal
580cd771f8 Merge branch 'release/metar' 2017-02-20 21:27:29 +01:00
Sander Roosendaal
3a203f9f1d Merge branch 'feature/metars' into develop 2017-02-20 20:48:32 +01:00
Sander Roosendaal
64d506fde5 added error checking 2017-02-20 20:45:51 +01:00
Sander Roosendaal
e49a4e8f0e added METAR 2017-02-20 20:38:12 +01:00