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
3227 commits 3 branches 150 tags 4.1 GiB
Commit graph

3227 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
34ca2ecf28 Add OctoCoin 2017-03-30 21:18:19 -05:00
Manfred Karrer
17edfdb51f Merge pull request #792 from my-first/master 
Finish adding Octocoin
 2017-03-30 21:15:05 -05:00
Manfred Karrer
1d9113499d Merge branch 'Development' into master 2017-03-30 21:14:57 -05:00
MyFirst
efb1689eb3 Fix missing P2SH prefix in validation regex 2017-03-30 16:09:31 -04:00
MyFirst
f9c4bb730c Fix Typos in Octocoin validation 2017-03-30 15:29:33 -04:00
MyFirst
23c4768d29 Rename OctocoinAddressValidator to OctocoinAddressValidator.java 2017-03-30 15:01:59 -04:00
Manfred Karrer
4c8f20d237 Fixed some OctroCoin bugs. Tests still failing. Need fix 2017-03-30 09:24:30 -05:00
Manfred Karrer
928668004a Merge pull request #790 from my-first/master 
Add Octocoin
 2017-03-30 09:09:00 -05:00
MyFirst
8462867afe Fix P2SH 2017-03-30 02:09:27 -04:00
MyFirst
38b66e7f9a Add Octocoin 2017-03-30 01:25:55 -04:00
MyFirst
2e8bc02b5d Add Octocoin 2017-03-30 01:09:04 -04:00
MyFirst
d2190efb66 Add Octocoin 2017-03-30 01:07:33 -04:00
MyFirst
cb4716e85f Add Octcoin 2017-03-30 01:02:33 -04:00
Manfred Karrer
fd8f555c68 Use "open" as default filter in arbitration dispute table 2017-03-23 16:56:44 -05:00
Manfred Karrer
c8d05c23fa Update conmment: Add onion address of arbitrators 2017-03-23 16:13:13 -05:00
Manfred Karrer
fd8e217b35 Cleanup 2017-03-23 10:36:26 -05:00
Manfred Karrer
57f201fa55 Reduce nr. of backups for PersistedP2PStorageData and TradeStatisitics 2017-03-22 21:31:56 -05:00
Manfred Karrer
f84a038889 Version 0.4.9.9.1 2017-03-22 16:24:52 -05:00
Manfred Karrer
0a546978b3 Remove monitor and headless modules 2017-03-22 16:01:47 -05:00
Manfred Karrer
9d5ea06def Add ClearXchange warning popups 2017-03-22 15:55:39 -05:00
Manfred Karrer
919de1af30 Update display strings regarding recomm. miner fee 2017-03-22 13:39:07 -05:00
Manfred Karrer
adbb547eb1 Rename offererMultiSigPubKey to offererBtcPubKey (as well as wellers side) to not break serialized data 2017-03-22 13:31:45 -05:00
Manfred Karrer
6733c064b9 Support filter for "open" 2017-03-22 13:31:06 -05:00
Manfred Karrer
6283255b21 Update PersistedP2PStorageData 2017-03-22 13:19:07 -05:00
Manfred Karrer
c0d92fae25 Add try/catch and error msg with info if error at spread calculation (overflow) occurs (again) 2017-03-22 13:16:30 -05:00
Manfred Karrer
50329567bd Increase non trade tx fee default value. change upper limit for tx fee. increase width of data column in arbitr. screen 2017-03-22 13:04:13 -05:00
Manfred Karrer
0a46581407 Add pubKeyHex 2017-03-22 13:03:21 -05:00
Manfred Karrer
b2a85d65f3 Merge branch 'master' into Development 
# Conflicts:
#	pom.xml
 2017-03-22 12:14:42 -05:00
Manfred Karrer
d3da53d140 Cleanup 2017-03-22 12:14:17 -05:00
Manfred Karrer
6348c9c70a Cleanup 2017-03-22 11:55:15 -05:00
Manfred Karrer
1f0df0c132 Fix unintended string 2017-03-22 11:50:25 -05:00
Manfred Karrer
92ea099ab8 Update to BitcoinJ 0.13.1.11 2017-03-22 11:48:55 -05:00
Manfred Karrer
30e91ea0ee Dont use peers from AddressMessage calls in btcj if we have set our own node addresses or use localhost. 2017-03-17 00:44:01 -05:00
Manfred Karrer
01707ebb2d Update bitcoinJ to 0.13.1.10 2017-03-17 00:12:42 -05:00
Manfred Karrer
ff5cdaacaa Update bitcoinJ to 0.13.1.10 2017-03-17 00:09:53 -05:00
Manfred Karrer
e9fd330447 Merge pull request #768 from undso/scrollpanes 
Scrollpanes in market section
 2017-03-06 20:48:07 -05:00
Alexander Friedrichs
aa7615cd99 Removed unused code lines 2017-03-06 23:51:39 +01:00
Alexander Friedrichs
c35ce6bb79 Scrollpanes in market section 2017-03-06 23:37:53 +01:00
Manfred Karrer
5bc1ee2257 Merge branch 'Allow_reopen_dispute' into Development 2017-03-06 15:06:15 -05:00
Manfred Karrer
96f208f82b Allow re-opening of a dispute (in case the arbitrator has not received it) 2017-03-06 14:49:29 -05:00
Manfred Karrer
cea8b7d992 delay removeEntryFromMailbox call to avoid repeated application of the same msg 2017-03-06 14:47:45 -05:00
Manfred Karrer
20189b7128 Merge pull request #766 from undso/issue_755 
Scale GUI to fit in 1024x700 pixel #755
 2017-03-05 17:19:02 -05:00
Manfred Karrer
ecd0ff9971 Merge pull request #765 from undso/scrollpane_to_account_screen 
Add scrollpane to account screen #708
 2017-03-05 15:13:27 -05:00
Alexander Friedrichs
20103cba7e Scale GUI to fit in 1024x700 pixel #755 2017-03-05 17:21:34 +01:00
Alexander Friedrichs
f829d04986 Add scrollpane to account screen #708 2017-03-04 23:38:13 +01:00
Manfred Karrer
4e467b9530 Display BuyerMultiSigPubKey and SellerMultiSigPubKey in Contract.toString. Use Utils.HEX.encode instead of Arrays.toString for pub keys printing. 
Remove BuyerMultiSigPubKey and SellerMultiSigPubKey from ContractWindow and TradeDetailsWindow (included in contract.toString now)
 2017-03-01 10:18:44 -05:00
Manfred Karrer
9704619f6b Merge remote-tracking branch 'origin/Development' into Development 2017-02-28 09:57:14 -05:00
Manfred Karrer
e91ab3b584 Improve error logs 2017-02-28 09:56:51 -05:00
Manfred Karrer
a239ccee10 Remove debug logs 2017-02-28 09:55:37 -05:00
Manfred Karrer
c1a44afb91 Use MAX_MSG_SIZE_GET_DATA for GetDataRequest 2017-02-28 09:54:21 -05:00