May 2015 - tor-commits - lists.torproject.org

[globe/master] Merge branch 'trac-15451'
by isis＠torproject.org 21 May '15

21 May '15

commit 3a92fbab5526599970e620bb7646baa1e824206f Merge: f46b370 02b8a91 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 21 09:50:01 2015 +0000 Merge branch 'trac-15451' src/html/index.raw.html | 2 +- src/js/templates/index.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[globe/master] Fix links to gitweb copy of README on index.html.
by isis＠torproject.org 21 May '15

21 May '15

commit 02b8a91592a8368302fd763b9f5491f135aa4ee4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 21 09:45:20 2015 +0000 Fix links to gitweb copy of README on index.html. * FIXES #15451: https://bugs.torproject.org/15451 --- src/html/index.raw.html | 2 +- src/js/templates/index.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/html/index.raw.html b/src/html/index.raw.html index 893fbb1..8f9c3c0 100644 --- a/src/html/index.raw.html +++ b/src/html/index.raw.html @@ -41,7 +41,7 @@ <h3>What is Globe</h3> <p>Globe is an application that helps you find and explore <a href="https://www.torproject.org/">Tor</a> relays and bridges. It's inspired by <a href="https://atlas.torproject.org">Atlas</a> and uses the <a href="https://onionoo.torproject.org/">Onionoo-API</a> to get the data. - More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://gitweb.torproject.org/globe.git/blob/HEAD:/README.md">README</a>. + More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://gitweb.torproject.org/globe.git/tree/README.md">README</a>. </p> <h3>Why JavaScript</h3> diff --git a/src/js/templates/index.hbs b/src/js/templates/index.hbs index 8738a85..17442a0 100644 --- a/src/js/templates/index.hbs +++ b/src/js/templates/index.hbs @@ -9,7 +9,7 @@ <h3>What is Globe</h3> <p>Globe is an application that helps you find and explore <a href="https://www.torproject.org/">Tor</a> relays and bridges. It's inspired by <a href="https://atlas.torproject.org">Atlas</a> and uses the <a href="https://onionoo.torproject.org/">Onionoo-API</a> to get the data. - More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://gitweb.torproject.org/globe.git/blob/HEAD:/README.md">README</a>. + More details about the used libraries and information on how to build your own version of Globe are available in the <a href="https://gitweb.torproject.org/globe.git/tree/README.md">README</a>. </p> </div> </div>

1 0

[globe/master] Remove advertised bandwidth fraction graph.
by isis＠torproject.org 21 May '15

21 May '15

