Commit Graph

840 Commits

Author SHA1 Message Date
Jaco Greeff
afec8358d3 Update dependencies 2017-09-18 10:56:09 +02:00
Jaco Greeff
1e1137a6f7 Update dependencies 2017-09-18 10:35:00 +02:00
Jaco Greeff
935d1476e9 Update test execution 2017-09-18 10:15:36 +02:00
Jaco Greeff
4a184dbbe6 Merge branch 'master' into ui-2 2017-09-13 15:51:02 +02:00
Jaco Greeff
6e2e122288 Update with recent @parity/ui 2017-09-12 13:32:21 +02:00
Jaco Greeff
2bcdb07b62 Run electron (dev) from build directory 2017-09-11 10:37:09 +02:00
Jaco Greeff
ceb1dd8d83 Electron app should not display extension install message 2017-09-11 10:00:51 +02:00
GitLab Build Bot
dcea17f8c6 [ci skip] js-precompiled 20170910-175532 2017-09-10 18:00:22 +00:00
Jaco Greeff
6d8b511d25 Merge master 2017-09-07 13:32:45 +02:00
GitLab Build Bot
e5bbabb2ba [ci skip] js-precompiled 20170905-115347 2017-09-05 11:58:41 +00:00
GitLab Build Bot
6b8c9cac23 [ci skip] js-precompiled 20170901-161931 2017-09-01 16:33:31 +00:00
Jaco Greeff
be56a06790 Basic electron interface 2017-08-30 11:59:38 +02:00
Jaco Greeff
b1428c2b56 Update packages 2017-08-30 09:29:28 +02:00
Jaco Greeff
35202e28c2 Update webpack 2017-08-29 15:11:09 +02:00
Jaco Greeff
7438cfc47d Merge branch 'master' into ui-2 2017-08-25 12:14:56 +02:00
GitLab Build Bot
b6024adf85 [ci skip] js-precompiled 20170825-090654 2017-08-25 09:11:39 +00:00
Jaco Greeff
d97f6b3812 Add @parity/jsonrpc explicitly 2017-08-24 13:07:22 +02:00
Jaco Greeff
630118b5a5 Merge branch 'master' into ui-2 2017-08-22 15:12:30 +02:00
GitLab Build Bot
f3e7d7c725 [ci skip] js-precompiled 20170821-094253 2017-08-21 09:48:30 +00:00
GitLab Build Bot
2c0a1b652c [ci skip] js-precompiled 20170818-143526 2017-08-18 14:40:04 +00:00
GitLab Build Bot
d115006597 [ci skip] js-precompiled 20170813-184308 2017-08-13 18:48:32 +00:00
GitLab Build Bot
ecd880c8e7 [ci skip] js-precompiled 20170810-101054 2017-08-10 10:16:01 +00:00
GitLab Build Bot
b21932687a [ci skip] js-precompiled 20170809-182421 2017-08-09 18:29:28 +00:00
Jaco Greeff
a11e9acd12 Merge branch 'master' into ui-2 2017-08-09 09:32:22 +02:00
Jaco Greeff
b0228e66a0 Update/rebuild after merge 2017-08-07 12:27:10 +02:00
Jaco Greeff
a48f321fac Merge branch 'master' into ui-2 2017-08-07 12:02:39 +02:00
GitLab Build Bot
67ccfa1da1 [ci skip] js-precompiled 20170807-093816 2017-08-07 09:43:01 +00:00
GitLab Build Bot
82f90085ee [ci skip] js-precompiled 20170807-004826 2017-08-07 00:53:11 +00:00
Jaco Greeff
28e2383778 Update build 2017-08-04 16:23:54 +02:00
Jaco Greeff
c088a9a660 Update dependencies 2017-08-04 11:57:05 +02:00
Jaco Greeff
696089c479 Update with latest dapps 2017-08-02 17:16:26 +02:00
Jaco Greeff
45f91facf1 Don't copy source window 2017-08-02 13:56:09 +02:00
Jaco Greeff
ffd53edf89 Update build 2017-08-02 11:15:36 +02:00
Jaco Greeff
0a3a860b27 Add dapp-develop 2017-08-02 10:02:53 +02:00
GitLab Build Bot
191f409741 [ci skip] js-precompiled 20170801-155944 2017-08-01 16:06:06 +00:00
Jaco Greeff
34a8daa629 Add addresses dapp 2017-08-01 17:42:04 +02:00
Jaco Greeff
1d96ba7dfc Update 2017-08-01 17:35:17 +02:00
Jaco Greeff
3006ab9253 Updated with working accounts 2017-08-01 16:07:35 +02:00
Jaco Greeff
dea25b194e Update build (yes, external dapps launch) 2017-08-01 15:36:32 +02:00
Jaco Greeff
52828c0444 Update inject 2017-08-01 15:04:07 +02:00
Jaco Greeff
f8bf4a1522 Update build to pull from external repos 2017-08-01 14:41:13 +02:00
Jaco Greeff
b5f4c40406 Re-add webpack-dev-server 2017-08-01 08:12:21 +02:00
Jaco Greeff
317a59d550 Build update 2017-08-01 08:02:28 +02:00
GitLab Build Bot
a6891e9f9f [ci skip] js-precompiled 20170731-215156 2017-07-31 21:57:18 +00:00
Jaco Greeff
0e7c115b73 Update build 2017-07-31 22:53:29 +02:00
Jaco Greeff
0b71baac4a Remove embed (for now) 2017-07-31 17:56:33 +02:00
Jaco Greeff
7f6e2a3a35 Build with parallel-webpack 2017-07-31 17:08:51 +02:00
Jaco Greeff
fdebeaf95b Update webpack 2017-07-31 13:58:18 +02:00
Jaco Greeff
6349da22ac Fix NODE_ENV=production build 2017-07-31 11:24:25 +02:00
Jaco Greeff
abb62d5c2a Ui 2 parity build fixes (#6182)
* Update API reference

* Deprecation warning

* Add missing parity-reactive-ui

* Add dapps to packages/dapps

* Add parity.js dependency

* Update with js-ui with compiled bundle.js
2017-07-28 17:56:48 +02:00
Jaco Greeff
4000ec681f Ui 2 js build fixes (#6176)
* Update API reference

* Deprecation warning

* Add missing parity-reactive-ui

* Add dapps to packages/dapps

* Add parity.js dependency
2017-07-28 15:37:58 +02:00
kaikun213
e70d5c52e4 Updated semantic-ui-react version (js-ui) 2017-07-28 11:51:59 +02:00
Jaco Greeff
a1b8fabd99 Ui 2 packages (#6169)
* Ensure all internal dapps have package.json

* Update compilation rules

# Conflicts:
#	js/src/redux/providers/balancesActions.js
#	js/src/ui/Form/TypedInput/typedInput.js

* Remove SignerIcon

* Cleanup providers

* Enable request of new token from app

* Queue when no token (yet)

* Add location & token request

* Cleanup send logic

* Request token

* Request comms token

* Remove yarn.lock (not updated)

* Update version to 1.99.99 (publish prepare)

* Move jsonrpc to seperate repo

* Update jsonrpc references

* Update repo info

* Update repo info

* Additional debugging

* Update repo references

* Move ABI to js-abi repo

* Move webWorker to shared

* Fix package reference

* Worker location

* Move js-ui & js-shared components

* Update file references

* Update package repo locations

* Remove debugging info

* Cleanup debug

* Split api into own repo

* Update api local references

* Update app loading

* Update dependencies

* Allow serving of /parity-utils

* Error when EthereumProvider has not been attached

* Use inject.js

* Correct appId retrieval
2017-07-28 10:25:34 +02:00
GitLab Build Bot
671ed1b9db [ci skip] js-precompiled 20170727-163754 2017-07-27 16:42:35 +00:00
Jaco Greeff
53bde282bb Link dapp-develop/account 2017-07-27 18:12:42 +02:00
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
GitLab Build Bot
bbbdd02a00 [ci skip] js-precompiled 20170524-104640 2017-05-24 10:50:29 +00:00
GitLab Build Bot
6b6555852c [ci skip] js-precompiled 20170523-130314 2017-05-23 13:07:10 +00:00
Jaco Greeff
368e3d1f51 Merge branch 'master' into ui-2 2017-05-22 11:50:15 +02:00
GitLab Build Bot
99a1636c62 [ci skip] js-precompiled 20170519-161414 2017-05-19 16:18:02 +00:00
GitLab Build Bot
ae0841598f [ci skip] js-precompiled 20170519-154153 2017-05-19 15:45:53 +00:00
Nicolas Gotchac
84cab18120 Update the Console dapp (#5602)
* Init Console Dapp structure

* Watches and status

* First REPL and display

* Attaching console

* Selectable autocomplete

* working console // Display objects nicely

* Multilines in Console Dapps

* Better UI

* Eval on window object

* Save console gistory

* Adding views

* Add settings to the console dapp

* Add / remove Watches

* Add Snippets Cmponent

* Semi Working Snippets

* Working Snippets

* Adding CodeMirror features

* Removing old Console

* Add Static folder
2017-05-19 17:07:59 +02:00
Jaco Greeff
e7abd3510a Use babel-runtime as opposed to babel-polyfill (#5662)
* Add babel-runtime

* Add babel-transform-runtime plugin

* Remove babel-polyfill imports

* Remove babel-polyfill package

* Transform exports to work around webpack 2.2
2017-05-19 16:51:15 +02:00
Jaco Greeff
602115d81e Merge branch 'master' into ui-2
# Conflicts:
#	js/src/shell/Connection/connection.js
#	js/src/ui/Icons/index.js
#	js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js
2017-05-19 14:55:13 +02:00
GitLab Build Bot
23a4a22869 [ci skip] js-precompiled 20170518-113124 2017-05-18 11:35:53 +00:00
GitLab Build Bot
95d9706fe1 [ci skip] js-precompiled 20170518-101141 2017-05-18 10:15:33 +00:00
Jaco Greeff
e0927f099e Merge branch 'master' into ui-2 2017-05-18 11:26:09 +02:00
Jaco Greeff
4b5a1d01ce Merge remote-tracking branch 'origin/ui-2' into ui-2 2017-05-18 10:07:35 +02:00
Craig O'Connor
78461d8a74 flow (#5606)
* FLOW

* ui-2-one more fix
2017-05-18 10:06:59 +02:00
GitLab Build Bot
2ec51fc0ad [ci skip] js-precompiled 20170517-144631 2017-05-17 14:50:24 +00:00
Jaco Greeff
ab86f9e696 Merge branch 'master' into ui-2 2017-05-17 14:20:07 +02:00
GitLab Build Bot
7626ddc9c3 [ci skip] js-precompiled 20170516-145955 2017-05-16 15:03:40 +00:00
Jaco Greeff
f7ea667140 Merge branch 'master' into ui-2 2017-05-16 17:03:17 +02:00
GitLab Build Bot
48ddd8b312 [ci skip] js-precompiled 20170516-115901 2017-05-16 12:04:56 +00:00
Jaco Greeff
9bc82543ee Merge branch 'master' into ui-2 2017-05-12 17:19:50 +02:00
GitLab Build Bot
83a13ee0e6 [ci skip] js-precompiled 20170512-102851 2017-05-12 10:32:43 +00:00
Craig O'Connor
662a8317a5 run-clean (#5607) 2017-05-12 12:10:24 +02:00
Jaco Greeff
b1a390983b Merge branch 'master' into ui-2 2017-05-11 09:57:39 +02:00
GitLab Build Bot
2b30e0b5e0 [ci skip] js-precompiled 20170510-155435 2017-05-10 15:58:15 +00: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
GitLab Build Bot
710339d0a8 [ci skip] js-precompiled 20170510-143939 2017-05-10 14:43:30 +00:00
GitLab Build Bot
3e86b2e666 [ci skip] js-precompiled 20170510-134918 2017-05-10 13:52:55 +00:00
GitLab Build Bot
c58c253cbf [ci skip] js-precompiled 20170510-131400 2017-05-10 13:17:46 +00: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
9f91c0490c Merge branch 'master' into ui-2 2017-05-09 14:10:24 +02:00
GitLab Build Bot
518b6e647b [ci skip] js-precompiled 20170509-115458 2017-05-09 11:58:48 +00:00
Jaco Greeff
40744d1bd2 Merge branch 'master' into ui-2 2017-05-09 13:47:29 +02:00
GitLab Build Bot
9947493977 [ci skip] js-precompiled 20170509-112134 2017-05-09 11:25:44 +00: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
Jaco Greeff
073564b508 Merge branch 'master' into ui-2 2017-05-09 10:11:13 +02:00
Jaco Greeff
d91fae4e54 UI 2 tests & webpack dapp build updates/fixes (#5561)
* Tests are executing again

* Fix tests

* Add missing contextTypes

* IdentityIcon without Connect()

* Update ~/ui tests

* Update spec locations

* Filename case

* Fix playground dapp build
2017-05-05 15:14:05 +02:00
GitLab Build Bot
0d8920347a [ci skip] js-precompiled 20170505-084643 2017-05-05 08:50:23 +00:00
GitLab Build Bot
4a2ad9fc2a [ci skip] js-precompiled 20170505-083410 2017-05-05 08:38:11 +00:00
Jaco Greeff
9b025cf8c1 Merge branch 'master' into ui-2
# Conflicts:
#	js/src/views/ContractDevelop/store.js
2017-05-05 10:08:10 +02:00
GitLab Build Bot
f5bfb208e7 [ci skip] js-precompiled 20170504-161940 2017-05-04 16:23:12 +00:00
Jaco Greeff
c7949e2fc3 Merge branch 'master' into ui-2 2017-05-04 10:39:46 +02:00
GitLab Build Bot
160183b6e8 [ci skip] js-precompiled 20170503-123121 2017-05-03 12:34:57 +00:00
Jaco Greeff
a1502738f1 Merge branch 'master' into ui-2 2017-05-03 10:40:53 +02:00
GitLab Build Bot
b17c6ec054 [ci skip] js-precompiled 20170502-161232 2017-05-02 16:16:27 +00:00
Jaco Greeff
b57e8f6f0d Merge branch 'master' into ui-2 2017-05-02 13:40:05 +02:00
GitLab Build Bot
b0e4c913c0 [ci skip] js-precompiled 20170502-103844 2017-05-02 10:42:38 +00:00