mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 02:12:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
14,448 Commits 4 Branches 148 Tags 4.3 GiB
3c3dca0053
Commit Graph

2565 Commits

Author SHA1 Message Date
jmacxx
df0acf1469
Improve mediation tools. 
Emergency payout tool to also show Open mediation tickets.
Log txHex of MediatedPayoutTxPublished.
 2021-02-18 16:15:35 -06:00
Christoph Atteneder
2dc34dce48
Bump version number for v1.5.7 2021-02-18 21:50:32 +01:00
chimp1984
097376ef07
Set onAction handlers in activate not in initialize 2021-02-18 11:42:16 -05:00
chimp1984
fdad973f4c
Add TxInputSelectionWindow for coin input selection. 
It is both for BSQ and non-BSQ (BTC) used.
 2021-02-18 11:42:16 -05:00
chimp1984
64e2d2b2c4
Add addButtonCheckBoxWithBox method with top param 2021-02-18 11:42:15 -05:00
chimp1984
2b9b9ef8a8
Add refreshValidation method 2021-02-18 11:42:15 -05:00
chimp1984
cd0a28361f
Add average bsq price text fields from timeline selection 2021-02-18 11:40:30 -05:00
chimp1984
d04ac5cdf0
Add missing stage offset to tooltips 2021-02-18 11:40:30 -05:00
chimp1984
683e768a00
Add total volume text fields 2021-02-18 11:40:30 -05:00
chimp1984
e91ed8a857
Always update all text field values even if the series is not selected 2021-02-18 11:40:30 -05:00
chimp1984
55a4154e74
Add tooltip to time navigation so from and to date is visible 2021-02-18 11:40:30 -05:00
chimp1984
955c57cfbe
Reduce vertical space 2021-02-18 11:40:30 -05:00
chimp1984
25f35fea9e
Update text field values when time interval selection changes 2021-02-18 11:40:30 -05:00
chimp1984
f421411bba
Add price and volume charts 2021-02-18 11:40:30 -05:00
chimp1984
4244f807c7
Refactoring: Rename classes 2021-02-18 11:40:29 -05:00
chimp1984
df6d451b80
Extract code to TemporalAdjusterModel 
Move TemporalAdjusterUtil code to TemporalAdjusterModel
 2021-02-18 11:40:29 -05:00
chimp1984
a332e603fb
Refactoring: Rename class 2021-02-18 11:40:29 -05:00
chimp1984
885fff5163
Refactoring: Rename classes, package and move class 2021-02-18 11:40:29 -05:00
chimp1984
320a2f8a1f
Only calculate data for active series 2021-02-18 11:40:29 -05:00
chimp1984
67d76cda27
Add time interval selector 2021-02-18 11:40:29 -05:00
chimp1984
9dab4fd65a
Add total issuance and total burned series 2021-02-18 11:40:29 -05:00
chimp1984
7c82271ac1
Fix data (was missing the reimbursement to the RA due a 
mistake by doing a double payout). we consider that as
reimbursement as well.
 2021-02-18 11:40:28 -05:00
chimp1984
632653a751
Add new chart view 2021-02-18 11:40:28 -05:00
chimp1984
db86b89377
Exclude proof of burn amounts from trade fee display. 
Use Proof of burn fee instead of burned BSQ from invalid tx.
 2021-02-18 11:40:10 -05:00
chimp1984
b2beec6bc8
Merge branch 'master' of https://github.com/bisq-network/bisq into master_upstream 2021-02-17 20:52:27 -05:00
sqrrm
a5790de99a
Merge pull request #5197 from bisq-network/hotfix/v1.5.6 
Release v1.5.6
 2021-02-18 00:06:43 +01:00
unofficial bisq contributor
fabfd6189c
fix #4019 Dark mode ColoredDecimalPlacesWithZerosText not working as intended 2021-02-16 20:33:50 +00:00
Christoph Atteneder
d2825c317c
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.6 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2021-02-16 21:27:15 +01:00
Christoph Atteneder
5c614be5d7
Revert to SNAPSHOT version 2021-02-16 21:23:37 +01:00
Christoph Atteneder
1507b58e26
Bump version number for v1.5.6 2021-02-16 09:04:10 +01:00
Christoph Atteneder
31b7292d56
Merge pull request #5117 from jmacxx/add_country_amazon_account 
Specify Amazon eGift Card country
 2021-02-12 20:34:51 +01:00
