Jaco Greeff
|
566b6a1967
|
Merge branch 'master' into ui-2
# Conflicts:
# js/src/shared/redux/middleware.js
# js/src/shared/redux/providers/registry/middleware.js
# js/src/shell/Application/application.js
# js/src/ui/Actionbar/actionbar.js
# js/src/ui/Button/button.js
# js/src/ui/Form/AddressSelect/addressSelect.js
# js/src/ui/Form/Input/input.js
# js/src/ui/MethodDecoding/methodDecoding.js
|
2017-05-10 17:29:07 +02:00 |
|
Jaco Greeff
|
9b025cf8c1
|
Merge branch 'master' into ui-2
# Conflicts:
# js/src/views/ContractDevelop/store.js
|
2017-05-05 10:08:10 +02:00 |
|
Jaco Greeff
|
37dd488579
|
UI 2 component & modal splits (#5525)
* Remove mui from Actionbar
* Add semantic-ui to vendor.js
* Stateless components
* Multi-item spacing
* Stateless components
* Stateless components
* Default font
* Context passing
* Move Vault modals into Vault dapp
* Move modals to their respective views
|
2017-04-28 11:21:05 +02:00 |
|
Jaco Greeff
|
34d68ccb73
|
CircularProgress -> Loading
|
2017-04-26 16:08:30 +02:00 |
|
Jaco Greeff
|
0c70cee503
|
Contracts & Contract develop as dapp
|
2017-04-24 13:21:22 +02:00 |
|