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
|
6a480ffb5b
|
Merge branch 'master' into ui-2
|
2017-06-06 09:35:22 +02:00 |
|
Jaco Greeff
|
45c6cc6ac0
|
Merge branch 'master' into ui-2
|
2017-05-24 14:09:51 +02:00 |
|
Jaco Greeff
|
368e3d1f51
|
Merge branch 'master' into ui-2
|
2017-05-22 11:50:15 +02:00 |
|
Jaco Greeff
|
f7ea667140
|
Merge branch 'master' into ui-2
|
2017-05-16 17:03:17 +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
|
31be9d25f3
|
Merge branch 'master' into ui-2
# Conflicts:
#
js/src/shell/Signer/components/TransactionPendingFormConfirm/transaction
PendingFormConfirm.js
# js/src/ui/Container/Title/title.js
# js/src/views/Application/Snackbar/snackbar.js
# js/src/views/Status/Peers/peers.js
|
2017-05-16 13:30:19 +02:00 |
|
Jaco Greeff
|
78b6de55b3
|
Ui 2 Select component conversion (#5598)
* Remove mui/Paper from PasswordManager
* Aliasses for @parity packages
* Remove mui/Card from contract queries
* Toggle component replacement (mui-only)
* Semantic-ui toggle component
* LabelComponent warpper for Toggle
* Convert Selectors
* Test fixes
* Fix case
|
2017-05-11 14:02:27 +02:00 |
|
Jaco Greeff
|
7c78dff386
|
Updates after merge (last remaining middleware nigglies)
|
2017-05-10 17:50:23 +02:00 |
|
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
|
b9c4e5b36c
|
Ui 2 depends & fixes (#5590)
* File paths
* Align balance overlays & sizes
* Copy works as expected
* Re-arrange imports
* Icon props
* Move packages to their original dependencies
* Dependencies to packages
* Update test babel overrides
|
2017-05-10 13:23:14 +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 |
|