jmacxx
f89e4187af
When country not known, prompt user to ask in Trader Chat. 2021-02-12 12:37:56 -06:00
Christoph Atteneder
de57900765
Merge pull request #5175 from jmacxx/fix_NPE_trader_chat 
Fix NPE in trader chat
 2021-02-12 11:35:44 +01:00
chimp1984
54ca03cdbd
Merge branch 'master' of https://github.com/bisq-network/bisq into master_upstream 2021-02-10 13:27:52 -05:00
sqrrm
e9e596e89c
Merge pull request #5172 from jmacxx/fix_npe_offer_trigger_price 
Fix NPE at offer entry when trading account switched
 2021-02-10 15:33:18 +01:00
sqrrm
78140ccadb
Merge pull request #5134 from chimp1984/remove-unused-BalanceWithConfirmationTextField 
Remove unused BalanceWithConfirmationTextField
 2021-02-10 14:40:59 +01:00
sqrrm
9ef4ea164d
Merge pull request #5120 from stejbac/speed-up-deposit-and-transactions-view-loads 
Speed up deposit and transactions view loads
 2021-02-10 14:39:49 +01:00
sqrrm
cedf108926
Merge pull request #5108 from jmacxx/pre_release_notifications 
New Feature: Pre-release notifications
 2021-02-10 14:38:53 +01:00
sqrrm
570ed0e032
Merge pull request #5148 from bisq-network/release/v1.5.5 
Release/v1.5.5
 2021-02-10 10:35:35 +01:00
Christoph Atteneder
5ad670fe27
Merge pull request #5178 from jmacxx/refund_agent_payout_fee 
Refund agent payout to use withdrawal fee rate from settings
 2021-02-09 21:03:25 +01:00
jmacxx
fc04e88a55
Refund agent payout to use withdrawal fee rate from settings 2021-02-09 10:51:01 -06:00
jmacxx
ed78d0fbb4
Fix NPE when sending trader chat 
Show error message to user when trader chat message cannot be sent.
 2021-02-08 17:35:56 -06:00
jmacxx
98feab3ef7
fix NPE when payment account changed on offer entry (with trigger price) 2021-02-08 10:55:25 -06:00
chimp1984
81fb615d86
Merge branch 'master' of https://github.com/bisq-network/bisq into master_upstream 2021-02-06 16:06:55 -05:00
jmacxx
d72b1a6639
Specify Amazon eGift Card country 
Adds countryCode to AmazonGiftCardAccountPayload
Account upgrade done at startup => Eurozone accounts will prompt for country.
Trade buyer step 2 prompts use of the appropriate Amazon website for buying gift card.
 2021-02-03 13:57:20 -06:00
Christoph Atteneder
63b39d5995
Revert to SNAPSHOT version 2021-02-02 10:34:27 +01:00
Christoph Atteneder
480ccd2c8e
Hide trigger price box if not used in confirmation step 2021-02-01 19:55:32 +01:00
Christoph Atteneder
d9f51afb8d
Hide trigger price box if not used in confirmation step 2021-02-01 19:52:31 +01:00
chimp1984
927ab2de21
Merge branch 'master' of https://github.com/bisq-network/bisq into master_upstream 2021-02-01 11:23:17 -05:00
sqrrm
1a8aba8221
Merge pull request #5145 from ripcurlx/improve-pending-trades-list 
[v1.5.5] Improve pending trades list rendering
 2021-02-01 13:05:03 +01:00
Christoph Atteneder
68e4a72c03
Add sanity check 2021-02-01 11:26:45 +01:00
Christoph Atteneder
9c31abfd36
Reset references to enable GC 2021-02-01 11:26:33 +01:00
Christoph Atteneder
91e75641eb
Minor cleanup 2021-02-01 11:26:24 +01:00
Christoph Atteneder
dcfcf6c214
Add sanity check 2021-02-01 11:24:20 +01:00
Christoph Atteneder
ade1c86c72
Reset references to enable GC 2021-02-01 10:52:21 +01:00
Christoph Atteneder
fd3f0e6d25
Minor cleanup 2021-02-01 10:52:06 +01:00
Christoph Atteneder
18d622e680
Bottom align elements in offerbook tools box 2021-02-01 09:33:21 +01:00
Christoph Atteneder
a35f50c882
Cleanup code 2021-02-01 09:33:12 +01:00
Christoph Atteneder
429ae08414
Prevent overlapping of offer tools 
Moves everything into box to prevent hiding of information in all languages
 2021-02-01 09:32:53 +01:00
