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

7477 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris Beams
cd616ffaf3
Merge pull request #1944 from henryBTR/list-bitcoinrhodium-asset 
List Bitcoin Rhodium (XRC)
 2018-11-20 14:29:44 +01:00
Chris Beams
956e77710e
Update core/src/test/java/bisq/core/user/PreferencesTest.java 
Co-Authored-By: henryBTR <42034896+henryBTR@users.noreply.github.com>
 2018-11-20 14:22:36 +01:00
Chris Beams
e7f2fd4104
Update core/src/main/java/bisq/core/locale/CurrencyUtil.java 
Co-Authored-By: henryBTR <42034896+henryBTR@users.noreply.github.com>
 2018-11-20 14:22:23 +01:00
Chris Beams
666a888ad1
Merge pull request #1927 from devinbileck/add-gitattributes 
Add gitattributes
 2018-11-20 14:20:47 +01:00
Chris Beams
9f4f5c48e1
Preserve CRLF line endings in .bat files 
This is specifically for the gradlew.bat file generated by the `gradle
wrapper` command. Typically, this file should never be edited, but just
in case it is, this configuration will preserve its original CRLF line
endings.
 2018-11-20 14:18:30 +01:00
Manfred Karrer
a64d695c10
Merge pull request #1942 from ripcurlx/ui-improvements 
Redesign: Extend focus line and textfield/textarea padding
 2018-11-19 13:45:06 -05:00
henryBTR
9fd26676af List Bitcoin Rhodium (XRC) 2018-11-19 19:32:49 +01:00
Christoph Atteneder
f122a4579f
Add padding for text area 2018-11-19 11:31:53 +01:00
Christoph Atteneder
16fe990424
Add padding to text input fields and extends focus line in create offer views 2018-11-19 11:12:30 +01:00
Devin Bileck
27c41a080c
Limit initial window size on application launch 
When launching the application, prevent the initial window size from
exceeding the maximum available bounds.
 2018-11-18 22:35:35 -08:00
Manfred Karrer
2564ae93f4
Remove comment 2018-11-18 12:13:34 -05:00
Manfred Karrer
671e5e30a0
Merge branch 'sqrrm-confiscation-tracking' into release-candidate-0.9.0 2018-11-18 11:08:37 -05:00
Manfred Karrer
89b092b7ea
Small fixes 
- Use Array list for PB list as PB lists are unmodifyable
- Rename method to contain the unspent property
- fix row index in view
 2018-11-18 11:07:30 -05:00
sqrrm
ed50b97b3d
Fix bsqdashboard availableamount 2018-11-17 23:13:13 +01:00
sqrrm
e815c4b105
Use lockup txid to track confiscation 
1. Every bond is defined by its lockup transaction. To make it easy to
track which bonds are confiscated it's easier to track them by only one
txid instead of using a map with a mix of lockup txoutputs and unlock
txoutputs.

To check if a txoutput has been confiscated it has to be checked against
the originiating lockup txid.

2. Minor fixes of naming lockedup -> lockup and comments.
 2018-11-17 23:13:13 +01:00
sqrrm
aa27d443a4
Display confiscated bond value 2018-11-17 23:13:13 +01:00
sqrrm
0c855f8dd0
Clearer param change validation 2018-11-17 23:13:13 +01:00
sqrrm
e577d0c4a9
Fix resource name 2018-11-17 23:13:13 +01:00
Manfred Karrer
aa05651ff4
Merge branch 'master' into release-candidate-0.9.0 2018-11-17 15:22:58 -05:00
Manfred Karrer
e37813c658
Merge pull request #1935 from freimair/externalTor 
Bisq can now use an external Tor service
 2018-11-17 14:02:11 -05:00
Manfred Karrer
c8416019f3
Merge pull request #1933 from ManfredKarrer/fix-temp-file-issue 
Don't use a temp file for the sound file
 2018-11-17 13:50:51 -05:00
Manfred Karrer
108ce1d72c
Merge pull request #1936 from ManfredKarrer/fix-formatting-issue 
Convert long dash to short dash for minus values
 2018-11-17 13:48:09 -05:00
Manfred Karrer
89825a3ef8
Cleanup 2018-11-17 13:35:53 -05:00
Manfred Karrer
3157e86f8b
Persist last selected payment account at take offer 
The last selected payment account gets persisted so that at the next
take offer attempt that same account is selected in the combo box in
case there are multiple accounts for that currency.
 2018-11-17 13:29:52 -05:00
