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
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 28fa1b7592b14671413c
2022-10-27 21:23:13 +02:00
Jasper Janin
bf8eb94117
Add user group reference to orders
2022-10-27 20:24:35 +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
5306561ddd
Correct word on home page
2022-05-30 20:20:51 +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
44feb1a4ff
Change forgotten order_id to order_slug in a few places
2022-05-25 10:29:46 +02:00
Charlotte Van Petegem
d6d9d61f27
Remove some unused code
2022-05-20 23:21:11 +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
mcbloch
8a2b9247e1
initial work, model works, layout doenst
2022-05-20 21:02:24 +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
b5202a9de6
Don't crash when rendering None price
2022-05-11 02:43:08 +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
85d8892176
Hide buttons for which user has no permission
2022-05-02 21:56:38 +02:00
5a9d9c1d31
Update prices per person on key up
...
After user feedback
2022-04-22 01:25:01 +02:00
ced04acb2e
Remove TODO buttons
2022-04-22 01:19:11 +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
841c3d5fb8
add flag to disable microsoft login
2022-04-20 01:34:19 +02:00
mcbloch
cc0c271a22
Add working microsoft login flow
2022-04-20 01:27:52 +02:00
maartenvn
9e3578425f
feat(pwa): add PWA support
2021-10-28 23:35:57 +02:00
02a82621b7
Improve footer: improve spacing, https URL
2021-07-24 17:51:26 +02:00
adcc0dd69e
Confine li spacing to .main
2021-07-24 17:51:26 +02:00
4a96c0c286
Correct phone URL, add phone URL on location
2021-07-24 17:51:26 +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
1ff8ceb521
Improve design
...
Remove main CSS from shop view page. Make it theme independent and
maximize contrast.
Improve spacing in "add item" list.
Refactor old term "showcase" to "shop_view" in code.
2021-07-24 17:51:25 +02:00
65d6de21fa
Change no courier text from "No-one" to "no-one yet"
2021-06-19 01:00:22 +02:00
787669823c
Improve spacing between items in ordered dishes
2020-10-13 02:27:31 +02:00
695331dd1a
Fix margin in ordered dishes, less bold
2020-10-13 02:18:43 +02:00
342e94a7bf
Remove aligned price in menu and my_items
2020-10-13 02:10:45 +02:00
d3e6c1b08c
Use columns in order info faster, align prices in menu
2020-10-13 02:08:52 +02:00
c23a11bfdb
Fix flow quirks in "order information" section
2020-10-13 02:01:07 +02:00
8cefb48768
Collapse other dishes, save expanded dish in hash
2020-10-13 01:42:03 +02:00
837dc682bc
Tweak UI a bit after demo
2020-10-12 22:40:27 +02:00
9641435b64
Add norobot tag on order pages
2020-09-26 00:39:50 +02:00
7856302028
Improve order menu design
2020-09-25 21:12:41 +02:00
0b93307f1f
Fix mobile order page, show dish descriptions
2020-09-01 16:35:18 +02:00
6651a8d513
Show less TODOs on order page
2020-09-01 16:26:29 +02:00
8ccc508747
Tweak layout
2020-08-26 19:30:01 +02:00
1bea3d2fcc
Show stop date if needed, change to "add from favourites"
2020-08-26 19:30:00 +02:00
48d67cbd89
Remove weird d from colours, add separate bg
2020-08-26 19:30:00 +02:00
63ce1c5551
Show options for choices on location page
2020-08-26 19:30:00 +02:00
65ed818875
Start redesign of order page
2020-08-26 19:29:59 +02:00
cd67eab29b
Remove colons after some titles
...
Some titles had a colon, some hadn't. Titles don't need colons.
2020-08-08 15:43:58 +02:00
