ynerant
synced commits to refs/merge-requests/223/merge at ynerant/nk20 from mirror
2024-08-29 18:42:14 +00:00
56bc249a9d
Merge branch 'summary_notes' into 'main'
a5df98224f
Merge branch 'migration-django-4-2' into 'main'
2cb9ac8735
replace "…" -> "..." (#130) and disable sorting on certain columns (#129)
35d4849a28
fix Oauth
a5df98224f
Merge branch 'migration-django-4-2' into 'main'
2cb9ac8735
replace "…" -> "..." (#130) and disable sorting on certain columns (#129)
35d4849a28
fix Oauth
ynerant
synced commits to migration-django-4-2 at ynerant/nk20 from mirror
2024-08-29 10:32:13 +00:00
2cb9ac8735
replace "…" -> "..." (#130) and disable sorting on certain columns (#129)
ynerant
synced commits to migration-django-4-2 at ynerant/nk20 from mirror
2024-08-29 02:22:14 +00:00
35d4849a28
fix Oauth
946674f59b
inclusif, avoids python3.10 syntax
a201d8376a
updated survey
a21b9275ea
Add caution_check in the validation form, #96
d4e85e8215
test wei 2024, linters
7af2ebba40
basic survey
ynerant
synced commits to refs/merge-requests/196/merge at ynerant/nk20 from mirror
2024-08-28 10:02:13 +00:00
842568f085
Merge branch 'qrcode' into 'main'
bd94400883
Merge branch 'food_traceability' into 'main'
5558341c8c
Change deprecated function
ynerant
synced commits to refs/merge-requests/201/merge at ynerant/nk20 from mirror
2024-08-28 10:02:13 +00:00
aea8d80d8d
Merge branch 'nix-shell' into 'main'
bd94400883
Merge branch 'food_traceability' into 'main'
5558341c8c
Change deprecated function
35ef82223c
Merge branch 'food_traceability' into 'main'
9ccac36831
Copy constructor
ynerant
synced commits to refs/merge-requests/223/merge at ynerant/nk20 from mirror
2024-08-28 10:02:13 +00:00
85d38487fa
Merge branch 'summary_notes' into 'main'
bd94400883
Merge branch 'food_traceability' into 'main'
5558341c8c
Change deprecated function
35ef82223c
Merge branch 'food_traceability' into 'main'
9ccac36831
Copy constructor
ynerant
synced and deleted reference 2024-08-28 01:52:12 +00:00
refs/tags/refs/pipelines/14117
at ynerant/nk20 from mirror
ynerant
synced and deleted reference 2024-08-28 01:52:12 +00:00
refs/tags/refs/pipelines/14118
at ynerant/nk20 from mirror
5558341c8c
Change deprecated function
9ccac36831
Copy constructor
2e71ce05a9
Merge branch 'main' into food_traceability
f2cb10b69f
Fix problem in addingredientform, change filter for container in QrcodeForm
24c4edf2e3
Merge branch 'migration-django-4-2' into 'main'
bd94400883
Merge branch 'food_traceability' into 'main'
5558341c8c
Change deprecated function
35ef82223c
Merge branch 'food_traceability' into 'main'
9ccac36831
Copy constructor
2e71ce05a9
Merge branch 'main' into food_traceability
ynerant
synced commits to refs/merge-requests/196/merge at ynerant/nk20 from mirror
2024-08-27 17:42:13 +00:00
55313f5fa5
Merge branch 'qrcode' into 'main'
35ef82223c
Merge branch 'food_traceability' into 'main'
9ccac36831
Copy constructor
2e71ce05a9
Merge branch 'main' into food_traceability
f2cb10b69f
Fix problem in addingredientform, change filter for container in QrcodeForm
ynerant
synced commits to refs/merge-requests/201/merge at ynerant/nk20 from mirror
2024-08-27 17:42:13 +00:00
0430a39e75
Merge branch 'nix-shell' into 'main'
24c4edf2e3
Merge branch 'migration-django-4-2' into 'main'
2c56178b15
Merge branch 'main' into migration-django-4-2
48a5b04579
Merge branch 'beta' into migration-django-4-2
2ab5c4082a
Merge branch 'beta' into 'main'
ynerant
synced new reference refs/tags/v1.0.3 to ynerant/nk20 from mirror
2024-08-27 17:42:13 +00:00
ynerant
synced commits to refs/merge-requests/196/merge at ynerant/nk20 from mirror
2024-08-27 09:32:13 +00:00
b5a4e15076
Merge branch 'qrcode' into 'main'
2ab5c4082a
Merge branch 'beta' into 'main'
053225c6dc
revert sort tables to member views
ac7b86651d
Merge branch 'beta' into 'main'
21f5a5d566
Merge branch 'invoice_template' into 'main'