status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-01-12 06:54:58 +00:00
Code Issues Projects Releases Wiki Activity
2,080 Commits 54 Branches 96 Tags 20 MiB
Commit Graph

2080 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Rainville
a112f18d93 always deploy contracts when in tests and make all test work 2018-06-01 10:05:43 -04:00
Jonathan Rainville
0ab151500d add id to solc process to avoid multiple callback calls 2018-05-31 13:32:02 -04:00
Jonathan Rainville
a8507998d9 update other tests 2018-05-31 11:27:38 -04:00
Jonathan Rainville
a0cfe525a9 fix contracts that are instances of 2018-05-31 09:52:37 -04:00
Jonathan Rainville
2ec94feaec Merge branch 'features/test-revamp' of https://github.com/embark-framework/embark into features/test-revamp 
# Conflicts:
#	lib/i18n/locales/en.json
#	package-lock.json
 2018-05-31 08:39:45 -04:00
Jonathan Rainville
4b4ae66c93 change another storage test 2018-05-31 08:38:25 -04:00
Jonathan Rainville
827a3b309f make running config() without callback work 2018-05-31 08:38:25 -04:00
Jonathan Rainville
756d77a9b1 conflict en.json 2018-05-31 08:38:20 -04:00
Jonathan Rainville
622f54bda9 fix missing default from 2018-05-31 08:37:21 -04:00
Jonathan Rainville
641a77c2dc use object assign to assign new values to contract 2018-05-31 08:37:21 -04:00
Jonathan Rainville
1176a2e8be make require and test work 2018-05-31 08:37:21 -04:00
Jonathan Rainville
093bd13c6a build only once 2018-05-31 08:37:21 -04:00
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
Jonathan Rainville
32e676384d change another storage test 2018-05-30 17:35:54 -04:00
Jonathan Rainville
521165f710 make running config() without callback work 2018-05-30 16:17:17 -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