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

1996 Commits

Author SHA1 Message Date
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
quark 4de2e987ef Rajout de la pseudo-doc 2024-07-22 15:52:07 +02:00
quark 9e6342c929 Création de l'apps et de la base de donnée 2024-07-22 15:50:09 +02:00
quark 74de358953 Update README.md 2024-07-22 15:50:09 +02:00
korenstin b8f81048a5 Merge branch 'fix_ActivityList' into 'main' 
Allow to order the 2 tables and to fix the bug of several activities

See merge request bde/nk20!252
 2024-07-18 18:17:06 +02:00
korenstin af819f45a1 Merge branch 'remove_picture' into 'main' 
Allow you to delete the profile picture

See merge request bde/nk20!250
 2024-07-18 18:02:43 +02:00
korenstin 076d065ffa Merge branch 'main' into 'remove_picture' 
# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
 2024-07-18 17:52:22 +02:00
korenstin 2da77d9c17 Merge branch 'fix_join_bda' into 'main' 
Fix #126 (join_bda)

Closes #126

See merge request bde/nk20!251
 2024-07-18 17:14:23 +02:00
korenstin 01584d6330 Merge branch 'modif_perm' into 'main' 
Modif perm

See merge request bde/nk20!249
 2024-07-18 16:54:23 +02:00
korenstin 4c0a5922c4 Allow to order the 2 tables and to fix the bug of several activities 2024-07-15 22:06:11 +02:00
korenstin f90b28fc7c Fix #126 (join_bda) 2024-07-15 14:30:46 +02:00
korenstin 925e0f26f5 Allow you to delete the profile picture 2024-07-13 17:37:19 +02:00
quark c912383f86 oups la virgule oublié 2024-06-24 22:36:22 +02:00
quark 32830e43fd Modify permission for negative 2024-06-24 21:21:22 +02:00
korenstin 11c6a6fa7a modifications permissions consommation pc kfet (Alcool) 2024-06-24 16:57:39 +02:00
korenstin 201d6b114a Merge branch 'new_logo' into 'main' 
New logo

See merge request bde/nk20!247
 2024-06-03 22:00:03 +02:00
korenstin 19e77df299 Merge branch 'main' into 'new_logo' 
# Conflicts:
#   .gitlab-ci.yml
 2024-06-03 21:59:44 +02:00
korenstin 5fd6ec5668 Merge branch 'charte_info' into 'main' 
Charte info

See merge request bde/nk20!248
 2024-06-03 21:53:01 +02:00
korenstin 10a01c5bc2 linters 2024-05-30 20:21:56 +02:00
korenstin 989905ea64 Update .gitlab-ci.yml 2024-05-26 18:41:49 +02:00
korenstin 0218d43a17 Update .gitlab-ci.yml 2024-05-26 16:00:26 +02:00
test 5d30b0e819 charte info 2024-05-26 15:46:50 +02:00
korenstin ec759dd3c0 error py37-django22 2024-05-23 22:38:09 +02:00
korenstin 2eb965291d new_logo 2024-05-23 21:46:01 +02:00
quark 7f182ee2ee Merge branch 'traduction_inclusive_fr' into 'main' 
Réécriture en inclusif de l'ensemble des textes français de la note

See merge request bde/nk20!246
 2024-03-30 13:24:06 +01:00
quark 3132aa4c38 Prise en compte des commentaires de Korenstin 2024-03-30 12:44:51 +01:00
quark c7eb774859 Prise en compte des commentaires 2024-03-30 11:20:23 +01:00
quark 32f8d285b3 Prise en compte des commentaires 2024-03-30 11:12:33 +01:00
quark 050256ea13 Réécriture en inclusif de l'ensemble des textes français de la note 2024-03-29 17:59:43 +01:00
quark 7afd15b1cc Merge branch 'invoice_modification' into 'main' 
changement template facture

Closes #128

See merge request bde/nk20!243
 2024-03-27 19:10:40 +01:00
korenstin 258361f116 Update forms.py 2024-03-27 10:25:38 +01:00
korenstin a307530579 Merge branch 'change_date' into 'main' 
change date

See merge request bde/nk20!245
 2024-03-27 10:19:37 +01:00
quark 5de930bf40 Update forms.py 2024-03-27 10:04:14 +01:00
quark f7ebe0e99b Update forms.py 2024-03-27 09:43:49 +01:00
quark 73de6e2176 Update forms.py 2024-03-27 09:20:32 +01:00
test 201611b105 change date 2024-03-26 08:33:34 +01:00
quark 40c239e9da Update models.py 2024-03-24 16:41:18 +01:00
quark 2aaab2b454 Update test_treasury.py 2024-03-24 15:55:46 +01:00