mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity
7241 commits 3 branches 150 tags 4.1 GiB
Commit graph

7241 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
9e0ada6337
Merge pull request #1836 from ripcurlx/merge-master-into-release-branch 
Merge master into release branch
 2018-10-29 10:57:46 -05:00
Manfred Karrer
a77be13e03
Merge pull request #1839 from ripcurlx/minor-fixes 
Minor ui fixes
 2018-10-29 10:56:56 -05:00
Christoph Atteneder
c031f68ddc
Clean up settings screens 2018-10-29 16:49:06 +01:00
Christoph Atteneder
71d64b19da
Clean up account section 2018-10-29 15:39:03 +01:00
Christoph Atteneder
f224f38050
Remove border focus in lists 2018-10-29 12:21:37 +01:00
Christoph Atteneder
f04ffafb89
Reduce padding for buttons within tables 2018-10-29 12:12:36 +01:00
Christoph Atteneder
0994bb96b9
Reposition Buy/Sell button 2018-10-29 12:12:00 +01:00
Christoph Atteneder
788bce0ff7
Clean up PromptPayForm 2018-10-29 11:14:37 +01:00
Christoph Atteneder
7d5e795714
Merge branch 'master' of github.com:bisq-network/bisq into merge-master-into-release-branch 
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
 2018-10-29 11:14:07 +01:00
Christoph Atteneder
55133ef117
Merge pull request #1822 from ManfredKarrer/add-cash-depoist-warning 
Add warning popup for cash deposit
 2018-10-29 10:59:30 +01:00
Christoph Atteneder
db540ab2e9
Clean up CryptoCurrencyForm 2018-10-29 10:55:31 +01:00
Christoph Atteneder
44a858becc
Clean up AccountsViews 2018-10-29 09:34:40 +01:00
Manfred Karrer
9b9fab2732
Merge branch 'release-candidate-0.9.0' into add-fiat-amount-to-fee 2018-10-28 22:11:01 -05:00
Manfred Karrer
509c3d1e10
Add trade fee display to take offer screen 
As take offer screen is WIP the fee display is also just a raw draft.
For the DAO state we should add a new group for the fee selection as
it is a bit lost in between the other fields...
 2018-10-28 17:01:44 -05:00
Manfred Karrer
ac11888ec0
Add non-DAO version for fee display 2018-10-28 15:29:49 -05:00
Manfred Karrer
b5568b8f1c
Move fee toggle outside of box 2018-10-28 14:48:09 -05:00
Manfred Karrer
1350413050
Add filter for not adding null entries 2018-10-28 12:45:10 -05:00
Manfred Karrer
8ab9c2839d
Merge pull request #1831 from leshik/th-promptpay-integration 
Add PromptPay (Thailand)
 2018-10-28 12:42:18 -05:00
Alexey Zagarin
0b8f6c17e2 Add PromptPay (Thailand) 
Closes https://github.com/bisq-network/payment-methods/issues/6.
 2018-10-28 20:25:37 +07:00
Manfred Karrer
e266232b17
Merge branch 'release-candidate-0.9.0' of https://github.com/bisq-network/bisq into release-candidate-0.9.0 2018-10-27 22:31:03 -05:00
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
Sotiris Blad
425b85a9b3
List MonetaryUnit (MUE) 2018-10-27 21:26:37 +03: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