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

106 commits

Author SHA1 Message Date
Feliciaan De Palmenaer
d6c29b9703 Fixed bug for volunteering closes #44 2015-06-04 22:37:00 +02:00
Feliciaan De Palmenaer
a5e231cc12 Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/19/paid-indicator 
* 'master' of github.com:ZeusWPI/Foodbot:
  Check if user is allowed to edit
  spacing
 2015-06-04 22:08:04 +02:00
Feliciaan De Palmenaer
09c1bd5a19 Merge pull request #49 from ZeusWPI/feat/47/add_telephone_number 
Feat/47/add telephone number
 2015-06-04 22:02:49 +02:00
Feliciaan De Palmenaer
90b2954be6 Merge pull request #46 from ZeusWPI/add_db_migrations 
Added alembic and flask-migrate to haldis (fixes #21 )
 2015-06-04 21:50:56 +02:00
Feliciaan De Palmenaer
3d5f6ef1ae Check if user is allowed to edit 2015-06-04 21:36:57 +02:00
Feliciaan De Palmenaer
39cfd77a7d Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/19/paid-indicator 
* 'master' of github.com:ZeusWPI/Foodbot:
  Edit orders
 2015-06-04 21:24:13 +02:00
Feliciaan De Palmenaer
69eb22c506 Add paid indicator, fixes #19 2015-06-04 21:20:38 +02:00
Feliciaan De Palmenaer
333a7ec5ec spacing 2015-06-04 19:13:09 +02:00
Feliciaan De Palmenaer
50a8714c51 Edit orders 2015-06-04 19:11:08 +02:00
Feliciaan De Palmenaer
24d1b7c094 Added phone number 2015-06-04 18:45:59 +02:00
Feliciaan De Palmenaer
2d6640b8b9 Added alembic and flask-migrate to haldis 2015-06-04 17:29:37 +02:00
Wout Schellaert
3aa16e2690 Merge branch 'master' of https://github.com/ZeusWPI/Foodbot 2015-05-13 13:35:14 +02:00
Wout Schellaert
111944619f Package restructure and small create_database changes 2015-05-13 13:34:32 +02:00
Tom Naessens
76ec291d02 Fix #35 2015-04-05 13:08:02 +02:00
Wout Schellaert
81913d2d1b Refactored create_database, put every addition in seperate file 2015-04-04 14:11:55 +02:00
Bart Mesuere
271e53dcae punctuation is overrated 2015-04-03 21:04:10 +02:00
Feliciaan De Palmenaer
7436bd37e6 Merge pull request #34 from Donvittorio/master 
find . -type f -exec sed -i s/James/Haldis/g {} \;
 2015-04-03 20:30:03 +02:00
Lorin Werthen
7a82ad13cd #stopJAMES2k15 2015-04-03 19:11:07 +02:00
Lorin Werthen
e3daf80ff6 lower case james 2015-04-03 18:51:19 +02:00
Feliciaan De Palmenaer
da73af3b19 Add nullable false to order 2015-04-03 18:45:33 +02:00
Lorin Werthen
113fbe98b9 find . -type f -exec sed -i s/James/Haldis/g {} \; 2015-04-03 18:41:44 +02:00
Feliciaan De Palmenaer
037b7ee934 why was this added? 
How the fuck do you type this.
 2015-04-03 18:16:01 +02:00
Feliciaan De Palmenaer
e1b35de786 fixing the db script 2015-04-03 18:11:39 +02:00
Feliciaan De Palmenaer
8a975d5d44 Modify the models to stop allowing certain fields to be null 2015-04-03 14:28:28 +02:00
Feliciaan De Palmenaer
4c94953059 Hopefully lets werkzeug log 2015-04-02 21:01:18 +02:00
Feliciaan De Palmenaer
85790c0a45 Adds placeholder to name field, fixes #25 2015-04-02 20:56:31 +02:00
James
f12c7b4849 Merge branch 'master' of github.com:ZeusWPI/James 2015-04-02 13:00:03 +02:00
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