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

11935 commits

This branch
This branch
All branches
Author SHA1 Message Date
cd2357
aae99703eb
Codacy: Fix md styling, part 5 
Fix styling to match Codacy rules.
 2020-09-18 06:43:12 +02:00
cd2357
4322e7275b
Upgrade apache-commons-lang3 to v11 to avoid jdeps issue 
Updated the commons-lang3 version to the latest one, to avoid the existence of multiple versions used by different projects.

Before, v3.8 was used in most projects and v3.9 was brought as a transitive dependency in pricenode. So both were used by different projects. With this commit, all projects use v3.11, since it is explicitly defined in build.gradle.

This resolves an exception thrown by jdeps when trying to list the module dependencies of the desktop-vXYZ-SNAPSHOT-all.jar.
 2020-09-17 11:10:35 +02:00
cd2357
c82d76e8ea
Codacy: Fix md styling, part 5 
Fix styling to match Codacy rules.
 2020-09-17 10:39:56 +02:00
cd2357
b877c9f973
Codacy: Fix md styling, part 4 
Fix styling to match Codacy rules.
 2020-09-17 09:05:40 +02:00
cd2357
24296fae59
Codacy: Fix md styling, part 3 
Fix styling to match Codacy rules.
 2020-09-17 08:52:07 +02:00
cd2357
9cc77850e4
Codacy: Fix md styling, part 2 
Fix styling to match Codacy rules.
 2020-09-17 08:40:59 +02:00
cd2357
f8dfcc9502
Codacy: Fix md styling 
Fix styling to match Codacy rules.
 2020-09-17 08:16:22 +02:00
cd2357
dc9288cf1d
Upgraded Gradle to v6.6.1 
Upgraded Gradle to the latest version, which has better module-info support for the imported gradle dependencies.
 2020-09-17 01:59:51 +02:00
cd2357
51e0de8116
Upgrade JavaFX to v15 
Upgrade JavaFX to most recent release.
 2020-09-16 16:24:37 +02:00
cd2357
e55594d1e3
Fix FeeReceiverSelectorTest 
Split test into sub-tests in order to avoid mockito UnnecessaryStubbingExceptions. These exceptions occurred because of 3 ambiguous uses of "when().thenReturn()" in the same test. These calls were ambiguous, because the when() argument was identical and mockito did not check the thenReturn() arguments, which would have differentiated the calls. Splitting this test method into 4 test methods achieved this call differentiation.
 2020-09-16 11:35:33 +02:00
cd2357
7a73fea622
Fix UnnecessaryStubbingException in test 
Remove duplicate call to a stubbed method. This caused an
UnnecessaryStubbingException with Mockito's strict validation settings.
 2020-09-16 09:24:29 +02:00
cd2357
2bc85d7553
Upgrade to Mockito 3.3.0 
Use Mockito 3.3.0, which fixes some bugs that caused valid tests to fail
in the Java 14 environment.
 2020-09-16 09:16:22 +02:00
cd2357
e6920c179c
Upgrade to Lombok 1.18.12 
Use Lombok v1.18.12, which adds support for Java 14.
 2020-09-16 09:15:13 +02:00
cd2357
77134a97b7
Upgrade to Gradle 6.3 
Use Gradle 6.3, which adds support for Java 14.
 2020-09-16 09:15:13 +02:00
cd2357
1109bafae0
Upgrade buildserver config to OpenJDK 14 
Use java 14 to build the necessary artifacts. This is the most recent
version which brings support for JavaFX 14, as well as a newer packager
tool to build native applications.
 2020-09-16 09:15:13 +02:00
cd2357
2ce807c9c8
Upgrade JavaFX to v14 
Update the gradle dependency to JavaFX 14.

This brings to Bisq the latest JavaFX fixes and improvements, especially
 in the areas of UI performance, memory management and security.

JavaFX can be upgraded independently of the JDK used to build the
application, so this change is modular and does not affect other parts
of the build process.

Related / likely related to: #350 #2135 #2509 #3128 #3307 #3308 #3343
#3430 #3657 #3677 #3683 #3686 #3786 #3787 #3892 #3917 #3918 #3936
 2020-09-16 09:15:13 +02:00
sqrrm
b2d6d81d5d
Merge pull request #4528 from bisq-network/release/v1.3.8 
Merge v1.3.8
 2020-09-15 14:56:20 +02:00
Christoph Atteneder
98b03937d8
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.3.8 
# Conflicts:
#	core/src/main/java/bisq/core/support/dispute/agent/MultipleHolderNameDetection.java
#	core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
 2020-09-15 13:24:06 +02:00
Christoph Atteneder
5f957f0a64
Revert to SNAPSHOT version 2020-09-15 09:26:08 +02:00
sqrrm
7e08fdf6c2
Merge pull request #4523 from ripcurlx/datastore-updates-for-v1.3.8 
Update data stores for v1.3.8 (second attempt)
 2020-09-14 10:38:20 +02:00
