905 Commits

Author SHA1 Message Date
Jonathan Rainville
8cc485ac94 add isDev blockchain option 2018-05-09 15:16:46 -04:00
Jonathan Rainville
2913617a81 fix command (reset) 2018-05-09 15:16:46 -04:00
Jonathan Rainville
92c8d70dd5 change warning to tell about --reset 2018-05-09 15:16:46 -04:00
Jonathan Rainville
46e1ccd81b use --dev when in development 2018-05-09 15:16:46 -04:00
Jonathan Rainville
edbc77afca hotfix console 2018-05-08 14:51:51 -04:00
VoR0220
cdf46f2b30 fix linting errors and clean up ze code
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:53:34 -05:00
VoR0220
ab53bfba0c fix linting errors
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:41:38 -05:00
VoR0220
819dec1bc3 profile me officer, here's a new module
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:30:46 -05:00
Richard Ramos
3f8450f060 Extra functionality for deciding which elements to include in a graph 2018-05-04 16:17:12 -04:00
Iuri Matias
b1a499cf0e update template message 2018-05-03 17:32:10 -04:00
Iuri Matias
be7723e077
Merge pull request #392 from embark-framework/bug_fix/whisper-demo
Fix Whisper demo
2018-05-02 16:12:33 -04:00
Jonathan Rainville
3266f20a0f fix glob in windows 2018-05-02 15:48:06 -04:00
Jonathan Rainville
41b2741ba5 add optionnal callback 2018-05-02 12:10:11 -04:00
Iuri Matias
0cffff067a
Merge pull request #390 from embark-framework/features/add-swarm-to-embarkjs
Added swarm support in embarkjs, isAvailable for messages/storage, swarm/ipfs checks
2018-05-01 18:52:22 -04:00
Jonathan Rainville
3bf5093f1b more linting and add condition in case of no hash 2018-05-01 10:20:27 -04:00
Jonathan Rainville
2ad852667e add early returns and lint 2018-05-01 09:38:13 -04:00
Jonathan Rainville
67c932c77d fix contracts in dashboard by removing the double evaluation 2018-05-01 09:20:19 -04:00
emizzle
b93b3b4e47 Merge branches 'features/add-swarm-to-embarkjs' and 'features/add-swarm-to-embarkjs' of https://github.com/embark-framework/embark into features/add-swarm-to-embarkjs 2018-05-01 00:06:26 +10:00
emizzle
6ef78ff770 include fix for bug 2018-05-01 00:03:31 +10:00
Jonathan Rainville
0d20d422ce hotfix for watch not defined 2018-04-30 09:29:31 -04:00
emizzle
72cce7d4d2 Fixes to make lint and tests happy 2018-04-30 22:07:37 +10:00
Eric Mastro
2bb977df76 WIP to merge in other swarm changes
Adding swarm to embarkjs. WIP.

Add 'auto' setting for geth CORS and websockets origin

* 'auto' now supported for `rpcCorsDomain` and `wsOrigins` in the blockchain config.
* 'auto' set to the default value in blockchain config for test and demo apps.
test add config and contract and add test

addFileToPipeline test and registerBeforeDeploy with new arg

add more registers but generation one fails in run

WIP commit

Undo changes to test config.

Merge pull request #381 from embark-framework/features/cors-auto

Add 'auto' setting for geth CORS and websockets origin
fix a bug where upload cmd used plugin name

don't error if it's an empty dapp with no contracts yet

Merge pull request #383 from embark-framework/no_contracts

don't error if it's an empty dapp with no contracts yet
remove duplicated entry

force zepplein version for travis

Merge pull request #384 from embark-framework/chores/test-allpligin-apis

Small fixes for plugin APIs
intercept logs in the app itself - stopgap fix

Merge pull request #385 from embark-framework/console_logs_fix

intercept logs in the app itself - stopgap fix
* removed unneeded provider property.
* add 'swarm' as a provider in the storage.config
* update method for swarm service check

Merge branch 'develop' into features/add-swarm-to-embarkjs


More work to add swarm to embarkjs

* added eth-lib to parse result of swarm text
* changed "currentStorage" and "currentMessages" to "currentProvider" for consistency.
* added protocol to storage config
* selectively starts storage service depending on which one is configured in the storage config
* run service check for ipfs/swarm prior to uploaded
* added swarm methods for embarkjs

Updated code based on code review

check if testrpc is installed and warn if not

Merge pull request #386 from embark-framework/bug_fix/test-rpc-not-installed

check if testrpc is installed and warn if not
Removed timeout

Removed spacer

Merge pull request #382 from embark-framework/react-demo

Updating embark demo to use react instead of jquery
fix on contract add

Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp

Fix adding a contract
redeploy with right config on config change

fix tests

reset watchers after build to make sure files remain watch

