Jaco Greeff
|
8453dda7ef
|
Merge branch 'master' into ui-2
# Conflicts:
# js/package-lock.json
# js/package.json
# js/src/api/api.js
# js/src/api/local/accounts/accounts.js
# js/src/api/local/localAccountsMiddleware.js
# js/src/api/local/transactions.js
# js/src/api/pubsub/signer/signer.js
# js/src/api/subscriptions/signer.js
# js/src/api/transport/jsonRpcBase.js
# js/src/api/transport/middleware.js
# js/src/api/util/format.js
# js/src/api/util/format.spec.js
# js/src/contracts/abi/index.js
# js/src/contracts/badgereg.js
# js/src/dapps/tokenreg/Application/application.css
# js/src/dapps/tokenreg/Application/application.js
# js/src/modals/CreateWallet/WalletDetails/walletDetails.js
# js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js
# js/src/modals/CreateWallet/createWalletStore.js
# js/src/modals/DeployContract/ParametersStep/parametersStep.js
# js/src/modals/DeployContract/deployContract.js
# js/src/modals/ExecuteContract/DetailsStep/detailsStep.js
# js/src/modals/WalletSettings/walletSettings.js
# js/src/redux/providers/certifications/actions.js
# js/src/redux/providers/certifications/middleware.js
# js/src/redux/providers/certifications/reducer.js
# js/src/redux/providers/requestsActions.js
# js/src/redux/providers/tokensActions.js
# js/src/ui/AccountCard/accountCard.css
# js/src/ui/Balance/balance.js
# js/src/ui/Balance/balance.spec.js
# js/src/ui/DappCard/dappCard.js
# js/src/ui/Form/AddressSelect/addressSelect.js
# js/src/ui/Form/AddressSelect/addressSelectStore.js
# js/src/ui/Form/InputAddressSelect/inputAddressSelect.js
# js/src/ui/Form/TypedInput/typedInput.js
# js/src/ui/IdentityIcon/identityIcon.js
# js/src/ui/MethodDecoding/tokenValue.js
# js/src/util/tx.js
# js/src/util/wallets.js
# js/src/util/wallets/consensys-wallet.js
# js/src/util/wallets/foundation-wallet.js
# js/src/views/Account/account.js
# js/src/views/Accounts/List/list.js
# js/src/views/Contract/Queries/inputQuery.js
# js/src/views/Contract/Queries/queries.js
# js/src/views/Contract/contract.js
# js/src/views/Signer/components/SignRequest/signRequest.css
# js/src/views/Signer/components/SignRequest/signRequest.js
# js/src/views/Signer/components/SignRequest/signRequest.spec.js
|
2017-10-16 12:41:41 +02:00 |
|
GitLab Build Bot
|
ba6594e30a
|
[ci skip] js-precompiled 20171013-002644
|
2017-10-13 00:31:48 +00:00 |
|
GitLab Build Bot
|
df39f5e7fc
|
[ci skip] js-precompiled 20171012-210804
|
2017-10-12 21:19:11 +00:00 |
|
GitLab Build Bot
|
7472bc3570
|
[ci skip] js-precompiled 20171012-181858
|
2017-10-12 18:24:04 +00:00 |
|
GitLab Build Bot
|
1d2319207a
|
[ci skip] js-precompiled 20171011-214450
|
2017-10-11 21:49:51 +00:00 |
|
GitLab Build Bot
|
0b666f605f
|
[ci skip] js-precompiled 20171011-192355
|
2017-10-11 19:29:28 +00:00 |
|
GitLab Build Bot
|
df19b8df69
|
[ci skip] js-precompiled 20171011-183646
|
2017-10-11 18:43:16 +00:00 |
|
GitLab Build Bot
|
0bb845a05c
|
[ci skip] js-precompiled 20171011-121439
|
2017-10-11 12:19:40 +00:00 |
|
GitLab Build Bot
|
dbd1976fc1
|
[ci skip] js-precompiled 20171009-121402
|
2017-10-09 12:19:46 +00:00 |
|
Jaco Greeff
|
439eb294bb
|
Merge branch 'master' into ui-2
|
2017-10-09 10:23:21 +02:00 |
|
GitLab Build Bot
|
ca6d5660c1
|
[ci skip] js-precompiled 20171008-172308
|
2017-10-08 17:28:31 +00:00 |
|
GitLab Build Bot
|
3f520b864b
|
[ci skip] js-precompiled 20171005-120001
|
2017-10-05 12:04:49 +00:00 |
|
GitLab Build Bot
|
c7ea25227a
|
[ci skip] js-precompiled 20171005-114154
|
2017-10-05 11:46:58 +00:00 |
|
Jaco Greeff
|
55b0b09d6a
|
Merge branch 'master' into ui-2
|
2017-10-04 12:31:09 +02:00 |
|
GitLab Build Bot
|
931a7a2210
|
[ci skip] js-precompiled 20171002-143145
|
2017-10-02 14:37:01 +00:00 |
|
Jaco Greeff
|
39b5e5b98a
|
Signer-plugin-based approach (plugins available)
|
2017-09-29 15:04:57 +02:00 |
|
GitLab Build Bot
|
cc759530fe
|
[ci skip] js-precompiled 20170926-133548
|
2017-09-26 13:40:38 +00:00 |
|
GitLab Build Bot
|
6840df4c09
|
[ci skip] js-precompiled 20170926-093714
|
2017-09-26 09:43:21 +00:00 |
|
Jaco Greeff
|
9daa884699
|
Update dependencies
|
2017-09-26 09:07:22 +02:00 |
|
GitLab Build Bot
|
f576926fa2
|
[ci skip] js-precompiled 20170925-101032
|
2017-09-25 10:15:30 +00:00 |
|
Jaco Greeff
|
ab902bfb66
|
Update packages
|
2017-09-22 14:03:26 +02:00 |
|
Jaco Greeff
|
f9b7be7576
|
Merge branch 'master' into ui-2
|
2017-09-20 12:14:46 +02:00 |
|
GitLab Build Bot
|
65ca9afce2
|
[ci skip] js-precompiled 20170920-093438
|
2017-09-20 09:39:32 +00:00 |
|
Jaco Greeff
|
51674f2cc4
|
Update dependencies
|
2017-09-19 20:48:05 +02:00 |
|
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 |
|