grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into ui-2

Browse Source 
# Conflicts:
#	js/src/modals/FirstRun/Welcome/welcome.js
This commit is contained in:
Jaco Greeff 2017-05-30 10:45:48 +02:00
commit d888190637
8 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -1825,7 +1825,7 @@ dependencies = [
[[package]]
name = "parity-ui-precompiled"
version = "1.4.0"
source = "git+https://github.com/paritytech/js-precompiled.git#d09c2b70b2e6c6e84d88999bfa6f3c8bb43b910e"
source = "git+https://github.com/paritytech/js-precompiled.git#94883dbc2ca86af58cb6fffac72bbc0c6789a202"
dependencies = [
"parity-dapps-glue 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -2100,7 +2100,7 @@ dependencies = [
[[package]]
name = "rocksdb"
version = "0.4.5"
source = "git+https://github.com/paritytech/rust-rocksdb#acd192f6ee017a3e8be704958617349d20ee783b"
source = "git+https://github.com/paritytech/rust-rocksdb#a5526297746b51a33abfeb58a0540e54dedcdcb9"
dependencies = [
"libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",
"rocksdb-sys 0.3.0 (git+https://github.com/paritytech/rust-rocksdb)",
@ -2109,7 +2109,7 @@ dependencies = [
[[package]]
name = "rocksdb-sys"
version = "0.3.0"
source = "git+https://github.com/paritytech/rust-rocksdb#acd192f6ee017a3e8be704958617349d20ee783b"
source = "git+https://github.com/paritytech/rust-rocksdb#a5526297746b51a33abfeb58a0540e54dedcdcb9"
dependencies = [
"gcc 0.3.43 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)",

4
evmbin/Cargo.toml
View File

@ -4,10 +4,6 @@ description = "Parity's EVM implementation"
version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"]
[lib]
name = "evmbin"
path = "./src/main.rs"
[[bin]]
name = "parity-evm"
path = "./src/main.rs"

2
js/package.json
View File

@ -1,6 +1,6 @@
{
"name": "parity.js",
"version": "1.7.84",
"version": "1.7.85",
"main": "release/index.js",
"jsnext:main": "src/index.js",
"author": "Parity Team <admin@parity.io>",

2
js/src/i18n/_default/firstRun.js
View File

@ -37,7 +37,7 @@ export default {
accept: `I accept these terms and conditions`
},
welcome: {
description: `As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -`,
description: `As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -`,
greeting: `Welcome to Parity, the fastest and simplest way to run your node.`,
next: `Click Next to continue your journey.`,
step: {

2
js/src/i18n/zh-Hant-TW/firstRun.js
View File

@ -40,7 +40,7 @@ export default {
},
welcome: {
description: `作為初次安裝的一部分，下面的幾個步驟將指導你如何設定你的Parity和相關帳戶。我們的目標是使得使用Parity變得儘可能的簡單，讓你成功執行，所以請有點耐心。 一旦完成，你將擁有`,
// As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
// As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
greeting: `歡迎使用Parity，這是執行以太坊節點的最快和最簡單的方式。`, // Welcome to Parity, the fastest and simplest way to run your node.
next: `點選下一步繼續`, // Click Next to continue your journey.
step: {

2
js/src/i18n/zh/firstRun.js
View File

@ -40,7 +40,7 @@ export default {
},
welcome: {
description: `作为初次安装的一部分，下面的几个步骤将指导你如何设置你的Parity和相关账户。我们的目标是使得使用Parity变得尽可能的简单，让你成功运行，所以请有点耐心。 一旦完成，你将拥有`,
// As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
// As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts.Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us.Once completed you will have -
greeting: `欢迎使用Parity，这是运行以太坊节点的最快和最简单的方式。`, // Welcome to Parity, the fastest and simplest way to run your node.
next: `点击下一步继续`, // Click Next to continue your journey.
step: {

2
js/src/shell/FirstRun/Welcome/welcome.js
View File

@ -45,7 +45,7 @@ export default function FirstRun () {
<p>
<FormattedMessage
id='firstRun.welcome.description'
defaultMessage='As part of a new installation, the next few steps will guide you through the process of setting up you Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -'
defaultMessage='As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -'
/>
</p>
<div>

4
parity/configuration.rs
View File

@ -881,8 +881,8 @@ impl Configuration {
use path;
let local_path = default_local_path();
let base_path = self.args.flag_base_path.as_ref().map_or_else(|| default_data_path(), |s| s.clone());
let data_path = replace_home("", self.args.flag_datadir.as_ref().unwrap_or(&base_path));
let base_path = self.args.flag_base_path.as_ref().or_else(|| self.args.flag_datadir.as_ref()).map_or_else(|| default_data_path(), |s| s.clone());
let data_path = replace_home("", &base_path);
let base_db_path = if self.args.flag_base_path.is_some() && self.args.flag_db_path.is_none() {
// If base_path is set and db_path is not we default to base path subdir instead of LOCAL.
"$BASE/chains"