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

59 commits

Author SHA1 Message Date
Mike Rosseel
26aa1ae48d Merge branch 'DAO' into policyfile 
Conflicts:
	package/mac/create_app.sh
	package/windows/32bitBuild.bat
	package/windows/64bitBuild.bat
 2017-02-20 15:16:13 +01:00
Manfred Karrer
358f292cbe Merge branch 'Development' into DAO 
# Conflicts:
#	common/src/main/java/io/bitsquare/app/Version.java
#	core/src/main/java/io/bitsquare/btc/FeePolicy.java
#	core/src/main/java/io/bitsquare/btc/WalletAppKitBitSquare.java
#	core/src/main/java/io/bitsquare/btc/WalletService.java
#	core/src/main/java/io/bitsquare/btc/wallet/TradeWalletService.java
#	core/src/main/java/io/bitsquare/locale/CurrencyUtil.java
#	core/src/main/java/io/bitsquare/trade/BuyerTrade.java
#	core/src/main/java/io/bitsquare/trade/SellerTrade.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/OffererCreatesAndSignsDepositTxAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndFinalizePayoutTx.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SignAndPublishDepositTxAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/TakerCreatesDepositTxInputsAsBuyer.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/OffererCreatesAndSignsDepositTxAsSeller.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignAndPublishDepositTxAsSeller.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SignPayoutTx.java
#	core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/TakerCreatesDepositTxInputsAsSeller.java
#	gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesDataModel.java
#	gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java
#	network/src/main/resources/PersistedP2PStorageData
#	package/mac/create_app.sh
#	pom.xml
#	provider/src/main/java/io/bitsquare/provider/ProviderMain.java
#	provider/src/main/java/io/bitsquare/provider/price/PriceRequestService.java
 2017-02-12 12:59:29 -05:00
Manfred Karrer
f64061cbc9 Remove preferIPv4Stack entry 2017-02-11 13:45:54 -05:00
Manfred Karrer
890c724a87 Prepare for v 0.4.9.9 2017-02-10 19:49:33 -05:00
Manfred Karrer
9f908b2aea add verify task to build script, update pom 2017-02-10 00:31:48 -05:00
Mike Rosseel
52b0e547e3 small fixes 2017-01-26 09:08:31 +01:00
Mike Rosseel
b604da861e adding arguments to javapackager for all builds 2017-01-25 09:56:29 +01:00
Manfred Karrer
8f871e2629 Add UTXO handling of orphan transactions, Add SquBlockchainManager, add Unittests 2017-01-17 02:56:30 +01:00
Manfred Karrer
0ba98c40ce update dev scripts 2016-11-19 19:54:39 +01:00
Manfred Karrer
3bf4c60567 Prepare for v0.4.9.8 2016-11-19 14:36:23 +01:00
Manfred Karrer
515491681f Update build script 2016-10-30 23:24:44 +01:00
Manfred Karrer
22250574d8 Prepare for v 0.4.9.7 2016-10-19 22:04:46 +02:00
Manfred Karrer
f076a840f5 Remove jdkfix module (new jdk version 8_u_122 includes the SorteList bugfix) 2016-10-19 16:53:06 +02:00
Manfred Karrer
83d411eba5 Prepare v0.4.9.6 2016-09-03 10:34:48 -05:00
Manfred Karrer
a803077296 Prepare for v 0.4.9.5 2016-08-26 17:03:01 +02:00
Manfred Karrer
7af384cb30 Prepare for 0.4.9.3 2016-08-23 15:38:08 +02:00
Manfred Karrer
f7a7c4087b Prepare v 0.4.9.3 2016-08-07 04:17:13 +02:00
Manfred Karrer
e3ce6e9125 Prepare for release 0.4.9.2 2016-07-30 00:32:40 +02:00
Manfred Karrer
11ebdf39d2 Set v 0.4.9.1 2016-07-25 19:37:01 +02:00
Manfred Karrer
0c791cd07b rename bootstrap module to seednode 2016-07-12 17:25:11 +02:00
Manfred Karrer
ddbbf6e998 Rename linux build scripts 2016-07-07 13:18:24 +02:00
Manfred Karrer
fe727a483b Update mac build script 2016-06-29 19:06:06 +02:00
Manfred Karrer
469f56276a Fix path to jre 2016-06-29 13:08:07 +02:00
Manfred Karrer
3879751d99 uncomment mvn task 2016-06-28 20:29:39 +02:00
Manfred Karrer
e9029cfbdd Remove #-BjvmOptions=-verbose:class \ as it breaks packaging 2016-06-28 20:29:18 +02:00
Mike Rosseel
0cf22db04f - added jdkfix to the package 
- tested inclusion of fix class
    - selected jre instead of ../../
 2016-06-27 23:06:20 +02:00
Mike Rosseel
e60b6c161f add jdkfix module to create its own jar. Change scripts with bootclasspath 2016-06-21 23:03:39 +02:00
Manfred Karrer
ca9eee895f v0.4.9 2016-06-17 01:54:38 +02:00
Manfred Karrer
638d1ab916 Version 0.4.8 (bugfix with XMR) 2016-05-25 21:13:59 +02:00
Manfred Karrer
a9de00f34b v0.4.7 2016-05-25 15:56:05 +02:00
Manfred Karrer
89aed23d67 v0.4.6 2016-04-29 11:22:58 +02:00
Manfred Karrer
dd5cacb26f Version 0.4.5 2016-04-28 22:24:51 +02:00
Manfred Karrer
9a3b16fc36 Add script for signing 2016-04-27 00:33:22 +02:00
Manfred Karrer
4e09428180 Beta version 0.4.4 2016-04-26 17:29:11 +02:00
Manfred Karrer
46cdfafd5e Add util script for collecting binaries 2016-04-23 14:05:57 +02:00
Manfred Karrer
24b109421f Version 0.4.3 2016-04-23 00:12:20 +02:00
Manfred Karrer
c02f6481b2 v0.4.2, new seednodes 2016-04-16 22:36:34 +02:00
Manfred Karrer
04e0935516 Start version 0.4.1 2016-04-09 03:44:00 +02:00
Manfred Karrer
333d0bf789 Version 0.4.0 2016-04-08 22:53:38 +02:00
Manfred Karrer
3aaf6360dd Add build files for 32bit linux version 2016-03-28 02:00:22 +02:00
Manfred Karrer
5d4d7607f3 Start 0.3.7-SNAPSHOT 2016-03-20 17:28:48 +01:00
Manfred Karrer
b4581ae698 Start for version 0.3.6-SNAPSHOT 2016-03-15 14:47:36 +01:00
Manfred Karrer
30f7ca69f8 Start v0.3.5-SNAPSHOT 2016-02-09 01:46:53 +01:00
Manfred Karrer
87e2119b84 Allow sorting in tables 2016-01-28 13:26:57 +01:00
Manfred Karrer
495616edea version 0.3.3 2016-01-27 19:02:01 +01:00
Manfred Karrer
be4a25abb0 use bitcoin as currency in lowercase 2016-01-18 13:04:15 +01:00
Manfred Karrer
22d1598566 update build files 2015-12-30 14:30:24 +01:00
Manfred Karrer
c2dbd55e77 Remove walletprefix, fix key event listener, v 0.3.2.23-snapshot 2015-12-29 00:36:19 +01:00
Manfred Karrer
b1c4d7b636 change pom files for 0.3.2.2-SNAPSHOT 2015-12-20 20:20:14 +01:00
Manfred Karrer
f009434530 Small fixes for v 0.3.2.1 2015-11-18 22:58:41 +01:00