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

5297 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
65285bfe30 Apply code inspection 2017-06-08 18:02:05 +02:00
Manfred Karrer
e81c72232d Add "open log file" button to backup view 2017-06-08 13:25:49 +02:00
Manfred Karrer
d075f23754 Fix seed word restore issues (bug with resource bundle, missing show() at popup), remove date check) 2017-06-08 13:13:37 +02:00
Manfred Karrer
8485e6655d Dont call closeDisputedTrade at onDisputedPayoutTxMessage. 
Add RuntimeException if tx signing fails
 2017-06-08 12:36:40 +02:00
Manfred Karrer
266bb682be Throw exception if tx signing fails 2017-06-08 12:27:37 +02:00
Manfred Karrer
813d896295 Fix P2PDataStorage bug (missing super call for lombok equalsandhashcode) 2017-06-08 12:06:09 +02:00
Manfred Karrer
8c051c3873 Add missing initPersistedDataHosts calls. Refactorings 2017-06-08 12:05:06 +02:00
Mike Rosseel
ac4bbe9dc4 ctor param was added, fixed 2017-06-08 11:46:21 +02:00
Mike Rosseel
0249df4ddd Merge branch 'DAO' into issue544-api 2017-06-08 11:35:50 +02:00
Manfred Karrer
677f6c81c6 Add missing contractHash from PB.Trade. 
Dont set nullable trade objects if PB is not set.
Remove Serializable form Proto interface
Remove LookAheadObjectInputStream
 2017-06-08 00:55:53 +02:00
Manfred Karrer
b64457e869 Fix missing ProtocolVersion in Offer. 
Use getTTL() instead of Lombok Getter with instance field
 2017-06-07 21:15:50 +02:00
Manfred Karrer
22d90f627c Use ProtoUtil.protoToNullableString and protoToToNullableByteArray instead of isEmpty checks and null assignement. 
Use fromProto for BlockChainExplorer, Country, CryptoCurrency, FiatCurrency
Use @EqualsAndHashCode(callSuper = true) for PaymentAccounts
Replace Samenknoten with Seednodes in german translation
Clean up PB definitions.
 2017-06-07 20:25:38 +02:00
Mike Rosseel
8b2d7791c2 dropwizard dependency exclusions to satisfy enforcer rules 2017-06-07 17:06:36 +02:00
Mike Rosseel
3a42426f50 Merge branch 'DAO' into issue544-api 2017-06-07 16:41:06 +02:00
Mike Rosseel
5b72e42a4e second part of merge 2017-06-07 15:19:28 +02:00
Mike Rosseel
aed210c33d Merge branch 'DAO' into issue544-api 
Conflicts:
	bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	core/src/main/java/io/bitsquare/trade/offer/Offer.java
	gui/src/main/java/io/bisq/gui/app/BisqApp.java
	pom.xml
 2017-06-07 15:18:59 +02:00
Mike Rosseel
d50ff6c6dc added the LTC network id's, renamed bitcoinNetwork to baseCryptoNetwork. 
Still a few places with BTC left, needs some more thought like TOR options, file to save the wallet to, ...
 2017-06-06 11:14:15 +02:00
Manfred Karrer
1e01ef3650 Cleanup PB definitions and methods 2017-06-06 02:39:37 +02:00
Manfred Karrer
e5b775d07c Cleanup PB definitions and methods 2017-06-05 23:13:51 +02:00
Manfred Karrer
3f756d4923 Cleanup PB definitions and methods 2017-06-05 21:03:50 +02:00
Manfred Karrer
5558d2f39b Fix nullable fields in Dispute 2017-06-05 20:02:58 +02:00
Manfred Karrer
416084fffc Display all offers not only those in the currency list if show all is selected in offer book view 2017-06-05 15:35:58 +02:00
Manfred Karrer
bce4d589b6 Fix icon path 2017-06-04 21:26:06 +02:00
Manfred Karrer
29d1bd1d8b Merge pull request #828 from SMH17/patch-1 
Update Bitsquare.iss
 2017-06-04 21:25:18 +02:00
Silvio Marano
3cc78f2ecf Update Bitsquare.iss 2017-06-04 20:03:51 +02:00
Manfred Karrer
331320f202 Added PEPECASH 2017-06-04 15:57:05 +02:00
Manfred Karrer
0c50fb9413 Fix missing check of isMyOwnRegisteredArbitrator 2017-06-04 00:13:42 +02:00
Manfred Karrer
ede90eb4cd Fix logs 2017-06-02 18:58:29 +02:00
Manfred Karrer
9374d4907f Fix issues with dispute, trade, userpayload, persistance 2017-06-02 18:57:05 +02:00
Manfred Karrer
ab81f76bf0 Merge remote-tracking branch 'origin/DAO' into DAO 
# Conflicts:
#	common/src/main/java/io/bisq/common/storage/FileManager.java
 2017-06-02 18:56:08 +02:00
Manfred Karrer
37f8cb8127 Fix issues with dispute, trade, userpayload, persistance 2017-06-02 18:55:17 +02:00
Mike Rosseel
b5298d360f change logging from error to info, distracting in logs 2017-05-31 11:50:07 +02:00
Manfred Karrer
2a7f851936 Fix TradableList, impl. missing fromProto methods 2017-05-31 01:36:12 +02:00
Manfred Karrer
1efe4e8828 Fix PaymentAccount id issue 2017-05-30 22:20:48 +02:00
Manfred Karrer
3a6fe00d4f Add log 2017-05-30 20:01:27 +02:00
Manfred Karrer
4b88465b47 Remove AtomicBoolean 2017-05-30 19:52:06 +02:00
Manfred Karrer
bddeb381a6 Fix nullpointer, cleanups.... 2017-05-30 15:34:57 +02:00
Mike Rosseel
5cb30dbffb fix the bug where a persisted paymentaccount would have a wrong id by eliminating the duplicate id on PaymentAccount/PaymentAccountPayload 2017-05-30 14:07:13 +02:00
Mike Rosseel
3570f609a9 don't crash on empty OpenOffers 2017-05-26 14:42:02 +02:00
Mike Rosseel
5752fdc4b6 fix OpenOffer bug 2017-05-24 15:48:40 +02:00
Mike Rosseel
879d1ec392 Persisted_entry_map now saved, tradablelist fixes (wip) 2017-05-22 15:00:46 +02:00
Mike Rosseel
991f6c9319 Don't hide guice exceptions when popup doesn't work, log it! 2017-05-19 10:29:44 +02:00
Mike Rosseel
dc32bd24b1 fix don't show again bug. Better log text. 2017-05-18 17:04:05 +02:00
Manfred Karrer
6ec49265fd Fix space 2017-05-18 16:10:47 +02:00
Manfred Karrer
e49b6b8783 Version 0.4.9.9.2 2017-05-18 15:41:48 +02:00
Manfred Karrer
24b19e527b Fix wrong trade fees 2017-05-18 15:41:04 +02:00
Mike Rosseel
790dfa80a7 fix startup bug by ensure the userPayload always has initialized lists, add try/catch in some places 2017-05-18 11:46:44 +02:00
Manfred Karrer
e5585a1b3a Version 0.4.9.9.2 2017-05-18 00:44:43 +02:00
Manfred Karrer
e107927fb2 Update PersistedP2PStorageData 2017-05-18 00:44:08 +02:00
Manfred Karrer
c5e23feccd Increase default tx fee for non-trade txs to 150_000 sat 2017-05-18 00:29:06 +02:00