Commit Graph
100 Commits
Author SHA1 Message Date
jl777 6ef472f7ee Merge branch 'beta' into dev 2017-03-17 18:19:16 +02:00
jl777 8c0fcef59b Merge pull request #298 from jl777/dev
Touch
2017-03-17 18:16:08 +02:00
jl777 98b0f4cd90 Merge pull request #297 from jl777/dev
Remove print
2017-03-17 18:03:59 +02:00
jl777 25a3e25da8 Merge pull request #296 from jl777/dev
Dev
2017-03-17 17:25:16 +02:00
jl777 628e0bfe14 Merge pull request #293 from jl777/dev
Test
2017-03-17 13:47:49 +02:00
jl777 0ce8ef227b Merge pull request #292 from jl777/dev
Test
2017-03-17 08:25:14 +02:00
jl777 317558d445 Merge pull request #291 from jl777/dev
disable redeems
2017-03-17 08:15:33 +02:00
jl777 196ed32f8d Merge pull request #290 from jl777/dev
Dev
2017-03-17 07:57:17 +02:00
jl777 4dfd322c8c Merge pull request #287 from jl777/dev
Dev
2017-03-17 02:20:13 +02:00
jl777 157080b7d1 Merge pull request #286 from jl777/dev
Test
2017-03-17 01:55:30 +02:00
jl777 cfee5e7f7c Merge pull request #285 from jl777/dev
Dev
2017-03-16 22:51:18 +02:00
jl777 9896fea5d7 Merge pull request #284 from jl777/dev
changes in interest calc to be active block 300000, no hurry to update
2017-03-16 20:32:17 +02:00
jl777 ea457f2552 Merge pull request #283 from jl777/dev
Dev
2017-03-16 20:05:13 +02:00
jl777 d6ab51d1af Merge pull request #280 from jl777/dPoW
DPoW
2017-03-16 16:50:50 +02:00
jl777 dbac4b61d4 Merge pull request #279 from jl777/beta
Beta
2017-03-16 16:50:20 +02:00
jl777 8b1e456d32 Merge pull request #278 from jl777/dev
Dev
2017-03-16 16:49:35 +02:00
jl777 f3658139a1 Merge pull request #275 from jl777/dPoW
DPoW
2017-03-16 08:48:24 +02:00
jl777 e9d403c71a Merge pull request #274 from jl777/beta
Beta
2017-03-16 08:47:54 +02:00
jl777 2533d8ade0 Merge pull request #273 from jl777/dev
Dev
2017-03-16 08:46:35 +02:00
jl777 018174cc85 Merge pull request #272 from jl777/dPoW
Syntax fix
2017-03-15 18:18:13 +02:00
jl777 049497d96e Merge pull request #271 from jl777/beta
Beta
2017-03-15 18:17:13 +02:00
jl777 229f934848 Merge pull request #270 from jl777/dev
Test
2017-03-15 15:31:34 +02:00
jl777 396b9d12e4 Merge pull request #269 from jl777/dev
Test
2017-03-15 10:57:00 +02:00
jl777 e9b84beb2b Merge pull request #268 from jl777/dev
Dev
2017-03-15 10:52:56 +02:00
jl777 68f495d1b5 Merge pull request #265 from jl777/dPoW
DPoW
2017-03-14 21:58:19 +02:00
jl777 b0f5be9f43 Merge pull request #264 from jl777/beta
Beta
2017-03-14 21:54:54 +02:00
jl777 534b5158b9 Merge pull request #263 from jl777/dev
Legacy combat
2017-03-14 21:54:25 +02:00
jl777 3b333f2e15 Merge pull request #262 from jl777/dPoW
DPoW
2017-03-14 21:36:56 +02:00
jl777 8f2734b935 Merge pull request #261 from jl777/beta
Beta
2017-03-14 21:36:21 +02:00
jl777 e811fb27c0 Merge pull request #260 from jl777/dev
Test
2017-03-14 21:35:42 +02:00
jl777 6aa97d1cdd Merge pull request #259 from jl777/dPoW
DPoW
2017-03-14 21:20:59 +02:00
jl777 1c8af45a72 Merge pull request #258 from jl777/beta
Beta
2017-03-14 21:19:26 +02:00
jl777 3e74b93ec7 Merge pull request #257 from jl777/dev
Dev
2017-03-14 21:17:58 +02:00
jl777 3a94bcc5c0 Merge pull request #254 from jl777/dPoW
DPoW
2017-03-14 00:00:44 +02:00
jl777 4fb037709a Merge pull request #253 from jl777/beta
Beta
2017-03-14 00:00:13 +02:00
jl777 c3bd99f77c Merge branch 'dPoW' into beta 2017-03-14 00:00:05 +02:00
jl777 f8d2d4713a Merge pull request #252 from jl777/dev
miner fix: dont accept into mempool what will be rejected
2017-03-13 23:56:14 +02:00
jl777 16641060f0 Merge pull request #249 from jl777/dPoW
DPoW
2017-03-13 15:05:59 +02:00
jl777 d0eb41f1d8 Merge pull request #248 from jl777/beta
Beta
2017-03-13 15:05:21 +02:00
jl777 e39811d57d Merge pull request #247 from jl777/dev
Dev
2017-03-13 14:16:43 +02:00
jl777 e0f9048e1e Merge pull request #246 from jl777/dev
Test
2017-03-13 11:12:21 +02:00
jl777 c4ca615e04 Merge pull request #245 from jl777/dPoW
DPoW
2017-03-13 09:21:31 +02:00
jl777 2c76a41bbb Merge pull request #244 from jl777/beta
Beta
2017-03-13 09:20:51 +02:00
jl777 90cd2fbd0f Merge pull request #243 from jl777/dev
Dev
2017-03-13 09:17:14 +02:00
jl777 037dd6deba Merge pull request #242 from jl777/dPoW
DPoW
2017-03-13 06:21:52 +02:00
jl777 45f02ac7ba Merge pull request #241 from jl777/beta
Beta
2017-03-13 06:20:39 +02:00
jl777 4d7a50d9b8 Merge pull request #240 from jl777/dev
remove printout
2017-03-13 06:13:11 +02:00
jl777 f42ed9b039 Merge pull request #239 from jl777/dev
Allow small second output
2017-03-13 06:00:00 +02:00
jl777 db91953174 Merge pull request #238 from jl777/dev
Dev
2017-03-13 05:50:41 +02:00
jl777 c932dca910 Merge pull request #237 from jl777/dev
Test
2017-03-13 00:36:00 +02:00
jl777 8498556eb5 Merge pull request #236 from jl777/dPoW
DPoW
2017-03-13 00:05:54 +02:00
jl777 956ee4ca86 Merge pull request #235 from jl777/beta
Beta
2017-03-13 00:05:28 +02:00
jl777 f7e5292e44 Merge pull request #234 from jl777/dev
Test
2017-03-13 00:05:00 +02:00
jl777 2263ffd387 Merge pull request #233 from jl777/dPoW
DPoW
2017-03-12 23:40:48 +02:00
jl777 31b3ae3e1d Merge pull request #232 from jl777/beta
Beta
2017-03-12 23:40:20 +02:00
jl777 85b531eb8e Merge pull request #231 from jl777/dev
Dev
2017-03-12 23:39:42 +02:00
jl777 e8bf7d5afb Merge pull request #230 from jl777/dPoW
DPoW
2017-03-12 22:00:38 +02:00
jl777 64965f63d4 Merge pull request #229 from jl777/beta
Beta
2017-03-12 22:00:09 +02:00
jl777 994f7b42d0 Merge pull request #228 from jl777/dev
Dev
2017-03-12 21:59:41 +02:00
jl777 79d11abda5 Merge pull request #227 from jl777/dPoW
DPoW
2017-03-12 15:32:36 +02:00
jl777 a486f31a3f Merge pull request #226 from jl777/beta
Beta
2017-03-12 15:32:06 +02:00
jl777 6742d72528 Merge pull request #225 from jl777/dev
fix sync from scratch
2017-03-12 15:31:31 +02:00
jl777 2b58404ddf Merge pull request #224 from jl777/dev
skip ahead 65 blocks, fix for stuck sync from scratch. no need to update if already in sync
2017-03-12 10:33:55 +02:00
jl777 536b065b7e Merge pull request #221 from jl777/dev
support Undo KOMODO_LASTMINED
2017-03-06 21:41:20 +02:00
jl777 703fee7dc6 Merge pull request #220 from jl777/dPoW
DPoW
2017-02-27 08:30:34 +02:00
jl777 19045e5489 Merge pull request #219 from jl777/beta
Beta
2017-02-27 08:29:32 +02:00
jl777 cf8b7395f7 Merge pull request #217 from jl777/dev
Dev
2017-02-26 16:14:28 +02:00
jl777 dab5584c31 Merge pull request #214 from jl777/dev
Test
2017-02-25 22:37:30 +02:00
jl777 0643f35a09 Merge pull request #213 from jl777/dev
Dev
2017-02-25 19:29:15 +02:00
jl777 359a7b1640 Merge pull request #212 from jl777/dev
Test
2017-02-25 17:45:07 +02:00
jl777 b05aac8de0 Merge pull request #211 from jl777/dev
Dev
2017-02-25 10:17:09 +02:00
jl777 386c634b01 Merge pull request #210 from jl777/dev
Dev
2017-02-25 08:56:51 +02:00
jl777 e9e04d7e81 Merge pull request #207 from jl777/dPoW
DPoW
2017-02-21 09:07:13 +02:00
jl777 a6b3e1e887 Merge pull request #206 from jl777/beta
Beta
2017-02-21 09:06:35 +02:00
jl777 afcba0c504 Merge pull request #205 from jl777/dev
Relax RT (X) test
2017-02-21 09:06:01 +02:00
jl777 44109c14c3 Merge pull request #204 from jl777/dPoW
DPoW
2017-02-21 08:12:01 +02:00
jl777 e69b5ca86e Merge pull request #203 from jl777/beta
Beta
2017-02-21 08:11:28 +02:00
jl777 7283f803e9 Merge pull request #202 from jl777/dev
Remove interests[] log
2017-02-21 08:10:55 +02:00
jl777 0f98f3fa6b Merge pull request #201 from jl777/dPoW
DPoW
2017-02-21 08:02:55 +02:00
jl777 fcd55e6055 Merge pull request #200 from jl777/beta
Beta
2017-02-21 08:02:08 +02:00
jl777 50c887a644 Merge pull request #199 from jl777/dev
Test
2017-02-21 07:59:53 +02:00
jl777 d74b39f80c Merge pull request #197 from jl777/dPoW
225000 update
2017-02-19 10:40:12 +02:00
jl777 8104754bfd Merge pull request #196 from jl777/beta
225000 update
2017-02-19 10:39:36 +02:00
jl777 ac64c9a962 Merge pull request #195 from jl777/dev
225000 update
2017-02-19 10:37:15 +02:00
jl777 451cc49cce Merge pull request #193 from jl777/dPoW
225000 update
2017-02-19 10:32:03 +02:00
jl777 d3bd1762c6 Merge pull request #192 from jl777/beta
225000 update
2017-02-19 10:31:26 +02:00
jl777 e5c4439dbb Merge pull request #191 from jl777/dev
Dev
2017-02-19 10:30:38 +02:00
jl777 20ce141789 Merge pull request #190 from jl777/dPoW
Scheduled update at 225000
2017-02-19 09:30:41 +02:00
jl777 bafd1a2aaa Merge pull request #189 from jl777/beta
Scheduled update at 225000
2017-02-19 09:29:56 +02:00
jl777 c911b6d331 Merge pull request #188 from jl777/dev
scheduled update at 225000
2017-02-19 09:25:46 +02:00
jl777 5a941b8376 Merge pull request #186 from jl777/dev
test
2017-02-08 10:20:57 +02:00
jl777 26f03a90cf Merge pull request #185 from jl777/dev
test
2017-02-08 09:54:45 +02:00
jl777 c76d46c5b3 Merge pull request #184 from jl777/dev
improves notary mining stability
2017-02-08 09:25:35 +02:00
jl777 c75e405d42 Merge pull request #183 from jl777/dev
fix getinfo bad notaryid
2017-02-07 22:24:05 +02:00
jl777 356125d91e Merge pull request #180 from jl777/dPoW
DPoW
2017-02-07 18:41:20 +02:00
jl777 06120047af Merge pull request #179 from jl777/beta
Beta
2017-02-07 18:40:46 +02:00
jl777 390fd85669 Merge pull request #178 from jl777/dev
Dev
2017-02-07 18:33:11 +02:00
jl777 43a0502613 Merge pull request #176 from jl777/dPoW
DPoW
2017-02-07 17:36:44 +02:00
jl777 3745f573d5 Merge pull request #175 from jl777/beta
Beta
2017-02-07 17:35:58 +02:00
jl777 a35968f1d4 Merge pull request #174 from jl777/dev
Dev
2017-02-07 15:39:36 +02:00