Commit graph

3334 commits

Author SHA1 Message Date
Manfred Karrer
68042b3c1e Ignore test 2017-07-16 03:30:18 +02:00
Manfred Karrer
0b6c3c04da Fix tests 2017-07-16 03:29:52 +02:00
Manfred Karrer
782a5b87ce Backup file if there is an existing file. Filter duplicate sig. 2017-07-16 03:11:45 +02:00
Manfred Karrer
97faeb1ef9 Use static method renameFile 2017-07-16 03:10:37 +02:00
Manfred Karrer
25f9368990 Add info for wallet restore 2017-07-16 02:35:03 +02:00
Manfred Karrer
50d9c453ba Fix wrong decimals for fiat price and volume for offer json 2017-07-16 02:34:26 +02:00
Manfred Karrer
46dc82c02d Fix wrong sub view selection in DAO view. Only allow DAO view if BTC is basecurrency 2017-07-16 01:17:19 +02:00
Manfred Karrer
349ae774a8 Increase trade limits to 2 BTC for OK_PAY and Altcoins 2017-07-16 01:16:35 +02:00
Manfred Karrer
9cb0134369 Add reminder for seed word and backup before setting the wallet pw 2017-07-16 00:53:11 +02:00
Manfred Karrer
51e8aae991 Add email again but set to empty string as otherwise it would break backward compatibility (hash of contract) 2017-07-16 00:34:46 +02:00
Manfred Karrer
04fa5f079f Remove email from bank accounts and fasterpayment 2017-07-15 23:09:13 +02:00
Manfred Karrer
f8ed97cb2e Merge branch 'Development' into 0.5.2
# Conflicts:
#	core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
2017-07-15 14:57:42 +02:00
Manfred Karrer
edb5de0ac6 Fix fees, update to libdohj 0.14.2 2017-07-15 14:52:17 +02:00
Manfred Karrer
ca9e53a2ab Remove email from sepa account 2017-07-15 13:12:09 +02:00
Mike Rosseel
b2f6d7435c added dash as base currency 2017-07-14 20:20:19 +02:00
Manfred Karrer
e857d411bb Use LibDohj 0.14.2 2017-07-14 18:28:15 +02:00
Manfred Karrer
1d5965e296 Merge remote-tracking branch 'origin/0.5.2' into 0.5.2 2017-07-14 11:43:23 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +02:00
Manfred Karrer
4b5b305389 Merge branch 'master' into Development 2017-07-14 11:41:39 +02:00
Manfred Karrer
6bbac2903b Change version nr back to 0.5.1 (0.5.2 is not ready yet) 2017-07-14 11:41:20 +02:00
Mike Rosseel
e9cbd07674 clear downloaded/verified list in case download fails and button is pushed again. 2017-07-12 16:57:56 +02:00
Mike Rosseel
c1e0e76127 move unit tests, add unit test for sigs, add documentation 2017-07-12 16:32:33 +02:00
Manfred Karrer
27105efe8e Handle nullable winner in DisputeResult for PB 2017-07-12 10:42:39 +02:00
Manfred Karrer
afe2a17f71 Merge branch 'downloadUpdates' into 0.5.2 2017-07-12 03:28:56 +02:00
Manfred Karrer
7067acc824 Improve UI for in-app-download window. 2017-07-12 03:28:00 +02:00
Manfred Karrer
dfc67b3df0 Merge branch 'Development' into downloadUpdates 2017-07-11 23:32:36 +02:00
Manfred Karrer
947a95385f Use TxType.UNDEFINED_TX_TYPE instead of TxType.UNDEFINED 2017-07-11 23:31:17 +02:00
Manfred Karrer
bba9b5179c Rename UNDEFINED to UNDEFINED_TX_TYPE (PB does not allow same enum items in diff. enums ;-() 2017-07-11 23:11:07 +02:00
Manfred Karrer
c8f9990d58 Add new dev seed node 2017-07-11 23:03:50 +02:00
Manfred Karrer
c9203d481a Check against UNDEFINED instead of null 2017-07-11 23:03:13 +02:00
Manfred Karrer
7860116a27 Add UNDEFINED to TxType as default value 2017-07-11 23:02:49 +02:00
Manfred Karrer
c7ccb56ca5 Add NewBestBlockListener to update BSQ tx UI if best chain has changed 2017-07-11 23:01:40 +02:00
Manfred Karrer
8abaf2dffb Only request restart if base currency has changed 2017-07-11 22:44:48 +02:00
Manfred Karrer
45720486b2 Use Bisq instead of bisq 2017-07-11 22:37:44 +02:00
Manfred Karrer
e51a1c4372 Rename ClearXchange to Zelle (ClearXchange) 2017-07-11 22:31:05 +02:00
Manfred Karrer
dcf4dcd9a4 Rename ClearXchange to Zelle (ClearXchange) 2017-07-11 22:29:47 +02:00
Manfred Karrer
baabf3ba26 Allow trade limit of 5 BTC for BSQ 2017-07-11 22:23:27 +02:00
Manfred Karrer
908972deaf Add log 2017-07-11 21:02:00 +02:00
Manfred Karrer
ce62f74eb9 Refactoring: rename method 2017-07-11 21:01:47 +02:00
Manfred Karrer
9b394794ee Adjust setup procedure 2017-07-11 20:45:52 +02:00
Manfred Karrer
c76a4ac898 Use txOutputType = TxOutputType.UNDEFINED; instead of null 2017-07-11 20:45:33 +02:00
Manfred Karrer
ec3f610a5b Update doc 2017-07-11 20:12:35 +02:00
Manfred Karrer
d4867f712a Fix null pointer 2017-07-11 15:28:01 +02:00
Manfred Karrer
e2af215a57 Set txOutputType default to TxOutputType.UNDEFINED instead of null 2017-07-11 15:27:47 +02:00
Manfred Karrer
8371363c96 Merge branch 'Development' into 0.5.2 2017-07-10 23:42:19 +02:00
Manfred Karrer
7fde9a17b4 Merge branch 'master' into Development 2017-07-10 23:41:54 +02:00
Manfred Karrer
45774d3177 Merge pull request #864 from cedricwalter/fix-protobuf-permissions
used ant-exec to fix permissions instead of maven assembly
2017-07-10 23:40:51 +02:00
Manfred Karrer
c89b8bb91f Fix build doc dir, argument references 2017-07-10 23:39:35 +02:00
cedric.walter
e62f7435a8 last fix for mac 2017-07-10 21:52:00 +02:00
cedric.walter
2d91e4118e fixed for macos, avoid having unix profile active on macos 2017-07-10 21:37:39 +02:00