Merge branch 'master' into ng-ui-fixes
Showing
- .gitlab-ci.yml 6 additions, 6 deletions.gitlab-ci.yml
- Cargo.lock 1 addition, 1 deletionCargo.lock
- ethcore/src/miner/miner.rs 20 additions, 40 deletionsethcore/src/miner/miner.rs
- ethcore/src/miner/transaction_queue.rs 62 additions, 4 deletionsethcore/src/miner/transaction_queue.rs
- js/package.json 2 additions, 1 deletionjs/package.json
- js/src/index.js 1 addition, 1 deletionjs/src/index.js
- js/src/redux/middleware.js 4 additions, 2 deletionsjs/src/redux/middleware.js
- js/src/redux/providers/balancesActions.js 79 additions, 16 deletionsjs/src/redux/providers/balancesActions.js
- js/src/redux/providers/balancesReducer.js 1 addition, 34 deletionsjs/src/redux/providers/balancesReducer.js
- js/src/redux/providers/index.js 3 additions, 3 deletionsjs/src/redux/providers/index.js
- js/src/redux/providers/status.js 4 additions, 1 deletionjs/src/redux/providers/status.js
- js/src/redux/providers/statusReducer.js 1 addition, 0 deletionsjs/src/redux/providers/statusReducer.js
- js/src/redux/reducers.js 6 additions, 1 deletionjs/src/redux/reducers.js
- js/src/redux/store.js 2 additions, 2 deletionsjs/src/redux/store.js
- js/src/ui/Actionbar/actionbar.js 3 additions, 1 deletionjs/src/ui/Actionbar/actionbar.js
- js/src/ui/Page/page.css 1 addition, 1 deletionjs/src/ui/Page/page.css
- js/src/ui/Page/page.js 21 additions, 4 deletionsjs/src/ui/Page/page.js
- js/src/util/notifications.js 45 additions, 0 deletionsjs/src/util/notifications.js
- js/src/views/Dapp/dapp.js 10 additions, 3 deletionsjs/src/views/Dapp/dapp.js
- js/src/views/Signer/signer.js 1 addition, 2 deletionsjs/src/views/Signer/signer.js
Please register or sign in to comment