Jaco Greeff
7bbd48a2bd
Merge branch 'master' into ui-2
...
# Conflicts:
# js/package.json
# js/src/api/local/ethkey/worker.js
# js/src/modals/FirstRun/TnC/tnc.js
# js/src/modals/FirstRun/Welcome/welcome.js
# js/src/ui/Form/Input/input.js
# js/src/ui/VaultCard/Accounts/accounts.spec.js
# js/src/views/Accounts/accounts.js
# js/src/views/Application/TabBar/tabBar.js
# js/src/views/Settings/Views/defaults.js
# js/src/views/Settings/Views/views.js
# js/webpack/app.js
# js/webpack/libraries.js
2017-06-13 11:02:38 +02:00
Jaco Greeff
c1599a3d85
Merge branch 'master' into ui-2
...
# Conflicts:
# js/src/ui/Balance/balance.js
2017-06-08 11:51:46 +02:00
Jaco Greeff
602115d81e
Merge branch 'master' into ui-2
...
# Conflicts:
# js/src/shell/Connection/connection.js
# js/src/ui/Icons/index.js
# js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js
2017-05-19 14:55:13 +02:00
Jaco Greeff
673cde3c0b
Ui 2 cleanups (unused components, shared assets) ( #5636 )
...
* Remove unused components
* Move to dapp/index.js
* Move assets to @parity/shared
2017-05-16 16:01:11 +02:00
Jaco Greeff
5da7c32bdf
Ui 2 radios & imports ( #5609 )
...
* Remove mui IconButton
* Token type selection
* Convert RadioButtons
* RadioButtons consistency
* Import @parity/ui
* Import @parity/ui
* Explicit name for RadioButtons
* Convert to semantic Radio
2017-05-12 12:06:16 +02:00
Jaco Greeff
4c28ef40b7
Ui 2 shared package (redux, mobx, utils) ( #5579 )
...
* Create @parity/shared
* Move ~/util to shared/util
* Move ~/contracts to shared/contracts
* Move ~/config to shared/config
* Move ~/environment to shared/environment
* Updated paths
* Move ~/mobx to shared/mobx
* Move ~/redux to shared/redux
* Add shared to test babel compile
2017-05-09 12:01:44 +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
