Commit Graph

7484 Commits

Author SHA1 Message Date
Gav Wood
c14d8da350
Use real arithmetic operator rather than '=' 2016-12-11 00:09:04 +01:00
GitLab Build Bot
62492a915e [ci skip] js-precompiled 20161210-230517 2016-12-10 23:07:55 +00:00
Gav Wood
12df3adfeb
Merge branch 'master' into fix-ci 2016-12-11 00:02:48 +01:00
Gav Wood
854eb1080c
Remove "s 2016-12-10 23:59:50 +01:00
Nicolas Gotchac
b44e7bb292 Extract CSS to file in production builds (#3783)
* Extract CSS to file if production build

* Use DAPPS_URL for testing purposes + better assets in Webpack

* Delete comments
2016-12-10 23:55:57 +01:00
Nicolas Gotchac
b0f1665f11 Notify user on transaction received (#3782)
* Notify user on new transaction #2556

* Add routing to account on notification click

* Timeout of notif set to 20s
2016-12-10 23:55:36 +01:00
Gav Wood
aa30619b6f Merge pull request #3772 from ethcore/txqueue-gc
Removing all old entries from transaction queue
2016-12-10 23:53:24 +01:00
Tomasz Drwięga
1e8638608c fixing tests 2016-12-10 22:59:35 +01:00
Nicolas Gotchac
e5c73b29d8 'contract/write' to 'contract/develop' 2016-12-10 22:42:49 +01:00
GitLab Build Bot
5ec1ff43ea [ci skip] js-precompiled 20161210-212741 2016-12-10 21:29:53 +00:00
Nicolas Gotchac
9dbccfda2f Fix padding bottom // Status bar fixed 2016-12-10 22:22:14 +01:00
Jaco Greeff
173a88804a Status page updates (#3774)
* Allow Page to create optional Actionbar

* Typo

* Display last block.timestamp

* Remove unnneeded console.log

* Re-do git mv

* git mv

* Force build changes

* Resolving case sensitivity issues

* Swapped to margin at bottom
2016-12-10 22:21:32 +01:00
Nicolas Gotchac
7401358543 PR grumbles 2016-12-10 22:15:56 +01:00
Tomasz Drwięga
b5020d3c8d Fixing Light context API 2016-12-10 21:25:28 +01:00
Tomasz Drwięga
19ca9ad460 Prevent broadcasting transactions to peer that send them. 2016-12-10 21:22:19 +01:00
Nicolas Gotchac
70eab0da03 PR grumbles 2016-12-10 20:29:22 +01:00
Nicolas Gotchac
89ed76497e Merge branch 'master' into ng-ui-fixes 2016-12-10 20:23:09 +01:00
Tomasz Drwięga
08a47ea2d4 Allow modifications of gas when confirming in signer (#3798) 2016-12-10 20:18:42 +01:00
Tomasz Drwięga
9b5fd93290 removing println [ci:skip] 2016-12-10 20:07:12 +01:00
Tomasz Drwięga
76a93d4eff eth_sign RPC now hashes given data 2016-12-10 20:01:04 +01:00
Nicolas Gotchac
0f6681d3e8 Linting issue 2016-12-10 19:15:45 +01:00
Nicolas Gotchac
69c0086ada Better Autocomplete Divider 2016-12-10 19:14:29 +01:00
Nicolas Gotchac
2346f29731 Add dividers to AutoComplete 2016-12-10 18:35:54 +01:00
keorn
b6c7ed24b7 Client trait reorg 2016-12-10 18:35:29 +01:00
keorn
f3af0f46be Merge branch 'master' into auth-bft 2016-12-10 18:14:35 +01:00
keorn
1611d190ba initial tendetmint consensus test 2016-12-10 17:40:53 +01:00
keorn
b9909da8b1 move Sealing methods to MiningBlockChainClient 2016-12-10 17:40:20 +01:00
Tomasz Drwięga
c408861c29 Updating submodules 2016-12-10 17:36:29 +01:00
Nicolas Gotchac
cd6ab07217 Use the new onClose autocomplete prop 2016-12-10 17:06:44 +01:00
Tomasz Drwięga
42c2d2291a Merge branch 'master' into rotating-key 2016-12-10 17:00:59 +01:00
Tomasz Drwięga
1f9adc8622 Merge branch 'master' into txqueue-gc
Conflicts:
	ethcore/src/miner/miner.rs
2016-12-10 17:00:29 +01:00
Nicolas Gotchac
84116130f6 Add sender balances to contract (exec/deploy) 2016-12-10 16:58:03 +01:00
Tomasz Drwięga
aaf6da4c00 Returning persistent node id 2016-12-10 16:55:29 +01:00
Robert Habermeier
a6fcd8a0d9 Merge pull request #3794 from ethcore/net-fix
Network connectivity fixes
2016-12-10 16:55:17 +01:00
keorn
239ba61a99 move transition message to to_step 2016-12-10 16:50:23 +01:00
Nicolas Gotchac
d9da8a48ff Add sender balance in transfer modal 2016-12-10 16:46:00 +01:00
Tomasz Drwięga
e66157f922 fixing test 2016-12-10 16:40:32 +01:00
Nicolas Gotchac
054b4810d5 Fix wallet data's prop types 2016-12-10 15:30:39 +01:00
Tomasz Drwięga
704054ef40 Merge branch 'master' into tx-broadcast
Conflicts:
	ethcore/src/client/traits.rs
2016-12-10 15:23:53 +01:00
Nicolas Gotchac
ef93262311 See addresses outside address book + Save them 2016-12-10 15:19:05 +01:00
Tomasz Drwięga
e1ade5b375 Maintaining a list of transactions propagated from other peers 2016-12-10 15:18:44 +01:00
Tomasz Drwięga
27503e8e8c Merge branch 'master' into rotating-key
Conflicts:
	ethstore/src/ethstore.rs
	ethstore/src/secret_store.rs
2016-12-10 15:13:58 +01:00
Nicolas Gotchac
65f586ed14 Fix tab bar active style 2016-12-10 14:32:54 +01:00
Nicolas Gotchac
81c5085b35 Don't create new Contracts instance if already exists 2016-12-10 14:31:20 +01:00
Nicolas Gotchac
13607d48be Better use of Tab Bar 2016-12-10 14:26:35 +01:00
arkpar
02c788a403 Network connectivity fixes 2016-12-10 14:20:34 +01:00
Nicolas Gotchac
591d086f42 Better use of React-Router (maintaining old routes) 2016-12-10 14:19:15 +01:00
Gav Wood
60ea787bd1 Merge pull request #3781 from ethcore/consistent-id
Make *ID names consistent with std Rust (Id)
2016-12-10 14:04:07 +01:00
Gav Wood
0977b82eeb
More fixes. 2016-12-10 13:54:17 +01:00
Gav Wood
7eb30b1249
Fix build. 2016-12-10 13:52:43 +01:00