Commit Graph

5638 Commits

Author SHA1 Message Date
Manfred Karrer
db8a5686b1
Merge branch 'feature/allow-btcNodes-in-regtest' of https://github.com/blabno/exchange into blabno-feature/allow-btcNodes-in-regtest 2018-03-02 22:38:41 -05:00
Bernard Labno
961b01403f Use btcNodes argument in regtest mode. 2018-03-02 22:47:39 +01:00
Christoph Atteneder
f7bae5ca3f
Merge remote-tracking branch 'upstream/master' into add-monospace-font-support-roboto 2018-03-02 17:11:16 +01:00
Manfred Karrer
fd18cca161
Add missing setProperty call for regTestBsqGenesisTxId 2018-03-02 09:50:33 -05:00
Manfred Karrer
a30f9f0a52
Move Notification out of DataModel to View 2018-03-01 19:06:19 -05:00
Manfred Karrer
a1befee0bd
Use common superclass for Create- and TakeOfferDataModel to avoid code duplication. 2018-03-01 18:47:38 -05:00
Manfred Karrer
46ac1142c8
Merge pull request #1400 from ripcurlx/sync-minAmount-with-amount-until-changed
Sync minAmount with amount until minAmount is set
2018-02-28 11:04:01 -05:00
Christoph Atteneder
375d2ca576
Merge pull request #1375 from ghubstan/issue-1186
Resize "Offers to buy/sell with X"; list to Bisq's vertical window size
2018-02-28 09:45:57 +01:00
author
2e7acf19d6 Define initial Scene dimensions in Layout fields
Also moved initial offer table view's height into reusable field.
2018-02-27 12:48:31 -03:00
author
cbf330461d Define initial Scene dimensions in Layout fields
Also moved initial offer table view's height into reusable field.
2018-02-27 12:45:39 -03:00
Angelcoin
22715c5731
Update CurrencyUtil.java 2018-02-27 14:09:55 +02:00
Angelcoin
d9149d47ec
Update TradeStatisticsManager.java 2018-02-27 14:08:37 +02:00
Angelcoin
f1aca2ebb8
Update AltCoinAddressValidator.java 2018-02-27 14:07:27 +02:00
Angelcoin
b0fe5fae5d
Update AltCoinAddressValidatorTest.java 2018-02-27 14:06:03 +02:00
Angelcoin
ad2ae97a40
Add files via upload 2018-02-27 14:03:02 +02:00
Christoph Atteneder
c3e745fa0b
Refactor tests 2018-02-27 12:28:11 +01:00
Manfred Karrer
1d0591084d
Merge branch '0.6.7'
# Conflicts:
#	common/pom.xml
#	common/src/main/java/io/bisq/common/app/Version.java
#	common/src/main/resources/i18n/displayStrings.properties
#	common/src/main/resources/i18n/displayStrings_hu.properties
#	common/src/main/resources/i18n/displayStrings_ro.properties
#	consensus/pom.xml
#	core/pom.xml
#	core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
#	core/src/main/java/io/bisq/core/payment/PaymentAccountUtil.java
#	core/src/main/java/io/bisq/core/provider/fee/FeeService.java
#	gui/pom.xml
#	gui/src/main/java/io/bisq/gui/bisq.css
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java
#	gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java
#	gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java
#	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
#	gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java
#	gui/src/main/java/io/bisq/gui/util/GUIUtil.java
#	monitor/pom.xml
#	network/pom.xml
#	network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
#	package/linux/32bitBuild.sh
#	package/linux/64bitBuild.sh
#	package/linux/Dockerfile
#	package/osx/create_app.sh
#	package/osx/finalize.sh
#	package/windows/32bitBuild.bat
#	package/windows/64bitBuild.bat
#	package/windows/Bisq.iss
#	pom.xml
#	seednode/pom.xml
#	statistics/pom.xml
2018-02-26 22:03:47 -05:00
Manfred Karrer
fd47cefc6c
Set v0.6.7 2018-02-26 20:23:07 -05:00
Manfred Karrer
3cff5ce73e
Update PersistableNetworkPayloadMap_BTC_MAINNET 2018-02-26 20:22:05 -05:00
Manfred Karrer
df76748361
Update table view after offer is removed 2018-02-26 20:20:47 -05:00
Manfred Karrer
2a16e68939
Fix bug: Cannot remove deactivated offer #1403 2018-02-26 20:17:21 -05:00
Manfred Karrer
1e219bcbfe
Fix bug: Cannot select US national bank transfer in Create offer #1404 2018-02-26 20:06:46 -05:00
Manfred Karrer
cc1da24d42
Fix bug: Cannot select US national bank transfer in Create offer #1404 2018-02-26 20:03:04 -05:00
Manfred Karrer
644312a472
Add useDevPrivilegeKeys to other app base module 2018-02-26 12:52:42 -05:00
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
Christoph Atteneder
81b2231bda
Sync minAmount with amount until minAmount is set and not is 0 2018-02-26 13:46:03 +01:00
Christoph Atteneder
69f35396ee
Merge remote-tracking branch 'upstream/master' into add-monospace-font-support-roboto
# Conflicts:
#	common/src/main/resources/i18n/displayStrings_hu.properties
2018-02-26 11:13:25 +01:00
Christoph Atteneder
42e2e68b56
Use Droid Sans Mono 2018-02-26 10:52:06 +01: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
70a452a335
Reduce min. trade fee from 0.0002 BTC to 0.00005 BTC #1394 2018-02-23 19:12:05 -05:00
Manfred Karrer
b22667e04c
Update PersistableNetworkPayloadMap_BTC_MAINNET 2018-02-23 17:42:18 -05:00
Manfred Karrer
0b6edbb883
Set version 0.6.6 2018-02-23 15:41:24 -05:00
Chris Beams
b01af2e666
Refine text of per-trade limit info popup (#1388) 2018-02-23 21:38:05 +01:00
Manfred Karrer
429b5c52e4
Merge pull request #1392 from ripcurlx/add-disabled-style
Add disabled style for offer
2018-02-23 12:00:38 -05:00
Manfred Karrer
bdd9326e8e
Add pgp sig key from Christoph Atteneder 2018-02-23 11:58:27 -05:00
Christoph Atteneder
918995daab
Add disabled style for offer 2018-02-23 17:58:09 +01:00
Manfred Karrer
a04f96335b
Add new altcoins: Cassubian Detk, DigiMoney, SpeedCash, SOS Coin, AchieveCoin, vDinar (#1385, #1381, #1377, #1370, #1369, #1367) 2018-02-23 11:10:06 -05:00
Manfred Karrer
2183227cf7
Rename "MoneyBeam" to "MoneyBeam (N26)" (#1349) 2018-02-23 10:11:52 -05:00
Manfred Karrer
dac2b3f042
Change maxTradeLimitHighRisk to 0.16 BTC (#1347) 2018-02-23 10:07:22 -05:00
Manfred Karrer
82541e6fac
Add DeepOnion to main currencies list 2018-02-23 08:43:41 -05:00
Manfred Karrer
3e3fd3ab45
Remove DOGE as basecurrency 2018-02-23 08:35:41 -05:00
Manfred Karrer
6f342c8d5a
Add popup explaining trade limits #1388 2018-02-22 20:53:59 -05:00
Manfred Karrer
6b01493ded
Use 1 day for popmoney 2018-02-22 20:08:28 -05:00
Manfred Karrer
2389611c39
Re-enable national bank transfer for US 2018-02-22 19:54:13 -05:00