Gav Wood
74a6203f72
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-11 15:43:28 +01:00
Gav Wood
0e17cf8d3a
Fix tests.
2016-12-11 15:41:49 +01:00
Robert Habermeier
6724f574d6
Light server improvements and protocol adjustments ( #3801 )
...
* light: basic transaction pool
* light: network timeouts
* fix dead code warnings
* les: update to new message format
* fix indentation
* les: hash or number in headers req, not both
2016-12-11 15:40:31 +01:00
Igor Artamonov
6742b080f5
use decimals for block numbers in config
2016-12-11 20:38:37 +06:00
Igor Artamonov
4e3c49c809
revert ETC to correct Network ID
2016-12-11 20:34:46 +06:00
Gav Wood
e6444cd106
Merge pull request #3810 from ethcore/defaults-parse-fix
...
Tolerate errors in user_defaults
2016-12-11 15:15:43 +01:00
GitLab Build Bot
778f5bbfaf
[ci skip] js-precompiled 20161211-141210
2016-12-11 14:14:41 +00:00
Gav Wood
b28537aa9a
Merge pull request #3809 from ethcore/mining-min-gas-limit
...
block: enforce gas limit falls within engine bounds
2016-12-11 15:08:30 +01:00
Nicolas Gotchac
d3077c51fc
Target Babel to latest Chrome Versions in dev ( #3806 )
...
* Use `babel-preset-env` to target Babel to latest Chrome Versions
* Opt-In mechanism for Babel Preset Env
2016-12-11 15:05:10 +01:00
arkpar
05dcf951d1
Merge w master
2016-12-11 14:59:57 +01:00
Igor Artamonov
aed633d7df
Testnet for Ethereum Classic
2016-12-11 19:25:02 +06:00
Gav Wood
5bf9fa9168
Allow reuse of previous logger.
2016-12-11 13:35:00 +01:00
arkpar
a49ff3fb32
Merge branch 'master' of github.com:ethcore/parity into cli-rpc
2016-12-11 13:30:48 +01:00
Igor Artamonov
7b5bc115e9
EIP-160 configuration for Ethereum Classic
2016-12-11 18:29:40 +06:00
Igor Artamonov
592ff53bab
EIP-155 configuration for Ethereum Classic
2016-12-11 18:28:37 +06:00
arkpar
2c653d2c2e
Merge w master
2016-12-11 13:11:08 +01:00
Gav Wood
8d7a63bbea
Join up the final dots.
2016-12-11 13:10:33 +01:00
arkpar
a56443aa6c
Tolerate error is user_defaults
2016-12-11 13:00:49 +01:00
Robert Habermeier
9252ebf93d
block: enforce gas limit falls within engine bounds
2016-12-11 12:50:48 +01:00
arkpar
c777362d02
Sync channel for consensus test
2016-12-11 12:32:01 +01:00
GitLab Build Bot
95af942fc9
[ci skip] js-precompiled 20161211-093638
2016-12-11 09:40:44 +00:00
Jaco Greeff
0a37288aa4
Lowercase npm packages ( #3807 )
2016-12-11 10:30:30 +01:00
GitLab Build Bot
17dee5f1a2
[ci skip] js-precompiled 20161211-091947
2016-12-11 09:22:07 +00:00
Jaco Greeff
36b8e4b6a8
Extended publishing of libraries to npm ( #3786 )
...
* Extended publishing of libraries to npm
* Update source links
* Add some tests before publishing NPM library
* Fix Shapeshift tests
2016-12-11 10:13:34 +01:00
Gav Wood
d9f6ea56ef
Don't restart if we're not in the cradle.
2016-12-11 04:05:02 +01:00
Gav Wood
2865cbaf70
Use file contents instead of symlink.
2016-12-11 03:33:10 +01:00
Gav Wood
7a1539cfb5
Fix deadlock.
2016-12-11 02:39:56 +01:00
GitLab Build Bot
bfb684a641
[ci skip] js-precompiled 20161211-012647
2016-12-11 01:28:52 +00:00
Gav Wood
078feaadd5
Merge pull request #3799 from ethcore/ng-ui-fixes
...
Several Fixes to the UI
2016-12-11 02:16:21 +01:00
Gav Wood
0a494962e4
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-11 02:13:52 +01:00
Gav Wood
120564ff29
Avoid pulling in hash_fetch.
2016-12-11 02:12:52 +01:00
Gav Wood
0302d582d2
Fix build.
2016-12-11 02:02:40 +01:00
Nicolas Gotchac
ba3bfcc54d
Merge branch 'master' into ng-ui-fixes
2016-12-11 01:26:55 +01:00
Gav Wood
068201a01b
Merge pull request #3805 from ethcore/fix-ci
...
Remove "s
2016-12-11 00:30:28 +01:00
Gav Wood
7c2c9c89a4
Stricter search for rust changes.
2016-12-11 00:20:19 +01:00
Gav Wood
c14d8da350
Use real arithmetic operator rather than '='
2016-12-11 00:09:04 +01:00
GitLab Build Bot
62492a915e
[ci skip] js-precompiled 20161210-230517
2016-12-10 23:07:55 +00:00
Gav Wood
12df3adfeb
Merge branch 'master' into fix-ci
2016-12-11 00:02:48 +01:00
Gav Wood
854eb1080c
Remove "s
2016-12-10 23:59:50 +01:00
Gav Wood
fa30dfd4b9
Refactor into system service, add exe redirect.
2016-12-10 23:58:39 +01:00
Nicolas Gotchac
b44e7bb292
Extract CSS to file in production builds ( #3783 )
...
* Extract CSS to file if production build
* Use DAPPS_URL for testing purposes + better assets in Webpack
* Delete comments
2016-12-10 23:55:57 +01:00
Nicolas Gotchac
b0f1665f11
Notify user on transaction received ( #3782 )
...
* Notify user on new transaction #2556
* Add routing to account on notification click
* Timeout of notif set to 20s
2016-12-10 23:55:36 +01:00
Gav Wood
aa30619b6f
Merge pull request #3772 from ethcore/txqueue-gc
...
Removing all old entries from transaction queue
2016-12-10 23:53:24 +01:00
Tomasz Drwięga
1e8638608c
fixing tests
2016-12-10 22:59:35 +01:00
Nicolas Gotchac
e5c73b29d8
'contract/write' to 'contract/develop'
2016-12-10 22:42:49 +01:00
GitLab Build Bot
5ec1ff43ea
[ci skip] js-precompiled 20161210-212741
2016-12-10 21:29:53 +00:00
Nicolas Gotchac
9dbccfda2f
Fix padding bottom // Status bar fixed
2016-12-10 22:22:14 +01:00
Jaco Greeff
173a88804a
Status page updates ( #3774 )
...
* Allow Page to create optional Actionbar
* Typo
* Display last block.timestamp
* Remove unnneeded console.log
* Re-do git mv
* git mv
* Force build changes
* Resolving case sensitivity issues
* Swapped to margin at bottom
2016-12-10 22:21:32 +01:00
Nicolas Gotchac
7401358543
PR grumbles
2016-12-10 22:15:56 +01:00
Tomasz Drwięga
b5020d3c8d
Fixing Light context API
2016-12-10 21:25:28 +01:00