Commit graph

688 commits

Author SHA1 Message Date
Feliciaan De Palmenaer 08c0922591 Removed some bugs in closing an order 2015-03-28 21:12:02 +01:00
Feliciaan De Palmenaer bf1b6b92ab With unregistered user (fixes #1 ) 2015-03-28 20:38:15 +01:00
Feliciaan De Palmenaer 511bdebea5 Change food => product, orders => items, closes #6 2015-03-28 19:25:38 +01:00
Wout Schellaert 95519f813f moved requirements to top level
added me as admin
2015-03-28 13:32:22 +01:00
Wout Schellaert 756b447719 Added testvalues & made stats non private 2015-03-28 12:17:04 +01:00
Wout Schellaert 4522adb3cc Merge remote-tracking branch 'origin/master' 2015-03-28 11:32:50 +01:00
Feliciaan De Palmenaer 8b99a763d8 Better close button 2015-03-28 10:49:28 +01:00
Feliciaan De Palmenaer 09e3aece73 Randomly select someone 2015-03-28 02:01:30 +01:00
Feliciaan De Palmenaer a0b79b68ac Added totals 2015-03-28 01:31:04 +01:00
Feliciaan De Palmenaer 7514396669 "I volunteer as Tribute" 2015-03-28 01:09:59 +01:00
Feliciaan De Palmenaer c160002a94 Delete items, with fancy icon 2015-03-28 00:44:58 +01:00
Wout Schellaert d323a7065c Merge remote-tracking branch 'origin/master'
Conflicts:
	app/create_database.py
2015-03-28 00:08:27 +01:00
Feliciaan De Palmenaer b34dc7fccc Add order items and split views 2015-03-28 00:02:12 +01:00
Feliciaan De Palmenaer 070dc241a9 Create order from order page 2015-03-27 23:24:41 +01:00
Feliciaan De Palmenaer 424af3e2cb Added orders form (simple bootstrap), using new bootstrap package 2015-03-27 21:57:37 +01:00
Feliciaan De Palmenaer d2f9b4dc9d Look fancy error pages 2015-03-27 18:25:09 +01:00
Feliciaan De Palmenaer 6e660399a2 Added an order detail view, and open orders on the homepage 2015-03-27 18:07:06 +01:00
Wout Schellaert 56c908c63f Removed slotmachien slack stuff 2015-03-27 14:03:28 +01:00
Feliciaan De Palmenaer 55a5c9b927 Remove some CSS 2015-03-27 01:25:21 +01:00
Feliciaan De Palmenaer 5da909dce4 Remove URL prefix, can be added during deploy, see http://flask.pocoo.org/snippets/35/ or so 2015-03-27 01:23:07 +01:00
Feliciaan De Palmenaer 0426b71556 bootstrap 3 ftw 2015-03-27 01:07:43 +01:00
Feliciaan De Palmenaer 7a8b8b7434 Modified the base layout to show the logged in users name 2015-03-26 23:31:13 +01:00
Feliciaan De Palmenaer 70a5874089 Merge branch 'master' of github.com:ZeusWPI/Foodbot 2015-03-26 23:18:07 +01:00
Feliciaan De Palmenaer e58ed018bd lol admin interface 2015-03-26 23:17:51 +01:00
Wout Schellaert 96f7542104 Dunno what ichanged 2015-03-26 22:45:41 +01:00
Feliciaan De Palmenaer 4e2780d9be mode some changes to get it working 2015-03-26 22:32:34 +01:00
Wout Schellaert c851ce11ec Edited User parameters 2015-03-26 22:23:11 +01:00
Wout Schellaert b69132b5b7 Removed imports 2015-03-26 22:17:50 +01:00
Feliciaan De Palmenaer 051588fba9 updated thingies 2015-03-26 22:11:58 +01:00
Feliciaan De Palmenaer b3b1d25bb5 Removed some more unnecsarry settings 2015-03-26 21:59:51 +01:00
Feliciaan De Palmenaer a17ffaf4a3 Remove reference to slotmachien 2015-03-26 21:58:55 +01:00
Feliciaan De Palmenaer f9968e0654 Removed config file 2015-03-26 21:56:49 +01:00
Wout Schellaert cc62911509 LoL windoos 2015-03-26 21:54:43 +01:00
Feliciaan De Palmenaer eba3fc5f07 forgot to add some files 2015-03-26 21:49:14 +01:00
Feliciaan De Palmenaer cf9fcfbad3 Lol did not test this 2015-03-26 21:45:27 +01:00
Wout Schellaert 258a7ab992 LeesMij 2015-03-26 00:21:25 +01:00
Wout Schellaert f57b636e3e Initial commit 2015-03-26 00:17:43 +01:00
Tom Naessens 118ba56584 Initial commit 2015-03-25 18:06:03 +01:00