DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity
16,714 Commits 6 Branches 7 Tags
9f6cb8f05e2514a3d075633e893b46352614ea67
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jl777 38a3382327 Merge branch 'dev' into jl777 2018-04-22 12:57:26 +03:00
jl777 d762865ec9 Merge branch 'beta' into dev 2018-04-22 10:22:56 +03:00
jl777 642dd2f82f Merge pull request #609 from jl777/jl777 
Jl777
 2018-04-21 23:11:46 +03:00
jl777 710f1a33f1 Merge pull request #608 from ca333/patch-5 
update configure
 2018-04-21 19:45:28 +03:00
jl777 56b09b29ed Merge pull request #607 from jl777/jl777 
Jl777
 2018-04-21 19:18:03 +03:00
jl777 e77c5b8d07 Merge pull request #606 from KomodoPlatform/dev 
fix OSX/WIN port
 2018-04-21 17:26:06 +03:00
jl777 7d54b77e7d Merge pull request #605 from jl777/jl777 
Jl777
 2018-04-21 17:10:00 +03:00
jl777 d013a67e45 Merge pull request #604 from jl777/jl777 
Jl777
 2018-04-21 15:35:07 +03:00
jl777 8d7c97d9e8 Merge pull request #603 from jl777/jl777 
Jl777
 2018-04-21 10:45:47 +03:00
jl777 1fd382079b Merge pull request #602 from jl777/jl777 
Jl777
 2018-04-20 22:32:41 +03:00
jl777 476479af36 Merge pull request #601 from jl777/jl777 
Jl777
 2018-04-20 22:01:57 +03:00
jl777 425ca40a4e Merge pull request #600 from jl777/jl777 
Fix polarity of compare
 2018-04-20 17:43:44 +03:00
jl777 6383313e39 Merge pull request #599 from jl777/jl777 
Jl777
 2018-04-20 17:18:52 +03:00
jl777 97ecac6248 Merge pull request #598 from jl777/jl777 
Jl777
 2018-04-20 09:59:56 +03:00
jl777 a6f1662b4e Merge pull request #597 from ca333/patch-8 
fix windows support
 2018-04-20 09:32:05 +03:00
jl777 0a4ffaff30 Merge pull request #595 from ca333/patch-9 
fix OSX deps mk
 2018-04-19 10:05:43 +03:00
jl777 ddd8e4744f Merge branch 'beta' into dev 2018-04-17 23:58:53 +03:00
jl777 8664be3a58 Merge pull request #593 from jl777/jl777 
Jl777
 2018-04-17 23:48:51 +03:00
jl777 7213e636c1 Merge branch 'dev' into jl777 2018-04-17 23:28:32 +03:00
jl777 6f27d2ef09 Merge pull request #591 from letolabs/jl777 
Script to stop all asset chains
 2018-04-17 10:18:09 +03:00
jl777 c180f620ee Merge pull request #590 from DeckerSU/dev-bitcorefix 
fix vout values display in Insight KMD explorer
 2018-04-16 20:30:49 +03:00
jl777 d9649204f4 Merge pull request #587 from ca333/patch-6 
update Makefile
 2018-04-16 08:23:54 +03:00
jl777 2b9acc59fc Merge pull request #586 from ca333/patch-5 
fix Makefile
 2018-04-16 07:52:02 +03:00
jl777 b63b56277b Merge pull request #584 from scottgrayson/trunk-merge 
Fix merge conflicts for Bitcore PR
 2018-04-16 06:02:56 +03:00
jl777 bea77378f9 Merge pull request #585 from jl777/dev 
Dev
 2018-04-16 05:34:21 +03:00
jl777 d192d75538 Merge pull request #583 from jl777/dev 
Restore fixes
 2018-04-16 03:41:51 +03:00
jl777 a5f848c45a Merge branch 'testmaster' into beta 2018-04-16 03:29:05 +03:00
jl777 80d1414870 Merge pull request #581 from jl777/dev 
Delay PoW check until connect block
 2018-04-16 02:51:51 +03:00
jl777 396b851b03 Merge pull request #580 from jl777/dev 
Dev
 2018-04-15 23:57:23 +03:00
jl777 ab3e2eecf5 Merge pull request #579 from jl777/dev 
Prevent autorewind if syncing. Not a critical update
 2018-04-15 23:27:01 +03:00
jl777 4627c1b4ec Merge pull request #578 from jl777/dev 
Change n0/n1 size to int32_t
 2018-04-15 22:32:35 +03:00
jl777 24f51d8dd3 Merge pull request #577 from jl777/dev 
Dev
 2018-04-15 22:15:38 +03:00
jl777 94d961cfa5 Merge pull request #576 from jl777/dev 
Dev
 2018-04-15 15:58:03 +03:00
jl777 dee1783a19 Merge pull request #575 from jl777/dev 
Dev
 2018-04-15 11:40:34 +03:00
