Commit graph

5309 commits

Author SHA1 Message Date
Manfred Karrer
250a3724be
Move useDevPrivilegeKeys from ArbitratorModule to BisqAppModule 2018-02-26 12:51:04 -05:00
Manfred Karrer
c19cf3c0cd
Merge pull request #1383 from blabno/feature/extract-USE_DEV_PRIVILEGE_KEYS-from-dev-env
Make USE_DEV_PRIVILEGE_KEYS flag configurable
2018-02-26 12:48:29 -05:00
Manfred Karrer
86af7b7ccb
Merge pull request #1401 from jbarcelo/fix_broken_links
Trivial: Fix two broken links
2018-02-26 10:31:46 -05:00
Manfred Karrer
ac082da72e
Refactoring: Rename AddOfferOfferBook to AddToOfferBook 2018-02-26 09:43:09 -05:00
Jaume Barcelo
c9af4d4694
Trivial: Fix two broken links
Fix two broken web links in the documentation.
2018-02-26 15:31:46 +01:00
Manfred Karrer
96a325269a
Merge pull request #1398 from argospam/dir-exists-check
Checks directory exists before setInitialDirectory
2018-02-26 08:41:14 -05:00
argospam
37309445b1
Checks directory exists before setInitialDirectory
Added a little defensive coding to prevent error: Folder parameter must be a valid folder.
2018-02-25 20:45:51 -08:00
Manfred Karrer
2c593559db
Merge 0.6.6 branch to master 2018-02-23 21:40:34 -05:00
Manfred Karrer
3048e0f385
Fix failed unit test 2018-02-22 12:23:30 -05:00
Manfred Karrer
43ce9f796f
Fix issue #1386: Offers with Cash deposit cannot be taken.
Fix handling for Sepa related accounts.
Optimize handling for same bank and specific banks.
Add comments
2018-02-22 12:10:25 -05:00
Manfred Karrer
2391b719a5
Merge pull request #1376 from blabno/feature/seednode-docker
Dockerize seednode for development mode
2018-02-21 14:33:33 -05:00
Manfred Karrer
7a96181ccc
Merge pull request #1378 from stevenkain/patch-7
Update displayStrings.properties
2018-02-21 14:32:48 -05:00
Bernard Labno
051694dfdb Make USE_DEV_PRIVILEGE_KEYS flag configurable 2018-02-21 16:29:57 +01:00
Christoph Atteneder
d377eec122
Merge pull request #1379 from stevenkain/patch-8
Update displayStrings_hu.properties
2018-02-21 09:23:32 +01:00
Christoph Atteneder
182fb5f94e
Merge pull request #1380 from stevenkain/patch-9
Update displayStrings_ro.properties
2018-02-21 09:20:05 +01:00
stevenkain
6af2fccb89
Update displayStrings_ro.properties
New Romanian translations
2018-02-20 23:08:35 +02:00
stevenkain
601bd9ea4e
Update displayStrings_hu.properties
New translations
2018-02-20 23:03:44 +02:00
stevenkain
f0a676bd33
Update displayStrings.properties
"both trades" makes no sense. Shouldn't it be "both traders"?
2018-02-20 22:41:35 +02:00
Bernard Labno
fe1edafbd8 Dockerize seednode for development mode 2018-02-20 17:58:06 +01:00
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