commit f46b3702582b4be3094240f0bda5a17ec2526b03 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 18 06:52:36 2014 +0100 Remove advertised bandwidth fraction graph. This graph is going to be removed from Onionoo as part of #13674. Replace it with the middle probability graph. Signed-off-by: Isis Lovecruft <isis(a)torproject.org> --- src/js/components/BandwidthStatsComponent.js | 4 ++-- src/js/models/OnionooWeightsHistory.js | 8 ++++---- src/js/templates/components/weight-stats.hbs | 14 +++++++------- src/js/views/HistoryGraphView.js | 6 +++--- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/js/components/BandwidthStatsComponent.js b/src/js/components/BandwidthStatsComponent.js index d856b46..a3aa732 100644 --- a/src/js/components/BandwidthStatsComponent.js +++ b/src/js/components/BandwidthStatsComponent.js @@ -31,9 +31,9 @@ GLOBE.UptimeStatsComponent = GLOBE.GraphStatsComponent.extend({ }); GLOBE.WeightStatsComponent = GLOBE.GraphStatsComponent.extend({ avgFields: [ - 'advertisedBandwidth', 'consensusWeightFraction', 'exitProbability', + 'middleProbability', 'guardProbability' ] }); @@ -41,4 +41,4 @@ GLOBE.ClientsStatsComponent = GLOBE.GraphStatsComponent.extend({ avgFields: [ 'averageClients' ] -}); \ No newline at end of file +}); diff --git a/src/js/models/OnionooWeightsHistory.js b/src/js/models/OnionooWeightsHistory.js index a285283..87be542 100644 --- a/src/js/models/OnionooWeightsHistory.js +++ b/src/js/models/OnionooWeightsHistory.js @@ -22,11 +22,11 @@ GLOBE.OnionooWeightsHistory.reopenClass({ return GLOBE.getJSON(url).then(function(result){ return GLOBE.Util.compute3DaysHistory(GLOBE.Util.processHistoryResponse({ - advertisedBandwidth: 'advertised_bandwidth_fraction', consensusWeightFraction: 'consensus_weight_fraction', - exitProbability: 'exit_probability', - guardProbability: 'guard_probability' + guardProbability: 'guard_probability', + middleProbability: 'middle_probability', + exitProbability: 'exit_probability' }, result)); }); } -}); \ No newline at end of file +}); diff --git a/src/js/templates/components/weight-stats.hbs b/src/js/templates/components/weight-stats.hbs index fcf7a2e..3f2c772 100644 --- a/src/js/templates/components/weight-stats.hbs +++ b/src/js/templates/components/weight-stats.hbs @@ -1,20 +1,20 @@ <div class="pure-g-r"> <div class="pure-u-1-3"> <h3>Weights</h3> - <p>mean advertised bandwidth fraction</p> + <p>mean consensus weight fraction</p> <strong> <span class="d3-col block-0"></span> - {{percent advertisedBandwidthAvg 4}} + {{percent consensusWeightFractionAvg 4}} </strong> - <p>mean consensus weight fraction</p> + <p>mean guard probability fraction</p> <strong> <span class="d3-col block-1"></span> - {{percent consensusWeightFractionAvg 4}} + {{percent guardProbabilityAvg 4}} </strong> - <p>mean guard probability fraction</p> + <p>mean middle probability fraction</p> <strong> <span class="d3-col block-2"></span> - {{percent guardProbabilityAvg 4}} + {{percent middleProbabilityAvg 4}} </strong> <p>mean exit probability fraction</p> <strong> @@ -29,4 +29,4 @@ data=data timePeriods=timePeriods }} </div> -</div> \ No newline at end of file +</div> diff --git a/src/js/views/HistoryGraphView.js b/src/js/views/HistoryGraphView.js index 4ba492b..169a5b4 100644 --- a/src/js/views/HistoryGraphView.js +++ b/src/js/views/HistoryGraphView.js @@ -160,8 +160,8 @@ GLOBE.HistoryGraphView = Em.View.extend({ GLOBE.RelayWeightView = GLOBE.HistoryGraphView.extend({ title: 'Weights', - graphs: ['advertisedBandwidth', 'consensusWeightFraction', 'guardProbability', 'exitProbability'], - labels: ['advertised bandwidth fraction', 'consensus weight fraction','guard probability', 'exit probability'], + graphs: ['consensusWeightFraction', 'guardProbability', 'middleProbability', 'exitProbability'], + labels: ['consensus weight fraction','guard probability', 'middle probability', 'exit probability'], legendPos: [{x:80,y:35},{x:80,y:15},{x:270,y:15}, {x:270,y:35}] }); @@ -209,4 +209,4 @@ GLOBE.BridgeBandwidthView = GLOBE.HistoryGraphView.extend({ }, title: 'Bandwidth', graphs: [] -}); \ No newline at end of file +});

1 0

[globe/master] Moving the License section to the bottom.
by isis＠torproject.org 21 May '15

21 May '15

