Commit Graph

15 Commits

Author SHA1 Message Date
Kevin Dungs 658a40a09f Resolve merge conflict. 2014-11-18 16:18:49 +01:00
Tim Head 96275a1a7e Change to the wording on the landing page 2014-11-18 16:05:44 +01:00
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 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 ff5d158a4e Yet another wordlist, based on WordNet this time 2014-11-17 18:25:37 +01:00
Kevin Dungs 6418ff4871 Small visual improvements. 2014-11-17 17:11:28 +01:00
Kevin Dungs af29d6321f Small changes to UI. Also add warning about state of the project. 2014-11-17 16:49:06 +01:00
Tim Head 361d113c9a Updated README and html 2014-11-17 16:40:58 +01:00
Tim Head 9c9f32c2a7 Added a word list generator using google ngram as input 2014-11-17 16:11:41 +01:00
Kevin Dungs 3a0d905660 Fix spelling. 2014-11-17 14:45:04 +01:00
Kevin Dungs 34a18b6eca Add simple webservice. 2014-11-17 11:44:55 +01:00