6417 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Manfred Karrer	7eba9f6b3b	Merge branch 'voting'	2018-08-14 23:59:31 +02:00
Manfred Karrer	87305eb747	Merge branch 'master' into voting ... # Conflicts: # src/main/resources/i18n/displayStrings.properties Merge branch 'master' into voting # Conflicts: # build.gradle	2018-08-14 23:29:02 +02:00
Manfred Karrer	f77eb4345f	Merge branch 'master' into voting ... # Conflicts: # src/main/resources/i18n/displayStrings.properties Merge branch 'master' into voting # Conflicts: # build.gradle	2018-08-14 23:27:49 +02:00
Manfred Karrer	c1a4809427	Round fiat volume	2018-08-14 23:13:46 +02:00
Manfred Karrer	5de04cee2b	Merge pull request #1619 from ManfredKarrer/halcash ... Add HalCash	2018-08-14 20:46:55 +02:00
Manfred Karrer	49cad5ecfa	Add check fro trade limit and adjust if needed	2018-08-14 20:46:14 +02:00
Manfred Karrer	de54e0dea2	Merge branch 'master' into halcash	2018-08-14 19:53:10 +02:00
Manfred Karrer	a1ab89acb3	Adjust amount in case of edit offer	2018-08-14 19:00:43 +02:00
Manfred Karrer	a8b5b1e1d8	Add download link. Filter own offers	2018-08-14 18:27:50 +02:00
Manfred Karrer	bbc1306143	Add market price alerts	2018-08-14 14:49:35 +02:00
Manfred Karrer	c88da45244	Merge pull request #1621 from ripcurlx/add-non-english-locale-warning ... Add warning for languages not natively supported by arbitration	2018-08-14 13:52:06 +02:00
Christoph Atteneder	76cc2d55a0	Add warning if Offer is taken or created and user has set language that is not supported natively by arbitrators	2018-08-14 13:29:06 +02:00
Christoph Atteneder	686ab45253	Extract arbitrator language check into ArbitratorManager	2018-08-14 12:06:07 +02:00
Manfred Karrer	c3e7fe0e41	Improve price alerts	2018-08-13 17:44:35 +02:00
Christoph Atteneder	6f110342bb	Add tests for arbitration language warning	2018-08-13 12:55:40 +02:00
Christoph Atteneder	b0296e28c4	Show warning if user selects language where native speaking arbitration support is not available	2018-08-13 12:21:45 +02:00
Manfred Karrer	fec12e5fdb	Merge pull request #1620 from ripcurlx/fix-reseting-of-amount-in-trade-statistics ... Properly reset cell in amount column	2018-08-13 12:03:31 +02:00
Christoph Atteneder	29414133fa	Properly reset cell in amount column	2018-08-13 10:38:07 +02:00
Manfred Karrer	7e1dcba597	Merge branch 'master' into notifications	2018-08-12 16:41:14 +02:00
Manfred Karrer	be5d1917e0	Remove iphone 6 warning ... Background App refresh need to be enabled (wlan+mobile data) and bisq enabled (settings/general/Background App refresh). If that is not enabled the app does not receive the messages even if it is open. Apple has some weird logic who the name such "features" - you need Background App refresh enabled to receive data if the app is not in background.... I think another reason to push Apple in background...	2018-08-11 23:19:34 +02:00
Manfred Karrer	21be6bec81	Cleanup blind vote domain	2018-08-11 22:06:18 +02:00
Manfred Karrer	3bce2b828b	Add adjustment fro multiple ofg 10 EUR for HalCash ... With ATMs one can withdraw only multiples of 10 EUR. We adjust the input values the way that the EUR amount leads to multiple of 10. MinAmount and amount will be adjusted. Please note that a similar approach like implemented here for HalCash can be used for removing the decimal places from fiat amounts to improve privacy. We keep that for a follow up PR to not mix 2 different use cases.	2018-08-11 20:48:42 +02:00
Manfred Karrer	671daacd18	Add more logs	2018-08-10 23:34:40 +02:00
Manfred Karrer	e7b3629a71	Add HalCash	2018-08-10 22:19:59 +02:00
Manfred Karrer	24991d739a	Change version from -SNAPSHOT to 0.9.0	2018-08-09 14:15:00 +02:00
Manfred Karrer	703bc08e79	Handle no-webcam case ... Fixed https://github.com/bisq-network/bisq-desktop/issues/1618	2018-08-09 11:18:32 +02:00
Manfred Karrer	6e15721935	Merge pull request #1617 from blur-network/list-blur-asset ... List Blur (BLUR)	2018-08-09 01:48:55 +02:00
blur-network	62c7a8fd11	List Blur (BLUR)	2018-08-08 19:11:06 -04:00
Manfred Karrer	c180f8767a	Remove BooleanVote and LongVote. ... Make Vote to BooleanVote	2018-08-09 00:54:44 +02:00
Manfred Karrer	185eee2fcb	Cleanup ballot domain	2018-08-09 00:39:12 +02:00
Manfred Karrer	4fddc5d089	Cleanup proposal domain	2018-08-09 00:17:40 +02:00
Manfred Karrer	5844bd1717	Remove uid from Proposal ... We can use the txId as unique ID	2018-08-08 23:40:18 +02:00
Manfred Karrer	dde3ba0a67	Cleanup proposal domain	2018-08-08 23:22:06 +02:00
Manfred Karrer	1d10de9b2c	Use DevEnv.logErrorAndThrowIfDevMode	2018-08-08 22:54:54 +02:00
Manfred Karrer	697e7ae058	Improve vote result view	2018-08-08 00:06:36 +02:00
Manfred Karrer	1df3dfe4c8	Refactoring ... - Rename proposal view classes	2018-08-07 22:52:57 +02:00
Manfred Karrer	a88667f8bc	Refactor ProposalService classes	2018-08-07 15:41:54 +02:00
Manfred Karrer	fc741674bd	Refactoring ... - Rename bisq.core.dao.state.ext package to bisq.core.dao.state.governance	2018-08-07 13:34:05 +02:00
Manfred Karrer	47c2977a75	Refactoring ... - Fix issues with past refactorings (not applied imports)	2018-08-07 13:09:17 +02:00
Manfred Karrer	6d9572c04f	Refactoring ... - Move role package inside governance	2018-08-07 13:04:33 +02:00
Manfred Karrer	975d7395b1	Refactor TxOutput and Block classes ... - Add BaseTxOutput and BaseBlock class containing only immutable blockchain-only data which is common in sub classes - RawTxOutput extends BaseTxOutput, RawBlock extends BaseBlock - TempTxOutput extends BaseTxOutput and has mutable data which can be altered during tx parsing. TempTxOutput is only used during parsing and gets converted to the immutable TxOutput when tx parsing is completed. - TxOutput extends BaseTx and is immutable and used to be stored in the Block. - Block extends BaseBlock and is persisted with the BsqState. The tx list is not a immutable list bu the transactions in there are immutable. Transactions gets added during parsing to the block which was gets added to the BsqState when parsing starts. - Change block time from seconds to ms	2018-08-06 19:53:38 +02:00
Manfred Karrer	468d5e01c6	Add a default impl. for BsqStateListener.onEmptyBlockAdded	2018-08-06 13:34:31 +02:00
Manfred Karrer	7bd22d1886	Remove grpc from build	2018-08-06 12:22:52 +02:00
Manfred Karrer	4a0c8b6dc1	Prepare for custom binary: ... - Set version 0.8.0 - Use Bisq_notifications as app name - Improve Relay - Fix build issues	2018-08-06 02:11:58 +02:00
Manfred Karrer	4ce22ece97	Cleanups	2018-08-06 01:14:28 +02:00
Manfred Karrer	dbad3950ae	Merge branch 'master' into notifications	2018-08-06 00:56:46 +02:00
Manfred Karrer	d897d5a3f3	Renaming, cleanups	2018-08-06 00:52:13 +02:00
Manfred Karrer	85973ff50d	Cleanup	2018-08-05 23:44:03 +02:00
Manfred Karrer	bd80e9d97d	Add result view and show merit	2018-08-05 22:57:36 +02:00
Manfred Karrer	242fe68df8	Remove views	2018-08-05 22:49:59 +02:00