Merge pull request #389 from embark-framework/bug_fix/file-changes-not-watched

Fix files not being watched
Merge pull request #388 from embark-framework/bug_fix/changing-contract-config

Redeploy with right config on config change
Added swarm support in embarkjs and isAvailable for messages/storage

* reverted currentProvider back to currentStorage and currentMessages
* added `EmbarkJS.Storage.isAvailable` and `EmbarkJS.Messages.isAvailable()` and underlying provider functions for Whisper, Orbit, IPFS, and Swarm
* Finished swarm implementation in embarkjs plus cleanup
* updated test app storage config to swarm to show swarm config option

Merge branch 'develop' into features/add-swarm-to-embarkjs
2018-04-30 15:56:43 +10:00
Jonathan Rainville
0dd2938abe reset watchers after build to make sure files remain watch 2018-04-27 16:34:13 -04:00
Jonathan Rainville
94c493e854 redeploy with right config on config change 2018-04-27 15:10:24 -04:00
Iuri Matias
5aa05c8094
Merge pull request #387 from embark-framework/bug_fix/new-contract-in-empty-dapp
Fix adding a contract
2018-04-27 14:08:02 -04:00
Jonathan Rainville
2827deb418 fix on contract add 2018-04-27 13:50:57 -04:00
Jonathan Rainville
4a9ff1fe9d check if testrpc is installed and warn if not 2018-04-27 09:16:29 -04:00
Iuri Matias
1cfe46db55 intercept logs in the app itself - stopgap fix 2018-04-26 17:19:45 -04:00
Iuri Matias
17c33ad075
Merge pull request #384 from embark-framework/chores/test-allpligin-apis
Small fixes for plugin APIs
2018-04-26 17:06:05 -04:00
Iuri Matias
6a3add8e04
Merge pull request #383 from embark-framework/no_contracts
don't error if it's an empty dapp with no contracts yet
2018-04-26 14:56:13 -04:00
Iuri Matias
3b736f56a7 don't error if it's an empty dapp with no contracts yet 2018-04-26 14:15:43 -04:00
Jonathan Rainville
d046feb83d fix a bug where upload cmd used plugin name 2018-04-26 14:00:41 -04:00
Jonathan Rainville
e4566f9f81 add more registers but generation one fails in run 2018-04-26 09:40:41 -04:00
Jonathan Rainville
61be2c7bd7 addFileToPipeline test and registerBeforeDeploy with new arg 2018-04-26 09:40:32 -04:00
Jonathan Rainville
c818326f2e test add config and contract and add test 2018-04-26 09:40:26 -04:00
Eric Mastro
ef0bcbf405 Add 'auto' setting for geth CORS and websockets origin
* 'auto' now supported for `rpcCorsDomain` and `wsOrigins` in the blockchain config.
* 'auto' set to the default value in blockchain config for test and demo apps.
2018-04-26 21:37:00 +10:00
Eric Mastro
4c39a3f589
Merge branch 'develop' into bug_fix/upload-to-swarm 2018-04-26 19:05:56 +10:00
emizzle
f59a187bce Removed unused host/port options passed in to the swarm service. 2018-04-26 12:59:57 +10:00
Jonathan Rainville
fba491592d add function to check if context has specified context 2018-04-25 10:57:23 -04:00
Jonathan Rainville
f39acbdd42 get context from cmd ran and use arrays of contexts 2018-04-25 10:34:17 -04:00
Jonathan Rainville
97e91d4c44 only log loaded plugins in list plugins and warn when plugin is not right 2018-04-24 15:53:19 -04:00
Jonathan Rainville
51c2c8f880 check context and on changing context, load plugins that work 2018-04-24 14:42:56 -04:00
Jonathan Rainville
52d0c5a8dd stop tests when deploy fails 2018-04-24 10:19:01 -04:00
emizzle
cc30ff390e Implemented PR review changes
* Removed config init from `cmd.js` for upload.
* refactored `upload()` to use engine services instead of loading and using plugins directly.
* now passing web3 directly to the `Swarm` constructor
2018-04-24 10:27:11 +10:00
Iuri Matias
16909c7f1a if version name doesn't have /, then just use the full name 2018-04-23 12:14:48 -04:00
Iuri Matias
782044ef7c
Merge pull request #375 from embark-framework/fix_package_management
Fix package management
2018-04-20 20:10:38 -04:00
Iuri Matias
ade2ad1a67 comply with linter 2018-04-20 19:59:47 -04:00
Iuri Matias
a63aa2ea0f remove commented line; use beta 34 2018-04-20 19:58:16 -04:00
Iuri Matias
41f04234d0 clean up 2018-04-20 19:52:51 -04:00
Iuri Matias
cf02a10656 use web3 naming instead of web3.js; check if package already exists 2018-04-20 19:45:57 -04:00