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

2421 Commits

Author SHA1 Message Date
Iuri Matias f4010bd66e remove unnecessary determin params call 2018-05-30 13:35:36 -04:00
Iuri Matias 8cc86e0b0f remove legacy events 2018-05-30 13:35:36 -04:00
Iuri Matias 742632eccf remove contractsManager dependency 2018-05-30 13:35:36 -04:00
Iuri Matias 3f9c55131b use requests instead of contractsManager directly 2018-05-30 13:35:36 -04:00
Iuri Matias 5f64376c84 refactor generateContractsJson 2018-05-30 13:35:36 -04:00
Iuri Matias cf999ce997 refactor runcode to use events instead; remove dependencies 2018-05-30 13:35:36 -04:00
Iuri Matias fc92b69211 use self 2018-05-30 13:35:03 -04: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 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