chimp1984
|
d5dfdb4a35
|
Merge branch 'chimp-bsq-swap-1' into bsq-swap-low-risk-refactorings-2
# Conflicts:
# core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
# core/src/main/java/bisq/core/api/CoreOffersService.java
# core/src/main/java/bisq/core/btc/listeners/TxConfidenceListener.java
# core/src/main/java/bisq/core/notifications/alerts/market/MarketAlerts.java
# core/src/main/java/bisq/core/offer/OpenOfferManager.java
# core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java
# core/src/main/java/bisq/core/offer/bisq_v1/OfferPayload.java
# core/src/main/java/bisq/core/offer/bisq_v1/TakeOfferModel.java
# core/src/main/java/bisq/core/offer/bisq_v1/TriggerPriceService.java
# core/src/main/java/bisq/core/proto/ProtoDevUtil.java
# core/src/main/java/bisq/core/trade/TradeManager.java
# core/src/main/java/bisq/core/trade/bisq_v1/TradeResultHandler.java
# core/src/main/java/bisq/core/trade/bisq_v1/TradeUtil.java
# core/src/main/java/bisq/core/trade/model/bisq_v1/Trade.java
# core/src/main/java/bisq/core/trade/protocol/FluentProtocol.java
# core/src/main/java/bisq/core/trade/protocol/Provider.java
# core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java
# core/src/main/java/bisq/core/trade/protocol/TradeProtocolFactory.java
# core/src/main/java/bisq/core/trade/protocol/TradeTaskRunner.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/DisputeProtocol.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/model/ProcessModel.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/ApplyFilter.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/TradeTask.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/maker/MakerCreateAndSignContract.java
# core/src/main/java/bisq/core/trade/protocol/bisq_v1/tasks/taker/TakerVerifyAndSignContract.java
# core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java
# core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
# core/src/main/java/bisq/core/trade/txproof/xmr/XmrTxProofService.java
# desktop/src/main/java/bisq/desktop/components/paymentmethods/PaymentMethodForm.java
# desktop/src/main/java/bisq/desktop/main/PriceUtil.java
# desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTradableFactory.java
# desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionAwareTrade.java
# desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
# desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java
# desktop/src/main/java/bisq/desktop/main/market/spread/SpreadViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/BuyOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/OfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/SellOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/MutableOfferViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferView.java
# desktop/src/main/java/bisq/desktop/main/offer/bisq_v1/takeoffer/TakeOfferViewModel.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBook.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
# desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
# desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
# desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/failedtrades/FailedTradesDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersDataModel.java
# desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java
# desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
# desktop/src/main/java/bisq/desktop/util/DisplayUtils.java
# desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferDataModelTest.java
# desktop/src/test/java/bisq/desktop/main/offer/bisq_v1/createoffer/CreateOfferViewModelTest.java
# desktop/src/test/java/bisq/desktop/main/offer/offerbook/OfferBookListItemMaker.java
# desktop/src/test/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModelTest.java
# desktop/src/test/java/bisq/desktop/maker/OfferMaker.java
# monitor/src/main/java/bisq/monitor/metric/P2PMarketStats.java
|
2021-11-02 16:04:12 +01:00 |
|
Christoph Atteneder
|
50798f0d62
|
Revert to SNAPSHOT version
|
2021-10-29 16:06:49 +02:00 |
|
chimp1984
|
2f40eddae8
|
Use bitcoinj 42bbae9 (with fix required for bsq swaps)
|
2021-10-21 15:41:07 +02:00 |
|
Christoph Atteneder
|
8fbccb7547
|
Bump version number for v1.7.5
|
2021-10-19 11:32:09 +02:00 |
|
cd2357
|
455a74a4a8
|
chore: Bump tor to v0.4.5.10
Update netlayer and tor-binary dependencies.
|
2021-10-18 09:12:21 +02:00 |
|
Christoph Atteneder
|
f73274b0b9
|
Revert to SNAPSHOT version
|
2021-09-24 19:28:11 +02:00 |
|
Christoph Atteneder
|
64274cf82e
|
Bump version number for v1.7.4
|
2021-09-21 09:24:26 +02:00 |
|
Christoph Atteneder
|
9c411b9ba4
|
Update Bisq bitcoinj fork with latest commit (3186b200fff690fa51f3ebbf578f427d78242bc2)
Conflicts:
build.gradle
gradle/witness/gradle-witness.gradle
|
2021-09-13 11:33:12 +02:00 |
|
Christoph Atteneder
|
704333f133
|
Add bitcoinj Tor v3 support
|
2021-09-09 11:41:01 +02:00 |
|
Christoph Atteneder
|
0e4278012b
|
Revert to SNAPSHOT version
|
2021-08-30 14:16:11 +02:00 |
|
Christoph Atteneder
|
ad95e5b3be
|
Bump version number for v1.7.3
|
2021-08-23 11:20:09 +02:00 |
|
Christoph Atteneder
|
4c451ebc11
|
Revert to SNAPSHOT version
|
2021-07-23 14:02:37 +02:00 |
|
Christoph Atteneder
|
0cd20d6cc5
|
Increase MaxRam setting to 8g
|
2021-07-22 15:01:11 +02:00 |
|
Christoph Atteneder
|
6648ab04f7
|
Add new JVM arguments also to build script
|
2021-07-22 15:01:11 +02:00 |
|
Christoph Atteneder
|
401f9d25f0
|
Update remaining Java max ram default settings
|
2021-07-22 15:01:11 +02:00 |
|
Christoph Atteneder
|
12b0a5bf80
|
Bump version number for v1.7.2
|
2021-07-16 20:37:10 +02:00 |
|
Christoph Atteneder
|
ef5ff1249b
|
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.7.1
# Conflicts:
# build.gradle
# desktop/package/linux/Dockerfile
# desktop/package/macosx/finalize.sh
# desktop/package/macosx/insert_snapshot_version.sh
# relay/src/main/resources/version.txt
|
2021-07-16 13:02:18 +02:00 |
|
Christoph Atteneder
|
a924e1058d
|
Revert to SNAPSHOT version
|
2021-07-16 12:58:55 +02:00 |
|
Christoph Atteneder
|
dddabe3081
|
Merge pull request #5582 from jmacxx/pricenode_config_ccy_excl
PriceNode: exclude currencies via config
|
2021-07-13 17:54:47 +02:00 |
|
Christoph Atteneder
|
dfb97ca05f
|
Bump version number for v1.7.1
|
2021-07-12 14:52:38 +02:00 |
|
Christoph Atteneder
|
b9db2426ba
|
Revert to SNAPSHOT version
|
2021-07-06 11:13:35 +02:00 |
|
Christoph Atteneder
|
9f42035108
|
Bump version number for v1.7.0
|
2021-06-23 14:27:22 +02:00 |
|
jmacxx
|
1c05e5d990
|
PriceNode: exclude currencies via config
|
2021-06-22 16:46:47 -05:00 |
|
cd2357
|
eea3acae36
|
Bump guice version to fix startup warnings
Bump guice to v5.0.1 to fix reflection warning logs shown each time Bisq started.
|
2021-06-11 12:03:28 +02:00 |
|
Christoph Atteneder
|
351d5f13e7
|
Revert to SNAPSHOT version
|
2021-05-31 09:53:33 +02:00 |
|
Christoph Atteneder
|
59de78c332
|
Bump version number for v1.6.5
|
2021-05-21 20:00:49 +02:00 |
|
Christoph Atteneder
|
0160039788
|
Revert "Remove openjfx plugin and manually add cross-platform openjfx libs"
This reverts commit 1c0409ad84.
|
2021-05-20 16:19:48 +02:00 |
|
Christoph Atteneder
|
1c0409ad84
|
Remove openjfx plugin and manually add cross-platform openjfx libs
|
2021-05-19 11:37:38 +02:00 |
|
Christoph Atteneder
|
e3842f2d04
|
Use gradle javafx plugin
|
2021-05-18 17:19:56 +02:00 |
|
Christoph Atteneder
|
fb410ac345
|
Upgrade JavaFX to v16
|
2021-05-18 16:44:30 +02:00 |
|
cd2357
|
a4863baa94
|
Preserve shadow plugin name
Include plugins.gradle.org repository, which contains the shadow plugin of the same artefact group and name as used before in jcenter.
|
2021-05-17 12:55:32 +02:00 |
|
cd2357
|
f26ccb15b7
|
Remove jcenter repository
Replace the jcenter repo with mavenCentral and jitpack.
|
2021-05-16 15:17:44 +02:00 |
|
Christoph Atteneder
|
25d2731fb4
|
Revert to SNAPSHOT version
|
2021-05-06 20:40:11 +02:00 |
|
Christoph Atteneder
|
dba59138df
|
Bump version number for v1.6.4
|
2021-05-05 10:27:42 +02:00 |
|
Christoph Atteneder
|
2c5e785a1e
|
Bump version number for v1.6.3
|
2021-04-22 10:36:37 +02:00 |
|
Christoph Atteneder
|
3281767a52
|
Clean build files and adapt binary signing
|
2021-04-20 15:10:44 +02:00 |
|
Christoph Atteneder
|
b5beea58db
|
Temporary delete QR code scanner
used for mobile notification pairing because of missing current macOS support by currently used webcam library
|
2021-04-20 10:20:58 +02:00 |
|
cd2357
|
e04537aca6
|
Merge remote-tracking branch 'bisq-network/hotfix/v1.6.2' into upgrade-javafax-14
|
2021-04-10 10:31:04 +02:00 |
|
Christoph Atteneder
|
c2834cebd6
|
Revert to SNAPSHOT version
|
2021-04-01 15:45:10 +02:00 |
|
Christoph Atteneder
|
8623b7b546
|
Bump version number for v1.6.2
|
2021-04-01 09:41:07 +02:00 |
|
cd2357
|
ca5f41a9d9
|
Merge remote-tracking branch 'bisq-network/hotfix/v1.6.1' into upgrade-javafax-14
# Conflicts:
# build.gradle
|
2021-03-29 18:37:14 +02:00 |
|
Christoph Atteneder
|
0c40d35ddb
|
Revert to SNAPSHOT version
|
2021-03-29 16:26:28 +02:00 |
|
cd2357
|
6c44f25738
|
Bump tor to v0.4.5.7
Bump tor-binary and netlayer dependencies to the newest versions which package tor v0.4.5.7.
|
2021-03-28 20:15:19 +02:00 |
|
Christoph Atteneder
|
b7524270dd
|
Bump version number for v1.6.1
|
2021-03-28 20:11:26 +02:00 |
|
Steven Barclay
|
f21379160b
|
Merge branch 'release/v1.6.0' into implement-segwit-for-bsq
|
2021-03-20 23:18:49 +00:00 |
|
Christoph Atteneder
|
378fd026bf
|
Bump version number for v1.6.0
|
2021-03-18 19:19:26 +01:00 |
|
Christoph Atteneder
|
38a9bf0277
|
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.9
# 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
|
2021-03-11 16:26:50 +01:00 |
|
Christoph Atteneder
|
fb053e85ad
|
Revert to SNAPSHOT version
|
2021-03-11 16:24:32 +01:00 |
|
sqrrm
|
463f87b39e
|
Merge pull request #5284 from ghubstan/07-validate-paymentacct-n-new-offer
Validate offer <-> payment-acct in createoffer
|
2021-03-09 16:51:56 +01:00 |
|
ghubstan
|
304781ce92
|
Add jupiter test support to :cli subproject
|
2021-03-05 07:15:01 -03:00 |
|