embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,774 Commits 171 Branches 184 Tags 104 MiB
Commit Graph

1774 Commits

Author SHA1 Message Date
iuri matias 1f5f2c6d0d update version 2018-05-03 15:06:00 -04:00
Iuri Matias a6b1d88c23
Merge pull request #394 from embark-framework/update-solc-0.4.23 
Update templates to solc version 0.4.23 to prevent issue with loading library.
 2018-05-03 12:51:53 -04:00
emizzle a0573a6638 Update templates to solc version 0.4.23 to prevent issue with loading library. 2018-05-03 12:43:24 -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
Iuri Matias 5974ab81bf
Merge pull request #393 from embark-framework/bug_fix/js-files-not-watched 
Fix glob in Windows for chokidar
 2018-05-02 16:11:03 -04:00
Jonathan Rainville 3266f20a0f fix glob in windows 2018-05-02 15:48:06 -04:00
Jonathan Rainville f303d3d839 fix whisper demo 2018-05-02 12:24:16 -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
Iuri Matias 8102b91211
Merge pull request #391 from embark-framework/bug_fix/contracts-in-dashboard 
Fix contract calls in dashboard by removing the double evaluation
 2018-05-01 09:35:07 -04:00
Jonathan Rainville 67c932c77d fix contracts in dashboard by removing the double evaluation 2018-05-01 09:20:19 -04:00
Eric Mastro 8770e1e2fe Merge remote-tracking branch 'origin/features/add-swarm-to-embarkjs' into features/add-swarm-to-embarkjs 2018-05-01 00:08:53 +10: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 8c59118f57 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-04-30 22:07:52 +10:00
emizzle 72cce7d4d2 Fixes to make lint and tests happy 2018-04-30 22:07:37 +10:00
Eric Mastro b29965b62f
Merge branch 'develop' into features/add-swarm-to-embarkjs 2018-04-30 16:16:03 +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
Iuri Matias 6766ecae5f
Merge pull request #388 from embark-framework/bug_fix/changing-contract-config 
Redeploy with right config on config change
 2018-04-28 06:10:29 -04:00
Iuri Matias 02ff6c3d16
Merge pull request #389 from embark-framework/bug_fix/file-changes-not-watched 
Fix files not being watched
 2018-04-27 21:14:42 -04:00
Jonathan Rainville 0dd2938abe reset watchers after build to make sure files remain watch 2018-04-27 16:34:13 -04:00
Jonathan Rainville 3f3bba33c2 fix tests 2018-04-27 15:35:12 -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
Iuri Matias bbec433f39
Merge pull request #382 from embark-framework/react-demo 
Updating embark demo to use react instead of jquery
 2018-04-27 12:29:11 -04:00
Richard Ramos 57428a65c6 Removed spacer 2018-04-27 11:48:44 -04:00
Richard Ramos dbb640642b Removed timeout 2018-04-27 11:47:35 -04:00
Iuri Matias 846980a4d7
Merge pull request #386 from embark-framework/bug_fix/test-rpc-not-installed 
check if testrpc is installed and warn if not
 2018-04-27 11:22:58 -04:00
Jonathan Rainville 4a9ff1fe9d check if testrpc is installed and warn if not 2018-04-27 09:16:29 -04:00
Richard Ramos c8effb7dcb Updated code based on code review 2018-04-27 09:04:34 -04:00
Iuri Matias 7ebaa7aaca
Merge pull request #385 from embark-framework/console_logs_fix 
intercept logs in the app itself - stopgap fix
 2018-04-26 17:59:24 -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
Jonathan Rainville 5de20c6baf force zepplein version for travis 2018-04-26 16:35:00 -04:00
Jonathan Rainville 797e43cedc remove duplicated entry 2018-04-26 15:09:39 -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
Iuri Matias 9e91915bce
Merge pull request #381 from embark-framework/features/cors-auto 
Add 'auto' setting for geth CORS and websockets origin
 2018-04-26 10:14:06 -04:00
emizzle 18e8f5c652 Undo changes to test config. 2018-04-27 00:06:15 +10: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
Iuri Matias acf1fa427b
Merge pull request #372 from embark-framework/bug_fix/upload-to-swarm 
swarm deploy refactored to use web3.bzz instead of command line
 2018-04-26 05:58:41 -04:00
Iuri Matias 51cfafaef9
Merge pull request #380 from embark-framework/bug_fix/fix-web3-dependencies 
Fix issues with missing web3 dependencies
 2018-04-26 05:56:21 -04:00