Commit Graph

7485 Commits

Author SHA1 Message Date
Jaco Greeff
8f9fdb350c Merge branch 'master' into jg-subscription-check 2016-12-09 02:34:07 +01:00
Jaco Greeff
f9a24f3c8e Update babel, fix CI build due to breaking changes (#3754)
* Update babel to latest version

* Re-add circular deps plugin

* Bump for build

* Fixes for babel build
2016-12-09 02:33:12 +01:00
Jaco Greeff
6b65a1f872 Merge branch 'master' into jg-subscription-check 2016-12-09 01:41:44 +01:00
GitLab Build Bot
e1ad347cdb [ci skip] js-precompiled 20161209-003004 2016-12-09 00:32:45 +00:00
Robert Habermeier
eec1929658 Merge branch 'master' into lightserv 2016-12-09 01:29:46 +01:00
Nicolas Gotchac
09334ca3bd Small fixes to contract (#3751)
* Fix contracts execution will fallback function

* Fix contract execute modal

* Working execute from Contract

* Don't dupliacet events

* Gas * 1.2 in wallet confirmations
2016-12-09 01:21:51 +01:00
Robert Habermeier
07d7a37319 les: make peer buffer flow params optional 2016-12-09 01:06:51 +01:00
Jaco Greeff
b76a717720 Fix & with && 2016-12-09 00:58:53 +01:00
Jaco Greeff
13f962ae01 Attempt to fix ci webpack 2016-12-09 00:56:12 +01:00
Jaco Greeff
10c356de65 Simplify, consolidate uses between subscription managers 2016-12-09 00:52:21 +01:00
Jannis R
5418c56b01
remove Prepare step
The modal got really crowded and the preparation step had
only been shown for fractions of a second anyways. The
"loading" message is now part of the next step.
2016-12-09 00:39:16 +01:00
Jannis R
dfc445b6d6
fix bugs & linting issues 2016-12-09 00:39:16 +01:00
Jannis R
162420f4c2
send emailHash with request, update ABI 2016-12-09 00:39:16 +01:00
Jannis R
0e0f602d5e
pass fields to query into QueryCode 2016-12-09 00:39:16 +01:00
Jannis R
052f9258a5
pass fields to query into GatherData 2016-12-09 00:39:15 +01:00
Jannis R
d3fd71d953
add email-specific contract, helpers, store 2016-12-09 00:39:15 +01:00
Jannis R
1ac3421f33
step to select verification method 2016-12-09 00:39:15 +01:00
Jannis R
1672cbad7b
factor out SMS-specific logic 2016-12-09 00:39:15 +01:00
Jannis R
b5b529f8c2
modals/SMSVerification -> modals/Verification 2016-12-09 00:39:15 +01:00
Jannis R
600a7e5ccc
make SMS verification contract general purpose 2016-12-09 00:39:15 +01:00
Jannis R
e536290892
fix linting issues 2016-12-09 00:38:44 +01:00
Jannis R
a84cd9143f
show certifications in accounts list 2016-12-09 00:36:27 +01:00
Robert Habermeier
d53c47aa69 more tracing 2016-12-09 00:35:34 +01:00
Jannis R
5862f2a9eb
Certifications: read dappsUrl from state 2016-12-09 00:34:59 +01:00
Jannis R
e1c5796a5c
fetch certifications in account view 2016-12-09 00:34:59 +01:00
Jannis R
409c4adfbf
fetch certifiers from BadgeReg 2016-12-09 00:34:58 +01:00
Jannis R
b32b636697
fetch certifiers by id 2016-12-09 00:34:58 +01:00
Jannis R
2b34d76b8c
pull out fetchMeta 2016-12-09 00:34:58 +01:00
Jaco Greeff
3989e2642b Typo 2016-12-09 00:25:50 +01:00
Jaco Greeff
1ecda93de9 Align api.subscribe with contract 2016-12-09 00:15:39 +01:00
Jaco Greeff
4ce3142c63 Add autoRemove functionality to api.contract.subscribe 2016-12-09 00:15:27 +01:00
Jaco Greeff
ad971a444c Add autoRemove functionality for api.subscribe 2016-12-09 00:00:56 +01:00
Robert Habermeier
e7ce8c9558 light: broadcast status updates to peers 2016-12-08 23:57:09 +01:00
Robert Habermeier
6f5f1f5e26 light: integrate with sync + serve_light CLI 2016-12-08 23:21:47 +01:00
keorn
7c42241466 remove merge code 2016-12-08 22:00:26 +01:00
keorn
74770e4773 better docstrings 2016-12-08 21:49:55 +01:00
keorn
cc284dd86f Merge branch 'master' into auth-bft 2016-12-08 21:35:08 +01:00
keorn
79ef64349c remove assert 2016-12-08 21:27:49 +01:00
keorn
9ecb07434f fix informant 2016-12-08 21:13:32 +01:00
Gav Wood
2d6656fc43 Merge pull request #3725 from ethcore/engine-password
Make engine hold AccountProvider
2016-12-08 20:52:12 +01:00
keorn
dca752e9bb docs, tweaks 2016-12-08 20:09:30 +01:00
Robert Habermeier
efd66f566d ethsync: optional ipc codegen 2016-12-08 19:52:48 +01:00
Jaco Greeff
9d5de519b6 Merge remote-tracking branch 'origin/jg-test-ui' into jg-test-ui 2016-12-08 17:33:15 +01:00
Jaco Greeff
0544e0e786 Merge branch 'jg-test-ui-2' into jg-test-ui 2016-12-08 17:33:02 +01:00
Jaco Greeff
96d4569cf3 Update test describe paths 2016-12-08 17:31:41 +01:00
Jaco Greeff
ae49251c81 Remove .only 2016-12-08 17:04:21 +01:00
Jaco Greeff
507b4b68a1 Merge branch 'master' into jg-test-ui 2016-12-08 16:50:23 +01:00
Jaco Greeff
9e8fb616d3 Add store tests, fix issue with pending sort to top 2016-12-08 16:50:19 +01:00
Robert Habermeier
2e87e31157 light: no default features 2016-12-08 16:46:58 +01:00
Robert Habermeier
64ebcd0f24 fix contract code response encoding; add test 2016-12-08 16:12:00 +01:00