mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into voting

Browse Source 
# Conflicts:
#	build.gradle
#	src/main/java/bisq/core/CoreModule.java
#	src/main/java/bisq/core/dao/DaoModule.java
#	src/main/java/bisq/core/dao/DaoSetup.java
#	src/main/java/bisq/core/dao/vote/blindvote/BlindVoteService.java
#	src/main/java/bisq/core/dao/vote/proposal/ProposalService.java
#	src/main/java/bisq/core/dao/vote/votereveal/VoteRevealService.java
#	src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java
#	src/main/java/bisq/core/trade/statistics/TradeStatistics2Store.java
#	src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
#	src/main/resources/i18n/displayStrings_de.properties
#	src/main/resources/i18n/displayStrings_el.properties
#	src/main/resources/i18n/displayStrings_es.properties
#	src/main/resources/i18n/displayStrings_hu.properties
#	src/main/resources/i18n/displayStrings_pt.properties
#	src/main/resources/i18n/displayStrings_ro.properties
#	src/main/resources/i18n/displayStrings_ru.properties
#	src/main/resources/i18n/displayStrings_sr.properties
#	src/main/resources/i18n/displayStrings_zh.properties

Merge branch 'master' into voting

# Conflicts:
#	src/main/java/bisq/common/UserThread.java
#	src/main/proto/pb.proto

Merge branch 'master' into voting