Florian Reimair
717796103d Fixed tests as in: commit of shame 2018-11-17 18:44:10 +01:00
Florian Reimair
f0bfb3825a Declutter TorNetworkNode some more 2018-11-17 18:42:18 +01:00
Manfred Karrer
5f766b4cd5
Convert long dash to short dash for minus values 
Fixes https://github.com/bisq-network/bisq/issues/1925
 2018-11-17 12:32:42 -05:00
Florian Reimair
f493b5f619 Added hashes and Netlayer release 0.6 2018-11-17 18:14:18 +01:00
Manfred Karrer
43ace0b659
Don't use a temp file for the sound file 
We play a silent sound to prevent app nap and network disconnections.
Instead of a temp file which got deleted on exit and recreated each
startup we store it once in the data directory root.
Fixes https://github.com/bisq-network/bisq/issues/1931
 2018-11-17 12:06:59 -05:00
Florian Reimair
64c6e3d783 Connect with CookieAuthentication 2018-11-17 18:03:10 +01:00
Florian Reimair
139ec518fc Connect with PasswordAuthentication 2018-11-17 18:03:10 +01:00
Florian Reimair
63f8bbf8c5 Connect to external Tor with NullAuthentication 2018-11-17 18:03:10 +01:00
Florian Reimair
aa584acb92 Declutter TorNetworkNode 2018-11-17 18:03:10 +01:00
Florian Reimair
68d813fc0c Refactored TorNetworkNode 2018-11-17 18:02:49 +01:00
Manfred Karrer
46b972cba6
Merge branch 'release-candidate-0.9.0' of https://github.com/bisq-network/bisq into release-candidate-0.9.0 2018-11-17 11:42:27 -05:00
Manfred Karrer
834ac2c04f
Merge branch 'master' into release-candidate-0.9.0 2018-11-16 21:08:03 -05:00
Manfred Karrer
136c268dbb
Merge pull request #1928 from freimair/tor8.0.3 
Use tor binaries from TorBrowser 8.0.3
 2018-11-16 21:07:14 -05:00
Manfred Karrer
95554441e5
Merge pull request #1825 from MUEDEV/list-monetaryunit 
List MonetaryUnit (MUE)
 2018-11-16 20:38:46 -05:00
Manfred Karrer
5714ce5b70
Merge pull request #1818 from Actinium-project/update-asset-actinium 
Update: Actinium (ACM) - Support p2sh-SegWit Addresses
 2018-11-16 20:38:29 -05:00
Manfred Karrer
78e78f6b79
Merge pull request #1798 from alfredmox/list-mox-project 
List MoX (MOX)
 2018-11-16 20:37:56 -05:00
Manfred Karrer
ca78453e04
Merge pull request #1930 from ManfredKarrer/small-fixes 
Cleanup
 2018-11-16 20:33:40 -05:00
Manfred Karrer
ac7ed15bcc
Merge branch 'release-candidate-0.9.0' of https://github.com/bisq-network/bisq into release-candidate-0.9.0 2018-11-16 20:30:30 -05:00
Manfred Karrer
f3851145f0
Merge branch 'master' into release-candidate-0.9.0 2018-11-16 20:29:56 -05:00
Manfred Karrer
0c2c68e146
Put Blockstream explorer as first item in the list 
Put Blockstream explorer as first item in the list so it will be
taken as default explorer.
 2018-11-16 20:29:39 -05:00
Manfred Karrer
887ab1dc9f
Merge pull request #1924 from cbeams/revise-docs 
Revise contributor / developer docs
 2018-11-16 20:26:25 -05:00
Manfred Karrer
4bec5b3830
Cleanup 2018-11-16 20:18:47 -05:00
Florian Reimair
21a56cc127 worked around jitpack issue 2018-11-16 13:31:37 +01:00
Florian Reimair
3e25ee2cdd Use tor binaries from TorBrowser 8.0.3 2018-11-16 12:28:34 +01:00
Devin Bileck
fa5c402af5
Normalize line endings 2018-11-15 22:42:21 -08:00
Devin Bileck
15c83aa592
Add .gitattributes file 2018-11-15 22:34:05 -08:00