8968 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
sqrrm	af3aedb51b	Update core/src/main/java/bisq/core/dao/governance/param/Param.java ... Co-Authored-By: ManfredKarrer <mk@nucleo.io>	2019-03-27 14:50:47 -05:00
Manfred Karrer	8704ba9aa5	Remove unused param	2019-03-27 14:14:48 -05:00
Manfred Karrer	c6947ba2d2	Merge branch 'master' into add-check-for-bsq-balance ... # Conflicts: # core/src/main/resources/i18n/displayStrings.properties # desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java	2019-03-27 12:27:29 -05:00
Christoph Atteneder	b0226ef576	Merge pull request #2592 from ripcurlx/prevent-bsq-amount-below-dust-limit ... Prevent BSQ offers below dust limit	2019-03-27 17:17:12 +01:00
Christoph Atteneder	e7a059950e	Prevent BSQ offers below dust limit	2019-03-27 17:00:29 +01:00
Manfred Karrer	9ca5899d4c	Merge pull request #2591 from oscarguindzberg/addr-msg ... Disable "add peers from addr message" custom bitcoinj feature when a …	2019-03-27 09:49:12 -05:00
Christoph Atteneder	d339f4274d	Ignore jenv config files	2019-03-27 15:48:55 +01:00
Christoph Atteneder	2356d2eba2	Merge pull request #2513 from ripcurlx/create-dao-section-for-economy ... Move BSQ dashboard into separate Facts & Figures section	2019-03-27 15:44:19 +01:00
Christoph Atteneder	9143616d85	Increase height of chart to fill window in default size	2019-03-27 15:21:54 +01:00
Christoph Atteneder	33bf07577d	Update wording	2019-03-27 15:13:00 +01:00
Christoph Atteneder	ff21c916fa	Improve layout	2019-03-27 15:06:39 +01:00
Oscar Guindzberg	5f3907caf3	Disable "add peers from addr message" custom bitcoinj feature when a list of peers is provided.	2019-03-27 10:51:29 -03:00
Christoph Atteneder	4c46b3865b	Put charts into white panes to improve layout	2019-03-27 14:33:22 +01:00
Christoph Atteneder	44764d1fb7	Add supply and transactions sections	2019-03-27 12:19:28 +01:00
Christoph Atteneder	b00f96d06e	Move BSQ economy details into separate view	2019-03-27 09:39:58 +01:00
Christoph Atteneder	1fb9a15668	Move BSQ dashboard in separate economy view	2019-03-27 09:39:58 +01:00
Manfred Karrer	55c54356a1	Merge pull request #2590 from devinbileck/no-trading-account-for-selected-currency ... Show close button when creating offer without required account	2019-03-26 21:52:19 -05:00
Manfred Karrer	73b0a17dd5	Add log for seeds	2019-03-26 21:35:52 -05:00
Manfred Karrer	c1edc622c9	Fix incorrect seed address	2019-03-26 21:34:26 -05:00
Manfred Karrer	fa8b8c5764	use new DAO_REGTEST server and seeds	2019-03-26 21:14:30 -05:00
Manfred Karrer	999fe85afc	Reduce durations of phases for DAO_REGTEST	2019-03-26 20:46:30 -05:00
Manfred Karrer	1bd6f03e15	Add new genesis tx for DAO_REGTEST	2019-03-26 20:43:08 -05:00
Manfred Karrer	793d00699a	Rename BTC_DAO_TESTNET2 to BTC_DAO_REGTEST	2019-03-26 20:13:08 -05:00
Manfred Karrer	8016f452f3	Add try/catch to print error in case the file does not exist	2019-03-26 20:12:43 -05:00
Manfred Karrer	bf83687524	Rename BTC_DAO_TESTNET to BTC_DAO_TESTNET2 to enforce new network	2019-03-26 19:24:45 -05:00
Manfred Karrer	121c0f6f68	Merge branch 'add-check-for-bsq-balance' of https://github.com/ManfredKarrer/bisq into add-check-for-bsq-balance	2019-03-26 19:05:03 -05:00
Manfred Karrer	7479b88a08	Keep invalid state for txs which cannot have been created by the app	2019-03-26 19:04:51 -05:00
sqrrm	2758db554e	Update desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java ... Co-Authored-By: ManfredKarrer <mk@nucleo.io>	2019-03-26 19:03:23 -05:00
sqrrm	a3e1e677c7	Update core/src/main/java/bisq/core/dao/node/parser/TxParser.java ... Co-Authored-By: ManfredKarrer <mk@nucleo.io>	2019-03-26 18:57:31 -05:00
sqrrm	83b7ed9fea	Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java ... Co-Authored-By: ManfredKarrer <mk@nucleo.io>	2019-03-26 18:56:28 -05:00
sqrrm	3d5ff1c674	Update core/src/main/java/bisq/core/dao/governance/votereveal/VoteRevealService.java ... Co-Authored-By: ManfredKarrer <mk@nucleo.io>	2019-03-26 18:56:20 -05:00
Devin Bileck	b86da3925b	Show close button when creating offer without required account ... Issue: When attempting to create an offer without a trading account for the selected currency, a prompt is shown asking the user whether to still create an offer or to create a new account. But this prompt is missing a cancel/close button in case you don't want to do either action. And pressing Esc on the keyboard proceeds to create the account. Cause: The close button on the prompt was renamed and being used to create a new account. Fix: Use the close button as a close button and add a secondary action button to create a new account. The popup width was increased to accommodate the long button text without being truncated.	2019-03-26 14:50:03 -07:00
Manfred Karrer	ff868311bb	Merge branch 'master' into add-check-for-bsq-balance ... # Conflicts: # desktop/src/main/java/bisq/desktop/main/dao/wallet/dashboard/BsqDashboardView.java	2019-03-26 00:40:27 -05:00
Manfred Karrer	ce1da644c2	Add IRREGULAR txType for txs which are not rule conform but not burnt ... We don't want to burn BSQ in cases like that the tx was published too late, which is a valid case if the tx does not make it in the next block. We set such txs as IRREGULAR and allow spending of the BSQ, but there function in the governance is invalidated. We also add a check if the sum of all UTXO is the same as the sum of the genesis + sum of issuance txs - burned fees.	2019-03-26 00:37:55 -05:00
Manfred Karrer	c20964f47a	Don't create vote reveal tx in last block of phase	2019-03-26 00:33:57 -05:00
Manfred Karrer	15bf8ff08b	Merge pull request #2584 from ManfredKarrer/add-issuance-limit ... Add ISSUANCE_LIMIT param and check for max issuance per cycle	2019-03-25 18:34:22 -05:00
Manfred Karrer	2a46133292	Merge pull request #2566 from ripcurlx/ui-dao-improvements ... DAO UI improvements	2019-03-25 18:34:02 -05:00
Christoph Atteneder	1324290d34	Move vote results for proposal into popup	2019-03-25 23:46:40 +01:00
Christoph Atteneder	f6f2a663e8	Improve layout and fix issue with phase breaks	2019-03-25 20:47:28 +01:00
Manfred Karrer	1e66d6e5c0	Merge pull request #2582 from oscarguindzberg/typo ... Fix typo	2019-03-25 13:46:16 -05:00
Manfred Karrer	f75ddf9346	Add ISSUANCE_LIMIT param and check for max issuance per cycle ... We limit the possible max. issuance (including reimbursements) to the valued defined in the ISSUANCE_LIMIT param. In case we exceed that limit the whole cycle becomes invalid. The main reason for that feature is limitation of max. damage in case that an attacker manages to create unjustified issuance. For valid cases we consider such a case as social consensus problem as the majority of voters should be aware of that limit before they accept such a high issuance. If known in advance that an extraordinary high issuance is expected the DAO parameter can be changed.	2019-03-25 13:36:34 -05:00
Manfred Karrer	3a9131d203	Merge pull request #2583 from ManfredKarrer/increase-timeouts ... Increase timeouts	2019-03-25 13:28:47 -05:00
Manfred Karrer	87378cde09	Merge pull request #2581 from freimair/netlayer ... Update Netlayer to 0.6.5	2019-03-25 13:28:30 -05:00
Manfred Karrer	9b2c5a2d2a	Increase timeouts ... See discussion at https://github.com/bisq-network/bisq/issues/2547	2019-03-25 12:44:54 -05:00
Oscar Guindzberg	56d152ebee	Fix typo	2019-03-25 12:06:45 -03:00
Oscar Guindzberg	2113e02c63	Fix typo	2019-03-25 12:03:59 -03:00
Florian Reimair	bb6de99385	Update Netlayer to 0.6.5	2019-03-25 15:42:21 +01:00
Christoph Atteneder	c9c775d60f	Merge pull request #2529 from quantum13/rename_xdr ... rename XDR ticker (conflict with ISO 4217)	2019-03-25 10:25:40 +01:00
Christoph Atteneder	ab4d203ece	Merge pull request #2575 from ManfredKarrer/higher-max-buyer-security-deposit ... Set max buyer's security deposit to 20% instead of 10%	2019-03-25 10:24:48 +01:00
Christoph Atteneder	f65b340d3d	Merge pull request #2576 from ManfredKarrer/mk-fix-get-all-bonds ... Fix get all bonds not returning not active bonds	2019-03-25 10:24:33 +01:00