Christoph Atteneder
1af7e6a971
Bottom align elements in offerbook tools box 2021-02-01 09:30:37 +01:00
chimp1984
0bfa633e23
Extract onSendBsq method, return early 2021-01-31 15:15:16 -05:00
chimp1984
2de65bb686
Remove unused BalanceWithConfirmationTextField 2021-01-30 11:59:21 -05:00
Christoph Atteneder
4164c77cf9
Cleanup code 2021-01-30 16:56:38 +01:00
Christoph Atteneder
2839b7a73a
Prevent overlapping of offer tools 
Moves everything into box to prevent hiding of information in all languages
 2021-01-30 16:56:02 +01:00
Steven Barclay
0a38aebdf8
Fix stale trade stats list view when new entries arrive 
Ensure the trade statistics list in TradesChartsView doesn't go stale
upon new stats arrivals, by moving a fillList() call from the currency
combobox onChangeConfirmed event handler to the selectedTradeStatistics
(TradesChartsViewModel field) listener.

Also avoid unnecessary use of an ObservableList as a temporary variable.
 2021-01-27 20:42:52 +00:00
Steven Barclay
d0172c2424
Load (Deposit|Transactions)ListItem tooltips lazily 
Add a nested class of lazy fields to (Deposit|Transactions)ListItem,
together with an associated memoised Supplier, lazyFieldsSupplier, which
initialises them all the first time any one of them is requested. Move
the txConfidenceIndicator & tooltip fields to this class, so that they
are only loaded when the given address/tx row is displayed in the
deposit/transactions views, respectively.

This prevents a minor bottleneck, as profiling indicates that creating a
tooltip for each tx confidence indicator in the list is quite expensive
and takes up around half the rendering time. (There may be 1000's of txs
or addresses in an old wallet.)
 2021-01-26 23:58:13 +00:00
Steven Barclay
8a385ba91b
Add missing WalletService.removeBalanceListener to fix leak 
Fix a serious memory leak in DepositListItem due to missing removal of
the BalanceListener (one per item) from BtcWalletService. This prevented
GC of the entire list of items, which was observed to leak ~500 MB in
JProfiler after repeated switching (several dozen times) between tabs.
 2021-01-26 23:20:55 +00:00
Steven Barclay
db26a1fe2d
Optimise TransactionAwareTrade.isRelatedToTransaction 
Attempt to remove a bottleneck during the transactions view load, as
revealed by JProfiler, by optimising the code to determine if any given
transaction and trade are related. Since both these sets will tend to
grow linearly with time, causing quadratic slowdown of TransactionsView,
try to alleviate (without completely fixing) the problem.

To do this, add a cached set of disputed trade IDs to DisputeListService
so that TransactionAwareTradable.is(Dispute|RefundPayout)Tx can be made
O(1) in the common case that the given trade is not involved in any
dispute. Also avoid calling Sha256Hash::toString by passing tx IDs as
Sha256Hash objects directly to is(Deposit|Payout)Tx, and short circuit
an expensive call BtcWalletService.getTransaction in isDelayedPayoutTx,
in the common case, by pre-checking the transaction locktime.

This also fixes a bug in isRefundPayoutTx whereby it incorrectly returns
false if there are >1 disputes in the list returned by RefundManager but
the given trade is not involved in the last one.
 2021-01-26 20:10:47 +00:00
Christoph Atteneder
60fc17be2c
Update data stores for v1.5.5 2021-01-25 14:18:21 +01:00
jmacxx
d579361df7
CBM currency selection to use drop down combo 
This changes CBM to use one currency per payment account.
 2021-01-25 09:37:10 +01:00
jmacxx
dbdaadba89
CBM currency selection to use drop down combo 
This changes CBM to use one currency per payment account.
 2021-01-24 11:21:41 -06:00
Jakub Loucký
172af9bd6b
Resolve unintended ellipsis. Make popup wider. 2021-01-24 15:06:54 +01:00
Jakub Loucký
e2de30a6e4
Resolve unintended ellipsis. Make popup wider. 2021-01-23 23:46:48 +01:00
jmacxx
849f1ec45f
code cleanup 2021-01-22 20:18:23 -06:00
jmacxx
da45b8e6cf
Add pre-release software update notifications 2021-01-22 20:08:02 -06:00
chimp1984
4621076fb3
Fix null pointer 2021-01-22 19:12:41 +01:00
Christoph Atteneder
80cd4a8ad6
Merge pull request #5101 from chimp1984/fix-nullpointer-at-bsq-tx-cvs-export 
Fix null pointer
 2021-01-22 19:12:24 +01:00
