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 |
|
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 |
|
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 |
|
GitLab Build Bot
|
5ec1ff43ea
|
[ci skip] js-precompiled 20161210-212741
|
2016-12-10 21:29:53 +00: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 |
|
Tomasz Drwięga
|
08a47ea2d4
|
Allow modifications of gas when confirming in signer (#3798)
|
2016-12-10 20:18:42 +01:00 |
|
Tomasz Drwięga
|
1f9adc8622
|
Merge branch 'master' into txqueue-gc
Conflicts:
ethcore/src/miner/miner.rs
|
2016-12-10 17:00:29 +01:00 |
|
Robert Habermeier
|
a6fcd8a0d9
|
Merge pull request #3794 from ethcore/net-fix
Network connectivity fixes
|
2016-12-10 16:55:17 +01:00 |
|
arkpar
|
02c788a403
|
Network connectivity fixes
|
2016-12-10 14:20:34 +01:00 |
|
Gav Wood
|
316c25d9f8
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-10 14:08:41 +01:00 |
|
Gav Wood
|
60ea787bd1
|
Merge pull request #3781 from ethcore/consistent-id
Make *ID names consistent with std Rust (Id)
|
2016-12-10 14:04:07 +01:00 |
|
Gav Wood
|
0977b82eeb
|
More fixes.
|
2016-12-10 13:54:17 +01:00 |
|
Gav Wood
|
7eb30b1249
|
Fix build.
|
2016-12-10 13:52:43 +01:00 |
|
Gav Wood
|
82efa2675e
|
Merge remote-tracking branch 'origin/master' into consistent-id
|
2016-12-10 13:36:30 +01:00 |
|
Jaco Greeff
|
6eb63a7316
|
Update CI builds (#3780)
* Only run languages tests in appropriate areas
* Drop echo
|
2016-12-10 10:49:39 +01:00 |
|
keorn
|
5f09eb9d04
|
update tests to new spec (#3790)
|
2016-12-10 10:38:10 +01:00 |
|
Nicolas Gotchac
|
b9c04fcd00
|
Fixes to the Wallet UI (#3787)
* Correct number of transactions for contracts
* Remove daily limit info if set to 0
* Hide tx count for contracts
|
2016-12-10 01:26:47 +01:00 |
|
Nicolas Gotchac
|
6655e7e3c0
|
Add support for wallets without getOwner() interface (#3779)
* Make Wallet Mist compatible #3282
* Owners icons on load
* Fix oversized logo on load
* Don't fetch registry twice (even when pending)
* Better logging...
* Better contract view : show if no events // show loading events
* Better decimal typed input
* PR grumble
|
2016-12-10 01:26:28 +01:00 |
|
Nicolas Gotchac
|
923f85d90d
|
Update Material-UI (#3785)
* Update MUI => Fixes wrong error styled inputs
* Update postcss import
|
2016-12-10 01:26:03 +01:00 |
|
Nicolas Gotchac
|
5c555aa18f
|
Fixes error in Transfer modal (mix between props and own property) (#3788)
|
2016-12-10 01:25:23 +01:00 |
|
Robert Habermeier
|
4d25445af5
|
Merge pull request #3755 from ethcore/lightserv
LES Part 3: Event handlers and handling responses
|
2016-12-10 00:40:46 +01:00 |
|
Gav Wood
|
341777dbb6
|
Merge pull request #3743 from ethcore/jg-test-ui
Basic UI rendering tests
|
2016-12-09 23:16:11 +01:00 |
|
Gav Wood
|
edd5e76050
|
Merge branch 'consistent-id' into check-updates
|
2016-12-09 23:12:36 +01:00 |
|
Gav Wood
|
5f1fcf95e0
|
Make *ID names consistent with std Rust (Id)
|
2016-12-09 23:01:43 +01:00 |
|
Robert Habermeier
|
d427d60156
|
Merge pull request #3776 from ethcore/p2p-event-ordering
network: process packets only after connection handler finishes
|
2016-12-09 23:00:59 +01:00 |
|
Robert Habermeier
|
503b126c93
|
Merge branch 'master' into lightserv
|
2016-12-09 21:37:55 +01:00 |
|
Robert Habermeier
|
b772901d77
|
network: process packets only after connection handler finishes
|
2016-12-09 21:17:05 +01:00 |
|
Gav Wood
|
2226324495
|
Merge pull request #3778 from ethcore/auth-round-test
AuthorityRound network simulation test
|
2016-12-09 20:58:05 +01:00 |
|
Gav Wood
|
c82754874c
|
Fix typo.
|
2016-12-09 20:48:52 +01:00 |
|
Gav Wood
|
46af3d18da
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-09 20:45:15 +01:00 |
|
Gav Wood
|
e5e6b77984
|
Cleanups and avoid redownloading.
|
2016-12-09 20:40:24 +01:00 |
|
arkpar
|
97f358ced9
|
AuthorityRound network simulation test
|
2016-12-09 20:38:06 +01:00 |
|
Tomasz Drwięga
|
c91a614c3d
|
Fixing tests
|
2016-12-09 20:24:33 +01:00 |
|
Gav Wood
|
598fd42856
|
Merge pull request #3770 from ethcore/jg-execute-gas
GasPrice selection for contract execution
|
2016-12-09 20:24:10 +01:00 |
|
Gav Wood
|
0a4e63b462
|
Merge pull request #3762 from ethcore/tx-check
Reject existing transactions
|
2016-12-09 20:17:28 +01:00 |
|
Gav Wood
|
45ec84e627
|
Merge pull request #3752 from ethcore/jg-subscription-check
Allow autoRemove from api.subscribe based on callback return values
|
2016-12-09 20:16:34 +01:00 |
|
Gav Wood
|
2e1e167397
|
Merge pull request #3753 from ethcore/jg-fix-gitlab.yml
Replace misplaced & with && in gitlab-ci.yml
|
2016-12-09 20:16:10 +01:00 |
|
GitLab Build Bot
|
647b62b4a2
|
[ci skip] js-precompiled 20161209-182130
|
2016-12-09 18:23:46 +00:00 |
|