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

55 Commits

Author SHA1 Message Date
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
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 2abcf46b30 Add Procfile. 2014-11-17 15:32:49 +01:00
Kevin Dungs 6119fea497 Fix requirements again. Should work now. 2014-11-17 15:26:07 +01:00
Kevin Dungs db3d286f70 Fix requirements. 2014-11-17 15:20:32 +01:00
Kevin Dungs c6ccdac193 Add requirements. Does this work this way? 2014-11-17 15:16:56 +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
Tim Head 485b25053e Updated install instructions and added new collaborator 2014-11-17 14:55:12 +01:00
Tim Head ce8fbf5f04 Merge pull request #1 from kdungs/webservice 
Adding the beginnings of a webservice.
 2014-11-17 14:51:02 +01:00
Kevin Dungs 3a0d905660 Fix spelling. 2014-11-17 14:45:04 +01:00
Kevin Dungs d382b7bc96 Adjust zoom. 2014-11-17 14:05:57 +01:00
Kevin Dungs 6f1a9824f0 Add section about webservice to README. 2014-11-17 14:04:38 +01:00
Kevin Dungs 34a18b6eca Add simple webservice. 2014-11-17 11:44:55 +01:00
Tim Head 1cb16ab621 Update README.md 2014-11-17 11:21:37 +01:00
Tim Head ee608b46b5 Less convoluted conversion of a list of bytes to integer 
After a few hours of sleep I do remember basic computing
 2014-11-17 10:45:51 +01:00
Tim Head 20a256fc65 Update README.md 2014-11-17 07:01:42 +01:00