1913 Commits

Author SHA1 Message Date
Iuri Matias
d1c3f36d02 update translations 2018-05-23 11:17:01 -04:00
Iuri Matias
201ec6c652 remove unneeded web3 object assignment 2018-05-23 11:17:01 -04:00
Jonathan Rainville
5f3361d030 conflict in en.json 2018-05-23 11:16:56 -04:00
Iuri Matias
3e9376138b move runCode 2018-05-23 11:16:17 -04:00
Jonathan Rainville
592b4ed4fd conflict in code_generator 2018-05-23 11:16:13 -04:00
Iuri Matias
30b1975e34 use request to get contract 2018-05-23 11:15:06 -04:00
Iuri Matias
c83064adf6 use request to get contract 2018-05-23 11:15:06 -04:00
Iuri Matias
7cebbec7b6 make determine arguments async 2018-05-23 11:15:06 -04:00
Iuri Matias
c0549a6642 refactor to waterfall, in preparation to making determine arguments async 2018-05-23 11:15:06 -04:00
Iuri Matias
3fb2b6fa60 remove direct reference to contracts manager, use a request instead 2018-05-23 11:15:06 -04:00
Iuri Matias
98c5b2dd06 move contractsState emit to contracts 2018-05-23 11:15:06 -04:00
Iuri Matias
250e0b8798 adjust contracts events emission 2018-05-23 11:15:06 -04:00
Iuri Matias
a664492d1f move onDeploy to special configs module 2018-05-23 11:15:06 -04:00
Iuri Matias
31833579a7 finish converting afterDeploy module 2018-05-23 11:15:06 -04:00
Iuri Matias
2064d26914 update package lock 2018-05-23 11:15:06 -04:00
Iuri Matias
c800598e9b move afterDeploy code into a special configs module 2018-05-23 11:15:06 -04:00
Iuri Matias
21026e07ae remove unnecessary passing of params around 2018-05-23 11:15:06 -04:00
Iuri Matias
000d7beb27 move code to assert connection to blockchain module 2018-05-23 11:15:06 -04:00
Iuri Matias
0ec4698e6b fix compiler tests 2018-05-23 11:15:05 -04:00
Iuri Matias
16eaacbd54 call compiler through a request 2018-05-23 11:15:05 -04:00
Iuri Matias
af8a720e90 guard against currentChain not set 2018-05-23 11:15:05 -04:00
Iuri Matias
0fcf508e17 associate address to contract 2018-05-23 11:15:05 -04:00
Iuri Matias
2ac38fb84a if no chain set then contract is not tracked 2018-05-23 11:15:05 -04:00
Iuri Matias
ba29f0e928 move deploy tracker into a module 2018-05-23 11:15:05 -04:00
Iuri Matias
78f64945ab remove web3 dependency from deploy tracker; use request instead to get block 2018-05-23 11:15:05 -04:00
Iuri Matias
68c277cad1 remove unneded references to web3 objects; leave clarifying notes 2018-05-23 11:15:05 -04:00
Iuri Matias
ac45b7a19b remove unneded assigment; add clarification/TODO 2018-05-23 11:15:05 -04:00
Iuri Matias
a8e29976b7 move deploy to blockchain component 2018-05-23 11:15:05 -04:00
Iuri Matias
9b1a78cdaa move Contract object to blockchain module 2018-05-23 11:15:05 -04:00
Iuri Matias
84dcfca254 move getBlock to blockchain module 2018-05-23 11:15:05 -04:00
Iuri Matias
1547a115a4 move getCode to blockchain 2018-05-23 11:15:05 -04:00
Iuri Matias
ae93d78cc2 move accounts to web3 module 2018-05-23 11:15:04 -04:00
Iuri Matias
4d0ebc03ad move web3 init to its own module 2018-05-23 11:15:04 -04:00
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