1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-11 04:17:33 +02:00

Commit Graph

  • 5558341c8c Change deprecated function quark 2024-08-27 19:14:59 +02:00
  • 35ef82223c Merge branch 'food_traceability' into 'main' quark 2024-08-27 18:46:54 +02:00
  • 9ccac36831 Copy constructor korenstin 2024-08-27 18:01:13 +02:00
  • 2e71ce05a9 Merge branch 'main' into food_traceability quark 2024-08-27 17:00:11 +02:00
  • f2cb10b69f Fix problem in addingredientform, change filter for container in QrcodeForm quark 2024-08-27 10:45:53 +02:00
  • 24c4edf2e3 Merge branch 'migration-django-4-2' into 'main' bleizi 2024-08-27 13:43:58 +02:00
  • 213e9a8b12 Fix problem in addingredientform, change filter for container in QrcodeForm quark 2024-08-27 10:45:53 +02:00
  • 2c56178b15 Merge branch 'main' into migration-django-4-2 korenstin 2024-08-25 16:14:59 +02:00
  • 48a5b04579 Merge branch 'beta' into migration-django-4-2 korenstin 2024-08-25 16:13:01 +02:00
  • 2ab5c4082a Merge branch 'beta' into 'main' v1.0.3 korenstin 2024-08-25 15:17:36 +02:00
  • 053225c6dc revert sort tables to member views korenstin 2024-08-25 15:13:02 +02:00
  • ac7b86651d Merge branch 'beta' into 'main' korenstin 2024-08-25 14:45:08 +02:00
  • 21f5a5d566 Merge branch 'invoice_template' into 'main' korenstin 2024-08-25 14:34:37 +02:00
  • ff9c78ed4e added opener in admin and fixed the guest view korenstin 2024-08-25 14:29:06 +02:00
  • 1e121297d1 Update invoice_sample.tex, remove link toward bde.ens-cachan quark 2024-08-23 00:32:37 +02:00
  • 549f56dc0b Translation quark 2024-08-17 02:43:56 +02:00
  • debeb33d46 Improve/modify form, view, template. Add permissions quark 2024-08-17 02:28:27 +02:00
  • 6d7076b03e Edit forms, views, template to improve/modify view. Edit urls to remove some path. Few changes in models. quark 2024-08-14 01:32:55 +02:00
  • 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). quark 2024-08-13 02:07:32 +02:00
  • 28117c8c61 Add developers, Opener comments korenstin 2024-08-10 11:47:33 +02:00
  • 0d9891fbd8 Merge branch 'migration-django-4-2' of gitlab.crans.org:bde/nk20 into migration-django-4-2 bleizi 2024-08-09 23:20:48 +02:00
  • 4be4a18dd1 Merge branch 'sortable_tables' into 'beta' korenstin 2024-08-08 17:37:31 +02:00
  • 27b00ba4f0 Merge branch 'beta' into sortable_tables korenstin 2024-08-08 17:27:44 +02:00
  • 3fcbb4f310 Merge branch 'no-api-error' into 'beta' korenstin 2024-08-08 17:05:25 +02:00
  • d1c9a2a7f1 Merge branch 'beta' into no-api-error korenstin 2024-08-08 16:54:21 +02:00
  • a673fd6871 Merge branch 'ouvreureuse' into 'beta' korenstin 2024-08-08 16:41:06 +02:00
  • a324d3a892 Merge branch 'beta' into ouvreureuse korenstin 2024-08-08 16:28:22 +02:00
  • 951ba74f8f Merge branch 'bug_31_july' into 'beta' korenstin 2024-08-08 16:23:21 +02:00
  • abc4f14bd1 Merge branch '404_or_403' into 'beta' korenstin 2024-08-07 21:54:54 +02:00
  • 47138bafd4 Merge branch 'traduction_inclusive_fr' into 'beta' korenstin 2024-08-07 21:45:05 +02:00
  • a3920fcae3 Merge branch 'Fix_time_zone_calendar.ics' into 'beta' korenstin 2024-08-07 21:26:32 +02:00
  • ae4213d087 Merge branch 'colored_linters' into 'beta' korenstin 2024-08-07 21:25:22 +02:00
  • 5a0fe7a6f0 Fr translation (treasury summary) summary_notes korenstin 2024-08-07 20:01:15 +02:00
  • eda8460014 Inclusif, admin and migrations (treasury summary) korenstin 2024-08-07 19:12:22 +02:00
  • b2b1f03b46 Edit food HTML template for translation, translations. Now the mandatory allergens are automatically created quark 2024-08-06 15:20:22 +02:00
  • 1c5ed2bd3f Edit base.html and few translations quark 2024-08-06 13:59:30 +02:00
  • a7e87ea639 API Food korenstin 2024-08-04 23:38:21 +02:00
  • cbf92651f0 Returning 403 when you don't have enough permissions korenstin 2024-08-04 21:58:57 +02:00
  • 12c93ff9da bug du jour 31 juillet (bissextile) korenstin 2024-07-30 02:52:11 +02:00
  • 354c79bb82 Inclusif manquant traduction_inclusive_fr korenstin 2024-08-04 01:39:04 +02:00
  • 1ea7b3dda1 documentation and modification of permissions korenstin 2024-08-02 15:21:34 +02:00
  • 15c71ad31a treasury summary Hugo 2023-10-05 16:54:45 +02:00
  • 35ffbfcf55 Colored linters korenstin 2024-08-01 17:26:17 +02:00
  • 162371042c Creation of "Opener", Fix #117 korenstin 2024-08-01 14:49:52 +02:00
  • 581715d804 Fix #95 (calendar) korenstin 2024-07-31 23:18:41 +02:00
  • c7c6f0350f Looks unused korenstin 2024-07-31 22:19:16 +02:00
  • 9d1024024b Each table can be sorted (with a few exceptions) korenstin 2024-07-30 21:42:45 +02:00
  • d595d908c6 Fix tests Emmy D'ANELLO 2022-08-29 14:52:34 +02:00
  • 734f5b242d C'est pas moi Emmy D'ANELLO 2022-08-29 13:22:01 +02:00
  • b0c7d43a50 De l'inclusif, partout Emmy D'ANELLO 2022-08-29 13:19:19 +02:00
  • 6f67d2c629 Documentation korenstin 2024-07-22 15:49:32 +02:00
  • 4b97ab2e2a linters korenstin 2024-07-11 13:38:22 +02:00
  • dcfd0167e7 Security against the cycles korenstin 2024-07-08 17:44:09 +02:00
  • 50a680eed2 Open table and shelf life korenstin 2024-07-07 21:25:26 +02:00
  • 226a2a6357 Automatic allergens and expiry_date update korenstin 2024-07-06 19:26:21 +02:00
  • 48462f2ffc Adding ingredients to a preparation korenstin 2024-07-05 11:57:44 +02:00
  • 260513ae3b Migration fixes korenstin 2024-07-04 17:11:38 +02:00
  • 210a3cc93c Implementing QRcode creation, modifying Allergen model and creating of few views korenstin 2024-07-03 19:20:01 +02:00
  • 896095a44c Un peu de nettoyage, rajout de commentaires quark 2024-05-25 22:34:59 +02:00
  • 3f997f94fa few changes in models, delete default label quark 2024-05-25 16:47:24 +02:00
  • 0801ad64ae création de forms fonctionnel (form + views + url + html), few changes in models.py quark 2024-05-25 15:27:26 +02:00
  • 64bd5ed546 création d'un form pour l'ajout d'aliments basiques quark 2024-05-24 21:49:23 +02:00
  • 4c390dce17 nom app quark 2024-05-24 21:47:30 +02:00
  • adacc293f5 First forms quark 2024-05-23 23:53:33 +02:00
  • 968fa64d37 Réagencement des tables et de leurs attributs quark 2024-05-21 14:07:35 +02:00
  • a481adbae4 création de l'interface admin temporaire quark 2024-05-21 11:21:13 +02:00
  • 4de2e987ef Rajout de la pseudo-doc quark 2024-05-17 21:33:30 +02:00
  • 9e6342c929 Création de l'apps et de la base de donnée quark 2024-05-17 20:46:38 +02:00
  • 74de358953 Update README.md quark 2024-05-17 20:40:52 +02:00
  • 7322d55789 Fix #113. Fix regex in views. korenstin 2024-07-18 13:51:56 +02:00
  • 1a258dfe9e Parse input of search filters to prevent errors based on invalid regex, fixes #113 Yohann D'ANELLO 2022-03-10 16:11:01 +01:00
  • b8f81048a5 Merge branch 'fix_ActivityList' into 'main' korenstin 2024-07-18 18:17:06 +02:00
  • af819f45a1 Merge branch 'remove_picture' into 'main' korenstin 2024-07-18 18:02:43 +02:00
  • 076d065ffa Merge branch 'main' into 'remove_picture' korenstin 2024-07-18 17:52:22 +02:00
  • 2da77d9c17 Merge branch 'fix_join_bda' into 'main' korenstin 2024-07-18 17:14:23 +02:00
  • 01584d6330 Merge branch 'modif_perm' into 'main' korenstin 2024-07-18 16:54:23 +02:00
  • 4c0a5922c4 Allow to order the 2 tables and to fix the bug of several activities korenstin 2024-07-15 22:06:11 +02:00
  • f90b28fc7c Fix #126 (join_bda) korenstin 2024-07-15 14:27:55 +02:00
  • bbbdcc7247 linters korenstin 2024-07-13 18:03:19 +02:00
  • 925e0f26f5 Allow you to delete the profile picture korenstin 2024-07-13 17:37:19 +02:00
  • feeb99041f Fix the Alias Search API korenstin 2024-07-13 12:41:59 +02:00
  • bb9f58e497 Migrate to Django 5.0, change requirements and tests, remove ifnotequal, remove htcpcp and CAS Server, adapt Picker, fix alias (lookup) and logout, change URL to re_path migration-django-5-0 korenstin 2024-07-11 11:58:37 +02:00
  • c912383f86 oups la virgule oublié quark 2024-06-24 22:36:22 +02:00
  • 32830e43fd Modify permission for negative quark 2024-06-24 21:21:22 +02:00
  • 11c6a6fa7a modifications permissions consommation pc kfet (Alcool) korenstin 2024-06-24 16:57:39 +02:00
  • 201d6b114a Merge branch 'new_logo' into 'main' korenstin 2024-06-03 22:00:03 +02:00
  • 19e77df299 Merge branch 'main' into 'new_logo' korenstin 2024-06-03 21:59:44 +02:00
  • 5fd6ec5668 Merge branch 'charte_info' into 'main' korenstin 2024-06-03 21:53:01 +02:00
  • 2807b6ef44 Note en mode vieux pour la Kokarde de remise des diplomes quark 2024-05-30 22:06:51 +02:00
  • 10a01c5bc2 linters korenstin 2024-05-30 20:21:56 +02:00
  • 989905ea64 Update .gitlab-ci.yml korenstin 2024-05-26 18:41:49 +02:00
  • 0218d43a17 Update .gitlab-ci.yml korenstin 2024-05-26 16:00:26 +02:00
  • 5d30b0e819 charte info test 2024-05-26 15:46:50 +02:00
  • ec759dd3c0 error py37-django22 korenstin 2024-05-23 22:38:09 +02:00
  • 2eb965291d new_logo korenstin 2024-05-23 21:46:01 +02:00
  • 7f182ee2ee Merge branch 'traduction_inclusive_fr' into 'main' quark 2024-03-30 13:24:06 +01:00
  • 3132aa4c38 Prise en compte des commentaires de Korenstin quark 2024-03-30 12:44:51 +01:00
  • c7eb774859 Prise en compte des commentaires quark 2024-03-30 11:20:23 +01:00
  • 32f8d285b3 Prise en compte des commentaires quark 2024-03-30 11:12:33 +01:00
  • 050256ea13 Réécriture en inclusif de l'ensemble des textes français de la note quark 2024-03-29 17:59:43 +01:00