4986 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manfred Karrer	eeeabaf015	Fix typos	2018-01-31 11:42:16 -05:00
Manfred Karrer	64ba300408	Add cleanup tor files button to tor network settings	2018-01-31 00:25:39 -05:00
Manfred Karrer	8b14f6bb15	Add request and response timestamp and retry counter to monitor	2018-01-30 22:34:36 -05:00
Manfred Karrer	bfc54f4d68	Add REF token	2018-01-30 19:42:14 -05:00
Manfred Karrer	8098e3c0c6	Merge remote-tracking branch 'origin/master'	2018-01-30 15:03:47 -05:00
Chris Beams	183389356f	Merge pull request #1294 from bisq-network/fix-custom-btc-nodes-issue-#1291 ... Fix issue with custom btc nodes	2018-01-30 20:59:19 +01:00
Manfred Karrer	25190bbe1f	Merge pull request #1296 from ripcurlx/add-util-tests ... Add util tests	2018-01-30 14:58:41 -05:00
Manfred Karrer	1e13375b9c	Merge remote-tracking branch 'origin/master'	2018-01-30 14:45:16 -05:00
Manfred Karrer	8732aeab54	Merge pull request #1287 from bisq-network/TradePeriodStartsAfterConfirmation ... Start trading period after deposit transaction confirmation	2018-01-30 14:45:01 -05:00
Manfred Karrer	aa06f3045b	Make useTorForBitcoinJ final again	2018-01-30 12:06:26 -05:00
Manfred Karrer	83f7cfbd8b	Refactor handling of empty list from custom nodes to avoid code duplication	2018-01-30 12:02:17 -05:00
Manfred Karrer	acab31955e	Use new flag useCustomNodes to not overload program argument value useAllProvidedNodes	2018-01-30 11:49:46 -05:00
Manfred Karrer	9ac49bd91a	Change guard logic for bitcoinNodesString	2018-01-30 11:41:42 -05:00
Christoph Atteneder	3d36e56532	Add first simple test for getTradeCurrency	2018-01-30 10:58:58 +01:00
Christoph Atteneder	b8fd8ec779	Add test for .fillCurrencyListItems	2018-01-29 20:33:59 +01:00
Manfred Karrer	a09df40571	Change sorting	2018-01-29 11:27:21 -05:00
Manfred Karrer	50c1607126	Merge pull request #1290 from bisq-network/fix-zero-balance-after-restore ... Fix zero balance after restore	2018-01-29 10:09:01 -05:00
Manfred Karrer	8ea5adf218	Merge pull request #1272 from ripcurlx/hotfix/fix-spread-sorting ... Adapt sorting behavior to values displayed in the spread column	2018-01-29 10:08:46 -05:00
Christoph Atteneder	428a38d6a0	Add test for fiat currency	2018-01-29 10:13:32 +01:00
Christoph Atteneder	d57b5354b0	Add basic tests for currency converters	2018-01-29 10:09:47 +01:00
Christoph Atteneder	28258831de	BigDecimal not needed in this case	2018-01-29 09:23:53 +01:00
Manfred Karrer	d6d5993627	Merge MVT	2018-01-28 19:15:19 -05:00
Manfred Karrer	b81f58006b	Merge branch 'BetterBetting-list-betr-token'	2018-01-28 19:10:24 -05:00
Manfred Karrer	20fd6a706e	Merge branch 'list-betr-token' of https://github.com/BetterBetting/exchange-bisq-network into BetterBetting-list-betr-token	2018-01-28 19:08:49 -05:00
Manfred Karrer	261af202d6	Support mixed clear net and onion custom nodes. Fall back to provided nodes if custom nodes are empty.	2018-01-28 19:08:10 -05:00
Manfred Karrer	45dc374176	Fix issue with custom btc nodes: #1291	2018-01-28 18:28:57 -05:00
Manfred Karrer	1b4e0c3e87	Merge pull request #1276 from ripcurlx/fix-gui-tests-for-different-locale ... Overwrite default locale to be able to run gui tests on non en_US machines	2018-01-26 22:30:22 -05:00
Manfred Karrer	d1aff34340	Merge pull request #1283 from cbeams/fix-english ... Fix typos and English errors in banned node dialog	2018-01-26 22:29:58 -05:00
Manfred Karrer	b220c1a6e2	Add new strings. Cleanup.	2018-01-26 22:25:03 -05:00
Manfred Karrer	af855f2326	Refactor: Move reSyncSPVChain code to GUIUtils.reSyncSPVChain	2018-01-26 22:23:16 -05:00
Manfred Karrer	03cde2ad65	Reuse FileUtil.deleteFileIfExists	2018-01-26 22:19:56 -05:00
Manfred Karrer	f91da81f87	Reuse FileUtil.renameFile	2018-01-26 22:18:47 -05:00
Manfred Karrer	648a7d4a0b	Add handling for canonical at Windows at file delete.	2018-01-26 22:17:33 -05:00
Manfred Karrer	ddf157f687	Rename AddressEntryList file at restoreSeedWords. Move restoreSeedWords to GUIUtils.	2018-01-26 22:14:07 -05:00
Manfred Karrer	da16a8169c	Add issuedReceiveAddresses to AddressEntryList at wallet restore #1288	2018-01-26 22:07:23 -05:00
Manfred Karrer	6d98ce4af2	Refactor: Move code from PendingTradesViewModel.getTimeWhenDisputeOpens to Trade.getTradeStartTime.	2018-01-26 20:11:03 -05:00
Manfred Karrer	4af8d44d7e	Change open dispute text	2018-01-26 20:07:36 -05:00
Manfred Karrer	537a9ad8ff	Change open dispute text (make open dispute optional)	2018-01-26 19:55:59 -05:00
Manfred Karrer	3e32a71d64	Improve logic flow of getTimeWhenDisputeOpens. Cleanup.	2018-01-26 14:33:44 -05:00
Manfred Karrer	1853d4ce49	Use BitcoinJ 0.14.4.5	2018-01-26 13:52:10 -05:00
Manfred Karrer	a70a810c76	Set boundaries for block date	2018-01-26 12:35:10 -05:00
Manfred Karrer	2a004a2f68	Merge branch 'master' into TradePeriodStartsAfterConfirmation ... # Conflicts: # core/src/main/java/io/bisq/core/btc/wallet/WalletConfig.java	2018-01-26 12:22:45 -05:00
Manfred Karrer	020a333db1	Cleanup	2018-01-26 12:19:58 -05:00
Manfred Karrer	af03007bb7	Change bitcoin node poyvpdt762gllauu to 3xucqntxp5ddoaz5	2018-01-26 12:15:19 -05:00
Manfred Karrer	0a138c7c1c	Fix issue: User with Western Union account can accept Cash Deposit offers #1249	2018-01-26 11:45:23 -05:00
Manfred Karrer	50f9a790fd	Cleanup	2018-01-26 11:32:01 -05:00
Manfred Karrer	f108836d1d	Revert isPreferred currencies change in 0.6.3 #1284	2018-01-26 11:30:59 -05:00
Chris Beams	f1d0abef4a	Fix typos and English errors in banned node dialog	2018-01-26 16:58:37 +01:00
Manfred Karrer	4af14af595	Change price node rb2l2qale2pqzjyo to 62nvujg5iou3vu3i	2018-01-26 10:25:49 -05:00
Manfred Karrer	172c51a6c3	Change selection of randomized provider node	2018-01-26 08:45:36 -05:00