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

1880 Commits

Author SHA1 Message Date
Iuri Matias 28ef2ed067 move web3 utils to utils module 2018-05-23 11:15:04 -04:00
Jonathan Rainville c3652da371 add line to compile .vy 2018-05-23 11:15:04 -04:00
Iuri Matias a0f6c96d89 update to 3.0.4 2018-05-23 11:15:04 -04:00
Iuri Matias 14c046954e update to 3.0.3 2018-05-23 11:15:04 -04:00
Iuri Matias 7d9389655e update to 3.0.2 2018-05-23 11:15:04 -04:00
Iuri Matias f3fb487d2e update package lock 2018-05-23 11:15:04 -04:00
Iuri Matias 3e1888aeb7 update compiler test 2018-05-23 11:15:04 -04:00
Iuri Matias 204bcb8cfe
Merge pull request #451 from embark-framework/bug_fix/create-dist-folder-before-placeholder-page 
Fixed bug where dist folder is created before placeholder page
 2018-05-23 05:28:31 -04:00
Eric Mastro ab1113fc31 Fixed bug where dist folder is created before placeholder page 
If dist folder did not already exist, the folder is created prior to creation of the placeholder page. Without this, the dapp files are never built.
 2018-05-23 13:35:18 +10:00
Jonathan Rainville 0ef0342fe3
Merge pull request #447 from embark-framework/features/show-building-placeholder 
Add loading placeholder page while embark is building asset files.
 2018-05-22 19:57:09 -04:00
Eric Mastro f10abc8da1
Merge branch 'develop' into features/show-building-placeholder 2018-05-23 09:36:11 +10:00
emizzle ab738c05f9 Moved placeholder page html to code generator and ejs template. 2018-05-23 09:33:05 +10:00
Jonathan Rainville 48836b3d5b
Merge pull request #446 from alaibe/fr-translation 
Adding fr translation
 2018-05-22 15:34:07 -04:00
Anthony Laibe 77dbcd4424 Improve fr translation (PR feedback) 2018-05-22 20:31:28 +01:00
Iuri Matias 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
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
Iuri Matias 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
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 566bcc71ae
Merge pull request #437 from embark-framework/no_solc_reload 
don't unnecessary reload solc
 2018-05-18 13:55:39 -04:00
Jonathan Rainville 6702cd2231 fix tests 2018-05-18 13:44:03 -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 59c4456206 move provide rtests to accountParser tests 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
Jonathan Rainville d6257dcbb9 fix contract tests 2018-05-18 12:58:09 -04:00