Commit Graph

7926 Commits

Author SHA1 Message Date
Robert Habermeier
3c7533831e Merge branch 'master' into client-provider 2016-11-14 15:16:26 +01:00
keorn
5de7d50bf8 add test for multi proposals 2016-11-14 14:15:31 +00:00
keorn
8be8b3e1cd ensure no double proposals 2016-11-14 13:35:45 +00:00
keorn
8a86c11375 enable force sealing 2016-11-14 13:35:16 +00:00
Arkadiy Paronyan
b4ef3f3255 Fixing benches (#3422) 2016-11-14 14:21:35 +01:00
Robert Habermeier
18153b8d9e Merge branch 'master' into missing-code-by-prefix 2016-11-14 14:02:19 +01:00
Tomasz Drwięga
9f002a8a94 Fixing benches 2016-11-14 13:29:49 +01:00
Tomasz Drwięga
d02afc0e40 Beta -> Stable 2016-11-14 13:21:08 +01:00
keorn
165e2bef75 modify proposer test 2016-11-14 11:34:54 +00:00
Jannis R
b1fcee73a5
sms verification: less block confirmations 2016-11-14 12:33:29 +01:00
Jannis R
8ce362b224
sms verification: add terms of service 2016-11-14 12:31:26 +01:00
Tomasz Drwięga
2795f40464 Merge branch 'new-token' of github.com:ethcore/parity into new-token 2016-11-14 12:17:29 +01:00
Tomasz Drwięga
7f011afacb Tokens retention policy 2016-11-14 12:17:05 +01:00
Jaco Greeff
665504c414 Only use #/auth token as fallback 2016-11-14 12:10:03 +01:00
keorn
b5c891814a fix merge 2016-11-14 11:09:57 +00:00
GitLab Build Bot
594bd35a5e
[ci skip] js-precompiled 20161113-131856 2016-11-14 11:57:54 +01:00
GitLab Build Bot
1e696c41f7
[ci skip] js-precompiled 20161113-131228 2016-11-14 11:57:54 +01:00
Gav Wood
8db3414de9
Merge branch 'master' into sms-verification-modal 2016-11-14 11:56:37 +01:00
Gav Wood
2fa2f8342a
isLatest works. 2016-11-14 11:49:56 +01:00
Jannis R
4d01fbc4c4
merge master into refactor-copy-to-clipboard 2016-11-14 11:46:58 +01:00
Jannis R
e9e9475830
CopyToClipboard: remove tooltip 2016-11-14 11:39:36 +01:00
keorn
501f6d3f49 Merge branch 'master' into auth-round 2016-11-14 10:08:14 +00:00
keorn
d8e6dbd981 Merge branch 'master' into dev-chain 2016-11-14 10:05:34 +00:00
keorn
2d4b4cf5c9 revert moves to Spec 2016-11-14 10:04:34 +00:00
Tomasz Drwięga
6957634ee7 Merge branch 'master' into new-token 2016-11-14 09:22:06 +01:00
Gav Wood
4bb4ed9551
Initial checking. 2016-11-13 15:52:33 +01:00
GitLab Build Bot
d1848117ef [ci skip] js-precompiled 20161113-131856 2016-11-13 13:20:20 +00:00
GitLab Build Bot
5a259be290 [ci skip] js-precompiled 20161113-131228 2016-11-13 13:13:54 +00:00
Gav Wood
4a92668c56 Fix chainspec storage field. (#3406)
Add a test.
2016-11-13 13:58:42 +01:00
Robert Habermeier
37f49aac1b abort snapshot restoration faster (#3356)
* abort snapshot restoration faster

* flag-checking tests
2016-11-13 13:52:53 +01:00
GitLab Build Bot
0c302376b6 [ci skip] js-precompiled 20161113-011451 2016-11-13 01:16:28 +00:00
Jaco Greeff
3ff9c3e6d6 Remove addresses, display non-refundable warning (#3403) 2016-11-12 22:28:50 +01:00
Jaco Greeff
c57738b9b6 Don't unsubscribe when subscriber callback throws (#3401) 2016-11-12 22:26:50 +01:00
Jaco Greeff
6b33899239 Fix dapp account selection (#3399)
* Fix GHH accounts (filter non accounts)

* SignatureReg handle undefined ABI names gracefully

* SignatureReg fix accounts (filter non accounts)

* TokenReg fix accounts (filter non accounts)

* Registry fix accounts (filter non accounts)
2016-11-12 22:24:55 +01:00
GitLab Build Bot
e5486f5d58 [ci skip] js-precompiled 20161112-202502 2016-11-12 20:26:39 +00:00
Robert Habermeier
ee11d104bf Merge pull request #3381 from ethcore/fix-travis
Fix travis build: remove unused import
2016-11-12 21:03:40 +01:00
Jaco Greeff
7ca317912f Set signer token via #/auth=token={} 2016-11-12 17:09:55 +01:00
Jaco Greeff
373eb6c01b Merge branch 'master' into new-token 2016-11-12 16:25:21 +01:00
Gav Wood
86eb84fd81 Switch --signer- to --ui- 2016-11-12 15:21:51 +01:00
Arkadiy Paronyan
67fa58db14 Optimize memory footprint (#3376) 2016-11-12 12:07:02 +01:00
Tomasz Drwięga
c17ef2c1a4 Fixing parsing passwords from file (#3367)
* fixing parsing passwords as inputs

* Fixing typo in test
2016-11-12 10:06:40 +01:00
keorn
15d748c2f7 Merge branch 'master' into dev-chain 2016-11-11 20:40:05 +00:00
keorn
aa296c3c0d update rpc tests 2016-11-11 19:12:32 +00:00
keorn
ea9c479fff update json_tests 2016-11-11 18:57:57 +00:00
keorn
cc39b24599 update chain name 2016-11-11 18:41:04 +00:00
keorn
4a65394269 change instant spec, update doc 2016-11-11 18:38:44 +00:00
Robert Habermeier
7e41f1c901 Fix travis build: remove unused import 2016-11-11 18:41:25 +01:00
keorn
53258cca6c add new dev spec 2016-11-11 17:27:20 +00:00
keorn
e63b7e51fb update instant_seal schedule 2016-11-11 17:26:41 +00:00
Robert Habermeier
87c668ba9c test previous code fetch 2016-11-11 18:24:12 +01:00