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

1920 Commits

Author SHA1 Message Date
Jonathan Rainville 8cee44cbd7 conflict in package lock 2018-05-15 14:42:06 -04:00
Iuri Matias 69e264e765
Merge pull request #413 from embark-framework/features/wallet 
HD Wallet when providing key or mnemonic
 2018-05-15 13:07:30 -04:00
Jonathan Rainville 38dffb9eed move provider to contracts 2018-05-15 12:45:38 -04:00
Jonathan Rainville 85d7024740 stupid tests 2018-05-15 11:40:35 -04:00
Jonathan Rainville fdf8791c1c fix mnemonic accounts 2018-05-15 11:33:19 -04:00
Jonathan Rainville 96b1c9c070 fix test 2018-05-14 17:03:39 -04:00
Jonathan Rainville c5f80c72b9 add 0x if private key doesn't have it 2018-05-14 16:38:15 -04:00
Jonathan Rainville 7b1a219b51 pass isDev to engine so that it can show a warning 2018-05-14 14:32:19 -04:00
Jonathan Rainville 3f09d5d3f0 add tests for getContract 2018-05-14 14:04:26 -04:00
Jonathan Rainville e470a63905 enable comma separated keys in file 2018-05-14 13:30:13 -04:00
Jonathan Rainville 24c4c51232 add locales 2018-05-14 12:14:05 -04:00
Jonathan Rainville 890faf260d remove sync methods as they are now unsupported 2018-05-14 12:12:14 -04:00
Jonathan Rainville 37ca90ad9b add wallet and clean up 2018-05-14 12:08:03 -04:00
Jonathan Rainville 39ede07cdb Merge branch 'features/wallet' of https://github.com/embark-framework/embark into features/wallet 2018-05-14 11:19:02 -04:00
Jonathan Rainville 00bc3050ba intercept get accounts 2018-05-14 11:18:48 -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 a03757a5e6
Merge pull request #412 from embark-framework/js_config 
support for js configs
 2018-05-12 13:13:15 -04:00
Iuri Matias e8210607b7 fix for when config is specified in embark.json 2018-05-11 19:09:38 -04:00
Iuri Matias cc3b748232 update contracts configs from json to js 2018-05-11 18:51:11 -04:00
Iuri Matias 24eadbd94f convert test_app contracts config from json format to js object 2018-05-11 18:22:32 -04:00
Iuri Matias b804f51de5 fix getting .json config file 2018-05-11 18:22:03 -04:00
Iuri Matias 2793432b87 convert test_app contracts.json to contracts.js 2018-05-11 18:11:05 -04:00
Iuri Matias 8b22305833 support js files besides json files 2018-05-11 18:10:48 -04:00
Iuri Matias 838f089bca
Merge pull request #411 from embark-framework/missing_from_dev 
Missing from dev
 2018-05-11 18:09:33 -04:00
Iuri Matias 8e0136c59e update tests 2018-05-11 16:23:17 -04:00
Iuri Matias 7d8dd02db1 silence bluebird warning 2018-05-11 16:18:53 -04:00
Iuri Matias 26187cfa1d add missing default from 2018-05-11 16:18:44 -04:00
Jonathan Rainville 391207e1bb intercept get accounts 2018-05-11 15:49:46 -04:00
Jonathan Rainville c1dd5dde9d conflict in package lock 2018-05-11 15:49:28 -04:00
Jonathan Rainville b9472892cb fix conflict in engine 2018-05-11 15:49:28 -04:00
Iuri Matias bd0e4a9960
Merge pull request #406 from embark-framework/metamask_fixes 
Metamask fixes
 2018-05-11 13:11:06 -04:00
Iuri Matias 7ae9720a26
Merge pull request #408 from embark-framework/onReady 
execOnReady -> OnReady
 2018-05-11 13:10:53 -04:00
VoR0220 0bb1b7bf1c attempting to craft the onReady bit...I think this works? 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-11 11:27:27 -05:00
Iuri Matias 9214eab7ad update tests 2018-05-11 12:13:49 -04:00
Iuri Matias 3a62f6a121 update default dev networkid to be the same as --dev option chainId 2018-05-11 10:23:52 -04:00
Iuri Matias 7686ad561f detect web3 version and get accounts correctly 2018-05-11 08:20:03 -04:00
Iuri Matias 9e1778f62c comment web3 test override to avoid confusion in the test_app 2018-05-10 19:57:26 -04:00
Iuri Matias ab5dc059e7
Merge pull request #405 from embark-framework/i18n 
I18n
 2018-05-10 16:04:30 -04:00
Iuri Matias 4236f56147 add missing option 2018-05-10 15:36:24 -04:00
Iuri Matias 2e324484d4 add missing option 2018-05-10 15:26:09 -04:00
Iuri Matias 854fa0deb0 add locale option to most cmds 2018-05-10 15:02:03 -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 51fab56fc5 update keys 2018-05-10 15:01:34 -04:00
Iuri Matias 22edfac26f update more keys 2018-05-10 15:01:34 -04:00
Iuri Matias 63504e5da9 add other locale keys 2018-05-10 15:01:34 -04:00
Iuri Matias 0b70f32bb9 initial work for i18n 2018-05-10 15:01:34 -04:00
Iuri Matias d84d064ede
Merge pull request #403 from embark-framework/features/file-per-process 
Process files in multiple separate processes
 2018-05-10 14:47:22 -04:00
Jonathan Rainville 1bb808a767
Merge pull request #404 from embark-framework/chore/webpack-optimization 
Add a plugin that caches to increase file processing speed
 2018-05-10 14:46:52 -04:00
Jonathan Rainville 59c61d6be1 hode messages from plugin 2018-05-10 14:45:35 -04:00