6613 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manfred Karrer	5141806509	Add handling for missing blindVote data	2018-10-09 22:00:02 -05: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
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
Manfred Karrer	be1f177fc7	Increase timeout to 30 sec	2018-10-07 17:40:44 -05:00
Manfred Karrer	85c80bcd5c	Remove the maybeCommitTx call at timeout	2018-10-07 17:40:01 -05:00
Manfred Karrer	5dfbb6d596	Merge branch 'master' into Dao-UI-improvements	2018-10-07 00:46:48 -05:00
Manfred Karrer	7d9a53adc9	Merge pull request #1749 from ManfredKarrer/small-fixes ... Small fixes	2018-10-07 00:45:44 -05:00
Manfred Karrer	6bcbfe7ce3	Merge branch 'master' into Dao-UI-improvements	2018-10-05 15:23:07 -05:00
Manfred Karrer	8c85a1bab5	Merge branch 'master' into small-fixes	2018-10-05 15:21:14 -05:00
Manfred Karrer	e2c830e632	Merge pull request #1657 from neoscoin/list-neos-coin ... List Neos (NEOS)	2018-10-05 15:19:45 -05:00
Manfred Karrer	7a22958523	Merge branch 'master' of https://github.com/xwebnetwork/bisq into xwebnetwork-master ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:13:48 -05:00
Manfred Karrer	f197cc0d82	Merge branch 'master' of https://github.com/xwebnetwork/bisq into xwebnetwork-master ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:13:44 -05:00
Manfred Karrer	881ee1949f	Merge pull request #1667 from greenblockcoin/list-greenblockcoin ... List Greenblockcoin (GBK)	2018-10-05 14:11:23 -05:00
Manfred Karrer	93ffa7ef6d	Merge branch 'list-pzdc-coin' of https://github.com/pzdc-project/bisq into pzdc-project-list-pzdc-coin ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:09:50 -05:00
Manfred Karrer	0fe8216418	Merge branch 'list-pzdc-coin' of https://github.com/pzdc-project/bisq into pzdc-project-list-pzdc-coin ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:09:46 -05:00
Manfred Karrer	e92c9a0e48	Merge branch 'list-qrl-asset' of https://github.com/scottdonaldau/bisq into scottdonaldau-list-qrl-asset ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:04:49 -05:00
Manfred Karrer	6c4b56d880	Merge branch 'list-qrl-asset' of https://github.com/scottdonaldau/bisq into scottdonaldau-list-qrl-asset ... # Conflicts: # assets/src/main/resources/META-INF/services/bisq.asset.Asset	2018-10-05 14:04:34 -05:00
Manfred Karrer	b40621cc46	Merge pull request #1653 from alaniz3/list-kekcoin ... List Kekcoin (KEK)	2018-10-05 14:02:04 -05:00
Manfred Karrer	063479b83c	Merge pull request #1654 from Alexqsd/list-loki-asset ... List Loki (LOKI)	2018-10-05 14:01:50 -05:00
Manfred Karrer	a81ad4a42e	Merge pull request #1656 from mobitglobal/mobitglobal-asset ... List MobitGlobal (MBGL)	2018-10-05 14:01:31 -05:00
Manfred Karrer	adbe7fe1a4	Merge pull request #1665 from Technohacker/list-ryo-asset ... List Ryo (RYO)	2018-10-05 14:00:35 -05:00
Manfred Karrer	72ea006c3a	Merge pull request #1662 from BTC2CoreDevs/list-bitcoin2-asset ... List Bitcoin 2 (BTC2)	2018-10-05 14:00:12 -05:00
Manfred Karrer	2a68bd1307	Merge pull request #1691 from ridd84/list-croat-asset ... List Croat (CROAT)	2018-10-05 13:57:53 -05:00
Manfred Karrer	77324ef41f	Merge pull request #1668 from DATSEC/list-starwels-asset ... List Starwels (MAI)	2018-10-05 13:57:37 -05:00
Manfred Karrer	518f31cb1d	Merge pull request #1687 from RocksteadyTC/master ... List TurtleCoin (TRTL)	2018-10-05 13:57:09 -05:00
Manfred Karrer	95d7ea2e1c	Merge pull request #1697 from SuB1X-Coin/list-sub1x-asset ... List SUB1X (SUB1X)	2018-10-05 13:56:55 -05:00
Manfred Karrer	5774a69f5a	Merge pull request #1741 from project-qmc/list-qmcoin ... List QMCoin	2018-10-05 13:56:41 -05:00
Manfred Karrer	b8a1a4c837	Merge pull request #1745 from egyware/master ... List Chaucha (CHA)	2018-10-05 13:56:27 -05:00
Manfred Karrer	f4cfeef2cd	Add checkTradeActivity method, remove ConvertToTradeStatistics2	2018-10-05 02:36:20 -05:00
Manfred Karrer	4770ac9ef5	Remove asset from comboBoxes if it was removed by voting	2018-10-05 00:46:03 -05:00
Manfred Karrer	3e7eba8f04	Add Generic- and removeAsset proposals	2018-10-04 23:24:14 -05:00
Manfred Karrer	072cedc29b	Improve param change selection (WIP) ... - Show current formatted value - Parse input to correct domain value - Add validation (WIP) - Add boundary checks (WIP)	2018-10-04 21:36:17 -05:00
Manfred Karrer	ccdac8e20b	Add new items to Param ... - Add COMPENSATION_REQUEST_MIN_AMOUNT and COMPENSATION_REQUEST_MAX_AMOUNT As BSQ based validation values can change over time if BSQ value rise we need to support that in the Params as well. - Add validateParamValue to ChangeParamValidator	2018-10-04 20:28:17 -05:00
Manfred Karrer	5f43bea278	Improve setFitToRowsForTableView method	2018-10-04 19:13:19 -05:00
Manfred Karrer	93b38d20b5	Add ButtonCell and PromptText to ComboBox in FormBuilder ... Default ComboBox does not show promptText after clear selection. https://stackoverflow.com/questions/50569330/how-to-reset-combobox-and-display-prompttext?noredirect=1&lq=1	2018-10-04 18:53:14 -05:00
Manfred Karrer	6299411a2f	Fix/add comments	2018-10-04 18:15:00 -05:00
Manfred Karrer	f562ffa424	Merge pull request #1746 from ManfredKarrer/DAO-improvements ... Dao improvements	2018-10-04 15:07:24 -05:00
Manfred Karrer	c6c617e4b6	Improve comment	2018-10-04 15:06:44 -05:00
Manfred Karrer	adcb254b2f	Fix issue with isBootstrapped ... - Add check for isBootstrapped before calling processProtectedMailboxStorageEntry - Add call of to maybeProcessAllMailboxEntries at onUpdatedDataReceived and onTorNodeReady	2018-10-04 14:57:51 -05:00
Manfred Karrer	3d8d8cc760	Improve logs ... - Remove logging of 'SupportedCapabilities is empty...' in Peer - Add log of number of peesWithNoCapabilitiesSet at persistedPeerList	2018-10-04 14:54:38 -05:00
Manfred Karrer	281e156449	Rename AvoidStandbyMode to AvoidStandbyModeService	2018-10-04 11:36:29 -05:00
Manfred Karrer	0728d04b02	Improve logs, don't show popups in dev mode	2018-10-04 11:33:44 -05:00
Manfred Karrer	d31d569160	Don't throw exception at delayedRemoveEntryFromMailbox ... - We saw that we get a NetworkNotReadyException called but it is unclear why that can happen as that method should be only called after bootstrap flag is set. But anyway that is not a critical issue as it only removes the mailboxMessage and in case we are nto well connected it would get removed by the TTL.	2018-10-04 11:32:53 -05:00
Manfred Karrer	1b8863652c	Merge branch 'master' into DAO-improvements	2018-10-04 10:40:42 -05:00
Manfred Karrer	b04d22f4d8	Merge pull request #1748 from brianl9995/wrong_url ... Fix broken url	2018-10-04 10:12:39 -05:00