bleizi
|
24c4edf2e3
|
Merge branch 'migration-django-4-2' into 'main'
nk20 v2.0.0 with django 4.2
See merge request bde/nk20!230
|
2024-08-27 13:43:58 +02:00 |
|
quark
|
213e9a8b12
|
Fix problem in addingredientform, change filter for container in QrcodeForm
|
2024-08-27 10:47:44 +02:00 |
|
korenstin
|
2c56178b15
|
Merge branch 'main' into migration-django-4-2
|
2024-08-25 16:14:59 +02:00 |
|
korenstin
|
48a5b04579
|
Merge branch 'beta' into migration-django-4-2
|
2024-08-25 16:13:01 +02:00 |
|
korenstin
|
2ab5c4082a
|
Merge branch 'beta' into 'main'
revert sort tables to member views
See merge request bde/nk20!262
|
2024-08-25 15:17:36 +02:00 |
|
korenstin
|
053225c6dc
|
revert sort tables to member views
|
2024-08-25 15:13:02 +02:00 |
|
korenstin
|
ac7b86651d
|
Merge branch 'beta' into 'main'
api errors (fix #113), sortable tables, calendar (fix #95), opener (fix #117), colored linters, inclusif, bug july 31, 403 (fix #65)
Closes #65, #117, #95, and #113
See merge request bde/nk20!260
|
2024-08-25 14:45:08 +02:00 |
|
korenstin
|
21f5a5d566
|
Merge branch 'invoice_template' into 'main'
Update invoice_sample.tex, remove link toward bde.ens-cachan
See merge request bde/nk20!261
|
2024-08-25 14:34:37 +02:00 |
|
korenstin
|
ff9c78ed4e
|
added opener in admin and fixed the guest view
|
2024-08-25 14:29:06 +02:00 |
|
quark
|
1e121297d1
|
Update invoice_sample.tex, remove link toward bde.ens-cachan
|
2024-08-23 00:32:37 +02:00 |
|
quark
|
549f56dc0b
|
Translation
|
2024-08-17 11:58:33 +02:00 |
|
quark
|
debeb33d46
|
Improve/modify form, view, template. Add permissions
|
2024-08-17 02:42:29 +02:00 |
|
quark
|
6d7076b03e
|
Edit forms, views, template to improve/modify view. Edit urls to remove some path. Few changes in models.
|
2024-08-14 01:32:55 +02:00 |
|
quark
|
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).
|
2024-08-13 02:07:32 +02:00 |
|
korenstin
|
28117c8c61
|
Add developers, Opener comments
|
2024-08-10 11:50:27 +02:00 |
|
bleizi
|
0d9891fbd8
|
Merge branch 'migration-django-4-2' of gitlab.crans.org:bde/nk20 into migration-django-4-2
|
2024-08-09 23:20:48 +02:00 |
|
korenstin
|
4be4a18dd1
|
Merge branch 'sortable_tables' into 'beta'
Sortable tables
See merge request bde/nk20!257
|
2024-08-08 17:37:31 +02:00 |
|
korenstin
|
27b00ba4f0
|
Merge branch 'beta' into sortable_tables
|
2024-08-08 17:27:44 +02:00 |
|
korenstin
|
3fcbb4f310
|
Merge branch 'no-api-error' into 'beta'
fix #113
See merge request bde/nk20!253
|
2024-08-08 17:05:25 +02:00 |
|
korenstin
|
d1c9a2a7f1
|
Merge branch 'beta' into no-api-error
|
2024-08-08 16:54:21 +02:00 |
|
korenstin
|
a673fd6871
|
Merge branch 'ouvreureuse' into 'beta'
Ouvreureuse
See merge request bde/nk20!256
|
2024-08-08 16:41:06 +02:00 |
|
korenstin
|
a324d3a892
|
Merge branch 'beta' into ouvreureuse
|
2024-08-08 16:28:22 +02:00 |
|
korenstin
|
951ba74f8f
|
Merge branch 'bug_31_july' into 'beta'
bug du jour 31 juillet (bissextile)
See merge request bde/nk20!254
|
2024-08-08 16:23:21 +02:00 |
|
korenstin
|
abc4f14bd1
|
Merge branch '404_or_403' into 'beta'
fix #65 Returning 403 when you don't have enough permissions
See merge request bde/nk20!259
|
2024-08-07 21:54:54 +02:00 |
|
korenstin
|
47138bafd4
|
Merge branch 'traduction_inclusive_fr' into 'beta'
De l'inclusif, partout
See merge request bde/nk20!258
|
2024-08-07 21:45:05 +02:00 |
|
korenstin
|
a3920fcae3
|
Merge branch 'Fix_time_zone_calendar.ics' into 'beta'
Update views.py - Fix calendar.ics
See merge request bde/nk20!237
|
2024-08-07 21:26:32 +02:00 |
|
korenstin
|
ae4213d087
|
Merge branch 'colored_linters' into 'beta'
Colored linters
See merge request bde/nk20!255
|
2024-08-07 21:25:22 +02:00 |
|
quark
|
b2b1f03b46
|
Edit food HTML template for translation, translations. Now the mandatory allergens are automatically created
|
2024-08-06 15:20:22 +02:00 |
|
quark
|
1c5ed2bd3f
|
Edit base.html and few translations
|
2024-08-06 13:59:30 +02:00 |
|
korenstin
|
a7e87ea639
|
API Food
|
2024-08-04 23:38:21 +02:00 |
|
korenstin
|
cbf92651f0
|
Returning 403 when you don't have enough permissions
|
2024-08-04 21:58:57 +02:00 |
|
korenstin
|
12c93ff9da
|
bug du jour 31 juillet (bissextile)
|
2024-08-04 14:45:17 +02:00 |
|
korenstin
|
354c79bb82
|
Inclusif manquant
|
2024-08-04 13:32:33 +02:00 |
|
korenstin
|
1ea7b3dda1
|
documentation and modification of permissions
|
2024-08-02 15:21:34 +02:00 |
|
korenstin
|
35ffbfcf55
|
Colored linters
|
2024-08-01 17:29:24 +02:00 |
|
korenstin
|
162371042c
|
Creation of "Opener", Fix #117
|
2024-08-01 14:49:52 +02:00 |
|
korenstin
|
581715d804
|
Fix #95 (calendar)
|
2024-07-31 23:18:41 +02:00 |
|
korenstin
|
c7c6f0350f
|
Looks unused
|
2024-07-31 22:19:16 +02:00 |
|
korenstin
|
9d1024024b
|
Each table can be sorted (with a few exceptions)
|
2024-07-30 21:42:45 +02:00 |
|
|
|
d595d908c6
|
Fix tests
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
|
2024-07-30 16:34:20 +02:00 |
|
|
|
734f5b242d
|
C'est pas moi
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
|
2024-07-30 16:32:19 +02:00 |
|
|
|
b0c7d43a50
|
De l'inclusif, partout
Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
|
2024-07-30 16:28:47 +02:00 |
|
korenstin
|
6f67d2c629
|
Documentation
|
2024-07-22 15:52:09 +02:00 |
|
korenstin
|
4b97ab2e2a
|
linters
|
2024-07-22 15:52:09 +02:00 |
|
korenstin
|
dcfd0167e7
|
Security against the cycles
|
2024-07-22 15:52:09 +02:00 |
|
korenstin
|
50a680eed2
|
Open table and shelf life
|
2024-07-22 15:52:09 +02:00 |
|
korenstin
|
226a2a6357
|
Automatic allergens and expiry_date update
|
2024-07-22 15:52:09 +02:00 |
|
korenstin
|
48462f2ffc
|
Adding ingredients to a preparation
|
2024-07-22 15:52:09 +02:00 |
|
korenstin
|
260513ae3b
|
Migration fixes
|
2024-07-22 15:52:09 +02:00 |
|
korenstin
|
210a3cc93c
|
Implementing QRcode creation, modifying Allergen model and creating of few views
|
2024-07-22 15:52:09 +02:00 |
|
