Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity
357 commits 9 branches 0 tags 3.9 MiB
Commit graph

229 commits

Author SHA1 Message Date
James
acc389082b Put things like they were 2015-04-02 12:59:55 +02:00
Feliciaan De Palmenaer
43b8a4f028 Merge branch 'master' of github.com:ZeusWPI/Foodbot 2015-04-02 12:56:38 +02:00
Feliciaan De Palmenaer
16b630854a maybe fixes it 2015-04-02 12:56:15 +02:00
James
24c5da72f6 Merge branch 'master' of github.com:ZeusWPI/James 
Conflicts:
	app/app.py
	app/james.py
 2015-04-02 12:47:11 +02:00
James
6eb310199a Do stuff on server 2015-04-02 12:45:38 +02:00
Feliciaan De Palmenaer
aa7f916979 Merge branch 'master' of github.com:ZeusWPI/Foodbot 
Conflicts:
	app/app.py
	app/james.py
 2015-04-02 12:42:39 +02:00
Feliciaan De Palmenaer
7ce3642ef8 Added logging 2015-04-02 12:41:19 +02:00
James
6a5a0ed20d Remove tmp dir from repo 2015-03-31 20:38:55 +02:00
James
6cb9bf067f This is really going to hurt 2015-03-31 20:15:22 +02:00
Feliciaan De Palmenaer
d4f129cd35 Merge branch 'master' of github.com:ZeusWPI/Foodbot 2015-03-31 19:24:07 +02:00
Feliciaan De Palmenaer
4cfb0b42aa Added simpizza to create database script 2015-03-31 19:21:53 +02:00
Tom Naessens
f276b94a1c Use HTTPS for everything 2015-03-31 16:29:45 +02:00
Tom Naessens
76f7d4c56d Some PEP8, remove insecure_lib 2015-03-31 16:29:28 +02:00
Tom Naessens
8c464ed73c Nope 2015-03-31 16:02:30 +02:00
Tom Naessens
a9390ed4e8 Try this 2015-03-31 15:59:35 +02:00
Tom Naessens
6c238ab4f5 Add init file 2015-03-31 15:35:53 +02:00
Tom Naessens
5515b7c370 Add wsgi goodies 2015-03-31 15:11:40 +02:00
Tom Naessens
1c76a318cd Merge branch 'master' of github.com:ZeusWPI/James 2015-03-31 15:11:26 +02:00
Tom Naessens
e59d7b5cc6 Add newline at end of file 2015-03-31 15:11:20 +02:00
Feliciaan De Palmenaer
bcefb66ac4 Fix create database, really add iepoev to the database 2015-03-31 13:16:10 +02:00
Wout Schellaert
9d9886c511 Added iepoev as admin 2015-03-31 12:18:00 +02:00
Feliciaan De Palmenaer
00613a7db8 better form layout orders page 2015-03-31 00:55:50 +02:00
Feliciaan De Palmenaer
8c992beed7 new layout 2015-03-31 00:51:30 +02:00
Feliciaan De Palmenaer
5677986378 Foodbot is dead, long live James 2015-03-31 00:06:09 +02:00
Gilles Jacobs
1151671aba JAMES 2015-03-30 23:53:21 +02:00
Feliciaan De Palmenaer
7032f2ad77 `The Final Countdown 2015-03-30 23:02:05 +02:00
Wout Schellaert
a0b2e6dd3d Merge remote-tracking branch 'origin/master' 2015-03-30 18:50:53 +02:00
Wout Schellaert
0cbbb7433c Fixed spelling 2015-03-30 18:50:39 +02:00
Feliciaan De Palmenaer
e8d72e686a Merge branch 'master' of github.com:ZeusWPI/Foodbot 2015-03-30 18:38:27 +02:00
Feliciaan De Palmenaer
f379448e31 make select2 look better in bootstrap 2015-03-30 18:37:39 +02:00
Wout Schellaert
efeb3e08a3 Added autogenerate for Chinese 2015-03-30 18:30:01 +02:00
Feliciaan De Palmenaer
c2c1b86aae flash things to the user 2015-03-30 00:38:53 +02:00
Feliciaan De Palmenaer
0a9212f2fe oops super 2015-03-30 00:29:32 +02:00
Feliciaan De Palmenaer
79063f8bdf added a footer 2015-03-30 00:23:59 +02:00
Feliciaan De Palmenaer
c3d776a985 added date pickers, only admins can set starttime 2015-03-30 00:01:07 +02:00
Feliciaan De Palmenaer
6c0badfd55 search items 2015-03-29 22:44:26 +02:00
Feliciaan De Palmenaer
9cd05b61d2 flash messages 2015-03-29 13:01:42 +02:00
Feliciaan De Palmenaer
b9a1a62a81 Fix some bugs (closes #8) 2015-03-29 11:46:08 +02:00
Feliciaan De Palmenaer
d2621c75f5 clearer model string representation 2015-03-28 23:31:38 +01:00
Feliciaan De Palmenaer
75dee4ebbd Some more layouting 2015-03-28 23:21:43 +01:00
Feliciaan De Palmenaer
28cd6947a5 Added some layouting 2015-03-28 23:06:36 +01:00
Feliciaan De Palmenaer
b4d1868988 Also show recently closed orders 2015-03-28 21:25:55 +01:00
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