1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-08-03 22:24:34 +02:00
Commit Graph

2339 Commits

Author SHA1 Message Date
Ehouarn
0ac719b1f6 French translations for WEI 2025-08-03 12:47:22 +02:00
ehouarn
e55a6ae407 Merge branch 'wei' into 'main'
Wei

See merge request bde/nk20!338
2025-08-03 01:38:27 +02:00
Ehouarn
59a502d624 Added column deposit_type to MembershipsTable 2025-08-03 01:02:06 +02:00
Ehouarn
312ab6dac4 Permissions 2025-08-03 00:41:10 +02:00
Ehouarn
cf53b480db Minor fix 2025-08-02 23:42:04 +02:00
Ehouarn
d1aa1edd09 Deposit check logic changed 2025-08-02 23:32:13 +02:00
Ehouarn
d6f9a9c5b0 Better test 2025-08-02 18:35:53 +02:00
ehouarn
fc0071144e Merge branch 'wei' into 'main'
More robust algorithm

See merge request bde/nk20!337
2025-08-02 17:34:45 +02:00
Ehouarn
573f2d8a22 More robust algorithm 2025-08-02 17:18:51 +02:00
ehouarn
da30382f41 Merge branch 'wei' into 'main'
Soge credit fixed

See merge request bde/nk20!336
2025-08-02 16:50:24 +02:00
Ehouarn
8e98d62b69 Soge credit fixed 2025-08-02 16:31:04 +02:00
ehouarn
3b7f8b87c4 Merge branch 'wei' into 'main'
Wei

See merge request bde/nk20!335
2025-08-01 23:38:46 +02:00
Ehouarn
023fc1db84 Visual fixes 2025-08-01 22:53:15 +02:00
Ehouarn
d50bb2134a Algorithm changed again 2025-08-01 11:56:34 +02:00
ehouarn
0992a8a7ee Merge branch 'wei' into 'main'
Wei

See merge request bde/nk20!334
2025-07-24 15:39:51 +02:00
Ehouarn
97597eb103 Fixed 1A forms 2025-07-24 12:26:44 +02:00
Ehouarn
bfa5734d55 Changed score calculation in survey 2025-07-23 16:48:59 +02:00
Ehouarn
296d021d54 Permissions 2025-07-23 01:24:59 +02:00
Ehouarn
6e348b995b Better Membership update 2025-07-23 00:51:03 +02:00
quark
12477b33cb Merge branch 'fix_activity_form' into 'main'
fix organizer field error

See merge request bde/nk20!333
2025-07-22 18:55:27 +02:00
quark
8c3ae338ea fix organizer field error 2025-07-22 18:20:05 +02:00
Ehouarn
1274315cde Last untranslated field 2025-07-19 18:55:49 +02:00
ehouarn
4975c1ab6f Merge branch 'translations' into 'main'
Translations

See merge request bde/nk20!332
2025-07-19 18:29:18 +02:00
Ehouarn
61999a31a5 Wei details 2025-07-19 18:04:14 +02:00
ehouarn
b217f7ceec Merge branch 'wei' into 'main'
Wei

See merge request bde/nk20!331
2025-07-19 17:27:20 +02:00
Ehouarn
2755a5f7ab Minor fail 2025-07-19 17:10:25 +02:00
Ehouarn
9ab4df94e6 Minor fixes 2025-07-19 16:55:07 +02:00
Ehouarn
edb6abfff5 Add fee field to WEIRegistration to be able to sort on validation status 2025-07-19 16:24:25 +02:00
Ehouarn
03c1bb41b6 First of many 2025-07-18 23:49:34 +02:00
ehouarn
f03c13a4b8 Merge branch 'wei' into 'main'
Wei

See merge request bde/nk20!330
2025-07-15 19:26:32 +02:00
ehouarn
b1fa1c2cdd Merge branch 'main' into 'wei'
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
2025-07-15 19:06:58 +02:00
Ehouarn
a273dc3eef Translations 2025-07-15 18:23:40 +02:00
Ehouarn
852651d126 Rename 'caution' fields into 'deposit' 2025-07-15 18:10:28 +02:00
Ehouarn
3af35dc0fc Soge Credit changed 2025-07-15 17:43:21 +02:00
Ehouarn
4380414c6b Minor fixes 2025-07-13 18:29:43 +02:00
ehouarn
a94c937c6a Merge branch 'food_traceability' into 'main'
Bugs fixed again (lost in beta)

See merge request bde/nk20!329
2025-07-13 17:12:57 +02:00
Ehouarn
0a261e6ad5 Bugs fixed again (lost in beta) 2025-07-13 16:38:39 +02:00
quark
ab9329f62b Merge branch 'beta' into 'main'
translation

See merge request bde/nk20!328
2025-07-12 14:06:27 +02:00
quark
b97b79e2ea translation 2025-07-12 14:05:53 +02:00
quark
483ea26f02 Merge branch 'beta' into 'main'
Django 5.2 and other upgrade

Closes #133

See merge request bde/nk20!327
2025-07-12 13:23:31 +02:00
quark
695ce63e08 Merge branch 'food_traceability' into 'beta'
Easier access to food details

See merge request bde/nk20!326
2025-07-11 17:15:50 +02:00
ehouarn
79f50c27f1 Merge branch 'beta' into 'food_traceability'
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
2025-07-11 17:00:45 +02:00
Ehouarn
5989721bc9 Easier access to food details 2025-07-11 16:35:49 +02:00
quark
bcc3e7cc53 Merge branch 'food_traceability' into beta 2025-07-11 12:26:55 +02:00
Ehouarn
608804db30 Bugs fixed 2025-07-10 20:05:27 +02:00
quark
82a06c29dd linters 2025-07-09 16:12:55 +02:00
quark
cf9d208586 scopes 2025-07-09 15:57:24 +02:00
quark
432f50e49a propose fix for #134 (partially tested) 2025-07-09 00:15:33 +02:00
quark
883589e08c django-constance and traduction 2025-07-06 16:17:13 +02:00
quark
c36f8c25a2 Add banner #80 (with django-constance 2025-07-05 18:45:36 +02:00