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

199 commits

Author SHA1 Message Date
Mike Rosseel
f1d37433ef
Remove API module 
The API module will be hosted in a separate repo, so it shouldn't be
in this one. GUI module will reference the API artifact created by
that other repo to allow the command-line switch to function on
first checkout of the bisq project.
 2017-10-10 11:11:39 +02:00
Mike Rosseel
a72986ff5b
Merge remote-tracking branch 'origin/Development' into issue544-api 2017-09-18 09:45:22 +02:00
Manfred Karrer
50106990ba
Merge branch 'master' into Development 
Merge master to Development
 2017-09-16 12:28:49 -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
Mike Rosseel
9456b00127 Merge branch 'Development' into issue544-api 2017-08-28 09:31:45 +02:00
Chris Beams
ede1f90167
Upgrade to latest HEAD of our libdohj fork 2017-08-23 15:43:36 +02:00
Chris Beams
6ffa52a006
Rename bitsquare/bitsquare => bisq-network/bisq-exchange 2017-08-23 15:36:17 +02:00
Chris Beams
391910576b
Update to depend on latest commit in libdohj-core 
Depending on this commit ensures that we do not transitively depend on
bitcoinj snapshots.
 2017-08-21 16:22:11 +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
779d388070 Merge branch 'Development' into issue544-api 2017-07-27 08:42:56 +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
8602108ef3 Merge branch 'Development' into issue544-api 2017-07-25 16:36:27 +02:00
Mike Rosseel
dc4e169602 update dependency versions for api (dropwizard/swagger compatibility): guava, jackson-annotations. 2017-07-25 16:32:19 +02:00
Mike Rosseel
337610ef7c Merge branch 'Development' into issue544-api 2017-07-17 13:19:24 +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
Mike Rosseel
47e771ef84 changing api version 2017-07-17 09:26:53 +02:00
Mike Rosseel
cda82172e3 Merge branch 'Development' into issue544-api 
Conflicts:
	.idea/codeStyleSettings.xml
 2017-07-17 09:03:15 +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
e857d411bb Use LibDohj 0.14.2 2017-07-14 18:28:15 +02:00
Manfred Karrer
2a55758d3b Merge branch 'Development' into 0.5.2 2017-07-14 11:42:16 +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
dfc67b3df0 Merge branch 'Development' into downloadUpdates 2017-07-11 23:32:36 +02:00
cedric.walter
692bc1a837 added dependency management for all bouncycastle dependencies, these jar are signed and can not be placed in shaded jar, copy them in a lib directory that will be use by shaded.jar classloader 2017-07-08 21:03:13 +02:00
cedric.walter
8457802943 added code to activate unlimited cipher strength when using jdk 9 2017-07-08 16:39:12 +02:00
Mike Rosseel
2f4ef841bf rebase of downloadUpdates branch by Simon Tuberlin on the Development HEAD 
- rebase conflicts due to package renames
- some bouncy castle pgp stuff changed with new releases
 2017-07-07 17:35:17 +02:00
SimonTuberlin
3e895f45e4 Sig verification for multiple keys 
but download somehow does not work anymore :s
TODO: Open download folder, give qualified report about signatures
 2017-07-07 17:35:17 +02:00
Manfred Karrer
e68f4219c6 v0.5.2 2017-07-03 12:18:14 +02:00
Manfred Karrer
570549bfd1 v0.5.1 2017-07-01 00:32:06 +02:00
Mike Rosseel
e851db1f01 merge 2017-06-29 15:08:33 +02:00
Manfred Karrer
e2fa679a68 Merge DAO branch to Development branch 2017-06-27 01:29:54 +02:00
Manfred Karrer
f7993b61c2 Change version nr 0.5.0.0. to 0.5.0 2017-06-23 18:10:26 +02:00
Mike Rosseel
4d2d81174f Merge branch 'DAO' into issue544-api 
Conflicts:
	bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
 2017-06-16 10:48:01 +02:00
Manfred Karrer
d27c4a6d7f Use https://github.com/bitsquare/bitsquare instead of https://github.com/bisq/bisq 2017-06-11 22:52:47 +02:00
Manfred Karrer
0583b7a3cb use capital letter for Bisq. Use bitsquare in github links (new bisq GH not defined yet) 2017-06-11 22:25:25 +02:00
Manfred Karrer
24d5b2d9ae Use libdohj v 0.14.1. 
Update build.md
 2017-06-10 12:03:41 +02:00
Mike Rosseel
dc01aef917 libdohj was lost 2017-06-09 20:03:09 +02:00
Mike Rosseel
aed210c33d Merge branch 'DAO' into issue544-api 
Conflicts:
	bsq_utxo_provider/src/main/java/io/bisq/bsq_utxo_provider/BsqUtxoProviderModule.java
	core/src/main/java/io/bisq/core/trade/statistics/TradeStatisticsManager.java
	core/src/main/java/io/bitsquare/trade/offer/Offer.java
	gui/src/main/java/io/bisq/gui/app/BisqApp.java
	pom.xml
 2017-06-07 15:18:59 +02:00
Manfred Karrer
e49b6b8783 Version 0.4.9.9.2 2017-05-18 15:41:48 +02:00
Manfred Karrer
e5585a1b3a Version 0.4.9.9.2 2017-05-18 00:44:43 +02:00
Mike Rosseel
bf7c06e0e2 getting the Trade serialized, wip 2017-05-03 16:52:15 +02:00
Manfred Karrer
b805a795dd Adjust code to work with BitcoinJ 0.14.4.1 2017-04-21 15:20:32 -05:00
Manfred Karrer
2955c0efff Use Seednode for block requests. Broadcast new blocks to P2P network. Add AppSetup class for SeedNode. Remove utxo_provider module (seednode can be configured to act as BSQ full node) 2017-04-16 23:28:36 -05:00
Mike Rosseel
03c1b4970b dependency fixes 2017-04-07 11:20:15 +02:00
Manfred Karrer
f1054446db Update guice version. Add utxo_provider module. 2017-04-04 21:54:02 -05:00
Manfred Karrer
e96e408e33 Fix incorrect handling of logical and/or. Rename rpc optionkeys. Use lombok in BSQ tx value objcts. Use map with txId, index tuple instead of nested map for utxo. Rename BSQ Tx classes. Fix BSQ parsing algo. Add and improve tests. 2017-04-01 11:41:13 -05:00
Manfred Karrer
1215834864 Remove Alert delegates 2017-03-27 23:16:23 -05:00
Manfred Karrer
94a44b6c99 Add emailAddress to arbitr. and mediator. Add PGPPubKey to PubKeyRing 2017-03-26 15:21:39 -05:00