commit 64dd3a86df3dbe451828efcdc701cb6b8015c2f7 Author: Randall Degges <r(a)rdegges.com> Date: Wed May 20 20:13:34 2015 -0700 Moving the License section to the bottom. --- README.md | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 265ea15..1e288c4 100644 --- a/README.md +++ b/README.md @@ -29,26 +29,6 @@ download the latest archived release from [the release page][]. - Shareable links for searches or details. -## License - -Globe is open-sourced software licensed under the [MIT License][]. - -Project | License ---- | --- -[Ember.js](http://emberjs.com/) | [MIT License](http://opensource.org/licenses/MIT) -[Pure](http://purecss.io/) | [Yahoo! Inc. BSD license](https://github.com/yui/pure/blob/master/LICENSE.md) -[Font Awesome - Font](http://purecss.io/) | [SIL OFL 1.1](http://scripts.sil.org/OFL) -[Font Awesome - SASS files](http://purecss.io/) | [MIT License](http://opensource.org/licenses/mit-license.html) -[Handlebars](http://handlebarsjs.com/) | [MIT License](http://opensource.org/licenses/MIT) -[dygraphs](http://dygraphs.com/) | [MIT License](http://opensource.org/licenses/MIT) -[moment](http://momentjs.com/) | [MIT License](http://opensource.org/licenses/MIT) -[jQuery](http://jquery.com/) | [MIT License](http://opensource.org/licenses/MIT) -[qTip2](http://qtip2.com/) | [MIT License](http://opensource.org/licenses/MIT) -[DataTables](https://datatables.net/) | [MIT license](http://opensource.org/licenses/MIT) [@](http://datatables.net/license_mit) -[jquery deparam](https://github.com/chrissrogers/jquery-deparam/blob/master/jquery-… | [MIT license](http://opensource.org/licenses/MIT) [@](http://benalman.com/about/license/) -[jsSHA](http://caligatio.github.io/jsSHA/) | [BSD license](https://github.com/Caligatio/jsSHA/blob/release-1.42/LICENSE) - - ## Installation Globe is tested and build with nodejs (0.10.x). For an easy overview on how @@ -126,6 +106,26 @@ If you only want to get the required html, JavaScript and CSS files see the resources. +## License + +Globe is open-sourced software licensed under the [MIT License][]. + +Project | License +--- | --- +[Ember.js](http://emberjs.com/) | [MIT License](http://opensource.org/licenses/MIT) +[Pure](http://purecss.io/) | [Yahoo! Inc. BSD license](https://github.com/yui/pure/blob/master/LICENSE.md) +[Font Awesome - Font](http://purecss.io/) | [SIL OFL 1.1](http://scripts.sil.org/OFL) +[Font Awesome - SASS files](http://purecss.io/) | [MIT License](http://opensource.org/licenses/mit-license.html) +[Handlebars](http://handlebarsjs.com/) | [MIT License](http://opensource.org/licenses/MIT) +[dygraphs](http://dygraphs.com/) | [MIT License](http://opensource.org/licenses/MIT) +[moment](http://momentjs.com/) | [MIT License](http://opensource.org/licenses/MIT) +[jQuery](http://jquery.com/) | [MIT License](http://opensource.org/licenses/MIT) +[qTip2](http://qtip2.com/) | [MIT License](http://opensource.org/licenses/MIT) +[DataTables](https://datatables.net/) | [MIT license](http://opensource.org/licenses/MIT) [@](http://datatables.net/license_mit) +[jquery deparam](https://github.com/chrissrogers/jquery-deparam/blob/master/jquery-… | [MIT license](http://opensource.org/licenses/MIT) [@](http://benalman.com/about/license/) +[jsSHA](http://caligatio.github.io/jsSHA/) | [BSD license](https://github.com/Caligatio/jsSHA/blob/release-1.42/LICENSE) + + [Globe Logo]: https://raw.github.com/makepanic/globe/master/res/others/logo-big.png "Globe Logo" [Tor Onionoo API]: https://onionoo.torproject.org/ "Tor Onionoo API" [Ember.js]: http://emberjs.com/ "Ember.js"

1 0

[globe/master] globe -> Globe
by isis＠torproject.org 21 May '15

21 May '15

