ff0d24aa1f
Merge branch 'features/ipfs-process' of https://github.com/embark-framework/embark into features/ipfs-process
...
# Conflicts:
# lib/contracts/blockchain.js
2018-05-30 12:02:30 -04:00
b5d9a86680
start blockchain process at false and deploy on ready
2018-05-30 12:00:44 -04:00
138aaf39ff
fix processes on ubuntu
2018-05-30 11:03:33 -04:00
fe34d84ff4
put back package lock
2018-05-30 11:03:33 -04:00
64bebc2bbf
remove package lock
2018-05-30 11:03:33 -04:00
a6ee63d7aa
package json pls fix this
2018-05-30 11:03:33 -04:00
2f3a94f3a1
little fixes
2018-05-30 11:03:33 -04:00
2023689eb2
fix tests
2018-05-30 11:03:33 -04:00
4df669ab52
add more error management to ipfs
2018-05-30 11:03:33 -04:00
d06a7f43ac
fix swarm spawn
2018-05-30 11:03:33 -04:00
c86c50fb4e
boot swarm with spawn
2018-05-30 11:03:33 -04:00
8655b49a39
change ipfs to spawn too
2018-05-30 11:03:33 -04:00
73db1a6133
something en.json
2018-05-30 11:03:33 -04:00
3f671c2fb0
conflict in en.json
2018-05-30 11:03:33 -04:00
d36af9f5e1
fix blockchain start
2018-05-30 11:03:33 -04:00
4e20e82edf
conflict in blockchain
2018-05-30 11:03:33 -04:00
a88ab82261
conflict in blockchain.js
2018-05-30 11:02:01 -04:00
b0a64cc043
use right version
2018-05-30 10:57:25 -04:00
e02648dbef
add error if user uses ipfs 0.4.14 or lower
2018-05-30 10:57:25 -04:00
023d8f7f5f
fix logs
2018-05-30 10:57:25 -04:00
3c7bdbf6cf
set cors domain depending on the webserverConfig
2018-05-30 10:57:25 -04:00
ac7612136e
start storage node on run too
2018-05-30 10:57:25 -04:00
857c7d8c85
small fixes
2018-05-30 10:57:25 -04:00
f08c700151
reverse plugin.js changes
2018-05-30 10:57:25 -04:00
2b54dfd7cc
conflict in en.json
2018-05-30 10:57:25 -04:00
0f07a00791
detect swarm started signal
2018-05-30 10:57:25 -04:00
e67fafdc29
conflict in en.json
2018-05-30 10:57:25 -04:00
bc853ef899
conflict in en.json
2018-05-30 10:57:25 -04:00
70d3e6a46f
conflict en.json
2018-05-30 10:57:25 -04:00
e3a93a6d61
add storageProcessesLauncher that can work for swarm or ipfs
2018-05-30 10:57:25 -04:00
56f25ebba1
clonflict for silent
2018-05-30 10:57:25 -04:00
d969eb0065
fix processes on ubuntu
2018-05-30 10:52:15 -04:00
198760609c
new trasnlastion
2018-05-30 09:18:05 -04:00
17c7880441
fix missing default from
2018-05-30 09:06:38 -04:00
99fd1be986
use object assign to assign new values to contract
2018-05-30 08:55:34 -04:00
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
d39f5e1868
Merge pull request #467 from embark-framework/simulatorCommandLine
...
fix simulator preferential treatment
2018-05-30 06:42:02 -04:00
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
89e0d39742
make require and test work
2018-05-29 16:41:55 -04:00
302476e95e
fix simulator preferential treatment
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-29 14:19:25 -05:00
0be18390f1
get rid of the template
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-29 14:02:26 -05:00
12836f53e8
alias to the abi property in an object
...
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
2018-05-29 13:53:21 -05:00
74d76585db
build only once
2018-05-29 13:48:07 -04:00
6dae1e04c3
start new file for tests
2018-05-29 10:37:19 -04:00
67b8f76384
reformat run_test
2018-05-29 09:24:45 -04:00
df9907d8f4
put back package lock
2018-05-29 08:24:11 -04:00
cfcf40c81a
remove package lock
2018-05-29 08:20:44 -04:00
cd96aebdcd
early return if failing to connect to node
2018-05-28 17:55:59 -04:00
cccb391fb4
package json pls fix this
2018-05-28 17:04:11 -04:00
a7bc9755c3
little fixes
2018-05-28 16:02:44 -04:00
Jonathan Rainville
Iuri Matias
emizzle
VoR0220