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

1549 commits

Author SHA1 Message Date
Manfred Karrer
d7f00e48e6 Make tradeLimits custom per baseCurrency 2017-06-21 17:27:38 +02:00
Manfred Karrer
04a6c2fc38 Add missing currency label 2017-06-21 17:27:05 +02:00
Mike Rosseel
b716a742ff basecrypto changes, env->environment changes 2017-06-16 14:19:49 +02:00
Mike Rosseel
4d2d81174f 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
 2017-06-16 10:48:01 +02:00
Manfred Karrer
1464beb200 Fix issue with not selecting market price at startup 2017-06-15 23:29:50 +02:00
Manfred Karrer
af9b583a0a Add arbitratorPubKeyRing and mediatorPubKeyRing to trade. remove arbitrator from user at revoke 2017-06-15 15:03:56 +02:00
Manfred Karrer
275ea6846b Move baseCurrency methods form BaseCurrencyNetwork to BisqEnvironment 2017-06-14 14:46:56 +02:00
Manfred Karrer
b334065af0 Use static BaseCurrencyNetwork.getBaseCurrencyNetwork() calls. Rename env to environment and type Environment to BisqEnvironment in concrete classes. 2017-06-14 13:51:34 +02:00
Manfred Karrer
362b0f9793 Add flags for deactivating dao and dao phase 2 features 2017-06-14 13:03:46 +02:00
Manfred Karrer
224de8a65a New logo for splash screen 2017-06-14 00:57:31 +02:00
Manfred Karrer
a348cf8bb1 Add DogecoinRegTestParams (placeholder, not impl yet) 2017-06-13 20:58:39 +02:00
Manfred Karrer
ac2fc814fd Add ltc and doge block explorers 2017-06-13 13:45:53 +02:00
Manfred Karrer
edb71d1d86 Add altcoin validation for btc. ltc and doge. change order of base currency network to avoid to break port assignment by enum ordinal. add btc to altcoin list if not base currency. 2017-06-13 12:44:25 +02:00
Manfred Karrer
7bd9ba6fb0 Convert btc based market price to ltc or doge based market price 2017-06-13 11:24:11 +02:00
Manfred Karrer
1b50bc9a3a Make minNonDustOutput base coin context specific 2017-06-13 10:41:41 +02:00
Manfred Karrer
b4fff9e1f6 Add market selection popup at startup 2017-06-13 08:53:13 +02:00
Manfred Karrer
ee4b91abb9 Make bsq format dynamic by base currency 2017-06-13 07:39:19 +02:00
Manfred Karrer
5a0d493d02 Use 100 000 Sat for 1 BSQ in formatter. Use localhost fee provider 2017-06-12 21:54:08 +02:00
Manfred Karrer
029ca8c91b Add delay at blockheight display to cover both dao and bitcoinj updates 2017-06-12 17:50:11 +02:00
Manfred Karrer
a9a9f887f7 Change order of text entry fields 2017-06-12 17:49:36 +02:00
Manfred Karrer
7e52f2f6b8 Replace usage of "BTC" in code with base currency. Set LTC genesis tx (dev) 2017-06-12 01:59:10 +02:00
Manfred Karrer
f9cd71c5c2 Replace usage of "BTC" in code with base currency. Remove denomination property in preferences 2017-06-11 23:39:41 +02:00
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
8b273c6c24 Only show Mainnet currency networks if not DEV_MODE is set 2017-06-10 14:02:36 +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
f8c7149e68 Merge branch 'DAO' into altcoins 2017-06-10 11:29:36 +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
a1aa1021eb Apply code formatter 2017-06-08 18:06:17 +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
813d896295 Fix P2PDataStorage bug (missing super call for lombok equalsandhashcode) 2017-06-08 12:06:09 +02:00
Mike Rosseel
0249df4ddd Merge branch 'DAO' into issue544-api 2017-06-08 11:35:50 +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
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
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
0c50fb9413 Fix missing check of isMyOwnRegisteredArbitrator 2017-06-04 00:13:42 +02:00
Manfred Karrer
37f8cb8127 Fix issues with dispute, trade, userpayload, persistance 2017-06-02 18:55:17 +02:00
Manfred Karrer
1efe4e8828 Fix PaymentAccount id issue 2017-05-30 22:20:48 +02:00