Commit Graph

7722 Commits

Author SHA1 Message Date
Robert Habermeier
b44cd7b1db Merge pull request #3940 from gguoss/auth-bft
Fixed compile error.
2016-12-22 12:54:14 +01:00
gavinGuo
70c9f7c80d Fixed compile error. 2016-12-22 14:51:25 +08:00
GitLab Build Bot
a13135de30 [ci skip] js-precompiled 20161222-043246 2016-12-22 04:35:36 +00:00
GitLab Build Bot
8114d50b47 [ci skip] js-precompiled 20161221-183632 2016-12-21 18:39:21 +00:00
Nicolas Gotchac
bce69b2b09 Fix dApps not loading (#3935) 2016-12-21 19:30:49 +01:00
GitLab Build Bot
5ea70b1fd3 [ci skip] js-precompiled 20161221-141855 2016-12-21 14:22:59 +00:00
Nicolas Gotchac
aba38721b1 Fix Secure API hangs (#3927)
* Use proxy for WS in dev

* Update SecureAPI

* Update webpack config

* Fix dev contract

* Update webpack

* Linting fixes

* Refactor Secure API logic : Promise based, no wastes of req

* Fix tests

* Add try 'intitial' token
2016-12-21 15:12:40 +01:00
Robert Habermeier
a9f89b09e0 Merge pull request #3899 from ethcore/warp-sync-rpcs
parity_chainStatus RPC for block gap info
2016-12-21 15:09:45 +01:00
Nikolay Volf
af501e6467 Custom attribute for binary serialization (#3922)
* derive(Binary) -> binary

* ethcore types refact

* fixup ethcore

* make binary optional

* fix common types

* fix updater

* remove condition
2016-12-21 15:09:35 +01:00
Gav Wood
b369939f20 Merge pull request #3926 from ethcore/split-ci-intermediate-stage
Split intermediate stage into two.
2016-12-20 18:42:11 +01:00
Gav Wood
af5c6af539
Split intermediate stage into two. 2016-12-20 17:54:09 +01:00
GitLab Build Bot
5bccd13111 [ci skip] js-precompiled 20161220-164120 2016-12-20 16:44:23 +00:00
Gav Wood
d486a983ac Merge pull request #3920 from ethcore/curl-rel-before-build
Move release-registering to intermediate stage.
2016-12-20 17:35:34 +01:00
Gav Wood
8f5804eab8 Merge pull request #3894 from ethcore/jg-fix-status-blocktime
Blocktime format rounding
2016-12-20 17:35:08 +01:00
Tomasz Drwięga
9a5bb9470b Ignore dapps_policy.json (#3919)
* Ignore dapps_policy.json

* Produce warning for non-ignored files
2016-12-20 16:34:53 +01:00
Gav Wood
f5a4581fa5
Move release-registering to intermediate stage. 2016-12-20 14:05:07 +01:00
GitLab Build Bot
269338d9bf [ci skip] js-precompiled 20161220-130157 2016-12-20 13:04:47 +00:00
GitLab Build Bot
ee050d4fd8 [ci skip] js-precompiled 20161220-111754 2016-12-20 11:20:41 +00:00
Jaco Greeff
d89ee5432e JS API interface for parity_chainStatus 2016-12-20 12:12:39 +01:00
Gav Wood
854cc604d9 Merge pull request #3912 from ethcore/ng-contract-dev
Fixing Contract Development
2016-12-20 12:12:06 +01:00
Nicolas Gotchac
7b3b82b750 Updating dependencies 2016-12-20 11:43:13 +01:00
Nicolas Gotchac
efb928b8f1 Removed Worker 2016-12-20 03:51:23 +01:00
Nicolas Gotchac
b4c73a52d1 Merge branch 'master' into ng-contract-dev 2016-12-20 02:39:10 +01:00
Nicolas Gotchac
244d1aefc6 linting 2016-12-20 02:38:40 +01:00
Nicolas Gotchac
1627c3fa71 Add import files in Contract Dev 2016-12-20 02:37:16 +01:00
Nicolas Gotchac
5886034265 Add optimize and autocompile toggles 2016-12-20 02:11:04 +01:00
Nicolas Gotchac
f70e808056 Fallback in Contract Dev if no worker 2016-12-20 01:55:57 +01:00
Gav Wood
8fc10c1911 Merge pull request #3911 from ethcore/use-rhash-for-non-native
Use rhash for non-native CI platforms and submit build.
2016-12-20 01:12:15 +01:00
Gav Wood
6659a4ec21
Use rhash for non-native CI platforms and submit build. 2016-12-20 00:21:19 +01:00
Gav Wood
61ade1e710 Merge pull request #3907 from ethcore/no-orbit-off
remove -Zorbit=off from rustflags on windows
2016-12-19 22:24:51 +01:00
Gav Wood
cd8af0a497 Merge pull request #3904 from ethcore/new-dirs
Fixed upgrading keys on the first run
2016-12-19 22:24:37 +01:00
Gav Wood
18965be047 Merge pull request #3903 from ethcore/test-mem-limit-deadlock
fix deadlock in queue drop
2016-12-19 22:23:56 +01:00
Gav Wood
5ba16e4867 Merge pull request #3897 from ethcore/single-provider-functions
require only simpler methods on Provider
2016-12-19 22:23:39 +01:00
Robert Habermeier
11f382ca1b remove -Zorbit=off from rustflags on windows 2016-12-19 19:15:18 +01:00
Robert Habermeier
ae8f77bc7c fix deadlock in queue drop 2016-12-19 18:10:26 +01:00
arkpar
ddb242c969 Fixed upgrading keys on the first run 2016-12-19 17:41:55 +01:00
Robert Habermeier
e0f6f8f97e Merge pull request #3902 from ethcore/rpc-error-grammar
Fix grammar ("you try" -> "you tried" + article)
2016-12-19 16:49:39 +01:00
Robert Habermeier
5b6cd2183b Fix grammar ("you try" -> "you tried" + article) 2016-12-19 16:27:03 +01:00
Robert Habermeier
e1adc9606f parity_chainStatus RPC for block gap info 2016-12-19 15:27:17 +01:00
Gav Wood
002cec9e6f Merge pull request #3872 from ethcore/disable-light-server
remove light server capability temporarily
2016-12-19 15:22:44 +01:00
Gav Wood
1f8a1cac22 Merge pull request #3896 from ethcore/timestamp-ignore
Allow retry for future blocks
2016-12-19 15:21:05 +01:00
Gav Wood
9e3cadc6c3 Merge pull request #3895 from ethcore/rename-engines
Consistent engine and seal names
2016-12-19 15:19:57 +01:00
Robert Habermeier
4c7dc9f2d8 require only simpler methods on Provider 2016-12-19 14:54:10 +01:00
arkpar
d3486b45c5 Allow retry for future blocks 2016-12-19 14:47:48 +01:00
Nicolas Gotchac
e377ec3194 Working ServiceWorker 2016-12-19 14:39:10 +01:00
GitLab Build Bot
776a45af87 [ci skip] js-precompiled 20161219-132051 2016-12-19 13:25:03 +00:00
keorn
46662899da make spec naming consistent 2016-12-19 14:15:39 +01:00
Jannis Redmann
2862e8b92c update email certification ABI (#3893) 2016-12-19 14:14:54 +01:00
Jaco Greeff
6efaec8f8b Blocktime format rounding 2016-12-19 14:07:50 +01:00
GitLab Build Bot
65f2d2b050 [ci skip] js-precompiled 20161219-122700 2016-12-19 12:30:05 +00:00