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

1188 commits

Author SHA1 Message Date
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
wiz
d308491d7f
Minor CSS fixes for light/dark themes 2019-08-30 01:42:09 +09:00
chimp1984
2189cba41b
Show chat in popup instead of tab (WIP) 2019-08-29 17:50:14 +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
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
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
41774bda48
Group burned BSQ by day 2019-08-28 11:18:01 +02:00
sqrrm
ace881cc04
Fix test, add singleton check for ChargeBackRisk 2019-08-27 12:47:02 +02:00
wiz
5bef161c6b
Tweak class names for navigation button text size for Japanese locale 2019-08-24 14:05:07 +09:00
wiz
d32f390809
Increase top navigation button text size for Japanese locale 2019-08-24 02:17:43 +09:00
Christoph Atteneder
0d9d1bdd8c
Merge pull request #3124 from battleofwizards/fix-dropdown-autocomplete-bugs 
Fix bugs in SearchComboBox (improve autocomplete)
 2019-08-23 11:10:35 +02:00
Christoph Atteneder
b43a006832
Merge pull request #3127 from devinbileck/activate-dao-preferences 
Fix incorrect DAO full node check when loading PreferencesView
 2019-08-22 19:35:25 +02:00
Devin Bileck
1780090558
Fix incorrect DAO full node check when loading PreferencesView 
When loading the preferences view, it would always log a warning
indicating that DAO full node is selected without providing required
parameters even though it wasn't selected.
 2019-08-22 01:28:11 -07:00
battleofwizards
fed956f63f
Fix bugs in SearchComboBox (improve autocomplete) 
Bisq's SearchComboBox implements a simple autocomplete. It is used
on the "add new altcoin account" form.

This fixes the following bugs in the SearchComboBox:

* no more dropdown flickering (fixed hide+show hack)
* space key no longer resets the text input
* unconfirmed changes no longer affect the form
* empty list no longer renders empty dropdown

This is a preparation step for using SearchComboBox more widely
in the project.
 2019-08-21 22:19:31 +02:00
Devin Bileck
b095086204
Prevent NullPointerException in ProposalsView 
When activating the ProposalsView, the table height is updated on the
user thread. Sometimes the scene is unavailable and causes a
NullPointerException. This should at least prevent the exception.

Fixes #2883 and #3116
 2019-08-21 00:59:30 -07:00
sqrrm
f2f62c7033
Merge pull request #3112 from freimair/optimizations 
Various optimizations
 2019-08-20 22:08:19 +02:00
Christoph Atteneder
85a93ba261
Merge pull request #3107 from christophsturm/christoph-more-tests 
inject CorruptedDataFilesHandler instead of making it static
 2019-08-20 11:34:14 +02:00
Florian Reimair
0501412d8e
Fix performance issue with DaoResultView 2019-08-20 11:18:17 +02:00
Christoph Sturm
7694d4e7d1 change some storage creations to injection. ensure its not a singleton 2019-08-19 17:19:45 +02:00
Christoph Sturm
b77cff9e26 inject CorruptedDataFilesHandler instead of making it static 2019-08-19 16:54:46 +02:00
battleofwizards
becfdc6819
Auto remove whitespace in the IBAN input field 
When adding a payment account Bisq requires IBAN to be whitespace free.

It is annoying for the user to manually clean pasted IBAN of spaces.
In online banking IBAN-s are usually displayed *with* spaces for
better readability.

This commit auto-removes whitespace when user is leaving the input
field, right before validation, effectively allowing to paste
real world IBAN-s.
 2019-08-17 22:36:26 +02:00
sqrrm
56037f0a08
Merge pull request #3077 from freimair/gui_tweaks 
Gui layout tweaks
 2019-08-16 18:23:55 +02:00
sqrrm
4381eea242
Merge pull request #3086 from christophsturm/p2ptest 
inject publickeyring
 2019-08-16 18:22:38 +02:00
