Commit graph

484 commits

Author SHA1 Message Date
Maxim De Clercq
6bb11e49a3
Add support for when cwd is outside the project
E.g. Pycharm runs `/.../haldis/venv/bin/python /.../haldis/app/app.py` when no working directory is set.
2023-04-19 21:18:53 +02:00
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
1bc6a5931e
Order current user to the top for admins 2023-01-24 19:06:10 +01:00
Jasper Janin
a29ade4773 Remove redundant class attributes 2022-10-27 22:12:03 +02:00
Jasper Janin
7b12c266b3 Add user group reference to orders 2022-10-27 21:32:22 +02:00
Charlotte Van Petegem
202d5d3e7a
Revert "Merge branch 'master' of github.com:ZeusWPI/Haldis"
This reverts commit 28fa1b7592, reversing
changes made to b14671413c.
2022-10-27 21:23:13 +02:00
Jasper Janin
28fa1b7592 Merge branch 'master' of github.com:ZeusWPI/Haldis 2022-10-27 20:28:11 +02:00
Jasper Janin
bf8eb94117 Add user group reference to orders 2022-10-27 20:24:35 +02:00
Charlotte Van Petegem
29afc8db7a
Make sure local dev still works with sentry 2022-10-27 19:47:12 +02:00
Charlotte Van Petegem
c0f44ab037
Add glitchtip 2022-10-27 19:38:46 +02:00
Charlotte Van Petegem
687d389fa2
Fix not being able to delete an item from the list at the bottom of an order 2022-06-10 18:28:31 +02:00
redfast00
9c4361ab1b
Merge pull request #197 from ZeusWPI/remove-dot-title-from-username
Don't title username
2022-06-03 19:36:54 +02:00
redfast00
754eae4a50
Don't title username 2022-06-03 19:27:11 +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
426357f00d
Move filtering by association to get_orders
Fixes duplication and restores old `/orders` behaviour
2022-05-30 20:24:07 +02:00
5306561ddd
Correct word on home page 2022-05-30 20:20:51 +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
bb49fb2795
Add merge migration 2022-05-30 18:44:18 +02:00
Charlotte Van Petegem
28a6dc5422
Merge pull request #193 from ZeusWPI/feature/association-management
Integrate associations
2022-05-30 18:29:05 +02:00
453cacebd9
Add migration to add slug DB field to order 2022-05-25 10:29:48 +02:00
44feb1a4ff
Change forgotten order_id to order_slug in a few places 2022-05-25 10:29: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
redfast00
0a0d13c0dc
Merge pull request #189 from ZeusWPI/fix-float-deadline
Make deadline minutes integer instead of rounded float
2022-05-24 20:42:24 +02:00
Charlotte Van Petegem
da1a708e28
List order association in admin view 2022-05-20 23:29:05 +02:00
Charlotte Van Petegem
d6d9d61f27
Remove some unused code 2022-05-20 23:21:11 +02:00
Charlotte Van Petegem
a077a8038a
Only list orders to users of its association 2022-05-20 23:15:45 +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
redfast00
25e2757461
Merge pull request #192 from ZeusWPI/chore/haldis-admins-not-admin-users
Change HALDIS_ADMIN_USERS configuration key to the one actually used
2022-05-20 20:44:32 +02:00
Charlotte Van Petegem
ab47c0a882
Change HALDIS_ADMIN_USERS configuration key to the one actually used 2022-05-20 19:32:59 +02:00
Maxime
f87f3c5446
Merge pull request #187 from ZeusWPI/feature/invitelink-token
Feature/invitelink token
2022-05-20 19:15:20 +02:00
mcbloch
a33c76f84b fix modify link 2022-05-20 19:14:10 +02:00
mcbloch
98214f8b84 Add share slug and qr code to order page 2022-05-20 19:04:25 +02:00
mcbloch
7702fdecbe change url usage to unique 7char slugs 2022-05-20 19:04:22 +02:00
mcbloch
0e0771bae1 use a more common unicode arrow that can be found in more fonts 2022-05-20 18:17:34 +02:00
redfast00
749012140b
Make deadline minutes integer instead of rounded float 2022-05-11 18:33:34 +02:00
b5202a9de6
Don't crash when rendering None price 2022-05-11 02:43:08 +02:00
7b16a3b6c5
Don't crash when item.price is None 2022-05-11 02:35:45 +02:00
03f1e56161
Fix bug with form inside form 2022-05-02 22:25:06 +02:00
cf27a7de8a
For loops don't work in this template engine 2022-05-02 22:04:45 +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