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

126 commits

Author SHA1 Message Date
Christoph Atteneder
1082340701
Adapt user avatar info popup 2018-11-07 19:54:19 +01:00
Christoph Atteneder
78e01f92da
Clean up TradeDetailsWindow 2018-11-07 16:48:32 +01:00
Christoph Atteneder
3887d4b49c
Merge pull request #1892 from ripcurlx/adapt-trade-process 
Redesign: Adapt trade process
 2018-11-07 16:11:45 +01:00
Christoph Atteneder
729eacd6d0
Adapt trade process to new design 2018-11-07 14:43:00 +01:00
Manfred Karrer
3a03deb83a
Cleanup translation string for bond domain 2018-11-06 22:46:27 -05:00
Manfred Karrer
bee2d1ebd3
Cleanup bond domain 2018-11-06 14:58:12 -05:00
Manfred Karrer
edc1a35b15
Merge branch 'release-candidate-0.9.0' into complete-bonded-roles-impl 2018-11-06 12:40:50 -05:00
Manfred Karrer
c5630eec0f
Add support for confiscation of bonds 2018-11-06 00:42:17 -05:00
Manfred Karrer
8e3864589a
Complete bonds view 2018-11-05 21:26:00 -05:00
Manfred Karrer
7bf5c819cd
Implements bonded reputation 
Still WIP with many areas...
 2018-11-05 18:35:30 -05:00
Christoph Atteneder
d7f72c158b
Adapt TakeOffer to new design 2018-11-05 18:51:17 +01:00
Christoph Atteneder
4ed6989217
Adapt arbitrator registration view 2018-11-05 09:35:28 +01:00
Manfred Karrer
15b8f02c67
Work on bonded reputation (WIP) 2018-11-02 19:31:31 -05:00
Manfred Karrer
8ce8813e89
Complete handling of bonds for roles. 
- Add BondedRoleState to reflect all diff. states.
- Show in UI correct state and button state for lockup/revoke
- Rename ProposalService classes to ProposalFactory
 2018-11-02 16:09:53 -05:00
Manfred Karrer
32f709c2c9
Merge pull request #1858 from ripcurlx/create-offer-adaptions 
Redesign: Create Offer flow adaptions
 2018-11-02 11:40:19 -05:00
Christoph Atteneder
3167195f85
Different clean up tasks in the create offer process 2018-11-02 16:30:42 +01:00
Manfred Karrer
bc82974996
Merge branch 'master' into release-candidate-0.9.0 2018-11-01 12:49:49 -05:00
Manfred Karrer
ae85969fe1
Fix wrong linebreaks 2018-11-01 12:49:35 -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
d92e0dd5bd
Add translation strings for roles 2018-10-31 14:30:14 -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
Christoph Atteneder
454ed6714a
Adapt OfferDetailsWindow to match design template 2018-10-31 17:35:21 +01:00
Christoph Atteneder
5221d766aa
Reintroduce more detailed tooltip for price provider 2018-10-31 15:17:35 +01: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
0c9a1ad1a7
Fix layout 2018-10-30 20:27:34 -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
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
ac11888ec0
Add non-DAO version for fee display 2018-10-28 15:29:49 -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
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
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
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00