Commit Graph

19436 Commits

Author SHA1 Message Date
jl777
1ed9e2c8b8 Merge pull request #921 from letolabs/size_on_disk
Add size_on_disk to getblockchaininfo from BTC master
2018-10-28 22:38:20 -11:00
Jonathan "Duke" Leto
42bf3ac4d8 Add size_on_disk to getblockchaininfo from BTC master 2018-10-28 22:20:07 -07:00
jl777
07abafda25 Merge pull request #912 from DION-PAY/dev
fix dion perms and assetchains.old
2018-10-18 05:29:03 -11:00
webworker01
acd9f324a7 fix dion perms and assetchains.old 2018-10-18 15:52:00 +00:00
jl777
6afed391f3 Merge pull request #910 from DION-PAY/dev
add dion
2018-10-17 20:14:11 -11:00
webworker01
da9fbe90d2 add dion 2018-10-17 16:13:56 -04:00
jl777
d5107f6415 Merge pull request #909 from chainmakers/dev
add KMDICE
2018-10-17 08:43:17 -11:00
Jorian
d0d61ef2de add kmdice files 2018-10-17 21:33:49 +02:00
Jorian
a15ea398e3 kmdice addition 2018-10-17 21:31:28 +02:00
jl777
01ba6d10d3 Merge pull request #907 from jl777/kolo
PGT
2018-10-11 23:54:35 -11:00
Mihail Fedorov
3cc05dc7b8 PGT 2018-10-11 04:07:04 +03:00
jl777
e3eea61546 -dpowassets 2018-10-08 09:09:23 -11:00
jl777
ad0e6b93b8 Merge pull request #905 from DeckerSU/dev
+ freq:5 for EMC2
2018-10-07 03:07:19 -11:00
DeckerSU
eb94acf733 + freq:5 for EMC2 2018-10-07 17:06:27 +03:00
jl777
cc2cd73ae0 Merge pull request #904 from himu007/patch-7
Update dpowassets
2018-10-02 02:14:27 -11:00
SHossain
4c95cd4c6f Update dpowassets 2018-10-02 14:13:58 +01:00
jl777
d72ad91424 Merge pull request #901 from himu007/patch-6
Update README.md
2018-10-01 00:35:23 -11:00
SHossain
5ca814d52d Update README.md 2018-10-01 10:52:36 +01:00
jl777
5441476fab Merge pull request #898 from himu007/patch-3
Update README.md
2018-09-30 08:42:19 -11:00
SHossain
e47eab188b Update README.md 2018-09-30 20:03:52 +01:00
jl777
1513c37f65 Merge pull request #894 from jl777/jl777
+print
2018-09-24 05:54:55 -11:00
jl777
2ee7b69b7a Merge pull request #895 from jl777/FSM
FSM
2018-09-24 05:54:37 -11:00
jl777
a5a8968a32 Merge branch 'beta' into dev 2018-09-24 05:49:30 -11:00
jl777
49adb58081 Merge branch 'master' into beta 2018-09-24 05:09:14 -11:00
jl777
17b55502e5 Merge pull request #891 from chainmakers/dev
add MGNX
2018-09-24 03:50:53 -11:00
jl777
6b72038d2d add claimpubkey check 2018-09-24 03:45:08 -11:00
Jorian
966a168037 fix ip 2018-09-24 15:43:16 +02:00
Jorian
594c9d1274 add mgnx 2018-09-24 15:41:03 +02:00
jl777
10a5fd2cd0 Test 2018-09-24 00:37:09 -11:00
jl777
2ce154d60e Allow sendtoaddress for PIRATE to notary 2018-09-24 00:36:18 -11:00
jl777
983ff7f46d Test 2018-09-23 23:34:34 -11:00
jl777
2511d10f8a Test 2018-09-23 23:33:24 -11:00
jl777
c884b0f0ea Test 2018-09-23 23:30:19 -11:00
jl777
c15c1ad2ef Test 2018-09-23 23:25:22 -11:00
jl777
733b58f249 Test 2018-09-23 23:23:20 -11:00
jl777
5c43df8b48 Test 2018-09-23 23:14:55 -11:00
jl777
1826284cb3 Print 2018-09-23 22:51:01 -11:00
jl777
186ce5d29d Test 2018-09-23 22:44:19 -11:00
jl777
b628372890 Test 2018-09-23 22:38:59 -11:00
jl777
e072837352 Test 2018-09-23 22:36:45 -11:00
jl777
11b0ed84d5 Test 2018-09-23 22:33:18 -11:00
jl777
b73666e2ff Test 2018-09-23 22:26:42 -11:00
jl777
2ca4cd6e9a Test 2018-09-23 22:25:15 -11:00
jl777
36fbbfe6fc Test 2018-09-23 22:20:51 -11:00
jl777
d4f6cde550 Test 2018-09-23 22:18:37 -11:00
jl777
8dab0bc78c Test 2018-09-23 22:10:42 -11:00
jl777
eff8c62cb3 Test 2018-09-23 22:04:40 -11:00
jl777
23acb025c3 Merge pull request #890 from himu007/dev
add PIRATE
2018-09-23 09:57:32 -11:00
himu007
40027428e4 add PIRATE 2018-09-23 21:52:56 +01:00
SHossain
426efacd34 Update dpowassets 2018-09-23 20:55:23 +01:00