mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,222 Commits 4 Branches 148 Tags 4.3 GiB
5e06153e49
Commit Graph

414 Commits

Author SHA1 Message Date
Christoph Atteneder
3167195f85
Different clean up tasks in the create offer process 2018-11-02 16:30:42 +01:00
Christoph Atteneder
b6fce24d0f
Use different style during when input is available and when read only to reduce height 2018-11-02 14:34:44 +01:00
Manfred Karrer
a3e01759b0
Moving classes 
That was a big commit with restructuring the packages and classes.
Motivation was to isolate the daoState value objects so it is more clear
which data are help in the daoState. As it was hard to keep an overview
and easy to add mutable data I think that makes it more safe overall.
I am aware that the downside to take out domain models from the domain
packages is not so nice.
Also moved blockchain models to parser and full node packages.
 2018-11-01 17:11:40 -05:00
Manfred Karrer
8dabd555c8
Move service classes out of daostate package 
- we want to have only those classes in the daoState package which are
stored in the daoState and immutable
 2018-11-01 16:13:24 -05:00
Manfred Karrer
2575a0aa90
Rename BondedRoleProposal and service 2018-11-01 15:29:07 -05:00
Manfred Karrer
111df6e679
Rename BondedRoleState to BondedRole 2018-11-01 15:24:06 -05:00
Manfred Karrer
8b3c06fb81
Rename BondedRole to Role 
This is the first of a series of renaming commits. We want to use role
for  the immutable class and BondedRole for the wrapper which contains
role and the mutable state.
 2018-11-01 15:22:50 -05:00
Manfred Karrer
e41be44e9c
Remove mutable data from BondedRole 
Use BondedRoleState to hold the mutable data. Store the BondedRoleState
in a local map.
 2018-11-01 15:20:35 -05:00
Manfred Karrer
dbddb46bf6
Remove BondedRoleList 
- We store the bonded roles in the evaluated proposals in the dao state.
From there we can get the bonded role object as it is part of the
bonded role proposal. Though we need to take that data immutable
(next commit will handle that)
 2018-11-01 13:58:49 -05:00
Manfred Karrer
3c5a1dabe0
WIP bonded roles 2018-10-31 18:23:45 -05:00
Manfred Karrer
f45517a237
Update to changed getter 2018-10-31 13:52:39 -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
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
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
1b4891eb1c
Fix vertical alignment in table views 2018-10-31 11:34:01 +01:00
Christoph Atteneder
1540a2ee50
Clean up funds section 2018-10-31 11:18:11 +01:00
Christoph Atteneder
797c935a28
Use TextField with label on top 2018-10-31 09:37:10 +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
df15399fdc
Fix bonding views 2018-10-30 18:57:55 -05:00
Manfred Karrer
3d3a1acad6
Rename classes 2018-10-30 18:49:48 -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
5b946be713
Increase font size of group header to 1.308em 2018-10-30 15:53:28 -05:00
Manfred Karrer
6fe3cb7eda
Fix merge issues 2018-10-30 14:58:09 -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
Manfred Karrer
ef3e4ba905
Fix issue with not applied error msg in validator 2018-10-30 13:14:19 -05:00
Manfred Karrer
6902f9aa0d
Use 1.231em for group header font size 2018-10-30 13:14:01 -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
Manfred Karrer
36838804c8
Merge pull request #1835 from ripcurlx/cleanup-altcoin-payment-accounts 
Clean up Altcoin payment accounts
 2018-10-29 10:58:21 -05:00
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
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
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
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
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
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
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
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
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
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
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00
Christoph Atteneder
45060575bd
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/dao/governance/ProposalDisplay.java
#	desktop/src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
 2018-10-24 13:52:49 +02:00
Manfred Karrer
538538ec34
FIx missing arguments in test, Ignore test (JMockit issue) 
@Christoph Can you have a look why JMockit is not working anymore
in that module? TradesChartsViewModel is null and creates a nullpointer.
Adding RunWith("JMockit") as it was earlier does not work with changed gradle file
with newer JMockit version.
 2018-10-23 13:13:36 -05:00
