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

2261 commits

Author SHA1 Message Date
Manfred Karrer
4094ff99a8
Add equals and hashCode methods to classes which use enums as fields 
Enums must not be used directly for hashCode or equals as it delivers
the Object.hashCode (internal address)!
The equals and hashCode methods cannot be overwritten in Enums.
It was only applied to classed which are used as value objects and
potentially are used in Sets or other context which involve usage of
equals or hashCode
 2018-11-01 13:40:07 -05:00
Manfred Karrer
6ef9ba00db
Add printStackTrace if resource not found 2018-11-01 12:48:41 -05:00
Manfred Karrer
0d481ac084
Fix wrong linebreaks 2018-11-01 12:48:21 -05:00
Manfred Karrer
b3b080cfb2
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:04:23 -05:00
Manfred Karrer
b55ba273a1
Merge pull request #1829 from arunasurya/2018-10-04-fix-grammar 
Improve grammar of Background Info
 2018-11-01 12:03:07 -05:00
Aruna Surya
6dd193b0f0
Improve grammar of Background Info 2018-11-01 08:16:38 +01:00
Manfred Karrer
3c5a1dabe0
WIP bonded roles 2018-10-31 18:23:45 -05:00
Manfred Karrer
bdbcc5e7fd
Add dev values for lock time and proposal phase 2018-10-31 14:30:54 -05:00
Manfred Karrer
d92e0dd5bd
Add translation strings for roles 2018-10-31 14:30:14 -05:00
Manfred Karrer
80066bda8c
Merge branch 'release-candidate-0.9.0' into sqrrm-bonded-reputation 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/BondingViewUtils.java
 2018-10-31 13:51:15 -05:00
Manfred Karrer
ad8a77d98d
Cleanup 2018-10-31 13:48:54 -05:00
Manfred Karrer
e14508055c
Fix merge errors 2018-10-31 13:23:38 -05:00
Manfred Karrer
c1768592a6
Merge pull request #1850 from ManfredKarrer/add-more-bonded-roles 
Add more bonded roles
 2018-10-31 13:18:24 -05:00
Manfred Karrer
a8b833c285
Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation 
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java
#	core/src/main/java/bisq/core/dao/DaoFacade.java
#	core/src/main/java/bisq/core/dao/governance/role/BondedRole.java
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/lockup/LockupView.java
 2018-10-31 13:17:57 -05:00
Manfred Karrer
3e81c6008b
Add more bonded roles 2018-10-31 12:59:08 -05:00
Christoph Atteneder
1540a2ee50
Clean up funds section 2018-10-31 11:18:11 +01:00
Christoph Atteneder
1057739f7a
Remove colons in network settings 2018-10-31 09:37:11 +01:00
Manfred Karrer
2d3269a07a
Add getBsqPrice method to PriceFeedService 2018-10-30 20:46:26 -05:00
Manfred Karrer
0c9a1ad1a7
Fix layout 2018-10-30 20:27:34 -05:00
Manfred Karrer
5ced4e8927
Use param type for switch cases 2018-10-30 20:27:21 -05:00
Manfred Karrer
8049588bc1
Use param type for switch cases 
- Add maxDecrease and maxIncrease properties to param
 2018-10-30 20:27:04 -05:00
Manfred Karrer
944acc9e93
Fix layout for governance screens 2018-10-30 18:49:04 -05:00
Manfred Karrer
090199c0c2
Fix layout for wallet screens 2018-10-30 17:28:11 -05:00
Manfred Karrer
526a9f5442
Merge branch 'master' into release-candidate-0.9.0 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/components/paymentmethods/InteracETransferForm.java
 2018-10-30 14:03:12 -05:00
Manfred Karrer
423ac38bd4
Merge pull request #1842 from ManfredKarrer/fix-dao-layout-issues 
Adjust layout with new design
 2018-10-30 13:32:11 -05:00
Jeffrey Ko
ee51292d87
add interac e-transfer question/answer validation 2018-10-30 21:53:32 +07:00
Manfred Karrer
8566765996
Adjust layout with new design (WIP) 
- on css there are some changes marked with MK. @Christoph - please
check if those are ok for you, otherwise lets discuss...
- in Formbuilder there is removed the automatic setting of the column
span and index
- Add support for columnIndex as parameter
- setMouseTransparent for addTopLabelTextField is removed (we want that
user can copy text)
- Adjustments in the DAO code are WIP and can be ignored by @Christoph
 2018-10-30 01:06:59 -05:00
Manfred Karrer
2ba68a13b8
Fix missing param in test class 2018-10-29 21:47:57 -05:00
Manfred Karrer
dbbbf1717b
Merge branch 'release-candidate-0.9.0' into make-param-value-string 2018-10-29 21:43:11 -05:00
Manfred Karrer
ea33899123
Add BTC recipient address to params 
- Change type of param value from long to string for more flexibility
- Add BTC recipient address param
- Add validation, refactor param value formatter and param value parser
 2018-10-29 21:32:16 -05: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
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
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
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
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
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
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
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
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
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00