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 |
|
Jonathan Rainville
|
fbd36b58e5
|
ignore tmp files
|
2018-05-10 13:42:02 -04:00 |
|
Jonathan Rainville
|
a3f8c809a0
|
add queue for changes to do only one file build at the time
|
2018-05-10 13:28:12 -04:00 |
|
Jonathan Rainville
|
986ef520fc
|
add plugin that caches
|
2018-05-10 12:22:58 -04:00 |
|
Jonathan Rainville
|
a35ce6f73e
|
pass normalizeInput
|
2018-05-10 11:14:25 -04:00 |
|
Jonathan Rainville
|
83f97407e8
|
touch ups
|
2018-05-10 10:48:06 -04:00 |
|
Jonathan Rainville
|
31e82e31d0
|
do a process for each file
|
2018-05-10 10:43:10 -04:00 |
|
Jonathan Rainville
|
ed1d0ce67c
|
make only webpack in a separate process
|
2018-05-10 10:10:09 -04:00 |
|
Iuri Matias
|
9d9d498e9a
|
update package.json
|
2018-05-09 17:31:30 -04:00 |
|
Iuri Matias
|
911efe4e84
|
Merge pull request #400 from embark-framework/features/write-files-process
Write files in a different process
|
2018-05-09 16:57:43 -04:00 |
|
Iuri Matias
|
f85017e3f4
|
Merge pull request #401 from embark-framework/bug_fix/blockchain-dev
Use --dev when in development
|
2018-05-09 16:17:17 -04:00 |
|
Jonathan Rainville
|
cc93667198
|
fix test
|
2018-05-09 15:16:46 -04:00 |
|
Jonathan Rainville
|
8cc485ac94
|
add isDev blockchain option
|
2018-05-09 15:16:46 -04:00 |