Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ipfs/ipfs-webui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ea0f9636b98b
Choose a base ref
...
head repository: ipfs/ipfs-webui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0c15f71b59d6
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Nov 9, 2015

  1. Use lookupPretty from ipfs-geoip

    @dignifiedquire
    dignifiedquire committed Nov 9, 2015
    Copy the full SHA
    a00fc44 View commit details

Commits on Nov 19, 2015

  1. Merge pull request #93 from Dignifiedquire/geoip 

    Use lookupPretty from ipfs-geoip
    @daviddias
    daviddias committed Nov 19, 2015
    Copy the full SHA
    0c15f71 View commit details
Showing with 2 additions and 40 deletions.
  1. +0 −38 js/getlocation.js
  2. +1 −1 js/pages/connections.jsx
  3. +1 −1 js/pages/home.jsx
38 changes: 0 additions & 38 deletions js/getlocation.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion js/pages/connections.jsx
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
var React = require('react')
var ConnectionList = require('../views/connectionlist.jsx')
var Globe = require('../views/globe.jsx')
var getLocation = require('../getlocation.js')
var getLocation = require('ipfs-geoip').lookupPretty
var Connections = React.createClass({
displayName: 'Connections',
propTypes: {
2 changes: 1 addition & 1 deletion js/pages/home.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var React = require('react')
var Peer = require('../views/peer.jsx')
var getLocation = require('../getlocation.js')
var getLocation = require('ipfs-geoip').lookupPretty

var Home = React.createClass({
displayName: 'Home',