grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,157 Commits 1 Branch 329 Tags 59 MiB
94df97a5ae
Commit Graph

1977 Commits

Author SHA1 Message Date
Jaco Greeff
0e7c115b73 Update build 2017-07-31 22:53:29 +02:00
debris
3c7ba5045d Merge branch 'master' into split 2017-07-31 19:40:33 +02:00
Jaco Greeff
0b71baac4a Remove embed (for now) 2017-07-31 17:56:33 +02:00
maciejhirsz
2ca4adb62c Re-enable wallets, fixed forgetting accounts 2017-07-31 17:51:23 +02:00
Jaco Greeff
7f6e2a3a35 Build with parallel-webpack 2017-07-31 17:08:51 +02:00
debris
81b57ceddb Merge branch 'master' into split 2017-07-31 16:19:59 +02:00
Jaco Greeff
fdebeaf95b Update webpack 2017-07-31 13:58:18 +02:00
Jaco Greeff
58c3948316 Remove extra options 2017-07-31 12:06:21 +02:00
Jaco Greeff
ec62d6f7e0 Additional compose removed 2017-07-31 11:30:46 +02:00
Jaco Greeff
6a51ff22d0 Cleanup unused vars 2017-07-31 11:24:54 +02:00
Jaco Greeff
6349da22ac Fix NODE_ENV=production build 2017-07-31 11:24:25 +02:00
kaikun213
9c5ef1f776 Merge pull request #6161 from paritytech/whisper-js 
Whisper js
 2017-07-31 11:23:52 +02:00
kaikun213
32fafd7a24 CI fix: Interface shh subscribe params 2017-07-31 10:58:49 +02:00
debris
eecd823d32 util reexports less std 2017-07-29 21:10:14 +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
Jaco Greeff
5830767273 Add oo7 deps 2017-07-27 20:23:36 +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
kaikun213
7a810def28 Shh documentation (jsonrpc interface) 2017-07-27 18:07:25 +02:00
Jaco Greeff
0bdd4a93b8 Add missing dependencies 2017-07-27 17:57:47 +02:00
Jaco Greeff
3e85bebc66 Add missing package dependencies 2017-07-27 17:53:26 +02:00
Tomasz Drwięga
9902714fb4 Don't display an overlay in case the time sync check fails. (#6164) 
* Small improvements to time estimation.

* Temporarily disable NTP time check by default.
 2017-07-27 17:36:23 +02:00
