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

3643 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Rosseel
4f68de2a96 ViewPath works 2017-05-09 22:32:42 +02:00
Mike Rosseel
423e5c8e05 TradableList works 2017-05-08 21:46:17 +02:00
Mike Rosseel
d99cab1d3c CompensationRequest done (added extends Persistable), ProcessModel done. 
TODO: adding trade objects to resolver
 2017-05-04 22:19:49 +02:00
Manfred Karrer
5d755f7288 Add toProto to ProcessModel (WIP) 2017-05-04 15:49:45 +02:00
Mike Rosseel
0c872396b0 Merge remote-tracking branch 'origin/disk-protobuffer' into disk-protobuffer 2017-05-04 15:45:12 +02:00
Mike Rosseel
7f56d01cee getting the Trade serialized, missing processmodel and decryptmsgwithpubkey 2017-05-04 15:44:30 +02:00
Manfred Karrer
26d4279d8c Remove bloomfilter nonce 2017-05-04 15:15:50 +02:00
Mike Rosseel
bf7c06e0e2 getting the Trade serialized, wip 2017-05-03 16:52:15 +02:00
Mike Rosseel
5498025a3a fix paymentaccount deser 2017-04-28 20:50:46 +02:00
Mike Rosseel
6cee0e415c fix paymentaccount reading + refactor tradecurrency to fromProto 2017-04-28 16:27:54 +02:00
Mike Rosseel
cea1c0c778 VoteItemsList added, paymentaccount debugging 2017-04-27 16:34:39 +02:00
Mike Rosseel
ab19521b6f Preferences fixes 2017-04-26 21:19:35 +02:00
Mike Rosseel
19c1659459 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/proto/CoreNetworkProtoResolver.java
 2017-04-25 11:27:27 +02:00
Mike Rosseel
3a79e573ff Merge branch 'DAO' into disk-protobuffer 2017-04-25 11:11:17 +02:00
Manfred Karrer
facdb32670 Add progress bar for chain sync 2017-04-24 22:44:46 -05:00
Manfred Karrer
89990de463 Replace occurances of Bitsquare with bisq 2017-04-24 21:59:17 -05:00
Manfred Karrer
20098cb814 Fixed merge issues (old bitsquare package) 2017-04-24 21:57:24 -05:00
Manfred Karrer
cff0b52e47 Added JNS (Janus) 2017-04-24 21:45:43 -05:00
Manfred Karrer
18d0bc0464 Merge branch 'Development' into DAO 
# Conflicts:
#	gui/src/main/java/io/bisq/gui/main/overlays/windows/SpendFromDepositTxWindow.java
#	gui/src/main/java/io/bisq/gui/util/validation/AltCoinAddressValidator.java
 2017-04-24 21:40:25 -05:00
Manfred Karrer
41d9123397 Merge pull request #805 from tig100/nxt-validation 
Nxt address validator
 2017-04-24 21:30:00 -05:00
Manfred Karrer
9fe3bf7510 Fix nullpointer in constructor 2017-04-24 14:09:04 -05:00
Manfred Karrer
a410da43ad Remove all json files at startup. Improve logs 2017-04-24 13:43:22 -05:00
Mike Rosseel
c7e765d52c Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/proto/CoreNetworkProtoResolver.java
 2017-04-24 15:33:25 +02:00
Mike Rosseel
64f13e1bfd sequencenumbermap resolver 2017-04-24 15:13:13 +02:00
Manfred Karrer
61981c0c3d Fix issue with marketbased price. Change format for BSQ to 4 decimals instead of 8 in create offer view 2017-04-23 23:47:41 -05:00
Manfred Karrer
87af0b4644 Add another seednode, add more logging 2017-04-23 18:21:51 -05:00
Manfred Karrer
445823412a Remove startup timeout for seednode 2017-04-23 15:33:45 -05:00
Manfred Karrer
dc1243bc78 Fix wrong path 2017-04-23 15:13:33 -05:00
Manfred Karrer
56c1448fb4 Set devmode false, remove dummy address in send bsq view 2017-04-23 13:46:25 -05:00
Manfred Karrer
cd8daaf483 Set testnet genesis tx 2017-04-23 13:39:54 -05:00
Manfred Karrer
f885716a3d Check if BSQ wallet is funded when using BSQ for trade fee 2017-04-23 13:05:21 -05:00
Manfred Karrer
c8c900e190 Update build files (add protobuffer dependency) 2017-04-23 13:04:45 -05:00
Tomislav Gountchev
4c47c26013 Nxt address validator 2017-04-23 13:15:16 +03:00
Manfred Karrer
64c696a264 Show popup if no btc funds available for BSQ tx 2017-04-22 14:12:36 -05:00
Manfred Karrer
b0a51c0389 Fix emptyWallet issues (allowspedignUnconfiremd was missing). Add better icons for tx type. 2017-04-22 12:37:12 -05:00
Manfred Karrer
c6af0c5e72 Remove rpc property file and put it in code. 2017-04-22 01:35:45 -05:00
Manfred Karrer
6b5ae740f5 Add ScriptTypes: witness_v0_keyhash and witness_v0_scripthash. Use testnet genesis tx. Use version 0.5.8.1. of btcd rpc lib. Update docs 2017-04-22 01:02:18 -05:00
Manfred Karrer
c9238fbc32 Use UNVERIFIED and INVALID txTypes instead of UNDEFINED 2017-04-21 23:15:39 -05:00
Manfred Karrer
5e3b68453c Add Tx type column. Display all wallet txs also invalid or unverified 2017-04-21 22:57:45 -05:00
Manfred Karrer
9b4e40aacc Use Address.fromBase58() instead of deprecated new Address(). Use "B" as prefix for bsq addresses. Add BSQAddressTextField. 2017-04-21 21:19:42 -05:00
Manfred Karrer
c81d208ab7 Add info field for mediator 2017-04-21 20:43:16 -05:00
Manfred Karrer
7493f14b4d Auto select all sepa countries by default 2017-04-21 19:07:08 -05:00
Manfred Karrer
2a66600009 Update build docs 2017-04-21 15:54:37 -05:00
Manfred Karrer
b805a795dd Adjust code to work with BitcoinJ 0.14.4.1 2017-04-21 15:20:32 -05:00
Manfred Karrer
9ab7cff156 Made Transaction and Coin fields transient. Do instantiation of transient fields in getters. Removed readObject and init methods. 2017-04-20 15:37:46 -05:00
Manfred Karrer
df1d5924d0 Make Transaction transient in Trade and fetch it on demand from wallet 2017-04-20 13:50:52 -05:00
Manfred Karrer
7771ba393d Use connected txo in txin, remove isverfied from tx 2017-04-20 13:14:49 -05:00
Mike Rosseel
6f18939fcb fix arbitrator signature which was not UTF-8 (convert to hex would be better?), null field errors. 2017-04-20 16:06:25 +02:00
Mike Rosseel
9e0056a276 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 2017-04-20 08:51:17 +02:00
Mike Rosseel
93b9847e47 User split in User and UserVO, all persisted stuff goes to UserVO, a lot cleaner than a class loading itself and fiddling at its internal bits - now you load your VO and replace it with the loaded version, update observables and done, code is shorter and more readable as well. Added fromProto() methods. Fixed a toProto bug. 2017-04-20 08:50:58 +02:00