chimp1984
0169bd334c
Fix null pointer 2021-01-22 10:02:19 -05:00
jmacxx
7300a1379a
Manual payout tool: prevent absurdly high fee payout 
- trims whitespace from numeric input fields before parsing
- adds percentage display of the tx fee
- validates that the tx fee percentage is not higher than 10%
 2021-01-22 11:26:48 +01:00
jmacxx
db76346cde
Manual payout tool: prevent absurdly high fee payout 
- trims whitespace from numeric input fields before parsing
- adds percentage display of the tx fee
- validates that the tx fee percentage is not higher than 10%
 2021-01-21 12:49:08 -06:00
Christoph Atteneder
b9e889050a
Bump version number for v1.5.5 2021-01-21 16:01:45 +01:00
Steven Barclay
8104301b52
Use new Bitcoind(Client|Daemon) & remove btcd-cli4j 
Migrate RpcService over to the new block notification daemon and RPC
client based on jsonrpc4j. Drop in own DTO classes in place of the ones
defined by btcd-cli4j and rename requestBtcBlock & addNewBtcBlockHandler
to requestDtoBlock & addNewDtoBlockHandler respectively.

Also remove now redundant filtering from the logback config and update
grade-witness.
 2021-01-21 10:10:28 +00:00
Christoph Atteneder
334fbdbc86
Merge pull request #5092 from jmacxx/add_cashbymail3 
Add payment method "Cash by mail"
 2021-01-21 10:26:59 +01:00
sqrrm
71b6b84b43
Merge pull request #5087 from ripcurlx/improve-responsiveness 
Keep main navigation items left aligned
 2021-01-19 11:12:03 +01:00
Christoph Atteneder
071e1e5a57
Merge pull request #5090 from jmacxx/disable_cpu_intensive_animations 
Disable CPU-intensive animations
 2021-01-19 10:54:12 +01:00
Christoph Atteneder
3f5c455f06
Merge pull request #5091 from jmacxx/test2 
Reword "trade started" popup messages per suggestion
 2021-01-19 10:27:43 +01:00
Christoph Atteneder
88c4272c63
Merge pull request #5080 from chimp1984/do-not-require-reason-for-payment 
Change rule for "reason for payment" field to not use trade ID but leave it empty
 2021-01-19 10:01:52 +01:00
jmacxx
2a33434a4e
codacy 2021-01-18 22:05:42 -06:00
jmacxx
3839f5961c
codacy 2021-01-18 21:58:14 -06:00
jmacxx
e11209d395
Add payment method "Cash by mail" 2021-01-18 21:15:18 -06:00
jmacxx
a90d606c01
Reword trade started popups per @m52go suggestion 2021-01-18 16:43:43 -06:00
jmacxx
daf5106e84
Disable animated progress indicator for Take offer 2021-01-18 15:07:08 -06:00
jmacxx
feb88bc769
Disable CPU-intensive animations 
Comments out the code for footer bar progress indicator shown when
receiving a DAO block

Comments out the code for the spinner indicator shown when waiting
for trade to be funded

https://github.com/bisq-network/bisq/issues/4649#issuecomment-761950701

Fixes #4649
 2021-01-18 13:23:18 -06:00
Christoph Atteneder
6ba04dd432
Keep main navigation items left aligned 2021-01-18 11:29:27 +01:00
sqrrm
d3971ef7dd
Merge pull request #5072 from chimp1984/persist-and-republish-mailbox-messages 
Persist and republish mailbox messages
 2021-01-16 20:24:13 +01:00
Christoph Atteneder
01bfbe7ca0
Merge pull request #5071 from jmacxx/fix_issue_5067 
Show a confirmation of successfully sending BTC or BSQ from wallet
 2021-01-14 09:37:20 +01:00
chimp1984
f19b049a7f
Update desktop/src/main/java/bisq/desktop/main/overlays/windows/TacWindow.java 
Co-authored-by: m52go <735155+m52go@users.noreply.github.com>
 2021-01-14 00:36:18 -05:00
