Manfred Karrer
f005f22cba
Merge branch 'ripcurlx-redesign' into release-candidate-0.9.0
2018-10-27 22:28:33 -05:00
Manfred Karrer
df0f4887f8
Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/util/FormBuilder.java
2018-10-27 22:28:02 -05:00
Manfred Karrer
5ac35284ef
Fix test
2018-10-27 18:43:50 -05:00
Manfred Karrer
3884607114
Add fee toggle in create offer screen
...
Implementation is not complete yet. It is missing the handling for the
not BSQ enabled case and applying to to the take offer screen.
2018-10-27 17:52:50 -05:00
Manfred Karrer
1d5bd2ccbc
Add don't show again checkbox to noPriceFeedAvailable popup
2018-10-27 13:54:03 -05:00
Manfred Karrer
187f539907
Adjust BSQ fee to current BTC price
...
We assumed a BTC price of 10 000 USD and a BSQ rice of 1 USD to get a
90% discount if the user choose the BSQ fee. As BTC price is more in
the 6000 USD range we adjust the BSQ fee to stick with the 90% discount.
2018-10-27 13:53:32 -05:00
Manfred Karrer
cc446fb707
Add warning popup for cash deposit
2018-10-26 21:48:41 -05:00
Manfred Karrer
235e2fa9f1
Add fiat amount to trade fees at maker
2018-10-26 17:29:39 -05:00
Manfred Karrer
dd5b16ed4d
Merge pull request #1821 from ripcurlx/clean-up-payment-method-forms
...
Clean up all payment method forms
2018-10-26 10:56:21 -05:00
Christoph Atteneder
ea73cbab76
Merge branch 'release-candidate-0.9.0' of github.com:bisq-network/bisq into clean-up-payment-method-forms
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/util/FormBuilder.java
2018-10-26 17:35:04 +02:00
Christoph Atteneder
de6678edcd
Merge pull request #1819 from ManfredKarrer/adjustments-with-redesign
...
Adjustments with redesign
2018-10-26 17:25:34 +02:00
Christoph Atteneder
f3019b7494
Clean up ClearXchangeForm (Zelle)
2018-10-26 17:23:35 +02:00
Christoph Atteneder
8ac43d85e1
Clean up WesternUnionForm
2018-10-26 17:22:02 +02:00
Christoph Atteneder
7073e44f19
Clean up WeChatPayForm, PerfectMoneyForm and AliPayForm
2018-10-26 17:20:35 +02:00
Christoph Atteneder
c183741fba
Inline unused flag
2018-10-26 17:11:27 +02:00
Christoph Atteneder
73a99107e6
Clean up USPostalMoneyOrderForm
2018-10-26 16:39:59 +02:00
Christoph Atteneder
0d85252960
Clean up UpholdForm
2018-10-26 16:38:25 +02:00
Christoph Atteneder
25bffbafac
Clean up SwishForm
2018-10-26 16:35:53 +02:00
Christoph Atteneder
8c5ab57eb0
Clean up SpecificBankForm
2018-10-26 16:34:25 +02:00
Christoph Atteneder
9395e5cef5
Clean up SepaForm and SepaInstantForm
2018-10-26 16:27:47 +02:00
Manfred Karrer
1175320ed1
Add comment
2018-10-25 21:58:02 -05:00
Manfred Karrer
4f52f227d6
Small UI improvements
...
- Remove arrow for show all and edit list
- Remove colons
- Remove progressbar style in dao phases
2018-10-25 21:52:41 -05:00
Manfred Karrer
80cb50a717
Remove colons, remove progressbar style in dao phases
2018-10-25 21:16:21 -05:00
Manfred Karrer
2953b989d1
Fix tab navigation issue
2018-10-25 21:14:49 -05:00
Manfred Karrer
fb4c0f5105
Fix merge errors
2018-10-25 20:11:29 -05:00
Manfred Karrer
8912f71392
Merge branch 'ripcurlx-redesign' into release-candidate-0.9.0
2018-10-25 19:59:31 -05:00
Manfred Karrer
6b10cf7072
Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
# desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
2018-10-25 19:59:10 -05:00
Manfred Karrer
7969374a4a
Merge branch 'redesign' of https://github.com/ripcurlx/bisq-desktop into ripcurlx-redesign
...
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
# desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java
2018-10-25 19:59:00 -05:00
Manfred Karrer
3239b401ae
Merge pull request #1817 from devinbileck/update-install-script
...
Refine the unix install script
2018-10-25 19:47:17 -05:00
Christoph Atteneder
8ecd53fab4
Cleanup SameBankForm
2018-10-25 17:06:11 +02:00
Christoph Atteneder
543559f0d4
Clean up RevolutForm
2018-10-25 17:04:38 +02:00
Christoph Atteneder
05277f8c5e
Clean up PerfectMoneyForm
2018-10-25 17:01:16 +02:00
Christoph Atteneder
1134ce178c
Clean up BankForm
2018-10-25 16:49:56 +02:00
Christoph Atteneder
c2b593f668
Clean up MoneyGramForm
2018-10-25 14:39:38 +02:00
Christoph Atteneder
dd72b9162e
Clean up MoneyBeamForm
2018-10-25 14:07:21 +02:00
Christoph Atteneder
bedf8454ca
Clean up InteracETransferForm and remove all resource access with additional colon
2018-10-25 14:06:11 +02:00
Christoph Atteneder
a2b39e8a34
Clean up FasterPaymentsForm
2018-10-25 14:01:04 +02:00
Christoph Atteneder
aed3ffeca1
Clean up F2FForm
2018-10-25 13:56:51 +02:00
Christoph Atteneder
25d6df4786
Clean up ChaseQuickPayForm
2018-10-25 13:50:04 +02:00
Christoph Atteneder
c3239f1c74
Show buttons after group
2018-10-25 12:27:56 +02:00
Christoph Atteneder
7e5e9cb588
Use abstract method to apply TradeCurrency
2018-10-25 12:27:36 +02:00
Christoph Atteneder
d9b11ab647
Remove colons in labels
2018-10-25 12:19:00 +02:00
Christoph Atteneder
23ab1c3cfe
Fix wrong column span
2018-10-25 12:11:28 +02:00
Christoph Atteneder
e99d860f16
Clean up CashDeposit Form and all changes related
2018-10-25 12:11:10 +02:00
Christoph Atteneder
d0ed219484
Comment out unused code block
2018-10-25 10:50:26 +02:00
Devin Bileck
eb879ef495
Merge remote-tracking branch 'remotes/upstream/master' into update-install-script
2018-10-24 23:49:46 -07:00
Devin Bileck
f6e6512c9e
Refine unix install script
2018-10-24 23:40:24 -07:00
Manfred Karrer
5113ccc7fc
Merge pull request #1813 from ManfredKarrer/add-reimbursement-proposal
...
Add support for reimbursement requests
2018-10-24 18:29:17 -05:00
sqrrm
7be08fee9c
FIx typo
...
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:33 -05:00
sqrrm
c463768856
Add comment
...
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:08 -05:00
