Commit Graph

685 Commits

Author SHA1 Message Date
Jaco Greeff
09e40c2f0d Upgrade webpack 2017-07-26 12:08:34 +02:00
Jaco Greeff
715fb688d3 Merge branch 'master' into ui-2 2017-07-26 11:54:54 +02:00
GitLab Build Bot
aa09cb266d [ci skip] js-precompiled 20170725-071056 2017-07-25 07:16:04 +00:00
Jaco Greeff
de76b8a465 Merge branch 'master' into ui-2 2017-07-24 17:48:25 +02:00
GitLab Build Bot
c72c020182 [ci skip] js-precompiled 20170721-201403 2017-07-21 20:18:51 +00:00
GitLab Build Bot
3605593d37 [ci skip] js-precompiled 20170721-165246 2017-07-21 16:58:58 +00: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
Jaco Greeff
7f3bb37b96 Merge branch 'master' into ui-2 2017-07-21 09:33:05 +02:00
GitLab Build Bot
797e7d98d3 [ci skip] js-precompiled 20170720-175801 2017-07-20 18:02:30 +00:00
GitLab Build Bot
10efc7e2d3 [ci skip] js-precompiled 20170719-205509 2017-07-19 20:59:31 +00:00
GitLab Build Bot
e5042d0d38 [ci skip] js-precompiled 20170719-084508 2017-07-19 08:49:29 +00:00
Jaco Greeff
49a55886d3 Bump package.json for master 1.8 (#6074) 2017-07-19 10:13:43 +02:00
Jaco Greeff
36f94fde05 Ui 2 package upgrades (#6076)
* Upgrade to React 15.6

* Import PropTypes from prop-types

* Update package.json

* UI version in built version

* Cleanup /api/health status failures

* Check reponse.ok

* Add icons to view dapps

* Adjust layout for dapps

* Slightly darker balance background

* Adjust shadows
2017-07-17 18:37:33 +02:00
Jaco Greeff
aaff34364d Merge branch 'master' into ui-2 2017-07-17 11:49:03 +02:00
GitLab Build Bot
30f2057bdf [ci skip] js-precompiled 20170716-095403 2017-07-16 10:02:50 +00:00
Jaco Greeff
a4fa6a3ac7 Add CSP for worker-src (#6059)
* Specify worker-src seperately, add blob:

* Upgrade react-qr-scan to latest version
2017-07-14 18:50:19 +02:00
GitLab Build Bot
3fb8a85f83 [ci skip] js-precompiled 20170713-162224 2017-07-13 16:27:01 +00:00
Jaco Greeff
d8c3c247f8 Merge branch 'master' into ui-2 2017-07-13 10:56:12 +02:00
GitLab Build Bot
45d44bedef [ci skip] js-precompiled 20170711-113031 2017-07-11 11:36:24 +00:00
Jaco Greeff
3d24ae0981 Merge branch 'master' into ui-2 2017-07-10 17:36:55 +02:00
Jaco Greeff
204fe44b29 Add new md tnc (#5937)
* Add new md tnc

* Skip markdown import in test
2017-07-10 13:23:59 +02:00
Jaco Greeff
84f11278ba Merge branch 'master' into ui-2 2017-07-10 11:33:07 +02:00
GitLab Build Bot
df0ef6618d [ci skip] js-precompiled 20170706-164115 2017-07-06 16:47:59 +00:00
GitLab Build Bot
33f1d2af1e [ci skip] js-precompiled 20170706-081457 2017-07-06 08:21:42 +00:00
Jaco Greeff
1896c2720b Use qrcode-generator directly from package 2017-07-03 09:48:17 +02:00
Jaco Greeff
8798ed4499 Merge branch 'master' into ui-2 2017-06-28 14:27:25 +02:00
GitLab Build Bot
6b16fe3f14 [ci skip] js-precompiled 20170627-213135 2017-06-27 21:35:37 +00:00
GitLab Build Bot
cf772ef555 [ci skip] js-precompiled 20170623-115250 2017-06-23 11:56:57 +00:00
Jaco Greeff
72f3576c78 Merge branch 'master' into ui-2 2017-06-23 11:48:12 +02:00
GitLab Build Bot
91f1c84048 [ci skip] js-precompiled 20170622-115440 2017-06-22 11:58:47 +00:00
Jaco Greeff
e1cd60987b Adjust keyethereum/secp256 aliasses (#5903)
* Alias keyethereum to empty for libraries/npm

* Alias long-standing vertx warning to empty

* Alias secp256k1

* remove package-lock.json (not active atm)
2017-06-22 13:29:12 +02:00
GitLab Build Bot
df51cad7e2 [ci skip] js-precompiled 20170622-101935 2017-06-22 10:23:53 +00:00
Jaco Greeff
97c67bc259 Merge branch 'master' into ui-2 2017-06-21 11:15:29 +02:00
GitLab Build Bot
367a5c998d [ci skip] js-precompiled 20170619-145413 2017-06-19 14:58:49 +00:00
Jaco Greeff
4dd26c0d7c Merge branch 'master' into ui-2 2017-06-19 10:39:05 +02:00
GitLab Build Bot
42dcdde4e8 [ci skip] js-precompiled 20170616-172546 2017-06-16 17:30:14 +00:00
Jaco Greeff
121b742482 Merge branch 'master' into ui-2
# Conflicts:
#	Cargo.lock
#	ethcore/src/evm/instructions.rs
#	js/package.json
#	js/src/modals/CreateAccount/AccountDetails/accountDetails.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/views/Accounts/accounts.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-14 10:16:42 +02:00
GitLab Build Bot
8aa2ed175e [ci skip] js-precompiled 20170613-162317 2017-06-13 16:31:45 +00:00
Jaco Greeff
8f5a863468 Package updates 2017-06-13 13:23:16 +02:00
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
GitLab Build Bot
15f19fc026 [ci skip] js-precompiled 20170612-222804 2017-06-12 22:32:43 +00:00
GitLab Build Bot
8eda5fcbbf [ci skip] js-precompiled 20170612-164938 2017-06-12 16:53:40 +00:00
Maciej Hirsz
b2a42f03eb Public node WASM, performance and fixes (#5734) 2017-06-12 15:57:16 +02:00
Jaco Greeff
6a480ffb5b Merge branch 'master' into ui-2 2017-06-06 09:35:22 +02:00
GitLab Build Bot
754abdb861 [ci skip] js-precompiled 20170604-110515 2017-06-04 11:09:12 +00:00
GitLab Build Bot
e89d49d958 [ci skip] js-precompiled 20170603-131456 2017-06-03 13:18:47 +00:00
Jaco Greeff
d888190637 Merge branch 'master' into ui-2
# Conflicts:
#	js/src/modals/FirstRun/Welcome/welcome.js
2017-05-30 10:45:48 +02:00
GitLab Build Bot
de4c9507e6 [ci skip] js-precompiled 20170529-225538 2017-05-29 22:59:31 +00:00
Jaco Greeff
37c3f51f6e Update deps for console refactor 2017-05-24 14:45:10 +02:00
Jaco Greeff
45c6cc6ac0 Merge branch 'master' into ui-2 2017-05-24 14:09:51 +02:00