7c42241466
remove merge code
2016-12-08 22:00:26 +01:00
74770e4773
better docstrings
2016-12-08 21:49:55 +01:00
cc284dd86f
Merge branch 'master' into auth-bft
2016-12-08 21:35:08 +01:00
79ef64349c
remove assert
2016-12-08 21:27:49 +01:00
9ecb07434f
fix informant
2016-12-08 21:13:32 +01:00
2d6656fc43
Merge pull request #3725 from ethcore/engine-password
...
Make engine hold AccountProvider
2016-12-08 20:52:12 +01:00
dca752e9bb
docs, tweaks
2016-12-08 20:09:30 +01:00
4e1b72b45c
[ci skip] js-precompiled 20161208-150237
2016-12-08 15:04:38 +00:00
a1fb1240a7
Properly delete addresses/contracts in addressbook ( #3739 )
...
* Remove previously market addresses at startup
* Remove meta.deleted checks
* Remove artifact from code move
2016-12-08 15:54:23 +01:00
d38da1f3b4
Display Wallet Owners in Accounts list ( #3741 )
2016-12-08 15:53:46 +01:00
715761a714
Edit Multisig Wallet settings ( #3740 )
...
* WIP Sending tokens in multi-sig wallet
* Working Token transfer for multi-sig wallet #3282
* Add operation hash to transfer modal
* Add existing wallet from address #3282
* Wallet delete redirect to Wallets/Accounts #3282
* Rightly check balance in Transfer // Get all accounts balances #3282
* Fix linting
* Better Header UI for Wallet
* Use the `~` webpack alias
* Use Webpack `~` alias
* Add `ETH` format to number typed input
* Fix wallet creation hint && eth input type
* Update dailylimit #3282
* Fix too long copied message
* WIP Wallet settings modification #3282
* WIP edit contract parameters #3282
* Edit Wallet parameters #3282
* Don't show wallets if none
* Fix Transfer for Wallet #3282
* Optimized version of contract code
* Fix wrong max in Wallet creation // Round gas in API
2016-12-08 15:53:29 +01:00
69e010bbf9
[ci skip] js-precompiled 20161208-144436
2016-12-08 14:46:49 +00:00
328db0c124
Replace build directory completely ( #3748 )
2016-12-08 15:39:27 +01:00
fb80cf6190
Add existing release files before merge ( #3747 )
2016-12-08 15:20:53 +01:00
5d224df2d5
Release script back to using fetch/merge ( #3746 )
...
* Update with -X only for merge
* Release back to using fetch/merge
2016-12-08 15:02:45 +01:00
cbd5fe7c07
Update with -X only for merge ( #3745 )
2016-12-08 14:48:09 +01:00
de4715bc67
Merge pull request #3732 from ethcore/jg-duplicate-accounts
...
Give accounts precedence over address_book entries
2016-12-08 12:27:26 +01:00
3ebfa1481d
better proposal block handling
2016-12-08 12:03:34 +01:00
15ec63750e
Enable Panic=abort ( #3423 )
...
* Enable panic=abort
* Update remaining crate versions to 1.5
* Run tests in release mode
* Enable panic=abort for release profile only
* Added travis_wait
* Travis timeout set to 40
2016-12-08 11:31:57 +01:00
5f1021822d
Cleanups on js-precompiled ( #3738 )
...
* Cleanups on js-precompiled
* Combined
* Adjust based on Pr comments
2016-12-07 21:38:28 +01:00
9e8d90b5ba
[ci skip] js-precompiled 20161207-173717
2016-12-07 17:39:18 +00:00
342357302b
Merge pull request #3735 from ethcore/jg-addressbook-delete
...
Add parity_removeAddress RPC
2016-12-07 18:31:22 +01:00
dba8cf3a3b
Add test for RPC side
2016-12-07 17:58:22 +01:00
7c054d2da0
Remove unneeded block scope
2016-12-07 17:07:28 +01:00
46840d36c9
Add parity_removeAddress RPC
2016-12-07 16:53:46 +01:00
347634ac6c
dont rebroadcast propose
2016-12-07 16:42:58 +01:00
aa9caac750
revert cli default
2016-12-07 15:36:20 +01:00
b73689f041
Merge branch 'engine-password' into auth-bft
2016-12-07 15:17:49 +01:00
727ace0561
add test
2016-12-07 15:14:21 +01:00
e9743a3a75
Merge branch 'master' into auth-bft
2016-12-07 14:50:17 +01:00
4361cb53e7
Merge branch 'engine-password' into auth-bft
2016-12-07 14:49:42 +01:00
5faa4a85cb
remove dummy type
2016-12-07 14:49:07 +01:00
6440ca2f68
move stuff around
2016-12-07 14:39:37 +01:00
1f0a02b638
Merge pull request #3633 from ethcore/fix-tx-rpc
...
Fix up the transaction JSON serialisation for RPC.
2016-12-07 14:34:51 +01:00
89726356a3
Merge pull request #3709 from ethcore/opt-in-verifier-scaling
...
queue: CLI for auto-scaling and num verifiers
2016-12-07 13:40:42 +01:00
3388eab76a
[ci skip] js-precompiled 20161207-123833
2016-12-07 12:40:35 +00:00
2e40a00768
[ci skip] js-precompiled 20161207-122336
2016-12-07 12:26:14 +00:00
8dbd56888d
Add functionalities to multi-sig wallet ( #3729 )
...
* WIP Sending tokens in multi-sig wallet
* Working Token transfer for multi-sig wallet #3282
* Add operation hash to transfer modal
* Add existing wallet from address #3282
* Wallet delete redirect to Wallets/Accounts #3282
* Rightly check balance in Transfer // Get all accounts balances #3282
* Fix linting
* Better Header UI for Wallet
* Use the `~` webpack alias
* Use Webpack `~` alias
2016-12-07 12:47:44 +01:00
5bdb6e4f22
Ignore meta.deleted for account name display
2016-12-07 11:51:48 +01:00
f7586109df
Ignore meta.deleted for accounts
2016-12-07 11:48:08 +01:00
21a3cf7b65
Swap order of addressbook & acocunts merge
2016-12-07 11:44:45 +01:00
c582540746
Merge branch 'engine-password' into auth-bft
2016-12-07 11:41:38 +01:00
3ae09de019
restore is_new_best
2016-12-07 11:40:46 +01:00
a296c5e226
test client message handling
2016-12-07 11:38:09 +01:00
be90245ecb
PropTypes as function call ( #3731 )
2016-12-07 10:46:46 +01:00
da030fed51
Merge branch 'master' into auth-bft
2016-12-07 10:41:07 +01:00
5c333fce31
Merge branch 'engine-password' into auth-bft
2016-12-07 10:35:52 +01:00
71a96588b0
add the methods to engines
2016-12-07 10:34:06 +01:00
e2bb8ef6d1
Unify proptypes in util/proptypes.js ( #3728 )
...
* Unify proptypes in util/proptypes.js
* Add missing use of nodeOrStringProptype
2016-12-07 10:25:57 +01:00
d9eb5e7f1d
remove uncles
2016-12-07 09:32:36 +01:00
keorn
Gav Wood
GitLab Build Bot
Jaco Greeff
Nicolas Gotchac
Robert Habermeier
Arkadiy Paronyan
Jaco Greeff