chimp1984
|
29e957a7ca
|
Apply changes from master
|
2019-08-29 19:11:09 +02:00 |
|
chimp1984
|
fa43f03151
|
Merge branch 'master_upstream' into sq-add-trader-chat
# Conflicts:
# desktop/src/main/java/bisq/desktop/main/disputes/trader/TraderDisputeView.java
|
2019-08-29 19:09:49 +02:00 |
|
chimp1984
|
bfb111da67
|
Add close handler to popup
- Close already open chat if new one opens
|
2019-08-29 18:56:11 +02:00 |
|
Christoph Atteneder
|
3ccae6922d
|
Merge pull request #3152 from wiz/darkmode
Dark Mode
|
2019-08-29 18:53:49 +02:00 |
|
wiz
|
d308491d7f
|
Minor CSS fixes for light/dark themes
|
2019-08-30 01:42:09 +09:00 |
|
sqrrm
|
9a2dfda418
|
Merge pull request #3162 from chimp1984/fix-mandatory-capability-check
Add missing check if capability is not empty before checking mandatory capabilities
|
2019-08-29 18:29:50 +02:00 |
|
chimp1984
|
adac3bd7e5
|
Do check after supportedCapabilities are applied
|
2019-08-29 18:21:38 +02:00 |
|
chimp1984
|
d7845d0eb1
|
Move check for empty capability.
- Move check for empty capability to connection class.
- Add MANDATORY_CAPABILITIES_NOT_SUPPORTED
- Add comment that capabilities can be empty
|
2019-08-29 18:15:17 +02:00 |
|
chimp1984
|
f5e4712c8a
|
Add missing check if capability is not empty before checking mandatory capabilities
We do not get the capabilities with all network messages so we have to
skip the test if the mandatory capability is included if capabilities
is empty.
|
2019-08-29 17:59:38 +02:00 |
|
chimp1984
|
2189cba41b
|
Show chat in popup instead of tab (WIP)
|
2019-08-29 17:50:14 +02:00 |
|
chimp1984
|
8e3a3514a3
|
Add comments, cleanup, fix wrong param name
|
2019-08-29 17:14:56 +02:00 |
|
chimp1984
|
cb673764df
|
Update string
|
2019-08-29 17:13:57 +02:00 |
|
chimp1984
|
5d338e693c
|
Fix merge issues
|
2019-08-29 17:07:39 +02:00 |
|
chimp1984
|
329572cc5d
|
Merge branch 'master_upstream' into sq-add-trader-chat
# Conflicts:
# core/src/main/java/bisq/core/arbitration/DisputeManager.java
# core/src/main/java/bisq/core/arbitration/messages/DisputeCommunicationMessage.java
# core/src/main/java/bisq/core/trade/Trade.java
|
2019-08-29 16:50:32 +02:00 |
|
Florian Reimair
|
4e7cb04043
|
Merge pull request #3154 from chimp1984/Fix-small-P2P-network-issues
Fix small p2p network issues
|
2019-08-29 16:15:18 +02:00 |
|
wiz
|
fd0c8652bd
|
Rename colors in bisq.css, add theme-light.css and theme-dark.css
Co-authored-by: Peter Banik <peter@froggle.org>
|
2019-08-29 20:48:01 +09:00 |
|
wiz
|
e2b47c8a37
|
Load different CSS file depending on dark mode setting
|
2019-08-29 20:28:04 +09:00 |
|
wiz
|
4eb85b955e
|
Add toggle switch UI preference for Dark Mode on/off
* Store preference for Dark Mode as int32 css_theme
|
2019-08-29 20:20:25 +09:00 |
|
Christoph Atteneder
|
edc1e6983b
|
Merge pull request #3153 from devinbileck/add-seednode-backup
Add backup operator for seeds 3f3cu2yw7u457ztq and fl3mmribyxgrv63c
|
2019-08-28 21:25:05 +02:00 |
|
chimp1984
|
55092edb6c
|
Disconnect nodes which do not have the mandatory capability
|
2019-08-28 21:06:17 +02:00 |
|
chimp1984
|
ab4aa64424
|
Smal performance optimisations, cleanups
|
2019-08-28 20:51:01 +02:00 |
|
chimp1984
|
bb628dc851
|
Avoid that removed mailbox messages get added again
|
2019-08-28 20:31:06 +02:00 |
|
chimp1984
|
a0e690997a
|
Merge branch 'master_upstream' into Fix-small-P2P-network-issues
# Conflicts:
# core/src/main/java/bisq/core/setup/CoreNetworkCapabilities.java
|
2019-08-28 19:49:18 +02:00 |
|
Devin Bileck
|
70a4009e85
|
Update backup operator
|
2019-08-28 09:16:06 -07:00 |
|
Devin Bileck
|
9c7c301860
|
Merge branch 'master' of https://github.com/bisq-network/bisq into add-seednode-backup
# Conflicts:
# core/src/main/resources/btc_mainnet.seednodes
|
2019-08-28 09:14:14 -07:00 |
|
Christoph Atteneder
|
d701d2f37a
|
Merge pull request #3157 from ripcurlx/change-burned-bsq-to-grouped-by-day
Group burned BSQ by day
|
2019-08-28 12:45:10 +02:00 |
|
Christoph Atteneder
|
4478476763
|
Merge pull request #3151 from chimp1984/dont-send-bsq-blocks-to-full-nodes
Do not send BSQ blocks to full nodes
|
2019-08-28 12:42:16 +02:00 |
|
Christoph Atteneder
|
41774bda48
|
Group burned BSQ by day
|
2019-08-28 11:18:01 +02:00 |
|
sqrrm
|
f8fe464ca3
|
Merge pull request #3121 from sqrrm/arbitrator-to-sign
Arbitrator to sign
|
2019-08-28 11:13:35 +02:00 |
|
Christoph Atteneder
|
bd89aa74f1
|
Merge pull request #3156 from wiz/add-backup-operator
Add @nicolasdorier as backup seednode operator for jhgcy2won7xnslrb
|
2019-08-28 10:23:41 +02:00 |
|
wiz
|
80ce113cae
|
Add @nicolasdorier as backup seednode operator for jhgcy2won7xnslrb
|
2019-08-28 17:04:44 +09:00 |
|
Christoph Atteneder
|
cbbd1a0bf8
|
Merge pull request #3150 from wiz/update-datastore
Update data storage on expired data removal
|
2019-08-28 09:43:20 +02:00 |
|
chimp1984
|
ca0a42ba42
|
Use node address for thread name; cleanup
|
2019-08-28 01:21:43 +02:00 |
|
chimp1984
|
72e291cf9c
|
Call supportedCapabilitiesListener on Userthread
|
2019-08-28 01:21:16 +02:00 |
|
chimp1984
|
79c08b6e04
|
Remove Capability.SIGNED_ACCOUNT_AGE_WITNESS
|
2019-08-28 01:20:10 +02:00 |
|
Devin Bileck
|
1790637c84
|
Add backup operator for seeds 3f3cu2yw7u457ztq and fl3mmribyxgrv63c
|
2019-08-27 15:32:55 -07:00 |
|
chimp1984
|
f95a7f5d3f
|
Add missing listener notification and clean up class
|
2019-08-27 22:03:23 +02:00 |
|
chimp1984
|
4bc6616e7a
|
Do not send BSQ blocks to full nodes
|
2019-08-27 19:27:39 +02:00 |
|
wiz
|
f3f04ddad9
|
Update data storage on expired data removal
|
2019-08-28 01:55:52 +09:00 |
|
Christoph Atteneder
|
1be6abf262
|
Merge pull request #3148 from wiz/tempProposal-improvement
Improve TempProposal processing (fixes #3143)
|
2019-08-27 15:54:39 +02:00 |
|
wiz
|
f5d75c4f60
|
Improve TempProposal processing (fixes #3143)
|
2019-08-27 22:36:37 +09:00 |
|
Christoph Atteneder
|
66e963aaa7
|
Merge pull request #3059 from camthegeek/list-masari
List Masari (MSR)
|
2019-08-27 14:19:11 +02:00 |
|
Christoph Atteneder
|
12a9e21f36
|
Merge pull request #3068 from zero24x/add-coin-varius
Add coin VARIUS
|
2019-08-27 14:18:35 +02:00 |
|
sqrrm
|
ace881cc04
|
Fix test, add singleton check for ChargeBackRisk
|
2019-08-27 12:47:02 +02:00 |
|
sqrrm
|
e3bd3a99e3
|
Merge remote-tracking branch 'origin/master' into arbitrator-to-sign
|
2019-08-27 11:27:33 +02:00 |
|
Christoph Atteneder
|
4c91671eec
|
Merge pull request #3113 from christophsturm/travis-jdk12
also run tests on jdk12
|
2019-08-27 11:00:49 +02:00 |
|
Christoph Sturm
|
9e17f812ce
|
Reformat travis config
|
2019-08-27 10:44:14 +02:00 |
|
Christoph Sturm
|
c5866eff80
|
Also run tests on jdk12
|
2019-08-27 10:42:46 +02:00 |
|
Christoph Atteneder
|
e93370ccd5
|
Merge pull request #3122 from christophsturm/fix-defaultseednoderepository
fix random test failure.
|
2019-08-27 10:01:16 +02:00 |
|
Christoph Atteneder
|
db823dda60
|
Merge pull request #3131 from christophsturm/improve-logging
fix logging of peer address
|
2019-08-27 09:43:23 +02:00 |
|