ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity
2,106 Commits 20 Branches 4 Tags 27 MiB
Commit Graph

2106 Commits

Author SHA1 Message Date
aeltheos 1e4b340c11 Merge branch 'nix-shell' into 'main' 
Nix shell

See merge request bde/nk20!201
 2024-10-04 21:39:51 +02:00
mcngnt 8fbaa0bdc8 Merge branch 'linters' into 'main' 
fix linters for WEI 2024 survey

See merge request bde/nk20!274
 2024-10-03 16:51:04 +02:00
thomasl a0de63effd Merge branch 'beta' into 'main' 
Correction translation of sport events ml

See merge request bde/nk20!276
 2024-09-18 13:52:33 +02:00
korenstin 09fb1d227e Correction translation of sport events ml 2024-09-18 08:54:04 +02:00
thomasl 2e27d4f05c Merge branch 'non-BDE-members-permission-fix' into 'main' 
Added some necessary rights

See merge request bde/nk20!275
 2024-09-17 17:24:30 +02:00
Nicolas Margulies 5d16dc4e7d Added some necessary rights 2024-09-17 17:13:47 +02:00
bleizi 3c34033bf5
fix linters for WEI 2024 survey 2024-09-12 13:41:04 +02:00
mcngnt 131f508433 Merge branch 'survey_wei_2024' into 'main' 
update hardcoded

See merge request bde/nk20!273
 2024-09-12 12:03:10 +02:00
mcngnt c1a353963a handle hardcoded corrected 2024-09-12 11:36:37 +02:00
mcngnt 178ce2b579 update hardcoded 2024-09-10 22:41:35 +02:00
quark 9162319734 Merge branch 'quark-main-patch-05186' into 'main' 
Update views.py (don't display forced blocked note, it's just temporary patch,...

See merge request bde/nk20!272
 2024-09-09 21:02:19 +02:00
quark 5d2a8e9b79 Update views.py (don't display forced blocked note, it's just temporary patch, we need to block these note in models too) 2024-09-09 19:05:53 +02:00
bleizi 33c94d0720 Merge branch 'non-BDE-members' into 'main' 
Allow non-BDE members to use the note

See merge request bde/nk20!268
 2024-09-05 23:15:04 +02:00
bleizi 5040e8e8ea Merge branch 'continuous-intergration' into 'main' 
continuous-intergration

See merge request bde/nk20!271
 2024-09-05 20:54:40 +02:00
Nicolas Margulies c5697c4cb4 don't hide the transfer tab 2024-09-05 20:54:23 +02:00
nicomarg e188c5a153 Merge branch 'mail' into 'main' 
mail

Closes #119

See merge request bde/nk20!270
 2024-09-05 20:29:30 +02:00
bleizi 94e1fdc93a
add ubuntu 24.4 in tox.ini and remove debian bullseye in gitlab-ci 2024-09-05 20:19:46 +02:00
Nicolas Margulies d1ef367bab Permissions for child clubs, also changed spaces for tabs 2024-09-05 20:17:45 +02:00
bleizi 0fbb19c5fd
limite mail sending to 10 per minute and purge fail mail log 2024-09-05 19:48:54 +02:00
mcngnt 21cbf2b21a Merge branch 'survey_wei_2024' into 'main' 
Survey wei 2024

See merge request bde/nk20!269
 2024-08-29 23:10:57 +02:00
mcngnt 185a2cabf2 corrected emoji + linting 2024-08-29 22:47:33 +02:00
mcngnt 7552e55c8d removed diet filed 2024-08-29 22:19:11 +02:00
nicomarg 361de9f8b4 more bug fixing 2024-08-29 21:06:34 +02:00
nicomarg e2426bd6a6 Bugfix 2024-08-29 20:03:43 +02:00
nicomarg 7fea619a9f add permission to make transfers with members of your club 2024-08-29 20:02:06 +02:00
nicomarg 7b5eefcc0a Update 2 files 
- /apps/registration/views.py
- /apps/permission/fixtures/initial.json
 2024-08-29 19:23:26 +02:00
mcngnt e4aa16986f Merge branch 'survey_wei_2024' into 'main' 
linting

See merge request bde/nk20!267
 2024-08-29 19:12:23 +02:00
mcngnt b92e6e4e10 linting 2024-08-29 18:36:20 +02:00
mcngnt dd675b3676 Merge branch 'survey_wei_2024' into 'main' 
Survey wei 2024

See merge request bde/nk20!266
 2024-08-29 14:45:28 +02:00
mcngnt f50849b4f8 delete print 2024-08-29 14:01:55 +02:00
mcngnt 73ff35c232 updated bus descr 2024-08-29 12:42:26 +02:00
korenstin a5df98224f Merge branch 'migration-django-4-2' into 'main' 
Migration django 4 2

See merge request bde/nk20!265
 2024-08-29 10:49:44 +02:00
korenstin 2cb9ac8735 replace "…" -> "..." (#130) and disable sorting on certain columns (#129) 2024-08-29 10:19:06 +02:00
korenstin 35d4849a28 fix Oauth 2024-08-29 00:43:33 +02:00
mcngnt 96539d262f working html for survey + fixed json error + added specific diet text field 2024-08-29 00:05:44 +02:00
korenstin 946674f59b inclusif, avoids python3.10 syntax 2024-08-28 11:11:32 +02:00
mcngnt a201d8376a updated survey 2024-08-28 11:01:33 +02:00
korenstin a21b9275ea Add caution_check in the validation form, #96 2024-08-28 09:48:52 +02:00
korenstin d4e85e8215 test wei 2024, linters 2024-08-28 09:48:52 +02:00
mcngnt 7af2ebba40 basic survey 2024-08-28 09:48:52 +02:00
quark bd94400883 Merge branch 'food_traceability' into 'main' 
Change deprecated function

See merge request bde/nk20!264
 2024-08-27 19:15:52 +02:00
quark 5558341c8c Change deprecated function 2024-08-27 19:14:59 +02:00
quark 35ef82223c Merge branch 'food_traceability' into 'main' 
Create traceability application

See merge request bde/nk20!263
 2024-08-27 18:46:54 +02:00
korenstin 9ccac36831 Copy constructor 2024-08-27 18:01:13 +02:00
quark 2e71ce05a9 Merge branch 'main' into food_traceability 2024-08-27 17:11:32 +02:00
quark f2cb10b69f Fix problem in addingredientform, change filter for container in QrcodeForm 2024-08-27 15:12:15 +02:00
bleizi 24c4edf2e3 Merge branch 'migration-django-4-2' into 'main' 
nk20 v2.0.0 with django 4.2

See merge request bde/nk20!230
 2024-08-27 13:43:58 +02:00
quark 213e9a8b12 Fix problem in addingredientform, change filter for container in QrcodeForm 2024-08-27 10:47:44 +02:00
korenstin 2c56178b15 Merge branch 'main' into migration-django-4-2 2024-08-25 16:14:59 +02:00
korenstin 48a5b04579 Merge branch 'beta' into migration-django-4-2 2024-08-25 16:13:01 +02:00