 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
|
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
|
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 |
|
|
jl777
|
d303e4b8d3
|
Merge pull request #496 from jl777/dev
Undefine cJSON bools
|
2017-10-24 13:26:13 +03:00 |
|
|
jl777
|
6e340b9ebb
|
Merge pull request #495 from jl777/dev
Dev
|
2017-10-24 12:20:30 +03:00 |
|
|
jl777
|
58fbfec10c
|
Merge pull request #494 from ca333/dev
dev update
|
2017-10-24 12:19:27 +03:00 |
|
|
jl777
|
70bd41b2be
|
Merge pull request #493 from libscott/refactor_cjson
Upgrade cJSON and move customizations to komodo_cJSON (PR to dev)
|
2017-10-23 21:07:25 +03:00 |
|
|
jl777
|
911a8ce104
|
Merge pull request #492 from jl777/dev
reduce printouts
|
2017-10-23 16:45:50 +03:00 |
|
|
jl777
|
29f356e9c4
|
Merge pull request #491 from jl777/dev
Speed up npoints
|
2017-10-23 15:49:51 +03:00 |
|
|
jl777
|
47d6d62696
|
Merge pull request #490 from jl777/dev
fix assetchains notarization detection
|
2017-10-23 15:18:28 +03:00 |
|
|
jl777
|
1b1def7a9f
|
Merge pull request #488 from jl777/dev
Disable pax pow for now
|
2017-10-19 23:30:56 +03:00 |
|
|
jl777
|
06e87156e4
|
Merge pull request #487 from jl777/dev
Dev
|
2017-10-18 22:53:14 +03:00 |
|
|
jl777
|
2dbc8e995f
|
Merge pull request #485 from jl777/dev
WIN32 -> _WIN32
|
2017-10-15 02:06:26 +03:00 |
|
|
jl777
|
30781748c4
|
Merge pull request #482 from jl777/dev
universal OS tree
|
2017-10-09 21:35:02 +03:00 |
|
|
jl777
|
4a4a29e788
|
Merge pull request #481 from ca333/dev
unibranch fix
|
2017-10-09 17:27:12 +03:00 |
|
|
jl777
|
965fbaf422
|
Merge pull request #479 from ca333/dev
universal build from ca333
|
2017-10-09 15:34:35 +03:00 |
|
|
jl777
|
f1a0d58051
|
Merge pull request #478 from jl777/dev
Dev
|
2017-10-06 16:49:26 +03:00 |
|
|
jl777
|
b50301fcff
|
Merge pull request #477 from jl777/dev
MNZ support
|
2017-10-06 15:55:28 +03:00 |
|
|
jl777
|
6fef8a41b5
|
Merge pull request #476 from jl777/dev
fixed wrong port used by assetchains, which caused error many times, each with 250ms sleep
|
2017-10-01 19:58:30 +03:00 |
|
|
jl777
|
0e15ad7f95
|
Merge pull request #475 from jl777/dev
init load tweak
|
2017-09-25 12:30:28 +02:00 |
|
|
jl777
|
c6faffe4b6
|
Merge pull request #474 from jl777/dev
Dev
|
2017-09-25 12:13:09 +02:00 |
|
|
jl777
|
5d7e988543
|
Merge pull request #471 from jl777/dev
Dev
|
2017-09-18 23:30:50 +02:00 |
|
|
jl777
|
2552250d89
|
Merge pull request #470 from SuperNETorg/dev
checksum fix
|
2017-09-18 23:30:11 +02:00 |
|
|
jl777
|
388d963ac4
|
Merge pull request #469 from jl777/dev
Test
|
2017-09-18 18:36:59 +02:00 |
|
|
jl777
|
0d73bf050f
|
Merge pull request #468 from jl777/dev
Dev
|
2017-09-18 17:43:19 +02:00 |
|
|
jl777
|
c4a12d9618
|
Merge pull request #466 from jl777/dev
Dev
|
2017-09-07 12:54:38 +02:00 |
|
|
jl777
|
a6a269f7ad
|
Merge pull request #463 from jl777/dev
Remove pax prints
|
2017-09-06 18:13:53 +02:00 |
|
|
jl777
|
2198f1cc19
|
Merge pull request #460 from jl777/dev
Test
|
2017-09-01 10:50:46 +02:00 |
|
|
jl777
|
a6c7e3a0d5
|
Merge pull request #459 from jl777/dev
Dev
|
2017-09-01 01:44:05 +02:00 |
|
|
jl777
|
79b44b4b7b
|
Merge pull request #457 from jl777/dev
Dev
|
2017-08-26 15:27:27 +02:00 |
|
|
jl777
|
5b0d5d4a37
|
Merge pull request #453 from jl777/dev
Dev
|
2017-08-22 09:19:58 +02:00 |
|
|
jl777
|
43d805dc0c
|
Merge pull request #451 from jl777/dev
JUMBLR
|
2017-07-18 08:46:33 +02:00 |
|
|
jl777
|
1552c52136
|
Merge pull request #450 from jl777/dev
Dev
|
2017-07-12 11:01:19 +03:00 |
|
|
jl777
|
9ba7735018
|
Merge pull request #448 from jl777/dev
fixes assetchains vout error
|
2017-07-03 18:30:22 +03:00 |
|
|
jl777
|
d71e908633
|
Merge pull request #447 from jl777/dev
Dev
|
2017-07-03 15:41:40 +03:00 |
|
|
jl777
|
da30ce6726
|
Merge pull request #446 from jl777/dev
Test
|
2017-07-02 23:13:55 +03:00 |
|
|
jl777
|
a2f5d3c9a3
|
Merge pull request #445 from jl777/dev
Dev
|
2017-07-01 19:47:31 +03:00 |
|
|
jl777
|
741658905f
|
Merge pull request #444 from jl777/dev
Dev
|
2017-06-29 18:29:51 +03:00 |
|
|
jl777
|
91324023d8
|
Merge pull request #443 from jl777/dev
fix default volume for paxprice, doesnt affect consensus
|
2017-06-27 17:52:10 +03:00 |
|
|
jl777
|
1656934cb0
|
Merge pull request #442 from jl777/dev
Dev
|
2017-06-16 23:54:13 +03:00 |
|
|
jl777
|
de38adeac1
|
Merge pull request #438 from jl777/dev
Remove print
|
2017-06-04 20:11:45 +03:00 |
|
|
jl777
|
93ea92bcc3
|
Merge pull request #437 from jl777/dev
hotfix
|
2017-06-04 20:10:16 +03:00 |
|
|
jl777
|
8300e53a81
|
Merge pull request #436 from jl777/dev
Dev
|
2017-06-04 19:44:22 +03:00 |
|
|
jl777
|
0c74f7de58
|
Merge pull request #435 from jl777/dev
Dev
|
2017-06-03 23:28:10 +03:00 |
|
|
jl777
|
d9135e422f
|
Merge pull request #432 from jl777/dev
Test
|
2017-05-23 10:41:07 +03:00 |
|
|
jl777
|
75f5f61211
|
Merge pull request #431 from jl777/dev
test
|
2017-05-23 10:37:58 +03:00 |
|
|
jl777
|
35d54ffd1a
|
Merge pull request #430 from jl777/dev
Dev
|
2017-05-23 10:28:35 +03:00 |
|
|
jl777
|
35c052a8ca
|
Merge pull request #424 from jl777/dev
Dev
|
2017-05-02 17:08:43 +03:00 |
|
|
jl777
|
5a3e1d41fa
|
Merge pull request #421 from jl777/dev
new MESH
|
2017-04-27 13:43:40 +03:00 |
|
|
jl777
|
9ad4422c3d
|
Merge pull request #420 from jl777/dev
new MESH
|
2017-04-27 11:07:10 +03:00 |
|
|
jl777
|
6ad5e10198
|
Merge pull request #419 from jl777/dev
Mesh crash test
|
2017-04-26 18:27:57 +03:00 |
|
|
jl777
|
8a7d6889f5
|
Merge pull request #418 from jl777/dev
Dev
|
2017-04-26 09:16:51 +03:00 |
|
|
jl777
|
854af15e28
|
Merge pull request #412 from jl777/dev
https://github.com/zcash/zcash/pull/2259/commits
|
2017-04-14 08:37:02 +03:00 |
|
|
jl777
|
21afe18407
|
Merge pull request #411 from jl777/dev
Test
|
2017-04-10 17:36:49 +03:00 |
|
|
jl777
|
3c4d6ebc6e
|
Merge pull request #410 from jl777/dev
Dev
|
2017-04-10 15:47:06 +03:00 |
|
|
jl777
|
953cec090a
|
Merge pull request #409 from jl777/dev
Dev
|
2017-04-08 16:45:05 +03:00 |
|
|
jl777
|
7afa0b34e0
|
Merge pull request #408 from jl777/1.0.8
1.0.8
|
2017-04-08 16:43:47 +03:00 |
|
|
jl777
|
38d0f59a7e
|
Merge pull request #407 from jl777/dPoW
DPoW
|
2017-03-30 04:56:09 +03:00 |
|
|
jl777
|
8b987626d9
|
Merge pull request #393 from jl777/beta
Beta
|
2017-03-30 04:55:19 +03:00 |
|
|
jl777
|
757119510c
|
Merge pull request #406 from jl777/dev
WLC
|
2017-03-27 10:50:11 +03:00 |
|
|
jl777
|
a82a09a24d
|
Merge pull request #401 from jl777/dev
Test
|
2017-03-26 22:24:02 +03:00 |
|
|
jl777
|
b204db1786
|
Merge pull request #400 from jl777/dev
Dev
|
2017-03-26 22:08:58 +03:00 |
|
|
jl777
|
43fcd91460
|
Merge pull request #399 from jl777/dev
Test
|
2017-03-26 20:53:53 +03:00 |
|
|
jl777
|
d0849a5d7e
|
Merge pull request #398 from jl777/dev
Test
|
2017-03-26 20:37:32 +03:00 |
|
|
jl777
|
cb02765591
|
Merge pull request #397 from jl777/dev
Test
|
2017-03-26 19:47:13 +03:00 |
|
|
jl777
|
2827ed9891
|
Merge pull request #396 from jl777/dev
Dev
|
2017-03-26 19:35:50 +03:00 |
|
|
jl777
|
d80c066d4b
|
Merge pull request #395 from jl777/dev
Dev
|
2017-03-26 19:10:35 +03:00 |
|
|
jl777
|
c8a6759c48
|
Merge pull request #394 from jl777/dev
Test
|
2017-03-26 18:55:39 +03:00 |
|
|
jl777
|
0ebebba0e3
|
Merge pull request #392 from jl777/dev
April 5th activation of interest calc fix, along with more notarization getinfo data
|
2017-03-26 18:42:34 +03:00 |
|
|
jl777
|
c99dd13cb6
|
Merge pull request #391 from jl777/dev
April 5th activation
Interest calc fix for small utxo
|
2017-03-26 17:08:30 +03:00 |
|
|
jl777
|
554cdd83b3
|
Merge pull request #388 from jl777/dev
Test
|
2017-03-25 20:37:13 +02:00 |
|
|
jl777
|
e84c90f704
|
Merge pull request #387 from jl777/dev
Remove prints
|
2017-03-25 19:32:57 +02:00 |
|
|
jl777
|
e1fa9a2439
|
Merge pull request #386 from jl777/dPoW
DPoW
|
2017-03-25 19:08:42 +02:00 |
|
|
jl777
|
d074d6e14f
|
Merge pull request #385 from jl777/beta
Beta
|
2017-03-25 19:07:55 +02:00 |
|
|
jl777
|
f8bb37565b
|
Merge pull request #384 from jl777/dev
Dev
|
2017-03-25 19:07:14 +02:00 |
|
|
jl777
|
9e7efae331
|
Merge pull request #383 from jl777/dPoW
DPoW
|
2017-03-25 17:11:39 +02:00 |
|
|
jl777
|
276420b373
|
Merge pull request #382 from jl777/beta
Beta
|
2017-03-25 17:10:57 +02:00 |
|
|
jl777
|
1265e49f96
|
Merge pull request #379 from jl777/dev
Expand time window
|
2017-03-25 13:26:06 +02:00 |
|
|
jl777
|
9094724ab8
|
Merge pull request #378 from jl777/dev
Fix miner
|
2017-03-25 10:36:25 +02:00 |
|
|
jl777
|
1aff66e126
|
Merge pull request #377 from jl777/dev
Test
|
2017-03-25 10:28:59 +02:00 |
|
|
jl777
|
c17d8a33c9
|
Merge pull request #376 from jl777/dev
Disable updating template time
|
2017-03-25 02:10:22 +02:00 |
|
|
jl777
|
4334bb4dec
|
Merge pull request #375 from jl777/dev
Test
|
2017-03-25 01:38:54 +02:00 |
|
|
jl777
|
e0a9732f61
|
Merge pull request #374 from jl777/dev
Dev
|
2017-03-25 01:19:27 +02:00 |
|
|
jl777
|
c987ffb5ed
|
Merge pull request #373 from jl777/devtest
Devtest
|
2017-03-25 01:18:40 +02:00 |
|
|
jl777
|
c4e2082725
|
Merge pull request #372 from jl777/dev
Test
|
2017-03-24 07:42:03 +02:00 |
|
|
jl777
|
9f4f92837e
|
Merge pull request #371 from jl777/dev
Dev
|
2017-03-24 07:24:29 +02:00 |
|
|
jl777
|
94a8c817ec
|
Merge pull request #370 from jl777/dev
Dev
|
2017-03-24 06:46:37 +02:00 |
|
|
jl777
|
dcf8db6bb9
|
Merge pull request #369 from jl777/dev
Dev
|
2017-03-24 06:24:01 +02:00 |
|
|
jl777
|
524cb6a9af
|
Merge pull request #368 from jl777/dev
Test
|
2017-03-24 05:45:56 +02:00 |
|