Commit Graph

4 Commits

Author SHA1 Message Date
Jaco Greeff
d852e6b063 Merge branch 'master' into ui-2
# Conflicts:
#	js/src/views/Signer/components/SignRequest/signRequest.js
2017-10-17 09:55:13 +02:00
Jaco Greeff
439eb294bb Merge branch 'master' into ui-2 2017-10-09 10:23:21 +02:00
Jaco Greeff
6d8b511d25 Merge master 2017-09-07 13:32:45 +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