jl777 afe2ca389f Merge pull request #574 from jl777/docker-curl-fix 
curl fix
 2018-04-15 11:39:51 +03:00
jl777 fffc1aa0aa Merge pull request #572 from jl777/dev 
Dev
 2018-04-14 15:34:51 +03:00
jl777 9fa5a41cf6 Merge pull request #570 from jl777/dev 
Dev
 2018-04-14 00:26:42 +03:00
jl777 8b29ea3797 Merge pull request #569 from jl777/dev 
New notaries, speedup and bugfixes
 2018-04-13 23:11:04 +03:00
jl777 b7fa26e3fb Merge branch 'beta' into dev 2018-04-13 23:10:36 +03:00
jl777 558f28c496 Merge pull request #568 from jl777/dev 
Dev
 2018-04-13 14:24:19 +03:00
jl777 40425d8514 Merge pull request #567 from letolabs/jl777 
Prevent core dumps from invalid maxpairs
 2018-04-13 10:22:06 +03:00
jl777 8e13b0fbf7 Merge pull request #566 from jl777/dev 
Dev
 2018-04-12 16:16:44 +03:00
jl777 11a1e38293 Merge pull request #565 from jl777/kolo-assets-new 
prlpay fix
 2018-04-12 16:14:36 +03:00
jl777 83079b8568 Merge pull request #564 from jl777/dev 
Dev
 2018-04-11 23:19:25 +03:00
jl777 3b71d4d22f Merge pull request #563 from jl777/jl777 
PoS bug fixes
 2018-04-11 16:10:06 +03:00
jl777 20ee2db462 Merge pull request #562 from jl777/jl777 
fix PoS
 2018-04-11 05:38:09 +03:00
jl777 94e005ffaf Merge pull request #561 from jl777/jl777 
tweak PoS
 2018-04-11 05:11:28 +03:00
jl777 29106d94a1 Merge pull request #560 from jl777/jl777 
Jl777
 2018-04-11 04:25:40 +03:00
jl777 4c015e6574 Merge pull request #559 from jl777/jl777 
-ac_perc and -ac_staking
 2018-04-11 03:40:16 +03:00
jl777 699634dd8b Merge pull request #557 from jl777/kolo-assets-new 
BNTN, CHAIN, PRLPAY chains
 2018-04-10 16:28:57 +03:00
jl777 58e477a75b Merge pull request #556 from letolabs/dev 
Dev
 2018-04-10 14:00:29 +03:00
jl777 83eae67b08 Merge pull request #555 from libscott/cryptoconditions 
Various cleanups
 2018-04-09 18:57:14 +03:00
jl777 53db65421e Merge pull request #538 from libscott/cryptoconditions 
Crypto-Conditions
 2018-04-08 13:18:26 +03:00
jl777 68e3066973 Merge pull request #554 from jl777/jl777 
Jl777
 2018-04-06 19:17:46 +03:00
jl777 c6c94006d9 Merge pull request #551 from KomodoPlatform/dev 
add BNTN
 2018-04-04 10:09:48 +03:00
jl777 b65fbf346c Merge pull request #548 from jl777/jl777 
Jl777
 2018-03-28 14:25:54 +03:00
jl777 c7fc8157f9 Merge pull request #547 from jl777/jl777 
a few fixes to build scripts
 2018-03-27 17:00:39 +03:00
jl777 1e0e14dea7 Merge pull request #546 from jl777/jl777 
add pindex pubkey33 cache
 2018-03-26 19:45:54 +03:00
jl777 6aecfddc35 Merge pull request #545 from jl777/jl777 
revert pindex caching
 2018-03-26 05:59:24 +03:00
jl777 65e1bee473 Merge pull request #544 from jl777/jl777 
some speedups
 2018-03-26 04:44:49 +03:00
jl777 7dc03c7d46 Merge pull request #543 from jl777/jl777 
fix sync
 2018-03-25 22:51:25 +03:00
jl777 d72bab960b Merge pull request #542 from jl777/jl777 
rebase to zcash 0.15
 2018-03-25 22:24:41 +03:00
jl777 eb9facd492 Merge branch 'dev' into jl777 2018-03-25 22:24:20 +03:00
jl777 ba5723c77d Merge pull request #541 from jl777/rebase2 
Rebase2 zcash 0.15
 2018-03-25 22:17:28 +03:00
jl777 bc206f0741 Merge pull request #540 from letolabs/completion 
Bash completion for komodo-cli, komodo-tx and komodo
 2018-03-24 18:56:50 +02:00
jl777 076452eeaa Merge pull request #539 from jl777/jl777 
MoM support
 2018-03-24 17:05:12 +02:00
jl777 137a67c987 Merge pull request #537 from jl777/dev 
Dev
 2018-03-08 22:46:51 +02:00
