Jaco Greeff
|
d8c3c247f8
|
Merge branch 'master' into ui-2
|
2017-07-13 10:56:12 +02:00 |
|
Jaco Greeff
|
a1a8181913
|
Merge branch 'master' into ui-2
|
2017-07-11 12:38:51 +02:00 |
|
Jaco Greeff
|
6a480ffb5b
|
Merge branch 'master' into ui-2
|
2017-06-06 09:35:22 +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
|
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
|
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 |
|