Commit graph

3497 commits

Author SHA1 Message Date
Manfred Karrer
b6cc3518a9
Add onInitP2pNetwork and onInitWallet to BisqSetupListener
- Rename BisqSetupCompleteListener to BisqSetupListener
- Add onInitP2pNetwork and onInitWallet to BisqSetupListener
- make onInitP2pNetwork and onInitWallet default so no impl. required
2019-10-05 10:06:38 +02:00
Christoph Atteneder
70d17eaf38
Merge pull request #3350 from QuantumLeaper/list-upx-asset
List uPlexa (UPX)
2019-10-04 12:10:26 +02:00
lukasz
d20afd6ec5 Remove not used private methods from BisqEnvironment 2019-10-03 20:16:13 +02:00
Kyle Pierce
f5f461111e List uPlexa (UPX) 2019-10-03 05:53:52 -04:00
chimp1984
b1c8141d48
Add mediator prefix to trade statistics 2019-10-02 00:18:32 -05:00
wiz
c63c77ce1e
Tweak the English name of Japan Bank Transfer payment method 2019-09-28 18:00:28 +09:00
Christoph Sturm
b2befde867 Check for dust after subtracting fee, not before. 2019-09-25 15:17:59 +02:00
Christoph Sturm
939f48a29b remove instance 2019-09-24 18:17:38 +02:00
Christoph Sturm
9cd5c9f83f inject DaoKillSwitch 2019-09-24 16:56:40 +02:00
Christoph Atteneder
4201e065bc
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.1.6
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
2019-09-23 10:57:03 +02:00
Christoph Atteneder
39a811ec26
Fix broken line break 2019-09-23 10:07:53 +02:00
chimp1984
8cf49e0308
Add missing handling for mailbox messages
- Without that fix mediated payouts would only succeed if both users are
online.
2019-09-23 09:43:13 +02:00
chimp1984
29f1cb29e3
Fix potential ConcurrentModificationException
We need to delay that call as we might get executed at startup after
mailbox messages are applied where we iterate over out pending trades.
The closeDisputedTrade method would remove that trade from the list
causing a ConcurrentModificationException.
To avoid that we delay for one render frame.
2019-09-23 09:43:02 +02:00
chimp1984
94724a2365
Fix potential ConcurrentModificationException
We need to delay that call as we might get executed at startup after
mailbox messages are applied where we iterate over out pending trades.
The closeDisputedTrade method would remove that trade from the list
causing a ConcurrentModificationException.
To avoid that we delay for one render frame.
2019-09-23 01:06:20 +02:00
chimp1984
8cd9f29b5a
Add missing handling for mailbox messages
- Without that fix mediated payouts would only succeed if both users are
online.
2019-09-23 01:05:44 +02:00
wiz
593abc24c2
Add new pricenode gztmprecgqjq64zh operated by @wiz 2019-09-20 16:22:16 +09:00
initCCG
08bbfe8ab4 add Right-to-Left support (#2774)
* add Right-to-Left support

* make requested changes in PR #2774
2019-09-19 16:06:21 +02:00
Steven Barclay
10bed7aafe Remove redundant/invalid null handling from PaymentMethod.compareTo
Don't return 0 in the case of a null 'this.id' field, as that violates
the Comparable contract and leads to inconsistent NPE throwing when the
arguments are swapped. Instead, just assume (reasonably) that the ID
field will never be null.
2019-09-17 18:59:31 +01:00
Christoph Sturm
feadfb86a0 Add an explaining comment 2019-09-17 18:42:46 +02:00
Christoph Sturm
f2ec433cc2 use /usr/bin/caffeinate to disable power management on macOS 2019-09-17 18:22:46 +02:00
Christoph Atteneder
736da2a006
Merge pull request #3278 from erciccione/DAO-username
Change dao.proposal.display.name to 'Exact GitHub username'
2019-09-17 17:05:37 +02:00
chimp1984
b26a15600d
Use static method, remove unused formatter field 2019-09-17 16:56:30 +02:00
Christoph Atteneder
cc3128d4e0
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.1.6
# Conflicts:
#	core/src/main/java/bisq/core/offer/OfferUtil.java
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/MainView.java
#	desktop/src/main/java/bisq/desktop/main/MainViewModel.java
#	desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersViewModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
2019-09-17 15:52:51 +02:00
erciccione
072fb137bb
Change dao.proposal.display.name to 'Exact GitHub username' 2019-09-17 11:10:54 +02:00
Devin Bileck
0cdf54a992
Update MobileModel parseDescriptor to support iPhone 11
It was parsing only the first digit of the version and using that in a
comparison check to determine if the version is greater than 5.
This meant for the iPhone 11 it was comparing 1 > 5, returning an
incorrect result.

It now supports multi-digit version numbers (i.e. 11), including
support for a suffix in the version (i.e. 11S), just in case...
2019-09-17 00:13:18 -07:00
wiz
db62d0df0f
Update IP address for @mrosseel's 2 hard-coded BTC nodes 2019-09-16 09:26:30 +02:00
Christoph Atteneder
85f9ead931
Merge pull request #3262 from wiz/fix-mrosseel-btcnode-ip-addresses
Update IP address for @mrosseel's 2 hard-coded BTC nodes
2019-09-16 09:26:15 +02:00
wiz
8327d35ad5
Remove bitcoin4-fullnode.csg.uzh.ch / 192.41.136.217 btcnode 2019-09-16 09:25:37 +02:00
wiz
683b8b590a
Remove bitcoin4-fullnode.csg.uzh.ch / 192.41.136.217 btcnode 2019-09-15 11:06:19 +09:00
wiz
d3335208bb
Temporarily disable onion host for @KanoczTomas's BTC node 2019-09-15 09:59:11 +09:00
wiz
ec9cc04eb8
Update IP address for @mrosseel's 2 hard-coded BTC nodes 2019-09-15 09:50:57 +09:00
wiz
4cc636dfea
Fix various bugs related to Japan Bank Transfer payment method (#3258)
* Fix various bugs related to Japan Bank Transfer payment method

* Add missing call to addFormForBuyer(), improve BuyerStep2View UI
* Fix Account Creation UI elements width to fill entire pane
* Fix Account Creation UI elements padding to avoid overlap
* Tweak trade display popup text and various strings
* Remove @Deprecated tag

* Remove unnecessary line break

* Improve layout of fields
2019-09-14 19:57:24 +02:00
wiz
f9687ad563 Fix various bugs related to Japan Bank Transfer payment method (#3258)
* Fix various bugs related to Japan Bank Transfer payment method

* Add missing call to addFormForBuyer(), improve BuyerStep2View UI
* Fix Account Creation UI elements width to fill entire pane
* Fix Account Creation UI elements padding to avoid overlap
* Tweak trade display popup text and various strings
* Remove @Deprecated tag

* Remove unnecessary line break

* Improve layout of fields
2019-09-14 19:55:58 +02:00
chimp1984
9f84f023fa
Remove CapabilityRequiringPayload from GetBlocksRequest
We remove CapabilityRequiringPayload as it would cause problems if the
lite node connects to a new seed node and they have not exchanged
capabilities already. We need to improve capability handling the we
can re-enable it again. As this message is sent any only to seed nodes
it does not has any effect. Even if a lite node receives it it will
be simply ignored.
2019-09-14 19:51:15 +02:00
sqrrm
e6179990bd
Merge pull request #3255 from ripcurlx/update-data-stores-and-dates-for-v1.1.6
Update data stores and dates for v1.1.6
2019-09-14 01:25:20 +02:00
Christoph Atteneder
690ceb013e
Fix typo 2019-09-13 18:55:04 +02:00
Christoph Atteneder
ac98a616f1
Update migration dates for v1.1.6 and remove testing code 2019-09-13 14:46:09 +02:00
Christoph Atteneder
bd656d5b3e
Rename review and accept or reject button to prevent confusion 2019-09-13 13:39:29 +02:00
Christoph Atteneder
15f71c9e02
Add information what to do next after mediation is completed 2019-09-13 12:16:40 +02:00
Christoph Atteneder
982f610a16
Add alternative text until mediation is activated 2019-09-13 11:57:57 +02:00
wiz
a09557fc45
Add new payment method: Japan Bank Transfer (furikomi) 2019-09-13 09:37:16 +02:00
Christoph Atteneder
13f00a9f48
Merge pull request #3225 from wiz/japan-bank-transfer-payment-method
Add new payment method: Japan Bank Transfer
2019-09-13 09:36:09 +02:00
wiz
fb385a0074
Add new payment method: Japan Bank Transfer (furikomi) 2019-09-13 11:46:21 +09:00
chimp1984
e71b6d69a7
Remove CapabilityRequiringPayload from NewBlockBroadcastMessage
We remove the CapabilityRequiringPayload interface to avoid risks
that new BSQ blocks are not well distributed in case the capability is
not exchanged at the time when the message is sent. We need to improve
the capability handling so that we can be sure that we know the actual
capability of the peer.
2019-09-13 00:38:59 +02:00
chimp1984
4a3d070259
Close trader chat popup once trade gets closed
Fixes https://github.com/bisq-network/bisq/issues/3243
2019-09-11 17:53:39 +02:00
chimp1984
5e48845d4c
Remove dev log, change log level 2019-09-11 17:52:57 +02:00
chimp1984
617ae35adf
Fix wrong error string 2019-09-11 16:53:53 +02:00
Justin Carter
3b46f3584f
Extract parsing functions from BSFormatter to ParsingUtils
Parsing and formatting are 2 different concerns, its better to have 2
classes that handle these.
2019-09-11 16:14:18 +02:00
Justin Carter
fe33a80de5
Extract DisplayUtils from BSFormatter
All methods that are only used in the desktop project are removed from
BSFormatter to DisplayUtils. This reduces the entanglement between the desktop and core
project by reducing the surface area of the coupling.
2019-09-11 15:58:48 +02:00
Florian Reimair
be21535a4b
Merge pull request #3239 from bodymindarts/static-BSFormatter-functions
Make stateless BSFormatter functions static and remove dead code
2019-09-11 13:10:37 +02:00