Manfred Karrer
0bbafc070b
Use FormBuilder.getIcon instead of AwesomeDude.createIconLabel 2018-10-23 11:58:41 -05:00
Manfred Karrer
7228228dc7
Merge branch 'master' into DAO-UI-hide-details 2018-10-23 11:52:44 -05:00
Christoph Atteneder
15aa9c9e30
Updated Components Demo 2018-10-23 18:20:01 +02:00
Christoph Atteneder
0c01093614
Style main state of account sub views to match design template and refactor GUI stuff on the way 2018-10-23 17:46:56 +02:00
Christoph Atteneder
4974cefb38
Use tabs instead of toggle group in account section 2018-10-23 15:59:50 +02:00
Christoph Atteneder
3dad02e485
Add missing JFoenix library removed during merge 2018-10-23 10:22:01 +02:00
Christoph Atteneder
80544d52f4
Remove module configuration for openjfx libraries as they are not used as Java 9 modules. 2018-10-23 10:15:59 +02:00
Christoph Atteneder
cdaba9d15d
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	desktop/build.gradle
 2018-10-23 09:22:31 +02:00
Manfred Karrer
2c26702c14
Merge pull request #1802 from ManfredKarrer/move-javafx-dep-to-core 
Move javafx dependencies to core
 2018-10-22 13:22:43 -05:00
Manfred Karrer
871e776509
Move javafx dependencies to core 
We use some javafx (Properties,...) classes in core as well, so we need
to have the dependency resolved there already.
 2018-10-22 13:17:06 -05:00
Christoph Atteneder
3f04be9d30
Remove openjfx checksum until implementation for platform specific libraries is finished 2018-10-22 19:57:25 +02:00
Christoph Atteneder
db2cda1355
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	desktop/build.gradle
 2018-10-22 19:27:31 +02:00
Christoph Atteneder
4fe45d3b8b
Remove platform specific libraries in checksum 2018-10-22 18:58:19 +02:00
Christoph Atteneder
01cf2a46cb
Adapt preference view to match design template 2018-10-22 17:47:01 +02:00
Christoph Atteneder
ba2277fcc5
Use top lable with list 2018-10-22 17:46:27 +02:00
Christoph Atteneder
e475147ebe
Use SlideToggleButton 2018-10-22 17:45:44 +02:00
Christoph Atteneder
adae6519f7
Add fixes for not shown combobox selection values 2018-10-22 15:24:15 +02:00
Christoph Atteneder
f9478a5afc
Show error below textinput instead of popup 2018-10-22 11:57:32 +02:00
Christoph Atteneder
6f1e74c780
Remove unnecessary padding to prevent scolling 2018-10-22 10:53:12 +02:00
Christoph Atteneder
549163616e
Display currency name in combobox list also when no offers are available 2018-10-22 10:48:36 +02:00
Christoph Atteneder
ecf8e05889
Remove unused converter 2018-10-22 10:47:56 +02:00
Christoph Atteneder
c231187daa
Add checksums for new openjfx libraries 2018-10-22 09:42:35 +02:00
Manfred Karrer
7e64cd2348
Update link 2018-10-20 11:30:34 -05:00
Devin Bileck
5ae96b74b1
Remove unnecessary content from build.gradle 2018-10-20 08:25:17 -07:00
Manfred Karrer
168a15b5a1
Add full node mode and rpc data to settings 
- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
 2018-10-19 23:43:07 -05:00
Manfred Karrer
75e0daefbf
Merge branch 'master' into DAO-UI-hide-details 2018-10-19 21:01:53 -05:00
Manfred Karrer
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05:00
Devin Bileck
48c196b5d1
Switch to OpenJDK10 in Gradle builds 
Oracle JDK10 is EOL and is no longer available for download.
So switch to OpenJDK10 in Gradle builds.
 2018-10-19 15:46:01 -07:00
