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

13652 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christoph Atteneder
aaad74fbf0
Merge pull request #5009 from chimp1984/improve-log-of-initial-data-response 
Add estimated size to log of initial data response
 2020-12-29 20:00:54 +01:00
Christoph Atteneder
115ec78f4d
Merge pull request #5011 from chimp1984/show-stacktrace-in-error-popup-at-view-exceptions 
Show stacktrace in error popup at view exceptions
 2020-12-29 19:58:01 +01:00
Christoph Atteneder
30cfe5de7b
Merge pull request #5015 from Jakub-CZ/fix-withdrawal-label 
Fix missing apostrophe in Withdrawal view
 2020-12-29 19:57:02 +01:00
Christoph Atteneder
94cf02303e
Merge pull request #4950 from chimp1984/improve-offer-publishing 
Improve offer publishing
 2020-12-29 19:51:21 +01:00
Christoph Atteneder
6564c3fe7f
Merge pull request #4988 from chimp1984/rearrange-bsq-price-rows 
Move BSQ price in USD at first row
 2020-12-29 19:45:44 +01:00
Christoph Atteneder
a2a542e11e
Merge pull request #4999 from chimp1984/persist-app-window-layout 
Add generic map (cookie) to UserPayload
 2020-12-29 19:44:29 +01:00
ghubstan
206364de42
Reduce some trade test wait times 
Commit 2070e76 fixed the repeating dao sync bug, so don't need to
wait as long after generating a btc block.
 2020-12-29 14:12:55 -03:00
ghubstan
6594d147d3
Refactor wallet test fixtures into util 2020-12-29 13:54:27 -03:00
ghubstan
9250845a66
Explain why balance asserts are checking a range, not one value 
And change log.info to log.debug.
 2020-12-29 13:14:05 -03:00
ghubstan
bb07f10990
Remove unused imports 2020-12-29 12:52:03 -03:00
ghubstan
7e24c57dc8
Adjust lombok annotations to reduce build warnings 
This change fixes the underlying problems behind five compiler warnings:
"Generating equals/hashCode implementation but without a call to superclass".

Some core classes use @Value and @Data annotations where not necessary, for
example, where equals, hashCode, and toString are implemented by the developer,
and where final class and field modifiers are defined by the developer.

From lombok classes and documents for the shortcut annotations
	@Value https://projectlombok.org/features/Value and
	@Data  https://projectlombok.org/features/Data,
we find some implicit annotations applied by these shortcuts are not needed.
Adjustments are described below.

- Tx Replace @Value with @Getter.

- TxOutput  Replace @Data with @Getter and @Setter.

- ChangeParamProposal  Replace @Value with @Getter.

- GetInventoryRequest, GetInventoryResponse
  An @EqualsAndHashCode(callSuper = false) is added to supress build
  warnings.
 2020-12-29 12:39:08 -03:00
ghubstan
651e772c18
Merge branch 'master' into 01-misc 2020-12-29 10:37:23 -03:00
Christoph Atteneder
1f06429d25
Merge pull request #5018 from Jakub-CZ/fix-button-checkbox-overlap 
Fix layout of button and checkbox in Receive funds
 2020-12-29 14:18:38 +01:00
sqrrm
9cc3f687c0
Merge pull request #4851 from chimp1984/improve-bsq-get-block-request-handling 
Improve getBlocks request handling
 2020-12-29 13:55:40 +01:00
Jakub Loucký
338d5a3ecf
Fix layout of button and checkbox in Receive funds 2020-12-29 01:17:02 +01:00
chimp1984
cf1b5ef01a
Change trade period for transferwise from 1 day to 4 days 2020-12-28 14:39:07 -05:00
Christoph Atteneder
785c76e9d6
Merge pull request #5010 from chimp1984/dao-performance-improvements 
Dao performance improvements
 2020-12-28 20:06:58 +01:00
chimp1984
862b12fe03
Apply code inspection 
Cleanups
 2020-12-28 13:34:50 -05:00
chimp1984
1fc8905634
Improve logs 
Cleanups
 2020-12-28 13:18:45 -05:00
chimp1984
768541664b
Use stream API 
Add checks to tryWithNewSeedNode method
Cleanups
 2020-12-28 13:18:19 -05:00
Christoph Atteneder
195c2b8f5d
Merge pull request #4997 from chimp1984/remove-unused-code 
Cleanup trade wallet code
 2020-12-28 19:18:12 +01:00
