Jonathan Rainville
|
41aaa5c20d
|
conflict package json
|
2018-05-31 08:37:17 -04:00 |
|
Jonathan Rainville
|
68fb70f788
|
reformat run_test
|
2018-05-31 08:37:00 -04:00 |
Iuri Matias
|
01fc78059e
|
Merge pull request #466 from embark-framework/abiFixes
alias to the abi property in an object
|
2018-05-30 15:37:42 -04:00 |
VoR0220
|
2d98938f18
|
eliminate space
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
|
2018-05-30 14:35:07 -05:00 |
|
VoR0220
|
21b530fad2
|
fix for the fix
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
|
2018-05-30 14:34:36 -05:00 |
|
VoR0220
|
4d65ccec7a
|
fixed this up
Signed-off-by: VoR0220 <catalanor0220@gmail.com>
|
2018-05-30 14:33:29 -05:00 |
|
Iuri Matias
|
4aa33935b0
|
Merge pull request #465 from embark-framework/features/ipfs-process
Processes everywhere
|
2018-05-30 13:33:17 -04:00 |
|
Jonathan Rainville
|
e35474f726
|
early return
|
2018-05-30 13:23:18 -04:00 |
|
Jonathan Rainville
|
4db2d40ef5
|
fix swarm
|
2018-05-30 12:58:32 -04:00 |
|
Jonathan Rainville
|
b5e96beb81
|
little oopsie
|
2018-05-30 12:07:48 -04:00 |
|
Jonathan Rainville
|
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 |
|
Jonathan Rainville
|
b5d9a86680
|
start blockchain process at false and deploy on ready
|
2018-05-30 12:00:44 -04:00 |
|
Jonathan Rainville
|
138aaf39ff
|
fix processes on ubuntu
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
fe34d84ff4
|
put back package lock
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
64bebc2bbf
|
remove package lock
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
a6ee63d7aa
|
package json pls fix this
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
2f3a94f3a1
|
little fixes
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
2023689eb2
|
fix tests
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
4df669ab52
|
add more error management to ipfs
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
d06a7f43ac
|
fix swarm spawn
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
c86c50fb4e
|
boot swarm with spawn
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
8655b49a39
|
change ipfs to spawn too
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
73db1a6133
|
something en.json
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
3f671c2fb0
|
conflict in en.json
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
d36af9f5e1
|
fix blockchain start
|
2018-05-30 11:03:33 -04:00 |
|
Jonathan Rainville
|
4e20e82edf
|
conflict in blockchain
|
2018-05-30 11:03:33 -04:00 |
|
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
|
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 |
|
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
|
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 |