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

297 Commits

Author SHA1 Message Date
Jonathan Rainville 5581964fab conflict in package json 2018-08-21 15:17:05 -04:00
emizzle efe649e4e6 Removed p-iteration from embark altogether. 
Replaced usage in storage module (on dapp side) with async.js `detectSeries`
 2018-08-21 15:12:07 -04:00
Jonathan Rainville eb9017bd2f update provider version 2018-08-21 15:08:25 -04:00
Iuri Matias d04f7622ce update to 3.1.10 2018-08-20 10:03:13 -04:00
Jonathan Rainville 6da4f7527e 3.1.9 2018-08-15 09:51:10 -04:00
Iuri Matias e3a48fd46a update to 3.1.8 2018-08-14 13:45:09 -04:00
Iuri Matias c577ad6b16 update to 3.1.7 2018-07-30 07:01:36 -04:00
Iuri Matias 0310d53b41 lock ethereumjs-wallet version due to breaking change in 0.6.1 patch 2018-07-30 06:44:27 -04:00
Iuri Matias 258358558b update to 3.1.6 2018-07-19 11:18:48 +03:00
Jonathan Rainville 446787447d 3.1.5 2018-07-06 10:50:41 -04:00
Iuri Matias 5bb1d33739 update to 3.1.4 2018-07-04 17:05:01 +03:00
Jonathan Rainville 3228ff2086 3.1.3 2018-07-03 15:12:27 -04:00
Iuri Matias 8800da6b42 update to 3.1.2 2018-06-25 13:37:36 -04:00
Iuri Matias bb21490d87 update to 3.1.1 2018-06-21 21:24:37 -04:00
Iuri Matias 6a5020402f update to 3.1 2018-06-19 17:54:10 -04:00
Iuri Matias 1f49c71850 re-add mocha to dependencies 2018-06-18 13:18:54 -04:00
Jonathan Rainville f517cc104f use new npm package instead of fork 2018-06-18 09:13:09 -04:00
Iuri Matias 37ab60d6de
Merge pull request #538 from embark-framework/features/ws-node 
Enable connection to websocket node
 2018-06-15 18:01:12 -04:00
emizzle 5e20f27c99 Solc loading issue now fully resolved 
Added better error checking for solidity compilation errors

Extracted timer functionality for downloading packages so it works across the main process and child processes.

Npm class is instantiated only once and reused for event commands.

Npm class can handle concurrent requests for the same package and callback the installation result for each request.
 2018-06-15 17:06:59 -04:00
Iuri Matias 0ca9446a4c use neo-blessed 2018-06-15 17:02:54 -04:00
emizzle eedcdc77a7 Solc loading issue now fully resolved 
Added better error checking for solidity compilation errors

Extracted timer functionality for downloading packages so it works across the main process and child processes.

Npm class is instantiated only once and reused for event commands.

Npm class can handle concurrent requests for the same package and callback the installation result for each request.
 2018-06-15 17:02:53 -04:00
Jonathan Rainville c8c0a5c42f enable websocket provider 2018-06-15 14:35:50 -04:00
Iuri Matias 0429703790 lock version to avoid suprises 2018-06-13 12:03:00 -04:00
Iuri Matias 3335483b1a
Merge pull request #520 from embark-framework/dashboard_performance_fix 
use neo blessed
 2018-06-13 11:44:47 -04:00
Iuri Matias daaee7d828 use neo-blessed 2018-06-13 11:17:55 -04:00
Iuri Matias 19aa117503 update references to package 2018-06-13 09:40:19 -04:00
Iuri Matias e8b11d9841 point to a forked npm package (for now), to avoid the npm install issues some users are reporting 2018-06-13 09:05:51 -04:00
Richard Ramos a9065b1eae Websocket handling 2018-06-12 08:50:49 -04:00
Richard Ramos 339ffa5869 Adding proxy for simulator 2018-06-11 16:38:29 -04:00
Iuri Matias b16c06025b use ipc for compiler 2018-06-04 18:15:37 -04:00
Iuri Matias 17f5bb3905
Merge branch 'develop' into features/test-revamp-multi 2018-06-01 18:14:32 -04:00
Iuri Matias 8d985ce60a fix tests; put back solc 0.4.24 2018-06-01 18:09:54 -04:00
Jonathan Rainville 2d1a37d63b conflict in pakcgae lock 2018-06-01 13:44:49 -04:00
Jonathan Rainville c234655acd resolve conflict in test.js 2018-06-01 13:33:11 -04:00
Iuri Matias 9a1eefc838
Merge branch 'develop' into features/improve-storage-config 2018-06-01 12:01:51 -04:00
Iuri Matias f3e7d03204 remove orbit 2018-06-01 10:15:41 -04: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
VoR0220 73720b6978 add eth ens namehash package 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-23 11:50:55 -05:00
Iuri Matias 31833579a7 finish converting afterDeploy module 2018-05-23 11:15:06 -04:00
Iuri Matias 2064d26914 update package lock 2018-05-23 11:15:06 -04:00
Iuri Matias a0f6c96d89 update to 3.0.4 2018-05-23 11:15:04 -04:00
Iuri Matias 14c046954e update to 3.0.3 2018-05-23 11:15:04 -04:00
Iuri Matias 7d9389655e update to 3.0.2 2018-05-23 11:15:04 -04:00
Jonathan Rainville 1ffc9ffe08 enable events calling for request and on 2018-05-16 16:41:25 -04:00
Jonathan Rainville b7908a3797 conflict in package lock 2018-05-14 11:18:48 -04:00
Jonathan Rainville a32c04c751 fix conflict in engine 2018-05-14 11:18:48 -04:00
Iuri Matias 517a3bf234 move i18n and locales to its own folder; abstract it a bit; detect at initialization; add cmd line option 2018-05-10 15:01:34 -04:00
Iuri Matias 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -04:00
Jonathan Rainville 986ef520fc add plugin that caches 2018-05-10 12:22:58 -04:00
Jonathan Rainville 31e82e31d0 do a process for each file 2018-05-10 10:43:10 -04: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
Iuri Matias 451c0bf2de update to 3.0.1 2018-05-03 21:44:31 -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
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 782044ef7c
Merge pull request #375 from embark-framework/fix_package_management 
Fix package management
 2018-04-20 20:10:38 -04:00
