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

945 commits

Author SHA1 Message Date
Manfred Karrer
7c45fb78cc
Remove never traded coins 2017-09-17 13:10:34 -05:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development 
Merge master to Development
 2017-09-16 12:28:49 -05:00
Manfred Karrer
9c77da778e
Remove developer log 2017-09-16 10:11:39 -05:00
Chris Beams
0f2145d19c
Rename bisq-network/{bisq-exchange => exchange} 
This is a follow on to 6ffa52a00. bisq-network/bisq-exchange is too
verbose, and other repositories have been shortened as well, e.g.
bisq-network/price-relay-node has become bisq-network/pricenode.
 2017-09-05 14:55:42 +02:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange 2017-08-23 15:36:17 +02:00
Manfred Karrer
e8c46c9709 Merge branch 'master' into Development 
# Conflicts:
#	doc/build.md
 2017-08-09 12:48:07 +02:00
Chris Beams
6ece78352f
Replace snapshot versions of JitPack deps with fixed SHAs (#899) 2017-08-09 12:41:18 +02:00
Chris Beams
ae05c015b9
Consume custom bitcoinj/libdojh/btcd deps via JitPack (#899) 
This change removes the need to clone and build bisq's forks of
bitcoinj, libdohj and btcd-cli4j in order to build bisq itself.
 2017-08-09 12:13:47 +02:00
Mike Rosseel
592bea9dad make a tradeProtocol getter for api use, cleanup protobuf in main pom and move protobuf-util to common like the other protobuf dependency. Also make it visible outside of test 2017-07-26 16:37:59 +02:00
Mike Rosseel
dc4e169602 update dependency versions for api (dropwizard/swagger compatibility): guava, jackson-annotations. 2017-07-25 16:32:19 +02:00
Manfred Karrer
a7f3d68cb1 Version 0.5.3 with hotfix for fixing wrong app data name (bisq was renamed to Bisq -> we rename the app data dir). 2017-07-17 10:05:08 +02:00
Manfred Karrer
c237c64550 Ignore failing tests, add TODO 2017-07-16 17:12:45 +02:00
Manfred Karrer
b7d8a0acb6 set version 0.5.2 2017-07-16 16:29:10 +02:00
Manfred Karrer
a2563fd0d4 Cleanup, improve comments, small refactorings 2017-07-16 16:06:05 +02:00
Manfred Karrer
bbacd09074 Fix missing break 2017-07-16 15:32:43 +02:00
Manfred Karrer
0b6c3c04da Fix tests 2017-07-16 03:29:52 +02:00
Manfred Karrer
25f9368990 Add info for wallet restore 2017-07-16 02:35:03 +02:00
Manfred Karrer
50d9c453ba Fix wrong decimals for fiat price and volume for offer json 2017-07-16 02:34:26 +02:00
Manfred Karrer
349ae774a8 Increase trade limits to 2 BTC for OK_PAY and Altcoins 2017-07-16 01:16:35 +02:00
Manfred Karrer
51e8aae991 Add email again but set to empty string as otherwise it would break backward compatibility (hash of contract) 2017-07-16 00:34:46 +02:00
Manfred Karrer
04fa5f079f Remove email from bank accounts and fasterpayment 2017-07-15 23:09:13 +02:00
Manfred Karrer
f8ed97cb2e Merge branch 'Development' into 0.5.2 
# Conflicts:
#	core/src/main/java/io/bisq/core/payment/payload/PaymentMethod.java
 2017-07-15 14:57:42 +02:00
Manfred Karrer
edb5de0ac6 Fix fees, update to libdohj 0.14.2 2017-07-15 14:52:17 +02:00
Manfred Karrer
ca9e53a2ab Remove email from sepa account 2017-07-15 13:12:09 +02:00
Mike Rosseel
b2f6d7435c added dash as base currency 2017-07-14 20:20:19 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +02:00
Manfred Karrer
4b5b305389 Merge branch 'master' into Development 2017-07-14 11:41:39 +02:00
Manfred Karrer
6bbac2903b Change version nr back to 0.5.1 (0.5.2 is not ready yet) 2017-07-14 11:41:20 +02:00
Manfred Karrer
27105efe8e Handle nullable winner in DisputeResult for PB 2017-07-12 10:42:39 +02:00
Manfred Karrer
947a95385f Use TxType.UNDEFINED_TX_TYPE instead of TxType.UNDEFINED 2017-07-11 23:31:17 +02:00
Manfred Karrer
bba9b5179c Rename UNDEFINED to UNDEFINED_TX_TYPE (PB does not allow same enum items in diff. enums ;-() 2017-07-11 23:11:07 +02:00
Manfred Karrer
c9203d481a Check against UNDEFINED instead of null 2017-07-11 23:03:13 +02:00
Manfred Karrer
7860116a27 Add UNDEFINED to TxType as default value 2017-07-11 23:02:49 +02:00
Manfred Karrer
c7ccb56ca5 Add NewBestBlockListener to update BSQ tx UI if best chain has changed 2017-07-11 23:01:40 +02:00
Manfred Karrer
45720486b2 Use Bisq instead of bisq 2017-07-11 22:37:44 +02:00
Manfred Karrer
e51a1c4372 Rename ClearXchange to Zelle (ClearXchange) 2017-07-11 22:31:05 +02:00
Manfred Karrer
baabf3ba26 Allow trade limit of 5 BTC for BSQ 2017-07-11 22:23:27 +02:00
Manfred Karrer
908972deaf Add log 2017-07-11 21:02:00 +02:00
Manfred Karrer
ce62f74eb9 Refactoring: rename method 2017-07-11 21:01:47 +02:00
Manfred Karrer
9b394794ee Adjust setup procedure 2017-07-11 20:45:52 +02:00
Manfred Karrer
c76a4ac898 Use txOutputType = TxOutputType.UNDEFINED; instead of null 2017-07-11 20:45:33 +02:00
Manfred Karrer
d4867f712a Fix null pointer 2017-07-11 15:28:01 +02:00
Manfred Karrer
e2af215a57 Set txOutputType default to TxOutputType.UNDEFINED instead of null 2017-07-11 15:27:47 +02:00
Manfred Karrer
be8703fdac Move check for peer address after message type check 2017-07-10 16:58:28 +02:00
Manfred Karrer
fc9acb4eb4 Fix check if onMessage at connection is matching requested peer address 2017-07-10 16:55:27 +02:00
Manfred Karrer
67134651ee Improve log 2017-07-10 16:53:45 +02:00
Manfred Karrer
bda069fd17 Fix null pointers 2017-07-10 12:42:54 +02:00
Manfred Karrer
77f8bdb7b0 Merge branch 'master' into DAO_phase1 2017-07-09 23:07:04 +02:00
Manfred Karrer
2844cdece3 Merge pull request #860 from cedricwalter/fix-maven-transitive-dependency 
Fix maven transitive dependency
 2017-07-08 22:12:35 +02:00
cedric.walter
ec6dc25195 fixed maven transitive dependencies, do not use ${project.parent.version} but ${project.version} with this change you can now run test without installing first all artifacts to local repository! test now run before install as expected and with current code version of ide/reactor 2017-07-08 21:40:16 +02:00