Commit Graph

1774 Commits

Author SHA1 Message Date
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
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
Afri
1349b4ba07 Replace Ethcore comany name in T&C and some other places (#5796)
* Replace ethcore in terms and conditions

* Replace ethcore company name in various places

* Fix casing in t&c
2017-06-09 12:21:35 +02:00
Bas
4f63377ff2 Fix terminology distributed -> decentralized for Dutch i18n (#5802) 2017-06-09 12:21:10 +02:00
Afri
d368006526 Fix terminology distributed -> decentralized (#5797) 2017-06-09 12:20:08 +02:00