Christoph Atteneder
4fbf857490
Fix column constraints in PreferencesView 2018-10-19 16:53:30 +02:00
Christoph Atteneder
2df89348e8
Use currency and payment method combobox renderer in OfferBookView 2018-10-19 16:53:01 +02:00
Christoph Atteneder
4f9ff4412a
Use new currency factories 2018-10-19 15:56:53 +02:00
Christoph Atteneder
10f1c795a5
Merge market price and provider 2018-10-19 15:29:46 +02:00
Manfred Karrer
29ae886ed8
Merge pull request #1778 from ManfredKarrer/Dao-UI-improvements 
Persitence of DAO state
 2018-10-18 16:15:28 -05:00
Christoph Atteneder
dc1f59a49e
Adapt new tabs style 2018-10-18 16:35:14 +02:00
Christoph Atteneder
e74ee8ec29
Adapt header to new design 2018-10-18 11:46:21 +02:00
Manfred Karrer
b47678d865
Add DAO resync option to preferences 2018-10-17 22:10:40 -05:00
Manfred Karrer
10fcd622e5
Remove BREAK4 2018-10-17 17:45:02 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Christoph Atteneder
86f39419de
Update scrollbar style 2018-10-17 10:55:50 +02:00
Christoph Atteneder
9ce8b215e1
Merge pull request #1775 from devinbileck/fix-take-offer-view 
Hide text that is not applicable in take offer view
 2018-10-17 10:17:31 +02:00
Manfred Karrer
6d18a9ea78
Rename BsqState to DaoState 2018-10-17 00:13:42 -05:00
Manfred Karrer
a308469ac6
Support for persisted bsqState as resource file 
- Move DecryptedBallotsWithMerits list and EvaluatedProposal list to
BsqState

- Use StoreService for handling persistence of snapshots
 2018-10-16 23:21:11 -05:00
Devin Bileck
5e27cbb2f6
Fix field visibility for fixed amount offer 2018-10-16 14:52:41 -07:00
Christoph Atteneder
8cec4df80e
Fix merging error 2018-10-16 19:49:44 +02:00
Christoph Atteneder
29adc6b472
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
 2018-10-16 19:38:16 +02:00
Christoph Atteneder
aad26423e5
Replace two column text input with single floating input field 2018-10-16 19:33:01 +02:00
Devin Bileck
d435afdd03
Merge remote-tracking branch 'upstream/master' into fix-take-offer-view 2018-10-16 10:06:11 -07:00
Christoph Atteneder
ad4b52f92a
Adapt ComboBox and CheckBox positioning and layout 2018-10-16 19:01:50 +02:00
Manfred Karrer
ce5a8b4f19
Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
 2018-10-16 11:48:11 -05:00
Manfred Karrer
dc6c25ed81
Merge branch 'master' into arbitration-system-improvements 2018-10-16 11:32:07 -05:00
Christoph Atteneder
fbb5b8e8d2
Use single ComboBox instead of additional label 2018-10-16 14:41:42 +02:00
Christoph Atteneder
0e304f99fe
Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-16 12:17:42 +02:00
Christoph Atteneder
05c47ae1d6
Merge pull request #1767 from devinbileck/labels-truncated-with-display-scaling 
Workaround for JDK-8199592; text being truncated at certain display scaling levels
 2018-10-16 12:16:30 +02:00
Christoph Atteneder
ad5e2329ce
Merge pull request #1774 from devinbileck/fix-preferences-view-combobox-selection 
Fix preferences view combobox selection
 2018-10-16 12:08:19 +02:00
Christoph Atteneder
866ea007dd
Merge pull request #1771 from devinbileck/fix-arbitrator-language-selection 
Fix arbitrator language selection
 2018-10-16 12:00:04 +02:00
Christoph Atteneder
73abc43739
Replace missing icons 2018-10-16 10:35:38 +02:00
Christoph Atteneder
1cfae14a21
Adding missing import 2018-10-16 10:27:19 +02:00