Commit Graph

8 Commits

Author SHA1 Message Date
Jaco Greeff
abb94c8bf3 Update ParityBar (container in Status) 2017-09-20 11:24:19 +02:00
Jaco Greeff
ac3d548079 Empty block 2017-09-20 09:09:05 +02:00
Jaco Greeff
7e1cb97c7e Make status always visible 2017-09-20 09:04:39 +02:00
Jaco Greeff
db9a70d008 Merge branch 'master' into ui-2
# Conflicts:
#	js/package-lock.json
#	js/src/Application/application.js
#	js/src/api/rpc/parity/parity.js
#	js/src/api/subscriptions/manager.spec.js
#	js/src/api/subscriptions/personal.spec.js
#	js/src/jsonrpc/interfaces/parity.js
#	js/src/mobx/hardwareStore.js
#	js/src/mobx/hardwareStore.spec.js
#	js/src/modals/index.js
#	js/src/redux/providers/signerMiddleware.spec.js
#	js/src/ui/SelectionList/selectionList.css
#	js/src/views/Account/account.spec.js
#	js/src/views/Accounts/accounts.spec.js
#	js/src/views/Application/Extension/store.js
#	js/src/views/Signer/components/SignRequest/signRequest.spec.js
2017-09-18 11:44:09 +02:00
Jaco Greeff
630118b5a5 Merge branch 'master' into ui-2 2017-08-22 15:12:30 +02:00
Jaco Greeff
f94f69c05c Import UI components directly 2017-08-02 17:34:16 +02:00
Jaco Greeff
f8bf4a1522 Update build to pull from external repos 2017-08-01 14:41:13 +02:00
Jaco Greeff
49fdd23d58 Ui 2 move to packages/* (#6113)
* Move secureApi to shell

* Extract isTestnet test

* Use mobx + subscriptions for status

* Re-add status indicator

* Add lerna

* Move intial packages to js/packages

* Move 3rdparty/{email,sms}-verification to correct location

* Move package.json & README to library src

* Move tests for library packages

* Move views & dapps to packages

* Move i18n to root

* Move shell to actual src (main app)

* Remove ~ references

* Change ~ to root (explicit imports)

* Finalise convert of ~

* Move views into dapps as well

* Move dapps to packages/

* Fix references

* Update css

* Update test spec locations

* Update tests

* Case fix

* Skip flakey tests

* Update enzyme

* Skip previously ignored tests

* Allow empty api for hw

* Re-add theme for embed
2017-07-21 15:46:53 +02:00