Merge branch 'master' of github.com:bisq-network/bisq into release/v1.8.0

Conflicts:
	core/src/main/resources/i18n/displayStrings_pl.properties
This commit is contained in:
Christoph Atteneder 2021-12-13 11:51:16 +01:00
commit a7c38630e8
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
8 changed files with 5 additions and 4 deletions

View file

@ -27,7 +27,8 @@ configure(subprojects) {
apply plugin: 'java'
apply plugin: 'com.google.osdetector'
sourceCompatibility = 1.10
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
ext { // in alphabetical order
bcVersion = '1.63'

View file

@ -577,7 +577,7 @@ takeOffer.success.info=You can see the status of your trade at \"Portfolio/Open
takeOffer.error.message=An error occurred when taking the offer.\n\n{0}
takeOffer.bsqSwap.success.headline=Your BSQ swap trade is completed
takeOffer.bsqSwap.success.info=You can see your completed trade at \"Portfolio/Unconfirmed BSQ Swaps\"
takeOffer.bsqSwap.success.info=Until your trade is included in a block you can see your completed trade at \"Portfolio/Unconfirmed BSQ Swaps\"
# new entries
takeOffer.takeOfferButton=Review: Take offer to {0} bitcoin

View file

@ -1087,7 +1087,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
{
button.setGraphic(iconView);
button.setMinWidth(200);
button.setMaxWidth(200);
button.setMaxWidth(Double.MAX_VALUE);
button.setGraphicTextGap(10);
}

View file

@ -10,7 +10,7 @@
You should see the version of Git LFS you installed, for example:
```sh
```
git-lfs/2.10.0 (GitHub; darwin amd64; go 1.13.6)
```

0
scripts/create_dao_genesis.sh Normal file → Executable file
View file

0
scripts/install_java.bat Normal file → Executable file
View file

0
scripts/install_java_linux.sh Normal file → Executable file
View file

0
scripts/install_java_macos.sh Normal file → Executable file
View file