Iuri Matias a63aa2ea0f remove commented line; use beta 34 2018-04-20 19:58:16 -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
Iuri Matias 1b6d747dbd fixing package management test 2018-04-20 17:17:49 -04:00
Jonathan Rainville df5b647ecb fix and add tests 2018-04-19 15:25:27 -04:00
Jonathan Rainville cf14b3784f add getUrl function for external contracts + tests 2018-04-17 15:07:00 -04:00
Iuri Matias 1415ce0d62 upgrade to latest web3.js 2018-04-17 14:48:17 -04:00
Iuri Matias 82726e07e1
Merge pull request #361 from embark-framework/graphviz-contracts 
Graphviz contracts
 2018-04-13 11:29:23 -04:00
Iuri Matias 2ce86f8591 use node cmd so it works on windows 2018-04-11 09:17:43 -04:00
Iuri Matias 67bdcbb1c3 put cmds between "s so it works on windows 2018-04-11 09:12:24 -04:00
Richard Ramos d038ed414d Merge branch 'develop' of https://github.com/embark-framework/embark into graphviz-contracts 2018-04-05 11:35:19 -04:00
Iuri Matias 94887f933d update finalhandler npm package 2018-03-30 12:47:15 -04:00
Iuri Matias 6cafb319ac update commander, css-loader, ejs packages 2018-03-30 12:07:58 -04:00
Iuri Matias 66187aef9a update eslint version 2018-03-30 11:48:35 -04:00
Iuri Matias a00119f5dc move test_app to test_apps 2018-03-29 18:20:45 -04:00
Richard Ramos 5d0e86bb72 Removed unneeded packages and added tooltips and colors 2018-03-23 11:27:21 -04:00
Richard Ramos 9e469cc83e Initial commit for graphviz functionality 
- Added required packages
- Added command to cmd.js
- Created graph.js to contain graph logic
 2018-03-23 10:02:23 -04:00
Iuri Matias be1c5badd8 improve full support for es6 2018-01-16 19:17:52 -05:00
Iuri Matias 728aea6e04 fix imports issue 2018-01-12 14:21:36 -05:00
Iuri Matias 59c3d82260 update web3.js 2018-01-05 15:10:47 -05:00
Iuri Matias 4976408c11 remove prepare command 2017-12-28 07:11:08 -05:00
Iuri Matias cd0fd94386 updatests; include options 2017-12-22 13:07:43 -05:00
Iuri Matias 02634d0bda warn is terminal window is too small 2017-12-19 15:14:09 -05:00
Iuri Matias c63c9b8728 warn user of typos 2017-12-19 13:29:48 -05:00
Iuri Matias bc34e00268 better errors when parsing invalid json 2017-12-19 12:57:03 -05:00
Iuri Matias 113bb25142 add webserver start/stop cmd 2017-12-17 18:34:41 -05:00
Iuri Matias 1cb6581fde better display error contract deployment errors in the dashbord 2017-12-14 15:03:08 -05:00
Iuri Matias c2c2635acd fix npm package group 2017-12-14 13:09:15 -05:00
Iuri Matias 2f5e6768ce remove jshint 2017-12-14 10:35:39 -05:00
Iuri Matias 84641f4056 add eslint to travis 2017-12-14 10:26:39 -05:00
Iuri Matias c0c0eb0550 fix eslint path 2017-12-14 10:20:07 -05:00
Iuri Matias 170143b52c update travis config 2017-12-14 10:12:14 -05:00
Iuri Matias b56a138b62 use eslint instead of jshint 2017-12-14 10:00:53 -05:00
Iuri Matias ccb77051f8 import bootstrap in test_app 2017-12-13 19:24:20 -05:00
Iuri Matias 12c8e223d6 update ipfs lib 2017-12-13 15:53:29 -05:00
Iuri Matias 0b00f99f09 include ipfs lib in embarkjs 2017-12-13 15:53:29 -05:00
Iuri Matias 33711c8db2 support imports 2017-12-13 15:53:29 -05:00
Iuri Matias aa0f774f1d Merge branch 'release/2.6.0' into develop 2017-12-13 12:17:29 -05:00
Iuri Matias 97231caad8 update to 2.6.1 2017-12-13 11:42:20 -05:00
Iuri Matias ed377d798f Revert "use custom repo for IPFS api" 
This reverts commit bb0d674c65.
 2017-12-06 10:34:13 -05:00
Antonio Tenorio Fornés bb0d674c65 use custom repo for IPFS api 2017-10-24 21:00:06 +02:00
Antonio Tenorio Fornés 4bb77ae8d5 Merge branch 'develop' into buildFixes 2017-10-24 20:56:57 +02:00
Iuri Matias 1cb0644f92 Revert "update solc version" 
This reverts commit d23cd753ce.
 2017-10-22 09:27:13 -04:00
Iuri Matias d23cd753ce update solc version 2017-10-21 15:16:11 -04:00
Iuri Matias 3b4e5f5b30 include test_app tests in ci 2017-10-21 08:13:28 -04:00