d1c3f36d02
update translations
2018-05-23 11:17:01 -04:00
5f3361d030
conflict in en.json
2018-05-23 11:16:56 -04:00
f10abc8da1
Merge branch 'develop' into features/show-building-placeholder
2018-05-23 09:36:11 +10:00
db9fbef140
Add loading placeholder page while embark is building asset files.
...
We could extend this further to launch the webserver with the placeholder page before building the contracts as well.
2018-05-22 15:15:34 +10:00
46e040f861
Merged in merge conflicts from remote
2018-05-22 12:16:13 +10:00
85919a4f6d
Update to make the imports 'shim' more readable as requested.
2018-05-22 12:11:45 +10:00
295152de82
Merge branch 'develop' into features/improve-imports
2018-05-21 21:46:14 +10:00
d4c04bbed7
Improve dapp imports to allow alternate syntax for importing contracts
...
* Now supports alternate import statements:
* import {Token} from 'Embark/contracts';
* import * as Contracts from 'Embark/contracts';
as well as the existing syntax:
* import Token from 'Embark/contracts/Token';
* Contracts js files moved from .embark to .embark/contracts
* .embark/contracts/index.js generated on the fly which requires all contracts in .embark/contract automatically and then creates a module.exports with each of them.
2018-05-21 21:43:36 +10:00
a1e3c741a0
remove remaning of accounts config in blockchain
2018-05-18 13:39:34 -04:00
50103a8c02
conflict in en.json
2018-05-18 13:39:29 -04:00
f2e52d1dbc
create processLauncher that launches and subscribes to process
2018-05-17 15:26:44 -04:00
c1de9defcd
Merge pull request #424 from embark-framework/features/remove-upload-option
...
Removed `platform` from the upload command line option as it is being specified in the storage.json config.
2018-05-17 15:20:47 -04:00
f828e9d87e
add missing comma
2018-05-17 08:58:26 -04:00
627bf0c939
Removed `platform` from the upload command line option as it is being specified in the storage.json config.
...
Removed duplicates from en.json.
Fixed upload error message bug showing encoded interpolated string
2018-05-17 17:38:17 +10:00
1c125a019c
conflict in en.json
2018-05-16 16:41:15 -04:00
597d40e824
add missing keys
2018-05-16 15:26:57 -04:00
c5f80c72b9
add 0x if private key doesn't have it
2018-05-14 16:38:15 -04:00
7b1a219b51
pass isDev to engine so that it can show a warning
2018-05-14 14:32:19 -04:00
3f09d5d3f0
add tests for getContract
2018-05-14 14:04:26 -04:00
24c4c51232
add locales
2018-05-14 12:14:05 -04:00
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
Jonathan Rainville
Eric Mastro