mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,847 Commits 4 Branches 148 Tags 4.3 GiB
15c83aa592
Commit Graph

6847 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Karrer
048767af1a
Make ProposalConsensus and CompensationConsensus methods static 2018-10-10 14:28:49 -05:00
Manfred Karrer
4b9073ce8a
Rename support for other base currencies in getDefaultMinFeePerByte 2018-10-10 14:28:03 -05:00
Manfred Karrer
965d741657
Rename fields and params 2018-10-10 14:21:11 -05:00
Manfred Karrer
8e22916914
Adjust comments 2018-10-10 14:18:56 -05:00
Manfred Karrer
923aaf6cdc
Remove other base currencies from FeeService 2018-10-10 14:06:24 -05:00
Manfred Karrer
c8f0098b2b
Add comments, cleanups 2018-10-10 14:03:53 -05:00
Manfred Karrer
280af36fc5
Reduce default btc miner fee from 200 to 50 sat/byte 2018-10-10 13:47:26 -05:00
Manfred Karrer
e99d733642
Remove PHASE_BREAK4, adjust phase periods and fees 2018-10-10 13:39:51 -05:00
Manfred Karrer
d2c98438ab
Merge branch 'master' into Dao-UI-improvements 2018-10-10 00:45:08 -05:00
Manfred Karrer
a63d1cc580
Merge remote-tracking branch 'upstream/master' 2018-10-10 00:43:51 -05:00
Manfred Karrer
56965c1904
Merge pull request #1765 from devinbileck/cancel-wallet-password-prompt 
Show cancel button in wallet password prompt
 2018-10-10 00:42:59 -05:00
Manfred Karrer
db3cd329b9
Add VoteResultExceptionHandler 2018-10-09 23:31:43 -05:00
Manfred Karrer
9b40306d9a
Add handling for missing proposal data 2018-10-09 22:32:03 -05:00
Manfred Karrer
5141806509
Add handling for missing blindVote data 2018-10-09 22:00:02 -05:00
Devin Bileck
1d179544f6
Hide the forgot password button in the SeedWordsView 2018-10-09 00:14:43 -07:00
Devin Bileck
c76fd598cd
Reworked implementation so as not to affect other uses of the 
WalletPasswordWindow
 2018-10-08 23:08:17 -07:00
Manfred Karrer
58e6db0a25
Persist DecryptedBallotsWithMeritsList 2018-10-08 20:13:22 -05:00
Manfred Karrer
4cc17feace
Persist EvaluatedProposalList 2018-10-08 19:47:54 -05:00
Devin Bileck
269912d1bb
Show cancel button in wallet password prompt 2018-10-08 15:51:36 -07:00
Manfred Karrer
d279dae032
Rename chainHeadHeight to chainHeight 2018-10-08 11:22:57 -05:00
Manfred Karrer
57355f2b19
Merge branch 'Dao-UI-improvements' 2018-10-08 11:18:42 -05:00
Manfred Karrer
d87bbf9318
Merge pull request #1763 from ManfredKarrer/tx-broadcaster-fix 
Tx broadcaster fix
 2018-10-08 07:10:52 -05:00
Manfred Karrer
7f8a90d1cd
Merge pull request #1764 from ManfredKarrer/remove_okpay 
Deactivate OKPay as it does not exist anymore
 2018-10-08 07:10:41 -05:00
Manfred Karrer
8232eeecd8
Deactivate OKPay as it does not exist anymore 
OkPay seems to have rebranded to Weezzo.
The OkPay webpage is offline but some links go to Weezzo.
Seems pretty unprofessional hwo they did the move...
Seems they have been involved with BTC-e…
https://bitcointalk.to/index.php?topic=2094721.0
 2018-10-07 21:54:00 -05:00
Manfred Karrer
be1f177fc7
Increase timeout to 30 sec 2018-10-07 17:40:44 -05:00
Manfred Karrer
85c80bcd5c
Remove the maybeCommitTx call at timeout 2018-10-07 17:40:01 -05:00
aejontargaryen
6d7b2dc777 List Dragonglass (DRGL) 2018-10-07 16:04:03 -04:00
Manfred Karrer
fbbec72eb0
Merge branch 'master' into arbitration-system-improvements 2018-10-07 00:47:42 -05:00
Manfred Karrer
5dfbb6d596
Merge branch 'master' into Dao-UI-improvements 2018-10-07 00:46:48 -05:00
Manfred Karrer
7d9a53adc9
Merge pull request #1749 from ManfredKarrer/small-fixes 
Small fixes
 2018-10-07 00:45:44 -05:00
