quark
4702f7d52a
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:05:57 +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] 3dd5f6e3e0bde/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
alexismdr
b7a660ee40
bootstrap: fix minor issues with profile picture cropping
...
* Add required [1] "display: block;" style property to img element
* Fix image overflow in modal. As cropper size inherits from img's parent element [2] (including padding according to my research), we need to wrap modal body into another div that has the padding we want.
* Remove ability [3] to click away to dismiss the modal as it often interfered with user interaction when cropping.
[1] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#example
[2] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#notes
[3] https://getbootstrap.com/docs/4.0/components/modal/#options
See merge request bde/nk20!301
2025-04-04 01:14:46 +02:00
Nicolas Margulies
b9ebb1718a
Fixed some non timezone-aware displays
2025-04-04 00:29:22 +02:00
quark
7ba5c76a89
Merge branch 'guests_schools' into 'main'
...
add school field to guest
See merge request bde/nk20!302
2025-03-25 18:59:46 +01:00
quark
702ddb5679
add school field to guest
2025-03-25 17:39:31 +01:00
Alexis Mercier des Rochettes
93aed87265
bootstrap: fix minor issues with profile picture cropping
...
* Add required [1] "display: block;" style property to img element
* Fix image overflow in modal. As cropper size inherits from img's parent element [2] (including padding according to my research), we need to wrap modal body into another div that has the padding we want.
* Remove ability [3] to click away to dismiss the modal as it often interfered with user interaction when cropping.
[1] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#example
[2] https://github.com/fengyuanchen/cropperjs/tree/v1?tab=readme-ov-file#notes
[3] https://getbootstrap.com/docs/4.0/components/modal/#options
Signed-off-by: Alexis Mercier des Rochettes <apernouille@gmail.com >
2025-03-24 17:36:30 +01:00
bleizi
60355196ce
Merge branch 'openid-connect' into 'main'
...
Openid connect
See merge request bde/nk20!293
2025-03-20 18:42:51 +01:00
bleizi
9bffb32a5e
documentation
2025-03-20 17:36:38 +01:00
quark
5ef019c5c2
Merge branch 'notekfet_wrapped' into 'main'
...
Rewrite script and add test
See merge request bde/nk20!300
2025-03-18 16:11:33 +01:00
quark
8da62e62fb
Rewrite script and add test
2025-03-18 15:53:02 +01:00
thomasl
56a43396d4
Merge branch 'Add_some_permissions' into 'main'
...
Add some permissions
See merge request bde/nk20!296
2025-03-17 13:16:01 +01:00
thomasl
7966d6f397
Update file initial.json
2025-03-17 13:15:07 +01:00
quark
cb61c511ce
Merge branch 'notekfet_wrapped' into 'main'
...
Another tables and doc
See merge request bde/nk20!299
2025-03-14 00:44:57 +01:00
quark
25bfa575ed
Another tables and doc
2025-03-14 00:31:25 +01:00
quark
e21d9fcfbe
Merge branch 'notekfet_wrapped' into 'main'
...
Notekfet wrapped
See merge request bde/nk20!298
2025-03-14 00:11:04 +01:00
quark
b293904525
Another tables and doc
2025-03-13 23:56:10 +01:00
quark
bd7e6b8ad4
add table, add some translation
2025-03-13 21:08:52 +01:00
quark
a208a4fa25
Merge branch 'bde_color' into 'main'
...
Resize and compress image, add shiny button
See merge request bde/nk20!297
2025-03-13 00:44:45 +01:00
quark
4799b2c52d
Resize and compress image, add shiny button
2025-03-12 23:42:37 +01:00
thomasl
562dcfb908
Update file initial.json
2025-03-11 19:34:56 +01:00
thomasl
12ef258ff0
Update file initial.json
2025-03-11 19:27:02 +01:00
thomasl
2ae32ee3b6
Update file initial.json
2025-03-11 19:26:49 +01:00
thomasl
ec1bd45481
Update file initial.json
2025-03-11 19:14:09 +01:00
quark
370a9a069e
Merge branch 'bde_color' into 'main'
...
Rave Part[list] colors
See merge request bde/nk20!295
2025-03-11 10:31:02 +01:00
quark
7f0a3784e9
Rave Part[list] colors
2025-03-11 10:15:11 +01:00
quark
36f4adf2e7
Merge branch 'update_copyright' into 'main'
...
update copyright
See merge request bde/nk20!292
2025-03-09 18:35:44 +01:00
quark
ae7d5d5489
update copyright
2025-03-09 18:14:58 +01:00
quark
434097aba4
Merge branch 'nerf_pc_kfet' into 'main'
...
Nerf pc kfet
See merge request bde/nk20!291
2025-03-09 17:58:25 +01:00
