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

9622 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Christoph Atteneder
4dfafb4ece
Merge pull request #3164 from sqrrm/chargeback-currencies 
Set active currencies as high chargeback risk
 2019-08-30 14:05:12 +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
Christoph Atteneder
44a00187fe
Merge pull request #3167 from battleofwizards/dont-specify-indirect-module-deps 
Do not specify indirect module dependencies
 2019-08-30 12:54:03 +02:00
Christoph Atteneder
8edd2611db
Use button instead of label to fix tooltip font size, use material design icon and add additional cleanup code 2019-08-30 12:42:17 +02:00
Christoph Atteneder
964ca648b8
Fix positioning of badge 2019-08-30 12:04:55 +02:00
battleofwizards
37ee034b96
Do not specify indirect module dependencies 
One is supposed to only specify direct dependencies in build.gradle.
This commit removes two superfluous deps statements for the desktop
module. Other modules already follow the convention.

This does *not* remove any dependencies - it only cleans up how they
are specified.
 2019-08-30 11:54:46 +02:00
Christoph Atteneder
19a4e6f891
Merge pull request #3166 from wiz/darkmode-fixes 
Additional CSS fixes/tweaks for Dark Mode theme
 2019-08-30 10:55:49 +02:00
wiz
efe1b47b88
Additional CSS fixes/tweaks for Dark Mode theme 2019-08-30 10:13:12 +09: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
6304c9ec84
Add badge for num new chat msg 2019-08-30 00:07:51 +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
battleofwizards
3f1b188e21
Add dropdown autocomplete on Market, Buy, Sell tabs; fix #2226 
Basic autocomplete feature for all dropdowns on the major tabs:

* Market / Offer Book
* Market / Trades
* Buy BTC
* Sell BTC

Known limitations:

* Autocomplete still missing from Settings, Account, DAO tabs
* Minor UX glitches remain despite lots of debugging and polishing

Related issues:

* fix #2226
* partially addressed #2712
* superseded #112
 2019-08-29 20:33:34 +02:00
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