Manfred Karrer
6bcbfe7ce3
Merge branch 'master' into Dao-UI-improvements 2018-10-05 15:23:07 -05:00
Manfred Karrer
2d593ee88f
Merge branch 'master' into arbitration-system-improvements 2018-10-05 15:21:41 -05:00
Manfred Karrer
8c85a1bab5
Merge branch 'master' into small-fixes 2018-10-05 15:21:14 -05:00
Manfred Karrer
e2c830e632
Merge pull request #1657 from neoscoin/list-neos-coin 
List Neos (NEOS)
 2018-10-05 15:19:45 -05:00
Manfred Karrer
7a22958523
Merge branch 'master' of https://github.com/xwebnetwork/bisq into xwebnetwork-master 
# Conflicts:
#	assets/src/main/resources/META-INF/services/bisq.asset.Asset
 2018-10-05 14:13:48 -05:00
Manfred Karrer
f197cc0d82
Merge branch 'master' of https://github.com/xwebnetwork/bisq into xwebnetwork-master 
# Conflicts:
#	assets/src/main/resources/META-INF/services/bisq.asset.Asset
 2018-10-05 14:13:44 -05:00
Manfred Karrer
881ee1949f
Merge pull request #1667 from greenblockcoin/list-greenblockcoin 
List Greenblockcoin (GBK)
 2018-10-05 14:11:23 -05:00
Manfred Karrer
93ffa7ef6d
Merge branch 'list-pzdc-coin' of https://github.com/pzdc-project/bisq into pzdc-project-list-pzdc-coin 
# Conflicts:
#	assets/src/main/resources/META-INF/services/bisq.asset.Asset
 2018-10-05 14:09:50 -05:00
Manfred Karrer
0fe8216418
Merge branch 'list-pzdc-coin' of https://github.com/pzdc-project/bisq into pzdc-project-list-pzdc-coin 
# Conflicts:
#	assets/src/main/resources/META-INF/services/bisq.asset.Asset
 2018-10-05 14:09:46 -05:00
Manfred Karrer
e92c9a0e48
Merge branch 'list-qrl-asset' of https://github.com/scottdonaldau/bisq into scottdonaldau-list-qrl-asset 
# Conflicts:
#	assets/src/main/resources/META-INF/services/bisq.asset.Asset
 2018-10-05 14:04:49 -05:00
Manfred Karrer
6c4b56d880
Merge branch 'list-qrl-asset' of https://github.com/scottdonaldau/bisq into scottdonaldau-list-qrl-asset 
# Conflicts:
#	assets/src/main/resources/META-INF/services/bisq.asset.Asset
 2018-10-05 14:04:34 -05:00
Manfred Karrer
b40621cc46
Merge pull request #1653 from alaniz3/list-kekcoin 
List Kekcoin (KEK)
 2018-10-05 14:02:04 -05:00
Manfred Karrer
063479b83c
Merge pull request #1654 from Alexqsd/list-loki-asset 
List Loki (LOKI)
 2018-10-05 14:01:50 -05:00
Manfred Karrer
a81ad4a42e
Merge pull request #1656 from mobitglobal/mobitglobal-asset 
List MobitGlobal (MBGL)
 2018-10-05 14:01:31 -05:00
Manfred Karrer
adbe7fe1a4
Merge pull request #1665 from Technohacker/list-ryo-asset 
List Ryo (RYO)
 2018-10-05 14:00:35 -05:00
Manfred Karrer
72ea006c3a
Merge pull request #1662 from BTC2CoreDevs/list-bitcoin2-asset 
List Bitcoin 2 (BTC2)
 2018-10-05 14:00:12 -05:00
Manfred Karrer
2a68bd1307
Merge pull request #1691 from ridd84/list-croat-asset 
List Croat (CROAT)
 2018-10-05 13:57:53 -05:00
Manfred Karrer
77324ef41f
Merge pull request #1668 from DATSEC/list-starwels-asset 
List Starwels (MAI)
 2018-10-05 13:57:37 -05:00
Manfred Karrer
518f31cb1d
Merge pull request #1687 from RocksteadyTC/master 
List TurtleCoin (TRTL)
 2018-10-05 13:57:09 -05:00
Manfred Karrer
95d7ea2e1c
Merge pull request #1697 from SuB1X-Coin/list-sub1x-asset 
List SUB1X (SUB1X)
 2018-10-05 13:56:55 -05:00