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

2089 Commits

Author SHA1 Message Date
Otthorn 92b2c4690f Merge branch 'qrcode' into 'main' 
Draft: Qrcode

See merge request bde/nk20!196
 2024-08-30 15:24:47 +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
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
korenstin 2ab5c4082a Merge branch 'beta' into 'main' 
revert sort tables to member views

See merge request bde/nk20!262
 2024-08-25 15:17:36 +02:00
korenstin 053225c6dc revert sort tables to member views 2024-08-25 15:13:02 +02:00
korenstin ac7b86651d Merge branch 'beta' into 'main' 
api errors (fix #113), sortable tables, calendar (fix #95), opener (fix #117), colored linters, inclusif, bug july 31, 403 (fix #65)

Closes #65, #117, #95, and #113

See merge request bde/nk20!260
 2024-08-25 14:45:08 +02:00
korenstin 21f5a5d566 Merge branch 'invoice_template' into 'main' 
Update invoice_sample.tex, remove link toward bde.ens-cachan

See merge request bde/nk20!261
 2024-08-25 14:34:37 +02:00
korenstin ff9c78ed4e added opener in admin and fixed the guest view 2024-08-25 14:29:06 +02:00
quark 1e121297d1 Update invoice_sample.tex, remove link toward bde.ens-cachan 2024-08-23 00:32:37 +02:00
quark 549f56dc0b Translation 2024-08-17 11:58:33 +02:00
quark debeb33d46 Improve/modify form, view, template. Add permissions 2024-08-17 02:42:29 +02:00
quark 6d7076b03e Edit forms, views, template to improve/modify view. Edit urls to remove some path. Few changes in models. 2024-08-14 01:32:55 +02:00
quark 196df1e775 Remove initial.json (food) mandatory allergen are directly created in migration. Edit tables.py and views.py transformedfoodlist.html to improve/change the view. Edit base.html, urls.py to correct little mistakes. Edit initial.json (permission) to begin permission for food apps and create a new role (Respo Bouffe). 2024-08-13 02:07:32 +02:00
korenstin 28117c8c61 Add developers, Opener comments 2024-08-10 11:50:27 +02:00
bleizi 0d9891fbd8 Merge branch 'migration-django-4-2' of gitlab.crans.org:bde/nk20 into migration-django-4-2 2024-08-09 23:20:48 +02:00
korenstin 4be4a18dd1 Merge branch 'sortable_tables' into 'beta' 
Sortable tables

See merge request bde/nk20!257
 2024-08-08 17:37:31 +02:00
korenstin 27b00ba4f0 Merge branch 'beta' into sortable_tables 2024-08-08 17:27:44 +02:00
korenstin 3fcbb4f310 Merge branch 'no-api-error' into 'beta' 
fix #113

See merge request bde/nk20!253
 2024-08-08 17:05:25 +02:00
korenstin d1c9a2a7f1 Merge branch 'beta' into no-api-error 2024-08-08 16:54:21 +02:00
korenstin a673fd6871 Merge branch 'ouvreureuse' into 'beta' 
Ouvreureuse

See merge request bde/nk20!256
 2024-08-08 16:41:06 +02:00
korenstin a324d3a892 Merge branch 'beta' into ouvreureuse 2024-08-08 16:28:22 +02:00
korenstin 951ba74f8f Merge branch 'bug_31_july' into 'beta' 
bug du jour 31 juillet (bissextile)

See merge request bde/nk20!254
 2024-08-08 16:23:21 +02:00
korenstin abc4f14bd1 Merge branch '404_or_403' into 'beta' 
fix #65 Returning 403 when you don't have enough permissions

See merge request bde/nk20!259
 2024-08-07 21:54:54 +02:00
korenstin 47138bafd4 Merge branch 'traduction_inclusive_fr' into 'beta' 
De l'inclusif, partout

See merge request bde/nk20!258
 2024-08-07 21:45:05 +02:00
korenstin a3920fcae3 Merge branch 'Fix_time_zone_calendar.ics' into 'beta' 
Update views.py - Fix calendar.ics

See merge request bde/nk20!237
 2024-08-07 21:26:32 +02:00