grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,425 Commits 1 Branch 329 Tags 59 MiB
9ca294740d
Commit Graph

2086 Commits

Author SHA1 Message Date
Jaco Greeff
935d1476e9 Update test execution 2017-09-18 10:15:36 +02:00
Tomasz Drwięga
b602fb4a5e Fix extension detection (#6452) 
* Fix extension detection.

* Fix mobx quirks.

* Update submodule.
 2017-09-15 15:06:42 +02:00
Tomasz Drwięga
06ff866e9d Fix broken JavaScript tests (#6498) 
* Fixing/removing failing JS tests.

* Fix javascript tests.
 2017-09-14 19:32:06 +02:00
Fredrik Harrysson
75b6a31e87 Trezor Support (#6403) 
* Copy modal from keepkey branch and generalize

The keepkey PinMatrix modal needs to be the same for Trezor, but we
should probably try to keep it general since it can be used for both.

* Add trezor communication code

This is a result of much trial-and-error and a couple of dead-ends in
how to communicate and wire everything up.

Code here is still a bit WIP with lots of debug prints and stuff.

The test works though, it is possible to sign a transaction.

* Extend the basic lib to allow Trezor

This is kind of ugly and needs some cleanup and generalization. I’ve
just copy-pasted some things to bring in the trezor wallets. I’ve also
had to add a lock to the USB API so that only one thing talks to the
USB at once.

* Add RPC plumbing needed

We need to be able to get “locked” devices from the frontend to figure
out if we’re going to display the PinMatrix or not. Then we need to be
able to send a pin to a device.

* Add logic to query backend for Trezor and display PinMatrix

There’s a bug somewhere here because signing a transaction fails if you
take too long to press the confirm button on the device.

* Change back to paritytech branch

As my fork has been merged in.

* Converting spaces to tabs, as it should be

* Incorporate correct handling of EIP-155

Turns out the Trezor was adjusting the v part of the signature, and
we’re already doing that so it was done twice.

* Some circular logic here that was incorrect

BE-encoded U256 is almost the same as RLP encoded without the
size-byte, except for <u8 sized values. What’s really done is
BE-encoded U256 and then left-trimmed to the smallest size. Kind of
obvious in hindsight.

* Resolve issue where not clicking fast enough fails

The device will not repeat a ButtonRequest when you read from it, so
you need to have a blocking `read` for whatever amount of time that you
want to give the user to click. You could also have a shorter timeout
but keep retrying for some amount of time, but it would amount to the
same thing.

* Scan after pin entry to make accepting it faster

* Remove ability to cancel pin request

* Some slight cleanup

* Probe for the correct HID Version to determine padding

* Move the PinMatrix from Accounts to Application

* Removing unused dependencies

* Mistake in copying over stuff from keepkey branch

* Simplify FormattedMessage

* Move generated code to external crate

* Remove ethcore-util dependency

* Fix broken import in test

This test is useless without a connected Trezor, not sure how to make
it useful without one.

* Merge branch 'master' into fh-4500-trezor-support

# Conflicts:
#	rpc/src/v1/helpers/dispatch.rs

* Ignore test that can't be run without trezor device

* Fixing grumbles

* Avoiding owning data in RPC method
* Checking for overflow in v part of signature
* s/network_id/chain_id
* Propagating an error from the HID Api
* Condensing code a little bit

* Fixing UI.

* Debugging trezor.

* Minor styling tweak

* Make message type into an actual type

This makes the message type that the RPC message accepts into an actual
type as opposed to just a string, based on feedback. Although I’m not
100% sure this has actually improved the situation.

Overall I think the hardware wallet interface needs some refactoring
love.

* Split the trezor RPC endpoint

It’s split into two more generic endpoints that should be suitable for
any hardware wallets with the same behavior to sit behind.

* Reflect RPC method split in javascript

* Fix bug with pin entry

* Fix deadlock for Ledger

* Avoid having a USB lock in just listing locked wallets

* Fix javascript issue (see #6509)

* Replace Mutex with RwLock

* Update Ledger test

* Fix typo causing faulty signatures (sometimes)

* *Actually* fix tests

* Update git submodule

Needed to make tests pass

* Swap line orders to prevent possible deadlock

* Make setPinMatrixRequest an @action
 2017-09-14 19:28:43 +02:00
Jaco Greeff
baeab01357 Current @parity/shared (required dapp-* rebuild) 2017-09-13 17:51:38 +02:00
Jaco Greeff
4a184dbbe6 Merge branch 'master' into ui-2 2017-09-13 15:51:02 +02:00
Jaco Greeff
5d774d360e Update with latest dependencies 2017-09-13 13:09:32 +02:00
Jaco Greeff
94df97a5ae Update packages 2017-09-12 15:58:13 +02:00
Jaco Greeff
6e2e122288 Update with recent @parity/ui 2017-09-12 13:32:21 +02:00
Jaco Greeff
dc85c66052 file: protocol updates 2017-09-11 14:47:34 +02:00
Jaco Greeff
2bcdb07b62 Run electron (dev) from build directory 2017-09-11 10:37:09 +02:00
Jaco Greeff
ceb1dd8d83 Electron app should not display extension install message 2017-09-11 10:00:51 +02:00
Jaco Greeff
093eb3915a Disable signer plugin 2017-09-11 09:31:28 +02:00
GitLab Build Bot
dcea17f8c6 [ci skip] js-precompiled 20170910-175532 2017-09-10 18:00:22 +00:00
Nicolas Gotchac
f1a050366f Fix slow balances (#6471) 
* Update token updates

* Update token info fetching

* Update logger

* Minor fixes to updates and notifications for balances

* Use Pubsub

* Fix timeout.

* Use pubsub for status.

* Fix signer subscription.

* Process tokens in chunks.

* Fix tokens loaded by chunks

* Linting

* Dispatch tokens asap

* Fix chunks processing.

* Better filter options

* Parallel log fetching.

* Fix signer polling.

* Fix initial block query.

* Token balances updates : the right(er) way

* Better tokens info fetching

* Fixes in token data fetching

* Only fetch what's needed (tokens)

* Fix linting issues

* Revert "Transaction permissioning (#6441)"

This reverts commit eed0e8b03a.

* Revert "Revert "Transaction permissioning (#6441)""

This reverts commit 8f96415e58dde652e5828706eb2639d43416f448.

* Update wasm-tests.

* Fixing balances fetching

* Fix requests tracking in UI

* Fix request watching

* Update the Logger

* PR Grumbles Fixes

* PR Grumbles fixes

* Linting...
 2017-09-10 18:03:35 +02:00
Jaco Greeff
6d8b511d25 Merge master 2017-09-07 13:32:45 +02:00
Jaco Greeff
ee4f370bdb Update CSS linting 2017-09-07 12:51:57 +02:00
Jaco Greeff
afb101e234 Cleanup handler determination 2017-09-07 12:31:32 +02:00
GitLab Build Bot
e5bbabb2ba [ci skip] js-precompiled 20170905-115347 2017-09-05 11:58:41 +00:00
Jaco Greeff
1d8886fa7d Adjust Signer title colours 2017-09-05 13:33:57 +02:00
Nicolas Gotchac
a62238c19d Add language selector in production (#6317) 
* Add language selector in PRODUCTIN

* Fix wrong i18n keys

* Update the default i18n files
 2017-09-05 12:26:29 +01:00
Jaco Greeff
a5cc14ce8c Signer plugin attachment 2017-09-04 16:17:39 +02:00
Jaco Greeff
7818ed98c7 Add status bar extension plugins 2017-09-04 12:24:46 +02:00
GitLab Build Bot
6b8c9cac23 [ci skip] js-precompiled 20170901-161931 2017-09-01 16:33:31 +00:00
Jaco Greeff
fb7b11553a Test-drive extensions, status first 2017-09-01 14:29:57 +02:00
Jaco Greeff
a1bde406de Don't clobber window.parity, extend 2017-09-01 13:03:00 +02:00
Craig O'Connor
56f46edab8 Pub sub blocks (#6139) 
* fun start

* playin

* linting

* cleanup kk 1

* cleanup kk 2

* package

* oops

* grumbles

* lint

* lint 2

* all-possible-cases

* conflict resolution

* conflict resolution

* ready

* lint

* remove package-lock

* Restart subscription on transport close.

* Bring back the formatter.

* Fix formatter.
 2017-09-01 12:23:41 +02:00
Jaco Greeff
d0d8002b66 Override uiUrl 2017-08-31 15:36:57 +02:00
Jaco Greeff
d957a10f47 Update to cater for token URL 2017-08-31 14:08:15 +02:00
Jaco Greeff
5b8236cdbd Update for non HTTP use 2017-08-30 12:47:14 +02:00
Jaco Greeff
be56a06790 Basic electron interface 2017-08-30 11:59:38 +02:00
Jaco Greeff
d7de40ab4c Init history in dapp module 2017-08-30 11:29:15 +02:00
Jaco Greeff
b1428c2b56 Update packages 2017-08-30 09:29:28 +02:00
Jaco Greeff
35202e28c2 Update webpack 2017-08-29 15:11:09 +02:00
Jaco Greeff
2593477151 Don't show tags for dapps 2017-08-29 13:03:06 +02:00
Jaco Greeff
39cf190db7 Update dependencies 2017-08-29 10:50:47 +02:00
Jaco Greeff
2a0820278b Update 2017-08-29 10:18:02 +02:00
Tomasz Drwięga
3226e1ca33 Expose health status over RPC (#6274) 
* Node-health to a separate crate.

* Initialize node_health outside of dapps.

* Expose health over RPC.

* Bring back 412 and fix JS.

* Add health to workspace and tests.

* Fix compilation without default features.

* Fix borked merge.

* Revert to generics to avoid virtual calls.

* Fix node-health tests.

* Add missing trailing comma.
 2017-08-28 14:11:55 +02:00
Jaco Greeff
7438cfc47d Merge branch 'master' into ui-2 2017-08-25 12:14:56 +02:00
GitLab Build Bot
b6024adf85 [ci skip] js-precompiled 20170825-090654 2017-08-25 09:11:39 +00:00
Jon Choi
5b6d47aeef Infoline less opaque for UI/visibility (#6364) 2017-08-25 16:31:48 +08:00
Jaco Greeff
d97f6b3812 Add @parity/jsonrpc explicitly 2017-08-24 13:07:22 +02:00
Jaco Greeff
ae66b98aac Update dependencies 2017-08-24 12:01:47 +02:00
Jaco Greeff
21e8c31aec Update dependencies 2017-08-22 16:51:40 +02:00
Jaco Greeff
630118b5a5 Merge branch 'master' into ui-2 2017-08-22 15:12:30 +02:00
Tomasz Drwięga
73644adf69
Rename network_id to chain_id where applicable. 2017-08-21 14:23:10 +02:00
GitLab Build Bot
f3e7d7c725 [ci skip] js-precompiled 20170821-094253 2017-08-21 09:48:30 +00:00
Marek Kotewicz
e8841ae9e2 Merge pull request #6331 from paritytech/fix-startup-wizard 
Better check the created accounts before showing Startup Wizard
 2017-08-21 10:44:54 +02:00
GitLab Build Bot
2c0a1b652c [ci skip] js-precompiled 20170818-143526 2017-08-18 14:40:04 +00:00
Tomasz Drwięga
cd0c77dc5c Ignore errors from dappsUrl when starting UI. (#6296) 
* Ignore errors from dappsUrl when starting UI.

* Fix linter.
 2017-08-18 15:51:52 +02:00
Nicolas Gotchac
444233bd1b Better check the created accounts before showing Startup Wizard 2017-08-18 15:28:41 +02:00
GitLab Build Bot
d115006597 [ci skip] js-precompiled 20170813-184308 2017-08-13 18:48:32 +00:00
Tomasz Drwięga
10068cee72 Extension fixes (#6284) 
* Fix token symbols in extension.

* Allow connections from firefox extension.
 2017-08-13 17:41:50 +02:00
Tomasz Drwięga
b5b6e3dd2a Fix a hash displayed in tooltip when signing arbitrary data (#6283) 
* Allow connections from firefox extension.

* Displaying actual data that will be signed on hover.

* Display a tooltip.

* Revert "Allow connections from firefox extension."

This reverts commit d3323b76fe28564c2366ceec3d891de19884192f.
 2017-08-13 17:41:08 +02:00
Jaco Greeff
f0e20142af Rebuild 2017-08-11 03:19:28 +02:00
Tomasz Drwięga
604ea5d684 Time should not contribue to overall status. (#6276) 2017-08-10 18:48:03 +02:00
GitLab Build Bot
ecd880c8e7 [ci skip] js-precompiled 20170810-101054 2017-08-10 10:16:01 +00:00
Tomasz Drwięga
30be0972b9 Add warning to web browser and fix links. (#6232) 2017-08-10 11:16:02 +02:00
GitLab Build Bot
b21932687a [ci skip] js-precompiled 20170809-182421 2017-08-09 18:29:28 +00:00
Björn Wagner
e128285a77 Replace 'home.parity' with 'parity.web3.site' (#4771) 2017-08-09 19:07:15 +02:00
Craig O'Connor
7d17d77254 Dapp refresh (#5752) 
* RwLock

* getting there

* argh

* parking_lot

* rpc

* wax on wax off

* almost there

* remove lock

* write over read

* works

* linting

* small updates

* dissapearing act

* router update

* complete

* one m

* grumbles1

* grumbles part II

* parking_lot->util

* missed test case

* fied package-lock.json

* small fixes

* 404 tests failing

* cleanup

* cleanup 2

* updates and the likes

* play

* simplify filter

* f-ing bugs

* read->write

* Address own grumbles.

* Fix test.
 2017-08-09 19:06:40 +02:00
Nicolas Gotchac
d6eb053826 Add support for ConsenSys multisig wallet (#6153) 
* First draft of ConsenSys wallet

* Fix transfer store // WIP Consensys Wallet

* Rename walletABI JSON file

* Fix linting

* Fix wrong daylimit in wallet modal

* Confirm/Revoke ConsensysWallet txs

* Linting

* Change of settings for the Multisig Wallet
 2017-08-09 19:06:14 +02:00
Jaco Greeff
039729a074 Export default function for shellMiddleware 2017-08-09 13:17:52 +02:00
Jaco Greeff
4176936d34 Move shell APIs to middleware 2017-08-09 13:03:26 +02:00
Jaco Greeff
f967bc4ac0 Don't mask top-level params 2017-08-09 11:01:34 +02:00
Jaco Greeff
2d5541f533 Add shell_loadApp API 2017-08-09 10:55:15 +02:00
Jaco Greeff
9aae4614a1 Update with latest package versions 2017-08-09 09:43:02 +02:00
Jaco Greeff
317addb7e3 Remove ~ alias 2017-08-09 09:36:40 +02:00
Jaco Greeff
a11e9acd12 Merge branch 'master' into ui-2 2017-08-09 09:32:22 +02:00
Jaco Greeff
b0228e66a0 Update/rebuild after merge 2017-08-07 12:27:10 +02:00
Jaco Greeff
a48f321fac Merge branch 'master' into ui-2 2017-08-07 12:02:39 +02:00
GitLab Build Bot
67ccfa1da1 [ci skip] js-precompiled 20170807-093816 2017-08-07 09:43:01 +00:00
Marek Kotewicz
bdeea80032 Merge pull request #6248 from paritytech/tiny_keccak_up 
updated tiny-keccak to 1.3
 2017-08-07 10:58:36 +02:00
Jaco Greeff
0371dcb7bd Explicityly serve via /index.html 2017-08-07 10:20:27 +02:00
debris
455ecf700c updated tiny-keccak to 1.3 2017-08-07 10:06:02 +02:00
GitLab Build Bot
82f90085ee [ci skip] js-precompiled 20170807-004826 2017-08-07 00:53:11 +00:00
Pieter Vander Vennet
ee07bf29ce Fixed typo (s/seems is/seems) 2017-08-06 18:33:54 +02:00
Jaco Greeff
28e2383778 Update build 2017-08-04 16:23:54 +02:00
Jaco Greeff
b7ebfab575 Allow webpack to parse modules 2017-08-04 15:58:33 +02:00
Jaco Greeff
49a4499d52 Update webpack 2017-08-04 14:28:55 +02:00
Jaco Greeff
44a7c3d0b6 Re-add modules path 2017-08-04 13:50:51 +02:00
Jaco Greeff
1bf851ad91 Really excluse node_modules 2017-08-04 13:44:38 +02:00
Jaco Greeff
2df7a5fe51 Cheap source-maps for development 2017-08-04 13:26:56 +02:00
Jaco Greeff
0892bc90ed Update sourcemap types 2017-08-04 13:24:03 +02:00
Jaco Greeff
c088a9a660 Update dependencies 2017-08-04 11:57:05 +02:00
Jaco Greeff
e7641e38d8 Update build 2017-08-03 16:50:35 +02:00
Jaco Greeff
34f9e69bff Update file-loader 2017-08-03 13:30:17 +02:00
Jaco Greeff
e99f86a052 Update locked versions 2017-08-02 17:54:21 +02:00
Jaco Greeff
f94f69c05c Import UI components directly 2017-08-02 17:34:16 +02:00
Jaco Greeff
696089c479 Update with latest dapps 2017-08-02 17:16:26 +02:00
Jaco Greeff
45f91facf1 Don't copy source window 2017-08-02 13:56:09 +02:00
Jaco Greeff
ffd53edf89 Update build 2017-08-02 11:15:36 +02:00
Jaco Greeff
0a3a860b27 Add dapp-develop 2017-08-02 10:02:53 +02:00
Jaco Greeff
cbd32035c8 Cleanup webpack config 2017-08-02 08:44:56 +02:00
Jaco Greeff
aa95c09a88 Re-add happypack for babel builds 2017-08-01 18:11:35 +02:00
GitLab Build Bot
191f409741 [ci skip] js-precompiled 20170801-155944 2017-08-01 16:06:06 +00:00
Jaco Greeff
34a8daa629 Add addresses dapp 2017-08-01 17:42:04 +02:00
Jaco Greeff
1d96ba7dfc Update 2017-08-01 17:35:17 +02:00
Jaco Greeff
3006ab9253 Updated with working accounts 2017-08-01 16:07:35 +02:00
Jaco Greeff
67db54d765 Update webpack config for semantic 2017-08-01 15:51:03 +02:00
Jaco Greeff
dea25b194e Update build (yes, external dapps launch) 2017-08-01 15:36:32 +02:00
Jaco Greeff
9b678a58e8 Use serviceWorker from shared 2017-08-01 15:05:44 +02:00
Jaco Greeff
52828c0444 Update inject 2017-08-01 15:04:07 +02:00
Jaco Greeff
f8bf4a1522 Update build to pull from external repos 2017-08-01 14:41:13 +02:00
debris
a2c05123fd Merge branch 'master' into split 2017-08-01 14:24:47 +02:00
Jaco Greeff
c509733a30 Split all packages/* to external repos 2017-08-01 12:51:41 +02:00
Jaco Greeff
b5f4c40406 Re-add webpack-dev-server 2017-08-01 08:12:21 +02:00
Jaco Greeff
317a59d550 Build update 2017-08-01 08:02:28 +02:00
GitLab Build Bot
a6891e9f9f [ci skip] js-precompiled 20170731-215156 2017-07-31 21:57:18 +00:00
Jaco Greeff
0e7c115b73 Update build 2017-07-31 22:53:29 +02:00
debris
3c7ba5045d Merge branch 'master' into split 2017-07-31 19:40:33 +02:00
Jaco Greeff
0b71baac4a Remove embed (for now) 2017-07-31 17:56:33 +02:00
maciejhirsz
2ca4adb62c Re-enable wallets, fixed forgetting accounts 2017-07-31 17:51:23 +02:00
Jaco Greeff
7f6e2a3a35 Build with parallel-webpack 2017-07-31 17:08:51 +02:00
debris
81b57ceddb Merge branch 'master' into split 2017-07-31 16:19:59 +02:00
Jaco Greeff
fdebeaf95b Update webpack 2017-07-31 13:58:18 +02:00
Jaco Greeff
58c3948316 Remove extra options 2017-07-31 12:06:21 +02:00
Jaco Greeff
ec62d6f7e0 Additional compose removed 2017-07-31 11:30:46 +02:00
Jaco Greeff
6a51ff22d0 Cleanup unused vars 2017-07-31 11:24:54 +02:00
Jaco Greeff
6349da22ac Fix NODE_ENV=production build 2017-07-31 11:24:25 +02:00
kaikun213
9c5ef1f776 Merge pull request #6161 from paritytech/whisper-js 
Whisper js
 2017-07-31 11:23:52 +02:00
kaikun213
32fafd7a24 CI fix: Interface shh subscribe params 2017-07-31 10:58:49 +02:00
debris
eecd823d32 util reexports less std 2017-07-29 21:10:14 +02:00
Jaco Greeff
abb62d5c2a Ui 2 parity build fixes (#6182) 
* Update API reference

* Deprecation warning

* Add missing parity-reactive-ui

* Add dapps to packages/dapps

* Add parity.js dependency

* Update with js-ui with compiled bundle.js
 2017-07-28 17:56:48 +02:00
Jaco Greeff
4000ec681f Ui 2 js build fixes (#6176) 
* Update API reference

* Deprecation warning

* Add missing parity-reactive-ui

* Add dapps to packages/dapps

* Add parity.js dependency
 2017-07-28 15:37:58 +02:00
kaikun213
e70d5c52e4 Updated semantic-ui-react version (js-ui) 2017-07-28 11:51:59 +02:00
Jaco Greeff
a1b8fabd99 Ui 2 packages (#6169) 
* Ensure all internal dapps have package.json

* Update compilation rules

# Conflicts:
#	js/src/redux/providers/balancesActions.js
#	js/src/ui/Form/TypedInput/typedInput.js

* Remove SignerIcon

* Cleanup providers

* Enable request of new token from app

* Queue when no token (yet)

* Add location & token request

* Cleanup send logic

* Request token

* Request comms token

* Remove yarn.lock (not updated)

* Update version to 1.99.99 (publish prepare)

* Move jsonrpc to seperate repo

* Update jsonrpc references

* Update repo info

* Update repo info

* Additional debugging

* Update repo references

* Move ABI to js-abi repo

* Move webWorker to shared

* Fix package reference

* Worker location

* Move js-ui & js-shared components

* Update file references

* Update package repo locations

* Remove debugging info

* Cleanup debug

* Split api into own repo

* Update api local references

* Update app loading

* Update dependencies

* Allow serving of /parity-utils

* Error when EthereumProvider has not been attached

* Use inject.js

* Correct appId retrieval
 2017-07-28 10:25:34 +02:00
Jaco Greeff
5830767273 Add oo7 deps 2017-07-27 20:23:36 +02:00
GitLab Build Bot
671ed1b9db [ci skip] js-precompiled 20170727-163754 2017-07-27 16:42:35 +00:00
Jaco Greeff
53bde282bb Link dapp-develop/account 2017-07-27 18:12:42 +02:00
kaikun213
7a810def28 Shh documentation (jsonrpc interface) 2017-07-27 18:07:25 +02:00
Jaco Greeff
0bdd4a93b8 Add missing dependencies 2017-07-27 17:57:47 +02:00
Jaco Greeff
3e85bebc66 Add missing package dependencies 2017-07-27 17:53:26 +02:00
Tomasz Drwięga
9902714fb4 Don't display an overlay in case the time sync check fails. (#6164) 
* Small improvements to time estimation.

* Temporarily disable NTP time check by default.
 2017-07-27 17:36:23 +02:00
Tomasz Drwięga
0209c6e0ff Fix connecting to wildcard addresses. (#6167) 2017-07-27 17:35:05 +02:00
kaikun213
f245d66c8a shh_subscription added 2017-07-27 15:48:49 +02:00
kaikun213
31a0f5ef28 contractDevelop Debugger (Bonds) in progress 2017-07-27 13:24:23 +02:00
kaikun213
e317fcf1d8 accounts.js -> Parity-reactive-ui accountCard 2017-07-27 13:24:00 +02:00
kaikun213
cd0fbbe948 whisper-js 2017-07-27 13:16:56 +02:00
kaikun213
b13cd0d484 getFilterChanges -> getFilterMessages , subscribe & unsubscribe 
subscription is currently not working (method not found)
 2017-07-27 12:18:07 +02:00
Jaco Greeff
a068f72f08 Ui 2 pubsub components (#6152) 
* Remove Application.orig from merge

* Disable i18n extraction for development

* Retrieve blockNumber via pubsub

* Chain via pubsub

* StatusIndicator with health

* WIP

* WIP

* s/BlockStatus/BlockNumber/

* Adjust BlockNumber display

* Cleanup debug

* Fix statusbar indicator

* NetPeers component

* Add BlockTimestamp

* Export statics on observer

* Cleanup debug logs

* Update references
 2017-07-26 16:54:47 +02:00
Jaco Greeff
09e40c2f0d Upgrade webpack 2017-07-26 12:08:34 +02:00
Jaco Greeff
decc5922de Fix previous merge 2017-07-26 11:57:14 +02:00
Jaco Greeff
715fb688d3 Merge branch 'master' into ui-2 2017-07-26 11:54:54 +02:00
kaikun213
689993a592 whisper parity.js api 2017-07-25 17:58:52 +02:00
GitLab Build Bot
aa09cb266d [ci skip] js-precompiled 20170725-071056 2017-07-25 07:16:04 +00:00
Enrique Fynn
985b0fbf7f Render correctly when query input is false in a contract (#6137) 2017-07-25 08:45:14 +02:00
Nicolas Gotchac
58fec9181f Filter tokens logs from current block, not genesis (#6128) 
* Filter tokens logs from current block, not genesis

* Fix linting
 2017-07-25 08:39:41 +02:00
Jaco Greeff
de76b8a465 Merge branch 'master' into ui-2 2017-07-24 17:48:25 +02:00
kaikun213
c894f7ac1f relocate to packages (+ Tab semantic ui v.7.1) 2017-07-24 17:35:10 +02:00