559 commits

Author	SHA1	Message	Date
Manfred Karrer	311b67573f	Merge pull request #1328 from ripcurlx/improve-info-during-trade-process ... Improve info during trade process	2018-02-13 12:33:05 -05:00
Manfred Karrer	f29f0e03d7	Change Bitcoin Classic to Bitcoin Clashic	2018-02-13 12:28:17 -05:00
Manfred Karrer	2287ec1eab	Merge pull request #1321 from stevenkain/patch-5 ... Update displayStrings.properties	2018-02-13 12:27:22 -05:00
Manfred Karrer	6ca1f2500a	Merge pull request #1316 from ripcurlx/finalize-info-icon-for-funds-needed ... Finalize info icon for funds needed	2018-02-13 12:06:44 -05:00
Christoph Atteneder	d03dd58144	Add info pop over for trade period	2018-02-06 11:18:57 +01:00
Bernard Labno	4b0692c6e0	Use environment locale to select right locale and currency	2018-02-05 12:50:47 +01:00
Christoph Atteneder	a4359e9557	Improve English translation and add German ones	2018-02-05 11:07:53 +01:00
Christoph Atteneder	b1aa86a57c	Add account age translation	2018-02-05 10:13:09 +01:00
Christoph Atteneder	09807a0744	Merge remote-tracking branch 'upstream/master' into improve-info-during-trade-process ... # Conflicts: # common/src/main/resources/i18n/displayStrings_ro.properties	2018-02-05 10:09:55 +01:00
Manfred Karrer	53ec4b2404	Merge pull request #1307 from stellitecoin/master ... Add Stellite Coin	2018-02-02 20:11:12 -05:00
stevenkain	2f0a6c1bc9	Update displayStrings_ro.properties ... New translation	2018-02-03 00:53:56 +02:00
stevenkain	422f5493de	Update displayStrings.properties ... 1. blocked by your internet provider or in your country - by your country 2. sent you -> send you 3. capitalized Bisq 4. I would love me some of that Bitcoin Clashic :)	2018-02-03 00:37:14 +02:00
Christoph Atteneder	bd4692f520	Fix wrong expectation of formatter method and add new translations for handling trade limits	2018-02-02 15:31:47 +01:00
Christoph Atteneder	76046c3de6	Remove trade date until from max trade period	2018-02-02 15:27:19 +01:00
Christoph Atteneder	75f0b4ad71	Remove translation that is not used	2018-02-02 15:21:45 +01:00
Manfred Karrer	1149a46837	Merge branch 'ripcurlx-use-info-icon-for-funds'	2018-02-01 15:52:43 -05:00
Manfred Karrer	ee9b133f65	Merge branch 'Development' ... # Conflicts: # gui/src/main/java/io/bisq/gui/main/funds/transactions/TransactionsView.java # gui/src/main/java/io/bisq/gui/main/overlays/windows/TorNetworkSettingsWindow.java	2018-02-01 14:10:42 -05:00
Christoph Atteneder	89a3939728	Add fee and deposit information to total funds to pay field	2018-02-01 15:05:24 +01:00
Manfred Karrer	664f094d99	Handle delete of spv chain file at startup for windows	2018-01-31 19:19:49 -05:00
Manfred Karrer	04560092ba	Improve handling of Tor shutdown	2018-01-31 16:52:35 -05:00
Manfred Karrer	89e11ac0e4	Handle locked files at delete directory method. Improve UI handling for TorNetworkSettingWindow	2018-01-31 15:44:30 -05:00
Stellite	a380381e94	fix formatting	2018-02-01 01:11:32 +05:30
root	2b2773e666	Adding STL Token	2018-01-31 19:39:16 +00:00
Manfred Karrer	bf244856b1	v0.6.5	2018-01-31 13:04:24 -05:00
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	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	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
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	d6d5993627	Merge MVT	2018-01-28 19:15:19 -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	b220c1a6e2	Add new strings. Cleanup.	2018-01-26 22:25:03 -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	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	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
Chris Beams	f1d0abef4a	Fix typos and English errors in banned node dialog	2018-01-26 16:58:37 +01:00
Saborknight	438e426a4d	Add BETR (Better Betting) token	2018-01-25 17:10:46 +00:00
Manfred Karrer	a0cdffaddc	Deactive dev flags	2018-01-24 20:46:32 -05:00
Manfred Karrer	6895ac9105	Refactoring: Rename methods	2018-01-24 20:43:30 -05:00
Manfred Karrer	f1d60ddcdb	Fix wrong argument at callFunctionWithWriteLock	2018-01-24 20:21:22 -05:00