jl777 80c9f9983c Merge pull request #536 from jl777/oot 
OOT coin s01e01
 2018-03-08 18:03:01 +02:00
jl777 bc61f3a7a3 Merge pull request #535 from jl777/dev 
Dev
 2018-03-08 11:19:21 +02:00
jl777 8bf7255043 Merge pull request #534 from jl777/jl777 
Jl777
 2018-03-08 11:18:38 +02:00
jl777 b9ed58da29 Merge pull request #533 from jl777/jl777 
Change IsInitialBlockDownload for asset chains to match KMD
 2018-03-08 05:31:17 +02:00
jl777 34a077d8a3 Merge pull request #532 from jl777/jl777 
Jl777
 2018-03-08 03:21:24 +02:00
jl777 2d731fb2d8 Merge pull request #531 from jl777/jl777 
Jl777
 2018-03-05 10:24:02 +02:00
jl777 117ce4fc32 Merge pull request #530 from letolabs/docs 
Documentation improvements
Thanks duke!!
 2018-03-04 09:15:53 +02:00
jl777 7686cb756b Merge pull request #529 from jl777/dev 
Dev
 2018-03-02 10:04:34 +02:00
jl777 080184dab0 Merge pull request #527 from jl777/jl777 
Separate port range for mined
 2018-02-27 18:12:29 +02:00
jl777 a0218efd10 Merge pull request #526 from jl777/dev 
Dev
 2018-02-26 19:00:53 +02:00
jl777 797d46d14e Merge pull request #525 from jl777/kolo-ninja 
Adding coin
 2018-02-26 18:06:59 +02:00
jl777 84be13c031 Merge pull request #524 from jl777/kolo 
DNS and docker stuff
 2018-02-26 08:06:07 +02:00
jl777 8410781107 Merge pull request #522 from jl777/dev 
new -ac options
second slate of hard coded notaries
new coins
 2018-02-26 07:05:05 +02:00
jl777 e1b44812f7 Merge branch 'beta' into dev 2018-02-25 15:44:06 +02:00
jl777 e2a7f87c31 Merge pull request #521 from jl777/kolo 
VOTE replaced with VOTE2018
 2018-02-25 11:02:41 +02:00
jl777 a86845f3dc Merge pull request #519 from jl777/dPoW 
DPoW
 2018-02-21 16:15:11 +02:00
jl777 bce7c68fd7 Merge pull request #518 from jl777/beta 
-couldnt open printout
 2018-02-21 16:14:39 +02:00
jl777 6c15b7407b Merge pull request #517 from jl777/dPoW 
DPoW
 2018-02-18 12:48:24 +02:00
jl777 8ec7e32a01 Merge pull request #516 from jl777/beta 
Dukeleto's zcash#2931
 2018-02-18 12:46:49 +02:00
jl777 8f011ce033 Merge pull request #515 from letolabs/hashreserved 
Read hashReserved block header data from disk
 2018-02-18 12:10:19 +02:00
jl777 577bcffb86 Merge pull request #514 from jl777/dev 
-SHARK
 2018-02-10 21:43:03 +02:00
jl777 7a316978bd Merge pull request #513 from jl777/dev 
new coins, fix sendmany, disable price feed
 2018-02-10 15:13:46 +02:00
jl777 ee8cdf46e4 Merge pull request #512 from DeckerSU/decker-dev 
added checkpoints for KMD blockchain. need to be tested.
 2018-01-29 11:59:25 +04:00
jl777 17b77a13b5 Merge pull request #511 from ca333/dev 
add native btch bins
 2018-01-28 10:06:02 +04:00
jl777 1cb56d219f Merge pull request #510 from kolobus/dev 
-pax
 2018-01-27 18:34:06 +04:00
jl777 5513bebbf2 Merge pull request #509 from kolobus/dev 
So long and thanks for all the pax
 2018-01-27 10:46:10 +04:00
jl777 854c233d36 Merge pull request #507 from ca333/dev 
333
 2018-01-22 10:07:05 +03:00
jl777 6f95f2e584 Merge pull request #504 from jl777/dev 
new coins and -SHARK
 2018-01-03 01:07:13 +07:00
jl777 65cddb38a9 Merge pull request #503 from jl777/dPoW 
DPoW
 2017-12-08 02:07:27 +04:00
jl777 96fbdd07e3 Merge pull request #502 from jl777/beta 
Beta
 2017-12-08 02:05:53 +04:00
jl777 4981072148 Merge pull request #501 from jl777/dev 
MSHARK and assetchains with hash as name
 2017-11-30 22:02:09 +04:00
jl777 5aacfee705 Merge pull request #500 from jl777/dev 
Fix help error
 2017-11-06 13:56:28 +02:00
jl777 a7f15a8132 Merge pull request #499 from jl777/dev 
massive init loading time speedup
 2017-11-06 06:55:59 +02:00