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

1042 commits

Author SHA1 Message Date
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
Christoph Atteneder
0edbb1733c
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
#	desktop/src/main/java/bisq/desktop/util/FormBuilder.java
 2018-10-16 10:09:37 +02:00
Christoph Atteneder
8356266397
Update images 2018-10-16 10:05:22 +02:00
Devin Bileck
3d3045c4d6
Move when offerAvailabilityBusyAnimation is stopped 
Stop the offerAvailabilityBusyAnimation sooner, prior to showing
securityDepositInfo popup, when it is hiding related fields.
 2018-10-14 23:39:03 -07:00
sqrrm
7b72f10eb2
Add bonded reputation 2018-10-14 12:51:36 +02:00
Devin Bileck
b0e232097e
Hide text that is not applicable in take offer view 
When taking an offer that does not specify an amount range, hide
the "Check if offer is available" text.

Fixes https://github.com/bisq-network/bisq/issues/1742
 2018-10-13 22:38:34 -07:00
Devin Bileck
26d03afbb4
Fix currency not sorted when added back to ComboBox 
When removing a previously selected fiat or crypto currency, it was
adding it back to the bottom of the combobox rather than alphabetically.
So make sure to sort when adding a currency to the list.
 2018-10-13 21:51:20 -07:00
Devin Bileck
933b0b8277
Fix prompt text disappearing after selection 
After selecting an option from the combobox, it would no longer
display the prompt text and instead would be blank.

As per the documentation
https://docs.oracle.com/javase/10/docs/api/javafx/scene/control/ComboBoxBase.html#promptTextProperty:
> Prompt text is not displayed in all circumstances, it is dependent
> upon the subclasses of ComboBoxBase to clarify when promptText will be
> shown.

Therefore, use a custom buttonCell on the combo box to display the
prompt text.
 2018-10-13 21:43:14 -07:00
Devin Bileck
313971d7d8
Fix combobox selection using arrow keys 
Utilize the onHiding event rather than onAction event to prevent the
first option from being added when using arrow keys to navigate the
combobox. This will add the selected option when the combobox is
closing.
 2018-10-13 21:37:22 -07:00
sqrrm
b9d6b3a007
Add interface for BondedRole to allow for more generic bonds 2018-10-13 12:31:02 +02:00
sqrrm
b02daca85e
Don't show role type for bonded reputation 2018-10-13 12:29:41 +02:00
Devin Bileck
b1066d8fe1
Fix arbitrator language selection prompt text 
After selecting a language from the combobox, it would no longer
display the prompt text and instead would be blank.

As per the documentation
https://docs.oracle.com/javase/10/docs/api/javafx/scene/control/ComboBoxBase.html#promptTextProperty:
> Prompt text is not displayed in all circumstances, it is dependent
> upon the subclasses of ComboBoxBase to clarify when promptText will be
> shown.

Therefore, use a custom buttonCell on the combo box to display the
prompt text.
 2018-10-12 23:45:49 -07:00
Devin Bileck
cb42942d86
Fix arbitrator language selection using arrow keys 
To prevent the issue mentioned in
https://github.com/bisq-network/bisq/issues/354 where using arrow keys
to navigate the combobox would add the first language, utilize the
onHiding event rather than onAction event. This will add the selected
language when the combobox is closing.
 2018-10-12 23:35:37 -07:00
Devin Bileck
52a565a3b0
Workaround for labels being truncated at certain display scaling levels (JDK-8199592) 
As per the workaround mentioned in https://bugs.java.com/bugdatabase/view_bug.do?bug_id=JDK-8199592, explicitly calling sizeToScene appears to suppress the bug at DPI levels other than 175%.
 2018-10-10 23:49:58 -07:00
Manfred Karrer
c8f0098b2b
Add comments, cleanups 2018-10-10 14:03:53 -05:00
Manfred Karrer
d2c98438ab
Merge branch 'master' into Dao-UI-improvements 2018-10-10 00:45:08 -05:00
Manfred Karrer
a63d1cc580
Merge remote-tracking branch 'upstream/master' 2018-10-10 00:43:51 -05:00
Manfred Karrer
56965c1904
Merge pull request #1765 from devinbileck/cancel-wallet-password-prompt 
Show cancel button in wallet password prompt
 2018-10-10 00:42:59 -05:00
Manfred Karrer
db3cd329b9
Add VoteResultExceptionHandler 2018-10-09 23:31:43 -05:00
Devin Bileck
1d179544f6
Hide the forgot password button in the SeedWordsView 2018-10-09 00:14:43 -07:00
Devin Bileck
c76fd598cd
Reworked implementation so as not to affect other uses of the 
WalletPasswordWindow
 2018-10-08 23:08:17 -07:00
Manfred Karrer
58e6db0a25
Persist DecryptedBallotsWithMeritsList 2018-10-08 20:13:22 -05:00
Manfred Karrer
4cc17feace
Persist EvaluatedProposalList 2018-10-08 19:47:54 -05:00