Commit graph

5674 commits

Author SHA1 Message Date
Christoph Atteneder
a6ff095234
Add isRange method 2018-02-16 09:54:54 +01:00
Christoph Atteneder
def3970e09
Merge remote-tracking branch 'upstream/master' into only-show-range-when-necessary 2018-02-16 09:31:08 +01:00
Christoph Atteneder
e1fffeb717
Merge pull request #1363 from ghubstan/issue-1184
Add number of open offers to currency filter popups (Issue 1184 - Tidy up)
2018-02-16 09:21:58 +01:00
author
3cb6b73193 Remove @Deprecated method. 2018-02-15 18:11:50 -02:00
author
5f6d9605c0 Add assert erroneously deleted in last commit. 2018-02-15 13:12:25 -02:00
Christoph Atteneder
ad7bb42012
Only display range if a amount or volume range is set 2018-02-15 15:24:52 +01:00
Stan
8daa39e21d
Merge pull request #2 from bisq-network/master
Sync branch with master fork.
2018-02-15 13:56:48 +00:00
Sergey Rozhnov
6f10d7d75e Added headers to new classes 2018-02-15 17:50:50 +04:00
Sergey Rozhnov
bd4439ce2c Made DefaultNodeAddresses impossible to instantiate 2018-02-15 17:48:38 +04:00
Sergey Rozhnov
81b9b8be99 Bound NodeAddressLookup to all necessary modules 2018-02-15 17:41:31 +04:00
Sergey Rozhnov
eea28c3d73 Implemented unit test for NodeAddressLookup 2018-02-15 17:10:53 +04:00
Sergey Rozhnov
60ca9fb14b Implemented unit test for NodeAddresses 2018-02-15 16:59:12 +04:00
Christoph Atteneder
33b1e45c7b
Merge remote-tracking branch 'upstream/master' into add-monospace-font-support-roboto 2018-02-15 13:55:32 +01:00
Sergey Rozhnov
96528a0fc5 Implemented unit test for ImmutableSetDecorator 2018-02-15 16:41:02 +04:00
Sergey Rozhnov
9889144d90 Extracted AbstractImmutableSetDecorator class 2018-02-15 16:26:44 +04:00
Sergey Rozhnov
180eb6bf9f Refactored some TODOs in NodeAddress and NodeAddressLookup 2018-02-15 15:49:53 +04:00
Sergey Rozhnov
9c2f0d5c00 Refactored CoreSeedNodesRepository using NodeAddressLookup 2018-02-15 15:34:13 +04:00
Sergey Rozhnov
3e13a0f226 Extracted default addresses into a separate class 2018-02-15 15:19:51 +04:00
Sergey Rozhnov
628b14c93c Fixed compilation errors in CoreSeedNodeRepositoryFactory 2018-02-15 14:21:50 +04:00
Sergey Rozhnov
196137b30c Moved NodeAddresses into a separate class 2018-02-15 14:06:20 +04:00
Sergey Rozhnov
05f515741d Moved creation logic into a separate class 2018-02-14 23:32:51 +04:00
Manfred Karrer
3d51f9dda5
Merge pull request #1358 from ripcurlx/refactor-infotextfields
Refactor infotextfields
2018-02-14 11:27:19 -05:00
sqrrm
a5364c9f3f
Display txid for compensation requests 2018-02-14 16:16:42 +01:00
Christoph Atteneder
72f1e02271
Only use additional decimal places for coins when explicitly required 2018-02-14 13:47:11 +01:00
Christoph Atteneder
283e7f8c6a
Merge remote-tracking branch 'upstream/master' into add-monospace-font-support-roboto
# Conflicts:
#	gui/src/main/java/io/bisq/gui/bisq.css
2018-02-14 13:15:38 +01:00
sqrrm
80a0829c2a
Some cleanup of CompensationRequestManager 2018-02-14 12:57:29 +01:00
Christoph Atteneder
04e5cef9ee
Rename singular/plural translation keys to make it less error-prune and add missing translations for all locales 2018-02-14 12:56:08 +01:00
Christoph Atteneder
436289edc9
Shorten labels in call-to-action buttons in offer book 2018-02-14 12:34:00 +01:00
Christoph Atteneder
1075298dc0
DRYing up code after recent PR merges 2018-02-14 11:29:39 +01:00
Christoph Atteneder
899d6aef02
Add german translation 2018-02-14 11:27:05 +01:00
Manfred Karrer
521dd62114
Change max. deviation of market price #1356 2018-02-13 21:10:55 -05:00
Manfred Karrer
ff629542e7
Use camelCase 2018-02-13 20:56:23 -05:00
Manfred Karrer
14035e58a6
Merge pull request #1355 from sqrrm/comp-req-refactor
Comp req refactor
2018-02-13 20:55:29 -05:00
Manfred Karrer
0a1dc70ec0
Fix sorting of altcoins 2018-02-13 20:37:26 -05:00
Manfred Karrer
bd6b70a8ba
Add new altcoins: Stellite, Dai Stablecoin, Obsidian, BitDaric, Yenten 2018-02-13 20:34:43 -05:00
Manfred Karrer
2dd6a91be8
Merge Obsidian 2018-02-13 20:23:25 -05:00
Manfred Karrer
f8850dfd0a
Merge branch 'list-odn-coin' of https://github.com/Manbearpixel/exchange into Manbearpixel-list-odn-coin
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
2018-02-13 20:23:02 -05:00
Manfred Karrer
879d8e0660
Merge branch 'add-darx-altcoin' of https://github.com/bitdaric/exchange into bitdaric-add-darx-altcoin
# 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
2018-02-13 20:19:14 -05:00
Manfred Karrer
c22f52477f
Add Yenten 2018-02-13 20:17:09 -05:00
Manfred Karrer
22a3b94d40
Add Yenten 2018-02-13 20:16:53 -05:00
Manfred Karrer
2f04d1ca89
Merge pull request #1342 from reverendus/list-dai-token
Add DAI Token
2018-02-13 20:11:56 -05:00
Manfred Karrer
2a9305c14b
Disable dev mode 2018-02-13 20:09:05 -05:00
Manfred Karrer
eb0a8b8d49
Add payment method MoneyBeam (#1349) 2018-02-13 20:00:35 -05:00
Manfred Karrer
ad56c26f7f
Add payment method Cash App (#1049) 2018-02-13 19:42:29 -05:00
Manfred Karrer
ead30822e5
Add payment method Uphold 2018-02-13 15:32:44 -05:00
Manfred Karrer
6a3206543d
Extract StringConverter for paymentAccountComboBox to GUIUtils. Handle multicurrency accounts. 2018-02-13 15:32:22 -05:00
Manfred Karrer
0064e5052f
Merge pull request #1332 from tau3/refactor/config-peer-nodes
Refactoring: WalletSetup#configPeerNodes
2018-02-13 13:14:16 -05:00
Manfred Karrer
1bb58261f0
Merge pull request #1331 from sqrrm/bsqparser-genesis-test
Bsqparser genesis test
2018-02-13 12:53:03 -05:00
Manfred Karrer
8c09423d47
Merge pull request #1341 from ghubstan/issue-1184
Add number of open offers to currency filter popups.
2018-02-13 12:46:43 -05:00
Manfred Karrer
949c1c6f2a
Merge pull request #1352 from ripcurlx/change-offerbook-column-headers
Change offerbook column headers
2018-02-13 12:42:05 -05:00