jl777
|
05011900b7
|
Merge pull request #1545 from jl777/FSM
FSM
|
2019-06-10 19:04:52 -11:00 |
|
jl777
|
206ae31734
|
Merge pull request #1544 from jl777/jl777
Jl777
|
2019-06-10 19:04:25 -11:00 |
|
jl777
|
8906371a9b
|
Merge pull request #1543 from jl777/kolo-jl
dev
|
2019-06-10 19:02:48 -11:00 |
|
Mihail Fedorov
|
086b9c7177
|
dev
|
2019-06-10 23:32:12 +03:00 |
|
jl777
|
4a9a1d2b8e
|
Merge branch 'FSM' into jl777
|
2019-06-10 05:51:30 -11:00 |
|
jl777
|
4dd2e2d7b2
|
Merge branch 'dev' into FSM
|
2019-06-10 05:51:05 -11:00 |
|
jl777
|
0b4c9628aa
|
Merge branch 'beta' into dev
|
2019-06-10 05:50:43 -11:00 |
|
jl777
|
818072e5cb
|
Merge pull request #1542 from blackjok3rtt/beta
wallet: Skip transactions with no shielded data in CWallet::SetBestCh…
|
2019-06-10 05:50:25 -11:00 |
|
Jack Grigg
|
a581ac5e1b
|
wallet: Skip transactions with no shielded data in CWallet::SetBestChain()
Co-authored-by: Daira Hopwood <daira@jacaranda.org>
Closes #3495.
|
2019-06-11 00:45:56 +08:00 |
|
jl777
|
a593da86b9
|
Merge pull request #1541 from jl777/dev
Merge branch 'beta' into dev
|
2019-06-10 05:34:20 -11:00 |
|
jl777
|
02bad9d99e
|
Merge pull request #1540 from jl777/FSM
FSM
|
2019-06-10 05:33:47 -11:00 |
|
jl777
|
2c098054de
|
Merge branch 'FSM' into jl777
|
2019-06-10 05:33:09 -11:00 |
|
jl777
|
f9c9b2ed90
|
Merge pull request #1539 from ca333/patch-5
bump version
|
2019-06-10 05:31:02 -11:00 |
|
jl777
|
922bbf9dd1
|
Merge branch 'FSM' into jl777
|
2019-06-10 05:18:25 -11:00 |
|
ca333
|
1403eb6cf7
|
bump version
bump version for the hardfork
|
2019-06-10 18:18:09 +02:00 |
|
jl777
|
626a04434c
|
Merge branch 'dev' into FSM
|
2019-06-10 05:16:39 -11:00 |
|
jl777
|
9048ed62ae
|
Merge branch 'beta' into dev
|
2019-06-10 05:16:17 -11:00 |
|
jl777
|
61a9b85974
|
Merge pull request #1538 from blackjok3rtt/beta
Change ccEnable/Disable to macro
|
2019-06-10 05:05:35 -11:00 |
|
blackjok3r
|
cab05f7f01
|
fix
|
2019-06-10 23:53:11 +08:00 |
|
blackjok3r
|
fd23e3a914
|
add -ac_ccactivateht=. Fix oracles timestamp activation, to stop loading block from disk for no reason.
|
2019-06-10 23:30:13 +08:00 |
|
blackjok3r
|
ce6acf0d00
|
Change ccEnable/Disable to macro
|
2019-06-10 20:51:52 +08:00 |
|
blackjok3rtt
|
5fdbf460d5
|
Merge pull request #101 from jl777/beta
Beta
|
2019-06-10 20:28:11 +08:00 |
|
jl777
|
b47f7733df
|
Merge branch 'FSM' into jl777
|
2019-06-10 00:56:38 -11:00 |
|
jl777
|
1f523d4162
|
Merge pull request #1537 from jl777/dev
Dev
|
2019-06-10 00:56:23 -11:00 |
|
jl777
|
a7b9ee5150
|
Merge pull request #1536 from jl777/FSM
Merge branch 'dev' into FSM
|
2019-06-10 00:55:41 -11:00 |
|
jl777
|
5a44f04d8b
|
Merge pull request #1535 from Alrighttt/FSM
Add oracles/faucet to KMDICE, add tokens to COQUI
|
2019-06-10 00:54:55 -11:00 |
|
jl777
|
eb99b6f662
|
-print
|
2019-06-10 00:14:48 -11:00 |
|
jl777
|
5197c502e9
|
Fix ac
|
2019-06-10 00:13:50 -11:00 |
|
jl777
|
553f53f11f
|
+prints
|
2019-06-10 00:11:59 -11:00 |
|
jl777
|
4993e1c477
|
+pritns
|
2019-06-10 00:06:04 -11:00 |
|
Alrighttt
|
c9a943a86e
|
add oracles, faucet to DICE; add tokens to COQUI
|
2019-06-10 10:50:23 +00:00 |
|
Alrighttt
|
cd189ae070
|
Merge pull request #2 from jl777/FSM
Fsm
|
2019-06-10 12:36:37 +02:00 |
|
jl777
|
9aba95eb1d
|
Asset chains dust
|
2019-06-09 22:12:54 -11:00 |
|
jl777
|
0087b1e546
|
Merge branch 'FSM' into jl777
|
2019-06-09 21:47:38 -11:00 |
|
jl777
|
94c7bec747
|
Merge branch 'dev' into FSM
|
2019-06-09 21:46:59 -11:00 |
|
jl777
|
c53064c938
|
Merge pull request #1534 from jl777/dev
Dev
|
2019-06-09 21:46:43 -11:00 |
|
jl777
|
929990301e
|
Merge pull request #1533 from KomodoPlatform/dev
fix multi OS build
|
2019-06-09 21:46:14 -11:00 |
|
ca333
|
c0e915a27e
|
Merge pull request #174 from jl777/dev
sync dev
|
2019-06-10 10:41:49 +02:00 |
|
jl777
|
e028fc8a6e
|
Merge pull request #1532 from jl777/dev
Dev
|
2019-06-09 21:37:29 -11:00 |
|
jl777
|
350b8e85e0
|
Merge pull request #1531 from jl777/FSM
FSM
|
2019-06-09 21:35:30 -11:00 |
|
jl777
|
839f2b5959
|
Merge branch 'dev' into FSM
|
2019-06-09 21:34:47 -11:00 |
|
jl777
|
98b1189c4b
|
Merge pull request #1530 from jl777/jl777
Jl777
|
2019-06-09 21:34:21 -11:00 |
|
jl777
|
507cb56c5d
|
Tweak batches
|
2019-06-09 21:33:52 -11:00 |
|
jl777
|
dea44a0b20
|
Merge pull request #1529 from jl777/kolo-jl
dev
|
2019-06-09 21:33:18 -11:00 |
|
ca333
|
77ceea9b15
|
fix multi OS build
|
2019-06-10 00:32:19 +02:00 |
|
ca333
|
34192e2b22
|
add multi OS ifdef
added ifdef directives for conditional mutli OS build
|
2019-06-10 00:18:16 +02:00 |
|
ca333
|
1120925b60
|
Merge pull request #173 from jl777/dev
sync dev
|
2019-06-09 22:31:40 +02:00 |
|
Mihail Fedorov
|
2abffc800c
|
dev
|
2019-06-09 19:48:21 +03:00 |
|
jl777
|
266cd487a3
|
Merge branch 'FSM' into jl777
|
2019-06-08 22:19:50 -11:00 |
|
jl777
|
c42116ba3b
|
Refund processor
|
2019-06-08 22:19:33 -11:00 |
|