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

177 commits

Author SHA1 Message Date
Manfred Karrer
dc1243bc78 Fix wrong path 2017-04-23 15:13:33 -05:00
Manfred Karrer
35363b2725 Remove policy flags 2017-03-16 11:59:29 -05:00
Manfred Karrer
f677e7f6a4 change to io.bisq.bisq ID 2017-03-16 11:59:15 -05:00
Manfred Karrer
ae9016ca10 Remove policy flags 2017-03-16 11:59:00 -05:00
Manfred Karrer
3b557463da Rebranding: replace bitsquare with bisq 2017-03-12 16:00:40 -05:00
Manfred Karrer
75fc7d2286 Rebranding: Change occurance of Bitsquare to bisq 2017-03-12 14:28:14 -05:00
Manfred Karrer
9f5b7f693b Use for Winows build no version nr at jar files to avoid collecting multiple jars at updates 2017-02-21 11:57:30 -05:00
Manfred Karrer
159b208273 Add btcd-cli4j lib as local build jar instead of using http repo. Add exclude for diff. version dependencies. 2017-02-20 14:29:58 -05:00
Mike Rosseel
f3d1c87d4e hand-merge of policyfile-dev branch 2017-02-20 17:04:17 +01:00
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
3094d13d8b Fix wrong separators 2017-02-12 14:20:52 -05:00
Manfred Karrer
d666490424 Set v 0.5.0.0, fix issues after merge. 2017-02-12 13:38:26 -05: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
80ec899bad update win build script 2017-02-11 20:06:20 -05:00
Manfred Karrer
8f60eb3acf update win build script 2017-02-11 20:02:08 -05:00
Manfred Karrer
c3aed9fbda Update build script 2017-02-11 18:43:49 -05:00
Manfred Karrer
f04511cfce Fix build script 2017-02-11 17:53:50 -05:00
Manfred Karrer
002a94eafe Fix build script 2017-02-11 17:43:21 -05:00
Manfred Karrer
5fc085ed43 Add -Bicon=package/windows/Bitsquare.ico 2017-02-11 17:00:39 -05:00
Manfred Karrer
28655e7062 Add copy task 2017-02-11 14:55:46 -05:00
Manfred Karrer
f64061cbc9 Remove preferIPv4Stack entry 2017-02-11 13:45:54 -05:00
Manfred Karrer
2ea5df3ba2 Change category to Network 2017-02-11 12:46:50 -05:00
Manfred Karrer
d83b17de9a Remove unneeded copy task, cleanup empty line 2017-02-11 11:54:53 -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
c672ba687d added docker file for testing 2017-01-25 12:37:23 +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
aeb72b26da update dev scripts 2016-11-19 18:07:44 +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
9e6b21cec0 Use single detached signature files for each binary 2016-10-08 01:19:52 +02:00
Manfred Karrer
50b4e83474 Improve build files 2016-10-05 23:57:12 +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
d5cca200ed Use SHA256 for gpg hash, reactivate rpm 2016-08-26 16:27:01 +02:00
Manfred Karrer
6034602f03 Disable rpm for linux64 build script 2016-08-26 15:54:27 +02:00
Manfred Karrer
349fb3c342 Enable rpm for linux64 2016-08-26 15:45:22 +02:00
Manfred Karrer
682e2d2d8e Remove rpm script 2016-08-25 00:40:42 +02:00
Manfred Karrer
7af384cb30 Prepare for 0.4.9.3 2016-08-23 15:38:08 +02:00
Manfred Karrer
1718f83d47 Update script 2016-08-08 03:51:31 +02:00
Manfred Karrer
4cefc45231 Update scripts 2016-08-07 05:34:10 +02:00
Manfred Karrer
7fd4dcc3e5 Update scripts (use alien for rpm) 2016-08-07 05:10:27 +02:00
Manfred Karrer
f7a7c4087b Prepare v 0.4.9.3 2016-08-07 04:17:13 +02:00
Manfred Karrer
31a1d7c0aa Add rpm packager (not tested yet) 2016-08-06 17:56:45 +02:00
Manfred Karrer
e3ce6e9125 Prepare for release 0.4.9.2 2016-07-30 00:32:40 +02:00