2811 Commits

Author SHA1 Message Date
Iuri Matias
4122bec122
Merge pull request #568 from embark-framework/next
merge Next
2018-06-20 16:40:23 -04:00
Iuri Matias
1dc5238966
Merge pull request #567 from embark-framework/master
Master
2018-06-20 16:40:10 -04:00
Iuri Matias
de39180737 re-add comment 2018-06-20 16:38:26 -04:00
Iuri Matias
1e580bfd23 organize package.json 2018-06-20 16:37:19 -04:00
Iuri Matias
b1d9b91890
Merge pull request #561 from embark-framework/bug_fix/intercept-rebased
Fix log interception and enable multi-argument logging #2
2018-06-20 16:34:36 -04:00
Iuri Matias
67118ab019 remove unneded files 2018-06-20 16:30:16 -04:00
Iuri Matias
caddd6c11d fix solc version 2018-06-20 16:23:13 -04:00
Iuri Matias
a6195d2517 Merge branch 'develop' 2018-06-20 15:55:16 -04:00
VoR0220
b41d6b312c small fix
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-20 14:17:05 -05:00
Jonathan Rainville
832e757262 add triple equals 2018-06-20 14:06:15 -04:00
Jonathan Rainville
150b5170c4 fix tests using new dependencies 2018-06-20 13:56:43 -04:00
Jonathan Rainville
4298e18655 make groups of dependencyCount to do async by group 2018-06-20 11:15:47 -04:00
VoR0220
a050a97a62 convert to average
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-20 09:38:51 -05:00
emizzle
51eb5a1f65 Added cors for whisper 2018-06-20 16:19:25 +10:00
Iuri Matias
6a5020402f update to 3.1 3.1.0 2018-06-19 17:54:10 -04:00
Iuri Matias
de33dc9de2
Merge pull request #563 from embark-framework/disable_ipc_client
disable ipc client in tests
2018-06-19 17:39:54 -04:00
Iuri Matias
650eb5e359 disable ipc client 2018-06-19 17:33:24 -04:00
Iuri Matias
aa5063e5ef
Merge pull request #562 from embark-framework/remove_extra_messages
remove extra logs
2018-06-19 15:49:37 -04:00
Iuri Matias
9f16740ead
Merge pull request #559 from embark-framework/warn_wrong_upload_cmd
warn if old upload cmd is used
2018-06-19 15:47:39 -04:00
Iuri Matias
9beaaa2a29 remove extra logs 2018-06-19 15:46:55 -04:00
Jonathan Rainville
8091563bea remove log 2018-06-19 15:01:10 -04:00
Jonathan Rainville
7f2f841e28 intercept logs by adding the name only 2018-06-19 15:01:03 -04:00
Jonathan Rainville
cd4bce8d12 enbale multiple arguments in dashboard 2018-06-19 15:00:56 -04:00
Jonathan Rainville
88cc4d05c0 enable logger to log multiple arguments 2018-06-19 15:00:51 -04:00
Iuri Matias
6a031e1dab warn if old cmd is used 2018-06-19 14:07:14 -04:00
Iuri Matias
9574562602
Merge pull request #558 from embark-framework/bug_fix/console-dir-test
Fix testing a directory without ending slash
2018-06-19 11:40:44 -04:00
Iuri Matias
d2489f0da8
Merge pull request #557 from embark-framework/bug_fix/hanging-graph
Fix hanging embark graph by starting web3 service
2018-06-19 11:38:21 -04:00
Jonathan Rainville
c1f29fdea4 fix test directory without ending slash 2018-06-19 10:58:09 -04:00
Jonathan Rainville
01277f6014 start web3 service so getGasPrice is available 2018-06-19 10:03:46 -04:00
Iuri Matias
b363873da2
Merge pull request #556 from embark-framework/bug_fix/hanging-test-node
Fix hanging tests when using a wrong node
2018-06-19 09:33:41 -04:00
Jonathan Rainville
287998d127
Merge pull request #554 from embark-framework/bug_fix/https-rpc-network
Add support for https ethereum network hosts and infura hosts with API key
2018-06-19 09:26:46 -04:00
Jonathan Rainville
1a91f3c688 ping endpoint before connecting to see if available 2018-06-19 09:24:36 -04:00
Jonathan Rainville
aa02aeb74c move pingEndpoint to utils 2018-06-19 09:02:19 -04:00
emizzle
ba66d763fe Add support for infura network hosts with api key.
Fix bug with non-development code generation.
2018-06-19 15:14:37 +10:00
emizzle
b56def7c57 Updated web3 endpoint for use with infura api key and https
Allows `protocol` to be specified in config/contract.js[on] for `<env>/deployment/protocol`.
2018-06-19 14:43:55 +10:00
Iuri Matias
c5799839bb
Merge pull request #553 from embark-framework/chores/update-templates
Update templates with tests and comments
2018-06-18 16:35:16 -04:00
Iuri Matias
537feccb52
Merge pull request #550 from embark-framework/deployENSonDevNets
Deploy ens on dev nets
2018-06-18 16:35:12 -04:00
Jonathan Rainville
f9d6e196c8 add configs for local swarm 2018-06-18 16:10:31 -04:00
VoR0220
7eac4df38d missing semicolon
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-18 15:07:42 -05:00
Jonathan Rainville
002f5992d4 add semicolons 2018-06-18 16:04:35 -04:00
Jonathan Rainville
a6dc2f5a91 fix linting 2018-06-18 16:04:05 -04:00
Jonathan Rainville
bf0cd2866c add comments to contracts templates 2018-06-18 15:59:48 -04:00
VoR0220
a9a460f10e back to promisification
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-18 14:57:43 -05:00
Jonathan Rainville
78f8dfdd60 add comments in communication templates 2018-06-18 15:44:24 -04:00
Jonathan Rainville
c1540dc2ea add comments in blockchain configs 2018-06-18 15:40:06 -04:00
VoR0220
ca5a60b5f0 callback fixes and get rid of resolver interface
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-18 14:31:22 -05:00
Jonathan Rainville
3d9a006ecc update tests in templates 2018-06-18 15:15:24 -04:00
VoR0220
800269d97b more unnecessary contracts gotten rid of, and fixes made to Embarkjs file
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-06-18 13:54:37 -05:00
Iuri Matias
c25bf086f9
Merge pull request #552 from embark-framework/bug_fix/default-account
Register web3 object after init
2018-06-18 14:42:41 -04:00
Jonathan Rainville
ed1ac3af2e register web3 after init 2018-06-18 14:33:25 -04:00