mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 23:06:39 +01:00
Code Issues Projects Releases Packages Wiki Activity
14642 commits 3 branches 150 tags 4.1 GiB
Commit graph

14642 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Atteneder
e375e9aadb
Merge pull request #5416 from xrhodium/fixed-xrc-title 
Fixed XRC coin title to correct one
 2021-05-12 21:29:05 +02:00
Christoph Atteneder
c9166f9ae0
Merge pull request #5489 from jmacxx/fix_pricenode_minfee 
Fix the PriceNode lower bounds for MinFee
 2021-05-12 21:25:28 +02:00
jmacxx
f462a72899
Differentiate PriceNode minFee/txFee limits (2 and 10) 2021-05-11 21:50:10 -05:00
Christoph Atteneder
21a231b735
Merge pull request #5478 from BtcContributor/restore_strings 
Restore missing displayStrings strings in Settings
 2021-05-11 16:20:06 +02:00
Christoph Atteneder
68f4ec144b
Merge pull request #5483 from BtcContributor/custominput_customfee 
Fix custom fee rate field when custom inputs are used
 2021-05-11 14:43:39 +02:00
BtcContributor
1a129b3fa9
Remove redundant code in updateItem 2021-05-11 10:23:51 +02:00
BtcContributor
77f5dc8822
Add case when you have multiple inputs and not all are selected 2021-05-11 10:13:00 +02:00
BtcContributor
3cb79956db
Fix custom fee rate field when custom inputs are used. 2021-05-11 09:46:30 +02:00
BtcContributor
7ee9eae4ae
Restore missing displayStrings strings in Settings 2021-05-09 20:56:51 +02:00
sqrrm
993f9b4e29
Merge pull request #5475 from BtcContributor/bsq_dust 
Fix the formula used to calculate BSQ amount needed to avoid dust
 2021-05-07 12:52:43 +02:00
Christoph Atteneder
eb9bce3033
Merge pull request #5451 from BtcContributor/fixstringmakingoffer 
Fix string when creating a new offer
 2021-05-07 11:52:17 +02:00
Christoph Atteneder
225a6f079f
Merge pull request #5473 from jmacxx/fix_edit_offer_focus_issue 
Fix focus issue when enter key used to edit offer
 2021-05-07 11:43:21 +02:00
Christoph Atteneder
ba1211bab0
Merge pull request #5476 from bisq-network/release/v1.6.4 
Release/v1.6.4
 2021-05-07 11:16:07 +02:00
Christoph Atteneder
4104fcd67f
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.6.4 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/macosx/insert_snapshot_version.sh
#	relay/src/main/resources/version.txt
 2021-05-07 10:47:05 +02:00
sqrrm
fa054c76ad
Merge pull request #5464 from bisq-network/release/v1.6.3 
Release/v1.6.3
 2021-05-07 10:45:05 +02:00
Christoph Atteneder
89729c41c9
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.6.3 
# Conflicts:
#	scripts/install_java.sh
 2021-05-07 10:33:45 +02:00
BtcContributor
ff18e8afbe
Fix the amount required to avoid BSQ dust as the formula used was incorrect. 2021-05-07 10:21:44 +02:00
jmacxx
11616610a8
fix issue #5460 (when enter key used, focus is wrong) 2021-05-06 23:19:58 -05:00
Christoph Atteneder
26e78e5989
Fix wrong resource path for Raspberry Pi bundle 2021-05-06 20:40:20 +02:00
Christoph Atteneder
25d2731fb4
Revert to SNAPSHOT version 2021-05-06 20:40:11 +02:00
Marcus0x
1e8db48a7b
Fixed XRC Coin Title 2021-05-06 16:51:22 +02:00
BtcContributor
270f7ba3cb
Fix string also for takers 2021-05-06 15:45:05 +02:00
BtcContributor
1f7c4fce05
Apply m52go suggestion 
Co-authored-by: m52go <735155+m52go@users.noreply.github.com>
 2021-05-06 13:55:57 +02:00
Christoph Atteneder
9c4137bc11
Not update the historical resource file 2021-05-05 14:29:52 +02:00
Christoph Atteneder
0731804b45
Filter banned seednodes with wrong format 2021-05-05 14:27:32 +02:00
Christoph Atteneder
83d9fa0ee8
Merge pull request #5453 from devinbileck/change-mempool.bisq.services-onion 
Change mempool.bisq.services onion address
 2021-05-05 14:27:06 +02:00
