Commit Graph

2005 Commits

Author SHA1 Message Date
Jonathan Rainville 3f671c2fb0 conflict in en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville d36af9f5e1 fix blockchain start 2018-05-30 11:03:33 -04:00
Jonathan Rainville 4e20e82edf conflict in blockchain 2018-05-30 11:03:33 -04:00
Jonathan Rainville a88ab82261 conflict in blockchain.js 2018-05-30 11:02:01 -04:00
Jonathan Rainville b0a64cc043 use right version 2018-05-30 10:57:25 -04:00
Jonathan Rainville e02648dbef add error if user uses ipfs 0.4.14 or lower 2018-05-30 10:57:25 -04:00
Jonathan Rainville 023d8f7f5f fix logs 2018-05-30 10:57:25 -04:00
Jonathan Rainville 3c7bdbf6cf set cors domain depending on the webserverConfig 2018-05-30 10:57:25 -04:00
Jonathan Rainville ac7612136e start storage node on run too 2018-05-30 10:57:25 -04:00
Jonathan Rainville 857c7d8c85 small fixes 2018-05-30 10:57:25 -04:00
Jonathan Rainville f08c700151 reverse plugin.js changes 2018-05-30 10:57:25 -04:00
Jonathan Rainville 2b54dfd7cc conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville 0f07a00791 detect swarm started signal 2018-05-30 10:57:25 -04:00
Jonathan Rainville e67fafdc29 conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville bc853ef899 conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville 70d3e6a46f conflict en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville e3a93a6d61 add storageProcessesLauncher that can work for swarm or ipfs 2018-05-30 10:57:25 -04:00
Jonathan Rainville 56f25ebba1 clonflict for silent 2018-05-30 10:57:25 -04:00
Jonathan Rainville 4d0453fede
Merge pull request #468 from embark-framework/fix_service_check
early return if failing to connect to node
2018-05-30 08:24:15 -04:00
Iuri Matias d39f5e1868
Merge pull request #467 from embark-framework/simulatorCommandLine
fix simulator preferential treatment
2018-05-30 06:42:02 -04:00
VoR0220 302476e95e fix simulator preferential treatment
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-29 14:19:25 -05:00
Iuri Matias cd96aebdcd early return if failing to connect to node 2018-05-28 17:55:59 -04:00
Iuri Matias 836fbfbc47
Merge pull request #464 from embark-framework/metaMaskCheck
Meta mask check
2018-05-28 14:37:58 -04:00
VoR0220 52524c2f59 eliminate nasty outdated test
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 13:22:48 -05:00
Iuri Matias 6c921e3a85 fix typo 2018-05-28 13:58:49 -04:00
Iuri Matias 1eee68e901 fix typo; default environment to development 2018-05-28 13:53:10 -04:00
VoR0220 6fe3064edd spelling correction of metamask
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:45:14 -05:00
VoR0220 f34bd5df4f env check
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:28:38 -05:00
VoR0220 90b42bccb2 template correction to check for development environment and whether metamask is engaged and log that it is
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-28 12:27:55 -05:00
RJ Catalano 0858092306
Merge pull request #463 from embark-framework/ens_fixes
Ens fixes
2018-05-28 11:56:54 -05:00
Iuri Matias 033613d7f6 lint is king 2018-05-28 12:29:47 -04:00
Iuri Matias 5b58c9f1b8 fix variable name being passed to name provider implementation 2018-05-28 12:20:04 -04:00
Iuri Matias ef3bde1053 add missing code init 2018-05-28 11:42:22 -04:00
Iuri Matias ee460e3309 add missing promise returns 2018-05-28 11:42:01 -04:00
Iuri Matias 32a9b25fe3 fix reference to ens object 2018-05-28 11:21:52 -04:00
Iuri Matias e988bd6b4a use import instead of require 2018-05-28 11:10:20 -04:00
Iuri Matias 3750fc297b add missing module init 2018-05-28 11:10:09 -04:00
Iuri Matias a25330ddec set namesystem enable to true by default 2018-05-28 11:09:48 -04:00
Iuri Matias 8fa325a7af
Merge pull request #452 from embark-framework/DomainNameResolution
ENS Domain name resolution initial integration
2018-05-27 08:12:26 -04:00
Iuri Matias 55aa1f8f0c
Merge pull request #458 from embark-framework/bug_fix/change-warn-path-depth-to-length
Changed path depth warning to path length
2018-05-27 08:07:25 -04:00
Iuri Matias 2608eed19b
Merge branch 'develop' into bug_fix/change-warn-path-depth-to-length 2018-05-27 08:05:51 -04:00
Iuri Matias 605a3fe8d5
Merge pull request #457 from embark-framework/bug_fix/error-with-geth-cors
geth CORS updates to fix issues and add to auto blockchain process
2018-05-27 08:04:51 -04:00
Iuri Matias 2d67061fe3 put compiling message only after checking for binary 2018-05-27 08:00:18 -04:00
Iuri Matias c97b0332b7
Merge pull request #459 from embark-framework/vyperWarning
add a warning for vyper installation
2018-05-27 07:56:45 -04:00
VoR0220 2ae9e7e0e7 add a warning for vyper installation
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 14:44:07 -05:00
VoR0220 8ace5653cd fix some linting issues and add a few forgotten lines to the config function
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:52:57 -05:00
VoR0220 9cb10c7ce7 bring free wheeling vars into the ensEmbark namespace
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:25:28 -05:00
VoR0220 f5a29c7f4d make namesystem service come from a config file for future development
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:25:02 -05:00
VoR0220 6b1b849df7 namesystem.json templates added
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-25 12:24:23 -05:00
Eric Mastro cfcdc0e15d Changed path depth warning to path length
* Updated the path depth warning to check that the dapp path length is <= 66 characters.
* Updated the blockchain process to silent:false when loglevel == trace.
* Updated the path warning so that it would appear in the console regardless of loglevel (and silent:true)
2018-05-25 13:42:18 +10:00