Haldis/haldis
2
0
Fork 0
Code Issues 39 Pull requests Packages Projects Releases Wiki Activity
705 commits 9 branches 0 tags 3.8 MiB
Commit graph

705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tom Naessens 8e682f0216 Merge branch 'master' into feature/104/show-map-on-location-page 2019-05-31 09:22:26 +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
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
fklinck 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
Maxime 2314ec0e3b
Merge pull request #119 from ZeusWPI/feature/add_location_name_to_browser_title 
add location name to browser title
 2019-05-29 18:05:28 +02:00
mcbloch 02c9abe28c add location name to browser title 2019-05-29 18:02:55 +02:00
Maxime 2cd5fca66b
Merge pull request #118 from ZeusWPI/feature/popup-link 
added open new tab on marker click
 2019-05-29 17:00:09 +02:00
fklinck 56ef2654a5
added open new tab on marker click 2019-05-29 15:48:38 +02:00
Maxime f4187a3385
Merge pull request #116 from ZeusWPI/fix/map-popup 
fixed poput location
 2019-05-28 18:57:28 +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 dfb19110c4 update urllib3 dependency; CVE-2019-11324 2019-04-19 21:50:05 +02:00
Maxime 7da75d85df
Merge pull request #110 from ZeusWPI/remove-analytics 
Remove Google Analytics
 2019-04-12 23:13:57 +02:00
mcbloch e416d5ff0a update jinja2 dependency; CVE-2019-10906 2019-04-12 22:54:19 +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
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