Commit graph

188 commits

Author SHA1 Message Date
Tom Naessens 7de4dbf5c4 Hide create order button when a user is not logged in 2019-05-31 09:27:44 +12:00
Tom Naessens 4e143b9b97
Merge pull request #124 from ZeusWPI/feature/120/order-button-on-location-page
Adds a button on the location/ and locations/ page to start a new order
2019-05-31 08:51:00 +12:00
Maxime 3465742021
Merge pull request #122 from ZeusWPI/fix/Create-text-on-edit
fixed Create new order message on order edit
2019-05-30 08:58:22 +02:00
Tom Naessens 2d4ad2a605 Adds a button on the location/ and locations/ page to start a new order at the given location #120 2019-05-30 14:10:47 +12:00
fklinck 75f3b80acb
fixed Create new order message on order edit 2019-05-30 02:30:22 +02:00
mcbloch 02c9abe28c add location name to browser title 2019-05-29 18:02:55 +02:00
fklinck 56ef2654a5
added open new tab on marker click 2019-05-29 15:48:38 +02:00
fklinck 7555b9d65c
fixed poput location 2019-05-28 19:52:38 +02:00
Maxime 7802464c66
Merge pull request #113 from ZeusWPI/fix_map
Fix map
2019-04-30 17:28:50 +02:00
mcbloch dd3fe26b86 add anchor so the marker points to the correct location 2019-04-06 19:31:04 +02:00
mcbloch 94fedf8097 Merge remote-tracking branch 'origin' into fix_map 2019-04-06 19:20:06 +02:00
mcbloch 31a731c1b8 do not query osm for 'None' locations 2019-04-06 19:05:52 +02:00
redfast00 909b3fc2e6
Remove Google Analytics 2019-04-05 23:31:36 +02:00
redfast00 b2c637b343
Serve own bootstrap 2019-04-05 23:26:57 +02:00
redfast00 34aca21a0b
Don't load over protocol-relative URI 2019-04-05 23:10:12 +02:00
mcbloch 83e4a10bbc fix big ass close order issue #107 2019-04-05 18:24:24 +02:00
mcbloch a3f0dffc30 move script to separate js file, add loging for bad adresses 2019-04-04 20:41:43 +02:00
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