chimp1984
fe44a343d0
Remove "hack" for removal of blockDownloadListener 
Rename params
Cleanups
 2020-12-28 13:17:06 -05:00
Christoph Atteneder
2d2cff5b41
Merge pull request #5014 from sqrrm/compensation-report 
Add indication of last GH CR issue
 2020-12-28 19:10:15 +01:00
ghubstan
25fbd3518e
Merge branch 'master' into 01-misc 2020-12-28 14:38:39 -03:00
ghubstan
2f7f14670c
Replace junit with jupiter asserts 
Don't mix junit and jupter apis, apitest should only be using
jupiter.  Also moved a file.deleteOnExit statement within the
method that created the file.
 2020-12-28 14:32:16 -03:00
ghubstan
bcc7216c9e
Fix tmp file deletion bug 2020-12-28 14:30:07 -03:00
chimp1984
357c980390
Fix leftovers from debugging. 
Use else if
Fix typo
 2020-12-28 12:24:35 -05:00
chimp1984
0be451a136
Fix typos 2020-12-28 12:24:35 -05:00
chimp1984
5e39477fca
Refactor: Use terminate instead of cancel 2020-12-28 12:24:35 -05:00
chimp1984
5363c8d505
Remove cancel,cleanup and stop method. Use terminate instead. 
Fix typo
 2020-12-28 12:24:35 -05:00
chimp1984
4a05e5bf0d
Improve getBlocks request handling 2020-12-28 12:24:35 -05:00
Jakub Loucký
9a9a8ba67d
Fix missing apostrophe in Withdrawal view 2020-12-28 18:22:57 +01:00
sqrrm
1abc7487b9
Add indication of last GH CR issue 2020-12-28 17:48:04 +01:00
ghubstan
1f99192a31
Make visible to subclasses 2020-12-28 13:12:34 -03:00
ghubstan
3bbf1e02dd
Add convenience method to convert enum[] to comma delimited string 2020-12-28 13:11:12 -03:00
Christoph Atteneder
976caeb14e
Merge pull request #5001 from chimp1984/deactivate-open-offer-if-trigger-price-is-reached 
Deactivate open offer if trigger price is reached
 2020-12-28 17:04:21 +01:00
ghubstan
32e9bd285f
Delete unused method 2020-12-28 12:52:29 -03:00
Christoph Atteneder
78d4176f8a
Merge pull request #5004 from chimp1984/add-mediators-keybase-usernames 
Add mediators keybase usernames
 2020-12-28 16:50:56 +01:00
sqrrm
00c82bb7e9
Merge pull request #5012 from bisq-network/release/v1.5.2 
Release/v1.5.2
 2020-12-28 15:08:13 +01:00
Christoph Atteneder
850e031158
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.2 
# Conflicts:
#	core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
#	core/src/main/java/bisq/core/trade/closed/CleanupMailboxMessages.java
 2020-12-28 14:57:08 +01:00
Christoph Atteneder
0ad39761ce
Revert to SNAPSHOT version 2020-12-28 14:54:55 +01:00
chimp1984
6fe19db233
Only check for downGrade if we are on mainnet 
Its a bit annoying for dev testing when switching between release and master...
 2020-12-27 23:38:17 -05:00
chimp1984
8350f22c0f
Set correct type of cache map 2020-12-27 23:37:08 -05:00
chimp1984
60ffdbab35
Show stack trace in error popup if view gets an exception at initialize. 2020-12-27 23:36:38 -05:00
chimp1984
681fed603e
Fix log 2020-12-27 22:50:56 -05:00
chimp1984
fd8fc8f9ac
Add estimated size to log of initial data response 2020-12-27 22:27:10 -05:00
chimp1984
7a9230ef27
Optimize getIssuance(String txId, IssuanceType issuanceType) method 
We iterated all map entries instead of a simple get call.
 2020-12-27 21:27:17 -05:00
chimp1984
9402ca0c64
Optimize getIssuance method 
We iterated all map entries instead of a simple get call.
 2020-12-27 21:24:58 -05:00
chimp1984
32cc062872
Refactor: Rename getIssuanceSet to getIssuanceSetForType 2020-12-27 21:21:48 -05:00
chimp1984
686957c809
Add comment 2020-12-27 21:20:17 -05:00