Tomasz Drwięga
19ca9ad460
Prevent broadcasting transactions to peer that send them.
2016-12-10 21:22:19 +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
Tomasz Drwięga
e1ade5b375
Maintaining a list of transactions propagated from other peers
2016-12-10 15:18:44 +01:00
Gav Wood
82efa2675e
Merge remote-tracking branch 'origin/master' into consistent-id
2016-12-10 13:36:30 +01:00
Nicolas Gotchac
b9c04fcd00
Fixes to the Wallet UI ( #3787 )
...
* Correct number of transactions for contracts
* Remove daily limit info if set to 0
* Hide tx count for contracts
2016-12-10 01:26:47 +01:00
Nicolas Gotchac
6655e7e3c0
Add support for wallets without getOwner() interface ( #3779 )
...
* Make Wallet Mist compatible #3282
* Owners icons on load
* Fix oversized logo on load
* Don't fetch registry twice (even when pending)
* Better logging...
* Better contract view : show if no events // show loading events
* Better decimal typed input
* PR grumble
2016-12-10 01:26:28 +01:00
Nicolas Gotchac
923f85d90d
Update Material-UI ( #3785 )
...
* Update MUI => Fixes wrong error styled inputs
* Update postcss import
2016-12-10 01:26:03 +01:00
Nicolas Gotchac
5c555aa18f
Fixes error in Transfer modal (mix between props and own property) ( #3788 )
2016-12-10 01:25:23 +01:00
Gav Wood
341777dbb6
Merge pull request #3743 from ethcore/jg-test-ui
...
Basic UI rendering tests
2016-12-09 23:16:11 +01:00
Gav Wood
5f1fcf95e0
Make *ID names consistent with std Rust (Id)
2016-12-09 23:01:43 +01:00
Gav Wood
598fd42856
Merge pull request #3770 from ethcore/jg-execute-gas
...
GasPrice selection for contract execution
2016-12-09 20:24:10 +01:00
Gav Wood
45ec84e627
Merge pull request #3752 from ethcore/jg-subscription-check
...
Allow autoRemove from api.subscribe based on callback return values
2016-12-09 20:16:34 +01:00
GitLab Build Bot
647b62b4a2
[ci skip] js-precompiled 20161209-182130
2016-12-09 18:23:46 +00:00
Gav Wood
b99403740a
Merge pull request #3773 from ethcore/ng-enhanced-multisig
...
Lower gas usage for creating a Multisig Wallet
2016-12-09 19:15:46 +01:00
Jaco Greeff
a73e0a987e
Merge branch 'master' into jg-test-ui
2016-12-09 18:34:58 +01:00
Jaco Greeff
290a4a40ff
Merge branch 'master' into jg-subscription-check
2016-12-09 18:17:36 +01:00
Jaco Greeff
0cbef30508
Unsubscribe on true
2016-12-09 18:17:31 +01:00
Jaco Greeff
99846e2ad2
Merge branch 'master' into jg-subscription-check
2016-12-09 18:14:09 +01:00
Jaco Greeff
1b0945940b
Test for boolean result before unsubscribe
2016-12-09 18:14:05 +01:00
GitLab Build Bot
fd23a2972c
[ci skip] js-precompiled 20161209-165845
2016-12-09 17:00:59 +00:00
Jaco Greeff
ffd8314a11
Be lenient around invalid owners map ( #3764 )
...
* Be lenient around invalid owners map
* Filter invalid owners before render
2016-12-09 17:52:25 +01:00
Nicolas Gotchac
ff11634e1d
PR Grumble
2016-12-09 16:55:43 +01:00
Nicolas Gotchac
bace05b154
Merge branch 'master' into ng-enhanced-multisig
2016-12-09 16:40:07 +01:00
Nicolas Gotchac
caf3a96c19
Add fallback Full Fleshed Wallet if no library
2016-12-09 16:29:57 +01:00
Nicolas Gotchac
efee55ae84
Updated Wallet Version ! Now only 500k gas for Wallet creation
2016-12-09 16:24:11 +01:00
Jaco Greeff
d992c642ff
Adjust to final step on rejected/completed
2016-12-09 15:55:50 +01:00
Nicolas Gotchac
63137b1548
Add enhanced Wallet solidity code
2016-12-09 15:52:28 +01:00
Jaco Greeff
d2494d1425
GasPrice selection for contract execution
2016-12-09 15:43:24 +01:00
GitLab Build Bot
1213ada59c
[ci skip] js-precompiled 20161209-125036
2016-12-09 12:52:50 +00:00
Jaco Greeff
2582514b58
GasEditor component ( #3750 )
...
* Initial split of component (WIP)
* GasPriceEditor externalised
* Fix lint
2016-12-09 13:44:35 +01:00
Jaco Greeff
befcc9cc1a
Cleanups ( #3742 )
...
* Remove unused file
* Combine tx checks into single file
* Move UI components into UI
* DRY links
* Unused rollup config
* Cleanup util paths
* Revert "Move UI components into UI"
This reverts commit 3379e61246cde635c296d31322b71e63395a5cd4.
* Re-apply ~/util/tx move
* Cleanup unused styles
2016-12-09 13:44:10 +01:00
Jaco Greeff
00c53a8d18
Merge branch 'master' into jg-test-ui
2016-12-09 13:36:50 +01:00
Jaco Greeff
bb209424ac
IdentityName flags testing
2016-12-09 13:36:46 +01:00
Jaco Greeff
1f4c84cbf1
Theme tests
2016-12-09 13:03:46 +01:00
Jaco Greeff
296301e284
Extend tests for TxList
2016-12-09 10:55:46 +01:00
Jaco Greeff
a133e41e16
Merge branch 'master' into jg-test-ui
2016-12-09 09:53:55 +01:00
GitLab Build Bot
83f791fa5d
[ci skip] js-precompiled 20161209-044115
2016-12-09 04:43:19 +00:00
GitLab Build Bot
12592689dd
[ci skip] js-precompiled 20161209-014235
2016-12-09 01:44:45 +00:00
Jaco Greeff
8f9fdb350c
Merge branch 'master' into jg-subscription-check
2016-12-09 02:34:07 +01:00
Jaco Greeff
f9a24f3c8e
Update babel, fix CI build due to breaking changes ( #3754 )
...
* Update babel to latest version
* Re-add circular deps plugin
* Bump for build
* Fixes for babel build
2016-12-09 02:33:12 +01:00
Jaco Greeff
6b65a1f872
Merge branch 'master' into jg-subscription-check
2016-12-09 01:41:44 +01:00
GitLab Build Bot
e1ad347cdb
[ci skip] js-precompiled 20161209-003004
2016-12-09 00:32:45 +00:00
Nicolas Gotchac
09334ca3bd
Small fixes to contract ( #3751 )
...
* Fix contracts execution will fallback function
* Fix contract execute modal
* Working execute from Contract
* Don't dupliacet events
* Gas * 1.2 in wallet confirmations
2016-12-09 01:21:51 +01:00
Jaco Greeff
13f962ae01
Attempt to fix ci webpack
2016-12-09 00:56:12 +01:00
Jaco Greeff
10c356de65
Simplify, consolidate uses between subscription managers
2016-12-09 00:52:21 +01:00
Jaco Greeff
3989e2642b
Typo
2016-12-09 00:25:50 +01:00
Jaco Greeff
1ecda93de9
Align api.subscribe with contract
2016-12-09 00:15:39 +01:00
Jaco Greeff
4ce3142c63
Add autoRemove functionality to api.contract.subscribe
2016-12-09 00:15:27 +01:00
Jaco Greeff
ad971a444c
Add autoRemove functionality for api.subscribe
2016-12-09 00:00:56 +01:00
Jaco Greeff
9d5de519b6
Merge remote-tracking branch 'origin/jg-test-ui' into jg-test-ui
2016-12-08 17:33:15 +01:00