Florian Reimair
9763753553
Merge pull request #3090 from battleofwizards/render-column-headers-in-csv-export 
Render proper column headers and values for CSV exports; fix #3075
 2019-08-14 18:46:41 +02:00
Florian Reimair
cb774176b7
Add minheight to prevent truncation 2019-08-14 18:34:43 +02:00
Christoph Sturm
5579c3019e rename MakerFeeMaker => MakerFeeProvider 2019-08-14 17:58:04 +02:00
Christoph Sturm
9eb174bc88 provide PubKeyRing and use it where appropriate instead of keyring 2019-08-14 17:58:04 +02:00
battleofwizards
72a6b784dc
Render proper column headers and values for CSV exports; fix #3075 
When exporting to CSV, both portfolio/trades and funds/transactions
were lacking the column headers.

Additionally, portfolio/trades colum values were outdated and
not matching the intended export.

Both issues are fixed.
 2019-08-14 16:35:40 +02:00
Christoph Sturm
d5af6e5260 avoid acronyms 2019-08-14 10:45:05 +02:00
Christoph Sturm
bd06d2a7df document what this is for 2019-08-14 10:42:38 +02:00
Christoph Sturm
17221cbed8 remove more powermock and jmockit tests. 
ignore 2 or 3 tests that are not possible to convert now
 2019-08-13 19:30:57 +02:00
Christoph Sturm
a8494a993a fix missing annotation 2019-08-13 15:58:14 +02:00
Christoph Sturm
c6f07ed945 singletonify the rest of the core module 2019-08-13 15:58:14 +02:00
Christoph Sturm
7500887484 even more singletoning 2019-08-13 15:58:14 +02:00
Christoph Sturm
3f097ebf63 more singletoning 2019-08-13 15:58:13 +02:00
Christoph Sturm
a4e8ec5ebf convert some of the core config 2019-08-13 15:58:13 +02:00
sqrrm
e52c255446
Merge pull request #3058 from christophsturm/bump-guice 
use singleton annotation instead of binding as singleton
 2019-08-13 15:19:41 +02:00
Florian Reimair
8821cdccf7
Dynamic list view sizes for DAO bonding tab 2019-08-13 12:43:40 +02:00
Florian Reimair
3018417d9b
Dynamic list view size for asset listing fee 2019-08-13 12:07:39 +02:00
Florian Reimair
637071c956
Dynamic list view size in Dao network monitor view 2019-08-13 11:44:47 +02:00
Florian Reimair
7e7d956f05
Dynamic list view size in accounts view 2019-08-13 11:22:08 +02:00
Florian Reimair
6ea0c50752
Update trading amount to prevent popup loop 2019-08-12 19:16:42 +02:00
sqrrm
fb1c96d24c
Merge pull request #2976 from niyid/master 
Fixes for issues #2741, #2944, #2955
 2019-08-09 15:35:21 +02:00
sqrrm
b92b4becfb
Merge pull request #3040 from bisq-2106-2/master 
Fix for #2106
 2019-08-09 15:32:50 +02:00
Christoph Atteneder
89073316c9
Merge branch 'master' of github.com:bisq-network/bisq into hotfix-v1.1.5 
# Conflicts:
#	build.gradle
#	desktop/package/linux/Dockerfile
#	desktop/package/linux/package.sh
#	desktop/package/linux/release.sh
#	desktop/package/macosx/create_app.sh
#	desktop/package/macosx/finalize.sh
#	desktop/package/macosx/insert_snapshot_version.sh
#	desktop/package/windows/package.bat
#	desktop/package/windows/release.bat
#	relay/src/main/resources/version.txt
 2019-08-08 11:19:51 +02:00
Christoph Atteneder
a56b367476
Revert to SNAPSHOT version 2019-08-08 10:34:06 +02:00
Christoph Atteneder
3bf3ff83b9
Bump version number 2019-08-08 09:54:54 +02:00