Commit Graph

  • bc0a2f7745 Merge branch 'summary_notes' into 'main' hugoooo 2024-10-11 10:04:25 +0200
  • 78838b404c Merge branch 'qrcode' into 'main' Otthorn 2024-10-11 05:06:54 +0200
  • 4c6ee2e13e Merge branch 'nix-shell' into 'main' aeltheos 2024-10-11 00:51:31 +0200
  • 7975fe47a6 Merge branch 'sda' into 'main' main quark 2024-10-10 23:44:22 +0200
  • 476fbceeea Donation goal la note kfet x les SdA quark 2024-10-10 01:48:23 +0200
  • 8fbaa0bdc8 Merge branch 'linters' into 'main' mcngnt 2024-10-03 16:51:04 +0200
  • a0de63effd Merge branch 'beta' into 'main' thomasl 2024-09-18 13:52:33 +0200
  • 09fb1d227e Correction translation of sport events ml beta korenstin 2024-09-18 08:54:04 +0200
  • 2e27d4f05c Merge branch 'non-BDE-members-permission-fix' into 'main' thomasl 2024-09-17 17:24:30 +0200
  • 5d16dc4e7d Added some necessary rights non-BDE-members-permission-fix Nicolas Margulies 2024-09-17 17:13:47 +0200
  • 3c34033bf5
    fix linters for WEI 2024 survey bleizi 2024-09-12 13:41:04 +0200
  • 131f508433 Merge branch 'survey_wei_2024' into 'main' mcngnt 2024-09-12 12:03:10 +0200
  • c1a353963a handle hardcoded corrected survey_wei_2024 mcngnt 2024-09-12 11:36:37 +0200
  • 178ce2b579 update hardcoded mcngnt 2024-09-10 19:37:12 +0200
  • 9162319734 Merge branch 'quark-main-patch-05186' into 'main' quark 2024-09-09 21:02:19 +0200
  • 5d2a8e9b79 Update views.py (don't display forced blocked note, it's just temporary patch, we need to block these note in models too) quark 2024-09-09 19:05:53 +0200
  • 33c94d0720 Merge branch 'non-BDE-members' into 'main' bleizi 2024-09-05 23:15:04 +0200
  • 5040e8e8ea Merge branch 'continuous-intergration' into 'main' bleizi 2024-09-05 20:54:40 +0200
  • c5697c4cb4 don't hide the transfer tab Nicolas Margulies 2024-09-05 20:54:23 +0200
  • e188c5a153 Merge branch 'mail' into 'main' nicomarg 2024-09-05 20:29:30 +0200
  • 94e1fdc93a
    add ubuntu 24.4 in tox.ini and remove debian bullseye in gitlab-ci bleizi 2024-09-05 20:19:46 +0200
  • d1ef367bab Permissions for child clubs, also changed spaces for tabs Nicolas Margulies 2024-09-05 20:17:45 +0200
  • 0fbb19c5fd
    limite mail sending to 10 per minute and purge fail mail log bleizi 2024-09-05 19:48:54 +0200
  • 21cbf2b21a Merge branch 'survey_wei_2024' into 'main' mcngnt 2024-08-29 23:10:57 +0200
  • 185a2cabf2 corrected emoji + linting mcngnt 2024-08-29 22:47:33 +0200
  • 7552e55c8d removed diet filed mcngnt 2024-08-29 22:19:11 +0200
  • 361de9f8b4 more bug fixing nicomarg 2024-08-29 21:06:34 +0200
  • e2426bd6a6 Bugfix nicomarg 2024-08-29 20:03:43 +0200
  • 7fea619a9f add permission to make transfers with members of your club nicomarg 2024-08-29 20:02:06 +0200
  • 7b5eefcc0a Update 2 files nicomarg 2024-08-29 19:23:26 +0200
  • e4aa16986f Merge branch 'survey_wei_2024' into 'main' mcngnt 2024-08-29 19:12:23 +0200
  • b92e6e4e10 linting mcngnt 2024-08-29 18:36:20 +0200
  • dd675b3676 Merge branch 'survey_wei_2024' into 'main' mcngnt 2024-08-29 14:45:28 +0200
  • f50849b4f8 delete print mcngnt 2024-08-29 14:01:55 +0200
  • 73ff35c232 updated bus descr mcngnt 2024-08-29 12:42:26 +0200
  • a5df98224f Merge branch 'migration-django-4-2' into 'main' korenstin 2024-08-29 10:49:44 +0200
  • 2cb9ac8735 replace "…" -> "..." (#130) and disable sorting on certain columns (#129) migration-django-4-2 korenstin 2024-08-29 10:17:13 +0200
  • 35d4849a28 fix Oauth korenstin 2024-08-29 00:43:33 +0200
  • 96539d262f working html for survey + fixed json error + added specific diet text field mcngnt 2024-08-29 00:05:44 +0200
  • 946674f59b inclusif, avoids python3.10 syntax korenstin 2024-08-28 11:11:32 +0200
  • a201d8376a updated survey mcngnt 2024-08-26 17:09:05 +0200
  • a21b9275ea Add caution_check in the validation form, #96 korenstin 2024-08-05 11:52:47 +0200
  • d4e85e8215 test wei 2024, linters korenstin 2024-08-04 17:05:35 +0200
  • 7af2ebba40 basic survey mcngnt 2024-07-03 18:55:41 +0200
  • bd94400883 Merge branch 'food_traceability' into 'main' quark 2024-08-27 19:15:52 +0200
  • 5558341c8c Change deprecated function food_traceability quark 2024-08-27 19:14:59 +0200
  • 35ef82223c Merge branch 'food_traceability' into 'main' quark 2024-08-27 18:46:54 +0200
  • 9ccac36831 Copy constructor korenstin 2024-08-27 18:01:13 +0200
  • 2e71ce05a9 Merge branch 'main' into food_traceability quark 2024-08-27 17:00:11 +0200
  • f2cb10b69f Fix problem in addingredientform, change filter for container in QrcodeForm quark 2024-08-27 10:45:53 +0200
  • 24c4edf2e3 Merge branch 'migration-django-4-2' into 'main' bleizi 2024-08-27 13:43:58 +0200
  • 213e9a8b12 Fix problem in addingredientform, change filter for container in QrcodeForm quark 2024-08-27 10:45:53 +0200
  • 900c0f941c Merge branch 'svg_icons' into 'main' me5na7qbjqbrp 2024-08-25 20:46:54 +0200
  • 2c56178b15 Merge branch 'main' into migration-django-4-2 korenstin 2024-08-25 16:14:59 +0200
  • 48a5b04579 Merge branch 'beta' into migration-django-4-2 korenstin 2024-08-25 16:13:01 +0200
  • 2ab5c4082a Merge branch 'beta' into 'main' v1.0.3 korenstin 2024-08-25 15:17:36 +0200
  • 053225c6dc revert sort tables to member views korenstin 2024-08-25 15:13:02 +0200
  • ac7b86651d Merge branch 'beta' into 'main' korenstin 2024-08-25 14:45:08 +0200
  • 21f5a5d566 Merge branch 'invoice_template' into 'main' korenstin 2024-08-25 14:34:37 +0200
  • ff9c78ed4e added opener in admin and fixed the guest view korenstin 2024-08-25 14:29:06 +0200
  • 1e121297d1 Update invoice_sample.tex, remove link toward bde.ens-cachan quark 2024-08-23 00:32:37 +0200
  • 549f56dc0b Translation quark 2024-08-17 02:43:56 +0200
  • debeb33d46 Improve/modify form, view, template. Add permissions quark 2024-08-17 02:28:27 +0200
  • 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 +0200
  • 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 +0200
  • 28117c8c61 Add developers, Opener comments korenstin 2024-08-10 11:47:33 +0200
  • 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 +0200
  • 4be4a18dd1 Merge branch 'sortable_tables' into 'beta' korenstin 2024-08-08 17:37:31 +0200
  • 27b00ba4f0 Merge branch 'beta' into sortable_tables korenstin 2024-08-08 17:27:44 +0200
  • 3fcbb4f310 Merge branch 'no-api-error' into 'beta' korenstin 2024-08-08 17:05:25 +0200
  • d1c9a2a7f1 Merge branch 'beta' into no-api-error korenstin 2024-08-08 16:54:21 +0200
  • a673fd6871 Merge branch 'ouvreureuse' into 'beta' korenstin 2024-08-08 16:41:06 +0200
  • a324d3a892 Merge branch 'beta' into ouvreureuse korenstin 2024-08-08 16:28:22 +0200
  • 951ba74f8f Merge branch 'bug_31_july' into 'beta' korenstin 2024-08-08 16:23:21 +0200
  • abc4f14bd1 Merge branch '404_or_403' into 'beta' korenstin 2024-08-07 21:54:54 +0200
  • 47138bafd4 Merge branch 'traduction_inclusive_fr' into 'beta' korenstin 2024-08-07 21:45:05 +0200
  • a3920fcae3 Merge branch 'Fix_time_zone_calendar.ics' into 'beta' korenstin 2024-08-07 21:26:32 +0200
  • ae4213d087 Merge branch 'colored_linters' into 'beta' korenstin 2024-08-07 21:25:22 +0200
  • 5a0fe7a6f0 Fr translation (treasury summary) summary_notes korenstin 2024-08-07 20:01:15 +0200
  • eda8460014 Inclusif, admin and migrations (treasury summary) korenstin 2024-08-07 19:12:22 +0200
  • b2b1f03b46 Edit food HTML template for translation, translations. Now the mandatory allergens are automatically created quark 2024-08-06 15:20:22 +0200
  • 1c5ed2bd3f Edit base.html and few translations quark 2024-08-06 13:59:30 +0200
  • a7e87ea639 API Food korenstin 2024-08-04 23:38:21 +0200
  • cbf92651f0 Returning 403 when you don't have enough permissions korenstin 2024-08-04 21:58:57 +0200
  • 12c93ff9da bug du jour 31 juillet (bissextile) korenstin 2024-07-30 02:52:11 +0200
  • 354c79bb82 Inclusif manquant traduction_inclusive_fr korenstin 2024-08-04 01:39:04 +0200
  • 1ea7b3dda1 documentation and modification of permissions korenstin 2024-08-02 15:21:34 +0200
  • 15c71ad31a treasury summary Hugo 2023-10-05 16:54:45 +0200
  • 35ffbfcf55 Colored linters korenstin 2024-08-01 17:26:17 +0200
  • 162371042c Creation of "Opener", Fix #117 korenstin 2024-08-01 14:49:52 +0200
  • 581715d804 Fix #95 (calendar) korenstin 2024-07-31 23:18:41 +0200
  • c7c6f0350f Looks unused korenstin 2024-07-31 22:19:16 +0200
  • 9d1024024b Each table can be sorted (with a few exceptions) korenstin 2024-07-30 21:42:45 +0200
  • d595d908c6 Fix tests Emmy D'ANELLO 2022-08-29 14:52:34 +0200
  • 734f5b242d C'est pas moi Emmy D'ANELLO 2022-08-29 13:22:01 +0200
  • b0c7d43a50 De l'inclusif, partout Emmy D'ANELLO 2022-08-29 13:19:19 +0200
  • 6f67d2c629 Documentation korenstin 2024-07-22 15:49:32 +0200
  • 4b97ab2e2a linters korenstin 2024-07-11 13:38:22 +0200
  • dcfd0167e7 Security against the cycles korenstin 2024-07-08 17:44:09 +0200
  • 50a680eed2 Open table and shelf life korenstin 2024-07-07 21:25:26 +0200