From eadaf2466f7293c3f0f5b8dd35c9264d7db1bd95 Mon Sep 17 00:00:00 2001 From: Rob Scanlon Date: Fri, 14 Apr 2017 22:53:25 -0400 Subject: [PATCH 1/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cbf60c5..9f6d92a 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ and is mapped to real locations using [freegeoip.net](http://freegeoip.net). ### License The MIT License (MIT) -Copyright (c) 2014 Robert Scanlon +Copyright (c) 2014-2017 Robert Scanlon Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From e1d9b781d7ec7f57f9c1c98f4baf7c35626eccbe Mon Sep 17 00:00:00 2001 From: Chandan Rai Date: Sun, 6 Aug 2017 16:01:22 +0530 Subject: [PATCH 2/4] corrected minor typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f6d92a..1a658bf 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ feeds, but it certainly is possible. I did split out the globe into its own [standalone library](https://github.com/arscan/encom-globe) that can be easily reused though. -### Noteable Dependencies +### Notable Dependencies * [Node.js](http://nodejs.org/) * [Three.js](http://threejs.org/) From 45b7b9ed230d1ddd5be40fecf2ef760f23432aaf Mon Sep 17 00:00:00 2001 From: the6thm0nth Date: Mon, 7 Aug 2017 10:44:09 +0900 Subject: [PATCH 3/4] fix a link to Tron:Leegacy on imdb on README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a658bf..48bcf03 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Encom Boardroom An HTML5 recreation of the [Boardroom Scene](http://work.gmunk.com/TRON-Board-Room) in Disney's [Tron: -Legacy](http://www.imdb.com/tible/tt1104001/). It currently displays realtime +Legacy](http://www.imdb.com/title/tt1104001/). It currently displays realtime data from Github and Wikipedia to make it a bit more fun. View it in action at https://www.robscanlon.com/encom-boardroom/ . From 78d3cf31a118a4732373e85d6332735b8994e036 Mon Sep 17 00:00:00 2001 From: Wandmalfarbe Date: Wed, 9 Aug 2017 14:55:09 +0200 Subject: [PATCH 4/4] Corrected minor mistakes in README.md Corrected minor mistakes in README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 48bcf03..8a5a7cc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Encom Boardroom An HTML5 recreation of the [Boardroom Scene](http://work.gmunk.com/TRON-Board-Room) in Disney's [Tron: Legacy](http://www.imdb.com/title/tt1104001/). It currently displays realtime -data from Github and Wikipedia to make it a bit more fun. View it in action at +data from GitHub and Wikipedia to make it a bit more fun. View it in action at https://www.robscanlon.com/encom-boardroom/ . ![Boardroom light table](https://raw.github.com/arscan/encom-boardroom/master/images/screenshot_lighttable.jpg "Boardroom light table") @@ -19,14 +19,14 @@ for a couple of seconds. I am in awe of those that put it together. My focus was on the globe and I made it available as a [standalone library](https://github.com/arscan/encom-globe) for those interested. The other elements are only loose adaptations of the film version. This project is not -associated with Github, Wikipedia, Tron: Legacy, or Disney. It is just a +associated with GitHub, Wikipedia, Tron: Legacy, or Disney. It is just a tribute. ### Usage The web application can be launched simply by serving up `./index.html`. If -you would like the full application, including the feeds from wikipedia and -github, install and run the node application as follows: +you would like the full application, including the feeds from Wikipedia and +GitHub, install and run the node application as follows: ```sh npm install @@ -51,15 +51,15 @@ reused though. ### Feed Info -**Github:** Data is being streamed in realtime from Github's [public timeline +**GitHub:** Data is being streamed in realtime from GitHub's [public timeline feed](http://github.com/timeline.json). Location information is retrieved from -the user's github profile and is mapped using +the user's GitHub profile and is mapped using [geonames.org](http://geonames.org). Historic 2013 data was retrieved from the -[Github Archive](http://githubarchive.org). User pictures are from +[GitHub Archive](http://githubarchive.org). User pictures are from [Gravatar](http://gravatar.com) and are throttled to under one per second to conserve bandwidth. -**Wikipedia:** Data is being streamed in realtime from Wikipedia's [public irc +**Wikipedia:** Data is being streamed in realtime from Wikipedia's [public IRC feed](http://meta.wikimedia.org/wiki/IRC_channels#Raw_feeds). Location information is only available from anonymous users in the form of IP addresses, and is mapped to real locations using [freegeoip.net](http://freegeoip.net).