f10abc8da1
Merge branch 'develop' into features/show-building-placeholder
2018-05-23 09:36:11 +10:00
ab738c05f9
Moved placeholder page html to code generator and ejs template.
2018-05-23 09:33:05 +10:00
48836b3d5b
Merge pull request #446 from alaibe/fr-translation
...
Adding fr translation
2018-05-22 15:34:07 -04:00
77dbcd4424
Improve fr translation (PR feedback)
2018-05-22 20:31:28 +01:00
ceb48ebb21
Merge pull request #445 from embark-framework/features/improve-imports
...
Improve dapp imports to allow alternate syntax for importing contracts
2018-05-22 12:06:22 -04: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
6bcf03adc5
Merge pull request #441 from embark-framework/ipfs_object
...
make Ipfs object available in environment
2018-05-21 10:31:30 -05:00
2271643015
Merge pull request #442 from 3esmit/patch-2
...
make getAccounts a simple web3..eth.getAccounts wrapper.
2018-05-21 08:04:28 -04: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
a297407e99
Adding fr translation
2018-05-20 20:53:08 +01:00
56b20becfb
make getAccounts a simple web3 wrapper.
...
Maybe could even be like Test.prototype.getAccounts = web3.eth.getAccounts; ?
2018-05-18 20:44:14 -03:00
0ff5930427
Merge pull request #433 from natachadelarosa/develop
...
[FIX #421 ] Add Spanish Translation to embark
2018-05-18 17:45:24 -04:00
9013af29cd
Merge pull request #438 from embark-framework/features/improve-process-wrapper
...
Improve Process Launcher
2018-05-18 16:03:13 -04:00
0363c676d4
initialized ipfs object to environment
2018-05-18 15:56:36 -04:00
e2c2373249
accept hash of objects as second param for runcode
2018-05-18 15:55:34 -04:00
db6b90e77f
Merge pull request #439 from embark-framework/uv_close_fix
...
only close watcher when it's actually ready
2018-05-18 14:51:05 -04:00
c6970cfa4b
Merge pull request #435 from embark-framework/features/fund-user-in-dev
...
Fund user accounts in dev
2018-05-18 14:46:08 -04:00
b829643f61
use once in pipeline
2018-05-18 14:25:20 -04:00
a7be2cda26
convert solcw to use once
2018-05-18 14:22:58 -04:00
c5c00fc3b4
conflict in solcW
2018-05-18 14:11:29 -04:00
566bcc71ae
Merge pull request #437 from embark-framework/no_solc_reload
...
don't unnecessary reload solc
2018-05-18 13:55:39 -04:00
6702cd2231
fix tests
2018-05-18 13:44:03 -04:00
46c2be16de
don't unnecessary reload solc
2018-05-18 13:41:25 -04:00
6c1d9d9b39
rename startProvider to startWeb3Provider
2018-05-18 13:39:35 -04:00
4c17aa9d40
fix some PR comments
2018-05-18 13:39:35 -04:00
09cdab7e2b
fund account only in dev
2018-05-18 13:39:35 -04:00
a1e3c741a0
remove remaning of accounts config in blockchain
2018-05-18 13:39:34 -04:00
6c8653ef09
move code to front end. funds on provider start
2018-05-18 13:39:34 -04:00
418c55851b
remove warning when dev
2018-05-18 13:39:34 -04:00
372266418f
too many spaces
2018-05-18 13:39:34 -04:00
50103a8c02
conflict in en.json
2018-05-18 13:39:29 -04:00
94f0d98e28
get accounts and generate script with the right address
2018-05-18 13:38:53 -04:00
59c4456206
move provide rtests to accountParser tests
2018-05-18 13:38:53 -04:00
c3c4518cb4
move account parsing to its own module
2018-05-18 13:38:53 -04:00
668fd3a064
add fundAccount script that keeps the user's account funded
2018-05-18 13:38:53 -04:00
c6593f6168
Merge pull request #426 from embark-framework/features/update_solc_wrapper
...
update solc wrapper
2018-05-18 13:17:01 -04:00
d6257dcbb9
fix contract tests
2018-05-18 12:58:09 -04:00
4439f8b601
Merge pull request #436 from embark-framework/fixConsolePluginCmdOutput
...
Fixed Returns From Plugin Modules
2018-05-18 11:45:02 -04:00
fee40c8935
remove trailing whitespace
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:43:56 -05:00
b2e45ed95c
remove unneeded code line
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:42:08 -05:00
dc0c8c5622
fix profiler and this is ready to go
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:41:23 -05:00
8411f36e06
trying this
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:18:00 -05:00
28fa906bbf
concentrate undefined logic in the plugin output
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:04:49 -05:00
bef490f5c7
get rid of console logs and try reworking the undefined handling
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 09:42:30 -05:00
5af4eb5b25
now profiler and other plugins will be able to benefit from undefined return output for logs only plugins
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 08:54:25 -05:00
14eb48fa6b
Merge pull request #434 from embark-framework/addScroller
...
should add scroller to available services
2018-05-18 09:30:37 -04:00
c2086b94ae
should add scroller to available services
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 08:10:59 -05:00
Eric Mastro
Jonathan Rainville
Anthony Laibe
Iuri Matias
RJ Catalano
Ricardo Guilherme Schmidt