mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 18:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity
9,524 Commits 4 Branches 148 Tags 4.3 GiB
b5f871b8ed
Commit Graph

3346 Commits

Author SHA1 Message Date
Christoph Atteneder
b5f871b8ed
Merge pull request #3165 from chimp1984/trade-chat 
Traders chat
 2019-08-30 19:00:03 +02:00
chimp1984
50baa9b023
Close chat window if dispute gets closed 2019-08-30 18:44:43 +02:00
chimp1984
c615780333
Update tradeChat.rules 2019-08-30 17:07:35 +02:00
chimp1984
16d3bc5d26
Update core/src/main/resources/i18n/displayStrings.properties 
Co-Authored-By: Steve Jain <mfiver@gmail.com>
 2019-08-30 16:54:16 +02:00
chimp1984
fa307207ac
Update core/src/main/resources/i18n/displayStrings.properties 
Co-Authored-By: Steve Jain <mfiver@gmail.com>
 2019-08-30 16:53:39 +02:00
sqrrm
dec5982b2a
Add BRL as mature market 
Move mature currency settings to CurrencyUtil as that seems a better fit
 2019-08-30 13:57:23 +02:00
chimp1984
5e267fa461
Handle nullables 2019-08-30 01:01:29 +02:00
chimp1984
663d8591c4
Add chat rules system msg; cleanups 2019-08-30 00:58:06 +02:00
chimp1984
5c1999f180
Fix wrong pubkey 2019-08-30 00:57:21 +02:00
chimp1984
a2cd80866d
Add missing setWasDisplayed 2019-08-30 00:07:32 +02:00
sqrrm
cb55693d4e
Set active currencies as high chargeback risk 2019-08-30 00:01:40 +02:00
chimp1984
81a93b56b1
Add onAllServicesInitialized call, rename method 2019-08-29 22:55:02 +02:00
chimp1984
e0c1a85406
Add wasDisplayed field to chatMsg 
- Fix logger
- Manage display state off trade chat msg (wip)
 2019-08-29 22:29:36 +02:00
chimp1984
855cb4f620
Add missing allServicesInitialized check 2019-08-29 21:40:32 +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
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
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
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
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
sqrrm
f8fe464ca3
Merge pull request #3121 from sqrrm/arbitrator-to-sign 
Arbitrator to sign
 2019-08-28 11:13:35 +02:00
wiz
80ce113cae
Add @nicolasdorier as backup seednode operator for jhgcy2won7xnslrb 2019-08-28 17:04:44 +09: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
4bc6616e7a
Do not send BSQ blocks to full nodes 2019-08-27 19:27: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
sqrrm
e3bd3a99e3
Merge remote-tracking branch 'origin/master' into arbitrator-to-sign 2019-08-27 11:27:33 +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
Christoph Atteneder
70e304e828
Merge pull request #3135 from TyphooN-/list-solo 
List Solo (XSL)
 2019-08-27 09:35:53 +02:00
sqrrm
74244c4ad9
Add non static ChargeBackRisk wrapper 2019-08-26 14:33:50 +02:00
sqrrm
972dda655b
Test BuyerDataItem, use lombok generated equals and hash 2019-08-26 11:33:42 +02:00
TyphooN
8e237b23ef
List Solo (XSL) 2019-08-23 17:11:51 -04:00
Christoph Sturm
31285b4419 Fix logging 
don't log peer as optional [....onion]
 2019-08-23 17:16:58 +02:00
Devin Bileck
7da3bab9ca
Suppress RPC service log entries when running as DAO lite node 
When running as DAO lite node, the following would get logged:

> INFO  b.c.dao.node.full.RpcService: The value of rpchost is
> INFO b.c.dao.node.full.RpcService: Starting RPCService with btcd-cli4j
version 0.5.8.4 on 127.0.0.1:8332 with user null

So instead of logging it when instantiating the RPCService, log it when
setting up the service.
 2019-08-23 01:38:08 -07:00
Christoph Sturm
5a67d9f092 fix random test failure. 2019-08-21 19:04:43 +02:00
sqrrm
61895102fd
Arbitrator sign accountAgeWitnesses 
Automatically filter to only sign accounts that
- have chargeback risk
- bought BTC
- was winner in dispute
 2019-08-21 17:43:29 +02:00
sqrrm
aed1e8027e
Publish signed witness 2019-08-21 17:35:43 +02:00
sqrrm
ad9715a2cd
Merge pull request #3108 from christophsturm/test-signed-witness 
make sure that signed witness is immutable.
 2019-08-21 16:31:37 +02:00
wiz
4d2a819a65
Add wiz's 2nd Bitcoin node 2019-08-21 18:17:18 +09:00
sqrrm
f2f62c7033
Merge pull request #3112 from freimair/optimizations 
Various optimizations
 2019-08-20 22:08:19 +02:00