Manfred Karrer
|
c11246a1ee
|
Merge pull request #1372 from cbeams/change-pricenode-operator
Reflect pricenode operator change in ProvidersRepository
|
2018-02-19 06:06:44 -05:00 |
|
Manfred Karrer
|
17231722c7
|
Merge pull request #1371 from blabno/bugfix/1357-not-possible-to-select-english
Not possible to select `English` anymore, if system locale is non-English
|
2018-02-19 06:03:37 -05:00 |
|
Manfred Karrer
|
fbc2761bf7
|
Update comment for price node operator
|
2018-02-19 05:57:24 -05:00 |
|
Chris Beams
|
ca57803660
|
Reflect pricenode operator change in ProvidersRepository
See bisq-network/roles#14 and bisq-network/pricenode#7
|
2018-02-19 11:31:53 +01:00 |
|
Bernard Labno
|
5471a8c9ca
|
Not possible to select English anymore, if system locale is non-English
|
2018-02-19 11:08:44 +01:00 |
|
Manfred Karrer
|
2d2db40fd3
|
Merge pull request #1365 from ripcurlx/only-show-range-when-necessary
Only show range when necessary
|
2018-02-18 21:33:20 -05:00 |
|
Manfred Karrer
|
649c14d28e
|
Merge pull request #1360 from ripcurlx/shorten-call-to-action-buttons
Shorten labels in call-to-action buttons in offer book
|
2018-02-18 21:29:44 -05:00 |
|
Christoph Atteneder
|
a6c9fe5a51
|
Only let user select amount if there is actually an amount range to select from
|
2018-02-16 10:54:12 +01:00 |
|
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 |
|
Manfred Karrer
|
3d51f9dda5
|
Merge pull request #1358 from ripcurlx/refactor-infotextfields
Refactor infotextfields
|
2018-02-14 11:27:19 -05: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
|
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
|
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
|
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 |
|
Manfred Karrer
|
cef91991c6
|
Merge pull request #1350 from ripcurlx/unify-column-oder
Unify order of columns in offer book
|
2018-02-13 12:41:03 -05:00 |
|
Manfred Karrer
|
e5e7ded68f
|
Merge pull request #1334 from ripcurlx/change-goto-screen-after-trade
Change path after completed trade
|
2018-02-13 12:38:45 -05:00 |
|
Manfred Karrer
|
d653e8263d
|
Change text for portfolio.pending.tradePeriodWarning
|
2018-02-13 12:37:06 -05:00 |
|
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
|
2cfc1b214f
|
Merge remote-tracking branch 'origin/master'
|
2018-02-13 12:27:30 -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 |
|
Manfred Karrer
|
1b8fce9374
|
Merge branch 'finalize-info-icon-for-funds-needed' of https://github.com/ripcurlx/exchange
|
2018-02-13 12:03:31 -05:00 |
|
Manfred Karrer
|
224a91bbd6
|
Merge pull request #1313 from blabno/feature/1204-use-environment-locale-to-select-right-locale-and-currency
Use environment locale to select right locale and currency
|
2018-02-13 12:02:34 -05:00 |
|
sqrrm
|
ab47148079
|
Move compensation request domain specifics out of gui
|
2018-02-13 15:26:03 +01:00 |
|
sqrrm
|
f73395f6f1
|
Fix log spelling
|
2018-02-13 14:03:08 +01:00 |
|
sqrrm
|
3fdb4fb860
|
Only warn on duplicate foreign compensation requests
|
2018-02-13 14:02:40 +01:00 |
|
sqrrm
|
d06746e78b
|
Change warning log to info
|
2018-02-13 13:48:48 +01:00 |
|
Christoph Atteneder
|
6de488bcc1
|
Add translations for changed string
|
2018-02-13 12:46:18 +01:00 |
|
Christoph Atteneder
|
dc2d94b486
|
Use header label for buy and sell offers that is easier to understand
|
2018-02-13 12:29:37 +01:00 |
|
Christoph Atteneder
|
9c58c30696
|
Add missing active text color
|
2018-02-13 12:22:02 +01:00 |
|