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

3760 commits

This branch
This branch
All branches
Author SHA1 Message Date
Manfred Karrer
be73d4d83c Merge branch 'DAO' into disk-protobuffer 2017-05-11 18:14:32 +02:00
Manfred Karrer
00268cd6af Use 4 days for sepa 2017-05-11 18:13:35 +02:00
Mike Rosseel
2f25c0701d Merge remote-tracking branch 'origin/disk-protobuffer' into disk-protobuffer 
# Conflicts:
#	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
 2017-05-11 14:42:50 +02:00
Mike Rosseel
3108e784cc Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
 2017-05-11 14:42:19 +02:00
Mike Rosseel
6591057489 Merge remote-tracking branch 'origin/DAO' into disk-protobuffer 
Conflicts:
	core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java
 2017-05-11 14:41:49 +02:00
Mike Rosseel
093b7828b1 tradablelist fixes 2017-05-11 14:38:24 +02:00
Manfred Karrer
a97a3cc08b Improve BSQ fee handling in createOffer and TakeOffer screens 2017-05-11 00:46:58 +02:00
Manfred Karrer
cc5a57509b Fix wrong popup if user starts app 2 times 2017-05-10 22:12:26 +02:00
Manfred Karrer
8633e0eaf2 Show price provider URL at tooltip 2017-05-10 21:54:35 +02:00
Manfred Karrer
7abeb6328f Fix isBullish property 2017-05-10 21:21:45 +02:00
Manfred Karrer
b31f8ea243 Fix issuanceVerification in parser 2017-05-10 21:18:32 +02:00
Manfred Karrer
82b1400681 Limit size of dispute message to 5000 chars in the UI 2017-05-10 21:14:30 +02:00
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
Manfred Karrer
9ae3e1e4c3 Refactor handling of DecryptedMsgWithPubKey in Trade. 2017-05-05 14:22:16 +02:00
Manfred Karrer
776893761c Add removeMailboxMessage method 2017-05-05 13:12:15 +02:00
Manfred Karrer
204385b4d9 Make getMailboxMessageSet private 2017-05-05 13:07:50 +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
Manfred Karrer
963494918d Add better logs, remove local seednode 2017-05-04 15:02:55 +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
Manfred Karrer
dbd31a8746 Add timeout 2017-04-25 11:30:08 -05: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