Tomasz Drwięga
0209c6e0ff Fix connecting to wildcard addresses. (#6167) 2017-07-27 17:35:05 +02:00
kaikun213
f245d66c8a shh_subscription added 2017-07-27 15:48:49 +02:00
kaikun213
31a0f5ef28 contractDevelop Debugger (Bonds) in progress 2017-07-27 13:24:23 +02:00
kaikun213
e317fcf1d8 accounts.js -> Parity-reactive-ui accountCard 2017-07-27 13:24:00 +02:00
kaikun213
cd0fbbe948 whisper-js 2017-07-27 13:16:56 +02:00
kaikun213
b13cd0d484 getFilterChanges -> getFilterMessages , subscribe & unsubscribe 
subscription is currently not working (method not found)
 2017-07-27 12:18:07 +02:00
Jaco Greeff
a068f72f08 Ui 2 pubsub components (#6152) 
* Remove Application.orig from merge

* Disable i18n extraction for development

* Retrieve blockNumber via pubsub

* Chain via pubsub

* StatusIndicator with health

* WIP

* WIP

* s/BlockStatus/BlockNumber/

* Adjust BlockNumber display

* Cleanup debug

* Fix statusbar indicator

* NetPeers component

* Add BlockTimestamp

* Export statics on observer

* Cleanup debug logs

* Update references
 2017-07-26 16:54:47 +02:00
Jaco Greeff
09e40c2f0d Upgrade webpack 2017-07-26 12:08:34 +02:00
Jaco Greeff
decc5922de Fix previous merge 2017-07-26 11:57:14 +02:00
Jaco Greeff
715fb688d3 Merge branch 'master' into ui-2 2017-07-26 11:54:54 +02:00
kaikun213
689993a592 whisper parity.js api 2017-07-25 17:58:52 +02:00
GitLab Build Bot
aa09cb266d [ci skip] js-precompiled 20170725-071056 2017-07-25 07:16:04 +00:00
Enrique Fynn
985b0fbf7f Render correctly when query input is false in a contract (#6137) 2017-07-25 08:45:14 +02:00
Nicolas Gotchac
58fec9181f Filter tokens logs from current block, not genesis (#6128) 
* Filter tokens logs from current block, not genesis

* Fix linting
 2017-07-25 08:39:41 +02:00
Jaco Greeff
de76b8a465 Merge branch 'master' into ui-2 2017-07-24 17:48:25 +02:00
kaikun213
c894f7ac1f relocate to packages (+ Tab semantic ui v.7.1) 2017-07-24 17:35:10 +02:00
kaikun213
381ed505a0 postMessage and store (merge..) 2017-07-24 16:21:54 +02:00
kaikun213
a562f2c434 Merge remote-tracking branch 'origin/ui-2' into ui-2 2017-07-24 16:14:02 +02:00
kaikun213
13b96ae7c8 Pubsub for postMessage Provider (UI2) 
Proper method-name displaying on request approval is missing
 2017-07-24 16:08:24 +02:00
GitLab Build Bot
c72c020182 [ci skip] js-precompiled 20170721-201403 2017-07-21 20:18:51 +00:00
Jaco Greeff
c369bba03b Fix QR scanner returning null on confirm (#6122) 2017-07-21 21:19:38 +02:00
GitLab Build Bot
3605593d37 [ci skip] js-precompiled 20170721-165246 2017-07-21 16:58:58 +00:00
Jaco Greeff
e3a8780da7 Check QR before lowercase (#6119) 2017-07-21 18:23:41 +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
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
Nicolas Gotchac
96ff69e7ef Update wallet library binaries (#6108) 
* Update wallet library binaries

* Update the links
 2017-07-20 19:30:25 +02:00
Robert Habermeier
02d462e263 update wallet library modifiers (#6103) 2017-07-20 00:02:36 +02:00
GitLab Build Bot
10efc7e2d3 [ci skip] js-precompiled 20170719-205509 2017-07-19 20:59:31 +00:00
Gav Wood
b640df8fbb Fix initialisation bug. (#6102) 2017-07-19 22:29:58 +02: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
fcdaa0d05b Upated dependencies 2017-07-17 11:54:13 +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
4fc16a9eec Show busy indicator on Address forget (#6066) 
* Shw busy indicator on Address forget

* Remove debug logs
 2017-07-16 11:05:36 +02: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
arkpar
debbfc117a Bumped version 2017-07-13 15:52:01 +02:00
Jaco Greeff
58307479ad Fix lint/build issue (#6050) 2017-07-13 14:37:35 +02:00
Jaco Greeff
e36a7fab2d Update tests to master version 2017-07-13 11:54:52 +02:00
Jaco Greeff
2007de3241 Fix lint issue. 2017-07-13 11:06:51 +02:00
Jaco Greeff
d8c3c247f8 Merge branch 'master' into ui-2 2017-07-13 10:56:12 +02:00
Marek Kotewicz
40e29c92bc make Multisig Wallet walletSourceUrl point to the latest version of solidity contract (#5984) 2017-07-13 09:47:51 +02:00
Tomasz Drwięga
24c8510932 Fix status icon (#6039) 
* Fix status icon when zooming out.

* Fix health errors.
 2017-07-12 08:52:50 +02:00
Joseph Mark
0fca4f95d6 Errors & warnings for inappropriate RPCs (#6029) 
* Clarify function name

Function checks if sealing is currently underway, not to be confused
with checking whether the engine performs internal sealing.

* Error when work called on internal sealing engine

* Error submitting work for internal sealing engine

* Fix inverted bool and style grumbles

* Add can_produce_work_package to TestMinerService

* Error when setting engine signer on PoW chain

* Unit tests for engine signing

Setting engine signer should fail if chain does not seal internally
or client lacks account provider.

* Tweak TestMinerService

* Fix minor style grumbles
 2017-07-12 08:52:18 +02:00
GitLab Build Bot
45d44bedef [ci skip] js-precompiled 20170711-113031 2017-07-11 11:36:24 +00:00
Jaco Greeff
92a9ff3c1a Update after merge 2017-07-11 12:47:22 +02:00
Jaco Greeff
a1a8181913 Merge branch 'master' into ui-2 2017-07-11 12:38:51 +02:00
Tomasz Drwięga
4936e99f30 Node Health warnings (#5951) 
* Health endpoint.

* Asynchronous health endpoint.

* Configure time api URL via CLI.

* Tests for TimeChecker.

* Health indication on Status page.

* Adding status indication to tab titles.

* Add status to ParityBar.

* Fixing lints.

* Add health status on SyncWarning.

* Fix health URL for embed.

* Nicer messages.

* Fix tests.

* Fixing JS tests.

* NTP time sync (#5956)

* use NTP to check time drift

* update time module documentation

* replace time_api flag with ntp_server

* fix TimeChecker tests

* fix ntp-server flag usage

* hide status tooltip if there's no message to show

* remove TimeProvider trait

* use Cell in FakeNtp test trait

* share fetch client and ntp client cpu pool

* Add documentation to public method.

* Removing peer count from status.

* Remove unknown upgrade status.

* Send two time requests at the time.

* Revert "Send two time requests at the time."

This reverts commit f7b754b1155076a5a5d8fdafa022801fae324452.

* Defer reporting time synchronization issues.

* Fix tests.

* Fix linting.
 2017-07-11 12:23:46 +02:00
Jaco Greeff
03b0ea6139 Merge branch 'master' into ui-2 2017-07-10 17:43:37 +02:00
Jaco Greeff
b49c039f41 Set observable on component (#6033) 2017-07-10 17:38:40 +02:00
Jaco Greeff
3d24ae0981 Merge branch 'master' into ui-2 2017-07-10 17:36:55 +02:00
Jaco Greeff
801b6e0ded UI 2 dapp configuration dapps (#6032) 
* Add shell_ APIs

* Allow handling of shell_ calls

* Retrieve API info via call

* Split Dapp Method config into dapp

* Allow shell API for configuring dapps

* Move dapp toggles to dapp itself

* Align provider naming

* Selection of default accounts via dapp

* Remove duplicated spec
 2017-07-10 17:03:16 +02:00
Jaco Greeff
4dd68f1ef3 Ui 2 provider rename (web3Provider -> ethereum) (#6031) 
* Rename web3Provider -> ethereumProvider

* ethereumProvider -> ethereum
 2017-07-10 15:56:43 +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
699aab0b80 Update package-lock.json 2017-07-10 11:40:45 +02:00
Jaco Greeff
84f11278ba Merge branch 'master' into ui-2 2017-07-10 11:33:07 +02:00
Jaco Greeff
cbcda140ec Ui 2 updates subscribe (#6027) 
* Add account & vault APIs

* Additional status methods

* Move permission modals into Dapp

* Adjust display position

* Don't publish invalid events

* Cleanup Wallet display

* Update package-lock

* Align icon buttons center

* Adjust account selectors

* Adjust wallet white

* Allow display of boolean/false values

* Pass value through correctly for disabled inputs

* Split requests into sections

* onClict -> onClick

* Update label

* Update skip step

* Connect provider interfaces
 2017-07-10 11:04:29 +02:00
GitLab Build Bot
df0ef6618d [ci skip] js-precompiled 20170706-164115 2017-07-06 16:47:59 +00:00
Robert Habermeier
0409e95d1e Merge pull request #6000 from paritytech/new-acc 
Fix first run wizard.
 2017-07-06 18:02:47 +02:00
kaikun213
76f0247f5d Tests still warn because of old provider in some tests 2017-07-06 12:42:10 +02:00
GitLab Build Bot
33f1d2af1e [ci skip] js-precompiled 20170706-081457 2017-07-06 08:21:42 +00:00
kaikun213
349316f70e PubSub for parity-js (#5830) 
* PubSub Integration WebSocket

* PubSub Provider API

* Parity License and fix switch statement

* Minor fix: use parameter api

* Exclude subscriptionId return

* Unsubscribe parameters as array

* secureProvider API added

* isSecure check

* Refractor: Formatting in callback (no Promise)

* Tests for parityProvider

* Refractor: Formatting in callback (secure API)

* Updated transaction documentation

* Module instead of API-Names, Options always as array (e.g. empty)

'parity' instead of 'parity_subscribe' calls
params with empty array as options. If eth_subscribe includes empty array parity-core will send invalid request (eth api doesn't have options)

* Removed isSecure transport check, because APIs are configurable

* Refractor Provider API to single Pubsub

* Modify transport layer to have single identifier for subscriptions

* FIX: Display pubsub errors

* Discard Messages after unsubscribing

* Fix: display error normal messages correctly

* Simplified code, removed unnecessary pubsub methods

* trace_call API 2nd argument blockNumber, first whatTrace

https://github.com/paritytech/parity/wiki/JSONRPC-trace-module#trace_call

* Separate namespaces pubsub. eth, parity, net

* Keep error for messages from unsubscribed topics.

* Fix: Unsubscribe Promise

* Add Test: Unsubscribe promise resolved

* Fix: 'error' in params
 2017-07-06 09:50:27 +02:00
Tomasz Drwięga
58a27b3334
Fix first run wizard. 2017-07-05 12:25:07 +02:00
Jaco Greeff
15a9e56b09 Ui 2 expand method filters (#5974) 
* Add account & vault APIs

* Additional status methods

* Move permission modals into Dapp

* Adjust display position

* Don't publish invalid events
 2017-07-03 17:05:56 +02:00
Jaco Greeff
7f77e6004c Cleanup selector (#5971) 2017-07-03 10:36:34 +02:00
Jaco Greeff
15d4bc9d6d Save permissions (#5970) 2017-07-03 10:03:29 +02: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
Tomasz Drwięga
944f9d7fb5 Clarify confusing messages. (#5935) 2017-06-28 09:35:25 +02:00
Tomasz Drwięga
c7a043b864 Content Security Policy (#5790) 
* Adding CSP headers.

* Adding Content-Security-Policy headers.

* Fixing test.

* CSP in ws server responses.
 2017-06-28 09:12:02 +02:00
GitLab Build Bot
6b16fe3f14 [ci skip] js-precompiled 20170627-213135 2017-06-27 21:35:37 +00:00
Arkadiy Paronyan
4a7bcfe4f0 CLI: Export error message and less verbose peer counter. (#5870) 
* Removed numbed of active connections from informant

* Print error message when fatdb is required

* Remove peers from UI
 2017-06-27 22:40:46 +02:00
GitLab Build Bot
cf772ef555 [ci skip] js-precompiled 20170623-115250 2017-06-23 11:56:57 +00:00
Jaco Greeff
0f41121556 Empty local middleware, until explicitly requested (#5912) 
* Empty local middleware, until explicitly requested

* Remove previous empty overrides (unneeded now)

* Re-add over-zealous keyethereum removal
 2017-06-23 13:40:16 +02:00
Jaco Greeff
6dfa097752 Update 2017-06-23 11:57:33 +02:00
Jaco Greeff
d9cb2c7781 Update 2017-06-23 11:53:20 +02:00
Jaco Greeff
72f3576c78 Merge branch 'master' into ui-2 2017-06-23 11:48:12 +02:00
Craig O'Connor
614a80bd23 Cancel propagated TX (#5899) 
* lgtm

* linting

* Slight shortening
 2017-06-23 10:32:19 +02:00
Robert Habermeier
b6fd18a9ca Merge pull request #5833 from paritytech/pubsub-docs 
Docs for Pub-Sub, optional parameter for parity_subscribe
 2017-06-22 20:17:02 +02:00
Jaco Greeff
64e6d36944 Fix gas editor doubling-up on gas (#5820) 2017-06-22 20:14:04 +02:00
Tomasz Drwięga
53609f703e Domain-locked web tokens. (#5894) 
* Domain-locking web tokens.

* JS part.

* Fix linting issues.
 2017-06-22 20:05:40 +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
a60c5527c7 Keyethereum fs dependency (#5902) 
* Set process.browser

* Empty fs module (keyethereum dep)

* !==
 2017-06-22 11:49:44 +02:00
Jaco Greeff
a6d3d4ea4c Secure API access via single-use tokens (#5892) 
* Single use token for dapp permissions

* Add accountsInfo & allAccountsInfo

* Covert token -> dappName in requests
 2017-06-21 15:15:23 +02:00
Jaco Greeff
97c67bc259 Merge branch 'master' into ui-2 2017-06-21 11:15:29 +02:00
Maciej Hirsz
e871b7a0ac Merge pull request #5856 from paritytech/mh-pubnode-dappsigner 
Fixed account selection for Dapps on public node
 2017-06-19 18:29:06 +02:00
Jaco Greeff
e479260e1f Method intercept dialog selection (#5875) 
* Cleanup filter config

* Show single request of type (at a time)

* Align packages

* DappFilter -> DappRequests

* Methods dialog (WIP)

* Initial dapp methods modal

* Align dialog & popup permissions

* appname -> token mapping TODOs

* Case
 2017-06-19 17:25:17 +02:00
GitLab Build Bot
367a5c998d [ci skip] js-precompiled 20170619-145413 2017-06-19 14:58:49 +00:00
Maciej Hirsz
b824bc29b5 Merge pull request #5838 from paritytech/ng-fix-timeouts 
Fix wrongly called timeouts
 2017-06-19 16:30:30 +02:00
Jaco Greeff
d4532fac18 Updated after merge 2017-06-19 10:42:17 +02:00
Jaco Greeff
4dd26c0d7c Merge branch 'master' into ui-2 2017-06-19 10:39:05 +02:00
Jaco Greeff
acf9096a83 Updated 2017-06-19 10:38:32 +02:00
GitLab Build Bot
42dcdde4e8 [ci skip] js-precompiled 20170616-172546 2017-06-16 17:30:14 +00:00
Robert Habermeier
7931d6a02a Merge pull request #5836 from paritytech/a5-ui-terminology 
Dutch i18n from #5802 for master
 2017-06-16 18:45:42 +02:00
maciejhirsz
ba6e41cf07 Fixed account selection for Dapps on public node 2017-06-16 14:00:30 +02:00
Rocco Stanzione
ba35d69831 Typos in token deploy dapp ui 2017-06-15 20:06:46 -05:00
Jaco Greeff
df52394871 UI 2 Approve-all for Filters (#5846) 
* Approve all requests or type for token

* Approve all functionality

* Remove extra console.log
 2017-06-15 11:59:14 +02:00
Jaco Greeff
58f15f1674 Filter request popups (#5843) 
* Formatting

* Update dapps to use web3Provider

* Remove secure flag from config

* Basic request approve/reject popup

* Lenient provider checks

* Case sensitivity fix
 2017-06-14 17:12:13 +02:00
Nicolas Gotchac
8cb4bc2127 Fix wrongly called timeouts 2017-06-14 12:35:36 +02:00
Tomasz Drwięga
00b58d1206
Merge branch 'master' into pubsub-docs 
# Conflicts:
#	rpc/src/v1/tests/mocked/pubsub.rs
 2017-06-14 11:46:30 +02:00
Tomasz Drwięga
f7fb1bfa1d
Fix linting. 2017-06-14 11:45:44 +02:00
Jaco Greeff
38b4ba8d33 Update package-lock 2017-06-14 10:27:33 +02: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
Nicolas Gotchac
e4c7a7f30a Don't fail on wrong log decoding (#5813) 2017-06-13 18:36:51 +03:00
Tomasz Drwięga
47e1e18e7e
Ignoring some methods in test. 2017-06-13 16:47:58 +02:00
Tomasz Drwięga
172300158d
Merge branch 'master' into pubsub-docs 2017-06-13 16:30:08 +02:00
Tomasz Drwięga
9994133446
Adding docs. 2017-06-13 14:07:39 +02:00
Jaco Greeff
8f5a863468 Package updates 2017-06-13 13:23:16 +02:00
Jaco Greeff
6ea932b1de Update test for packages 2017-06-13 12:09:32 +02:00
Jaco Greeff
a2fdf38316 Additional merge fixes 2017-06-13 11:34:43 +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
Afri
f3874ffaf2 Fix party technologies (#5810) 2017-06-12 22:52:34 +02:00
GitLab Build Bot
8eda5fcbbf [ci skip] js-precompiled 20170612-164938 2017-06-12 16:53:40 +00:00
maciejhirsz
c7c05552f3 Fix rust, skip WASM till CI switches to Node 8+ 2017-06-12 17:43:23 +02:00
maciejhirsz
788dd04600 Merge branch 'master' into fix-tests 2017-06-12 17:07:07 +02:00
maciejhirsz
41df8413fc fix JS tests 2017-06-12 16:44:59 +02:00
Maciej Hirsz
b2a42f03eb Public node WASM, performance and fixes (#5734) 2017-06-12 15:57:16 +02:00
Tomasz Drwięga
5c3ea4ec29 Require phrase confirmation. (#5731) 
* Require phrase confirmation.

* Linting issues.

* Fix dialog title.

* Confirm a backup phrase.

* Confirm recovery phrase on fist run as well.
 2017-06-09 12:25:14 +02:00