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

3654 Commits

Author SHA1 Message Date
Iuri Matias cbd208cae1
Merge pull request #805 from embark-framework/feature/blockchain-indicator 
Adding blockchain indicator
 2018-09-11 14:00:01 -04:00
Iuri Matias a2e03b5b13
Merge pull request #801 from embark-framework/bugfix/avoid-multiple-connect 
Avoid multiple connect to IPC
 2018-09-11 13:46:33 -04:00
Iuri Matias 6f188ae6c8
Update PULL_REQUEST_TEMPLATE.md 2018-09-11 13:38:40 -04:00
Iuri Matias bc22418250
Merge pull request #798 from embark-framework/features/dev_funds-doco 
Add `dev_funds` doco to templates
 2018-09-11 13:35:18 -04:00
Santiago Gonzalez Toral 8a43b0789e Merge branch 'develop' of https://github.com/embark-framework/embark into develop 2018-09-11 12:32:07 -05:00
Santiago Gonzalez Toral fea1783516 Fixed Typo in spanish locale file 2018-09-11 12:31:42 -05:00
Marlon Henry Schweigert 6f8e453ddd
Update fr.json 2018-09-11 10:50:33 -03:00
Anthony Laibe 0884cd7c8e Adding blockchain indicator 2018-09-11 09:12:09 +01:00
Subramanian Venkatesan b3eedc4ba2 embark config 2018-09-10 23:12:04 +05:30
Subramanian Venkatesan fe0bbc3559 changes from the code review 2018-09-10 22:38:17 +05:30
Anthony Laibe 6ad9c0dc5a Update error with or 2018-09-10 17:08:09 +01:00
Anthony Laibe 32a6b53c6a Add missing callback 2018-09-10 17:05:11 +01:00
Marlon Henry Schweigert 043f9a016d Added French translations 2018-09-10 12:44:59 -03:00
Anthony Laibe 16c870ac34 Use error logger 2018-09-10 13:57:54 +01:00
Subramanian Venkatesan 2782acf438 fix plugin command 2018-09-10 18:25:17 +05:30
emizzle 1d03f01531 Update warnings in embark after upload 
warn user that they need to run a blockchain node and swarm for the dapp to work correctly.
 2018-09-10 22:47:31 +10:00
emizzle 6cfc914a04 Update package.json for swarmjs 2018-09-10 22:42:10 +10:00
emizzle b759e9eed7 Add ‘defaultpath’ for upload 
Hardcode to ‘index.html’
 2018-09-10 22:42:10 +10:00
emizzle 9d39fa39ac Swarm updates for embark 
Change __embarkSwarm to use new SwarmJS and change over from promises.

Add note after upload that blockchain nodes needs to be running to access the swarm uploaded dapp.

Fix typo with swarm “on” available.

Linting / cleanup
 2018-09-10 22:42:10 +10:00
emizzle e44b62d550 SwarmJS browser support 2018-09-10 22:42:10 +10:00
emizzle 3f5fe21b90 change to ‘uploadDirectory’ 2018-09-10 22:42:10 +10:00
emizzle 2dc8d8c276 Fix issue with swarm isAvailable 2018-09-10 22:42:10 +10:00
emizzle fcb75dee11 Move to swarmjs and await geth ready 
Move to swarmjs library (in embark-framework).

Wait for geth to start before start of swarm check.
 2018-09-10 22:42:10 +10:00
emizzle b5e8546ebd Converted upload procedure to local SwarmGW lib 
# Conflicts:
#	package-lock.json
 2018-09-10 22:42:00 +10:00
Anthony Laibe 68ef5454e0 Avoid multiple connect to IPC 2018-09-10 11:52:06 +01:00
Subramanian Venkatesan 53de6dcb19 Fixes to npm command parsing 2018-09-10 16:19:37 +05:30
Anthony Laibe 613921169a Better trace register ens 2018-09-10 10:12:02 +01:00
Subramanian Venkatesan 78bc27ad95 fix runCmd 2018-09-10 14:16:02 +05:30
Subramanian Venkatesan f20934ac8c Use Object.assign 2018-09-10 14:11:40 +05:30
Subramanian Venkatesan 4823d2312e remove console.log 2018-09-10 14:07:02 +05:30
Subramanian Venkatesan cb751b5213 install npm package using shell.js 2018-09-10 14:01:36 +05:30
Anthony Laibe b41bcbbe17 Use trace logger for code runner error 2018-09-10 09:26:37 +01:00
emizzle 92ed32aeba Add `dev_funds` doco to templates 2018-09-10 11:22:47 +10:00
Subramanian Venkatesan c8e812e638 Plugin Command Module 2018-09-09 23:22:57 +05:30
Subramanian Venkatesan 74f0d05ca0 Plugin Command 2018-09-09 23:07:55 +05:30
Iuri Matias 8c3ac34fac
Merge pull request #794 from embark-framework/bug_fix/check-node-modules 
Check node modules before running
 2018-09-07 19:05:21 -04:00
Iuri Matias 833fcef22a
Merge pull request #795 from embark-framework/bug_fix/webserver-config-change 
Watch webserver config and restart it
 2018-09-07 19:04:17 -04:00
Iuri Matias 4128a96997
Merge pull request #796 from embark-framework/bug_fix/web3-location 
getWeb3Location should use require.resolve()
 2018-09-07 19:03:59 -04:00
Iuri Matias 2a41c7c310
Merge pull request #792 from embark-framework/feature/ens-configured-only-once 
Ens config is run only once
 2018-09-07 18:48:06 -04:00
Iuri Matias 12fbb46aeb
Merge pull request #793 from embark-framework/feature/metamask-eip-1102 
Ready for EIP 1102
 2018-09-07 18:46:39 -04:00
Michael Bradley, Jr 7549c1f8e6 require.resolve() should start by looking in embark's own node_modules 2018-09-07 16:28:03 -05:00
Michael Bradley, Jr 13e21702d2 getWeb3Location should use require.resolve() for "version:get:web3" event 2018-09-07 15:52:30 -05:00
Jonathan Rainville 3d37fe6362 catch webserver config and restart it 2018-09-07 14:54:15 -04:00
Jonathan Rainville fb7b98c055 make sure we are in a Dapp 2018-09-07 12:40:25 -04:00
Jonathan Rainville 5c973258a5 add pakcage 2018-09-07 12:37:30 -04:00
Jonathan Rainville 542462faed check deps before launching 2018-09-07 12:37:18 -04:00
Anthony Laibe 4c580dd54d Pr feedback using once 2018-09-07 14:57:49 +01:00
Anthony Laibe 93424f5c78 Ready for EIP 1102 2018-09-07 14:31:34 +01:00
Anthony Laibe 4481e6eb99 Ens config is run only once 2018-09-07 11:18:43 +01:00
Iuri Matias a622f22dcd update package lock 2018-09-06 16:35:32 -04:00