1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-05-15 06:52:50 +00:00

Commit Graph

  • e9cc7fb38a Merge branch 'qrcode' into 'main' Otthorn 2025-05-11 06:02:35 +02:00
  • 5184071702 Merge branch 'nix-shell' into 'main' aeltheos 2025-05-11 06:00:54 +02:00
  • 7b9ff119e8 Merge branch 'food_bugs' into 'main' main quark 2025-05-10 19:46:44 +02:00
  • a62cad9a3f Merge branch 'food_bugs' into 'main' ehouarn 2025-05-10 19:27:04 +02:00
  • 108a56745c Corrections de quelques bugs (par Quark) food_bugs Ehouarn 2025-05-10 19:24:05 +02:00
  • 9643d7652b Merge branch 'delete_activity' into 'main' ehouarn 2025-05-09 20:15:46 +02:00
  • 43136815b8 Merge branch 'delete_activity' into 'main' ehouarn 2025-05-09 20:03:34 +02:00
  • fadb289ed7 migrations delete_activity Ehouarn 2025-05-09 19:48:04 +02:00
  • 905fc6e7cc Merge branch 'delete_activity' into 'main' ehouarn 2025-05-08 20:28:21 +02:00
  • 1e62c605b8 Merge branch 'delete_activity' into 'main' ehouarn 2025-05-08 20:14:33 +02:00
  • cdd81c1444 Update views.py ehouarn 2025-05-08 20:14:24 +02:00
  • 4afafceba1 Update activity_detail.html ehouarn 2025-05-08 19:39:59 +02:00
  • 3065eacc96 Update views.py ehouarn 2025-05-08 19:38:40 +02:00
  • 71ef3aedd8 Update views.py ehouarn 2025-05-08 19:09:22 +02:00
  • 0cf11c6348 ok Ehouarn 2025-05-08 18:34:23 +02:00
  • 70abd0f490 Merge branch 'food_traceability' into 'main' quark 2025-05-07 18:26:40 +02:00
  • 4702f7d52a Merge branch 'food_traceability' into 'main' quark 2025-05-07 18:05:57 +02:00
  • 4445dd4a96 Remove food with end_of_life not null from open table food_traceability quark 2025-05-07 18:04:47 +02:00
  • 03932672f3 Merge branch 'food_traceability' into 'main' quark 2025-05-04 20:17:51 +02:00
  • 31ef8e75db Merge branch 'food_traceability' into 'main' quark 2025-05-04 18:01:11 +02:00
  • dc6a40de02 bug fix and doc quark 2025-05-04 17:56:44 +02:00
  • d58a299a8b Merge branch 'food_traceability' into 'main' quark 2025-04-30 12:38:32 +02:00
  • ad0a219ed3 Add manage ingredient feature, fix some bug quark 2025-04-30 11:59:08 +02:00
  • c4404ef995 Merge branch 'food_traceability' into 'main' quark 2025-04-28 13:35:17 +02:00
  • b4f3a158a6 fix permission bug quark 2025-04-27 16:54:58 +02:00
  • f0e9a7d3dc Merge branch 'food_traceability' into 'main' quark 2025-04-27 09:36:46 +02:00
  • a2b42c5329 permission, fixture, translation (fr), bug fixes quark 2025-04-24 20:50:32 +02:00
  • 6d6583bfe6 Rewrite food apps, new feature some changes to model quark 2025-04-22 19:52:32 +02:00
  • 485d093002 here we go again (better this time) quark 2025-04-16 17:26:00 +02:00
  • 9252d0ef6a Merge branch 'summary_notes' into 'main' hugoooo 2025-04-16 05:25:04 +02:00
  • ff4353d344 Merge branch 'update_invoice_template' into 'main' ehouarn 2025-04-15 18:11:18 +02:00
  • a90f45bd8b Replace Diolistos.png update_invoice_template ehouarn 2025-04-15 17:38:45 +02:00
  • 10c22ccc53 Replace Diolistos_bg.jpg ehouarn 2025-04-15 17:38:26 +02:00
  • 6969cee0f3 Merge branch 'time-display' into 'main' quark 2025-04-15 17:28:28 +02:00
  • ddeada200b Changement logo factures Ehouarn 2025-04-15 17:26:14 +02:00
  • 8e2b24b2da Merge branch 'options_order' into 'main' ehouarn 2025-04-13 23:12:05 +02:00
  • bd76c280ec Update forms.py ehouarn 2025-04-13 22:59:04 +02:00
  • ca0a95ba9e Update transaction_form.html ehouarn 2025-04-13 22:32:49 +02:00
  • 614f76e699 Add BDA email as an option to fix NL updates alexismdr 2025-04-13 20:17:44 +02:00
  • a5815f0bc7 Add BDA email as an option to fix NL updates alexismdr 2025-04-13 19:56:20 +02:00
  • 84e9fea15f linters time-display bleizi 2025-04-04 14:46:43 +02:00
  • b7a660ee40 bootstrap: fix minor issues with profile picture cropping alexismdr 2025-04-04 01:14:46 +02:00
  • b9ebb1718a Fixed some non timezone-aware displays Nicolas Margulies 2025-04-04 00:29:22 +02:00
  • 7ba5c76a89 Merge branch 'guests_schools' into 'main' quark 2025-03-25 18:59:46 +01:00
  • 702ddb5679 add school field to guest guests_schools quark 2025-03-25 17:39:31 +01:00
  • 93aed87265 bootstrap: fix minor issues with profile picture cropping Alexis Mercier des Rochettes 2025-03-24 17:34:06 +01:00
  • 60355196ce Merge branch 'openid-connect' into 'main' bleizi 2025-03-20 18:42:51 +01:00
  • 9bffb32a5e
    documentation bleizi 2025-03-20 17:36:38 +01:00
  • 5ef019c5c2 Merge branch 'notekfet_wrapped' into 'main' export_members_ml quark 2025-03-18 16:11:33 +01:00
  • 8da62e62fb Rewrite script and add test notekfet_wrapped quark 2025-03-18 15:53:02 +01:00
  • 56a43396d4 Merge branch 'Add_some_permissions' into 'main' thomasl 2025-03-17 13:16:01 +01:00
  • 7966d6f397 Update file initial.json Add_some_permissions thomasl 2025-03-17 13:15:07 +01:00
  • cb61c511ce Merge branch 'notekfet_wrapped' into 'main' quark 2025-03-14 00:44:57 +01:00
  • 25bfa575ed Another tables and doc quark 2025-03-13 23:56:10 +01:00
  • e21d9fcfbe Merge branch 'notekfet_wrapped' into 'main' quark 2025-03-14 00:11:04 +01:00
  • b293904525 Another tables and doc quark 2025-03-13 23:56:10 +01:00
  • bd7e6b8ad4 add table, add some translation quark 2025-03-13 21:01:50 +01:00
  • a208a4fa25 Merge branch 'bde_color' into 'main' quark 2025-03-13 00:44:45 +01:00
  • 4799b2c52d Resize and compress image, add shiny button quark 2025-03-12 23:42:37 +01:00
  • 562dcfb908 Update file initial.json thomasl 2025-03-11 19:34:56 +01:00
  • 12ef258ff0 Update file initial.json thomasl 2025-03-11 19:27:02 +01:00
  • 2ae32ee3b6 Update file initial.json thomasl 2025-03-11 19:26:49 +01:00
  • ec1bd45481 Update file initial.json thomasl 2025-03-11 19:14:09 +01:00
  • 370a9a069e Merge branch 'bde_color' into 'main' quark 2025-03-11 10:31:02 +01:00
  • 7f0a3784e9 Rave Part[list] colors quark 2025-03-11 10:15:11 +01:00
  • 36f4adf2e7 Merge branch 'update_copyright' into 'main' quark 2025-03-09 18:35:44 +01:00
  • ae7d5d5489 update copyright quark 2025-03-09 18:14:58 +01:00
  • 434097aba4 Merge branch 'nerf_pc_kfet' into 'main' quark 2025-03-09 17:58:25 +01:00
  • a0ebf8658d nerf invalidate perm quark 2025-03-09 17:01:57 +01:00
  • 423454ba5d nerf PC Kfet perms quark 2025-03-09 14:37:35 +01:00
  • 3ccb31639c Merge branch 'perm_gc_anti_vss' into 'main' quark 2025-03-09 13:28:55 +01:00
  • 5fb12a1388 improve permissions for GC anti-VSS quark 2025-03-09 13:11:46 +01:00
  • fe029893b0 Merge branch 'permissions_fo_parent_clubs' into 'main' thomasl 2025-03-08 22:29:07 +01:00
  • 767e98c2a3 Update file initial.json permissions_fo_parent_clubs thomasl 2025-03-08 22:05:22 +01:00
  • 1bdad76fe9 Update file initial.json thomasl 2025-03-08 22:00:46 +01:00
  • 0196db7fff Update file initial.json thomasl 2025-03-08 21:54:28 +01:00
  • 1f53ad4407 Update file initial.json thomasl 2025-03-08 21:47:21 +01:00
  • 018f6e3f13 Update file initial.json thomasl 2025-03-08 21:37:53 +01:00
  • 9752a030d9 Update file initial.json thomasl 2025-03-08 21:30:25 +01:00
  • b27bdb090d Update file initial.json thomasl 2025-03-08 21:30:16 +01:00
  • 55a0fbb6cb Update file initial.json thomasl 2025-03-08 21:15:56 +01:00
  • c356534309 Update file initial.json thomasl 2025-03-08 20:25:33 +01:00
  • 51315a0555 Update file initial.json thomasl 2025-03-08 20:25:16 +01:00
  • e5f9fe2cf5 Update file initial.json thomasl 2025-03-08 20:00:20 +01:00
  • 6c63c6417c Typesetting Nicolas Margulies 2025-03-08 16:08:40 +01:00
  • 4563b2b640 Added configusation for OpenID support, along with installation information Nicolas Margulies 2025-03-08 16:04:25 +01:00
  • c630a3fbd5 Merge branch 'change_template' into 'main' quark 2025-03-07 19:25:27 +01:00
  • 79b8ebeca4 Merge branch 'main' into change_template quark 2025-03-07 19:09:17 +01:00
  • dc14ba0101 Suppression article TVA quark 2025-03-07 18:42:41 +01:00
  • 6028bfeb56 Merge branch 'notekfet_wrapped' into 'main' quark 2025-03-05 22:03:51 +01:00
  • bd9773a8af change icon quark 2025-03-05 13:28:55 +01:00
  • cdeb76d9f8 Merge branch 'main' into notekfet_wrapped quark 2025-03-04 19:08:32 +01:00
  • ac4574200d Modify font quark 2025-03-04 18:45:22 +01:00
  • b17d31e8ee translation quark 2025-02-25 13:52:40 +01:00
  • 30d27459dd modify tox.ini to use complex script for make wrapped (bypass C901 in linters) quark 2025-02-24 18:57:07 +01:00
  • 333f7aa284 update font and minor change quark 2025-02-24 18:37:18 +01:00
  • 587314e03c linters quark 2025-02-24 16:10:58 +01:00
  • 9f888a5281 Merge branch 'patch_openers_(forgot_something)' into 'main' thomasl 2025-02-18 21:44:21 +01:00
  • 88b1a25ca0 Update file initial.json thomasl 2025-02-18 21:26:55 +01:00
  • 8cb50f58f2 Merge branch 'Respo_jam_permission' into 'main' thomasl 2025-02-17 14:48:21 +01:00