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

2310 Commits

Author SHA1 Message Date
f03c13a4b8 Merge branch 'wei' into 'main'
Wei

See merge request bde/nk20!330
2025-07-15 19:26:32 +02:00
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
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
0a261e6ad5 Bugs fixed again (lost in beta) 2025-07-13 16:38:39 +02:00
ab9329f62b Merge branch 'beta' into 'main'
translation

See merge request bde/nk20!328
2025-07-12 14:06:27 +02:00
b97b79e2ea translation 2025-07-12 14:05:53 +02:00
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
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
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
bcc3e7cc53 Merge branch 'food_traceability' into beta 2025-07-11 12:26:55 +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
432f50e49a propose fix for #134 (partially tested) 2025-07-09 00:15:33 +02:00
883589e08c django-constance and traduction 2025-07-06 16:17:13 +02:00
c36f8c25a2 Add banner #80 (with django-constance 2025-07-05 18:45:36 +02:00
8783a63d7f change CAS template for #133 2025-07-05 13:56:43 +02:00
4cc43fe4b6 traduction, resolve #133 2025-07-04 22:11:47 +02:00
b7c0986a5f cron and linters 2025-07-04 17:14:12 +02:00
85ea43a7cf change pipeline 2025-07-04 16:27:04 +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
1567bc6ce5 Merge branch 'oidc' into 'main'
Oidc

See merge request bde/nk20!324
2025-06-27 22:29:51 +02:00
c411197af3 multiline support for RSA key in env 2025-06-27 22:13:43 +02:00
bc517f02e5 Traduction 2025-06-27 19:26:58 +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
cdc6f0a3f8 Fix jwks.json 2025-06-27 12:13:54 +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
5c5f579729 Traductions 2025-06-20 14:24:03 +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
16b55e23af Merge branch 'thomasl-main-patch-84944' into 'main'
Update doc about scripts

See merge request bde/nk20!321
2025-06-14 20:24:49 +02:00
97621e8704 Update doc about scripts 2025-06-14 20:07:29 +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