Jaco Greeff 2dd2004ed5 Merge branch 'master' into jg-signer-decoding ...

# Conflicts:
#	js/src/views/Signer/components/RequestFinished/requestFinished.js

2016-12-02 11:21:17 +01:00

..

3rdparty

update SMS verification (#3579)

2016-11-28 17:39:55 +01:00

abi

Close and not Cancel on deploy contract #3393

2016-11-15 12:50:20 +01:00

api

Merge pull request #3642 from ethcore/confirmation

2016-12-01 01:09:07 +00:00

contracts

implement basic badges/certifications/flair (#3665)

2016-11-30 21:39:06 +01:00

dapps

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

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

environment

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

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

jsonrpc

Typo in description

2016-11-23 10:33:04 +01:00

modals

show recovery print button on first run

2016-12-01 15:40:20 +01:00

redux

Merge pull request #3642 from ethcore/confirmation

2016-12-01 01:09:07 +00:00

ui

Merge branch 'master' into jg-signer-decoding

2016-12-02 11:21:17 +01:00

util

update SMS verification (#3579)

2016-11-28 17:39:55 +01:00

views

Merge branch 'master' into jg-signer-decoding

2016-12-02 11:21:17 +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

Working HOT RELOAD !!

2016-11-28 12:37:13 +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.js

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

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

main.js

Working HOT RELOAD !!

2016-11-28 12:37:13 +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