sqrrm
2205726e21
Merge pull request #5469 from ripcurlx/filterBannedSeednodesWithWrongFormat 
Filter banned seednodes with wrong format
 2021-05-05 13:24:58 +02:00
Christoph Atteneder
c63148e62a
Merge pull request #5405 from maxim-belkin/update-install-java-script 
Update scripts/install_java.sh script
 2021-05-05 11:36:24 +02:00
Christoph Atteneder
35ede06037
Filter banned seednodes with wrong format 2021-05-05 11:21:53 +02:00
Devin Bileck
a486093ffa
Change mempool.bisq.services onion address 
In the process of migrating the server to a new instance, my secret key
for the onion address seems to have become corrupted. Therefore, I
needed to generate a new onion address.
 2021-05-05 10:28:09 +02:00
Christoph Atteneder
dba59138df
Bump version number for v1.6.4 2021-05-05 10:27:42 +02:00
Christoph Atteneder
59b4697664
Revert to SNAPSHOT version 2021-05-04 11:09:44 +02:00
Christoph Atteneder
177067ea08
Merge pull request #5404 from maxim-belkin/gh-action 
.github/workflows/build.yml: new GitHub Action
 2021-05-04 11:03:54 +02:00
Christoph Atteneder
31b7bd1de2
Merge pull request #5452 from BtcContributor/addfiatequivalent 
Add fiat equivalent for Total Amount & Security Deposit for both makers and sellers
 2021-05-04 10:02:38 +02:00
BtcContributor
4af614b9cc
Update scripts to JDK 11 2021-05-01 10:24:40 +02:00
Devin Bileck
f5fd99f9ad
Change mempool.bisq.services onion address 
In the process of migrating the server to a new instance, my secret key
for the onion address seems to have become corrupted. Therefore, I
needed to generate a new onion address.
 2021-04-30 14:43:56 -07:00
BtcContributor
de74ab04de
Fix codacy issues 2021-04-30 18:46:20 +02:00
BtcContributor
ea8653ef87
Add fiat conversion also for trade amount when making a trade to sell btc 2021-04-30 18:24:09 +02:00
BtcContributor
a1d63e35d7
Notice when the security deposit is the minimum possible 2021-04-30 17:35:24 +02:00
BtcContributor
0218803650
Restore totalToPay as 'final' as before 2021-04-30 16:56:41 +02:00
BtcContributor
8e1074881f
Add fiat equivalent for Total Amount & Security Deposit for both makers and sellers 2021-04-30 16:49:54 +02:00
sqrrm
e287fddc86
Merge pull request #5449 from ripcurlx/release/v1.6.3 
Update DAO data store for v1.6.3
 2021-04-30 12:55:10 +02:00
BtcContributor
3047cd48d4
Fix missing verb in string when creating a new offer (again) 2021-04-30 11:24:21 +02:00
BtcContributor
943632fd7c
Fix missing verb in string when creating a new offer 2021-04-30 11:21:50 +02:00
Christoph Atteneder
fa920fc0a1
Update DAO state for v1.6.3 2021-04-29 20:20:49 +02:00
Christoph Atteneder
ec4ce6027d
Merge pull request #5448 from m52go/remove-faq-links 
Replace bisq.network/faq links with bisq.wiki
 2021-04-29 15:20:06 +02:00
m52go
afa3daa069
Replace bisq.network/faq links with bisq.wiki 2021-04-28 20:29:47 -04:00
ghubstan
1ea445b1e5
Fix NetworkParameters.fromID( incorrect-arg -> correct-arg ) 2021-04-28 17:41:40 +02:00
ghubstan
2559ba2203
Fix flaky tx fee rate validation test (api) 
Min tx fee rates move fast, sometimes so low the validation test fails.
Try to consistently force validation error by setting fee rate=1.
 2021-04-28 17:41:30 +02:00
ghubstan
f94f19e79b
Fix bsq wallet testcase setup (api) 
Regtest btc block was not being generated, and chain download not triggered.
Also ajusted testGetUnusedBsqAddress() for upcoming segwit bsq changes.
 2021-04-28 17:40:52 +02:00