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
Maxime
01bde1501e
Merge pull request #111 from ZeusWPI/edit-badges
...
Added links, removed unneeded badges
2019-04-06 18:24:50 +02:00
redfast00
093963cf3a
Added links, removed unneeded badges
...
Badges for the amount of open issues, PR's and last commit are unneeded, since they are shown in the GitHub UI.
I removed them, because they don't always load as fast as the page loads, resulting in ugly
text getting displayed.
2019-04-06 11:12:21 +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
Maxime
dfe04a885d
Merge pull request #103 from ZeusWPI/fix_deps
...
Update all dependencies, update first-setup script, add how-to-run docs. Badges are nice to
2019-04-05 18:09:47 +02:00
Maxime
173b367b8e
Merge pull request #102 from ZeusWPI/fix_map
...
move script to separate js file, add logging for bad adresses
2019-04-05 18:09:33 +02:00
mcbloch
55d3c11115
vert line is ugly
2019-04-05 02:48:58 +02:00
mcbloch
c9e0857ae0
more on one line?
2019-04-05 02:48:24 +02:00
mcbloch
1a5ac94d6b
remove less import badges
2019-04-05 02:47:08 +02:00
mcbloch
5769597a12
more readable
2019-04-05 02:45:21 +02:00
mcbloch
0910d0c430
throw a ton of badges into the readme
2019-04-05 02:42:49 +02:00
mcbloch
807807e0ac
update some wording
2019-04-05 02:14:30 +02:00
mcbloch
539e6ff2c4
add command to run the server/manage deps
2019-04-05 02:12:52 +02:00
mcbloch
c68fe1f7b9
add command to run the server/manage deps
2019-04-05 02:12:39 +02:00
mcbloch
e4b8ae58d6
typo
2019-04-05 02:05:54 +02:00
mcbloch
9e4beb7787
update readme with extra docs
2019-04-05 02:04:46 +02:00
mcbloch
07895c5e87
add some nice formatting
2019-04-05 01:48:59 +02:00
mcbloch
4fe2634668
fix pip-tools dep
2019-04-05 01:29:48 +02:00
mcbloch
d33dc05840
use pip-tools for dependecy management, update setup script
2019-04-05 01:25:30 +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
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
