Commit Graph

13 Commits

Author SHA1 Message Date
Tim Head 46e6d883dc More tidying up from Tims rebase screw up 2014-11-18 15:46:56 +01:00
Tim Head a08f93ff5b Merge remote-tracking branch 'origin/landing' into landing
Conflicts:
	views/index.html
2014-11-18 15:43:28 +01:00
Tim Head cc80f74dec Smarter landing page 2014-11-18 15:40:05 +01:00
Tim Head fa44970fd1 Rudimentary smart box on the landing page 2014-11-18 15:00:02 +01:00
Tim Head 912688fca1 Rudimentary smart box on the landing page 2014-11-18 14:37:48 +01:00
Kevin Dungs f1482dde02 Remove import of old api. 2014-11-18 10:13:43 +01:00
Kevin Dungs ce9cd36c9d Integrate the API into the App.
Very simple proof of concept for the moment.
Also the map is now click-able and the marker updates its label via the
API.
2014-11-18 10:10:18 +01:00
Tim Head 675b4e330c Started a JSON API 2014-11-18 07:22:28 +01:00
Kevin Dungs 98d26a4b61 Add marker. 2014-11-17 16:59:10 +01:00
Kevin Dungs c08ef2d10c Fix import 2014-11-17 15:44:39 +01:00
Kevin Dungs eed50f8ac6 Preserve functionality to run locally.
On the server the app is now run by gunicorn.
2014-11-17 15:43:32 +01:00
Kevin Dungs 8eeea4b7d3 Prepare app for Heroku. 2014-11-17 15:16:43 +01:00
Kevin Dungs 160ee4473b Nowadays stuff is called "App". 2014-11-17 15:14:55 +01:00