67 Commits

Author SHA1 Message Date
Iuri Matias
0804779a20 don't sync i18n files anymore 2018-06-01 19:31:26 -04:00
Jonathan Rainville
b727d85358 small fixes 2018-06-01 13:53:09 -04:00
Jonathan Rainville
2d1a37d63b conflict in pakcgae lock 2018-06-01 13:44:49 -04:00
Jonathan Rainville
491ff47cf8 conflict in en.json 2018-06-01 13:35:52 -04:00
Eric Mastro
421f9a4096 Merge in remote 2018-06-01 14:10:54 +10:00
emizzle
74d5ee3984 small fixes 2018-06-01 14:06:02 +10:00
emizzle
446f28ed6f de-dupe en.json 2018-06-01 13:39:00 +10:00
emizzle
a11047c681 Further fixes for starting dappConnection processes automatically
moved storage process launching to storage module

refactored all cases of storage url building to util methods

updated cors so that a processes will not include itself in cors list

changed child process command console output to trace, so it's visible when --logLevel == trace
2018-06-01 13:36:46 +10:00
emizzle
927f562a41 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes.
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
2018-06-01 13:35:25 +10:00
emizzle
7aa44c7fe3 Added improvements to storage config 2018-06-01 13:35:11 +10:00
emizzle
85117cf55c Dynamic selection of storage provider now working based on improved storage config.
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
2018-06-01 13:35:11 +10:00
emizzle
942a57aa3a Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
2018-06-01 13:33:44 +10:00
emizzle
0cb79d84a0 Dynamic selection of storage provider now working based on improved storage config.
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
2018-06-01 13:30:01 +10:00
emizzle
f6667b6948 Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
2018-06-01 13:28:05 +10:00
emizzle
0aa96aa504 Fixed issue with CORS domains for auto-started geth, swarm, and ipfs processes.
Fixes after rebase:
* De-duped i18n en.json
* Re-built package-lock.json

Current WIP is auto-starting storage processes defined in dappConnection config.
2018-05-31 20:18:25 +10:00
emizzle
6d77aae6de Added improvements to storage config 2018-05-31 15:19:09 +10:00
emizzle
30f0f4dc72 Dynamic selection of storage provider now working based on improved storage config.
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
2018-05-31 15:18:58 +10:00
emizzle
d0d73320aa Storage config improvements start. Adjusted the config and have started to support those improvements through the codebase.
Currently stuck on starting multiple storage servcies at once. Might need  a change in storage config spec.

WIP.
2018-05-31 15:18:10 +10:00
Iuri Matias
cf999ce997 refactor runcode to use events instead; remove dependencies 2018-05-30 13:35:36 -04:00
Jonathan Rainville
8655b49a39 change ipfs to spawn too 2018-05-30 11:03:33 -04:00
Jonathan Rainville
73db1a6133 something en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville
3f671c2fb0 conflict in en.json 2018-05-30 11:03:33 -04:00
Jonathan Rainville
ac7612136e start storage node on run too 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
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
Iuri Matias
2608eed19b
Merge branch 'develop' into bug_fix/change-warn-path-depth-to-length 2018-05-27 08:05:51 -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
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
Jonathan Rainville
61a5ba5e0a fix tests 2018-05-23 11:31:20 -04:00
Jonathan Rainville
77fad169aa add process exit 2018-05-23 11:17:03 -04:00
Jonathan Rainville
6145c0b92c start node only when no node is present 2018-05-23 11:17:02 -04:00
Iuri Matias
315d8c2197 fix merge 2018-05-23 11:17:02 -04:00
Jonathan Rainville
f935fee566 add i18n for blockchain node logs 2018-05-23 11:17:02 -04:00
Jonathan Rainville
0be35e87f9 remove duplicate translations 2018-05-23 11:17:02 -04:00
Jonathan Rainville
3759738551 fix tests 2018-05-23 11:17:02 -04:00
Jonathan Rainville
4bdf469131 conflict in en.json 2018-05-23 11:17:02 -04:00
Jonathan Rainville
2062f9032c conflict in en.json 2018-05-23 11:17:01 -04:00
Iuri Matias
d1c3f36d02 update translations 2018-05-23 11:17:01 -04:00
Jonathan Rainville
5f3361d030 conflict in en.json 2018-05-23 11:16:56 -04:00
Eric Mastro
f10abc8da1
Merge branch 'develop' into features/show-building-placeholder 2018-05-23 09:36:11 +10:00
Jonathan Rainville
48836b3d5b
Merge pull request #446 from alaibe/fr-translation
Adding fr translation
2018-05-22 15:34:07 -04:00
Anthony Laibe
77dbcd4424 Improve fr translation (PR feedback) 2018-05-22 20:31:28 +01:00
emizzle
db9fbef140 Add loading placeholder page while embark is building asset files.
We could extend this further to launch the webserver with the placeholder page before building the contracts as well.
2018-05-22 15:15:34 +10:00
emizzle
46e040f861 Merged in merge conflicts from remote 2018-05-22 12:16:13 +10:00
emizzle
85919a4f6d Update to make the imports 'shim' more readable as requested. 2018-05-22 12:11:45 +10:00
Eric Mastro
295152de82
Merge branch 'develop' into features/improve-imports 2018-05-21 21:46:14 +10:00
Eric Mastro
d4c04bbed7 Improve dapp imports to allow alternate syntax for importing contracts
* Now supports alternate import statements:
 * import {Token} from 'Embark/contracts';
 * import * as Contracts from 'Embark/contracts';
as well as the existing syntax:
 * import Token from 'Embark/contracts/Token';

* Contracts  js files moved from .embark to .embark/contracts
* .embark/contracts/index.js generated on the fly which requires all contracts in .embark/contract automatically and then creates a module.exports with each of them.
2018-05-21 21:43:36 +10:00
Anthony Laibe
a297407e99 Adding fr translation 2018-05-20 20:53:08 +01:00