Maxim De Clercq
|
aab522eef9
|
Merge branch 'master' into feature/microsoft-auth
# Conflicts:
# app/app.py
# app/create_database.py
# app/models/user.py
# requirements.in
# requirements.txt
|
2023-04-19 20:55:35 +02:00 |
|
Charlotte Van Petegem
|
3bc2ad83ea
|
Remove some more letters from the alphabet
|
2022-06-03 19:12:00 +02:00 |
|
Charlotte Van Petegem
|
0661016236
|
Make slug eight characters
|
2022-06-03 19:05:33 +02:00 |
|
mcbloch
|
5d204a4012
|
use a string, not bytes
|
2022-06-01 17:36:52 +02:00 |
|
Maxime
|
2bdd07c9af
|
Update app/models/order.py
Co-authored-by: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
|
2022-06-01 17:24:27 +02:00 |
|
mcbloch
|
978b432d7e
|
use base58 for slugs to remove doubt
|
2022-06-01 17:18:47 +02:00 |
|
Charlotte Van Petegem
|
01b5c72e7b
|
Generate slug in app
|
2022-05-30 19:48:23 +02:00 |
|
|
|
4a353ec17e
|
Create a slug for old orders in the migration
|
2022-05-30 19:47:48 +02:00 |
|
Charlotte Van Petegem
|
8f3750060b
|
VARCHAR requires a length in mysql
|
2022-05-30 18:50:46 +02:00 |
|
Charlotte Van Petegem
|
c04d9bbd44
|
Fix typing of associations in user model
|
2022-05-25 10:07:30 +02:00 |
|
Charlotte Van Petegem
|
4d9d43b0f0
|
Don't limit length (and fix migration)
|
2022-05-24 21:26:56 +02:00 |
|
Charlotte Van Petegem
|
1c0d78f2ee
|
Make sure only users with at least one association can create an order
|
2022-05-20 22:46:56 +02:00 |
|
Charlotte Van Petegem
|
c43efa4b10
|
Migration
|
2022-05-20 21:34:18 +02:00 |
|
mcbloch
|
8a2b9247e1
|
initial work, model works, layout doenst
|
2022-05-20 21:02:24 +02:00 |
|
mcbloch
|
7702fdecbe
|
change url usage to unique 7char slugs
|
2022-05-20 19:04:22 +02:00 |
|
|
|
a568103a60
|
You didn't see this
|
2022-05-02 22:00:37 +02:00 |
|
|
|
85d8892176
|
Hide buttons for which user has no permission
|
2022-05-02 21:56:38 +02:00 |
|
|
|
09e2d704cd
|
Add price editor
|
2022-04-22 01:19:07 +02:00 |
|
|
|
fc630e9061
|
Support marking items as paid
|
2022-04-20 18:09:45 +02:00 |
|
mcbloch
|
cc0c271a22
|
Add working microsoft login flow
|
2022-04-20 01:27:52 +02:00 |
|
Jan-Pieter Baert
|
5e29f2a5f7
|
Fix formatting
|
2022-04-19 22:04:49 +02:00 |
|
|
|
e82742eb62
|
Remove pills introduced in previous commit
|
2021-07-24 17:51:26 +02:00 |
|
|
|
16bd9243d4
|
Aggregate comments
|
2021-07-24 17:51:26 +02:00 |
|
|
|
f516ffe8c6
|
Don't crash when no user name
|
2020-08-26 19:30:00 +02:00 |
|
|
|
65ed818875
|
Start redesign of order page
|
2020-08-26 19:29:59 +02:00 |
|
redfast00
|
b1f3d786e8
|
Remove print statements polluting our logs
|
2020-08-21 21:02:21 +02:00 |
|
|
|
4f7ffc0e3d
|
Reformat with black
|
2020-07-17 11:40:15 +02:00 |
|
|
|
1fa38d08c6
|
Sort comments in order views
|
2020-03-10 18:39:11 +01:00 |
|
|
|
aa331b6843
|
Fix error when anonymous name has accidentally been allowed to be None
|
2020-02-28 13:43:39 +01:00 |
|
|
|
04fb06d187
|
Use order.location_name instead of order.location.name
|
2020-01-27 22:59:07 +01:00 |
|
|
|
0e779e59b9
|
Use order.is_closed()
|
2020-01-27 03:52:29 +01:00 |
|
|
|
aa63023383
|
Improve order items page and other stuff
|
2020-01-27 03:46:05 +01:00 |
|
|
|
8ed38f178c
|
Fix and improve "ordered items" page
|
2020-01-27 03:01:49 +01:00 |
|
|
|
6f24b52855
|
Make creating order and adding items work
|
2020-01-27 02:33:55 +01:00 |
|
|
|
40170046c5
|
Make order_item.price nullable
There are some order items in the DB where product = NULL so price
cannot be defined for them.
|
2020-01-26 21:03:14 +01:00 |
|
|
|
7e476c39dc
|
Drop migration of "paid" to non-nullable
The DB contains NULLs here, and I'll just leave them be.
|
2020-01-26 19:48:31 +01:00 |
|
|
|
2313f0bcb5
|
Write migration -- don't run, not tested
|
2020-01-26 18:53:14 +01:00 |
|
|
|
6d7baa31ea
|
Final fixes before generating migration
|
2020-01-26 16:25:59 +01:00 |
|
|
|
9588116ba7
|
Fix data model before generating migration
|
2020-01-26 03:04:37 +01:00 |
|
|
|
e46d5e622e
|
Fix references to removed concepts
This will probably not work but it's a start and it was needed to get
the DB migrations running
|
2020-01-26 02:52:45 +01:00 |
|
|
|
ecb0550fdd
|
Update models
|
2020-01-26 02:39:58 +01:00 |
|
|
|
d564808417
|
Correct misspelled "courrier" to "courier"
|
2020-01-26 02:28:20 +01:00 |
|
|
|
f2c6ad9c89
|
Remove old, database-based models
|
2020-01-26 02:13:02 +01:00 |
|
Jan-Pieter Baert
|
8a0e6e3047
|
Merge branch 'master' into fix-pylint-formatting
|
2019-10-16 15:00:45 +02:00 |
|
|
|
0af72376a1
|
Increase line length limit to 100
Up from 80.
|
2019-09-12 20:53:26 +02:00 |
|
Jan-Pieter Baert
|
ec82639c5c
|
Fix pylint for models files
|
2019-09-12 20:50:17 +02:00 |
|
Jan-Pieter Baert
|
cff24dc096
|
Allow courrier to delete item in order
|
2019-09-12 18:42:29 +02:00 |
|
Jan-Pieter Baert
|
c64e4bd998
|
Run black and isort on all code
|
2019-09-08 02:04:34 +02:00 |
|
Jan-Pieter Baert
|
27cb10f745
|
Add typing to model files
|
2019-09-08 00:41:50 +02:00 |
|
mcbloch
|
d591f846d8
|
add and run black formatter
|
2019-09-05 03:33:29 +02:00 |
|
