6749 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	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	9740a97bbf	Add missing translations for market provider info	2018-10-19 16:51:50 +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
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
Christoph Atteneder	86f39419de	Update scrollbar style	2018-10-17 10:55:50 +02:00
Christoph Atteneder	8cec4df80e	Fix merging error	2018-10-16 19:49:44 +02:00
Christoph Atteneder	95fa81361e	Merge branch 'master' of github.com:bisq-network/bisq into redesign	2018-10-16 19:45:50 +02:00
Manfred Karrer	dabe6907e1	Fix missing sorting	2018-10-16 12:40:10 -05: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	dd568111a5	Update translations without colons	2018-10-16 19:35:05 +02:00
Christoph Atteneder	aad26423e5	Replace two column text input with single floating input field	2018-10-16 19:33:01 +02:00
Christoph Atteneder	ad4b52f92a	Adapt ComboBox and CheckBox positioning and layout	2018-10-16 19:01:50 +02:00
Manfred Karrer	254059b411	Fix typo	2018-10-16 11:57:50 -05:00
Manfred Karrer	1fadef15ef	Merge branch 'ManfredKarrer-arbitration-system-improvements'	2018-10-16 11:51:24 -05: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
Manfred Karrer	2133b37837	Merge pull request #1706 from Mentors4EDU/List-EtherStone-(ETHS) ... List EtherStone (ETHS)	2018-10-15 12:30:59 -05:00
Manfred Karrer	6a6f648142	Merge pull request #1723 from blur-network/list-blur-asset ... List Blur (BLUR)	2018-10-15 12:29:57 -05:00
Manfred Karrer	3517c2f155	Merge pull request #1750 from CryptoForge/add-zero-asset ... List Zero (ZER)	2018-10-15 12:29:42 -05:00
Manfred Karrer	7a6cff6ba1	Merge pull request #1754 from Actinium-project/list-actinium ... List Actinium (ACM)	2018-10-15 12:29:21 -05:00
Manfred Karrer	f87cad7900	Merge pull request #1762 from ZirtysPerzys/list-drgl-asset ... List Dragonglass (DRGL)	2018-10-15 12:28:20 -05: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
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
Manfred Karrer	1163cebf91	Merge pull request #1751 from ManfredKarrer/Dao-UI-improvements ... Dao ui improvements	2018-10-12 18:31:24 -05:00
The Blur Network	2b39e604a9	List Blur (BLUR)	2018-10-11 17:03:34 -04: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	5879dd98df	Change log level for printing asset trade stats	2018-10-10 15:34:02 -05:00
Manfred Karrer	62a824653d	Update comments	2018-10-10 15:33:01 -05:00
Manfred Karrer	c3f508e24c	Adjust DAO params	2018-10-10 15:20:17 -05:00
Manfred Karrer	aeebae9297	Support trade fees defined DAO params ... - Use DAO Params to get the trade fees - Rename existing params - Add min fee values	2018-10-10 15:02:38 -05:00