Commit Graph

11231 Commits

Author SHA1 Message Date
Robert Habermeier
d0194f3ad3 Merge branch 'master' into lightsync 2016-12-23 13:39:06 +01:00
Robert Habermeier
10c56acff6 revert tests submodule 2016-12-23 13:21:29 +01:00
GitLab Build Bot
4623f45686 [ci skip] js-precompiled 20161223-041415 2016-12-23 04:17:11 +00:00
GitLab Build Bot
9a013c4f47 [ci skip] js-precompiled 20161222-173736 2016-12-22 17:40:57 +00:00
Jaco Greeff
077069c452 Display 0x00..00 as null (#3950)
* Display 0x00..00 as null (custom black icon)

* rendering test for null
2016-12-22 18:30:59 +01:00
Tomasz Drwięga
f0387c33c6 Global Fetch Service (#3915)
* Dapps web

Conflicts:
	dapps/src/apps/fetcher.rs
	dapps/src/handlers/fetch.rs

* Rewriting fetch

* Parity-wide fetch service

* Obey the limits and support cancellation.

* Removing temporary files.

* Actually use Fetch for dapps

* Re-implementing file fetching to avoid temporary files.

* Serde to 0.8.19

* Fixing content & dapps fetch
2016-12-22 18:26:39 +01:00
GitLab Build Bot
1645419bc8 [ci skip] js-precompiled 20161222-164848 2016-12-22 16:51:32 +00:00
Jaco Greeff
c2e5b78c5b Update babel-loader for WebPack 2.2-rc (#3953)
* Update babel loader for WebPack 2.2

* Force build
2016-12-22 17:44:29 +01:00
GitLab Build Bot
7dd988860f [ci skip] js-precompiled 20161222-162822 2016-12-22 16:31:24 +00:00
Nicolas Gotchac
1140f9c9f8 Remove ui/views/modals bundles (#3946) 2016-12-22 17:21:59 +01:00
Jaco Greeff
203b419080 Fix manual input token (#3945)
* Fix manual input token (invalid regex)

* .trim() on token

* Add ^ & $ matching
2016-12-22 17:21:48 +01:00
Nicolas Gotchac
692ec97158 Update Webpack to 2.2 RC2 (#3952) 2016-12-22 17:07:18 +01:00
GitLab Build Bot
25f1c1dcc9 [ci skip] js-precompiled 20161222-153857 2016-12-22 15:42:00 +00:00
Jaco Greeff
00f4f128f2 Add missing Ethcore -> Parity headers (#3948) 2016-12-22 16:33:05 +01:00
Paul Peregud
b444d23b3a code example: do start before register_protocol (#3947) 2016-12-22 16:15:26 +01:00
Igor Artamonov
be75cbfaaa set CHAIN_ID for Classic (#3934)
* configurable CHAIN_ID

* set CHAIN_ID for Ethereum Classic
2016-12-22 13:10:58 +01:00
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
keorn
552a772cc1 make fields defaulting to 0 optional 2016-12-22 07:06:40 +01: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
Robert Habermeier
01b494ca2c Merge branch 'master' into lightsync 2016-12-21 13:42:07 +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