Commit Graph
23357 Commits
Author SHA1 Message Date
blackjok3r d5561eeb66 Merge branch 'dev' of https://github.com/blackjok3rtt/komodo into dev 2019-03-14 17:16:07 +08:00
blackjok3r 8cc7c51c53 Merge branch 'jl777-beta' into dev
x
2019-03-14 17:15:22 +08:00
blackjok3r 21742e2ce5 Merge branch 'beta' of https://github.com/jl777/komodo into jl777-beta
x
2019-03-14 17:15:03 +08:00
blackjok3rtt b97f4e091e fix 100% PoS chain (#1332) 2019-03-13 21:47:09 -11:00
blackjok3rtt c35503c4d4 Merge pull request #27 from jl777/dev
Dev
2019-02-26 16:30:10 +08:00
jl777 acfa52a3f9 Merge pull request #1284 from jl777/kolo
ILN
2019-02-25 19:02:44 -11:00
Mihail Fedorov 0d2bfae2bf ILN 2019-02-26 04:51:32 +03:00
jl777 e90131793e Merge pull request #1281 from igorvoltaic/master
edited OS X installation paragraph in README.md
2019-02-24 20:03:04 -11:00
igorvoltaic d8c4f6ec94 Update README.md 2019-02-25 09:54:07 +03:00
igorvoltaic a5d480a40e Update README.md 2019-02-25 09:50:10 +03:00
jl777 80e74e0c8b Merge pull request #1267 from KomodoPlatform/zmq_update
update dependencies
2019-02-19 09:21:30 -11:00
ca333 7bf6996468 update libsodium 2019-02-19 16:02:03 +01:00
ca333 c2665ae8bf update libsodium osx 2019-02-19 02:15:13 +01:00
ca333 a53eee78b5 update rust 2019-02-19 01:54:40 +01:00
ca333 599bb0b2e1 update boost 2019-02-19 01:52:16 +01:00
ca333 7b6a6a729a update openssl 2019-02-19 01:38:02 +01:00
ca333 7b8460cfaa update openssl 2019-02-19 01:33:03 +01:00
jl777 8034f6bddf Merge pull request #1258 from KomodoPlatform/master
update ZMQ
2019-02-17 17:10:47 -11:00
ca333 bcd6be86c5 Merge pull request #130 from KomodoPlatform/zmq_update
update zmq
2019-02-17 21:46:47 +01:00
ca333 7d50f06c76 add ZMQ to WIN 2019-02-17 18:21:18 +01:00
ca333 af9ff2e620 update zeromq 2019-02-17 18:20:57 +01:00
ca333 ec95ae2d65 remove ZMQ from WIN 2019-02-17 17:14:18 +01:00
ca333 4f5ba23dfc set static ZMQ flag 2019-02-17 16:05:19 +01:00
ca333 5c6ca4c291 update ZMQ 2019-02-17 15:15:17 +01:00
ca333 459faf5fe2 Merge pull request #129 from KomodoPlatform/master
update zmq
2019-02-17 15:13:44 +01:00
ca333 d6309d063a update zmq 2019-02-17 15:09:21 +01:00
jl777 9ca1eb8543 Merge pull request #1250 from chainmakers/beta
Add Ilien
2019-02-14 21:23:44 -11:00
Your Name 8702ec8130 new file: ac/ilien
new file:   fiat/ilien
2019-02-14 22:34:38 +00:00
Your Name 2933c4d2a9 modified: assetchains.json
modified:   assetchains.old
2019-02-14 22:08:20 +00:00
siulynot bc416d79e2 Merge pull request #5 from jl777/beta
Beta
2019-02-14 17:37:49 -04:00
jl777 df597cf8ae Merge pull request #1237 from jl777/dev
SEC and MGNX exemption
2019-02-11 02:31:14 -11:00
jl777 e8b7963356 SEC and MGNX exemption 2019-02-11 02:30:21 -11:00
blackjok3rtt 1a26a2b4ed Merge pull request #17 from jl777/dev
Dev
2019-01-28 14:16:45 +08:00
jl777 e7f7495492 Merge pull request #1218 from jl777/dev
Dev
2019-01-27 04:53:59 -11:00
jl777 a8ea6eb7ea Merge pull request #1217 from jl777/FSM
FSM
2019-01-27 04:53:12 -11:00
jl777 76024c356e Merge pull request #1216 from jl777/jl777
Disable removeorphan
2019-01-27 04:52:32 -11:00
jl777 fbd07edee2 Disable removeorphan 2019-01-27 04:51:48 -11:00
ca333 728c8f1e3d Merge pull request #119 from jl777/master
update master
2019-01-27 04:30:51 +01:00
jl777 c27493d9ac Merge pull request #1213 from jl777/dev
Dev
2019-01-26 01:31:13 -11:00
jl777 57f6fd813a Merge pull request #1212 from jl777/FSM
FSM
2019-01-26 01:30:36 -11:00
jl777 f5ac1e19d9 Merge pull request #1211 from jl777/jl777
Jl777
2019-01-26 01:29:35 -11:00
jl777 9484ddf59b Merge pull request #1210 from KomodoPlatform/cclib_dyn
update linux makefile
2019-01-26 01:28:16 -11:00
ca333 25965a5307 Merge pull request #124 from jl777/jl777
sync cclib_dyn->jl777:jl777
2019-01-26 13:11:17 +01:00
ca333 18f8c77197 update linux makefile 2019-01-26 13:09:27 +01:00
ca333 fe4b34e9e3 add linux headers 2019-01-26 13:08:29 +01:00
jl777 7c81fe3200 Merge pull request #1209 from jl777/dev
Dev
2019-01-25 17:20:22 -11:00
jl777 c990c403b3 Merge pull request #1208 from jl777/FSM
FSM
2019-01-25 17:19:11 -11:00
jl777 b778dbef8e Merge pull request #1207 from jl777/jl777
Jl777
2019-01-25 17:16:59 -11:00
jl777 932b358243 +comments how to update to 8MB blocks 2019-01-25 17:15:56 -11:00
jl777 352c93f2c4 -<<<<< HEAD 2019-01-25 16:59:55 -11:00