commit 129732477cf67a3ab0094108f0f8ab0cb16dd1a1 Author: Randall Degges <r(a)rdegges.com> Date: Wed May 20 20:16:23 2015 -0700 globe -> Globe --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 3ca93a9..1adf2de 100644 --- a/README.md +++ b/README.md @@ -35,10 +35,10 @@ Globe is tested and build with nodejs (0.10.x). For an easy overview on how to install node on your distribution look at [Installing Node.js via Package Manager][] -- or, more preferably: [nvm][]. -In addition to that, globe can be built in a virtual machine that is managed +In addition to that, Globe can be built in a virtual machine that is managed using [Vagrant][]. To make it easier for you, we provide a [Vagrantfile][] that builds an ubuntu (12.04) virtual machine with everything necessary for -developing and building globe. If you have vagrant installed run `vagrant up` +developing and building Globe. If you have vagrant installed run `vagrant up` and wait until everything is ready. **NOTE**: By default, Vagrant will expose the local Globe instance on @@ -46,7 +46,7 @@ and wait until everything is ready. browser, you can do so there. Connect to your running virtual machine via `vagrant ssh`. Using the shared -folder (`cd /vagrant/`) you can continue building globe using the following +folder (`cd /vagrant/`) you can continue building Globe using the following commands. @@ -63,7 +63,7 @@ commands. 1. First you need all the npm dependencies. Run `npm install`. 2. Now you're ready to build the application and start the server. Call - `grunt` and wait for it to complete the build process. Grunt precompiles + `grunt` and wait for it to complete the build process. Grunt pre-compiles the handlebars templates, combines all the different JavaScript and CSS files and minifies them. This can take a while depending on your computer.

1 0

[globe/master] Adding information about what port globe runs on via vagrant.
by isis＠torproject.org 21 May '15

21 May '15

