Commit Graph

27693 Commits

Author SHA1 Message Date
ca333
219e684a50 fix typo 2019-06-09 09:48:39 +02:00
ca333
6301a294ed Merge pull request #169 from jl777/FSM
sync FSM
2019-06-09 09:45:13 +02:00
ca333
3d313229d8 add dev docs 2019-06-09 09:43:52 +02:00
ca333
dd1e2e7576 add src 2019-06-09 09:36:00 +02:00
ca333
f0171a9bbc update code of conduct 2019-06-09 09:33:23 +02:00
ca333
6bb5f308fa add contribution guideline 2019-06-09 09:32:37 +02:00
jl777
127d1485dc Merge pull request #1526 from jl777/jl777
Jl777
2019-06-07 22:54:57 -11:00
jl777
6432d0a24d Merge branch 'FSM' into jl777 2019-06-07 22:54:16 -11:00
jl777
65fd650782 Rescue stuff 2019-06-07 22:53:59 -11:00
jl777
733f4501a5 Merge branch 'dev' into FSM 2019-06-07 21:30:29 -11:00
jl777
e7777b405c Merge branch 'beta' into dev 2019-06-07 21:30:08 -11:00
jl777
81562f0459 Merge pull request #1525 from blackjok3rtt/beta
Disable ALL CCs on all CC activated chains.
2019-06-07 19:16:32 -11:00
blackjok3r
e73b3c5c9d Disable all CCs that are not used. Still needs list of ccs for KMDICE from Alright. 2019-06-08 12:50:10 +08:00
blackjok3rtt
215cd52809 Merge pull request #100 from jl777/beta
Beta
2019-06-08 11:32:21 +08:00
ca333
d206cc9c6c add security info 2019-06-08 01:22:28 +02:00
ca333
d256bddec4 Merge pull request #168 from jl777/FSM
sync FSM
2019-06-08 01:19:45 +02:00
jl777
439e7cb5d7 Fix getchaintips rpc crash. Thanks mike tout!! 2019-06-07 08:51:38 -11:00
jl777
b71ed3b95e Merge branch 'FSM' into jl777 2019-06-03 23:07:04 -11:00
jl777
c508dee766 Merge branch 'dev' into FSM 2019-06-03 23:06:37 -11:00
jl777
52661cc30a Merge branch 'beta' into dev 2019-06-03 23:05:24 -11:00
jl777
89e1414c6b Merge pull request #1524 from KMDLabs/master
merge changes for gcharang
2019-06-03 23:05:06 -11:00
blackjok3r
bc69675fc3 undo attempt at hs/s for staking chains 2019-06-04 17:55:34 +08:00
blackjok3rtt
c55c9ae930 Merge pull request #96 from jl777/beta
Beta
2019-06-04 17:49:52 +08:00
jl777
d2b906160e Merge pull request #1523 from jl777/dev
Dev
2019-06-03 21:15:53 -11:00
jl777
166fdd7c8b Merge pull request #1522 from jl777/FSM
FSM
2019-06-03 21:14:44 -11:00
jl777
3f2a0584e8 Merge pull request #1521 from jl777/jl777
Jl777
2019-06-03 21:14:11 -11:00
jl777
ee3aef5066 Define getacseason 2019-06-03 21:10:49 -11:00
jl777
37a2889b24 Merge branch 'FSM' into jl777 2019-06-03 19:23:28 -11:00
jl777
d1c16ee705 Merge branch 'dev' into FSM 2019-06-03 19:23:05 -11:00
jl777
52ff4a9cfc Merge branch 'beta' into dev 2019-06-03 19:22:45 -11:00
jl777
2dde049863 Merge pull request #1520 from blackjok3rtt/beta
sorry messed it up this works, have tested it.
2019-06-03 19:22:26 -11:00
blackjok3r
17dd062fee woops 2019-06-04 14:10:15 +08:00
jl777
bfd191585b Merge branch 'FSM' into jl777 2019-06-03 18:53:26 -11:00
jl777
dc28597e30 Merge branch 'dev' into FSM 2019-06-03 18:52:57 -11:00
jl777
bff1694a08 Merge branch 'beta' into dev 2019-06-03 18:52:26 -11:00
jl777
cf4c055f99 Merge pull request #1519 from blackjok3rtt/beta
fix PIRATE wallet forcing rescan
2019-06-03 18:51:57 -11:00
blackjok3r
86926e33f0 fix uint 2019-06-04 13:34:50 +08:00
blackjok3r
b29c95a26d fix PIRATE forced rescan. 2019-06-04 11:53:38 +08:00
blackjok3rtt
e49c63d6e4 Merge pull request #93 from jl777/beta
Beta
2019-06-04 11:12:23 +08:00
jl777
a38a0b2031 Merge pull request #1518 from jl777/kolo-jl
Notaries
2019-06-03 03:38:24 -11:00
Mihail Fedorov
c62ddda360 Notaries 2019 2019-06-03 17:36:28 +03:00
Mihail Fedorov
f5d4ff421e Notaries 2019 2019-06-03 02:04:54 +03:00
jl777
7730dfbf6d Merge branch 'FSM' into jl777 2019-05-30 22:14:04 -11:00
jl777
2a3dffbb5d Merge pull request #1516 from MyHush/zdupes2
Allow duplicate receivers in z_sendmany
2019-05-30 22:13:23 -11:00
Jonathan "Duke" Leto
01fb676782 Allow duplicate receivers in z_sendmany 2019-05-31 10:54:16 +02:00
jl777
06e60194dc Merge pull request #1515 from ca333/patch-4
fix OSX
2019-05-30 19:26:32 -11:00
jl777
ed2406172c Merge pull request #1514 from ca333/patch-3
fix OSX
2019-05-30 19:26:21 -11:00
jl777
5c7d67962a Merge pull request #1513 from ca333/patch-2
fix OSX
2019-05-30 19:26:08 -11:00
jl777
6a7a7e3a2d Merge pull request #1512 from ca333/patch-1
fix OSX
2019-05-30 19:25:55 -11:00
ca333
df7f46285a fix OSX 2019-05-31 03:14:38 +02:00