Permalink
Browse files

Merge pull request #3080 from ethereum/develop

Update Master Branch with latest develop changes
  • Loading branch information...
evertonfraga committed Sep 27, 2017
2 parents a17b8f1 + 8688a18 commit 3ef3c5debe9a61f73687f2a1b90e12e09d282834
@@ -121,21 +121,15 @@ html {
background: #FFF;
overflow: hidden;
opacity: 1;
z-index:10;
z-index: 10;
&.hidden {
visibility: hidden;
z-index: 1;
webview {
height: 0;
}
z-index: 0;
}
&.app-bar-transparent webview {
top: 0;
margin-top: 0;
// Temporary fix. See https://github.com/electron/electron/issues/5110
flex: 0 1;
}
}
@@ -57,11 +57,11 @@ aside.sidebar {
> ul {
margin: 6px 0;
padding: 0;
width: 55px;
width: 54px;
> li {
overflow: hidden;
margin-bottom: 15px;
margin-bottom: 14px;
transition-delay: 200ms;
// draggable LI
@@ -85,7 +85,7 @@ aside.sidebar {
}
}
button.main {
height: 54px;
height: 55px;
width: 54px;
display: block;
opacity: .6;
@@ -314,4 +314,3 @@ aside.sidebar {
.app-blur aside.newsidebar nav::after {
background-image: linear-gradient(to bottom, rgba(246, 246, 246, 0) 0%, rgba(246, 246, 246, 1) 100%);
}
@@ -105,11 +105,12 @@ Template['elements_nodeInfo'].onCreated(function(){
});
Template['elements_nodeInfo'].onDestroyed(function(){
Template['elements_nodeInfo'].onDestroyed(function() {
Meteor.clearInterval(this.peerCountIntervalId);
if(this.syncFilter)
if (this.syncFilter) {
this.syncFilter.stopWatching();
}
});
@@ -120,28 +121,32 @@ Template['elements_nodeInfo'].helpers({
@method (formattedBlockNumber)
@return {String}
*/
'formattedBlockNumber': function() {
formattedBlockNumber: function () {
return numeral(EthBlocks.latest.number).format('0,0');
},
/**
Formats the time since the last block
@method (timeSinceBlock)
*/
'timeSinceBlock': function () {
var timeSince = moment(EthBlocks.latest.timestamp, "X");
timeSinceBlock: function () {
var timeSince = moment(EthBlocks.latest.timestamp, 'X');
var now = moment();
var diff = now.diff(timeSince, "seconds");
var diff = now.diff(timeSince, 'seconds');
if (!EthBlocks.latest.timestamp) {
return '-';
}
if (diff>60) {
Helpers.rerun["10s"].tick();
if (diff > 60) {
Helpers.rerun['10s'].tick();
return timeSince.fromNow(true);
} else if (diff<2) {
Helpers.rerun["1s"].tick();
return ' <span class="blue">' + TAPi18n.__('mist.nodeInfo.blockReceivedShort') + '</span>'
} else {
Helpers.rerun["1s"].tick();
return diff + "s";
} else if (diff < 2) {
Helpers.rerun['1s'].tick();
return ' <span class="blue">' + TAPi18n.__('mist.nodeInfo.blockReceivedShort') + '</span>';
}
Helpers.rerun['1s'].tick();
return diff + 's';
}
});
@@ -20,8 +20,8 @@
"sending": "Inviando...",
"create": "Crea",
"tryToReconnect": "Prova a riconnetterti",
"stayAnonymous": "Stay anonymous",
"authorize": "Authorize"
"stayAnonymous": "Rimani anonimo",
"authorize": "Autorizza"
},
"commonWords": {
"you": "Tu",
@@ -33,4 +33,4 @@
"on": "su",
"per": "per"
}
}
}
@@ -47,7 +47,7 @@
"ethereumNode": "Ethereum Softwareknoten",
"network": "Netzwerk",
"mainNetwork": "Hauptnetzwerk",
"startMining": "⛏ Mining starten (nur auf Testnetz)",
"startMining": "⛏ Mining starten",
"stopMining": "⛏ Mining stoppen",
"externalNode": "externer Softwareknoten aktiv",
"nodeMode": "Chain herunterladen",
@@ -69,7 +69,7 @@
"nodeMode": "Chain download",
"fullNode": "Store full blockchain",
"lightNode": "Use light Node (experimental!)",
"startMining": "⛏ Start mining (Testnet only)",
"startMining": "⛏ Start mining",
"stopMining": "⛏ Stop mining"
},
"window": {
@@ -46,7 +46,7 @@
"ethereumNode": "Nodo de Ethereum",
"network": "Red",
"mainNetwork": "Red principal",
"startMining": "⛏ Empezar a minar (sólo Testnet)",
"startMining": "⛏ Empezar a minar",
"stopMining": "⛏ Parar de minar",
"externalNode": "using external node",
"openRemix": "Open Remix IDE",
@@ -47,7 +47,7 @@
"ethereumNode": "Ethereum Node",
"network": "Network",
"mainNetwork": "Main Network",
"startMining": "⛏ Start Mining (Testnet only)",
"startMining": "⛏ Start Mining",
"stopMining": "⛏ Stop Mining",
"openRemix": "Open Remix IDE",
"nodeMode": "Chain download",
@@ -46,7 +46,7 @@
"ethereumNode": "Nœud Ethereum",
"network": "Réseau",
"mainNetwork": "Réseau principal",
"startMining": "⛏ Commencer à miner (seulement pour Testnet)",
"startMining": "⛏ Commencer à miner",
"stopMining": "⛏ Arrêter de miner",
"externalNode": "using external node",
"openRemix": "Open Remix IDE",
@@ -46,7 +46,7 @@
"ethereumNode": "Nodo Ethereum",
"network": "Rete",
"mainNetwork": "Rete principale",
"startMining": "⛏ Inizia mining (solo Testnet)",
"startMining": "⛏ Inizia mining",
"stopMining": "⛏ Ferma mining",
"externalNode": "using external node",
"openRemix": "Open Remix IDE",
@@ -46,7 +46,7 @@
"ethereumNode": "Ethereum ノード",
"network": "ネットワーク",
"mainNetwork": "メインネットワーク",
"startMining": "⛏ マイニングを始める (テストネット のみ)",
"startMining": "⛏ マイニングを始める",
"stopMining": "⛏ マイニングを中止する",
"externalNode": "using external node",
"openRemix": "Open Remix IDE",
@@ -46,7 +46,7 @@
"ethereumNode": "Ethereum Node",
"network": "Nettverk",
"mainNetwork": "Hovednettverk",
"startMining": "⛏ Start Mining (Kun testnett)",
"startMining": "⛏ Start Mining",
"stopMining": "⛏ Stopp Mining",
"externalNode": "using external node",
"openRemix": "Open Remix IDE",
@@ -69,7 +69,7 @@
"fullNode": "Bewaar volledige blockchain",
"lightNode": "Gebruik light Node (experimenteel!)",
"mainNetwork": "Hoofdnetwerk",
"startMining": "⛏ Start Mining (Alleen testnet)",
"startMining": "⛏ Start Mining",
"stopMining": "⛏ Stop Mining"
},
"window": {
@@ -47,7 +47,7 @@
"ethereumNode": "Node",
"network": "Rede",
"mainNetwork": "Rede principal",
"startMining": "⛏ Iniciar mineração (somente em teste)",
"startMining": "⛏ Iniciar mineração",
"stopMining": "⛏ Parar mineração",
"externalNode": "using external node",
"openRemix": "Open Remix IDE",
@@ -46,7 +46,7 @@
"ethereumNode": "Ethereum-нода",
"network": "Сеть",
"mainNetwork": "Основная сеть",
"startMining": "⛏ Запустить майнинг (только для тестовой сети)",
"startMining": "⛏ Запустить майнинг",
"stopMining": "⛏ Остановить майнинг",
"externalNode": "using external node",
"openRemix": "Open Remix IDE",
@@ -51,7 +51,7 @@
"nodeMode": "Shkarkim zinxhir",
"fullNode": "Ruaj zinxhirin e plotë të blloqeve",
"lightNode": "Përdor nyje të lehtë (eksperimentale!)",
"startMining": "⛏ Fillo të Prodhosh (Rrjet testimi)",
"startMining": "⛏ Fillo të Prodhosh",
"stopMining": "⛏ Ndalo së Prodhuari"
},
"window": {
@@ -31,7 +31,6 @@ class Manager extends EventEmitter {
// check every hour
setInterval(() => this._checkForNewConfig(true), 1000 * 60 * 60);
this._resolveEthBinPath();
return this._checkForNewConfig(restart);
}
@@ -73,7 +72,7 @@ class Manager extends EventEmitter {
log.warn('Error fetching client binaries config from repo', err);
})
.then((latestConfig) => {
if(!latestConfig) return;
if (!latestConfig) return;
let localConfig;
let skipedVersion;
Oops, something went wrong.

0 comments on commit 3ef3c5d

Please sign in to comment.