Haldis/haldis
2
0
Fork 0
Code Issues 39 Pull requests Packages Projects Releases Wiki Activity
705 commits 9 branches 0 tags 3.8 MiB
Commit graph

705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wout Schellaert dd97b036b5 Fixed little issues, working fine now 2015-04-04 14:26:09 +02:00
Wout Schellaert 81913d2d1b Refactored create_database, put every addition in seperate file 2015-04-04 14:11:55 +02:00
Tom Naessens 1daa7bfa62 Merge pull request #36 from bmesuere/patch-1 
punctuation is overrated
 2015-04-03 21:09:40 +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 94747397d9 Merge branch 'master' of https://github.com/ZeusWPI/James 
Conflicts:
	app/app.py
	app/james.py
 2015-03-31 20:16:58 +02:00
James 6cb9bf067f This is really going to hurt 2015-03-31 20:15:22 +02:00
James 0a266adec7 This is going to hurt 2015-03-31 20:14:29 +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 9948037fd5 This? 2015-03-31 18:04:30 +02:00
Tom Naessens e56f1fd089 This 2015-03-31 18:03:36 +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 0955560303 Remove importerror 2015-03-31 15:41:09 +02:00
Tom Naessens 898736c2a2 james -> app 2015-03-31 15:39:40 +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 f4256924a3 Merge pull request #18 from ZeusWPI/james 
JAMES
 2015-03-31 00:06:26 +02:00
Feliciaan De Palmenaer 5677986378 Foodbot is dead, long live James 2015-03-31 00:06:09 +02:00
Gilles Jacobs 0a546f8aa9 Merge pull request #17 from ZeusWPI/master 
Rename to James
 2015-03-30 23:55:44 +02:00
Tom Naessens bbe64df471 Update README.md 2015-03-30 23:53:55 +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