Commit Graph

5316 Commits

Author SHA1 Message Date
Christoph Atteneder
499396e6fc
Add initial formatting for OfferBookView 2018-02-19 15:01:01 +01:00
Christoph Atteneder
196a7824a4
Improve formatting in OfferBook 2018-02-19 14:57:43 +01:00
Christoph Atteneder
e9591cafb2
Add formatting support for ranges 2018-02-19 14:57:17 +01:00
Christoph Atteneder
ea8cdf3ec8
Add number formatting to columns 2018-02-19 10:09:17 +01:00
Christoph Atteneder
8247a642eb
Add component tests 2018-02-19 10:08:53 +01:00
Christoph Atteneder
5545b588c6
Add number formatting to columns 2018-02-19 10:08:36 +01:00
Christoph Atteneder
ff7e527ab8
Use three zero places max 2018-02-19 10:08:07 +01:00
Christoph Atteneder
ab3903d98d
Merge remote-tracking branch 'upstream/master' into add-monospace-font-support-roboto
# Conflicts:
#	gui/src/test/java/io/bisq/gui/util/BSFormatterTest.java
2018-02-19 09:39:32 +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
75b89723a9
Add coloring of decimal places with zero at the end of a number 2018-02-16 16:55:56 +01:00
Christoph Atteneder
ee7f2e116a
Resize table rows in offer book 2018-02-16 12:33:36 +01:00
Christoph Atteneder
b172068cb3
Organize imports 2018-02-16 11:05:10 +01:00
Christoph Atteneder
75ac5c8a66
Merge remote-tracking branch 'upstream/master' into add-monospace-font-support-roboto 2018-02-16 11:00:59 +01: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
Christoph Atteneder
33b1e45c7b
Merge remote-tracking branch 'upstream/master' into add-monospace-font-support-roboto 2018-02-15 13:55:32 +01:00
Manfred Karrer
3d51f9dda5
Merge pull request #1358 from ripcurlx/refactor-infotextfields
Refactor infotextfields
2018-02-14 11:27:19 -05: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
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