Jaco Greeff d888190637 Merge branch 'master' into ui-2 ...

# Conflicts:
#	js/src/modals/FirstRun/Welcome/welcome.js

2017-05-30 10:45:48 +02:00

..

3rdparty

find . -type f -not -path './.*' -exec sed -i -e "s/ethcore\.io/parity.io/g" {} \; (#5528)

2017-05-02 11:41:09 +02:00

abi

Merge branch 'master' into ui-2

2017-05-09 13:47:29 +02:00

api

Merge branch 'master' into ui-2

2017-05-24 14:09:51 +02:00

dapps

Update deps for console refactor

2017-05-24 14:45:10 +02:00

i18n

fixes typo

2017-05-29 14:29:55 -07:00

jsonrpc

Merge branch 'master' into ui-2

2017-05-24 14:09:51 +02:00

shared

Merge branch 'master' into ui-2

2017-05-24 14:09:51 +02:00

shell

Merge branch 'master' into ui-2

2017-05-30 10:45:48 +02:00

ui

Form fixes (#5664)

2017-05-22 11:00:37 +02:00

views

Merge branch 'master' into ui-2

2017-05-24 14:09:51 +02: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

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

inject.js

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

lib.rs

Fix whitespace (#4299)

2017-01-25 18:51:41 +01:00

lib.rs.in

find . -type f -not -path './.*' -exec sed -i -e "s/ethcore\.io/parity.io/g" {} \; (#5528)

2017-05-02 11:41:09 +02:00

library.etherscan.js

Use babel-runtime as opposed to babel-polyfill (#5662)

2017-05-19 16:51:15 +02:00

library.jsonrpc.js

Build embedded Parity JS properly and separatly (#4426)

2017-02-09 15:30:57 +01:00

library.parity.js

Remove additional polyfill (#5663)

2017-05-19 17:30:54 +02:00

library.shapeshift.js

Use babel-runtime as opposed to babel-polyfill (#5662)

2017-05-19 16:51:15 +02:00

parity.js

Use babel-runtime as opposed to babel-polyfill (#5662)

2017-05-19 16:51:15 +02:00

secureApi.js

Merge branch 'master' into ui-2

2017-05-24 14:09:51 +02:00

serviceWorker.js

Fix issues in Contract Development view (#5555)

2017-05-05 10:00:16 +02:00

web3.extensions.js

Ui 2 shared package (redux, mobx, utils) (#5579)

2017-05-09 12:01:44 +02:00

web3.js

Ui 2 shared package (redux, mobx, utils) (#5579)

2017-05-09 12:01:44 +02:00

webWorker.js

Ui 2 shared package (redux, mobx, utils) (#5579)

2017-05-09 12:01:44 +02:00