chimp1984
cef1c056bb
Improve text, reformat tac text 2021-01-13 23:35:13 -05:00
chimp1984
935d9853bc
Add popup at startup to notify about rule change if user had already a fiat account 2021-01-13 23:34:15 -05:00
chimp1984
c68f75c7e9
Remove instructions for using trade id as reason for payment 
State to use empty field instead.
 2021-01-13 23:03:04 -05:00
jmacxx
3984e8b3dd
Code review suggestions from @ripcurlx 
Disable validation errors when clearing edit fields
Implement spacer field using Region
 2021-01-13 21:31:58 -06:00
chimp1984
b4ab8a4a0d
Fix incorrect comparison at RemovedPayloadsService.readPersisted 
Add comments
Cleanups
 2021-01-12 10:59:11 -05:00
sqrrm
fea52f07a3
Merge pull request #5057 from chimp1984/fix-premature-disconnections-from-seeds 
Fix premature disconnections from seeds
 2021-01-12 12:52:41 +01:00
sqrrm
e565a18bc5
Merge pull request #5066 from chimp1984/add-usd-volume-to-tradestatistics-chart 
Add toggle for displaying volume in tradestatistics chart in USD
 2021-01-11 23:06:13 +01:00
Christoph Atteneder
917637c4a9
Merge pull request #5054 from chimp1984/add-csv-export-to-bsq-tx-view 
Add csv export to bsq tx view
 2021-01-11 11:14:27 +01:00
jmacxx
27d41c8499
Show a confirmation of successfully sending BTC or BSQ from wallet 
The confirmation details include amount, recipient address and txId.
Includes a link to open txId details in the user's external block explorer.
@m52go reworded the BSQ conf explanation note.
Added "don't show again" checkbox.
 2021-01-10 19:51:34 -06:00
chimp1984
4e444269af
Remove unnecessary ObservableList 2021-01-08 19:57:39 -05:00
chimp1984
ec7521628b
Only update selectedTradeStatistics if selected currency has 
changed or we got added new trade stats
 2021-01-08 19:53:40 -05:00
chimp1984
2006f58580
Refactor: Rename tradeStatisticsByCurrency to selectedTradeStatistics 2021-01-08 19:43:24 -05:00
chimp1984
397a97a899
Call fillTradeCurrencies only once at activate 2021-01-08 19:42:51 -05:00
chimp1984
b3c8e20d66
Fix available height calculation 
Fix incorrect removeListener call on priceColumn.textProperty()
instead of priceColumnLabel
 2021-01-08 19:31:33 -05:00
chimp1984
0d09c19953
Cleanups 2021-01-08 19:30:10 -05:00
chimp1984
5ec6ad503f
Cache fields in TradeStatistics3ListItem 2021-01-08 18:24:56 -05:00
chimp1984
bf7acb5932
Add toggle for showing volume as USD instead of BTC 
Precalculate the USD average prices for tick intervals
and use that for converting the BTC volume to USD volume.
 2021-01-08 16:41:55 -05:00
chimp1984
ad1b436832
Use List instead of ObservableList, cleanups 2021-01-08 16:41:55 -05:00
chimp1984
6c62e77d7c
Remove unused variable 2021-01-08 14:24:24 -05:00
James Cox
e50a182883
Merge branch 'master' into remove_awt_dependencies 2021-01-07 17:54:40 -06:00
chimp1984
1dc71c9b3a
Increase delay for reset 
Improve statistic logging
 2021-01-06 11:14:47 -05:00
chimp1984
8865d9bc93
Fix node display 2021-01-06 01:33:00 -05:00
chimp1984
3d55c16c8b
Update display string and UI representation 2021-01-05 20:56:27 -05:00
chimp1984
86d0f96c6c
Remove PeerType from Connection. Use ConnectionState instead. 
Remove unnecessary setPeerType calls. ConnectionState is handling that.
Only PeerManager does the setting of isSeedNode as we do not have the
required dependency in ConnectionState.
 2021-01-05 20:50:46 -05:00
chimp1984
f169cf1309
Refactoring: Move PeerType outside of Connection 2021-01-05 20:34:28 -05:00
chimp1984
fe7fdbde9a
Add num-offers stype to numItems labels 2021-01-04 16:24:27 -05:00
chimp1984
29b4a60dac
Add export to CSV button 2021-01-04 16:23:49 -05:00
chimp1984
c2174607f5
Add isTakerApiUser field to OfferAvailabilityRequest 
Add UNCONF_TX_LIMIT_HIT and MAKER_DENIED_API_USER to AvailabilityResult enum
Apply handling for api filter features
 2021-01-04 12:35:29 -05:00
