Private
Public Access
1
0
Commit Graph

4860 Commits

Author SHA1 Message Date
Sander Roosendaal
a6e184958b bug fix 2019-08-30 08:31:54 +02:00
Sander Roosendaal
87f9a58550 Merge branch 'release/v10.20' 2019-08-30 08:06:26 +02:00
Sander Roosendaal
2e892e7498 alert boat type 2019-08-30 08:01:15 +02:00
Sander Roosendaal
a214f560d2 Merge tag 'v10.19' into develop
alerts ready for prod
2019-08-29 15:49:08 +02:00
Sander Roosendaal
c4ffb4484e Merge branch 'release/v10.19' 2019-08-29 15:48:49 +02:00
Sander Roosendaal
6b1d30c808 tested 2019-08-29 15:41:51 +02:00
Sander Roosendaal
45119770b1 Merge branch 'feature/alertstats' into develop 2019-08-29 15:11:50 +02:00
Sander Roosendaal
9c76dd7ccd alert email 2019-08-29 15:10:26 +02:00
Sander Roosendaal
a91e454eaa stats report alert 2019-08-29 14:46:34 +02:00
Sander Roosendaal
890a93044c Merge branch 'feature/groups' into develop 2019-08-29 08:00:38 +02:00
Sander Roosendaal
b6a1a7646b fixed access to teams 2019-08-29 07:59:13 +02:00
Sander Roosendaal
3357a06d4a improved privileges 2019-08-29 07:47:02 +02:00
Sander Roosendaal
b5935b9a19 Merge branch 'feature/freecoach2' into develop 2019-08-28 21:24:07 +02:00
Sander Roosendaal
a22283bb20 added explanation on team page 2019-08-28 21:21:55 +02:00
Sander Roosendaal
83e14c1785 some stuff 2019-08-28 21:12:23 +02:00
Sander Roosendaal
a28afdd99d Merge branch 'feature/alerts' into develop 2019-08-27 14:55:48 +02:00
Sander Roosendaal
287d2d606e tested 2019-08-27 14:54:41 +02:00
Sander Roosendaal
b3046b8517 alerts 2019-08-27 14:52:49 +02:00
Sander Roosendaal
f4bc72501a alerts ajax working 2019-08-27 13:33:21 +02:00
Sander Roosendaal
0adaf12495 starting some ajax 2019-08-27 11:59:13 +02:00
Sander Roosendaal
fce222ebeb Merge branch 'release/v10.18' into develop 2019-08-26 20:27:11 +02:00
Sander Roosendaal
85d358dcfe Merge branch 'release/v10.18' 2019-08-26 20:27:02 +02:00
Sander Roosendaal
e69f763343 tested 2019-08-26 20:26:49 +02:00
Sander Roosendaal
454bcde22f alerts stats on alerts page 2019-08-26 18:08:10 +02:00
Sander Roosendaal
ce582f7563 fixed small C2 stuff bug 2019-08-26 14:35:53 +02:00
Sander Roosendaal
c8435a9050 tested 2019-08-26 11:13:05 +02:00
Sander Roosendaal
270e179393 Merge branch 'release/v10.17' into develop 2019-08-22 21:19:05 +02:00
Sander Roosendaal
db0d5d57e9 Merge branch 'release/v10.17' 2019-08-22 21:18:53 +02:00
Sander Roosendaal
592226b8a2 tested 2019-08-22 21:18:43 +02:00
Sander Roosendaal
f71f1e4898 Merge branch 'feature/alerts' into develop 2019-08-22 21:15:08 +02:00
Sander Roosendaal
e19555e39a some improvements on alerts 2019-08-22 21:14:33 +02:00
Sander Roosendaal
e8161077a6 favicon on landing page 2019-08-22 20:59:30 +02:00
Sander Roosendaal
324c017f35 adding some info to email 2019-08-22 16:58:32 +02:00
Sander Roosendaal
9d2ce1e34b Merge branch 'release/v10.16' 2019-08-20 20:45:58 +02:00
Sander Roosendaal
4eedf59953 queue failed management 2019-08-20 20:45:30 +02:00
Sander Roosendaal
77aabe385d Merge branch 'release/v10.15' into develop 2019-08-20 19:30:51 +02:00
Sander Roosendaal
9ca731ce20 Merge branch 'release/v10.15' 2019-08-20 19:30:41 +02:00
Sander Roosendaal
4d4282765d tested 2019-08-20 19:30:32 +02:00
Sander Roosendaal
4f812344a7 tested 2019-08-20 17:49:12 +02:00
Sander Roosendaal
5f5778e759 added failed jobs queue view 2019-08-20 16:44:13 +02:00
Sander Roosendaal
fc479c2b61 adding names 2019-08-19 21:56:37 +02:00
Sander Roosendaal
6998ab9306 adding names of athlete to alert pages 2019-08-19 21:53:39 +02:00
Sander Roosendaal
3ffa23cd63 Merge branch 'release/v10.14' 2019-08-19 21:41:37 +02:00
Sander Roosendaal
eaf144503e fixing links 2019-08-19 21:41:17 +02:00
Sander Roosendaal
470d358f4b adding user 2019-08-19 21:38:26 +02:00
Sander Roosendaal
89484aeaf2 Merge branch 'release/v10.13' 2019-08-19 21:35:08 +02:00
Sander Roosendaal
2af99722b5 adding correct url for user 2019-08-19 21:34:41 +02:00
Sander Roosendaal
fecd667109 Merge branch 'hotfix/v10.12' into develop 2019-08-19 21:12:30 +02:00
Sander Roosendaal
c2aab0f9f6 Merge branch 'hotfix/v10.12' 2019-08-19 21:12:23 +02:00
Sander Roosendaal
60f849dade bug fix 2019-08-19 21:12:12 +02:00