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

688 commits

This branch
This branch
All branches
Author SHA1 Message Date
Feliciaan De Palmenaer a689dcfa1a Fixing a little bug 2015-06-19 20:44:58 +02:00
Feliciaan De Palmenaer f0a0d4f001 Show order stoptime 2015-06-18 14:39:42 +02:00
Feliciaan De Palmenaer 3d50650d8e Add fancy debugtoolbar when debugging 2015-06-09 22:24:48 +02:00
Tom Naessens 71bfe073e6 Professionally revert a commit 2015-06-09 16:57:15 +02:00
Tom Naessens 19661989a7 #SWAG 2015-06-09 16:55:36 +02:00
Tom Naessens c77f9150db Add errbit integration 2015-06-09 16:47:11 +02:00
Feliciaan De Palmenaer dd4754ec0d Updated forms and orders 2015-06-09 13:46:37 +02:00
Feliciaan De Palmenaer 79d8a93267 After closing, payment status can still be changed 2015-06-05 14:27:55 +02:00
Feliciaan De Palmenaer 798e2fd0e7 Merge pull request #54 from ZeusWPI/print-css 
Print css
 2015-06-05 13:53:26 +02:00
Feliciaan De Palmenaer e50e97b428 Add initial profile 2015-06-05 11:39:34 +02:00
Feliciaan De Palmenaer feb1bb0b69 Add link to form 2015-06-05 11:34:39 +02:00
Feliciaan De Palmenaer 47d46223aa Added print.css and updated requirements, GA 2015-06-05 11:29:14 +02:00
Feliciaan De Palmenaer 586e2ca443 Merge pull request #48 from ZeusWPI/feat/38/post_to_slack 
Post to slack
 2015-06-04 23:04:49 +02:00
Feliciaan De Palmenaer 46bf2a0cbb Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/38/post_to_slack 
* 'master' of github.com:ZeusWPI/Foodbot:
  Fixed bug for volunteering closes #44
  Check if user is allowed to edit
  Add paid indicator, fixes #19
  spacing
  Edit orders
  Added phone number
  Added alembic and flask-migrate to haldis
 2015-06-04 22:57:42 +02:00
Feliciaan De Palmenaer 795746bbd1 Merge pull request #52 from ZeusWPI/fix/none-bug 
Fixed bug for volunteering closes #44
 2015-06-04 22:38:27 +02:00
Feliciaan De Palmenaer d6c29b9703 Fixed bug for volunteering closes #44 2015-06-04 22:37:00 +02:00
Feliciaan De Palmenaer 8be04fc450 Merge pull request #51 from ZeusWPI/feat/19/paid-indicator 
Feat/19/paid indicator
 2015-06-04 22:08:27 +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 43a196248b Merge pull request #50 from ZeusWPI/feat/43/edit-orders 
Edit orders
 2015-06-04 21:40:39 +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 9b9eec4e63 Post to slack 2015-06-04 18:33:17 +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 69590c460e Forgot commiting db session 2015-04-04 14:36:19 +02:00
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