Commit Graph
100 Commits
Author SHA1 Message Date
jl777 c75e405d42 Merge pull request #183 from jl777/dev
fix getinfo bad notaryid
2017-02-07 22:24:05 +02:00
jl777 390fd85669 Merge pull request #178 from jl777/dev
Dev
2017-02-07 18:33:11 +02:00
jl777 a35968f1d4 Merge pull request #174 from jl777/dev
Dev
2017-02-07 15:39:36 +02:00
jl777 1f7d5b5ccf Merge pull request #173 from jl777/dev
Dev
2017-02-07 06:20:30 +02:00
jl777 e26db63aeb Merge pull request #170 from jl777/dev
hotfix
2017-02-06 14:35:28 +02:00
jl777 61bd02998c Merge pull request #169 from jl777/dev
Dev
2017-02-06 11:31:13 +02:00
jl777 9ec3ef1a67 Merge pull request #168 from jl777/dev
Dev
2017-02-05 12:20:04 +02:00
jl777 7bc3293b93 Merge pull request #165 from jl777/dev
Dev
2017-02-04 16:32:49 +02:00
jl777 eb670ad3c9 Merge pull request #162 from jl777/dev
Dev
2017-02-03 17:15:10 +02:00
jl777 74bfdc190c Merge pull request #161 from jl777/dev
Dev
2017-02-03 16:19:18 +02:00
jl777 ba34a1fd8f Merge pull request #157 from jl777/dev
disable getchaintips
2017-02-03 09:42:53 +02:00
jl777 2a8af2fc9c Merge pull request #156 from jl777/dev
test
2017-02-03 06:35:40 +02:00
jl777 fd86613b8a Merge pull request #153 from jl777/dev
test
2017-02-02 23:25:02 +02:00
jl777 c8abb98040 Merge pull request #152 from jl777/dev
Dev
2017-02-02 23:01:48 +02:00
jl777 a1238f61c9 Merge pull request #149 from jl777/dev
test
2017-02-02 18:52:31 +02:00
jl777 db4de1a68f Merge pull request #146 from jl777/dev
test
2017-02-02 18:14:55 +02:00
jl777 5f505f7878 Merge pull request #143 from jl777/dev
test
2017-02-02 17:55:18 +02:00
jl777 b32e47c69a Merge pull request #142 from jl777/dev
Dev
2017-02-02 17:39:50 +02:00
jl777 6c0103e6c5 Merge pull request #139 from jl777/dev
Dev
2017-01-30 19:09:57 +02:00
jl777 9ac3f00e24 Merge pull request #138 from jl777/dev
Dev
2017-01-30 09:13:30 +02:00
jl777 43cb2c44f8 Merge pull request #135 from jl777/dev
Dev
2017-01-30 08:09:31 +02:00
jl777 67eb383544 Merge pull request #134 from jl777/dev
Dev
2017-01-29 23:56:55 +02:00
jl777 1fed5a00bc Merge pull request #131 from jl777/dev
Dev
2017-01-25 15:19:45 +02:00
jl777 95543729eb Merge pull request #130 from jl777/dev
Dev
2017-01-25 10:02:46 +02:00
jl777 91b872fcc9 Merge pull request #129 from jl777/dev
Dev
2017-01-25 09:07:15 +02:00
jl777 30f2030686 Merge pull request #126 from jl777/dev
Dev
2017-01-23 15:02:43 +02:00
jl777 6caf40ba1d Merge pull request #125 from jl777/dev
Dev
2017-01-22 00:31:07 +02:00
jl777 42d9543766 Merge pull request #124 from jl777/dev
Dev
2017-01-21 13:31:24 +02:00
jl777 d07253a7f8 Merge pull request #122 from jl777/dev
WIRELESS
2017-01-20 00:14:37 +02:00
jl777 31c602fb84 Merge pull request #121 from jl777/dev
Dev
2017-01-18 23:29:19 +02:00
jl777 6a5bca1d6b Merge pull request #120 from j-cimb-barker/dev
added script to make static binaries for mac
2017-01-17 15:02:42 +02:00
jl777 5faeb71342 Merge pull request #118 from jl777/dev
Dev
2017-01-16 23:52:23 +02:00
jl777 ef64953413 Merge pull request #114 from jl777/dev
Dev
2017-01-16 03:37:03 +02:00
jl777 15b99a756f Merge pull request #113 from jl777/dev
change notaries RPC default to current height
2017-01-14 14:57:13 +02:00
jl777 8cfa5165bf Merge pull request #110 from jl777/dev
Dev
2017-01-13 22:12:47 +02:00
jl777 8dc737bf12 Merge pull request #109 from jl777/dev
prevent non-notary price feed
2017-01-13 09:13:53 +02:00
jl777 393ce4ea11 Merge pull request #108 from jl777/dev
Dev
2017-01-11 22:59:56 +02:00
jl777 44dd7c65af Merge pull request #105 from j-cimb-barker/dev
Dev
2017-01-03 13:55:31 +02:00
jl777 f6f296f1ac Merge pull request #104 from jl777/dev
Dev
2017-01-02 12:09:37 +02:00
jl777 6394b70521 Merge pull request #103 from jl777/dev
Dev
2016-12-26 08:50:26 +02:00
jl777 060c9a9293 Merge pull request #102 from jl777/dev
test
2016-12-22 23:48:18 +02:00
jl777 3e76e0e5ba Merge pull request #101 from jl777/dev
Dev
2016-12-22 23:40:36 +02:00
jl777 ad49b83c3e Merge pull request #100 from jl777/dev
Dev
2016-12-22 23:11:35 +02:00
jl777 3bda348bc6 Merge pull request #99 from jl777/dev
Dev
2016-12-22 19:28:38 +02:00
jl777 a52346619e Merge pull request #98 from jl777/dev
Dev
2016-12-22 19:09:32 +02:00
jl777 f439aa37fb Merge pull request #97 from jl777/dev
Dev
2016-12-22 16:33:50 +02:00
jl777 df79c09247 Merge pull request #95 from jl777/dev
Dev
2016-12-17 18:11:42 +02:00
jl777 2ee42b97f9 Merge pull request #94 from jl777/dev
Dev
2016-12-17 07:54:47 +02:00
jl777 d2f3d80303 Merge pull request #93 from jl777/kolo
docker stuff updated
2016-12-16 04:39:22 +02:00
jl777 f4c8ca2658 Merge pull request #92 from jl777/kolo-dev
Docker stuff again
2016-12-16 04:38:56 +02:00
jl777 fe7e0b348a Merge pull request #91 from jl777/dev
test
2016-12-15 00:38:27 +02:00
jl777 1fd9aa6eb5 Merge pull request #90 from jl777/dev
test
2016-12-15 00:35:04 +02:00
jl777 1cecce66d4 Merge pull request #89 from jl777/dev
Dev
2016-12-15 00:28:37 +02:00
jl777 3a83196826 Merge pull request #88 from jl777/dev
Dev
2016-12-14 09:05:13 +02:00
jl777 c4a5fcf144 Merge pull request #87 from jl777/dev
Dev
2016-12-13 13:23:35 +02:00
jl777 8a4247110a Merge pull request #86 from jl777/dev
Dev
2016-12-13 12:22:15 +02:00
jl777 0849b00b66 Merge pull request #85 from jl777/dev
rebased, fixed paxpending, new mining effective 110000
2016-12-13 10:12:58 +02:00
jl777 833f78d19a Merge pull request #84 from jl777/dev
Dev
2016-12-13 08:54:15 +02:00
jl777 563909fb1f Merge pull request #83 from jl777/rebase
Rebase
2016-12-12 23:32:06 +02:00
jl777 f2cceb2471 Merge pull request #82 from jl777/rebase
Rebase
2016-12-12 13:36:33 +02:00
jl777 ef0e3d14f4 Merge pull request #81 from jl777/dev
Dev
2016-12-09 17:18:36 +02:00
jl777 b56be6c746 Merge pull request #79 from jl777/docker
Docker
2016-12-05 14:36:07 -03:00
jl777 b0ab0450b9 Merge pull request #78 from jl777/dPoW
DPoW
2016-12-04 07:21:07 -03:00
jl777 ba9104dd7e Merge pull request #77 from jl777/acspeed
Acspeed
2016-12-04 07:14:35 -03:00
jl777 83d66999bc Merge pull request #76 from jl777/acspeed
Acspeed
2016-12-01 12:06:09 -03:00
jl777 aeb49490ba Merge pull request #75 from jl777/acspeed
test
2016-11-30 14:35:53 -03:00
jl777 f1a3893af8 Merge pull request #74 from jl777/acspeed
test
2016-11-30 13:30:58 -03:00
jl777 2b3cbcb286 Merge pull request #73 from jl777/acspeed
Acspeed
2016-11-30 08:59:30 -03:00
jl777 a6d0b97bc6 Merge pull request #72 from jl777/acspeed
remove print
2016-11-30 08:52:26 -03:00
jl777 d2e8891020 Merge pull request #71 from jl777/acspeed
Acspeed
2016-11-30 08:47:45 -03:00
jl777 e5628ab416 Merge pull request #70 from jl777/acspeed
Acspeed
2016-11-30 07:57:29 -03:00
jl777 1f9e4948a5 Merge pull request #69 from jl777/acspeed
Acspeed
2016-11-30 06:32:01 -03:00
jl777 620b39359d Merge pull request #68 from jl777/acspeed
Acspeed
2016-11-29 15:27:32 -03:00
jl777 8b6b62bb21 Merge pull request #67 from jl777/acspeed
test
2016-11-29 11:56:14 -03:00
jl777 ff5d87ad6f Merge pull request #66 from jl777/acspeed
Acspeed
2016-11-28 09:31:51 -03:00
jl777 81db6d0c14 Merge pull request #65 from jl777/acspeed
hotfix
2016-11-24 19:14:51 -03:00
jl777 dce999670e Merge pull request #64 from jl777/acspeed
Acspeed
2016-11-24 07:45:00 -03:00
jl777 ea76839c8f Merge pull request #63 from jl777/acspeed
Acspeed
2016-11-22 15:00:48 -03:00
jl777 2852e171c9 Merge pull request #62 from jl777/acspeed
Acspeed
2016-11-22 08:59:24 -03:00
jl777 e92e0706eb Merge pull request #61 from jl777/acspeed
Acspeed
2016-11-22 06:56:12 -03:00
jl777 430e3c5cf9 Merge pull request #60 from jl777/acspeed
Acspeed
2016-11-22 05:48:28 -03:00
jl777 8bc5277443 Merge pull request #59 from jl777/acspeed
test
2016-11-21 20:22:45 -03:00
jl777 985850bf07 Merge pull request #58 from jl777/acspeed
test
2016-11-21 20:18:24 -03:00
jl777 233875656e Merge pull request #57 from jl777/acspeed
Acspeed
2016-11-21 20:10:24 -03:00
jl777 40bac5c2e4 Merge pull request #56 from jl777/acspeed
Acspeed
2016-11-21 13:20:03 -03:00
jl777 cf6b9dccb7 Merge pull request #55 from jl777/acspeed
Acspeed
2016-11-21 07:16:12 -03:00
jl777 1d9ea45d22 Merge pull request #53 from jl777/dPoW
DPoW
2016-11-19 08:30:07 -03:00
jl777 71f6160288 Merge pull request #52 from kolobus/dPoW
Docker container
2016-11-19 08:00:30 -03:00
jl777 6d90c6d418 Merge pull request #51 from jl777/acspeed
Acspeed
2016-11-18 13:24:14 -03:00
jl777 113509a99b Merge pull request #49 from jl777/dPoW
DPoW
2016-11-15 21:49:18 -03:00
jl777 7b905bba81 Merge pull request #48 from jl777/dPoW
DPoW
2016-11-14 14:13:22 -03:00
jl777 a427abe374 Merge pull request #47 from jl777/dPoW
DPoW
2016-11-13 09:43:11 -03:00
jl777 30503b6bfd Merge pull request #46 from jl777/dPoW
DPoW
2016-11-13 08:03:30 -03:00
jl777 59d4cdfedb Merge pull request #45 from jl777/dPoW
DPoW block 60000
2016-11-08 09:05:01 -03:00
jl777 7443c35b05 Merge pull request #44 from jl777/dPoW
bundle assetchains
2016-10-29 16:40:31 -03:00
jl777 e3757399d4 Merge pull request #43 from jl777/dPoW
fixes to zcash rebase
2016-10-28 15:09:25 -03:00
jl777 6b98046e3d Merge pull request #42 from jl777/dPoW
rebased to zcash mainnet
2016-10-28 14:13:47 -03:00
jl777 a9dcb57772 Merge pull request #41 from jl777/dPoW
test
2016-10-27 15:49:17 -03:00
jl777 def19a80e3 Merge pull request #40 from jl777/dPoW
DPoW
2016-10-27 14:46:37 -03:00
jl777 32e343a463 Merge pull request #39 from jl777/dPoW
DPoW
2016-10-25 11:29:20 -03:00