ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-11-04 09:12:11 +01:00
Code Issues Releases Wiki Activity
2,256 Commits 46 Branches 4 Tags
763535bea45e1b4e966393fbb091f7d046d108d5
Commit Graph

2256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
quark
763535bea4 Merge branch 'oidc' into 'main' 
OIDC 0 Quark 1

See merge request bde/nk20!322
 2025-06-17 16:02:40 +02:00
quark
df0d886db9 linters 2025-06-17 11:46:33 +02:00
quark
092cc37320 OIDC 0 Quark 1 2025-06-17 00:38:11 +02:00
thomasl
16b55e23af Merge branch 'thomasl-main-patch-84944' into 'main' 
Update doc about scripts

See merge request bde/nk20!321
 2025-06-14 20:24:49 +02:00
thomasl
97621e8704 Update doc about scripts 2025-06-14 20:07:29 +02:00
quark
cf4c23d1ac Merge branch 'oidc' into 'main' 
oidc

See merge request bde/nk20!320
 2025-06-14 18:36:24 +02:00
quark
d71105976f oidc 2025-06-14 18:01:42 +02:00
quark
89cc03141b allow search with club name 2025-06-12 18:48:29 +02:00
ehouarn
ff812a028c Merge branch 'darbonne' into 'main' 
Darbonne

See merge request bde/nk20!318
 2025-05-26 16:47:03 +02:00
Ehouarn
5a8acbde00 Trez TaT en moins 2025-05-25 00:07:07 +02:00
Ehouarn
f60dc8cfa0 Pré-injection du BDA 2025-05-25 00:05:13 +02:00
Ehouarn
067dd6f9d1 WEI-Roles 2025-05-24 22:41:53 +02:00
Ehouarn
7b1e32e514 Réécriture des rôles pertinents 2025-05-24 22:29:11 +02:00
ehouarn
e88dbfd597 Merge branch 'darbonne' into 'main' 
Faute de frappe

See merge request bde/nk20!317
 2025-05-23 23:57:18 +02:00
Ehouarn
3d34270959 Faute de frappe 2025-05-23 23:38:06 +02:00
ehouarn
3bb99671ec Merge branch 'ehouarn-main-patch-70724' into 'main' 
Update views.py

See merge request bde/nk20!316
 2025-05-19 18:03:00 +02:00
ehouarn
0d69383dfd Update views.py 2025-05-19 17:45:01 +02:00
quark
7b9ff119e8 Merge branch 'food_bugs' into 'main' 
Corrections de quelques bugs (par Quark)

See merge request bde/nk20!315
 2025-05-10 19:46:44 +02:00
Ehouarn
108a56745c Corrections de quelques bugs (par Quark) 2025-05-10 19:24:05 +02:00
ehouarn
9643d7652b Merge branch 'delete_activity' into 'main' 
migrations

See merge request bde/nk20!314
 2025-05-09 20:15:46 +02:00
Ehouarn
fadb289ed7 migrations 2025-05-09 19:48:04 +02:00
ehouarn
905fc6e7cc Merge branch 'delete_activity' into 'main' 
Delete activity

See merge request bde/nk20!313
 2025-05-08 20:28:21 +02:00
ehouarn
cdd81c1444 Update views.py 2025-05-08 20:14:24 +02:00
ehouarn
4afafceba1 Update activity_detail.html 2025-05-08 19:39:59 +02:00
ehouarn
3065eacc96 Update views.py 2025-05-08 19:38:40 +02:00
ehouarn
71ef3aedd8 Update views.py 2025-05-08 19:09:22 +02:00
Ehouarn
0cf11c6348 ok 2025-05-08 18:34:23 +02:00
quark
70abd0f490 Merge branch 'food_traceability' into 'main' 
Remove food with end_of_life not null from open table

See merge request bde/nk20!312
 2025-05-07 18:26:40 +02:00
quark
4445dd4a96 Remove food with end_of_life not null from open table 2025-05-07 18:04:47 +02:00
quark
03932672f3 Merge branch 'food_traceability' into 'main' 
bug fix and doc

See merge request bde/nk20!311
 2025-05-04 20:17:51 +02:00
quark
dc6a40de02 bug fix and doc 2025-05-04 17:56:44 +02:00
quark
d58a299a8b Merge branch 'food_traceability' into 'main' 
Add manage ingredient feature, fix some bug

See merge request bde/nk20!310
 2025-04-30 12:38:32 +02:00
quark
ad0a219ed3 Add manage ingredient feature, fix some bug 2025-04-30 12:06:37 +02:00
quark
c4404ef995 Merge branch 'food_traceability' into 'main' 
fix bug

See merge request bde/nk20!309
 2025-04-28 13:35:17 +02:00
quark
b4f3a158a6 fix permission bug 2025-04-28 13:18:33 +02:00
quark
f0e9a7d3dc Merge branch 'food_traceability' into 'main' 
Food traceability

See merge request bde/nk20!308
 2025-04-27 09:36:46 +02:00
quark
a2b42c5329 permission, fixture, translation (fr), bug fixes 2025-04-24 20:50:32 +02:00
quark
6d6583bfe6 Rewrite food apps, new feature some changes to model 2025-04-22 19:52:32 +02:00
quark
485d093002 here we go again (better this time) 2025-04-16 17:26:00 +02:00
ehouarn
ff4353d344 Merge branch 'update_invoice_template' into 'main' 
Update invoice template

See merge request bde/nk20!307
 2025-04-15 18:11:18 +02:00
ehouarn
a90f45bd8b Replace Diolistos.png 2025-04-15 17:38:45 +02:00
ehouarn
10c22ccc53 Replace Diolistos_bg.jpg 2025-04-15 17:38:26 +02:00
quark
6969cee0f3 Merge branch 'time-display' into 'main' 
Fixed some non timezone-aware displays

See merge request bde/nk20!303
 2025-04-15 17:28:28 +02:00
Ehouarn
ddeada200b Changement logo factures 2025-04-15 17:26:14 +02:00
ehouarn
8e2b24b2da Merge branch 'options_order' into 'main' 
Options order

See merge request bde/nk20!306
 2025-04-13 23:12:05 +02:00
ehouarn
bd76c280ec Update forms.py 2025-04-13 22:59:04 +02:00
ehouarn
ca0a95ba9e Update transaction_form.html 2025-04-13 22:32:49 +02:00
alexismdr
614f76e699 Add BDA email as an option to fix NL updates 
Commit [1] removed default BDA email address from extract_ml_registrations script code. We should now add it to cron.

[1] 3dd5f6e3e0

See merge request bde/nk20!305
 2025-04-13 20:17:44 +02:00
alexismdr
a5815f0bc7 Add BDA email as an option to fix NL updates 
Commit [1] removed default BDA email address from extract_ml_registrations script code. We should now add it to cron.

[1] 3dd5f6e3e0
 2025-04-13 19:56:20 +02:00
bleizi
84e9fea15f linters 2025-04-04 14:46:43 +02:00