Commit Graph

1770 Commits

Author SHA1 Message Date
Manfred Karrer
d19580b32b
Reformat 2018-01-09 21:42:14 +01:00
Manfred Karrer
c0b44165de
Merge branch 'master' of https://github.com/deeponion/exchange into deeponion-master 2018-01-09 21:40:40 +01:00
Chris Beams
66d4b2c162
Remove trailing whitespace and use expression lambda 2018-01-08 10:27:20 +01:00
Alex Meyer
2f35186c09 Send messages when CMD+ENTER is pressed and focus is on the message input area 2018-01-07 23:50:23 -06:00
Manfred Karrer
80aca142ff
Fix issue with bouncycastle in pom 2018-01-04 23:46:42 +01:00
Manfred Karrer
dbdb8b3cea
Add nullcheck at seed restore 2018-01-03 17:52:32 +01:00
Chris Beams
604a9b1389
Use 'yyyy' vs 'YYYY' in date format for backup folder
This fixes the bug described in #1137. Lower-case 'yyyy' is the format
that always should have been used here.
2017-12-31 13:29:23 +01:00
deeponion
3c3412fe8e updated for supporting ONION 2017-12-28 00:47:50 -08:00
Manfred Karrer
f0ab56cced
Deactiavete stream isolation. Improve logging 2017-12-27 23:50:33 +01:00
Manfred Karrer
9f775f2cae
Make validators not singleton 2017-12-20 02:52:54 +01:00
Manfred Karrer
5ce2a67d0c
Prepare release 0.6.2 2017-12-20 01:12:18 +01:00
Manfred Karrer
58d8ab032e
Remove exclusion of bouncycastle in pom. 2017-12-20 00:49:01 +01:00
Manfred Karrer
41a4ca93e7
Improve error msg for withdrawal. Refactor: Rename TIMEOUT variables. 2017-12-19 23:27:43 +01:00
Manfred Karrer
7e7a06a0da
Merge branch 'jbg-add-xspec'
# Conflicts:
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2017-12-19 21:22:42 +01:00
Manfred Karrer
23f13c10fe
Merge XSPEC 2017-12-19 21:22:02 +01:00
Manfred Karrer
ad8c23b294
Merge branch 'add-xspec' of https://github.com/jbg/exchange into jbg-add-xspec 2017-12-19 21:20:40 +01:00
Manfred Karrer
ab07e6c47c
Merge branch 'ibininja-master'
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
#	gui/src/test/java/io/bisq/gui/util/validation/AltCoinAddressValidatorTest.java
2017-12-19 21:19:26 +01:00
Manfred Karrer
3c0082aee5
Merge branch 'master' of https://github.com/ibininja/exchange into ibininja-master 2017-12-19 21:14:55 +01:00
Manfred Karrer
a5289460d3
Merge PR for Cage 2017-12-19 21:11:44 +01:00
Manfred Karrer
013a960d01
Merge master 2017-12-19 20:55:03 +01:00
Manfred Karrer
e3488184a5
Merge branch 'master' into Development
# Conflicts:
#	provider/src/main/java/io/bisq/provider/price/providers/PoloniexProvider.java
2017-12-19 20:52:27 +01:00
Manfred Karrer
40b23b28d6
Merge non critical changes from dev branch 2017-12-19 20:52:00 +01:00
Manfred Karrer
c80d891d6f
Refactoring: Rename calss 2017-12-19 20:13:47 +01:00
Manfred Karrer
e5eff0d648
Remove unneeded broadcast trade fee tasks 2017-12-19 20:12:29 +01:00
swordfish5975
eeceef2bb1 Cagecoin 2017-12-18 21:11:16 +10:00
swordfish5975
86370ea1cc CageCoin 2017-12-18 21:01:29 +10:00
Manfred Karrer
83cd1b7ebc
Merge branch 'master' into Development
# Conflicts:
#	core/src/main/java/io/bisq/core/app/BisqEnvironment.java
2017-12-17 22:11:12 +01:00
Manfred Karrer
d77eb89e78
Add seed node monitor module 2017-12-17 20:39:00 +01:00
Ibrahim MOKDAD
a492fb7cec
Update CRED test 2017-12-17 09:23:35 +03:00
Ibrahim MOKDAD
2905a2edae
Update Added CRED 2017-12-17 09:13:08 +03:00
Jasper Bryant-Greene
539c767476 Added XSPEC altcoin 2017-12-11 14:21:32 +01:00
Manfred Karrer
a25b1f81be
Adjust comment 2017-12-09 10:25:35 -05:00
Manfred Karrer
de957e833f
Merge branch 'fix-588' of https://github.com/dulanov/exchange into dulanov-fix-588 2017-12-09 10:22:07 -05:00
Dmitry Ulanov (aka dulanov)
8ba7b351e7
After price feed actualization re-ordering doesn't perform
Fixes #588.
2017-12-09 12:55:23 +01:00
Manfred Karrer
a2e67e9965
Change IP of Jochen's btc node 2017-12-08 19:31:20 -05:00
Manfred Karrer
558157082d
Add filter for btc nodes 2017-12-07 23:14:34 -05:00
Manfred Karrer
e3408ea9d1
Merge branch 'BetterUpdateWindow' into Development 2017-12-07 22:27:32 -05:00
Manfred Karrer
a43ab663db
Merge branch 'master' into Development
# Conflicts:
#	core/src/main/java/io/bisq/core/provider/fee/FeeService.java
#	gui/src/main/java/io/bisq/gui/main/dao/DaoView.java
2017-12-07 22:27:26 -05:00
Manfred Karrer
35b2b46d36
Add update later button. Make version lable clickable and show updates 2017-12-07 22:24:24 -05:00
Manfred Karrer
41a48952b6
Update to latest netlayer version. Increase delay for tor settings 2017-12-07 15:41:41 -05:00
Manfred Karrer
6b8276ba10
Set version 0.6.1 for provider node. Increase timout for offer availibility. 2017-12-07 14:48:49 -05:00
Manfred Karrer
b70bcd25b4
Deactive tabs of not impl. DAO features 2017-12-07 13:38:24 -05:00
Manfred Karrer
41cf028f7e
Merge branch 'r8d8-fix/close_handler' into Development 2017-12-07 12:56:12 -05:00
Manfred Karrer
a944aba33d
Merge branch 'fix/close_handler' of https://github.com/r8d8/exchange into r8d8-fix/close_handler 2017-12-07 12:53:43 -05:00
Manfred Karrer
bec01232a0
Merge branch 'master' into Development 2017-12-07 12:32:41 -05:00
Dmitry Ulanov (aka dulanov)
7b25a1b904
Absent of market column custom comparator in OfferBookView
Related to #588.
2017-12-07 17:38:24 +01:00
r8d8
945ef24772
Fix for handling fo modal window closing
Related to #1042
2017-12-07 17:53:19 +02:00
Christoph Atteneder
a49157a628
Only hide prompt text after user starts typing 2017-12-06 10:35:19 +01:00
Manfred Karrer
ea5548f2ec
Add coin selection options to withdrawal screen 2017-11-30 23:01:30 -05:00
Manfred Karrer
52d6d8adc6
Add option in withdrawal screen to include or exclude miner fee 2017-11-30 21:29:56 -05:00