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

1283 Commits

Author SHA1 Message Date
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 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
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 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 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
korenstin 27b00ba4f0 Merge branch 'beta' into sortable_tables 2024-08-08 17:27:44 +02:00
korenstin d1c9a2a7f1 Merge branch 'beta' into no-api-error 2024-08-08 16:54:21 +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
quark b2b1f03b46 Edit food HTML template for translation, translations. Now the mandatory allergens are automatically created 2024-08-06 15:20:22 +02:00
korenstin a7e87ea639 API Food 2024-08-04 23:38:21 +02:00
korenstin cbf92651f0 Returning 403 when you don't have enough permissions 2024-08-04 21:58:57 +02:00
korenstin 12c93ff9da bug du jour 31 juillet (bissextile) 2024-08-04 14:45:17 +02:00
korenstin 1ea7b3dda1 documentation and modification of permissions 2024-08-02 15:21:34 +02:00
korenstin 162371042c Creation of "Opener", Fix #117 2024-08-01 14:49:52 +02:00
korenstin 581715d804 Fix #95 (calendar) 2024-07-31 23:18:41 +02:00
korenstin c7c6f0350f Looks unused 2024-07-31 22:19:16 +02:00
korenstin 9d1024024b Each table can be sorted (with a few exceptions) 2024-07-30 21:42:45 +02:00
Emmy D'ANELLO d595d908c6 Fix tests 
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
 2024-07-30 16:34:20 +02:00
Emmy D'ANELLO b0c7d43a50 De l'inclusif, partout 
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
 2024-07-30 16:28:47 +02:00
korenstin 4b97ab2e2a linters 2024-07-22 15:52:09 +02:00
korenstin dcfd0167e7 Security against the cycles 2024-07-22 15:52:09 +02:00
korenstin 50a680eed2 Open table and shelf life 2024-07-22 15:52:09 +02:00
korenstin 226a2a6357 Automatic allergens and expiry_date update 2024-07-22 15:52:09 +02:00
korenstin 48462f2ffc Adding ingredients to a preparation 2024-07-22 15:52:09 +02:00
korenstin 260513ae3b Migration fixes 2024-07-22 15:52:09 +02:00
korenstin 210a3cc93c Implementing QRcode creation, modifying Allergen model and creating of few views 2024-07-22 15:52:09 +02:00
quark 896095a44c Un peu de nettoyage, rajout de commentaires 2024-07-22 15:52:09 +02:00
quark 3f997f94fa few changes in models, delete default label 2024-07-22 15:52:09 +02:00
quark 0801ad64ae création de forms fonctionnel (form + views + url + html), few changes in models.py 2024-07-22 15:52:09 +02:00
quark 64bd5ed546 création d'un form pour l'ajout d'aliments basiques 2024-07-22 15:52:09 +02:00
quark 4c390dce17 nom app 2024-07-22 15:52:09 +02:00
quark adacc293f5 First forms 2024-07-22 15:52:09 +02:00
quark 968fa64d37 Réagencement des tables et de leurs attributs 2024-07-22 15:52:09 +02:00
quark a481adbae4 création de l'interface admin temporaire 2024-07-22 15:52:09 +02:00