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
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
Christoph Atteneder
b930e18ce0
Increase vertical gap
2018-02-13 10:00:46 +01:00
Christoph Atteneder
ceb8e857d5
Unify order of columns in offer book
2018-02-13 09:36:08 +01:00
Manfred Karrer
313090b825
Improve and fix logs.
2018-02-12 11:17:31 -05:00
Christoph Atteneder
ac20997c05
Merge remote-tracking branch 'upstream/master' into improve-info-during-trade-process
2018-02-12 11:52:57 +01:00
Christoph Atteneder
d938437aab
Merge remote-tracking branch 'upstream/master' into finalize-info-icon-for-funds-needed
2018-02-12 11:52:20 +01:00
Manbearpixel
c23492eaff
Merge branch 'list-odn-coin' of https://github.com/Manbearpixel/exchange into list-odn-coin
2018-02-11 14:03:11 -06:00
Hein Bloed
45b2693048
added ODN to createAllSortedCryptoCurrenciesList
2018-02-11 14:02:21 -06:00
Hein Bloed
b067831e5e
correct settings for p2shHeader
2018-02-11 14:02:21 -06:00
Manbearpixel
abe20f1b97
Added ODN Address Validation
2018-02-11 14:02:21 -06:00
Vaughn
72fffb315d
Merge pull request #3 from Hein-Bloed/list-odn-coin
...
Fixed p2shHeader attribute and added to another List
2018-02-11 13:45:45 -06:00
bitdaric
a22bea3a80
add BitDaric
2018-02-11 10:51:49 +03:30
bitdaric
9204c3b8c2
add BitDaric
2018-02-11 10:47:34 +03:30
bitdaric
9ca3876472
add BitDaric
2018-02-11 10:45:26 +03:30
bitdaric
51e2d89e5c
add BitDaric
2018-02-11 10:43:24 +03:30
Poompon
fc94fb564e
Add YENTEN [YTN] validaion
2018-02-10 15:34:52 +03:00
Poompon
fc62237234
Add YENTEN [YTN] validaion
2018-02-10 14:35:35 +03:00
reverendus
0b83d9de23
Add DAI Token
2018-02-10 11:34:40 +01:00
author
cedefba24d
Proposed fix for issue 1184. OfferBook caches buy & sell offer counts for each trade currency when OfferBook's fillOfferBookListItems method is called, and the appropriate cache is passed to the modified GIUUtil's getTradeCurrencyConverter. Currency ComboBox.setConverter call was moved from OfferBookView's initialize() to activate() because it depends on a non null direction field value.
2018-02-08 17:57:33 -02:00
Hein Bloed
00f6f8ea4b
added ODN to createAllSortedCryptoCurrenciesList
2018-02-08 18:26:45 +01:00
Hein Bloed
55201fedba
correct settings for p2shHeader
2018-02-08 18:25:24 +01:00
ghubstan
c8283afad6
Merge pull request #1 from bisq-network/master
...
Bringing my fork up to date
2018-02-08 14:50:47 +00:00
Chris Beams
ed0148bfee
Enable running tests in Travis CI
...
This change removes the custom `script` command, falling back to Travis
CI's default Maven script command, which, per [1] is:
mvn test -B
The effect is that tests should now be run, which is particularly useful
for incoming pull requests.
See https://github.com/bisq-network/exchange/pull/1309#issuecomment-363776458
for context.
[1]: https://docs.travis-ci.com/user/languages/java/#Maven-Default-Script-Command
2018-02-08 13:30:54 +01:00
Chris Beams
8d44f750f6
Do not steal focus when selecting disputes
...
This commit reverts a change added in
f0a985ea0d#1311 ) that made it impossible
to scroll through arbitration tickets with the arrow keys, because on
selecting each dispute/ticket, the input text area would steal focus
away.
Now, the input text field still gets auto-focused when the dispute view
is opened, but does not try to steal / auto-focus when scrolling through
/ selecting individual disputes.
2018-02-08 09:24:56 +01:00
Christoph Atteneder
2f6184d1b6
Merge remote-tracking branch 'upstream/master' into change-goto-screen-after-trade
2018-02-08 09:23:36 +01:00
Christoph Atteneder
83a890be43
Merge remote-tracking branch 'upstream/master' into improve-info-during-trade-process
2018-02-08 09:22:46 +01:00
Christoph Atteneder
d7a36e35a3
Merge remote-tracking branch 'upstream/master' into finalize-info-icon-for-funds-needed
2018-02-08 09:21:24 +01:00
Chris Beams
4ac2343219
Merge pull request #1326 from blabno/feature/1058-make-arbitration-chat-messages-selectable
...
Make arbitration chat messages selectable
2018-02-08 08:37:22 +01:00
Christoph Atteneder
65d2c03eac
Change path after completed trade
2018-02-07 16:28:24 +01:00
