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

1320 Commits

Author SHA1 Message Date
Iuri Matias 5b60c3effa fix issue with orbit config 2017-06-26 15:25:22 -04:00
Iuri Matias 1bbacd1c5d make linter happy 2017-06-26 09:02:58 -04:00
Iuri Matias 2a2a5820fc fix testing functionality in develop 2017-06-26 09:01:54 -04:00
Iuri Matias ad9b18133a update tests 2017-06-25 12:59:19 -04:00
Iuri Matias 84f7149aaf fix contracts loading; add warning for whisper version; update web3.js 2017-06-25 12:56:14 -04:00
Iuri Matias 955aab35de Revert "use temporary simulator fork on the test_app to fix web3.js dependency" 
This reverts commit f077e017e9.
 2017-06-25 09:47:44 -04:00
Iuri Matias f077e017e9 use temporary simulator fork on the test_app to fix web3.js dependency 2017-06-25 08:50:47 -04:00
Iuri Matias 668509bd52 Merge pull request #282 from michaeljyeates/develop 
Update web3 version to 0.19.1
 2017-06-25 08:08:17 -04:00
Michael Yeates b3067b5735 Update web3 version to 0.19.1, anything earlier is broken by bignumber.js removal 2017-06-25 13:04:02 +01:00
Iuri Matias a6c8e83d40 fix conflicts 2017-06-24 22:35:27 -04:00
Antonio Tenorio Fornés 5b609411fb change prepublish scrpt to prepare 2017-06-21 19:16:43 +02:00
Antonio Tenorio Fornés c3a915e80c move webpack to dev dependency 2017-06-21 19:15:25 +02:00
Antonio Tenorio Fornés 362f1282a6 use npm dependencies management for ipfs, web3 and orbit, and remove them from js/ folder. 2017-06-21 19:12:07 +02:00
Antonio Tenorio Fornés 6f93d7e824 use npm dependencies management for ipfs, web3 and orbit, and remove them from js/ folder. 2017-06-21 18:58:15 +02:00
Antonio Tenorio Fornés 46e18e34c5 remove duplicate dependency 2017-06-21 18:57:25 +02:00
Antonio Tenorio Fornés 24b9763da5 move webpack to prepublish script 2017-06-21 18:57:25 +02:00
Antonio Tenorio Fornés 351b81e696 Automate embark.bundle.js generation 2017-06-21 18:57:25 +02:00
Iuri Matias 4bb7f18155 Merge branch 'develop' of github.com:iurimatias/embark-framework into develop 2017-06-19 06:33:07 -04:00
Iuri Matias 1e306f0ad1 Merge pull request #278 from carlmon/develop 
fix for no accounts on init with warning messages
 2017-06-19 06:29:11 -04:00
Carl Mönnig f38b9bc1d6 fix for no accounts on init with warning messages 2017-06-18 13:16:11 +02:00
Iuri Matias f5b0c4d2a7 Merge pull request #275 from nathanph/develop 
Update solc from 0.4.8 to 0.4.11
 2017-06-03 08:41:02 -04:00
Nathan Hernandez ed0da0d292 Merge pull request #1 from jonjonsonjr/develop 
fix expected token in compiler test
 2017-06-02 22:22:04 -04:00
Nathan Hernandez 97d113b334 Update compiler tests 2017-06-02 22:17:21 -04:00
Jon Johnson 3049acbdee fix expected token in compiler test 2017-06-02 19:14:04 -07:00
Nathan Hernandez 4202d5e832 Update solc to 0.4.11 
The solidity compiler was at 0.4.8, 3 patches behind. At some point the
output of the compiler changed, `compiler.js` reflects those changes.
I'm not sure if other properties changed.
 2017-06-02 21:20:27 -04:00
Iuri Matias 06c2d9807d Merge pull request #265 from aletheia-foundation/develop 
fix crash in logger if message is null or undefined
 2017-04-24 21:21:43 -04:00
roo2 5232f0e74d fix crash in logger if message is null or undefined 2017-04-09 14:55:24 +10:00
Iuri Matias cfc75c3619 update to 2.4.2 2017-04-04 08:19:52 -04:00
Iuri Matias 5a8304dd35 fix for metamask integration; 2017-04-04 08:17:17 -04:00
Iuri Matias 47f313b12c generate json files 2017-04-04 06:37:50 -04:00
Iuri Matias 3c1ca7f457 remove unneded require 2017-04-02 14:54:34 -04:00
Iuri Matias dd7984bcda use version from constructor parameter 2017-04-02 14:49:19 -04:00
Iuri Matias 86335e0c74 move http request to utils 2017-04-02 14:40:10 -04:00
Iuri Matias 2373d14d6b add options to runCommand 2017-04-02 14:30:00 -04:00
Iuri Matias d800c1cee0 add aliases to embarkjs 2017-04-02 14:12:12 -04:00
Iuri Matias 9ce25d7651 refactor services check to use on/off and let monitor decide colors 2017-04-01 23:22:43 -04:00
Iuri Matias f4dbeb4b7e revert some of the recent changes 2017-03-31 07:39:33 -04:00
Iuri Matias faf0e1ff48 revert some of the recent changes 2017-03-31 07:34:43 -04:00
Iuri Matias f5cfcae3dd Merge pull request #264 from toadkicker/eventing 
integration testing fixes
 2017-03-30 20:01:55 -04:00
Todd Baur 780fc197f3 remove static since we want these exposed 2017-03-30 22:31:23 +09:00
Todd Baur 613e4e6abe integration testing fixes 2017-03-30 22:16:46 +09:00
Iuri Matias d872ce9c51 Merge pull request #263 from toadkicker/eventing 
Eventing Embark
 2017-03-30 07:58:28 -04:00
Todd Baur 8a5604eec6 var -> let 2017-03-30 20:52:49 +09:00
Todd Baur 7599f43a3b fixed problem with double this.client in blockchain.js 2017-03-30 20:48:22 +09:00
Todd Baur fbe3f302b2 cleanup code from linter feedback 2017-03-30 20:38:14 +09:00
Todd Baur 65f6827b05 merge develop branch 2017-03-30 20:29:55 +09:00
Todd Baur 648b27920c merge develop branch 2017-03-30 20:26:03 +09:00
Iuri Matias 36633bf60c the lint is mother the lint is father 2017-03-30 07:16:15 -04:00
Todd Baur 67f325f5a0 migrate all the code to ES6 2017-03-30 20:12:39 +09:00
Iuri Matias c2ca2563bc revert change that was refering to a relative path for embark.json 2017-03-30 07:04:13 -04:00