Tomasz Drwięga b56f12adc6 Merge branch 'master' into tx-broadcast ...

Conflicts:
	ethcore/light/src/net/context.rs
	ethcore/light/src/net/tests/mod.rs

2016-12-11 17:31:56 +01:00

..

3rdparty

Extended publishing of libraries to npm (#3786)

2016-12-11 10:13:34 +01:00

abi

Fix slice test (#3712)

2016-12-02 21:10:22 +01:00

api

Unsubscribe on true

2016-12-09 18:17:31 +01:00

contracts

Don't create new Contracts instance if already exists

2016-12-10 14:31:20 +01:00

dapps

Prevent broadcasting transactions to peer that send them.

2016-12-10 21:22:19 +01:00

environment

Add inject to "bundle everything" list (#2871)

2016-10-26 13:44:38 +02:00

jsonrpc

Make *ID names consistent with std Rust (Id)

2016-12-09 23:01:43 +01:00

modals

PR grumbles

2016-12-10 22:15:56 +01:00

redux

Notify user on transaction received (#3782)

2016-12-10 23:55:36 +01:00

ui

Merge branch 'master' into ng-ui-fixes

2016-12-11 01:26:55 +01:00

util

Notify user on transaction received (#3782)

2016-12-10 23:55:36 +01:00

views

Fix padding in App, again... (#3813)

2016-12-11 16:49:38 +01:00

dev.parity.html

Fix /parity-utils/{web3,parity}.js webpack errors (#3221)

2016-11-06 17:42:25 +01:00

dev.web3.html

Fix /parity-utils/{web3,parity}.js webpack errors (#3221)

2016-11-06 17:42:25 +01:00

error_pages.css

Initial new UI source code import (#2607)

2016-10-18 11:52:56 +02:00

index.ejs

Update loading splash to fit in with l&f (#3685)

2016-11-30 00:06:58 +01:00

index.js

Notify user on transaction received (#3782)

2016-12-10 23:55:36 +01:00

lib.rs

Removing submodule in favour of rust crate (#2756)

2016-10-22 20:07:12 +02:00

lib.rs.in

Removing submodule in favour of rust crate (#2756)

2016-10-22 20:07:12 +02:00

library.etherscan.js

Extended publishing of libraries to npm (#3786)

2016-12-11 10:13:34 +01:00

library.parity.js

Extended publishing of libraries to npm (#3786)

2016-12-11 10:13:34 +01:00

library.shapeshift.js

Extended publishing of libraries to npm (#3786)

2016-12-11 10:13:34 +01:00

main.js

'contract/write' to 'contract/develop'

2016-12-10 22:42:49 +01:00

parity.js

Use the right webpack file // Export to window.Parity #3471

2016-11-17 15:54:13 +01:00

reset.css

Initial new UI source code import (#2607)

2016-10-18 11:52:56 +02:00

secureApi.js

Smarter balance fetching (#3605)

2016-11-25 16:46:35 +01:00

web3.js

Add inject to "bundle everything" list (#2871)

2016-10-26 13:44:38 +02:00