Commit graph

171 commits

Author SHA1 Message Date
mcbloch 3a5f31bfac add database population script 2019-04-04 18:27:50 +02:00
Maxime 82d870e825
Merge pull request #95 from Kortika/feature/map
Feature/map
2019-04-04 17:51:00 +02:00
mcbloch 18c2008959 squash database migrations, update model to be equal to the server 2019-04-02 18:03:14 +02:00
Maxime cd3e31d44b
Merge pull request #96 from ZeusWPI/date_time_update
Date time update. 
Update looks good, merging.
2019-04-01 23:41:08 +02:00
Kobe Mertens c32f2ac387 improved formatting of prices 2019-02-16 21:03:56 +01:00
klaasgoethals 71e16064d3 Added startdate and starttime on order page 2019-02-15 19:03:35 +01:00
klaasgoethals 4322f620d7 Show stoptime AND countdown on home and order page 2019-02-15 16:47:02 +01:00
Sitt Min Oo a472efad7c revert change to locations.html 2019-02-14 19:51:12 +01:00
Sitt Min Oo e27d3977dd removed copy paste check 2019-02-14 19:47:25 +01:00
Sitt Min Oo ec91384e9a added mousehovers for marker popups 2019-02-14 19:34:55 +01:00
Sitt Min Oo eaf9ba8399 fixed name and address on popup 2019-02-14 19:17:02 +01:00
Sitt Min Oo baf000eaab edited db models to separate address and tele no. added map for locations 2019-02-14 18:45:24 +01:00
Sitt Min Oo 0a36eab231 added leaflet files and init maps.html 2019-02-14 16:43:29 +01:00
klaasgoethals 7d10608080 Logo's added 2019-02-13 22:31:52 +01:00
klaasgoethals 65b27f7668 Logo with red icon added 2019-02-13 22:28:16 +01:00
klaasgoethals eece1844f2 Added favicon 2019-02-13 20:25:44 +01:00
Francis Begyn debca79f39
Think this should work -- added primmadonna script 2019-01-23 18:11:10 +01:00
Jan-Pieter Baert 6ec294bcf1
forgot to update create_database and typo fix 2019-01-21 18:15:13 +01:00
Jan-Pieter Baert e046d78d78
fixed formatting 2019-01-21 17:08:55 +01:00
Jan-Pieter Baert c0a988d88d
added primadonna to take there 2019-01-21 17:01:02 +01:00
Jan-Pieter Baert 03bf116637
added primadonna from takeaway.com 2019-01-21 16:40:43 +01:00
Rien Maertens 0838c5c501
Add logo 2018-11-06 20:24:40 +01:00
Titouan Vervack ac6659db2d
Sample keys available now! 2018-03-20 10:55:31 +01:00
Robbe Van Herck b324d0a723 Added Choose for me button in order 2018-03-19 18:52:15 +01:00
Titouan Vervack b611fe5961 Removed UTF-8 annotations, better count 2018-03-10 00:50:02 +01:00
Titouan Vervack 2e3ef91ec3 Count and display total # of orders 2018-03-09 00:59:33 +01:00
Titouan Vervack f9b48969b2 Oops, python3 2018-03-09 00:59:14 +01:00
Titouan Vervack 628c5e55c5 Added total nr of orders to order.html 2018-03-08 23:23:40 +01:00
Titouan Vervack 8567d17bab Use raw_input instead of input 2018-03-08 23:22:51 +01:00
Titouan Vervack 0ff7dca664 Set utf-8 encoding on required files 2018-03-08 23:22:32 +01:00
Feliciaan De Palmenaer 2208c44a8d
Fix crash in admin panel 2018-02-19 21:34:54 +01:00
Rien Maertens 4eda1e3f36
Use adams for oauth 2017-02-18 19:08:11 +01:00
Feliciaan De Palmenaer 6abd9614ab Fix deprecations 2017-01-06 12:05:31 +01:00
Wout Schellaert 30a5d05362 Fix errors 2016-09-10 23:25:09 +02:00
Wout Schellaert ba33a05f66 Add top4 products 2016-09-10 23:01:13 +02:00
Wout Schellaert a6f71195fd First data 2016-09-10 16:52:46 +02:00
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