# Conflicts:
#	src/main/java/bisq/desktop/app/BisqAppMain.java
#	src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
This commit is contained in:
Manfred Karrer 2018-07-11 02:43:32 +02:00
commit 4ec69f082e
No known key found for this signature in database
GPG Key ID: 401250966A6B2C46
17 changed files with 30 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -34,7 +34,7 @@ Staying in Touch
Contact the team and keep up to date using any of the following:
- The [Bisq website](https://bisq.network)
- GitHub [Issues](https://github.com/bisq-network/exchange/issues)
- GitHub [Issues](https://github.com/bisq-network/bisq-desktop/issues)
- The [Bisq forum]( https://bisq.community)
- The [#bisq](https://webchat.freenode.net/?channels=bisq) IRC channel on Freenode
- Our [contributor mailing list](https://lists.bisq.network/listinfo/bisq-contrib)

2
build.gradle
View File

@ -16,7 +16,7 @@ apply plugin: 'witness'
apply plugin: 'com.github.johnrengelman.shadow'
group = 'network.bisq'
version = '0.7.0-SNAPSHOT'
version = '0.7.1-SNAPSHOT'
sourceCompatibility = 1.8

2
package/linux/32bitBuild.sh
View File

@ -6,7 +6,7 @@ mkdir -p deploy
set -e
# Edit version
version=0.7.0
version=0.7.1
dir="/media/sf_vm_shared_ubuntu14_32bit"

2
package/linux/64bitBuild.sh
View File

@ -6,7 +6,7 @@ mkdir -p deploy
set -e
# Edit version
version=0.7.0
version=0.7.1
dir="/media/sf_vm_shared_ubuntu"

2
package/linux/Dockerfile
View File

@ -8,7 +8,7 @@
# pull base image
FROM openjdk:8-jdk
ENV version 0.7.0
ENV version 0.7.1
RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
apt-get install -y vim fakeroot

2
package/linux/rpm.sh
View File

@ -2,7 +2,7 @@
## From https://github.com/bisq-network/bisq-desktop/issues/401#issuecomment-372091261
version=0.7.0
version=0.7.1
alien -r -g /home/$USER/Desktop/Bisq-64bit-$version.deb
find bisq-$version -type f | while read LIB; do LDDOUT=$(ldd $LIB 2>&1); LDDRETVAL=$?;if [ \( -z "${LDDOUT%%*you do not have execution permission for*}" \) -a \( $LDDRETVAL -eq 0 \) ]; then chmod -v +x $LIB;fi;done

4
package/osx/Info.plist
View File

@ -15,7 +15,7 @@
<key>CFBundleName</key>
<string>Bisq</string>
<key>CFBundleIdentifier</key>
<string>io.bisq.Bisq</string>
<string>io.bisq.CAT</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
@ -40,7 +40,7 @@
<key>JVMAppClasspath</key>
<string></string>
<key>JVMMainJarName</key>
<string>Bisq-0.7.0.jar</string>
<string>Bisq-0.7.1.jar</string>
<key>JVMPreferencesID</key>
<string>bisq</string>
<key>JVMOptions</key>

26
package/osx/create_app.sh
View File

@ -6,11 +6,11 @@ mkdir -p deploy
set -e
version="0.7.0"
version="0.7.1"
./gradlew --include-build ../common --include-build ../assets --include-build ../p2p --include-build ../core build -x test shadowJar
EXE_JAR=build/libs/bisq-desktop-0.7.0-all.jar
EXE_JAR=build/libs/bisq-desktop-$version-all.jar
echo SHA 256 before stripping jar file:
shasum -a256 $EXE_JAR | awk '{print $1}'
@ -40,17 +40,17 @@ cp $EXE_JAR "$win32/Bisq.jar"
cp $EXE_JAR "$win64/Bisq.jar"
# copy bouncycastle jars to VM shared folders
bc_lib1=bcpg-jdk15on-1.56.jar
cp build/app/lib/$bc_lib1 "$linux32/$bc_lib1"
cp build/app/lib/$bc_lib1 "$linux64/$bc_lib1"
cp build/app/lib/$bc_lib1 "$win32/$bc_lib1"
cp build/app/lib/$bc_lib1 "$win64/$bc_lib1"
# bc_lib1=bcpg-jdk15on-1.56.jar
# cp build/app/lib/$bc_lib1 "$linux32/$bc_lib1"
# cp build/app/lib/$bc_lib1 "$linux64/$bc_lib1"
# cp build/app/lib/$bc_lib1 "$win32/$bc_lib1"
# cp build/app/lib/$bc_lib1 "$win64/$bc_lib1"
bc_lib2=bcprov-jdk15on-1.56.jar
cp build/app/lib/$bc_lib2 "$linux32/$bc_lib2"
cp build/app/lib/$bc_lib2 "$linux64/$bc_lib2"
cp build/app/lib/$bc_lib2 "$win32/$bc_lib2"
cp build/app/lib/$bc_lib2 "$win64/$bc_lib2"
# bc_lib2=bcprov-jdk15on-1.56.jar
# cp build/app/lib/$bc_lib2 "$linux32/$bc_lib2"
# cp build/app/lib/$bc_lib2 "$linux64/$bc_lib2"
# cp build/app/lib/$bc_lib2 "$win32/$bc_lib2"
# cp build/app/lib/$bc_lib2 "$win64/$bc_lib2"
# Copy packager scripts to VM. No need to checkout the source as we only are interested in the build scripts.
rm -rf "$linux32/package"
@ -77,7 +77,7 @@ echo "Using JAVA_HOME: $JAVA_HOME"
$JAVA_HOME/bin/javapackager \
-deploy \
-BappVersion=$version \
-Bmac.CFBundleIdentifier=io.bisq \
-Bmac.CFBundleIdentifier=io.bisq.CAT \
-Bmac.CFBundleName=Bisq \
-Bicon=package/osx/Bisq.icns \
-Bruntime="$JAVA_HOME/jre" \

2
package/osx/finalize.sh
View File

@ -2,7 +2,7 @@
cd ../../
version="0.7.0"
version="0.7.1"
target_dir="releases/$version"

2
package/signingkey.asc
View File

@ -1 +1 @@
F379A1C6
29CDFD3B

2
package/windows/32bitBuild.bat
View File

@ -5,7 +5,7 @@
:: 32 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
SET version=0.7.0
SET version=0.7.1
:: Private setup
SET outdir=\\VBOXSVR\vm_shared_windows_32bit

2
package/windows/64bitBuild.bat
View File

@ -5,7 +5,7 @@
:: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
SET version=0.7.0
SET version=0.7.1
:: Private setup
SET outdir=\\VBOXSVR\vm_shared_windows

2
package/windows/Bisq.iss
View File

@ -3,7 +3,7 @@
[Setup]
AppId={{bisq}}
AppName=Bisq
AppVersion=0.7.0
AppVersion=0.7.1
AppVerName=Bisq
AppPublisher=Bisq
AppComments=Bisq

2
src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
View File

@ -255,7 +255,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
offerListListener = c -> nrOfOffersLabel.setText(Res.get("offerbook.nrOffers", model.getOfferList().size()));
// Fixes incorrect ordering of Available offers:
// https://github.com/bisq-network/exchange/issues/588
// https://github.com/bisq-network/bisq-desktop/issues/588
priceFeedUpdateCounterListener = (observable, oldValue, newValue) -> tableView.sort();
}

4
src/main/java/bisq/desktop/main/overlays/Overlay.java
View File

@ -360,7 +360,7 @@ public abstract class Overlay<T extends Overlay> {
public T useReportBugButton() {
this.closeButtonText = Res.get("shared.reportBug");
this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bisq-network/exchange/issues"));
this.closeHandlerOptional = Optional.of(() -> GUIUtil.openWebPage("https://github.com/bisq-network/bisq-desktop/issues"));
//noinspection unchecked
return (T) this;
}
@ -779,7 +779,7 @@ public abstract class Overlay<T extends Overlay> {
gitHubButton.setOnAction(event -> {
if (message != null)
Utilities.copyToClipboard(message);
GUIUtil.openWebPage("https://github.com/bisq-network/exchange/issues");
GUIUtil.openWebPage("https://github.com/bisq-network/bisq-desktop/issues");
hide();
});
}

2
src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java
View File

@ -20,7 +20,6 @@ package bisq.desktop.main.portfolio.pendingtrades;
import bisq.desktop.common.model.ActivatableWithDataModel;
import bisq.desktop.common.model.ViewModel;
import bisq.desktop.util.GUIUtil;
import bisq.desktop.util.validation.BtcAddressValidator;
import bisq.core.locale.Res;
import bisq.core.network.MessageState;
@ -32,6 +31,7 @@ import bisq.core.trade.Trade;
import bisq.core.trade.closed.ClosedTradableManager;
import bisq.core.util.BSFormatter;
import bisq.core.util.BsqFormatter;
import bisq.core.util.validation.BtcAddressValidator;
import bisq.network.p2p.P2PService;

53
src/main/java/bisq/desktop/util/validation/BtcAddressValidator.java
View File

@ -1,53 +0,0 @@
/*
* This file is part of Bisq.
*
* Bisq is free software: you can redistribute it and/or modify it
* under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or (at
* your option) any later version.
*
* Bisq is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
* License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with Bisq. If not, see <http://www.gnu.org/licenses/>.
*/
package bisq.desktop.util.validation;
import bisq.core.app.BisqEnvironment;
import bisq.core.locale.Res;
import bisq.core.util.validation.InputValidator;
import org.bitcoinj.core.Address;
import org.bitcoinj.core.AddressFormatException;
import javax.inject.Inject;
public final class BtcAddressValidator extends InputValidator {
@Inject
public BtcAddressValidator() {
}
@Override
public ValidationResult validate(String input) {
ValidationResult result = validateIfNotEmpty(input);
if (result.isValid)
return validateBtcAddress(input);
else
return result;
}
private ValidationResult validateBtcAddress(String input) {
try {
Address.fromBase58(BisqEnvironment.getParameters(), input);
return new ValidationResult(true);
} catch (AddressFormatException e) {
return new ValidationResult(false, Res.get("validation.btc.invalidFormat"));
}
}
}