Jaco Greeff 7bbd48a2bd Merge branch 'master' into ui-2 ...

# Conflicts:
#	js/package.json
#	js/src/api/local/ethkey/worker.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/ui/VaultCard/Accounts/accounts.spec.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Application/TabBar/tabBar.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js

2017-06-13 11:02:38 +02:00

..

cli

UI server refactoring (#5580)

2017-05-24 12:24:07 +02:00

light_helpers

Back-references for the on-demand service (#5573)

2017-05-23 12:39:25 +02:00

account.rs

Importing accounts from files. (#5644)

2017-05-19 17:14:47 +02:00

blockchain.rs

Update dependencies and bigint api (#5685)

2017-05-24 12:31:33 +02:00

boot.rs

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

cache.rs

Memory usage optimization (#5526)

2017-05-02 11:40:03 +02:00

configuration.rs

Merge branch 'master' into ui-2

2017-06-13 11:02:38 +02:00

dapps.rs

UI server refactoring (#5580)

2017-05-24 12:24:07 +02:00

deprecated.rs

Dapps and RPC server merge (#5365)

2017-04-03 10:27:37 +02:00

dir.rs

Secret store - initial version (#4567)

2017-02-20 16:13:21 +01:00

helpers.rs

Update dependencies and bigint api (#5685)

2017-05-24 12:31:33 +02:00

informant.rs

Update dependencies and bigint api (#5685)

2017-05-24 12:31:33 +02:00

ipfs.rs

Dapps and RPC server merge (#5365)

2017-04-03 10:27:37 +02:00

main.rs

Bump mio (#5763)

2017-06-05 20:40:40 +02:00

migration.rs

initial light CLI

2017-03-22 18:32:04 +01:00

modules.rs

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

params.rs

Support both V1 & V2 DataChanged events in registry (#4734)

2017-03-03 13:33:49 +01:00

presale.rs

Ledger wallet support (#4486)

2017-02-09 19:07:06 -05:00

rpc_apis.rs

rpc -> weak to arc (#5688)

2017-05-28 08:40:36 -04:00

rpc.rs

Merge branch 'master' into ui-2

2017-06-13 11:02:38 +02:00

run.rs

Blacklist empty phrase account. (#5730)

2017-06-07 11:34:53 +02:00

secretstore.rs

Fixing secretstore TODOs - part 2 (#5416)

2017-04-25 21:34:03 +02:00

signer.rs

UI server refactoring (#5580)

2017-05-24 12:24:07 +02:00

snapshot.rs

Chain-selection from UI (#4859)

2017-03-13 12:10:53 +01:00

stratum.rs

remove the deprecated options in rustfmt.toml (#5616)

2017-05-19 17:12:20 +02:00

sync.rs

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

upgrade.rs

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

url.rs

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

user_defaults.rs

Serde 0.9 (#4508)

2017-02-13 18:38:47 +03:00