Commit graph

725 commits

Author SHA1 Message Date
3cde7764c4
Update syntax for lifted double space requirement 2024-06-29 11:56:12 +02:00
redfast00
73671bd8f1
Merge pull request #213 from ZeusWPI/feat/docker
Dockerize the application
2023-06-28 22:09:06 +02:00
Maxim De Clercq
45b4913657
Add menus provided by Zeus WPI by default 2023-06-25 17:18:50 +02:00
Maxim De Clercq
7b78e7d8ff
Add .dockerignore 2023-06-25 17:18:39 +02:00
Maxim De Clercq
a29d3a33be
Use correct app when running with waitress 2023-06-25 17:18:31 +02:00
Maxim De Clercq
7fad75fc08
Dockerize the application 2023-06-25 17:18:20 +02:00
redfast00
5a82354b78
Merge pull request #214 from ZeusWPI/microsoft-auth-wip
Microsoft auth
2023-06-25 16:49:13 +02:00
Maxim De Clercq
fbb69c843a
Merge branch 'master' into microsoft-auth-wip 2023-06-25 16:18:32 +02:00
redfast00
30626e457a
Merge pull request #217 from ZeusWPI/no-double-space
Remove double space requirement
2023-06-13 23:31:56 +02:00
redfast00
0aea3f6d34
Remove double space requirement 2023-06-13 21:39:19 +02:00
redfast00
cdca5646ef
Merge pull request #204 from Happilands/patch-1
Add robots.txt file
2023-04-22 17:52:17 +02:00
Maxim De Clercq
8b1b3f482a
Add migration for Microsoft Auth 2023-04-20 02:10:59 +02:00
Maxim De Clercq
2d6aea10fb
Change Microsoft account type to ugentbe.onmicrosoft.com 2023-04-19 23:17:51 +02:00
Maxim De Clercq
6e79fc50ed
Merge pull request #186 from ZeusWPI/feature/microsoft-auth
Add working microsoft login flow
2023-04-19 22:55:32 +02:00
Maxim De Clercq
ba29ecbc73
Check for user with matching Microsoft UUID first 2023-04-19 22:38:30 +02:00
Maxim De Clercq
1ffcdc3ec1
Do not store UGent username since it is not exposed through Graph API 2023-04-19 22:03:40 +02:00
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
Tibo
e86fce0a7e
Merge branch 'master' into patch-1 2023-04-19 19:14:54 +02:00
Charlotte Van Petegem
02afba70a9
Merge pull request #212 from ZeusWPI/fix/admin-order-current-top
Order current user to the top for admins when choosing courier
2023-01-24 19:11:21 +01:00
Charlotte Van Petegem
1bc6a5931e
Order current user to the top for admins 2023-01-24 19:06:10 +01:00
Jasper
c991cd7882
Merge pull request #207 from JasperJanin/master
Add user group reference to orders
2022-10-27 22:15:37 +02:00
Jasper Janin
a29ade4773 Remove redundant class attributes 2022-10-27 22:12:03 +02:00
Jasper
6f7aff15cc
Merge branch 'ZeusWPI:master' into master 2022-10-27 21:35:28 +02:00
Jasper Janin
7b12c266b3 Add user group reference to orders 2022-10-27 21:32:22 +02:00
Tibo
7d122cf6e9
Merge pull request #203 from ZeusWPI/addToolversions
.tool-versions toegevoegd
2022-10-27 21:32:06 +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
Maxime
b14671413c
Merge pull request #206 from ZeusWPI/sentry-local-dev
Make sure local dev still works with sentry
2022-10-27 19:49:57 +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
1dcd723bd4
Merge pull request #205 from ZeusWPI/add-sentry
Add glitchtip
2022-10-27 19:41:26 +02:00
Charlotte Van Petegem
c0f44ab037
Add glitchtip 2022-10-27 19:38:46 +02:00
Happilands
4e8799eca5
Add robots.txt file
From
https://www.pythonanywhere.com/forums/topic/2899/
2022-10-27 19:29:50 +02:00
AlexVDP8
e302da0335 .tool-versions toegevoegd
Co-authored-by: Francis <francisklinck@gmail.com>
2022-10-27 19:15:29 +02:00
redfast00
c839fce270
Merge pull request #199 from ZeusWPI/fix/delete-bottom-list
Fix not being able to delete an item from the list at the bottom of an order
2022-06-10 18:41:14 +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
f3911b377d
Merge pull request #196 from ZeusWPI/eight-character-slug
Make slug eight characters
2022-06-03 19:16: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
Maxime
10327941d2
Merge pull request #195 from ZeusWPI/base58-slugs
Use base58 for slugs
2022-06-01 21:26:49 +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