Private
Public Access
1
0
Commit Graph

8688 Commits

Author SHA1 Message Date
3cdf971723 Merge tag 'v22.1.1' into develop
fix
2024-06-02 12:05:08 +02:00
95c9ca6dcc Merge branch 'release/v22.1.1' v22.1.1 2024-06-02 12:05:03 +02:00
d21d35ddc1 email login, fixing bulk 2024-06-02 12:04:10 +02:00
49cc3a81d7 Merge tag 'v22.1.0' into develop
fix
2024-06-01 17:39:14 +02:00
7070423e29 Merge branch 'release/v22.1.0' v22.1.0 2024-06-01 17:39:08 +02:00
4354bb125f fixing rules backend error 2024-06-01 17:38:33 +02:00
4c6fea4159 Merge branch 'feature/coachworkouts' into develop 2024-06-01 16:11:15 +02:00
235dc7217b adding coach assign rower (test) 2024-06-01 16:10:52 +02:00
53cbd91e8d adding bulk action assign rowers 2024-06-01 15:44:03 +02:00
2046f74946 Merge tag 'v22.0.2' into develop
fix
2024-06-01 14:41:44 +02:00
bbc62485ff Merge branch 'release/v22.0.2' v22.0.2 2024-06-01 14:41:39 +02:00
fcc03b1195 fix instroke chart 2024-06-01 14:41:13 +02:00
258b083efd fix 2024-06-01 14:24:44 +02:00
1869dc5883 cleaning up a bit 2024-05-31 15:25:40 +02:00
8a2457b6e2 to do list 2024-05-31 15:24:28 +02:00
c56b81a6e4 fix 2024-05-31 15:13:57 +02:00
a64ec2f1fa Merge tag 'v22.0.1' into develop
fix
2024-05-31 15:05:41 +02:00
415dd63af5 Merge branch 'release/v22.0.1' v22.0.1 2024-05-31 15:05:36 +02:00
462cdf5e0a fix 2024-05-31 15:05:25 +02:00
874c41008a f 2024-05-31 15:02:26 +02:00
d354903dd0 Merge tag 'v22.0.0' into develop
fix
2024-05-31 14:44:29 +02:00
a757879d0b Merge branch 'release/v22.0.0' v22.0.0 2024-05-31 14:44:24 +02:00
61aa12ea41 Merge branch 'feature/django4.2' into develop 2024-05-31 14:43:09 +02:00
b2ac38a889 fix 2024-05-31 14:30:58 +02:00
d67f98f485 Merge tag 'v21.2.7' into develop
test release
2024-05-30 17:05:21 +02:00
e36f32dab8 Merge branch 'release/v21.2.7' v21.2.7 2024-05-30 17:05:15 +02:00
fb25e22914 test release 2024-05-30 17:04:59 +02:00
863d90c24b removing unnecessary middleware 2024-05-28 15:19:20 +02:00
0c06463cef fix 2024-05-28 08:46:07 +02:00
f59fb7947a lijkt beter te werken 2024-05-26 17:09:54 +02:00
52d6e3b6bb oauth2 not working 2024-05-26 17:01:45 +02:00
1624371d68 Merge branch 'develop' into feature/django4.2 2024-05-26 15:51:56 +02:00
887ff72f49 changing oauth2 settings 2024-05-26 15:51:08 +02:00
5f970a17c8 fixing tests 2024-05-26 14:51:40 +02:00
ad372d8f92 fixing tests 2024-05-26 14:51:21 +02:00
09ee59a58e Merge branch 'develop' into feature/django4.2 2024-05-26 13:54:24 +02:00
1d0c05554f Merge tag 'v21.2.6' into develop
fix
2024-05-26 13:52:21 +02:00
979e6d072b Merge branch 'release/v21.2.6' v21.2.6 2024-05-26 13:52:16 +02:00
d367b5e97b tested 2024-05-26 13:51:53 +02:00
5f63b84d00 getting there 2024-05-26 13:32:17 +02:00
873ba6ab3b Merge branch 'develop' into feature/django4.2 2024-05-25 15:15:02 +02:00
896d9423e1 fix 2024-05-25 15:14:16 +02:00
7b861799c2 Merge tag 'v21.2.5' into develop
flex2 charts improved
2024-05-24 11:27:43 +02:00
5d6f6fd76a Merge branch 'release/v21.2.5' v21.2.5 2024-05-24 11:27:30 +02:00
1cfb263d95 Merge branch 'feature/flex2' into develop 2024-05-24 11:26:47 +02:00
c5618f3085 Merge branch 'develop' into feature/flex2 2024-05-24 10:41:51 +02:00
6af162bbc5 Merge tag 'v21.2.4' into develop
fix
2024-05-24 10:36:38 +02:00
5bbb7d9a11 Merge branch 'release/v21.2.4' v21.2.4 2024-05-24 10:36:32 +02:00
8f58ef3067 fix nk import 2024-05-24 10:35:54 +02:00
3cfcc22646 flex2 2024-05-24 10:22:34 +02:00