Commit Graph

11226 Commits

Author SHA1 Message Date
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
Svyatoslav Nikolsky
4938dfd971 removed comment 2017-07-25 17:57:27 +03:00
Svyatoslav Nikolsky
eb895fbb31 completed KeyStoreNodeKeyPair 2017-07-25 17:54:32 +03:00
Svyatoslav Nikolsky
2e9df2c39d updated parity for NodeKeyPair 2017-07-25 16:30:24 +03:00
Robert Habermeier
ee1dfb5605 Merge pull request #6044 from paritytech/issues/4673
`--config` option handles bundled presets
2017-07-25 13:05:49 +02:00
kaikun213
55bef6ec2f Merge remote-tracking branch 'origin/master' 2017-07-25 11:13:39 +02:00
Svyatoslav Nikolsky
9e30d85fdc continue integrating with parity 2017-07-25 10:19:48 +03:00
GitLab Build Bot
aa09cb266d [ci skip] js-precompiled 20170725-071056 2017-07-25 07:16:04 +00:00
Svyatoslav Nikolsky
fb68b0924a fixed parity to use new trait 2017-07-25 09:56:23 +03: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
Gav Wood
0b46cce95f Deduplicate help text. 2017-07-25 08:38:20 +02:00
Svyatoslav Nikolsky
45f2b82411 NodeKeyPAir trait 2017-07-25 09:24:54 +03:00
Joseph Mark
8b3ec61151
Merge branch 'master' into issues/4673 2017-07-25 09:03:21 +07:00
Joseph Mark
c522f564a9
Update usage doc for --config (#4673) 2017-07-25 09:02:37 +07: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
Evan
78fab4e471 Add a snapcraft badge (#6135)
Congrats on the snap of Parity! Here's a shiny green build status badge :)
2017-07-24 17:27:27 +02:00
Nikolay Volf
2d6a1160d5 don't return 412 (#6133) 2017-07-24 17:26:49 +02:00
NikVolf
5180919e52 wasm mvp continued 2017-07-24 17:45:15 +03: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
Nikolay Volf
5fb32229f9 bump jsonrpc (#6129) 2017-07-24 13:44:42 +02:00
Robert Habermeier
079b24175c Merge pull request #6080 from Vurich/ethash
Unroll loops in light_compute
2017-07-24 13:09:31 +02:00
Svyatoslav Nikolsky
b31b067743 fixed tests 2017-07-24 12:36:31 +03:00
Afri
e33f9c1d11 Changelog for 1.6.9, 1.6.10, and 1.7.0 (#6075)
* Update CHANGELOG for 1.6.9 stable release.

* [WIP] Prepare CHANGELOG for 1.7.0 beta release.

* Contract warp

* Update changes for 1.7.0

* Update description for 1.7.0 in changelog

* Update Changelog for 1.7.0 beta and 1.6.10 stable

* Address reviews for the Changelog.

* Fix blog URL in changelog.

* Fix typo in Changelog.

* Update changelog for 1.7.0 beta and 1.6.10 stable
2017-07-23 15:18:58 +02:00
Vurich
0fa9c93f6f Style reungrumble 2017-07-22 14:49:02 +02:00
Robert Habermeier
abe7518424 add security policy (#6121) 2017-07-22 07:41:58 +02:00
Joseph Mark
17e6d2d51c
Descriptive error for invalid preset (#4673) 2017-07-22 11:09:59 +07:00
Joseph Mark
6ae93cf14e
Roll preset command into --config option (#4673)
* --config takes either toml file or bundled preset eg. '--config=dev'
* Maintains consistency with --chain arguments
2017-07-22 10:37:38 +07: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
Robert Habermeier
2d0d7150cc remove chunk to restore from pending set only upon successful import (#6112) 2017-07-21 17:24:53 +02:00
Joseph Mark
ae3dfe9327
Revert Cargo.lock 2017-07-21 21:19:34 +07: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
Joseph Mark
db0d20e17b
Update Cargo.lock 2017-07-21 20:30:35 +07:00
Joseph Mark
0ec917e980
Merge branch 'master' into issues/4673 2017-07-21 19:47:14 +07:00
Arkadiy Paronyan
99f4bc76d7 Fix for building with --no-default-features (#6110) 2017-07-21 12:14:47 +02:00
Svyatoslav Nikolsky
5fb9652af5 improved logging 2017-07-21 11:25:26 +03:00
Svyatoslav Nikolsky
023e5b4b90 do not try to connect if not a part of cluster 2017-07-21 10:49:10 +03: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
e7f82cf62e Merge pull request #5980 from brson/panic-hook
Add custom panic hook
2017-07-20 17:11:08 +02:00
Svyatoslav Nikolsky
c94c799347 re-read only when blockchain is changed 2017-07-20 13:28:31 +03:00