Maxime
|
82d870e825
|
Merge pull request #95 from Kortika/feature/map
Feature/map
|
2019-04-04 17:51:00 +02:00 |
|
Maxime
|
27302bdc2f
|
Merge pull request #98 from ZeusWPI/fix_db
squash database migrations, update model to be equal to the server
|
2019-04-04 17:41:47 +02:00 |
|
mcbloch
|
18c2008959
|
squash database migrations, update model to be equal to the server
|
2019-04-02 18:03:14 +02:00 |
|
mcbloch
|
f7dfad5700
|
Merge branch 'master' of github.com:ZeusWPI/Haldis
|
2019-04-01 23:43:12 +02:00 |
|
mcbloch
|
c249bdcbd4
|
add venv creation to script, add to readme and gitignore
|
2019-04-01 23:42:59 +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 |
|
redfast00
|
94a8e2e12c
|
Merge pull request #97 from SchrodingersCat00/priceformat
improved formatting of prices
|
2019-02-17 09:35:20 +01: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 |
|
Robbe Van Herck
|
09c65e2bcc
|
Merge pull request #93 from ZeusWPI/localhost-script
Localhost script
|
2019-02-13 22:48:36 +01:00 |
|
Jan-Pieter Baert
|
12d215f86f
|
name change, more logical game
|
2019-02-13 22:46:26 +01:00 |
|
klaasg
|
e5a2fe48cc
|
Merge pull request #94 from ZeusWPI/favicon
Favicon
|
2019-02-13 22:39:45 +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 |
|
Jan-Pieter Baert
|
7ad6ff3853
|
cross platform sucks a bit, so the current script is only for linux
|
2019-02-13 20:42:02 +01:00 |
|
Jan-Pieter Baert
|
4137016965
|
added a script to run haldis locally + README update
|
2019-02-13 20:37:07 +01:00 |
|
klaasgoethals
|
eece1844f2
|
Added favicon
|
2019-02-13 20:25:44 +01:00 |
|
Rien
|
52188e0fb2
|
Merge pull request #92 from fbegyn/primmadonna
Think this should work -- added primmadonna script
|
2019-02-07 18:06:05 +01:00 |
|
|
|
debca79f39
|
Think this should work -- added primmadonna script
|
2019-01-23 18:11:10 +01:00 |
|
redfast00
|
b47153de4e
|
Merge pull request #91 from Jan-PieterBaert/master
forgot to update create_database and typo fix
|
2019-01-21 18:18:13 +01:00 |
|
Jan-Pieter Baert
|
6ec294bcf1
|
forgot to update create_database and typo fix
|
2019-01-21 18:15:13 +01:00 |
|
Robbe Van Herck
|
0bb09662d3
|
Merge pull request #90 from Jan-PieterBaert/master
Added a script to add primadonna to haldis
|
2019-01-21 17:14: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 |
|
Wout Schellaert
|
44b5209213
|
Merge pull request #88 from ZeusWPI/Robbe7730-patch-1
Fixed wrong filename in step 4
|
2018-03-22 14:02:57 +01:00 |
|
Robbe Van Herck
|
62973f4800
|
Fixed wrong filename in step 4
|
2018-03-22 14:02:00 +01:00 |
|
Feliciaan De Palmenaer
|
5f5081d2cd
|
Merge pull request #86 from ZeusWPI/tivervac-patch-1
Sample keys available now!
|
2018-03-20 11:04:37 +01:00 |
|
Feliciaan De Palmenaer
|
2de5f6a1b0
|
Merge pull request #87 from ZeusWPI/tivervac-patch-1-1
Sample keys available now!
|
2018-03-20 11:04:22 +01:00 |
|
Titouan Vervack
|
6039f051fe
|
Sample keys available now!
|
2018-03-20 10:55:42 +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 |
|
Feliciaan De Palmenaer
|
a65540aa06
|
Merge pull request #85 from ZeusWPI/total_orders
Total orders
|
2018-03-10 10:18:58 +01:00 |
|
Titouan Vervack
|
b611fe5961
|
Removed UTF-8 annotations, better count
|
2018-03-10 00:50:02 +01:00 |
|
Titouan Vervack
|
a911f6ef88
|
Update install instructions
|
2018-03-09 01:02:35 +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
|
a5a924d5ea
|
Ignore vscode configs
|
2018-03-09 00:58:53 +01:00 |
|
Titouan Vervack
|
628c5e55c5
|
Added total nr of orders to order.html
|
2018-03-08 23:23:40 +01:00 |
|
Titouan Vervack
|
8b1b708695
|
Added install instructions
|
2018-03-08 23:23:02 +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 |
|