commit b96593b6dcc508d64570d96f8b3912cab14fe196 Author: Randall Degges <r(a)rdegges.com> Date: Wed May 20 20:15:29 2015 -0700 Adding information about what port globe runs on via vagrant. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 1e288c4..3ca93a9 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,10 @@ that builds an ubuntu (12.04) virtual machine with everything necessary for developing and building globe. If you have vagrant installed run `vagrant up` and wait until everything is ready. +**NOTE**: By default, Vagrant will expose the local Globe instance on +[http://localhost:1337][]. So if you want to view the Globe site in your +browser, you can do so there. + Connect to your running virtual machine via `vagrant ssh`. Using the shared folder (`cd /vagrant/`) you can continue building globe using the following commands. @@ -51,6 +55,7 @@ commands. 1. `npm install` (not necessary in the vagrant machine) 2. `grunt` 3. `node app.js` +4. In your browser, visit [http://localhost:1337][] ### Explanation @@ -139,3 +144,4 @@ Project | License [Vagrantfile]: https://gitweb.torproject.org/globe.git/blob/HEAD:/Vagrantfile "Vagrantfile" [Express.js]: http://expressjs.com/ "Express.js" [karma]: https://karma-runner.github.io/0.12/index.html "Karma" + [http://localhost:1337] http://localhost:1337 "View Globe Locally"

1 0

[globe/master] Merge remote-tracking branch 'rdegges/readme-cleanup'
by isis＠torproject.org 21 May '15

21 May '15

commit 234f07c6cdd4f479d55d2737c639c1aedc798593 Merge: 37d2bc6 7f635b8 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu May 21 07:57:30 2015 +0000 Merge remote-tracking branch 'rdegges/readme-cleanup' README.md | 175 +++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 111 insertions(+), 64 deletions(-)

1 0

[globe/master] Minor fixes to space.
by isis＠torproject.org 21 May '15

21 May '15

commit 7f635b862489842e9993950b910fb9c2efb1dd97 Author: Randall Degges <r(a)rdegges.com> Date: Wed May 20 20:23:23 2015 -0700 Minor fixes to space. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1adf2de..cefba2c 100644 --- a/README.md +++ b/README.md @@ -60,14 +60,14 @@ commands. ### Explanation -1. First you need all the npm dependencies. Run `npm install`. +1. First you need all the npm dependencies. Run `npm install`. 2. Now you're ready to build the application and start the server. Call `grunt` and wait for it to complete the build process. Grunt pre-compiles the handlebars templates, combines all the different JavaScript and CSS files and minifies them. This can take a while depending on your computer. -3. If it's done start the server using `node app.js`. This will start a simple +3. If it's done start the server using `node app.js`. This will start a simple [Express.js][] server that handles the requests. If you only want to get the required html, JavaScript and CSS files see the

1 0

[globe/master] Updating links (using nice markdown style and fixing old links).
by isis＠torproject.org 21 May '15

21 May '15

commit 7e3fbe412fda2d2bd98a1c3a3a612752329bd18b Author: Randall Degges <r(a)rdegges.com> Date: Wed May 20 20:10:42 2015 -0700 Updating links (using nice markdown style and fixing old links). --- README.md | 48 ++++++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index d6125ff..bb73aa6 100644 --- a/README.md +++ b/README.md @@ -4,23 +4,20 @@ JavaScript application to search and view details for Tor relays and bridges. -All the data comes from the [Tor onionoo API](https://onionoo.torproject.org/). -Uses [Ember.js](http://emberjs.com/) as JavaScript framework. Inspired by the -official [Tor Atlas](https://atlas.torproject.org/). +All the data comes from the [Tor Onionoo API][]. Uses [Ember.js][] as +Javascript framework. Inspired by the official [Tor Atlas][] project. -Tor Onionoo Search is not affiliated with the Tor project. "Tor" and the "Onion -Logo" are registered trademarks of The Tor Project, Inc. +Tor Onionoo is not affiliated with the Tor project. "Tor" and the "Onion Logo" +are registered trademarks of The Tor Project, Inc. ## Use the Application -To use a hosted version of Globe, -[click here to open http://globe.rndm.de](http://globe.rndm.de/). If you want -to build your own version take a look at the [grunt targets](#grunt-targets) -section. +To use a hosted version of Globe, [click here][]. If you want to build your +own version, take a look at the [grunt targets](#grunt-targets) section. -If you can't or don't want to build the application on your own, you could -download the latest archived relase from [the release page](https://github.com/makepanic/globe/releases). +If you can't or don't want to build the application on your own, you can +download the latest archived release from [the release page][]. ## Features @@ -34,8 +31,7 @@ download the latest archived relase from [the release page](https://github.com/m ## License -Globe is open-sourced software licensed under the -[MIT license](http://opensource.org/licenses/MIT) +Globe is open-sourced software licensed under the [MIT License][]. Project | License --- | --- @@ -57,11 +53,10 @@ Project | License Globe is tested and build with nodejs (0.10.x). For an easy overview on how to install node on your distribution look at -[Installing Node.js via package manager](https://github.com/joyent/node/wiki/Installing-Node.js-via-package…. +[Installing Node.js via Package Manager][] -- or, more preferably: [nvm][]. In addition to that, globe can be built in a virtual machine that is managed -using [Vagrant](http://www.vagrantup.com/). To make it easier for you, we -provide a [Vagrantfile](https://gitweb.torproject.org/globe.git/blob/HEAD:/Vagrantfile) +using [Vagrant][]. To make it easier for you, we provide a [Vagrantfile][] that builds an ubuntu (12.04) virtual machine with everything necessary for developing and building globe. If you have vagrant installed run `vagrant up` and wait until everything is ready. @@ -88,10 +83,10 @@ commands. files and minifies them. This can take a while depending on your computer. 3. If it's done start the server using `node app.js`. This will start a simple - [express.js](http://expressjs.com/) server that handles the requests. + [Express.js][] server that handles the requests. If you only want to get the required html, JavaScript and CSS files see the -__Standalone grunt target__ below. +**Standalone grunt target** below. ### Grunt Targets @@ -121,13 +116,26 @@ __Standalone grunt target__ below. #### Continuous Integration Target - `grunt ci` - same targets as `grunt standalone` with additional testing of the generated - files using [karma](http://karma-runner.github.io/) + files using [karma][] - used for travis continuous integration #### Default Target - `grunt` -- same as `standalone` except it won't create a build folder with all the ressources +- same as `standalone` except it won't create a build folder with all the + resources [Globe Logo]: https://raw.github.com/makepanic/globe/master/res/others/logo-big.png "Globe Logo" + [Tor Onionoo API]: https://onionoo.torproject.org/ "Tor Onionoo API" + [Ember.js]: http://emberjs.com/ "Ember.js" + [Tor Atlas]: https://atlas.torproject.org/ "Tor Atlas" + [click here]: https://globe.torproject.org/ "Tor Globe" + [the release page]: https://github.com/makepanic/globe/releases "Tor Globe Releases" + [MIT License]: http://opensource.org/licenses/MIT "MIT License" + [Installing Node.js via Package Manager]: https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager "Installing Node.js via Package Manager" + [nvm]: https://github.com/creationix/nvm "NVM - Node Version Manager" + [Vagrant]: https://www.vagrantup.com/ "Vagrant" + [Vagrantfile]: https://gitweb.torproject.org/globe.git/blob/HEAD:/Vagrantfile "Vagrantfile" + [Express.js]: http://expressjs.com/ "Express.js" + [karma]: https://karma-runner.github.io/0.12/index.html "Karma"

1 0

[globe/master] Updating syntax slightly to be consistent.
by isis＠torproject.org 21 May '15

21 May '15

commit d352c65f1025cf00455fa8743f7cd5f9f90a9c46 Author: Randall Degges <r(a)rdegges.com> Date: Wed May 20 20:12:59 2015 -0700 Updating syntax slightly to be consistent. --- README.md | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index bb73aa6..265ea15 100644 --- a/README.md +++ b/README.md @@ -22,11 +22,11 @@ download the latest archived release from [the release page][]. ## Features -- search for bridges or relays -- advanced search with country, running, flags and other filters -- details for a bridge or relay -- interactive graphs using dygraphs -- shareable links for searches or details +- Search for bridges or relays. +- Advanced search with country, running, flags and other filters. +- Details for a bridge or relay. +- Interactive graphs using dygraphs. +- Shareable links for searches or details. ## License @@ -94,36 +94,36 @@ If you only want to get the required html, JavaScript and CSS files see the #### Development Target - `grunt dev` -- useful for local development -- uses not minified js and css -- uses grunt watch to update code changes +- Useful for local development. +- Uses not minified js and css. +- Uses `grunt watch` to update the server after making code changes. #### Standalone Target - `grunt standalone` -- useful to create a minified version that is easy to deploy to your server -- minifies all the js and css files -- creates a `/build` folder that has all the required resources -- used to build the resources for the running application +- Useful to create a minified version that is easy to deploy to your server. +- Minifies all the js and css files. +- Creates a `/build` folder that has all the required resources. +- Used to build the resources for the running application. #### Standalone Target with Archive - `grunt standalone-archive` -- same as `grunt standalone` but creates archive of the build directory -- used for to create release files on github +- Same as `grunt standalone`, but creates archive of the build directory. +- Used for to create release files on Github. #### Continuous Integration Target - `grunt ci` -- same targets as `grunt standalone` with additional testing of the generated - files using [karma][] -- used for travis continuous integration +- Same targets as `grunt standalone` with additional testing of the generated + files using [karma][]. +- Used for Travis continuous integration. #### Default Target - `grunt` -- same as `standalone` except it won't create a build folder with all the - resources +- Same as `standalone` except it won't create a build folder with all the + resources. [Globe Logo]: https://raw.github.com/makepanic/globe/master/res/others/logo-big.png "Globe Logo"

1 0