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

163 commits

Author SHA1 Message Date
Christoph Atteneder
4201e065bc
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.1.6 
# 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
 2019-09-23 10:57:03 +02:00
Christoph Atteneder
4842352756
Revert to SNAPSHOT version 2019-09-23 10:55:08 +02:00
Christoph Atteneder
58f3f73d56
Bump version number 2019-09-23 10:10:09 +02:00
Christoph Atteneder
27b6035278
Update copyright date for macOS binary 2019-09-19 16:18:30 +02:00
Christoph Atteneder
cc3128d4e0
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.1.6 
# Conflicts:
#	core/src/main/java/bisq/core/offer/OfferUtil.java
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/MainView.java
#	desktop/src/main/java/bisq/desktop/main/MainViewModel.java
#	desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
#	desktop/src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/DisputeSummaryWindow.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/OfferDetailsWindow.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersViewModel.java
#	desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
#	desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
 2019-09-17 15:52:51 +02:00
Christoph Atteneder
c0563fba1b
Revert to SNAPSHOT version 2019-09-16 11:21:39 +02:00
Christoph Atteneder
457da44b0c
Bump version number 2019-09-13 19:20:26 +02:00
Christoph Atteneder
2abc4b4b14
Add scripts to create testing jars 2019-09-04 13:53:09 +02:00
Christoph Atteneder
e2a17dcb8e
Update data stores 2019-09-02 11:14:59 +02:00
Christoph Atteneder
a56b367476
Revert to SNAPSHOT version 2019-08-08 10:34:06 +02:00
Christoph Atteneder
3bf3ff83b9
Bump version number 2019-08-08 09:54:54 +02:00
Christoph Atteneder
d498e43415
Bump version number 2019-07-26 10:41:47 +02:00
Christoph Atteneder
59be5bc94e
Bump version number 2019-07-15 16:33:55 +02:00
Christoph Atteneder
5b841709d4
Revert to SNAPSHOT version 2019-06-04 10:53:42 +02:00
Christoph Atteneder
ca24ce0217
Bump version number 2019-06-04 10:49:00 +02:00
Christoph Atteneder
98a7748a01
Revert to SNAPSHOT version 2019-05-06 10:55:09 +02:00
Christoph Atteneder
ac68da1dd3
Bump version number 2019-05-06 10:47:01 +02:00
Christoph Atteneder
36c0e49504
Revert to SNAPSHOT version 2019-05-03 12:47:59 +02:00
Christoph Atteneder
8ceb2e3be2
Bump version number 2019-05-03 12:13:41 +02:00
Christoph Atteneder
1d18029b1c
Update dbs 2019-05-02 18:00:35 +02:00
Christoph Atteneder
36f8b0275a
Revert to SNAPSHOT version 2019-04-16 16:26:41 +02:00
Christoph Atteneder
bdf163ca2d
Bump version number 2019-04-16 16:03:12 +02:00
Christoph Atteneder
60826a11e1
Revert to SNAPSHOT 2019-04-15 17:42:16 +02:00
Manfred Karrer
6c98d98ce1
Merge branch 'master' into rc_v1.0.0 2019-04-15 09:00:31 -05:00
Christoph Atteneder
1664a72788
Update Mainnet dbs and remove old test dbs 2019-04-15 14:13:53 +02:00
Christoph Atteneder
2c106c74c6
Bump version number 2019-04-12 12:09:49 +02:00
Christoph Atteneder
ee7864bc34
Revert to SNAPSHOT versions 2019-04-08 12:12:01 +02:00
Christoph Atteneder
f9a0dd1502
Bump version number 2019-04-08 12:10:59 +02:00
Christoph Atteneder
7f2e406e8d
Revert to SNAPSHOT versions 2019-04-02 17:25:03 +02:00
Christoph Atteneder
0ffc93a091
Bump version number 2019-04-02 17:13:04 +02:00
Christoph Atteneder
21e63066af
Revert to SNAPSHOT versions 2019-04-02 11:21:11 +02:00
Christoph Atteneder
fb3c8c214e
Bump version number 2019-04-02 11:19:03 +02:00
Christoph Atteneder
38728a1132
Update DBs 2019-04-01 15:43:53 +02:00
Christoph Atteneder
d6fb97880a
Revert to SNAPSHOT 2019-03-06 15:37:23 +01:00
Christoph Atteneder
75fd991b3b
Bump version number 2019-03-06 10:04:50 +01:00
Christoph Atteneder
5c69d75192
Update data stores 2019-03-05 16:24:55 +01:00
Christoph Atteneder
b4c248426b
Combine and update installer background 
tiffutil -cathidpicheck Bisq-background.png Bisq-background@2x.png -out Bisq-background.tiff
Afterwards rename tiff into png to trick the javapackager installer
 2019-02-26 15:43:29 +01:00
Christoph Atteneder
25498a9e1a
Revert to SNAPSHOT release 2019-02-21 23:16:23 +01:00
Christoph Atteneder
985ffeb879
Add rpm support 2019-02-21 22:34:50 +01:00
Christoph Atteneder
d31173bc4f
Update version number for v0.9.4 2019-02-21 22:34:36 +01:00
Christoph Atteneder
1f87278873
Add script for adding SNAPSHOT information after release 2019-02-20 17:47:40 +01:00
Christoph Atteneder
57c8e9006a
Add script for renaming version numbers for a new release 2019-02-20 17:47:10 +01:00
Christoph Atteneder
ae9f13c09d
Update installer background image 2019-01-14 14:50:06 +01:00
Christoph Atteneder
d320380e80
Set back to SNAPSHOT 2019-01-08 19:56:23 +01:00
Christoph Atteneder
b18a143c0c
Bump version number 2019-01-08 19:54:33 +01:00
Christoph Atteneder
307a5b8822
Set back to SNAPSHOT 2019-01-08 16:48:22 +01:00
Christoph Atteneder
d6543377cf
Bump version number 2019-01-08 16:37:28 +01:00
Christoph Atteneder
7c4fcfa43d
Adapt for changed build directories 2019-01-08 16:36:26 +01:00
Christoph Atteneder
5f5e153d66
Add script for updating store dbs 2019-01-08 10:52:48 +01:00
Christoph Atteneder
b03e96821c
Change path structure to match new build process on Linux and Windows 2019-01-07 11:15:48 +01:00