Christoph Atteneder
efcca92688
Update data stores for v1.3.8 (second attempt) 2020-09-14 10:16:42 +02:00
Christoph Atteneder
f8a69411f2
Update data stores for v1.3.8 (second attempt) 2020-09-14 10:09:38 +02:00
chimp1984
156559cb9a
Increase timeouts 2020-09-14 09:53:52 +02:00
sqrrm
5911667b03
Merge pull request #4521 from chimp1984/increase-timeouts 
Increase timeouts
 2020-09-14 09:47:18 +02:00
chimp1984
76267afabf
Increase timeouts 2020-09-13 17:12:25 -05:00
Christoph Atteneder
a19c662b44
Merge pull request #4511 from sqrrm/return-on-null 
Return if setting not present
 2020-09-11 16:53:21 +02:00
Christoph Atteneder
2b9445d50f
Merge pull request #4507 from chimp1984/fix-bug-with-seed-restore-and-open-offers 
Fix bug with seed restore and open offers
 2020-09-11 16:52:11 +02:00
Christoph Atteneder
425ae87870
Merge pull request #4496 from freimair/tor_0.4.3.6 
Tor 0.4.3.6
 2020-09-11 16:46:10 +02:00
wiz
ab5aee5aab
Revert Tether USD for now due to various issues 2020-09-10 21:31:22 +02:00
Christoph Atteneder
43fac2cc31
Merge pull request #4513 from wiz/revert-tether-usd-assets 
Revert Tether USD for now due to various issues
 2020-09-10 21:30:18 +02:00
wiz
de48b3b040
Revert Tether USD for now due to various issues 2020-09-11 00:51:19 +09:00
Christoph Atteneder
9ab53eb099
Merge pull request #4512 from wiz/fix-name-of-liquid-tetherusd 
Fix name of L-USDT asset to Tether USD (Liquid)
 2020-09-10 17:09:56 +02:00
wiz
8004186ff4
Fix name of L-USDT asset to Tether USD (Liquid) 2020-09-10 23:30:39 +09:00
Devin Bileck
8dcb5dadd5
Add new Monero explorer xmrblocks.bisq.services with onion 
As per https://github.com/bisq-network/proposals/issues/257
 2020-09-10 14:01:38 +02:00
Christoph Atteneder
b7eef8cb79
Update data stores for v1.3.8 2020-09-10 14:00:37 +02:00
sqrrm
a8f19a938a
Merge pull request #4508 from ripcurlx/updates-for-v1.3.8 
Update data stores for v1.3.8
 2020-09-10 10:53:35 +02:00
sqrrm
db8c02b40b
Return if setting not present 2020-09-10 10:29:05 +02:00
sqrrm
579c2c416b
Merge pull request #4510 from devinbileck/add-xmr-explorer 
Add new Monero explorer xmrblocks.bisq.services with onion
 2020-09-10 10:23:52 +02:00
Devin Bileck
18496b71e2
Add new Monero explorer xmrblocks.bisq.services with onion 
As per https://github.com/bisq-network/proposals/issues/257
 2020-09-09 21:17:15 -07:00
Christoph Atteneder
be4e905018
Update data stores for v1.3.8 2020-09-09 22:08:58 +02:00
chimp1984
00d267e4db
Merge branch 'master_upstream' into fix-bug-with-seed-restore-and-open-offers 2020-09-09 14:29:27 -05:00
chimp1984
6821c582e9
Add check for open offers and remove them if present at restore from seed 2020-09-09 14:12:03 -05:00
chimp1984
1bea05d8c6
Fix bug with wallet restore with same seed and when there was 
an open offer.

Improve handling of restore and add more checks to avoid invalid
entries.
 2020-09-09 13:52:34 -05:00
chimp1984
77e5d71ca4
Remove unused method 2020-09-09 13:50:42 -05:00
chimp1984
7fb42f37eb
Improve toString method 2020-09-09 13:47:32 -05:00
chimp1984
38299a9498
Remove side effect in setUserName method and add extra handling for the 
moment we save the account. Only at that moment we check if we need to
set the accountId with the value of the userName.
We do that in the domain layer to avoid more domain logic code in the UI
layer.

Fixes bug found at:
https://github.com/bisq-network/bisq/pull/4481#pullrequestreview-485066342
 2020-09-09 20:42:48 +02:00
Christoph Atteneder
91d70ad8fd
Merge pull request #4506 from chimp1984/fix-revolut-account-id-bug 
Fix revolut accountID bug
 2020-09-09 20:42:32 +02:00
chimp1984
20cb98aa93
Remove side effect in setUserName method and add extra handling for the 
moment we save the account. Only at that moment we check if we need to
set the accountId with the value of the userName.
We do that in the domain layer to avoid more domain logic code in the UI
layer.

Fixes bug found at:
https://github.com/bisq-network/bisq/pull/4481#pullrequestreview-485066342
 2020-09-09 11:21:43 -05:00
wiz
e7016a3ede
Rename Monero Explorer to friendlier hostname explorer.monero.wiz.biz 2020-09-09 15:16:46 +02:00
wiz
8cde8ce16a
Fix codacy complaining about missing space character 2020-09-09 15:16:38 +02:00