Commit Graph

438 Commits

Author SHA1 Message Date
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
Christoph Atteneder
c1d6ea93bb
Bump version number for v1.5.9 2021-03-02 18:53:37 +01:00
Christoph Atteneder
996e264cfb
Revert to SNAPSHOT version 2021-03-02 10:03:29 +01:00
Christoph Atteneder
5288d0840b
Bump version number for v1.5.8 2021-03-01 11:24:04 +01:00
Christoph Atteneder
52c90dc9c1
Revert to SNAPSHOT version 2021-02-26 21:06:35 +01:00
cd2357
fb3ed20d74
Bump netlayer and tor-binary versions
Update dependencies to use tor v0.4.5.6
2021-02-26 17:20:01 +01:00
Christoph Atteneder
2dc34dce48
Bump version number for v1.5.7 2021-02-18 21:50:32 +01:00
Christoph Atteneder
5c614be5d7
Revert to SNAPSHOT version 2021-02-16 21:23:37 +01:00
Christoph Atteneder
1507b58e26
Bump version number for v1.5.6 2021-02-16 09:04:10 +01:00
Christoph Atteneder
b9e889050a
Bump version number for v1.5.5 2021-01-21 16:01:45 +01:00
Christoph Atteneder
0f7756267d
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.4
# 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
2020-12-31 14:00:12 +01:00
Christoph Atteneder
31ee62b6c0
Revert to SNAPSHOT version 2020-12-31 13:58:20 +01:00
Christoph Atteneder
3914e5c198
Bump version number for v1.5.4 2020-12-31 06:55:20 +01:00
Christoph Atteneder
0c83a9b0cd
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.3
# 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
2020-12-30 15:15:06 +01:00
Christoph Atteneder
a9dc664560
Revert to SNAPSHOT version 2020-12-30 15:00:16 +01:00
Christoph Atteneder
e92be14a57
Bump version number for v1.5.3 2020-12-30 13:34:08 +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
ghubstan
5de910a03d
Add unit test dependencies to daemon subproject 2020-12-19 15:40:27 -03:00
Oscar Guindzberg
a161376da3
Use bitcoinj 0.15.8.bisq.13 (commit dcf8af0) 2020-12-16 14:57:41 -03:00
Christoph Atteneder
a6bee1116a
Bump version number for v1.5.2 2020-12-16 14:19:41 +01:00
Christoph Atteneder
a04cc7bfe2
Revert to SNAPSHOT version 2020-12-08 22:14:56 +01:00
Oscar Guindzberg
9ca20d8b3d
Use bitcoinj 0.15.8 (commit dcf8af0) 2020-12-07 11:39:58 -03:00
Christoph Atteneder
4ab75b656d
Bump version number for v1.5.1 2020-12-03 12:57:43 +01:00
Oscar Guindzberg
e667f8fbad
Upgrade bitcoinj to commit 60b4f2f 2020-11-23 14:39:26 -03:00
Oscar Guindzberg
6bba6a526f
Use bitcoinj 0.15.8 (commit 60b4f2f) 2020-11-05 11:51:43 -03:00
Oscar Guindzberg
ef97daac89
Use bitcoinj 0.15.8 (commit fcec3da) 2020-11-05 11:47:38 -03:00
Christoph Atteneder
66fcde11bf
Bump version number for v1.5.0 2020-11-05 11:34:40 +01:00
sqrrm
f2cf5e2984
Merge pull request #4723 from ghubstan/16-improve-apitest-logging
Improve apitest cmd line console logging
2020-11-02 13:12:02 +01:00
sqrrm
53a16698e2
Merge pull request #4722 from ghubstan/15-upgrade-jupiter
Upgrade jupiterVersion = '5.7.0'
2020-11-02 13:05:39 +01:00
ghubstan
d6524bf46d
Improve apitest cmd line console logging
- Show full stack traces in console
- Do use previously cached test outputs
- Do not show skipped test name in console (too noisy)
- Show test run summary, including number of skipped tests
- Show note about skipped test info in the html report
- Show link to html report on test SUCCESS
2020-10-28 17:39:50 -03:00
ghubstan
8e51e1e495
Upgrade jupiterVersion = '5.7.0'
This upgrades jupiter for all subprojects using this library, but
it does not affect released code.
2020-10-28 17:21:04 -03:00
cd2357
ca56d002df
Update netlayer references to bisq repos
Update build.gradle to rely on the netlayer libraries from the bisq-network repo. The library versions (commit IDs) remain the same, only the repo from which they are pulled is changed.
2020-10-24 13:33:22 +02:00
chimp1984
aa812ba7f1
Add shadow plugin 2020-10-23 01:17:33 -05:00
chimp1984
821fa39a7e
Add sparkjava dependency 2020-10-23 01:17:33 -05:00
chimp1984
3521619e03
Add inventory module
Simple monitor dumping json files with data result and request/response time to disk. Can be used by a simple web server to show state of seed nodes.
2020-10-23 01:17:32 -05:00
Christoph Atteneder
f6d8cadee8
Revert to SNAPSHOT version 2020-10-22 09:36:50 +02:00
Christoph Atteneder
062b58b65d
Bump version number for v1.4.2 2020-10-21 09:23:51 +02:00
Christoph Atteneder
7ae6e84e02
Bump version number for v1.4.1 2020-10-18 19:22:53 +02:00
Christoph Atteneder
bac1e7b04c
Revert to SNAPSHOT version 2020-10-16 14:47:43 +02:00
Oscar Guindzberg
417daf5692
Use bitcoinj 0.15.8 (commit a733034) 2020-10-08 16:33:58 -03:00
Christoph Atteneder
5294820eb6
Bump version number for v1.4.0 2020-10-08 09:39:01 +02:00
cd2357
6ef9368b75
Bump netlayer to use tor binary from tor browser v10.0
Upgrade netlayer to a version that uses tor binaries extracted from the latest tor-browser v10.0.
2020-10-06 18:03:59 +02:00
Oscar Guindzberg
5db273010f
Use bitcoinj 0.15.8 (commit 44ddbdc) 2020-09-30 13:10:05 -03:00
Oscar Guindzberg
93d321b995
Use bitcoinj 0.15.8 (commit 5312aa3) 2020-09-26 11:36:48 -03:00
Oscar Guindzberg
0d25ca1381
Remove okhttp and okio dependencies 2020-09-18 18:29:38 -03:00