ehouarn
|
a2e2ff5fa9
|
Merge branch 'main' into 'wei'
Main
See merge request bde/nk20!319
|
2025-05-26 17:51:33 +02:00 |
|
Ehouarn
|
53d0480a12
|
Ajout de permissions
|
2025-05-26 17:29:34 +02:00 |
|
Ehouarn
|
136f636fda
|
Fix de l'ajout d'équipe, le ColorWidget était défaillant
|
2025-05-25 23:31:09 +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
|
3d34270959
|
Faute de frappe
|
2025-05-23 23:38:06 +02:00 |
|
ehouarn
|
0d69383dfd
|
Update views.py
|
2025-05-19 17:45:01 +02:00 |
|
Ehouarn
|
108a56745c
|
Corrections de quelques bugs (par Quark)
|
2025-05-10 19:24:05 +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
|
4445dd4a96
|
Remove food with end_of_life not null from open table
|
2025-05-07 18:04:47 +02:00 |
|
quark
|
dc6a40de02
|
bug fix and doc
|
2025-05-04 17:56:44 +02:00 |
|
quark
|
ad0a219ed3
|
Add manage ingredient feature, fix some bug
|
2025-04-30 12:06:37 +02:00 |
|
quark
|
b4f3a158a6
|
fix permission bug
|
2025-04-28 13:18:33 +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
|
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 |
|
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
|
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 |
|
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
|
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 |
|