Commit Graph

7739 Commits

Author SHA1 Message Date
Jaco Greeff
00c53a8d18 Merge branch 'master' into jg-test-ui 2016-12-09 13:36:50 +01:00
Jaco Greeff
bb209424ac IdentityName flags testing 2016-12-09 13:36:46 +01:00
Jannis R
fd88421e88
store id with certifiers 2016-12-09 13:35:10 +01:00
arkpar
364dd9dda4 Make stop const 2016-12-09 13:25:02 +01:00
Jannis R
3dc943e854
merge master into jr-use-badge-reg 2016-12-09 13:14:35 +01:00
Jaco Greeff
1f4c84cbf1 Theme tests 2016-12-09 13:03:46 +01:00
keorn
475d4bcf3f Merge branch 'io-stop' into auth-bft 2016-12-09 12:37:55 +01:00
Jannis R
a94bbea7a5
more user-friendly method selection 2016-12-09 12:37:36 +01:00
keorn
762e5f1e3e proposed block sync tests 2016-12-09 12:05:56 +01:00
Tomasz Drwięga
3ccdb7c143 Fixing unused imports 2016-12-09 10:52:42 +00:00
Tomasz Drwięga
c76b7cf8f8 Fixing tests submodule 2016-12-09 10:48:46 +00:00
arkpar
22a63f6fd3 Added IO Service explicit stop 2016-12-09 11:45:16 +01:00
keorn
fb71caffbd remove double registration 2016-12-09 11:05:44 +01:00
Jaco Greeff
296301e284 Extend tests for TxList 2016-12-09 10:55:46 +01:00
keorn
42c34b5c1b ignore flaky test 2016-12-09 10:53:38 +01:00
Tomasz Drwięga
930183831b Adding tests for ethstore 2016-12-09 09:45:34 +00:00
Jaco Greeff
a133e41e16 Merge branch 'master' into jg-test-ui 2016-12-09 09:53:55 +01:00
Tomasz Drwięga
8596134c0f Clearer updates handling 2016-12-09 08:31:58 +00:00
Tomasz Drwięga
93230dd4c2 Merge branch 'master' into rotating-key
Conflicts:
	ethcore/src/account_provider/mod.rs
	rpc/src/v1/types/mod.rs.in
2016-12-09 07:37:34 +00:00
GitLab Build Bot
83f791fa5d [ci skip] js-precompiled 20161209-044115 2016-12-09 04:43:19 +00:00
GitLab Build Bot
12592689dd [ci skip] js-precompiled 20161209-014235 2016-12-09 01:44:45 +00:00
Jaco Greeff
7eeac232b4 Merge branch 'master' into lightserv 2016-12-09 02:36:55 +01:00
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