Maxime
|
e9293f7947
|
Merge branch 'master' into feature/104/show-map-on-location-page
|
2019-05-31 17:15:40 +00:00 |
|
Maxime
|
5020556dcb
|
Merge pull request #121 from ZeusWPI/feature/order_items
add order items screen
|
2019-05-31 17:12:43 +00:00 |
|
mcbloch
|
ec9c034539
|
add media querries for side padding
|
2019-05-31 19:05:40 +02:00 |
|
Tom Naessens
|
6327809bbd
|
Merge branch 'master' into feature/104/show-map-on-location-page
|
2019-05-31 09:29:07 +12:00 |
|
Tom Naessens
|
7de4dbf5c4
|
Hide create order button when a user is not logged in
|
2019-05-31 09:27:44 +12:00 |
|
Tom Naessens
|
8e682f0216
|
Merge branch 'master' into feature/104/show-map-on-location-page
|
2019-05-31 09:22:26 +12:00 |
|
|
|
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 |
|
Tom Naessens
|
41a289fb47
|
Add a small padding-top above location map for mobile devices
|
2019-05-30 19:40:17 +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
|
0619cef246
|
Some layouting
|
2019-05-30 18:46:28 +12:00 |
|
Tom Naessens
|
6e74e0e078
|
Cleaner layout
|
2019-05-30 18:36:56 +12:00 |
|
Tom Naessens
|
1f3c480967
|
Basic code, still needs some layout changes
|
2019-05-30 18:29:08 +12: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 |
|
|
|
75f3b80acb
|
fixed Create new order message on order edit
|
2019-05-30 02:30:22 +02:00 |
|
mcbloch
|
2d9f7e7fc5
|
add extra order items screen, clickable div with shadow
|
2019-05-29 20:12:19 +02:00 |
|
mcbloch
|
02c9abe28c
|
add location name to browser title
|
2019-05-29 18:02:55 +02:00 |
|
|
|
56ef2654a5
|
added open new tab on marker click
|
2019-05-29 15:48:38 +02:00 |
|
Maxime
|
7802464c66
|
Merge pull request #113 from ZeusWPI/fix_map
Fix map
|
2019-04-30 17:28:50 +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
|
34aca21a0b
|
Don't load over protocol-relative URI
|
2019-04-05 23:10:12 +02:00 |
|
mcbloch
|
a3f0dffc30
|
move script to separate js file, add loging for bad adresses
|
2019-04-04 20:41:43 +02:00 |
|
Maxime
|
82d870e825
|
Merge pull request #95 from Kortika/feature/map
Feature/map
|
2019-04-04 17:51:00 +02: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 |
|
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
|
628c5e55c5
|
Added total nr of orders to order.html
|
2018-03-08 23:23:40 +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 |
|
Feliciaan De Palmenaer
|
ce0fe33c0e
|
Show prices for locations
For @procrat
|
2016-08-01 23:40:04 +02: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
|
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
|
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
|
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
|
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 |
|
Tom Naessens
|
76ec291d02
|
Fix #35
|
2015-04-05 13:08:02 +02:00 |
|
Bart Mesuere
|
271e53dcae
|
punctuation is overrated
|
2015-04-03 21:04:10 +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 |
|
Lorin Werthen
|
113fbe98b9
|
find . -type f -exec sed -i s/James/Haldis/g {} \;
|
2015-04-03 18:41:44 +02:00 |
|
Feliciaan De Palmenaer
|
85790c0a45
|
Adds placeholder to name field, fixes #25
|
2015-04-02 20:56:31 +02:00 |
|
James
|
6cb9bf067f
|
This is really going to hurt
|
2015-03-31 20:15:22 +02:00 |
|
