1139 Commits

Author SHA1 Message Date
emizzle
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
emizzle
46e040f861 Merged in merge conflicts from remote 2018-05-22 12:16:13 +10:00
emizzle
85919a4f6d Update to make the imports 'shim' more readable as requested. 2018-05-22 12:11:45 +10:00
RJ Catalano
6bcf03adc5
Merge pull request #441 from embark-framework/ipfs_object
make Ipfs object available in environment
2018-05-21 10:31:30 -05:00
Eric Mastro
295152de82
Merge branch 'develop' into features/improve-imports 2018-05-21 21:46:14 +10:00
Eric Mastro
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
Anthony Laibe
a297407e99 Adding fr translation 2018-05-20 20:53:08 +01:00
Ricardo Guilherme Schmidt
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
Iuri Matias
0ff5930427
Merge pull request #433 from natachadelarosa/develop
[FIX #421] Add Spanish Translation to embark
2018-05-18 17:45:24 -04:00
Iuri Matias
9013af29cd
Merge pull request #438 from embark-framework/features/improve-process-wrapper
Improve Process Launcher
2018-05-18 16:03:13 -04:00
Iuri Matias
0363c676d4 initialized ipfs object to environment 2018-05-18 15:56:36 -04:00
Iuri Matias
e2c2373249 accept hash of objects as second param for runcode 2018-05-18 15:55:34 -04:00
Iuri Matias
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
Iuri Matias
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
Jonathan Rainville
b829643f61 use once in pipeline 2018-05-18 14:25:20 -04:00
Jonathan Rainville
a7be2cda26 convert solcw to use once 2018-05-18 14:22:58 -04:00
Jonathan Rainville
c5c00fc3b4 conflict in solcW 2018-05-18 14:11:29 -04:00
Iuri Matias
46c2be16de don't unnecessary reload solc 2018-05-18 13:41:25 -04:00
Jonathan Rainville
6c1d9d9b39 rename startProvider to startWeb3Provider 2018-05-18 13:39:35 -04:00
Jonathan Rainville
4c17aa9d40 fix some PR comments 2018-05-18 13:39:35 -04:00
Jonathan Rainville
09cdab7e2b fund account only in dev 2018-05-18 13:39:35 -04:00
Jonathan Rainville
a1e3c741a0 remove remaning of accounts config in blockchain 2018-05-18 13:39:34 -04:00
Jonathan Rainville
6c8653ef09 move code to front end. funds on provider start 2018-05-18 13:39:34 -04:00
Jonathan Rainville
418c55851b remove warning when dev 2018-05-18 13:39:34 -04:00
Jonathan Rainville
372266418f too many spaces 2018-05-18 13:39:34 -04:00
Jonathan Rainville
50103a8c02 conflict in en.json 2018-05-18 13:39:29 -04:00
Jonathan Rainville
94f0d98e28 get accounts and generate script with the right address 2018-05-18 13:38:53 -04:00
Jonathan Rainville
c3c4518cb4 move account parsing to its own module 2018-05-18 13:38:53 -04:00
Jonathan Rainville
668fd3a064 add fundAccount script that keeps the user's account funded 2018-05-18 13:38:53 -04:00
Iuri Matias
c6593f6168
Merge pull request #426 from embark-framework/features/update_solc_wrapper
update solc wrapper
2018-05-18 13:17:01 -04:00
Iuri Matias
4439f8b601
Merge pull request #436 from embark-framework/fixConsolePluginCmdOutput
Fixed Returns From Plugin Modules
2018-05-18 11:45:02 -04:00
VoR0220
fee40c8935 remove trailing whitespace
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:43:56 -05:00
VoR0220
b2e45ed95c remove unneeded code line
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:42:08 -05:00
VoR0220
dc0c8c5622 fix profiler and this is ready to go
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:41:23 -05:00
VoR0220
8411f36e06 trying this
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:18:00 -05:00
VoR0220
28fa906bbf concentrate undefined logic in the plugin output
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 10:04:49 -05:00
VoR0220
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
VoR0220
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
Iuri Matias
14eb48fa6b
Merge pull request #434 from embark-framework/addScroller
should add scroller to available services
2018-05-18 09:30:37 -04:00
VoR0220
c2086b94ae should add scroller to available services
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-18 08:10:59 -05:00
Natacha De la Rosa
bc681a5b4f [FIX #421] Add Spanish Translation to embark
added spanish translation to Emabrk.
2018-05-17 22:21:41 -04:00
RJ Catalano
380b2258e7
Merge pull request #432 from embark-framework/addCompileOnlyFlag
add command for only compiling contracts in build command
2018-05-17 16:56:50 -05:00
VoR0220
dd9e85fa27 add command for only compiling contracts in build command
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-17 15:37:57 -05:00
Iuri Matias
c94d8e9f91 update old solc process to new process wrapper 2018-05-17 15:26:44 -04:00
Jonathan Rainville
f2e52d1dbc create processLauncher that launches and subscribes to process 2018-05-17 15:26:44 -04:00
Iuri Matias
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
Iuri Matias
a967b304e3
Merge pull request #422 from 3esmit/patch-1
Initialize web3 provider before deployAll
2018-05-17 15:08:29 -04:00
Jonathan Rainville
8e2af920b8 early callback in compiler 2018-05-17 10:02:53 -04:00
Jonathan Rainville
bcb7c80758 Early return if no sol files 2018-05-17 09:49:50 -04:00
Jonathan Rainville
dd78aef3db fix vyper .vy 2018-05-17 09:40:38 -04:00