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
Jannis R
bc33231f7c
merge master into jr-use-badge-reg
2016-12-09 16:53:14 +01:00
Jannis R
eb1429237b
merge master into jr-email-verification
2016-12-09 16:52:44 +01:00
Jannis R
c249c51dd3
certification: use BadgeReg to load the contract
2016-12-09 16:40:45 +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
Jannis R
452b8c9c74
split sms & email verification 3rdparty code
...
We might want to bundle the code in `3rdparty`.
React & presentational components don't belong in there. At the
same time, the terms of service are strictly related to the use
of these external services. We decided to not bundle them, but
still keep them in a file called `terms-of-service.js`.
The commit also moves the "how it works" section into the
presentational part in `modals/Verification`.
2016-12-09 16:23:13 +01:00
Jaco Greeff
d992c642ff
Adjust to final step on rejected/completed
2016-12-09 15:55:50 +01:00
Tomasz Drwięga
cee07fef74
Trigger remove_old on new block
2016-12-09 15:54:13 +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
Robert Habermeier
415fccfffb
add ethcore-light cov target
2016-12-09 15:20:45 +01:00
Robert Habermeier
9a4dfbd211
Merge branch 'lightserv' of github.com:ethcore/parity into lightserv
2016-12-09 15:20:12 +01:00
Tomasz Drwięga
5d054f08c3
Clearing old transactions
2016-12-09 15:05:03 +01:00
Robert Habermeier
5f37c93659
les: use negotiated protocol version
2016-12-09 15:04:54 +01:00
keorn
56e9dab9de
add Engine stop method
2016-12-09 14:52:08 +01:00
arkpar
cc8c2ea58d
Reject existing tx
2016-12-09 14:37:11 +01:00
keorn
c7f1260775
Merge branch 'io-stop' of https://github.com/ethcore/parity into auth-bft
2016-12-09 14:27:39 +01:00
Jannis R
6d20592f76
remove certification on Revoke
2016-12-09 14:06:02 +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
Jannis R
fd88421e88
store id with certifiers
2016-12-09 13:35:10 +01:00
arkpar
364dd9dda4
Make stop const
2016-12-09 13:25:02 +01:00
Jannis R
3dc943e854
merge master into jr-use-badge-reg
2016-12-09 13:14:35 +01:00
Jaco Greeff
1f4c84cbf1
Theme tests
2016-12-09 13:03:46 +01:00
keorn
475d4bcf3f
Merge branch 'io-stop' into auth-bft
2016-12-09 12:37:55 +01:00
Jannis R
a94bbea7a5
more user-friendly method selection
2016-12-09 12:37:36 +01:00
keorn
762e5f1e3e
proposed block sync tests
2016-12-09 12:05:56 +01:00
Tomasz Drwięga
3ccdb7c143
Fixing unused imports
2016-12-09 10:52:42 +00:00
Tomasz Drwięga
c76b7cf8f8
Fixing tests submodule
2016-12-09 10:48:46 +00:00
arkpar
22a63f6fd3
Added IO Service explicit stop
2016-12-09 11:45:16 +01:00
keorn
fb71caffbd
remove double registration
2016-12-09 11:05:44 +01:00
Jaco Greeff
296301e284
Extend tests for TxList
2016-12-09 10:55:46 +01:00
keorn
42c34b5c1b
ignore flaky test
2016-12-09 10:53:38 +01:00
Tomasz Drwięga
930183831b
Adding tests for ethstore
2016-12-09 09:45:34 +00:00
Jaco Greeff
a133e41e16
Merge branch 'master' into jg-test-ui
2016-12-09 09:53:55 +01:00
Tomasz Drwięga
8596134c0f
Clearer updates handling
2016-12-09 08:31:58 +00:00
Tomasz Drwięga
93230dd4c2
Merge branch 'master' into rotating-key
...
Conflicts:
ethcore/src/account_provider/mod.rs
rpc/src/v1/types/mod.rs.in
2016-12-09 07:37:34 +00:00
GitLab Build Bot
83f791fa5d
[ci skip] js-precompiled 20161209-044115
2016-12-09 04:43:19 +00:00
