6723 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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	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
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
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
Devin Bileck	35f0fcf914	Fix typos in PeerManager	2018-10-11 23:54:19 -07: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
Manfred Karrer	048767af1a	Make ProposalConsensus and CompensationConsensus methods static	2018-10-10 14:28:49 -05:00
Manfred Karrer	4b9073ce8a	Rename support for other base currencies in getDefaultMinFeePerByte	2018-10-10 14:28:03 -05:00
Manfred Karrer	965d741657	Rename fields and params	2018-10-10 14:21:11 -05:00
Manfred Karrer	8e22916914	Adjust comments	2018-10-10 14:18:56 -05:00
Manfred Karrer	923aaf6cdc	Remove other base currencies from FeeService	2018-10-10 14:06:24 -05:00
Manfred Karrer	c8f0098b2b	Add comments, cleanups	2018-10-10 14:03:53 -05:00
Manfred Karrer	280af36fc5	Reduce default btc miner fee from 200 to 50 sat/byte	2018-10-10 13:47:26 -05:00
Manfred Karrer	e99d733642	Remove PHASE_BREAK4, adjust phase periods and fees	2018-10-10 13:39:51 -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
Manfred Karrer	9b40306d9a	Add handling for missing proposal data	2018-10-09 22:32:03 -05:00
Manfred Karrer	5141806509	Add handling for missing blindVote data	2018-10-09 22:00:02 -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
Devin Bileck	269912d1bb	Show cancel button in wallet password prompt	2018-10-08 15:51:36 -07:00
Manfred Karrer	d279dae032	Rename chainHeadHeight to chainHeight	2018-10-08 11:22:57 -05:00
Manfred Karrer	57355f2b19	Merge branch 'Dao-UI-improvements'	2018-10-08 11:18:42 -05:00
Manfred Karrer	d87bbf9318	Merge pull request #1763 from ManfredKarrer/tx-broadcaster-fix ... Tx broadcaster fix	2018-10-08 07:10:52 -05:00
Manfred Karrer	7f8a90d1cd	Merge pull request #1764 from ManfredKarrer/remove_okpay ... Deactivate OKPay as it does not exist anymore	2018-10-08 07:10:41 -05:00
Manfred Karrer	8232eeecd8	Deactivate OKPay as it does not exist anymore ... OkPay seems to have rebranded to Weezzo. The OkPay webpage is offline but some links go to Weezzo. Seems pretty unprofessional hwo they did the move... Seems they have been involved with BTC-e… https://bitcointalk.to/index.php?topic=2094721.0	2018-10-07 21:54:00 -05:00