chimp1984
95063b6c7f
Add denyApiTaker field to Preferences 2021-01-04 12:00:29 -05:00
chimp1984
cfabf79ca4
Merge branch 'add-toggle-for-hiding-not-takable-offers' into add-new-filter-entries 2021-01-04 11:48:02 -05:00
chimp1984
4bbc394b2d
Add disableApi flag to filter 2021-01-04 11:44:50 -05:00
chimp1984
f588b22620
Add null checks 2021-01-04 11:32:56 -05:00
chimp1984
9e275048f6
Add toggle for filtering offers which can be taken with users accounts 2021-01-04 11:32:56 -05:00
chimp1984
c3c1f95cba
Extract methods for show all and edit entries. 
Use isShowAllEntry methods instead of equals checks
 2021-01-04 11:32:56 -05:00
sqrrm
ffb2aa8feb
Merge pull request #5052 from jmacxx/show_offer_stats_by_payment_method 
Add a 'payment method details' screen
 2021-01-04 13:08:22 +01:00
sqrrm
7bc9c102d0
Merge pull request #5045 from chimp1984/add-option-to-hide-non-supported-payment-methods 
Add option to hide non supported payment methods
 2021-01-04 12:06:41 +01:00
sqrrm
4127f75b36
Merge pull request #5042 from chimp1984/select-show-all-currencies-for-transferwise 
Select show-all currencies if TransferWise is selected
 2021-01-04 10:53:34 +01:00
sqrrm
14d5600107
Merge pull request #5038 from chimp1984/add-filter-support-on-network-level 
Add filter support on network level
 2021-01-04 10:36:54 +01:00
jmacxx
3488c9eb07
Add a 'payment method details' screen in Bisq client 2021-01-03 19:59:45 -06:00
chimp1984
05b993e7b9
Rename bannedNodeAddress to nodeAddressesBannedFromTrading 2021-01-03 18:53:15 -05:00
sqrrm
0004dedb3b
Merge pull request #5036 from bisq-network/hotfix/v1.5.4 
Merge v1.5.4 hotfix
 2021-01-03 22:44:34 +01:00
sqrrm
df5baaf88e
Merge pull request #5031 from chimp1984/access-concrete-data-stores 
Access concrete data stores
 2021-01-03 22:43:52 +01:00
chimp1984
eddb7cb555
Add option in preferences to hide payment methods which are not part of the users accounts. 
Default value is false, so same behaviour as before the change.
If no payment account is setup then we also show all payment methods.
In that case (no payment account) we disable the toggle as well as set it to false.
 2021-01-01 21:52:34 -05:00
chimp1984
55ec8fa6b7
If we select TransferWise we switch to show all 
currencies as TransferWise supports sending to
most currencies.
 2021-01-01 20:44:26 -05:00
chimp1984
c8bf1d469e
Add support to filter manager for network wide banned nodes 2021-01-01 16:51:24 -05:00
chimp1984
28dd8404f7
Merge branch 'access-concrete-data-stores' into add-filter-support-on-network-level 2021-01-01 13:50:46 -05:00
sqrrm
d79799aaa3
Merge pull request #5006 from Jakub-CZ/instant-error-message-update 
Display up-to-date error messages under text fields
 2021-01-01 17:42:50 +01:00
Christoph Atteneder
0f7756267d
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.4 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2020-12-31 14:00:12 +01:00
Christoph Atteneder
31ee62b6c0
Revert to SNAPSHOT version 2020-12-31 13:58:20 +01:00
Christoph Atteneder
3914e5c198
Bump version number for v1.5.4 2020-12-31 06:55:20 +01:00
chimp1984
4489e57849
Use concrete dataStorageServices instead 
p2PService.getP2PDataStorage().getAppendOnlyDataStoreMap().

p2PService.getP2PDataStorage().getAppendOnlyDataStoreMap() iterates
over all services including the historical data store service. It used the
getMap method which should not be used at historical data store service as
it is not clear if the live data or all data should be accessed.
 2020-12-30 20:38:42 -05:00
Christoph Atteneder
0c83a9b0cd
Merge branch 'master' of github.com:bisq-network/bisq into hotfix/v1.5.3 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2020-12-30 15:15:06 +01:00
Christoph Atteneder
a9dc664560
Revert to SNAPSHOT version 2020-12-30 15:00:16 +01:00