mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-28 17:15:14 +01:00
Code Issues Projects Releases Packages Wiki Activity
12862 commits 3 branches 150 tags 4.1 GiB
Commit graph

788 commits

Author SHA1 Message Date
Luis Aranguren
ecf9d49f65
Resolve conflicts with master 2020-11-03 15:42:23 +01:00
Christoph Atteneder
3d7273883c
Merge pull request #4733 from jmacxx/edit_explorer_details 
Allow user-defined block explorers
 2020-11-02 19:23:48 +01:00
jmacxx
8a9d05eba0
Allow user-defined block explorers 
In Settings/General Preferences the Bitcoin Explorer and Bisq Explorer may
now be user defined in addition to the hard coded block explorer choices.

This implementation takes advantage of the existing Protobuf implementation
that stores a BlockExplorer Name/UrlTx/UrlAddress for BTC and for BSQ.

A new popup dialog is implemented which allows editing of the explorer
details (name, txUrl, and addressUrl).  Any of the system-defined
explorer details may be selected into the edit fields thus allowing
them to be used as templates, customized or an entirely new explorer to
be used.

If the user switches choice from a customized back to a pre-defined
explorer then the customized settings are gone; this is because the
Protobuf storage only allows saving one selection.

Fixes #4371
Closes #4634
 2020-11-02 07:53:06 -06:00
Christoph Atteneder
9ab65459df
Merge pull request #4736 from jmacxx/add_autoconf_service_filter 
Admin filter for auto-confirmation service addresses
 2020-11-02 10:47:22 +01:00
jmacxx
15b8e72059
Admin filter for auto-confirmation service addresses 
A service address can be filtered out using the admin key.  This would
be useful if a federated server failed, it could be filtered out so
that the auto-confirmation operates with the remaining services.  If
all federated service addresses were filtered out the user would have to
either confirm manually or use their own explorer service.
 2020-11-01 08:20:33 -06:00
sqrrm
89620a02da
Merge pull request #4706 from chimp1984/remove-outliers-at-bsq-rate 
Remove outliers when calculating BSQ rate
 2020-10-31 23:07:40 +01:00
chimp1984
1f45d492ef
Remove todos 2020-10-28 21:52:38 -05:00
chimp1984
ebce18c338
Add transferwise account 2020-10-28 21:35:47 -05:00
chimp1984
8bfe9b82c8
Remove outliers when calculating BSQ rate 
Add percentage for upper and lower threshold for outlier detection.
 2020-10-25 18:34:22 -05:00
Christoph Atteneder
55c663ad47
Merge pull request #4676 from jmacxx/show_tx_fee 
Show current tx fee rate on main screen
 2020-10-24 11:40:34 +02:00
chimp1984
21bd85c488
Remove signature from GetInventoryRequest (as monitor is public it does not make sense to limit requests). 
Add html output and webserver
 2020-10-23 01:17:33 -05:00
jmacxx
7c7887d91f
Changes requested: 
Shorten "synchronized" to "synced"
    Move Bitcoin network peer count to right with Bisq network peer count

Moved "Synchronizing DAO" to center for clarity/balance.
 2020-10-22 22:01:37 -05:00
Christoph Atteneder
ebe4618bfe
Merge pull request #4655 from bisq-network/release/v1.4.0 
Release/v1.4.0 and v1.4.1
 2020-10-20 09:10:12 +02:00
Christoph Atteneder
4a20cc8379
Merge pull request #4637 from jmacxx/clickable_urls 
Make URLs in popup notices clickable
 2020-10-16 14:38:54 +02:00
Christoph Atteneder
b7c6c42475
Update bitcoinj checkpoints for v1.4.0 2020-10-15 09:13:17 +02:00
jmacxx
ce1efa1337
Remove unused strings, ref: 
https://github.com/bisq-network/bisq/pull/4637#issuecomment-708721299
 2020-10-14 20:54:09 -05:00
jmacxx
b17c5c9353
Make URLs in popup notices clickable 
Fixes #4623

URLs in Javafx label controls are not clickable, so separate them out to
one or more clickable Hyperlinks displayed at the footer of the popup.

The approach taken for this is to embed the tag `[HYPERLINK:]` in the
message around a link that you want to be handled this way.  The links
can be anywhere within the popup message, in the same order that they
will be displayed.  Using the tag has the advantage of being optional,
and does not require new code to be written for each individual popup.

