Commit Graph

1048 Commits

Author SHA1 Message Date
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 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
Iuri Matias 504e68d5fc Merge pull request #259 from Exartu/develop
readme documentation update
2017-03-30 07:02:52 -04:00
Iuri Matias 8dc87b7cbc Merge pull request #258 from toadkicker/use_path_in_tmpl_gen
this fixes problems where concatenating the path string would fail
2017-03-30 07:01:11 -04:00
Iuri Matias d2232011c6 Merge pull request #262 from toadkicker/mindmap
add class mierarchy mindmap
2017-03-30 07:00:30 -04:00
Iuri Matias f206b6eb2b update readme for tests so it reflects the stable version 2017-03-30 06:59:51 -04:00
Iuri Matias 7bdc934e40 revert test change to previous state 2017-03-30 06:58:24 -04:00
Iuri Matias e2888e6d5a remove testrpc from package.json 2017-03-30 06:57:41 -04:00
Iuri Matias fc36bccee5 Merge pull request #257 from aletheia-foundation/develop
Show error message if unable to deploy contracts. Include ethereumjs-testrpc
2017-03-30 06:57:04 -04:00
ramiro 604635f3e3 added async simulator 2017-03-29 17:47:04 -03:00
Todd Baur a66f002a18 swap path -> util.joinPath 2017-03-30 03:13:48 +09:00
Todd Baur 26b87b4b05 swap test var -> let 2017-03-30 02:57:22 +09:00
Todd Baur 5bf1475ea4 swap more var -> let 2017-03-30 02:50:05 +09:00
Todd Baur a948cecd42 remove old versions of node 2017-03-30 02:46:19 +09:00
Todd Baur a6cd8b1292 change linter config for browser/node switching 2017-03-30 02:42:06 +09:00