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

2194 Commits

Author SHA1 Message Date
Jonathan Rainville a88ab82261 conflict in blockchain.js 2018-05-30 11:02:01 -04:00
Jonathan Rainville b0a64cc043 use right version 2018-05-30 10:57:25 -04:00
Jonathan Rainville e02648dbef add error if user uses ipfs 0.4.14 or lower 2018-05-30 10:57:25 -04:00
Jonathan Rainville 023d8f7f5f fix logs 2018-05-30 10:57:25 -04:00
Jonathan Rainville 3c7bdbf6cf set cors domain depending on the webserverConfig 2018-05-30 10:57:25 -04:00
Jonathan Rainville ac7612136e start storage node on run too 2018-05-30 10:57:25 -04:00
Jonathan Rainville 857c7d8c85 small fixes 2018-05-30 10:57:25 -04:00
Jonathan Rainville f08c700151 reverse plugin.js changes 2018-05-30 10:57:25 -04:00
Jonathan Rainville 2b54dfd7cc conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville 0f07a00791 detect swarm started signal 2018-05-30 10:57:25 -04:00
Jonathan Rainville e67fafdc29 conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville bc853ef899 conflict in en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville 70d3e6a46f conflict en.json 2018-05-30 10:57:25 -04:00
Jonathan Rainville e3a93a6d61 add storageProcessesLauncher that can work for swarm or ipfs 2018-05-30 10:57:25 -04:00
Jonathan Rainville 56f25ebba1 clonflict for silent 2018-05-30 10:57:25 -04:00
Jonathan Rainville d969eb0065 fix processes on ubuntu 2018-05-30 10:52:15 -04:00
Jonathan Rainville 198760609c new trasnlastion 2018-05-30 09:18:05 -04:00
Jonathan Rainville 17c7880441 fix missing default from 2018-05-30 09:06:38 -04:00
Jonathan Rainville 99fd1be986 use object assign to assign new values to contract 2018-05-30 08:55:34 -04:00
Jonathan Rainville 4d0453fede
Merge pull request #468 from embark-framework/fix_service_check 
early return if failing to connect to node
 2018-05-30 08:24:15 -04:00
Iuri Matias d39f5e1868
Merge pull request #467 from embark-framework/simulatorCommandLine 
fix simulator preferential treatment
 2018-05-30 06:42:02 -04:00
emizzle c0bdff1ae4 Dynamic selection of storage provider now working based on improved storage config. 
swarm plugin now re-initialises the bzz object when it's availability is checked. this creates a much more stable swarm implementation on the dapp side.

surrounded the storage provider init code block with embark env ready

added alternate swarm gateway url

can now upload dapp to ipfs and run swarm storage and vice versa
 2018-05-30 16:34:36 +10:00
Jonathan Rainville 89e0d39742 make require and test work 2018-05-29 16:41:55 -04:00
VoR0220 302476e95e fix simulator preferential treatment 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-29 14:19:25 -05:00
VoR0220 0be18390f1 get rid of the template 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-29 14:02:26 -05:00
VoR0220 12836f53e8 alias to the abi property in an object 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-29 13:53:21 -05:00
Jonathan Rainville 74d76585db build only once 2018-05-29 13:48:07 -04:00
Jonathan Rainville 6dae1e04c3 start new file for tests 2018-05-29 10:37:19 -04:00
Jonathan Rainville 67b8f76384 reformat run_test 2018-05-29 09:24:45 -04:00
Jonathan Rainville df9907d8f4 put back package lock 2018-05-29 08:24:11 -04:00
Jonathan Rainville cfcf40c81a remove package lock 2018-05-29 08:20:44 -04:00
Iuri Matias cd96aebdcd early return if failing to connect to node 2018-05-28 17:55:59 -04:00
Jonathan Rainville cccb391fb4 package json pls fix this 2018-05-28 17:04:11 -04:00
Jonathan Rainville a7bc9755c3 little fixes 2018-05-28 16:02:44 -04:00
Jonathan Rainville 729c43bae1 fix tests 2018-05-28 15:56:03 -04:00
Jonathan Rainville 7a754ac97f add more error management to ipfs 2018-05-28 15:43:27 -04:00
Jonathan Rainville 9338b6e37f fix swarm spawn 2018-05-28 15:37:25 -04:00
Iuri Matias 836fbfbc47
Merge pull request #464 from embark-framework/metaMaskCheck 
Meta mask check
 2018-05-28 14:37:58 -04:00
VoR0220 52524c2f59 eliminate nasty outdated test 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-28 13:22:48 -05:00
Iuri Matias 6c921e3a85 fix typo 2018-05-28 13:58:49 -04:00
Iuri Matias 1eee68e901 fix typo; default environment to development 2018-05-28 13:53:10 -04:00
VoR0220 6fe3064edd spelling correction of metamask 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-28 12:45:14 -05:00
VoR0220 f34bd5df4f env check 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-28 12:28:38 -05:00
VoR0220 90b42bccb2 template correction to check for development environment and whether metamask is engaged and log that it is 
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
 2018-05-28 12:27:55 -05:00
RJ Catalano 0858092306
Merge pull request #463 from embark-framework/ens_fixes 
Ens fixes
 2018-05-28 11:56:54 -05:00
Jonathan Rainville 7a05a9ac79 boot swarm with spawn 2018-05-28 12:54:06 -04:00
Jonathan Rainville 3c32f98f71 change ipfs to spawn too 2018-05-28 12:49:44 -04:00
Jonathan Rainville 6fa472ae11 something en.json 2018-05-28 12:31:29 -04:00
Iuri Matias 033613d7f6 lint is king 2018-05-28 12:29:47 -04:00
Iuri Matias 5b58c9f1b8 fix variable name being passed to name provider implementation 2018-05-28 12:20:04 -04:00