Refactor to be more flexible; allowing inline hyperlinks

Codacy nits.
 2020-10-14 13:42:51 -05:00
Christoph Atteneder
06e7e4b8f1
Update bitcoinj checkpoints for v1.4.0 2020-10-14 15:39:21 +02:00
Mike Rosseel
58f5066e0a
Resolve conflict in 'core/src/main/resources/btc_mainnet.seednodes'. 2020-10-14 15:15:30 +02:00
Mike Rosseel
000f319930
Merge branch 'master' into update-mr-seednode 2020-10-14 14:07:09 +02:00
Mike Rosseel
d1b936e7c5
Adding two torv3 seednodes, removing torv2 nodes 2020-10-14 13:54:22 +02:00
wiz
866b227fcc
Replace emzy's v2 seednodes with new v3 seednodes 2020-10-14 12:54:25 +02:00
Christoph Atteneder
b57ae3532f
Merge pull request #4644 from wiz/update-emzy-seednodes-v3 
Replace emzy's v2 seednodes with new v3 seednodes
 2020-10-14 12:54:05 +02:00
wiz
1f2002ad0e
Replace emzy's v2 seednodes with new v3 seednodes 2020-10-14 18:24:19 +09:00
Oscar Guindzberg
f9f5d92941
Add segwit/legacy checbox for address creation 2020-10-08 16:33:52 -03:00
Christoph Atteneder
2d06946c18
Update translations for v1.4.0 2020-10-08 09:41:42 +02:00
dchoe
39d37e1070
Update displayStrings.properties 
Better wording
 2020-10-06 10:44:09 -05:00
Chris Beams
e623d9638e
Fix typo in 'available for withdrawal' popup 2020-10-02 08:54:42 +02:00
chimp1984
fb41a1984b
Merge branch 'master_upstream' into fix-delayed-payout-tx-issues 
# Conflicts:
#	core/src/main/java/bisq/core/trade/TradeManager.java
#	desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
 2020-10-01 09:24:46 -05:00
chimp1984
25e64cd6b5
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:44 -05:00
chimp1984
e071d5e025
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:28 -05:00
chimp1984
9cf368c449
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:06:09 -05:00
chimp1984
c3d3e5230e
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:05:46 -05:00
chimp1984
6c114b44e8
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:05:21 -05:00
chimp1984
77ae1bddfa
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:45 -05:00
chimp1984
92902102ec
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:27 -05:00
chimp1984
4e2ccf249b
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:17 -05:00
chimp1984
1fef02e6f1
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:04:04 -05:00
chimp1984
dc15c7dfa7
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:53 -05:00
chimp1984
e3cc62ed60
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:41 -05:00
chimp1984
126f99668d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:30 -05:00
chimp1984
08e2a2e0b0
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:18 -05:00
chimp1984
c448b1b58d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:03:01 -05:00
chimp1984
285003743d
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:02:49 -05:00
chimp1984
6be21fa86c
Update core/src/main/resources/i18n/displayStrings.properties 
Co-authored-by: m52go <mfiver@gmail.com>
 2020-09-29 01:02:11 -05:00
chimp1984
f46e132195
Add rocket icon to xmr offers which have enabled autoconf 
Add info to tooltip and to offer window
Add center css to actions column. It looks weird that title is left aligned and button is centered.
only "last-column", "avatar-column" worked, making an new style e.g. center-column did not succeed... css is not my friend....
Shorten "Time since signing" to "Signed since" header to avoid truncation
 2020-09-29 00:45:31 -05:00
chimp1984
28a85c1ce5
Fix display strings 2020-09-27 02:04:35 -05:00
chimp1984
5309f04b40
DO not deactivate move to failed trades button. Use different text in popup if all txs are valid. 
Fix icon style issues.
 2020-09-26 18:33:25 -05:00
chimp1984
3cc633f39f
Add check if trade was already taken in the past. If so show a popup at take offer screen. 
We could deactivate such offers as well but as it is only for exceptional cases I think this way is good enough (would be more effort otherwise).
 2020-09-25 21:30:19 -05:00
chimp1984
10bedee803
Merge branch 'dispute-agent-branch' into fix-delayed-payout-tx-issues 
# Conflicts:
#	core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSetupDepositTxListener.java
 2020-09-25 15:03:28 -05:00