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

4328 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mike Rosseel
1f3e9dadfb
Merge branch 'api-pr1' of github.com:mrosseel/bisq-exchange into api-pr1 2017-10-12 16:14:34 +02:00
Mike Rosseel
c79d9e992c
Reverting non-relevant changes 2017-10-12 16:12:21 +02:00
Mike Rosseel
a8bcc4a9e3
Reverting non-relevant changes 2017-10-12 15:07:52 +02:00
Mike Rosseel
0755cac9d1
Merge remote-tracking branch 'origin/Development' into api-pr1 
Conflicts:
	common/src/main/java/io/bisq/common/locale/LocaleUtil.java
 2017-10-11 14:38:34 +02:00
Manfred Karrer
0c86ae9354
Add Altcoin Ellaism 2017-10-11 07:28:58 -05:00
Manfred Karrer
9732301dbd
Merge branch 'ManfredKarrer-Development2' into Development 2017-10-11 07:23:20 -05:00
Manfred Karrer
4c08fa8679
Merge branch 'Development' of https://github.com/ManfredKarrer/exchange into ManfredKarrer-Development2 2017-10-11 07:22:06 -05:00
Manfred Karrer
01cf823d7a
Prepare merge Dev 2017-10-11 07:21:50 -05:00
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
fbfb9ccc50
Merge branch 'Development' into issue544-api 2017-10-09 16:11:37 +02:00
Mike Rosseel
91b5d93bf0
Add support documents 
Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-10-09 16:05:45 +02:00
Manfred Karrer
ca71f4464f
Put altcoin Ellaism to right position in list 2017-10-08 21:15:38 -05:00
Manfred Karrer
8ac5d51bdd
Merge branch 'ellaismer-Development' into Development 2017-10-08 21:14:51 -05:00
Manfred Karrer
a8c81871c9
Merge branch 'Development' of https://github.com/ellaismer/exchange into ellaismer-Development 2017-10-08 21:12:02 -05:00
Manfred Karrer
a76b4d17f5
Show better text in PeerInfo if 0 trades 2017-10-08 21:03:08 -05:00
Manfred Karrer
361a520048
Remove sum column in market offerbook tables 2017-10-08 20:48:11 -05:00
Manfred Karrer
4522f50149
Fix wrong fee group at Create offer screen. Improve wording 2017-10-08 20:39:09 -05:00
Manfred Karrer
3963924359
Change Maker fee to Trade fee 2017-10-08 20:03:20 -05:00
Manfred Karrer
e26037c59f
Change Taker fee to Trade fee 2017-10-08 20:00:37 -05:00
Manfred Karrer
cb24b973ba
Don't show fee and security deposit fields if BSQ is not enabled 2017-10-08 19:53:52 -05:00
Manfred Karrer
6904c545b0
Improve logging 2017-10-08 19:53:04 -05:00
Manfred Karrer
15a5f75877
Merge remote-tracking branch 'upstream/Development' into Development 2017-10-06 21:04:53 -05:00
Manfred Karrer
ce25beff5e
Merge master to Development 2017-10-06 21:04:04 -05:00
Manfred Karrer
e5738507c3
Merge branch 'master' into Development 2017-10-06 20:57:32 -05:00
Manfred Karrer
2ac1b34996
Disable dev mode 2017-10-06 20:45:27 -05:00
Manfred Karrer
b060766537
Set phase 0 initial genesis tx 2017-10-06 20:45:07 -05:00
Manfred Karrer
fe91c8ee76
Set phase 0 genesis tx 2017-10-06 14:28:50 -05:00
Manfred Karrer
52dd76bd9a
Remove inactive blockexplorer blockr.io 2017-10-06 12:43:59 -05:00
Mike Rosseel
17b4eefd29
Add swagger annotations to make generated html better 
Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-10-02 09:32:08 +02:00
Manfred Karrer
99dc2f710a
Merge branch 'riclas-patch-6' 2017-09-30 13:16:35 -05:00
riclas
ae4212c567 created properties file for Simplified Chinese from transifex 2017-09-30 19:05:16 +01:00
Manfred Karrer
e6498e2659
Remove pre-filled entries in ManualPayoutTxWindow 2017-09-26 09:06:12 -05:00
Manfred Karrer
da2b12f71a
Rename SpendFromDepositTxWindow to ManualPayoutTxWindow 2017-09-26 08:47:55 -05:00
Manfred Karrer
c3320123c5
Add log for invalid arbitrators 2017-09-25 08:55:55 -05:00
Manfred Karrer
01e0ac3f57
Add equals check and diff for contractAsJson 2017-09-23 11:14:55 -05:00
Manfred Karrer
e73cd7abe2
Fix typos 2017-09-22 08:33:38 -05:00
Mike Rosseel
bc4460bc9e
Merge remote-tracking branch 'origin/Development' into issue544-api 2017-09-22 13:09:06 +02:00
Mike Rosseel
a713c4b502
Change offer_make to take a market_pair argument 
Instead of asking for a baseCurrency and a counterCurrency, the
method now just takes the market_pair (as returned in market_pair
method) and extracts the relevant currencies from that.

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-21 17:32:23 +02:00
Manfred Karrer
86c20682e9
Cleanup startup process 2017-09-21 09:03:50 -05:00
Manfred Karrer
570e2ffba0
Increase timeout 2017-09-21 09:02:59 -05:00
Manfred Karrer
96601afb9c
Fix issue #927 2017-09-20 15:52:16 -05:00
Ellaismer
a61f37b6e1 Add Ellaism coin 2017-09-21 04:38:36 +08:00
Manfred Karrer
80111caf3b
Rename bisq.io to bisq.network. 2017-09-20 15:21:13 -05:00
Manfred Karrer
ac0bf80606
Support different keys for code signing in download-tool 2017-09-20 15:05:25 -05:00
Manfred Karrer
981e6814cc
Add Chris Beams' gpg key 5BC5ED73 to resources 2017-09-20 13:07:50 -05:00
Manfred Karrer
a5ab750ce8
Fix bug with missing MultiSigKey 2017-09-20 11:45:24 -05:00
Mike Rosseel
8852eab523
Fix maven warning in api pom 
There was a duplicate entry in the pom, now removed.

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-20 16:31:27 +02:00
Mike Rosseel
4ade734c7e
Change travis config file 
Remove slack notifications for now

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-20 14:55:06 +02:00
Mike Rosseel
9e04fe4b15
Add missing OfferUtil and fix docs 
Branch did not compile due to missing checkin of the OfferUtil file.

Signed-off-by: Mike Rosseel <mike.rosseel@gmail.com>
 2017-09-20 11:38:33 +02:00
Manfred Karrer
1b324631ae
Rename \'Account holder name\' to \'Account owner full name\' 2017-09-19 20:54:36 -05:00