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 7ca0e36946 Small reformat 2016-09-10 15:49:52 +02:00
Wout Schellaert 38843173d5 Fix imports 2016-08-16 20:05:36 +02:00
Feliciaan De Palmenaer ce0fe33c0e Show prices for locations 
For @procrat
 2016-08-01 23:40:04 +02:00
Feliciaan De Palmenaer 6eeb7e8018 Remove prefixFix, no longer necessary 2016-02-18 11:26:41 +01:00
Rien Maertens bea56b6a1e Merge branch 'master' of github.com:ZeusWPI/Haldis 2016-02-09 01:09:39 +01:00
Rien Maertens 1ea873fe17 Added <!channel|@channel> 2016-02-09 01:07:34 +01:00
Feliciaan De Palmenaer a289ad0697 Update models.py 2016-01-04 19:38:10 +01:00
Feliciaan De Palmenaer 59afcab907 OrderItem: repr to no longer show the product if it's deleted 2016-01-04 19:14:08 +01:00
Feliciaan De Palmenaer 3cf49c7634 Fix errbit 2015-11-29 15:19:37 +01:00
Feliciaan De Palmenaer 073f4bba11 Define id 2015-11-05 17:15:03 +01:00
Feliciaan De Palmenaer b51fb2d6de Haldis hot fix, anonymous users cannot delete stuff 2015-10-30 20:30:18 +01:00
Tom Naessens 48e314335f Merge branch 'master' of github.com:ZeusWPI/Haldis 2015-08-18 21:19:47 +02:00
Tom Naessens fcafbb68fa Add search field to ProductAdmin 2015-08-18 21:19:41 +02:00
Stijn Seghers 47d4300e83 Product and paid status of an order can't be NULL 2015-08-18 20:47:49 +02:00
Wout Schellaert f2e2bd2727 Merge pull request #60 from ZeusWPI/add-extras 
Extras
 2015-08-04 17:21:36 +01:00
Feliciaan De Palmenaer 2497686abe Better table Fixes #58 2015-06-24 22:24:21 +02:00
Feliciaan De Palmenaer 4de65752ec Extras 2015-06-24 22:10:26 +02:00
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