mattmcw
/
these-3-words
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72 Commits 1 Branch 0 Tags 620 KiB
Commit Graph

72 Commits

Author SHA1 Message Date
Kevin Dungs 990ebd3ee5 Merge pull request #17 from betatim/dont-move-marker-on-zoom 
Do not move marker on double click
 2014-11-24 15:53:01 +01:00
Tim Head 011620b406 Merge pull request #19 from kdungs/fix-18 
Fix #18.
 2014-11-23 12:54:28 +01:00
Tim Head e7eb6c2283 Move code that prevents moveTo from running 2014-11-23 12:24:59 +01:00
Kevin Dungs 14e5d8fb21 Fix #18. 2014-11-23 12:22:58 +01:00
Tim Head 719148aa1c Do not move marker on double click 
Zoom but do not move the marker on double click
on the map.
 2014-11-23 12:07:19 +01:00
Tim Head 365114dd8c Merge pull request #16 from betatim/panning 
Map now pans when marker is outside viewport. Closes #12
 2014-11-23 11:45:38 +01:00
Tim Head d5cae4c6b7 Map now pans when marker is outside viewport 2014-11-23 11:41:25 +01:00
Tim Head 9cdd13343a Removing some more rude words and automation of examples 2014-11-21 22:52:17 +01:00
Tim Head f47ea87475 Examples in index.html as well 2014-11-21 22:35:23 +01:00
Tim Head 464909060e Update README.md 2014-11-21 11:52:38 +01:00
Tim Head 23d400d82c Updated README.md 
Changed the examples to work with new wordlist

added some exampel locations
 2014-11-21 11:50:45 +01:00
Tim Head e28a4b4995 Trivial update to index.html 2014-11-21 11:36:24 +01:00
Kevin Dungs 43f2fe89a3 Merge pull request #15 from betatim/landing-page-extension 
Extended landing page with examples
 2014-11-21 10:06:18 +01:00
Kevin Dungs 1311a32577 Merge pull request #14 from betatim/google-ngram-wordlist 
New word list based on google ngram from 2008
 2014-11-21 10:06:08 +01:00
Tim Head 9acf0851ae Extended landing page with examples 
Added some examples to the landing page that will make
it easier for newcomers to understand what this is
and what to do next
 2014-11-21 09:55:09 +01:00
Tim Head 0bc618049e Undo temporary filename change 
Forgot to undo temporary filename change
 2014-11-21 09:32:23 +01:00
Tim Head e89bbe2399 New word list based on google ngram from 2008 
In addition made handling of word lists in thesethreewords.py
more modular.
 2014-11-21 09:23:07 +01:00
Tim Head 4aa7e921e7 Merge pull request #8 from betatim/button-fix 
Repaired the submit button, self merge
 2014-11-18 16:55:41 +01:00
Tim Head 10fc782332 Submit button works again 2014-11-18 16:47:47 +01:00
Kevin Dungs 658a40a09f Resolve merge conflict. 2014-11-18 16:18:49 +01:00
Kevin Dungs 1a445cdc0c Merge pull request #6 from betatim/landing 
Rudimentary smart box on the landing page
 2014-11-18 16:15:51 +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
Kevin Dungs d72e9eb10b Fix small error in style. 2014-11-18 14:38:55 +01:00
Tim Head 912688fca1 Rudimentary smart box on the landing page 2014-11-18 14:37:48 +01:00
Kevin Dungs a651a584a9 Improve search bar behaviour. 2014-11-18 14:35:16 +01:00
Kevin Dungs 9b411e4908 Add lines for Vim swapfiles and OS X Ds store. 2014-11-18 14:35:04 +01:00
Kevin Dungs c01af15828 Add experimental search bar. 2014-11-18 11:56:39 +01:00
Kevin Dungs c3d518a68d Also change page title for nicer history. 2014-11-18 11:22:54 +01:00
Kevin Dungs 4f90b5dc04 Implement responsive URLs. 2014-11-18 11:11:37 +01:00
Kevin Dungs ea8adf3750 Resolve merge conflict. 2014-11-18 10:20:34 +01:00
Tim Head 6872dc293c Merge pull request #5 from betatim/json-api 
Started a JSON API
 2014-11-18 10:19:03 +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 97b6dd6dbb Add overlay for information. 2014-11-17 19:33:38 +01:00
Tim Head ff5d158a4e Yet another wordlist, based on WordNet this time 2014-11-17 18:25:37 +01:00
Tim Head 7d657e99ca Merge pull request #4 from kdungs/master 
Merge changes to the webservice
 2014-11-17 18:19:33 +01:00
Kevin Dungs 6418ff4871 Small visual improvements. 2014-11-17 17:11:28 +01:00
Kevin Dungs 98d26a4b61 Add marker. 2014-11-17 16:59:10 +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 f88c7f856d Bug fix for duplicate words 
This word list is still pretty bad ...
 2014-11-17 16:38:15 +01:00
Tim Head 2b514a981d Merge pull request #3 from kdungs/webservice 
Add Gunicorn to requirements.
 2014-11-17 16:12:32 +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 f1ee767f9d Add Gunicorn to requirements. 
Also fix call to gunicorn.
 2014-11-17 16:00:32 +01:00
Tim Head 6902b59dbf Merge pull request #2 from kdungs/webservice 
Getting ready for heroku
 2014-11-17 15:53:59 +01:00