Christoph Atteneder
976caeb14e
Merge pull request #5001 from chimp1984/deactivate-open-offer-if-trigger-price-is-reached
...
Deactivate open offer if trigger price is reached
2020-12-28 17:04:21 +01:00
Christoph Atteneder
78d4176f8a
Merge pull request #5004 from chimp1984/add-mediators-keybase-usernames
...
Add mediators keybase usernames
2020-12-28 16:50:56 +01:00
sqrrm
00c82bb7e9
Merge pull request #5012 from bisq-network/release/v1.5.2
...
Release/v1.5.2
2020-12-28 15:08:13 +01:00
Christoph Atteneder
850e031158
Merge branch 'master' of github.com:bisq-network/bisq into release/v1.5.2
...
# Conflicts:
# core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java
# core/src/main/java/bisq/core/trade/closed/CleanupMailboxMessages.java
2020-12-28 14:57:08 +01:00
Christoph Atteneder
0ad39761ce
Revert to SNAPSHOT version
2020-12-28 14:54:55 +01:00
chimp1984
681fed603e
Fix log
2020-12-27 22:50:56 -05:00
chimp1984
e38fa9a819
Add user name to dispute window and to trade details window (json contract window)
2020-12-25 13:46:04 -05:00
chimp1984
2b047976af
Add lookup map for support agents keybase user names by onion address
...
Add it to dispute (client) views
2020-12-25 13:27:14 -05:00
chimp1984
1336cbb569
Fix test
2020-12-25 01:27:29 -05:00
chimp1984
4f96ade69d
Rename wrong params
2020-12-25 00:14:47 -05:00
chimp1984
57c1ad28a5
Add dontShowAgain to edit offer success popup
2020-12-25 00:14:21 -05:00
chimp1984
2a86d5b5b5
Add triggerPrice to csv
2020-12-25 00:13:55 -05:00
chimp1984
64607de924
Add trigger icon column
2020-12-24 23:44:27 -05:00
chimp1984
39893a6aaf
Add trigger price to OpenOffersView
2020-12-24 23:05:23 -05:00
chimp1984
f096351d60
Make rows smaller
2020-12-24 21:46:14 -05:00
chimp1984
bb9de0b24c
Add trigger price field to create offer view
2020-12-24 20:01:04 -05:00
chimp1984
e5957cd2fe
Set priceTypeToggleButton invisible once we move to funds section
...
Remove disableProperty().unbind() calls which have never got a bind call before
Cleanups
2020-12-23 23:22:02 -05:00
chimp1984
229d013844
Add PriceEventHandler
2020-12-23 21:52:35 -05:00
chimp1984
0e6b983564
Add triggerPrice
2020-12-23 21:50:53 -05:00
chimp1984
752984726c
Add getRegularIconButton method
2020-12-23 21:48:04 -05:00
chimp1984
99192e76ae
Apply formatting (no code change)
2020-12-23 21:47:44 -05:00
chimp1984
8ac81d903d
Refactor InfoInputTextField
...
Use only one icon which is set on demand.
We will add a new icon later so that refactoring prepares that...
2020-12-23 21:46:49 -05:00
chimp1984
d1c8718517
Merge branch 'add-percentage-price-to-open-offer-view' into deactivate-open-offer-if-trigger-price-is-reached
2020-12-23 21:24:52 -05:00
sqrrm
c52d6691d4
Merge pull request #4996 from ghubstan/fix-bitcoind-config-bug
...
Pass hash to bitcoind blocknotify script
2020-12-23 23:34:08 +01:00
ghubstan
2070e7633b
Pass hash to bitcoind blocknotify script
2020-12-23 16:18:31 -03:00
sqrrm
7d7f1b09e7
Merge pull request #4966 from ghubstan/10-callrate-interceptor
...
Prevent excessive api calls
2020-12-23 16:19:29 +01:00
ghubstan
10727fc083
Fix GrpcCallRateMeter method and variable name
...
- Change method isAllowed() -> checkAndIncrement().
- Change variable allowedCallsPerTimeUnit -> allowedCallsPerTimeWindow.
2020-12-23 11:30:16 -03:00
ghubstan
b8c5a29659
Disable CallRateMeteringInterceptorTest and run it from test suite
...
This will reduce the entire apitest suite's exec time
2020-12-22 22:03:06 -03:00
ghubstan
63564760a8
Support more fine grained rate metering
...
We need to be able to define call rate meters for time spans not limited
to TimeUnit intervals of 1 SECOND, 1 HOUR, or 1 DAY. This change allows
more flexibility, e.g., 10 per 5 seconds, 10 per 5 hrs, 100 per 7 days.
2020-12-22 21:11:04 -03:00
chimp1984
b36802dc49
Add percentage price to open offer view
2020-12-22 19:03:09 -05:00
ghubstan
c8ef4141e3
Fix comment
2020-12-22 18:33:18 -03:00
ghubstan
0d4ed952e7
Remove redundant callCount field
...
The size of the timestamp queue is the call count
2020-12-22 17:00:01 -03:00
ghubstan
d61521276f
Remove unused local var
2020-12-22 16:30:37 -03:00
ghubstan
01546ad11d
Use a simpler, time windowing call rate meter
...
Rewrote the GrpcCallRateMeter class and adjusted afected classes.
These changes were requested in PR review
https://github.com/bisq-network/bisq/pull/4966#pullrequestreview-557040093
2020-12-22 16:14:49 -03:00
Christoph Atteneder
4e707a59fe
Merge pull request #4980 from Jakub-CZ/improve-msg-in-wallet-info
...
Improve paragraph under "Wallet balances"
2020-12-22 09:32:54 +01:00
Christoph Atteneder
142d14b58f
Merge pull request #4991 from m52go/walletinfo-path-wording
...
Improve path text on wallet info screen
2020-12-22 09:32:12 +01:00
Christoph Atteneder
73fdb9f6ec
Merge pull request #4984 from chimp1984/improve-localnode-popup-text
...
Improve popup text in case a local node is detected
2020-12-22 09:31:28 +01:00
chimp1984
823980c678
Improve text
2020-12-21 16:26:26 -05:00
sqrrm
c5218c66c3
Merge pull request #4971 from chimp1984/use-resource-file-instead-of-resync-from-genesis
...
Avoid resync from genesis in case of dao state issues
2020-12-21 22:00:42 +01:00
m52go
409b092c1f
Edit path text on wallet info screen
2020-12-21 15:21:05 -05:00
Jakub Loucký
a6f13223d1
Remove dangling line break
2020-12-21 21:06:14 +01:00
Jakub Loucký
9aeb775443
Apply suggestions from code review
...
Co-authored-by: m52go <735155+m52go@users.noreply.github.com>
2020-12-21 21:03:28 +01:00
ghubstan
27efc5f3c2
Merge branch '09-refactor-grpc-error-handling' into 10-callrate-interceptor
...
Adjust to reverting to reverting 6aa385e
2020-12-21 15:44:34 -03:00
ghubstan
8ee3a1599c
Merge branch '08-gettransaction' into 09-refactor-grpc-error-handling
...
Adjust to reverting 6aa385e
2020-12-21 15:35:15 -03:00
ghubstan
1507a2c791
Resolve file conflict w/ master
2020-12-21 15:31:07 -03:00
ghubstan
4aa4270ed9
Adjust TradeTest to reverting 6aa385e494
2020-12-21 15:23:23 -03:00
ghubstan
3a770f4bc0
Adjust TakeSellBTCOfferTest to reverting 6aa385e494
2020-12-21 15:22:05 -03:00
ghubstan
97dcac2a2d
Adjust TradeFormat to reverting 6aa385e494
2020-12-21 15:19:10 -03:00
ghubstan
64c2ac5169
Adjust grpc.proto to reverting 6aa385e494
2020-12-21 15:17:52 -03:00
ghubstan
bdde24a463
Ajust TradeInfo to reverting 6aa385e494
2020-12-21 15:10:43 -03:00
