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

4168 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
d27c4a6d7f Use https://github.com/bitsquare/bitsquare instead of https://github.com/bisq/bisq 2017-06-11 22:52:47 +02:00
Manfred Karrer
ba3fcc2cd4 Apply string replace for BTC, Bitcoin and bitcoin to selected base currency 2017-06-11 22:49:26 +02:00
Manfred Karrer
0583b7a3cb use capital letter for Bisq. Use bitsquare in github links (new bisq GH not defined yet) 2017-06-11 22:25:25 +02:00
Manfred Karrer
bf377501ad Add seed node for ltc mainnnet 2017-06-11 22:18:28 +02:00
Manfred Karrer
64a72ddec1 Add comment 2017-06-10 23:57:47 +02:00
Manfred Karrer
8b273c6c24 Only show Mainnet currency networks if not DEV_MODE is set 2017-06-10 14:02:36 +02:00
Manfred Karrer
a860f8c8d3 Support LTB for DAO as base currency 2017-06-10 13:56:30 +02:00
Manfred Karrer
ff548093d9 Fix layout bug. Use resource file for display string. 2017-06-10 13:56:03 +02:00
Manfred Karrer
f847900049 Rename BaseCryptoNetwork to BaseCurrencyNetwork 2017-06-10 13:06:24 +02:00
Manfred Karrer
aea6300994 Add ltc local host seed nodes (port ends with 5) 2017-06-10 13:02:27 +02:00
Manfred Karrer
24d5b2d9ae Use libdohj v 0.14.1. 
Update build.md
 2017-06-10 12:03:41 +02:00
Manfred Karrer
f8c7149e68 Merge branch 'DAO' into altcoins 2017-06-10 11:29:36 +02:00
Mike Rosseel
dc01aef917 libdohj was lost 2017-06-09 20:03:09 +02:00
Manfred Karrer
b82a0610c3 Run reformat code over project 2017-06-09 17:37:23 +02:00
Manfred Karrer
934474f6d0 Fix incorrect handling of messageVersion. Make NetworkEnvelope a abstract class instead of Interface. 2017-06-09 17:36:16 +02:00
Mike Rosseel
f99a3c1238 Merge branch 'DAO' into altcoins 
Conflicts:
	common/src/main/java/io/bisq/common/proto/ProtoUtil.java
	core/src/main/java/io/bisq/core/user/Preferences.java
 2017-06-09 16:58:06 +02:00
Mike Rosseel
a61a350ec7 read preferred crypto network from property file 2017-06-09 16:45:41 +02:00
Manfred Karrer
e86edd8384 Migrate old trade statistic db to new data structure. 
Use SignaturePubKeyBytes instead of PubKeyRing in TradeStatistics.
Use PersistedEntryMap instead of PersistableHashMap.
Use bytes as Hex encoded instead of toString call.
Use ConcurrentHashMap for SequenceNumberMap and PersistedEntryMap
 2017-06-08 23:47:55 +02:00
Manfred Karrer
8189749125 Add in-dev resource files 2017-06-08 18:07:45 +02:00
Manfred Karrer
a1aa1021eb Apply code formatter 2017-06-08 18:06:17 +02:00
Manfred Karrer
61809779f0 Apply code formatter 2017-06-08 18:03:35 +02:00
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