a6c8e83d40
fix conflicts
2017-06-24 22:35:27 -04:00
4bb7f18155
Merge branch 'develop' of github.com:iurimatias/embark-framework into develop
2017-06-19 06:33:07 -04:00
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
f38b9bc1d6
fix for no accounts on init with warning messages
2017-06-18 13:16:11 +02:00
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
ed0da0d292
Merge pull request #1 from jonjonsonjr/develop
...
fix expected token in compiler test
2017-06-02 22:22:04 -04:00
97d113b334
Update compiler tests
2017-06-02 22:17:21 -04:00
3049acbdee
fix expected token in compiler test
2017-06-02 19:14:04 -07:00
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
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
5232f0e74d
fix crash in logger if message is null or undefined
2017-04-09 14:55:24 +10:00
47f313b12c
generate json files
2017-04-04 06:37:50 -04:00
3c1ca7f457
remove unneded require
2017-04-02 14:54:34 -04:00
dd7984bcda
use version from constructor parameter
2017-04-02 14:49:19 -04:00
86335e0c74
move http request to utils
2017-04-02 14:40:10 -04:00
2373d14d6b
add options to runCommand
2017-04-02 14:30:00 -04:00
d800c1cee0
add aliases to embarkjs
2017-04-02 14:12:12 -04:00
9ce25d7651
refactor services check to use on/off and let monitor decide colors
2017-04-01 23:22:43 -04:00
f4dbeb4b7e
revert some of the recent changes
2017-03-31 07:39:33 -04:00
faf0e1ff48
revert some of the recent changes
2017-03-31 07:34:43 -04:00
f5cfcae3dd
Merge pull request #264 from toadkicker/eventing
...
integration testing fixes
2017-03-30 20:01:55 -04:00
780fc197f3
remove static since we want these exposed
2017-03-30 22:31:23 +09:00
613e4e6abe
integration testing fixes
2017-03-30 22:16:46 +09:00
d872ce9c51
Merge pull request #263 from toadkicker/eventing
...
Eventing Embark
2017-03-30 07:58:28 -04:00
8a5604eec6
var -> let
2017-03-30 20:52:49 +09:00
7599f43a3b
fixed problem with double this.client in blockchain.js
2017-03-30 20:48:22 +09:00
fbe3f302b2
cleanup code from linter feedback
2017-03-30 20:38:14 +09:00
65f6827b05
merge develop branch
2017-03-30 20:29:55 +09:00
648b27920c
merge develop branch
2017-03-30 20:26:03 +09:00
36633bf60c
the lint is mother the lint is father
2017-03-30 07:16:15 -04:00
67f325f5a0
migrate all the code to ES6
2017-03-30 20:12:39 +09:00
c2ca2563bc
revert change that was refering to a relative path for embark.json
2017-03-30 07:04:13 -04:00
504e68d5fc
Merge pull request #259 from Exartu/develop
...
readme documentation update
2017-03-30 07:02:52 -04:00
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
d2232011c6
Merge pull request #262 from toadkicker/mindmap
...
add class mierarchy mindmap
2017-03-30 07:00:30 -04:00
f206b6eb2b
update readme for tests so it reflects the stable version
2017-03-30 06:59:51 -04:00
7bdc934e40
revert test change to previous state
2017-03-30 06:58:24 -04:00
e2888e6d5a
remove testrpc from package.json
2017-03-30 06:57:41 -04:00
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
604635f3e3
added async simulator
2017-03-29 17:47:04 -03:00
a66f002a18
swap path -> util.joinPath
2017-03-30 03:13:48 +09:00
26b87b4b05
swap test var -> let
2017-03-30 02:57:22 +09:00
5bf1475ea4
swap more var -> let
2017-03-30 02:50:05 +09:00
a948cecd42
remove old versions of node
2017-03-30 02:46:19 +09:00
a6cd8b1292
change linter config for browser/node switching
2017-03-30 02:42:06 +09:00
0774841b66
tell jshint to read config from package.json
2017-03-30 02:20:20 +09:00
e3b9c01205
fix linter complaints
2017-03-30 02:18:00 +09:00
4ae5757bae
add back in missing load commands
2017-03-30 02:04:35 +09:00
446721229c
updated
2017-03-30 01:28:54 +09:00
5584b88842
add class mierarchy mindmap
2017-03-30 00:38:25 +09:00
Iuri Matias
Carl Mönnig
Nathan Hernandez
Jon Johnson
roo2
Todd Baur
ramiro