|
|
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 |
|
|
|
3b1876103b
|
fix
|
2024-05-23 20:04:29 +02:00 |
|
|
|
79a229c998
|
Merge tag 'v21.2.3' into develop
nk import fix
|
2024-05-23 16:30:13 +02:00 |
|
|
|
834785a529
|
Merge branch 'release/v21.2.3'
v21.2.3
|
2024-05-23 16:30:03 +02:00 |
|
|
|
9af5057d7c
|
fix
|
2024-05-23 16:29:27 +02:00 |
|
|
|
184c32d000
|
Merge tag 'v21.2.2' into develop
fix
|
2024-05-23 13:52:21 +02:00 |
|
|
|
ad25858b65
|
Merge branch 'release/v21.2.2'
v21.2.2
|
2024-05-23 13:52:17 +02:00 |
|
|
|
d306bd5539
|
fixed form and tests updated
|
2024-05-23 13:50:54 +02:00 |
|
|
|
49ab756211
|
attempt to django 4.2
|
2024-05-23 09:17:00 +02:00 |
|
|
|
1fef50fabf
|
Merge tag 'v21.2.1' into develop
hotx
|
2024-05-22 21:43:31 +02:00 |
|
|
|
f359e99443
|
Merge branch 'hotfix/v21.2.1'
v21.2.1
|
2024-05-22 21:43:01 +02:00 |
|
|
|
a1100d2452
|
fix
|
2024-05-22 21:42:50 +02:00 |
|
|
|
82f842d6ab
|
fix
|
2024-05-22 21:00:56 +02:00 |
|
|
|
55170546fd
|
Merge branch 'feature/contactform' into develop
|
2024-05-22 20:57:43 +02:00 |
|
|
|
fc35034c7c
|
form fixed
|
2024-05-22 20:57:31 +02:00 |
|
|
|
ce978bfe8e
|
new form with recaptcha
|
2024-05-22 20:47:20 +02:00 |
|
|
|
fe620031dc
|
testing
|
2024-05-22 20:11:35 +02:00 |
|
|
|
a604fda3cc
|
adding meters
|
2024-05-22 11:22:46 +02:00 |
|
|
|
987dabc146
|
Merge tag 'v21.2.0' into develop
fix
|
2024-05-22 11:17:29 +02:00 |
|
|
|
d35aba9bf2
|
Merge branch 'release/v21.2.0'
v21.2.0
|
2024-05-22 11:17:24 +02:00 |
|
|
|
0bae7bc3d1
|
Merge branch 'feature/workoutnames' into develop
|
2024-05-22 11:02:38 +02:00 |
|
|
|
c1a027db6b
|
tested
|
2024-05-22 11:02:24 +02:00 |
|
|
|
38b2a71e25
|
Merge branch 'develop' into feature/workoutnames
|
2024-05-22 09:59:21 +02:00 |
|
|
|
2ab119d5ff
|
Merge tag 'v21.1.4' into develop
fix
|
2024-05-22 09:57:38 +02:00 |
|
|
|
f84083071e
|
Merge branch 'hotfix/v21.1.4'
v21.1.4
|
2024-05-22 09:57:33 +02:00 |
|
|
|
0026234972
|
fix
|
2024-05-22 09:57:23 +02:00 |
|
|
|
a0fdd3006d
|
Merge branch 'develop' into feature/workoutnames
|
2024-05-22 09:53:46 +02:00 |
|
|
|
d63b70a929
|
Merge tag 'v21.1.3' into develop
fix
|
2024-05-22 09:51:39 +02:00 |
|
|
|
9a845e7843
|
Merge branch 'hotfix/v21.1.3'
v21.1.3
|
2024-05-22 09:51:34 +02:00 |
|
|
|
2a2bf08f24
|
fix
|
2024-05-22 09:51:24 +02:00 |
|
|
|
9ccb8dc9f4
|
initial
|
2024-05-22 09:48:52 +02:00 |
|
|
|
ef208be1d9
|
Merge tag 'v21.1.2' into develop
fix
|
2024-05-22 08:25:31 +02:00 |
|