1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-07-17 23:00:23 +02:00
Commit Graph

1457 Commits

Author SHA1 Message Date
b1fa1c2cdd Merge branch 'main' into 'wei'
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
2025-07-15 19:06:58 +02:00
a273dc3eef Translations 2025-07-15 18:23:40 +02:00
852651d126 Rename 'caution' fields into 'deposit' 2025-07-15 18:10:28 +02:00
3af35dc0fc Soge Credit changed 2025-07-15 17:43:21 +02:00
4380414c6b Minor fixes 2025-07-13 18:29:43 +02:00
0a261e6ad5 Bugs fixed again (lost in beta) 2025-07-13 16:38:39 +02:00
79f50c27f1 Merge branch 'beta' into 'food_traceability'
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
2025-07-11 17:00:45 +02:00
5989721bc9 Easier access to food details 2025-07-11 16:35:49 +02:00
608804db30 Bugs fixed 2025-07-10 20:05:27 +02:00
82a06c29dd linters 2025-07-09 16:12:55 +02:00
cf9d208586 scopes 2025-07-09 15:57:24 +02:00
c36f8c25a2 Add banner #80 (with django-constance 2025-07-05 18:45:36 +02:00
f54dd30482 fix logout test 2025-07-03 15:18:29 +02:00
7eafe33945 Merge branch 'main' into django-5.2 2025-07-03 14:24:58 +02:00
6edef619aa change requirements.txt 2025-07-03 11:37:07 +02:00
8a1f30ebe2 Merge branch 'wei' into 'main'
Wei

See merge request bde/nk20!325
2025-07-01 18:14:45 +02:00
b2c6b0e85d Sélection de bus/équipe plus ergonomique 2025-07-01 17:48:39 +02:00
e83ee8015f Tests 2025-06-27 18:50:37 +02:00
c26534b6b7 Année et algorithme 2025-06-27 16:56:17 +02:00
c153d5f10a Merge branch 'wei' into 'main'
Wei

See merge request bde/nk20!323
2025-06-26 17:08:27 +02:00
3f76ca6472 Tables 1A (et typo) 2025-06-21 17:16:15 +02:00
a6df0e7c69 Autres permissions 2025-06-17 20:51:46 +02:00
763535bea4 Merge branch 'oidc' into 'main'
OIDC 0 Quark 1

See merge request bde/nk20!322
2025-06-17 16:02:40 +02:00
df0d886db9 linters 2025-06-17 11:46:33 +02:00
092cc37320 OIDC 0 Quark 1 2025-06-17 00:38:11 +02:00
cf4c23d1ac Merge branch 'oidc' into 'main'
oidc

See merge request bde/nk20!320
2025-06-14 18:36:24 +02:00
d71105976f oidc 2025-06-14 18:01:42 +02:00
89cc03141b allow search with club name 2025-06-12 18:48:29 +02:00
6822500fdc Correction des tests et autres 2025-06-12 17:39:34 +02:00
63f6528adc Suppression du choix GC WEI dans les roles 2025-06-12 13:59:59 +02:00
40ac1daece Tests et permissions 2025-06-02 17:51:33 +02:00
e617048332 Meilleure gestion des cautions 2025-06-02 01:09:51 +02:00
9eb6edb37d Problème de membership fee 2025-05-29 23:15:33 +02:00
70a57bf02d Ajout d'un champ club au modèle Bus pour faciliter la gestion des bus 2025-05-29 20:16:43 +02:00
02453e07ba linters 2025-05-28 16:31:03 +02:00
4479e8f97a Fix de views.py et tests de permissions 2025-05-28 16:04:19 +02:00
a351415494 Fix des tests de apps/wei 2025-05-28 15:37:37 +02:00
16cfaa809a Fix de la plupart des bugs 2025-05-27 18:56:49 +02:00
f2cd0b6d36 Merge branch 'wei' of gitlab.crans.org:bde/nk20 into wei 2025-05-26 18:15:51 +02:00
a2e2ff5fa9 Merge branch 'main' into 'wei'
Main

See merge request bde/nk20!319
2025-05-26 17:51:33 +02:00
53d0480a12 Ajout de permissions 2025-05-26 17:29:34 +02:00
136f636fda Fix de l'ajout d'équipe, le ColorWidget était défaillant 2025-05-25 23:31:09 +02:00
5a8acbde00 Trez TaT en moins 2025-05-25 00:07:07 +02:00
f60dc8cfa0 Pré-injection du BDA 2025-05-25 00:05:13 +02:00
067dd6f9d1 WEI-Roles 2025-05-24 22:41:53 +02:00
7b1e32e514 Réécriture des rôles pertinents 2025-05-24 22:29:11 +02:00
3d34270959 Faute de frappe 2025-05-23 23:38:06 +02:00
0d69383dfd Update views.py 2025-05-19 17:45:01 +02:00
108a56745c Corrections de quelques bugs (par Quark) 2025-05-10 19:24:05 +02:00
fadb289ed7 migrations 2025-05-09 19:48:04 +02:00