Commit Graph

1700 Commits

Author SHA1 Message Date
Iuri Matias f85017e3f4
Merge pull request #401 from embark-framework/bug_fix/blockchain-dev
Use --dev when in development
2018-05-09 16:17:17 -04:00
Jonathan Rainville cc93667198 fix test 2018-05-09 15:16:46 -04:00
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
Iuri Matias a6bb44c20f
Merge pull request #399 from embark-framework/profileMeSir
Profile me officer
2018-05-08 13:35:37 -04:00
Jonathan Rainville 74dc8e3f27 update package lock 2018-05-08 13:23:11 -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 d8c1418042 add ascii table dependencies and update the lock
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-08 10:31:02 -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
Iuri Matias 204684ef07
Merge pull request #397 from embark-framework/graph-skipElements
Improvements to graph functionality
2018-05-04 22:12:26 -04:00
Iuri Matias c8eb0861a3
Merge pull request #396 from embark-framework/bug_fix/fix-solc-version-test
fix test failing with old solc version
2018-05-04 22:12:07 -04:00
Richard Ramos 3f8450f060 Extra functionality for deciding which elements to include in a graph 2018-05-04 16:17:12 -04:00
emizzle 799769d19c Update test to match abi generated with 0.4.23 2018-05-04 11:01:42 -04:00
emizzle bdfe61ad75 fix test failing with old solc version 2018-05-03 23:30:59 -04:00
Iuri Matias 451c0bf2de update to 3.0.1 2018-05-03 21:44:31 -04:00
Iuri Matias f6835cb461
Merge pull request #395 from embark-framework/bug_fix/contract_constructor_warning_on_demo
Changed pragma version and constructor syntax
2018-05-03 21:02:46 -04:00
Richard Ramos 9d197dcbb3
Changed pragma version and constructor syntax 2018-05-03 21:00:38 -04:00
Iuri Matias 0f4b49a822 update README 2018-05-03 20:29:11 -04:00
Iuri Matias 8c53ba4897 remove old docs 2018-05-03 20:27:20 -04:00
Iuri Matias 221281c182 update package-lock 2018-05-03 20:27:03 -04:00
Iuri Matias b1a499cf0e update template message 2018-05-03 17:32:10 -04:00
iuri matias c34192c5f9 update default to solc 0.4.23 2018-05-03 17:30:43 -04:00
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